241 Commits

Author SHA1 Message Date
Hillel Coren
7d0ec404da Working on gateway fees 2017-03-14 15:18:31 +02:00
Hillel Coren
ae7acc8602 Provide a 'cancel payment' button in Stripe #1248 2017-03-01 17:27:46 +02:00
Hillel Coren
93ba0cb201 Merge branch 'release-3.1.0' 2017-02-27 21:19:31 +02:00
Joshua Dwire
fb749092b2 Reorganize Client Portal Fonts/CSS to allow styling client auth screens 2017-02-15 22:26:55 -05:00
Hillel Coren
c0fbaf1e89 php-cs-fixer cleanup 2017-01-30 21:40:43 +02:00
Hillel Coren
1eb83a2642 php-cs-fixer clean up 2017-01-30 18:05:31 +02:00
Hillel Coren
4739cc04c3 Change back to UTC dates 2017-01-30 14:40:48 +02:00
Hillel Coren
249f5b3543 Change back to UTC dates 2017-01-30 14:40:07 +02:00
Hillel Coren
80b582a059 Fix for dates 2017-01-30 10:17:32 +02:00
Hillel Coren
6d65b8e7cc Fix for dates 2017-01-30 10:15:28 +02:00
Hillel Coren
a63c0843cc Fix to retain plan_started 2017-01-25 20:01:34 +02:00
Hillel Coren
5bfc183ed5 Fix to retain plan_started 2017-01-25 20:01:12 +02:00
Hillel Coren
322f5ce866 Fix for wepay hook 2017-01-24 10:07:11 +02:00
Hillel Coren
3c968ef8bf Minor fixes 2017-01-24 10:06:41 +02:00
Hillel Coren
7a744680ae Merge branch 'release-3.0.0' 2017-01-23 21:55:55 +02:00
Hillel Coren
45ee040146 Working on Skrill 2017-01-16 19:46:47 +02:00
Hillel Coren
00ae1d4a1c Support entering payment for draft invoice 2017-01-13 13:53:06 +02:00
Hillel Coren
4f04e56c7e Fix timezone issue with dates 2017-01-02 22:43:03 +02:00
Hillel Coren
392d55c190 Working on white label renewls 2016-12-28 16:53:18 +02:00
Hillel Coren
cf0889bc90 Improvements to white label purchase 2016-12-27 23:56:55 +02:00
Hillel Coren
42f7d65aff Merge branch 'release-2.9.0' 2016-12-15 17:28:48 +02:00
Hillel Coren
cc8959626f Support pro plan discounts 2016-12-14 16:19:16 +02:00
Hillel Coren
2ccb54bf42 Added rbits data 2016-12-12 20:42:51 +02:00
Hillel Coren
966d3cedba Fix for PayFast 2016-11-16 12:41:59 +02:00
Hillel Coren
2cd574d349 Fix for PayFast 2016-11-16 12:41:47 +02:00
Hillel Coren
b620356db1 Merge branch 'release-2.8.0' 2016-11-06 19:29:19 +02:00
Hillel Coren
ef44a95902 Working on signature feature 2016-11-06 13:44:58 +02:00
Hillel Coren
d6afc03c3b Merge fixes 2016-10-02 10:59:15 +03:00
Hillel Coren
47137e60df Check if Stripe card is set 2016-09-28 21:07:43 +03:00
Hillel Coren
f7b7796f25 Fix for setting num users 2016-09-27 21:03:46 +03:00
Hillel Coren
6088a36175 Support for custom gateway 2016-09-26 12:33:30 +03:00
Hillel Coren
4b3507211a Show 'Pay with credit card' with PayPal 2016-09-26 09:20:06 +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
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
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 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
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
ed07439de2 GoCardless only accepts bank transfers, not credit cards 2016-09-08 20:52:32 -04:00
Hillel Coren
9feddabd4b Fix for WePay app fee 2016-08-28 00:30:05 +03:00
Hillel Coren
ef4c0c4237 Fixed PayFast integration 2016-08-15 23:14:08 +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