Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-14 07:02:34 +01:00
Code Issues Releases Activity
4,621 Commits 9 Branches 921 Tags 2 GiB
ddda4b90b4
Commit Graph

678 Commits

Author SHA1 Message Date
Joshua Dwire
5713561261 Add UI for BlueVine signup 2016-11-03 16:54:33 -04:00
Hillel Coren
9769f206f2 Fix for outstanding amount on dashboard 2016-11-02 09:43:57 +02:00
Hillel Coren
e677569351 Support importing VAT number with client CSV 2016-11-01 13:19:35 +02:00
Hillel Coren
eca4d7ce6a Add financial year start setting for dashboard 2016-10-31 11:11:30 +02:00
Hillel Coren
7b5cd9e4c1 Eager load contact with activities 2016-10-30 08:50:58 +02:00
David Bomba
147a1b1a94 Add in additional fields for activities transformer (#1129) 
* Expense categories

* add dependencies

* expense categories

* expense categories

* expense categories

* Change expense categories into a resource route

* add expenses, contacts, tasks and is_system to activity transformer
 2016-10-29 18:48:58 +11:00
Hillel Coren
7465eb1631 Include taxes in expense amount 2016-10-27 17:26:42 +03:00
Hillel Coren
5b80e32fa7 Add ability to enable\disable modules 2016-10-27 11:57:51 +03:00
David Bomba
0bef2a0d1a Changed object back to 2016-10-26 12:01:36 +11:00
Hillel Coren
8e6113dad0 Merge invoice document/api fix to master 2016-10-25 13:30:28 +03:00
Hillel Coren
6a55cf5b43 Add API support for expenses 2016-10-23 11:01:21 +03:00
Hillel Coren
4320a72692 Add company plan to user account API response 2016-10-21 14:29:01 +03:00
Hillel Coren
fc683784fc Remove duplicate activity records for expenses and tasks 2016-10-21 09:54:28 +03:00
Hillel Coren
83b66c880b Track changes to expenses in activities 2016-10-20 23:17:37 +03:00
Hillel Coren
d92f7fadc0 Fix for currency symbol 2016-10-20 18:14:54 +03:00
Hillel Coren
4c5b4d5164 Filter buy now clients and invoices 2016-10-20 17:50:59 +03:00
David Bomba
9c21cc0e5c Merge pull request #1110 from turbo124/develop 
Added missing fields in Expense Transformer
 2016-10-19 13:00:25 +11:00
David Bomba
c50f1a8f37 Added missing fields 2016-10-19 12:59:01 +11:00
Hillel Coren
89088e5517 Fix product list filter 2016-10-18 21:15:08 +03:00
Hillel Coren
733890ec3f Show archived/deleted in breadcrumbs 2016-10-18 17:55:07 +03:00
Hillel Coren
9fe183f125 Fix for deleting vendor contacts 2016-10-18 14:22:04 +03:00
Hillel Coren
147df1ef91 Standardize archive/deleted behaviors 2016-10-10 11:40:04 +03:00
Hillel Coren
48f2f58d3f Only show 'Refund Payment' for selected gateways 2016-10-09 20:01:44 +03:00
Hillel Coren
d8835a09c0 Fix for sorting payment list by source 2016-10-07 10:13:19 +03:00
Hillel Coren
6fad8c6bbb Fix for sorting payment list by source 2016-10-07 10:13:08 +03:00
Hillel Coren
92698f5c26 Improve expense import 2016-10-05 23:56:48 +03:00
Hillel Coren
48d0b1b9cf Improve expense import 2016-10-05 23:46:15 +03:00
Hillel Coren
d0b06b94da Update invoice to use invoice terms when converted from a quote 2016-10-05 22:11:22 +03:00
Hillel Coren
d6afc03c3b Merge fixes 2016-10-02 10:59:15 +03:00
Hillel Coren
7bd4026e4c Working on importing expenses 2016-10-02 10:10:28 +03:00
Hillel Coren
47137e60df Check if Stripe card is set 2016-09-28 21:07:43 +03:00
Hillel Coren
2bf3e524db Fix for documents when approving a quote 2016-09-28 10:44:07 +03:00
Hillel Coren
11472e488f Fix for documents when approving a quote 2016-09-28 10:43:48 +03:00
Hillel Coren
f7b7796f25 Fix for setting num users 2016-09-27 21:03:46 +03:00
Hillel Coren
c5d0786ed6 Prevent partial from being negative 2016-09-27 10:37:37 +03:00
Hillel Coren
6088a36175 Support for custom gateway 2016-09-26 12:33:30 +03:00
Hillel Coren
078527443f Enable recurring for a cloned invoice 2016-09-26 09:54:59 +03:00
Hillel Coren
4b3507211a Show 'Pay with credit card' with PayPal 2016-09-26 09:20:06 +03:00
Hillel Coren
249c89dbfd Added products to main navigation 2016-09-23 17:00:47 +03:00
Hillel Coren
5d04bdab21 Add credits to the client portal 2016-09-23 12:02:48 +03:00
Hillel Coren
8a8a80c414 Standardize partial/deposit error 2016-09-21 17:07:01 +03:00
Hillel Coren
c5b685d390 Enable users with 'View all' to see w/o editing 2016-09-20 17:34:13 +03:00
Hillel Coren
fc5a462f5a Fix for payment error 2016-09-20 09:03:48 +03:00
Hillel Coren
5f861f491a Fix error with payment methods 2016-09-19 13:31:04 +03:00
Hillel Coren
cb44f8e9a6 Fix error with payment methods 2016-09-19 13:29:56 +03:00
Hillel Coren
d3116f7a06 Fix for null reference 2016-09-19 10:05:13 +03:00
Hillel Coren
767d4d148a Fix for null reference 2016-09-19 10:04:30 +03:00
Hillel Coren
c1696ef8d8 Task report 2016-09-18 22:28:37 +03:00
Hillel Coren
d57117477c Remove repo warnings 2016-09-18 17:11:17 +03:00
Joshua Dwire
5af46cf1e9 Fix bugs when paying with a stored card 2016-09-15 11:37:43 -04:00
Joshua Dwire
989b514788 Merge remote-tracking branch 'upstream/develop' into 2016-09-payments-changes 2016-09-14 14:35:03 -04:00
Joshua Dwire
d96c8bd048 Make min and max inclusive; remove .99 from max 2016-09-14 14:31:44 -04:00
Joshua Dwire
a5580cc650 Allow max of 0 for payment limits 2016-09-14 10:26:50 -04:00
Hillel Coren
ebd258d655 Merge branch 'release-2.7.0' 
Conflicts:
	app/Http/Controllers/DashboardController.php
	app/Http/Requests/UpdateInvoiceRequest.php
	app/Http/routes.php
	composer.lock
	resources/views/payments/credit_card.blade.php
 2016-09-12 13:36:53 +03:00
Hillel Coren
db4dbdc87e Cleaning up errors from the logs 2016-09-12 08:51:41 +03:00
Hillel Coren
ef81549694 Working on the dashboard 2016-09-11 20:05:59 +03:00
Hillel Coren
ce3a510037 Working on the dashboard 2016-09-11 17:30:23 +03:00
Joshua Dwire
7b203c11f1 Revert "GoCardless only accepts bank transfers, not credit cards" 
This reverts commit ed07439de2.
 2016-09-09 17:31:47 -04:00
Joshua Dwire
4c1f96e740 Use numeric ID for gateway_types table 2016-09-09 17:19:32 -04:00
Joshua Dwire
2fc0265d06 Revert change to string ID for gateway types 2016-09-09 16:47:08 -04:00
Joshua Dwire
286f9e8902 Prevent users from changing the url to access a payment method whose limits don't support the current invoice 2016-09-08 22:19:51 -04:00
Joshua Dwire
ca71ea5622 Restrict payments based on gateway type limits 2016-09-08 22:12:51 -04:00
Joshua Dwire
3c4ad52463 Switch to string-based ID for gateway types; associate gateway type with payment type 2016-09-08 22:12:32 -04:00
Joshua Dwire
30fcf0e363 Merge remote-tracking branch 'upstream/develop' into 2016-09-payments-changes 2016-09-08 20:55:53 -04:00
Joshua Dwire
ed07439de2 GoCardless only accepts bank transfers, not credit cards 2016-09-08 20:52:32 -04:00
Joshua Dwire
620e93084f Allow admin to set min/max amount for each payment type 2016-09-05 18:16:56 -04:00
Hillel Coren
ea2d5af69a Camel case anchor tag 2016-09-05 21:40:02 +03:00
Hillel Coren
d14cf5f9ed Working on invoice fields 2016-09-05 15:28:59 +03:00
Hillel Coren
08590a4b6f Working on invoice fields 2016-09-05 08:10:39 +03:00
Hillel Coren
8696acf4d3 Reduce extra queries 2016-09-01 20:02:37 +03:00
Hillel Coren
db0c305b4f Working on history sidebar 2016-08-31 22:10:41 +03:00
Hillel Coren
9feddabd4b Fix for WePay app fee 2016-08-28 00:30:05 +03:00
Hillel Coren
2d15c43251 Set invoice type for renewal invoices 2016-08-25 17:32:26 +03:00
Hillel Coren
b405ed84da Prevent invoices with expenses from creating products 2016-08-21 18:47:56 +03:00
Hillel Coren
6c92a6a94a Enabled adding expense to open invoice 2016-08-21 18:25:35 +03:00
David Bomba
05340d3e4a Add updated_at into Activity Transformer 2016-08-17 18:56:31 +10:00
Hillel Coren
ad5b185c7c Add key for activities 2016-08-17 10:55:50 +03:00
Hillel Coren
ef4c0c4237 Fixed PayFast integration 2016-08-15 23:14:08 +03:00
Hillel Coren
2ebd40f46e Added activities to API dashboard data 2016-08-15 16:43:26 +03:00
Hillel Coren
8262e40942 Working on dashboard API 2016-08-15 06:46:47 +03:00
Hillel Coren
918d58e0b6 Bot fixes 2016-08-14 13:33:22 +03:00
Hillel Coren
bfae5018e0 Fixes for the bot 2016-08-14 12:30:16 +03:00
Hillel Coren
c7c253fbd8 Merge branch 'release-2.6.9' 
Conflicts:
	app/Http/routes.php
	app/Ninja/PaymentDrivers/BasePaymentDriver.php
	composer.lock
	resources/lang/en/texts.php
	resources/views/reports/chart_builder.blade.php
 2016-08-14 09:07:44 +03:00
Hillel Coren
ce2c71843c Working on the bot 2016-08-13 22:19:37 +03:00
Hillel Coren
e4929c1008 Fix for cancelled mollie payments 2016-08-11 13:17:01 +03:00
Hillel Coren
0a7381294e Working on the bot 2016-08-10 17:04:17 +03:00
Hillel Coren
815c3991a6 Working on the bot 2016-08-10 15:57:34 +03:00
Hillel Coren
d374843e50 Working on the bot 2016-08-09 23:06:24 +03:00
Hillel Coren
5a4f705c8b working on the bot 2016-08-09 17:14:26 +03:00
Hillel Coren
6c9c892d7c Fix for applying multiple credits 2016-08-09 09:39:37 +03:00
Hillel Coren
e36db657cc Fix for applying multiple credits 2016-08-09 09:39:20 +03:00
Hillel Coren
472ba842eb Working on the bot 2016-08-08 17:45:37 +03:00
Hillel Coren
f8fda5f241 Working on the bot 2016-08-07 22:42:32 +03:00
Hillel Coren
b8a124dc0f Working on our bot 2016-08-07 09:10:36 +03:00
Hillel Coren
f1a278e4ff Working on our bot 2016-08-06 20:54:56 +03:00
Hillel Coren
7f3bd44d9a Working on bots 2016-08-04 20:01:30 +03:00
Hillel Coren
293e7cbb61 Support saving credit card and paypal tokens for the same client 2016-08-02 13:40:20 +03:00
Hillel Coren
8f084ddbc1 Set last entered payment method as the default 2016-08-01 15:01:04 +03:00
Hillel Coren
bf5d6ac1ee Set last entered payment method as the default 2016-08-01 15:00:47 +03:00
Hillel Coren
f3419587bf Archive previous payment methods 2016-08-01 14:53:49 +03:00