1
0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-11 13:42:49 +01:00
Commit Graph

71 Commits

Author SHA1 Message Date
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 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
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
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
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
Hillel Coren
ee937d9994 Fixes from refactor 2016-07-21 14:28:06 +03:00
Hillel Coren
7b4b84cedd Merge pull request #979 from codedge/Refactoring-docblocks-dead-code-unused-uses
Refactor docblocks, unused vars, unused uses
2016-07-20 11:00:03 +03:00
Hillel Coren
ce6068f924 Additional online payment checks 2016-07-18 22:03:28 +03:00
Hillel Coren
078964d297 Improve offsite payment checks 2016-07-18 21:45:32 +03:00
Hillel Coren
cf3465b5e2 Fix for token billing 2016-07-15 11:23:19 +03:00
Hillel Coren
c6bf1d5fcc Fix for wepay fee 2016-07-15 10:41:16 +03:00
Holger Lösken
71ab4dc3d8 Refactor docblocks, unused vars, unused uses 2016-07-14 22:37:04 +02:00