1121 Commits

Author SHA1 Message Date
Joshua Dwire
7b203c11f1 Revert "GoCardless only accepts bank transfers, not credit cards"
This reverts commit ed07439de2546728e9d9fd9f67411d4281c20021.
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
Hillel Coren
948a3e8911 Archive previous payment methods 2016-08-01 14:53:10 +03:00
Hillel Coren
af78a3dd2d Test Stripe credentials when adding gateway 2016-07-29 14:58:26 +03:00
Hillel Coren
1e7bedd469 Fix for removing payment method 2016-07-27 14:38:44 +03:00
Hillel Coren
903036c02c Fix for removing payment method 2016-07-27 14:37:36 +03:00
Hillel Coren
bb590830cf Fix for upgrading Stripe accounts 2016-07-27 12:53:58 +03:00
Hillel Coren
7c314347db Fix for upgrading Stripe accounts 2016-07-27 12:53:11 +03:00
Hillel Coren
498578cefc Rollback to 2.6.5 2016-07-21 15:35:23 +03:00