368 Commits

Author	SHA1	Message	Date
Hillel Coren	d71017e203	Payment webhook bug fixes	2016-06-23 20:17:02 +03:00
Hillel Coren	6ad49cf281	Fixing payment hooks	2016-06-23 16:15:52 +03:00
Hillel Coren	93c3521952	Improve check for duplicate gateways	2016-06-22 21:42:09 +03:00
Hillel Coren	c9a19cbd76	Fixes for WePay	2016-06-21 19:10:22 +03:00
Hillel Coren	12b754dc32	Merge branch 'develop' of github.com:hillelcoren/invoice-ninja into develop	2016-06-20 17:14:57 +03:00
Hillel Coren	5ff69c6f29	Payments refactor	2016-06-20 17:14:43 +03:00
David Bomba	6e57976075	typo	2016-06-13 20:26:47 +10:00
David Bomba	369b696297	typo	2016-06-13 20:23:14 +10:00
David Bomba	fedbd74319	Integrating Expense categories into API	2016-06-13 20:18:30 +10:00
David Bomba	f6aa3340d7	Expense Categories Model	2016-06-11 12:47:26 +10:00
Hillel Coren	ffa67cef3b	Refactoring payments code...	2016-06-09 10:56:22 +03:00
Hillel Coren	1039aec1d0	Always load user even if they're deleted	2016-06-08 08:11:05 +03:00
Hillel Coren	4976d5b057	Fix for tests	2016-06-07 21:13:29 +03:00
Hillel Coren	7facf518cf	Added back API route for quotes	2016-06-06 22:17:16 +03:00
Hillel Coren	8b2f7eb39f	Check for blank api secret	2016-06-05 18:50:41 +03:00
Hillel Coren	a7f92d0726	Merge pull request #901 from joshuadwire/wepay-integration ... Wepay integration	2016-06-03 11:20:31 +03:00
Hillel Coren	0acf4ff1fc	Support importing JSON file	2016-06-02 22:03:59 +03:00
Joshua Dwire	49d47bb9e3	Merge remote-tracking branch 'upstream/develop' into wepay-integration	2016-06-01 16:46:03 -04:00
Hillel Coren	17eb2a7a79	Support saving invoice_id and expense_id with the document	2016-06-01 12:39:42 +03:00
Hillel Coren	51d9b2b427	Prevent converting a qoute from incrementing the counter	2016-06-01 10:56:44 +03:00
Hillel Coren	42ac9507e5	Enabled importing products	2016-05-31 23:15:55 +03:00
Hillel Coren	d175fc872a	Don't render pdf if not attached and fix typo	2016-05-29 19:32:45 +03:00
Hillel Coren	a9302d4d01	Fixes for is_quote	2016-05-29 15:34:44 +03:00
Hillel Coren	607fb58c29	Merge branch 'develop' of github.com:hillelcoren/invoice-ninja into develop ... Conflicts: app/Models/Account.php	2016-05-29 12:27:14 +03:00
Hillel Coren	0e75ddb5e6	Added setting to hide second tax rate	2016-05-29 12:26:02 +03:00
ben	dadac05532	add support to multiple invoice types	2016-05-29 12:02:44 +03:00
Joshua Dwire	1c119fe35a	ACH autobill bug fixes	2016-05-26 15:22:09 -04:00
Hillel Coren	29bccd650d	Fix permission issue with quotes	2016-05-26 15:50:23 +03:00
Joshua Dwire	c9f00274b1	Support storing WePay bank tokens	2016-05-25 15:04:58 -04:00
Joshua Dwire	7d55ab033b	Merge branch 'wepay-ach' into wepay-integration	2016-05-25 11:11:47 -04:00
Joshua Dwire	a5fdb88d79	Add support for auto bill on due date	2016-05-24 22:49:06 -04:00
Joshua Dwire	724f5738aa	Add contact_key	2016-05-24 17:02:28 -04:00
Joshua Dwire	f8835268b4	Update DB structure	2016-05-24 14:16:42 -04:00
Hillel Coren	e7bf0599db	Separated out entity datatable classes	2016-05-23 19:52:20 +03:00
Hillel Coren	99da41669b	Fixes for #442 and #702	2016-05-22 13:10:58 +03:00
Hillel Coren	ef65bb7d84	Merge pull request #879 from joshuadwire/wepay-integration ... Wepay integration - Part 3	2016-05-18 19:22:44 +03:00
Joshua Dwire	f0d276be4c	Listen for WePay IPNs	2016-05-18 09:51:20 -04:00
Hillel Coren	fa9370d4fb	Fix for symbol placement	2016-05-17 22:45:10 +03:00
Joshua Dwire	e905b29510	Partial WePay ACH support	2016-05-17 14:09:39 -04:00
Hillel Coren	e5e65c0349	Added getCompletedAmount to payments	2016-05-17 14:55:53 +03:00
Hillel Coren	a82437b2bc	Merge branch 'develop' of github.com:hillelcoren/invoice-ninja into develop ... Conflicts: app/Http/routes.php resources/lang/en/texts.php	2016-05-16 11:34:00 +03:00
Joshua Dwire	a482c63ee3	Payments bug fixes	2016-05-15 16:27:56 -04:00
Hillel Coren	3df6ad2529	Changes to support transifex.com	2016-05-15 23:16:08 +03:00
Hillel Coren	b067697b1c	Support manually importing OFX files	2016-05-15 13:58:11 +03:00
Joshua Dwire	947cb4a6f7	Better WePay configuration support	2016-05-14 17:23:20 -04:00
Joshua Dwire	ce04c994dd	Support payments and storing cards via WePay.	2016-05-13 09:30:22 -04:00
Joshua Dwire	ba000546c4	Better WePay switching	2016-05-12 11:09:07 -04:00
Joshua Dwire	104264607b	Pad last 4 card digits to a string of length 4, since we're storing it as an int	2016-05-10 19:17:55 -04:00
Joshua Dwire	b8514436a9	Pad last 4 card digits to a string of length 4, since we're storing it as an int	2016-05-10 19:17:41 -04:00
Joshua Dwire	88ec714cd5	Store Stripe card summary locally	2016-05-10 18:46:32 -04:00