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 |
|
Hillel Coren
|
cca6dcfc4a
|
Merge pull request #878 from benb969/invoices_types
add support to multiple invoice types
|
2016-05-29 12:21:57 +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
|
145c394e6b
|
Ensure all files are deleted with the account
|
2016-05-26 20:48:45 +03:00 |
|
Hillel Coren
|
f233582ea8
|
Ensure all files are deleted with the account
|
2016-05-26 20:48:27 +03:00 |
|
Hillel Coren
|
b32a9110c7
|
Fix for deleting documents
|
2016-05-26 19:04:43 +03:00 |
|
Hillel Coren
|
2043621ac9
|
Fix for deleting documents
|
2016-05-26 19:02:53 +03:00 |
|
Hillel Coren
|
7599edbc8c
|
Fixed date formatting in document list
|
2016-05-26 18:28:36 +03:00 |
|
Hillel Coren
|
0da3741b56
|
Fixed date formatting in document list
|
2016-05-26 18:28:13 +03:00 |
|
Hillel Coren
|
26b0169ae9
|
Fix permission issue with quotes
|
2016-05-26 15:51:13 +03:00 |
|
Hillel Coren
|
29bccd650d
|
Fix permission issue with quotes
|
2016-05-26 15:50:23 +03:00 |
|
Joshua Dwire
|
acbc0e887f
|
Support adding WePay ACH from payment page
|
2016-05-25 16:54:49 -04:00 |
|
Joshua Dwire
|
c9f00274b1
|
Support storing WePay bank tokens
|
2016-05-25 15:04:58 -04:00 |
|
Hillel Coren
|
afd7b7ed38
|
check document completed upload before user submitted form
|
2016-05-25 21:44:06 +03:00 |
|
Hillel Coren
|
85184f9a5b
|
check document completed upload before user submitted form
|
2016-05-25 21:42:22 +03:00 |
|
Joshua Dwire
|
7d55ab033b
|
Merge branch 'wepay-ach' into wepay-integration
|
2016-05-25 11:11:47 -04:00 |
|
Joshua Dwire
|
d19a3715f9
|
Warn user when editing an ACH auto bill invoice
|
2016-05-25 11:07:20 -04:00 |
|
Joshua Dwire
|
c701c5563c
|
Add payment settings block
|
2016-05-25 10:36:40 -04:00 |
|
Joshua Dwire
|
9d4b42a514
|
Mention in the invoice notification that the invoice will be auto billed on the due date
|
2016-05-24 23:14:19 -04:00 |
|
Joshua Dwire
|
a5fdb88d79
|
Add support for auto bill on due date
|
2016-05-24 22:49:06 -04:00 |
|
Joshua Dwire
|
1f11d88d6b
|
Store ip addresses for payments and payment methods
|
2016-05-24 18:00:59 -04:00 |
|
Joshua Dwire
|
29c4f16970
|
Fix contact authentication
|
2016-05-24 17:45:38 -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 |
|
Joshua Dwire
|
5958cd2c5e
|
Don't request update URI from WePay
|
2016-05-24 13:04:55 -04:00 |
|
Hillel Coren
|
ea2f154b1f
|
Merge branch 'develop' of github.com:hillelcoren/invoice-ninja into develop
|
2016-05-24 10:18:21 +03:00 |
|
Hillel Coren
|
7cc29de881
|
Bumped version
|
2016-05-24 10:18:10 +03:00 |
|
Hillel Coren
|
e201651aa6
|
Bumped version
|
2016-05-24 10:17:53 +03:00 |
|
David Bomba
|
5f928ecf01
|
Merge remote-tracking branch 'upstream/develop' into develop
|
2016-05-24 14:26:19 +10:00 |
|
Hillel Coren
|
406df6f3d8
|
Fix for payment datatable list
|
2016-05-23 21:10:40 +03:00 |
|
Hillel Coren
|
b2beb8fb73
|
Updated vendors to new datatable class
|
2016-05-23 21:07:06 +03:00 |
|
Hillel Coren
|
541b19cd5f
|
Updated vendor expenses to new datatable class
|
2016-05-23 21:03:01 +03:00 |
|
Hillel Coren
|
e7bf0599db
|
Separated out entity datatable classes
|
2016-05-23 19:52:20 +03:00 |
|
Hillel Coren
|
4b1b80886d
|
Implemented base entity presenter
|
2016-05-23 12:26:08 +03:00 |
|
Hillel Coren
|
260b9212b9
|
Renamed PublicClientController to ClientPortalController
|
2016-05-23 11:31:49 +03:00 |
|
Hillel Coren
|
f19058e35e
|
Improved message after update
|
2016-05-23 09:18:39 +03:00 |
|
Hillel Coren
|
86240affab
|
Show company name in client portal dashboard activities
|
2016-05-23 09:02:31 +03:00 |
|
Hillel Coren
|
4aa11be28f
|
Added user permission to tranformer
|
2016-05-22 22:02:42 +03:00 |
|
Hillel Coren
|
371f224c24
|
Minor fixes for invoice export
|
2016-05-22 20:01:37 +03:00 |
|
Hillel Coren
|
d0232e00f6
|
Hide outstanding on dashboard from non-admins
|
2016-05-22 15:31:41 +03:00 |
|
Hillel Coren
|
99da41669b
|
Fixes for #442 and #702
|
2016-05-22 13:10:58 +03:00 |
|
David Bomba
|
1e370d2cce
|
Implement DocumentAPIController
|
2016-05-21 18:44:53 +10:00 |
|
David Bomba
|
eb1d5be47c
|
bugs in dashboardapicontroller
|
2016-05-21 09:17:53 +10:00 |
|
Hillel Coren
|
990ba1a89c
|
Merge pull request #881 from turbo124/develop
Include Documents in Invoice transformer
|
2016-05-19 10:57:28 +03:00 |
|
Hillel Coren
|
6caf1ff30d
|
Minor fixes
|
2016-05-19 09:47:57 +03:00 |
|
David Bomba
|
2034c11795
|
Include Documents in Invoice transformer
|
2016-05-19 09:43:03 +10: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 |
|