Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-11 13:42:49 +01:00
Code Issues Releases Activity
11,217 Commits 7 Branches 919 Tags 2 GiB
364978d282
Commit Graph

1807 Commits

Author SHA1 Message Date
David Bomba
e52f93be74 Fixes for base driver 2021-07-05 10:26:00 +10:00
David Bomba
620ad57d50 merging v5-dev 2021-07-05 09:00:46 +10:00
David Bomba
95bbc4108c Payfast custom notify URL 2021-07-05 08:59:52 +10:00
David Bomba
58547faf3e Fixes for client portal page 2021-07-04 20:53:32 +10:00
David Bomba
3874bff357 Minor bug fixes 2021-07-03 09:26:49 +10:00
David Bomba
e8a1df16cd Fixes for credit query 2021-07-02 16:36:14 +10:00
David Bomba
e75d817bd4
Merge pull request #6182 from turbo124/v5-develop 
Fixes for setup flow
 2021-07-02 10:45:10 +10:00
David Bomba
ee729d8da0 fixes for setup flow 2021-07-02 10:43:32 +10:00
Benjamin Beganović
e9d2d7d7f2 Show logo on the login screen if account whitelabel or official subdomain 2021-07-01 18:29:32 +02:00
David Bomba
25459797db Add late fees back into reminders 2021-07-01 09:14:30 +10:00
Benjamin Beganović
31e138c41e CreatePaymentMethodRequest.php allow only enabled methods to pass 2021-06-29 12:42:44 +02:00
David Bomba
8e43eaa99d minor fixes 2021-06-29 17:26:21 +10:00
David Bomba
ac842d0d83 Fixes for subscriptions 2021-06-29 16:05:03 +10:00
David Bomba
0ef1a83300 Additional catches for company importing 2021-06-29 08:42:59 +10:00
David Bomba
11f13cba0d Minor fixes 2021-06-28 21:30:04 +10:00
David Bomba
b654639ad3 Refactor for company import 2021-06-28 16:02:49 +10:00
David Bomba
24e8745b5b Fixes for company import 2021-06-28 14:09:02 +10:00
David Bomba
7d6676ca14 Fixes for missing include 2021-06-28 09:47:04 +10:00
David Bomba
0c9de66a80 Set Transactions on the correct database 2021-06-24 21:52:02 +10:00
David Bomba
428a1a221c Minor fixes 2021-06-24 20:12:05 +10:00
David Bomba
c961d32c81 Minor fixes 2021-06-24 19:59:14 +10:00
David Bomba
28e3defc83 Fixes for dissociated default_company 2021-06-24 18:42:45 +10:00
David Bomba
1195c98660 Fixes for Two Factor 2021-06-23 15:01:13 +10:00
David Bomba
b56b5c1ec9 Fixes for Two Factor 2021-06-23 14:55:12 +10:00
David Bomba
293b12e348 Fixes for login where the user is not attached to an account 2021-06-22 21:14:08 +10:00
David Bomba
f258ccec16 force token_billing=always for system created gateways 2021-06-22 08:01:50 +10:00
David Bomba
1fb8e003b2 Fixes for sending message 2021-06-22 07:21:59 +10:00
David Bomba
1b303f9559 Fixes for subscription service 2021-06-21 20:53:34 +10:00
David Bomba
c9778463f6 Fixes for AAL license 2021-06-21 15:10:20 +10:00
David Bomba
f93aab5697 Fixes for Client Portal Download a single invoice 2021-06-21 12:58:52 +10:00
David Bomba
d43984385a Fixes for migration email 2021-06-21 07:09:42 +10:00
David Bomba
172604a1a0 WePay 2021-06-20 22:10:22 +10:00
David Bomba
1c052a7431 change user login event 2021-06-20 20:35:26 +10:00
David Bomba
5535ce8faf Allow archived invoices to be paid. 2021-06-20 08:14:56 +10:00
David Bomba
3982fcc2b0 Bug fix for saving report/user notifications for non-admin users 2021-06-20 07:34:30 +10:00
David Bomba
7ec71d886d
Merge pull request #6080 from turbo124/v5-develop 
Working on gmail BCC
 2021-06-18 22:04:42 +10:00
David Bomba
5cc3539388 Fix for no EmailBounce class 2021-06-18 12:57:13 +10:00
Benjamin Beganović
a502cee73e Enabled modules for InvoiceController.php 2021-06-17 14:43:14 +02:00
Benjamin Beganović
430d39b2f1 Enabled modules QuoteController.php 2021-06-17 14:37:06 +02:00
Benjamin Beganović
0d313f12b0 Enabled modules CreditController.php 2021-06-17 14:28:46 +02:00
Benjamin Beganović
a999534769 Enabled modules RecurringInvoiceController.php 2021-06-17 14:24:33 +02:00
David Bomba
b37d9d267e Fixes for broken invoice pdf links 2021-06-17 18:59:15 +10:00
David Bomba
805d7f24d2 Minor fixes for InvoiceController PDF 2021-06-16 21:15:32 +10:00
David Bomba
c076998366 Wepay Payments 2021-06-16 20:12:04 +10:00
David Bomba
36f6cbbcc9 Update license in codebase 2021-06-16 16:58:16 +10:00
David Bomba
177a4ce58f Working on authorization for WePay 2021-06-15 15:56:23 +10:00
David Bomba
95c9eb03a9 merge v5-dev 2021-06-14 20:47:03 +10:00
David Bomba
1397c9ab1c Fixes logic for hosted login 2021-06-14 17:04:15 +10:00
=
0bc3ec111d Authorize WePAy 2021-06-13 22:49:43 +10:00
David Bomba
59fcbfe52c Don't delete the PDF prior to sending 2021-06-13 14:19:40 +10:00
David Bomba
0fb7f58851 code cleanup 2021-06-13 09:58:23 +10:00
=
afdfddd7e9 Refactor for entity paths 2021-06-12 21:50:01 +10:00
David Bomba
f268b7adcb Clean up 2021-06-11 17:45:41 +10:00
David Bomba
b111483ef1 We Pay Account Signup 2021-06-11 17:39:51 +10:00
David Bomba
c367ea60ae Timezone Offset implementation 2021-06-11 08:20:46 +10:00
David Bomba
1bc32c2aca Working on Timezone Offsets 2021-06-11 07:34:03 +10:00
=
99d6d1c516 Email timing offset 2021-06-10 21:25:47 +10:00
=
769ab49458 Force client country if none set 2021-06-10 20:18:01 +10:00
David Bomba
4675cc92b5 Inject delays in emails to allow enough time for attachment resources to upload when using S3 type storage 2021-06-10 19:01:30 +10:00
David Bomba
af68794823 Resolve access token from refresh token - gmail 2021-06-10 18:35:58 +10:00
David Bomba
4ef26723c1 Gmail offline_access 2021-06-10 17:38:07 +10:00
David Bomba
8a89973d7c Gmail offline_access 2021-06-10 17:17:02 +10:00
David Bomba
d1e92060bd Fixes for scopes 2021-06-10 16:57:18 +10:00
David Bomba
185986e819 Fix for missing method property 2021-06-10 15:06:28 +10:00
David Bomba
9c8618ac34 Oauth 2021-06-10 14:05:49 +10:00
David Bomba
0f58039532 Fixes for if plan is null 2021-06-08 22:29:39 +10:00
David Bomba
d68e40433c Fixes for client portal links 2021-06-08 21:45:23 +10:00
David Bomba
c2e2ab60cb Implement slight delay on Company Import 2021-06-08 18:58:27 +10:00
David Bomba
5d04ab724b Fixes for login 2021-06-08 18:42:37 +10:00
David Bomba
968f512aec Fixes for orphan users with no tokens 2021-06-08 18:30:54 +10:00
David Bomba
5854b9825f Fixes for Import 2021-06-08 08:33:51 +10:00
David Bomba
ec6bf52b43 Add specific route for disabling 2FA 2021-06-06 19:21:05 +10:00
=
8703bcc5f6 Fixes for .register bug 2021-06-05 20:59:53 +10:00
=
a2e994be82 Company Import 2021-06-04 20:07:45 +10:00
David Bomba
b75c01d6d4 Minor fixes 2021-06-04 17:41:12 +10:00
David Bomba
43c52ab753 Bug fixes 2021-06-03 15:47:09 +10:00
David Bomba
214396fa43 Fixes for deleting and reusing design names 2021-06-03 08:02:30 +10:00
David Bomba
5252f83ec6 Fixes for CORS 2021-06-01 23:08:32 +10:00
Benjamin Beganović
23e23918b4 Show register link on the login page 2021-06-01 14:06:47 +02:00
Benjamin Beganović
468b576ce5
Merge pull request #5864 from beganovich/v5-3105-checkout-3ds-route 
(v5) Move Checkout.com 3DS confirmation logic into separate route
 2021-06-01 13:37:34 +02:00
David Bomba
1ddf220448 Fixes for gmail oauth 2021-06-01 19:57:05 +10:00
Benjamin Beganović
9119f57a35 Return JSON response if some of required records wasn't found 2021-06-01 11:54:15 +02:00
David Bomba
0e210e6635 Minor fixes 2021-06-01 17:24:51 +10:00
David Bomba
b581a749f2 Minor fixes 2021-06-01 16:06:00 +10:00
David Bomba
1d4f982245 Gmail Oauth 2021-06-01 15:24:47 +10:00
David Bomba
ee6c0468b2 Minor fixes 2021-06-01 10:24:20 +10:00
David Bomba
cd594914b7 fixes for password reset screen 2021-06-01 09:02:30 +10:00
David Bomba
c3946f44b0 Fixes for custom payment method name 2021-06-01 08:09:38 +10:00
David Bomba
13bfd6e7fd Fixes for setup screeen 2021-06-01 07:40:15 +10:00
Benjamin Beganović
588aeefb35 Moving logic for confirming the 3ds process into own method 2021-05-31 16:37:46 +02:00
Benjamin Beganović
8ca1b904d7 Refactor the redirect to specific route 2021-05-31 16:23:18 +02:00
David Bomba
829b069063 Fixes for custom translations 2021-05-31 20:40:34 +10:00
David Bomba
b9191bf67a Company Ledger Adjustment 2021-05-31 15:27:26 +10:00
David Bomba
5e820bbba7 Working on company importer 2021-05-31 08:55:27 +10:00
David Bomba
6dc3668ff6 Fixes for tests 2021-05-31 08:17:42 +10:00
David Bomba
b72217d74c Fixes for import company tests 2021-05-30 21:26:43 +10:00
David Bomba
f22745d131 Remove delivery not from try/catch block 2021-05-30 06:50:55 +10:00
David Bomba
d3c8060dfb Fixes for tests 2021-05-27 11:19:07 +10:00
David Bomba
9805474c3d Fixes for archived/deleted task reording 2021-05-27 09:25:29 +10:00
David Bomba
c125dca154 Fixes for client portal login/auth/register pages 2021-05-27 09:14:21 +10:00
David Bomba
e76567f337 Fixes for creating an account using OAuth 2021-05-26 16:14:47 +10:00
David Bomba
0079e52b85 Refactor for account signups 2021-05-26 10:37:59 +10:00
David Bomba
5e33eb9130 Generate temp email address for direct client portal viewing. 2021-05-25 08:32:08 +10:00
David Bomba
0e61a6f491 Fixes for random subdomain generator 2021-05-24 19:39:21 +10:00
David Bomba
6b0d75a666 Fixes for multidb UserController 2021-05-24 11:30:30 +10:00
David Bomba
0b71bc03b0 Fixes for User Route 2021-05-24 10:53:04 +10:00
David Bomba
10a0812ead Refactor for login flow 2021-05-24 07:23:30 +10:00
David Bomba
3b7bf352a7 Fixes for trait inclusion 2021-05-23 18:59:09 +10:00
David Bomba
9d21b4fd57 Refactor LoginController 2021-05-23 18:43:50 +10:00
David Bomba
c5a24fd9d9 Fixes for OAuth using logging in over user/pass combinations 2021-05-23 07:57:53 +10:00
David Bomba
601d795ace Fixes for reset password 2021-05-22 14:45:09 +10:00
David Bomba
264477a2de Fixes for reset password 2021-05-22 14:31:48 +10:00
David Bomba
b58d3f390e Fixes for Stripe Connect 2021-05-21 15:47:05 +10:00
David Bomba
ee0518d34f Merge branch 'v5-develop' of https://github.com/turbo124/invoiceninja into v5-develop 2021-05-21 07:58:51 +10:00
David Bomba
0b7891e24f Fixes for restore invoice numbering 2021-05-21 07:58:46 +10:00
David Bomba
238143d88e Fixes for paths for email attachments 2021-05-20 19:50:11 +10:00
David Bomba
f7a4588371 Fixes for refresh route - firstload/mini_loader 2021-05-19 18:38:51 +10:00
David Bomba
2e6896dd58 Fixes for importing customers into Stripe. 2021-05-19 14:27:47 +10:00
David Bomba
4db46e2bb6 Fixes for Stripe import 2021-05-19 13:32:20 +10:00
David Bomba
49b3cab7d7 Refactor system logger to enable multidb 2021-05-19 11:12:55 +10:00
David Bomba
52c3d63349 Refactor system logger to enable multidb 2021-05-19 11:12:23 +10:00
David Bomba
c1c17eb2ed Change VersionCheck URL away from GitHub 2021-05-19 09:42:48 +10:00
David Bomba
a482e3c37e Fixes for Stripe Connect 2021-05-19 09:03:30 +10:00
David Bomba
470fb67877 Fixes for subdomain checks 2021-05-18 23:12:03 +10:00
David Bomba
a45341786d Debugging for Stripe Connect 2021-05-18 22:03:19 +10:00
David Bomba
754bed50d3
Merge pull request #5735 from turbo124/v5-develop 
Fixes for setup + new js package
 2021-05-18 20:26:22 +10:00
David Bomba
4492346e48 Fixes for setup + new js package 2021-05-18 20:26:06 +10:00
Benjamin Beganović
21d12bef77
Merge pull request #5734 from beganovich/v5-1805-credits-updates 
(v5) Client portal: "Credits" updates
 2021-05-18 12:05:05 +02:00
Benjamin Beganović
cd2a104fbc Fullscreen view for credits 2021-05-18 12:03:06 +02:00
David Bomba
2291d908d0
Merge pull request #5733 from turbo124/v5-develop 
Fixes for Stripe Connect
 2021-05-18 19:55:22 +10:00
David Bomba
5c11901625 Fixes for Stripe Connect 2021-05-18 19:54:57 +10:00
Benjamin Beganović
9dc418ec5b
Merge pull request #5691 from beganovich/v5-1204-tasks 
(v5) Client portal: Tasks
 2021-05-18 11:08:46 +02:00
Benjamin Beganović
fad1743e30 Update Carbon locale before rendering the tasks page 2021-05-18 11:08:26 +02:00
David Bomba
d049c56573 fixes for migration 2021-05-18 17:28:13 +10:00
David Bomba
3f373d873f Fixes for Stripe Connect 2021-05-18 15:53:00 +10:00
David Bomba
d515a1ee97 Fixes for stripe connect 2021-05-18 14:02:57 +10:00
David Bomba
f39bdaef73 Fixes for Stripe Connect 2021-05-18 13:28:59 +10:00
David Bomba
9599c8de4f Refactor for Stripe Connect 2021-05-18 12:13:00 +10:00
David Bomba
12d8da942e Import stripe customers and update their payment methods 2021-05-17 18:56:14 +10:00
David Bomba
0347ca00f5 Update payment methods for Stripe 2021-05-17 14:02:43 +10:00
David Bomba
c52311bcde Fixes for PDF file paths 2021-05-15 12:19:36 +10:00
David Bomba
7756ca7436 Don't store PDFs 2021-05-14 21:15:11 +10:00
David Bomba
de8fb374ab Fixes for S3 storage and delivery notes 2021-05-14 19:43:06 +10:00
David Bomba
0dac08eaa6 Fixes for large account loading 2021-05-14 17:38:16 +10:00
David Bomba
97b49f8df6 Fixes for download export button 2021-05-14 13:32:37 +10:00
David Bomba
777c2dd24a Reorder middleware to allow route model binding to be delayed 2021-05-13 22:41:32 +10:00
David Bomba
8a582f7800 Fixes for reset password 2021-05-13 20:18:30 +10:00
=
daff65de01 Working on password reset throttling 2021-05-13 19:13:51 +10:00
David Bomba
ef359501ba Export Controller 2021-05-13 16:16:39 +10:00
David Bomba
e4fabfbf2d Export data 2021-05-13 16:01:12 +10:00
Benjamin Beganović
5a84fb6990 Tasks module in the client portal 2021-05-12 16:39:29 +02:00
David Bomba
ac77100981 New login notification 2021-05-12 16:31:02 +10:00
David Bomba
f60b9c30eb Add new login notification 2021-05-12 16:18:32 +10:00
David Bomba
42d5f03130 Fixes for Stripe Connect 2021-05-12 13:15:51 +10:00
David Bomba
e8adae6568 Fixes for Stripe Connect 2021-05-12 13:00:46 +10:00
David Bomba
06a242625b Fixes for stripe authorize card 2021-05-12 10:13:42 +10:00
David Bomba
6bfaa11f59
Merge branch 'v5-develop' into v5-2804-braintree 2021-05-11 21:14:54 +10:00
David Bomba
e46bf71334 Fixes for deleting users / company_users and companies 2021-05-11 17:25:34 +10:00
David Bomba
3b01190bc2 Return error when the user isn't attached to a company 2021-05-11 14:57:36 +10:00
David Bomba
ad2742a0d6 Disable client portal 2021-05-11 11:55:47 +10:00
Benjamin Beganović
f07c911f8b
Merge branch 'v5-develop' into v5-2804-braintree 2021-05-10 16:55:04 +02:00
Benjamin Beganović
50ad75b516 Fix the wrong variable reference 2021-05-10 13:35:38 +02:00
Benjamin Beganović
580628b7f9 Show quotes 2021-05-10 13:28:31 +02:00
Benjamin Beganović
604f074dfa Show invoices full screen 2021-05-10 13:26:13 +02:00
David Bomba
16c5665cc6 Recurring Invoice history / activities 2021-05-10 20:20:52 +10:00
Benjamin Beganović
85822c45ac Merge upstream/v5-develop 2021-05-10 11:50:05 +02:00
=
3b5a6d5392 Events and listeners for Recurring Invoices 2021-05-10 18:45:07 +10:00
=
438cf2d3ee Merge branch 'v5-develop' of https://github.com/turbo124/invoiceninja into v5-develop 2021-05-10 18:17:32 +10:00
David Bomba
82d274c1f2 Recurring Invoice Activities 2021-05-10 15:59:23 +10:00
David Bomba
39f3c55e8e Stripe ConnecT 2021-05-10 12:49:16 +10:00
David Bomba
907da5f27d Fixes for Stripe Connect 2021-05-10 11:57:23 +10:00
David Bomba
685b5be11c Fixes for Stripe Connect 2021-05-10 11:37:53 +10:00
David Bomba
815878be5c Fixes for Stripe Connect 2021-05-10 10:22:07 +10:00
David Bomba
dacd31bb83 Merge branch 'v5-develop' of https://github.com/turbo124/invoiceninja into v5-develop 2021-05-10 09:53:05 +10:00
David Bomba
7808b4c30d Fixes for created_at dates in migration 2021-05-10 09:52:58 +10:00
David Bomba
87ddad6670 Working on PDF generator flags 2021-05-09 21:30:31 +10:00
=
2510fe9df8 Allow all users to see the task statuses 2021-05-09 19:03:47 +10:00
David Bomba
85c05f7c30 Fixes for VarEvents 2021-05-07 07:12:07 +10:00
David Bomba
24f935e277 Merge branch 'wepay' of https://github.com/turbo124/invoiceninja into wepay 2021-05-06 13:44:25 +10:00
David Bomba
3c670592b9 Add default include for mini_load 2021-05-06 13:29:59 +10:00
David Bomba
2805e1cc96 email_receipt flag 2021-05-06 13:22:55 +10:00
David Bomba
eaeb47090a Load designs for mini load 2021-05-06 08:42:18 +10:00
David Bomba
991fa7079e Fixes for password protection 2021-05-05 16:44:31 +10:00
David Bomba
d61e7f57a2 Fixes for wepay 2021-05-05 16:21:37 +10:00
David Bomba
b9fece424f Minor fixes for password protection cache 2021-05-05 15:56:54 +10:00
David Bomba
8c00bce71b We Pay signup 2021-05-05 14:29:58 +10:00
David Bomba
430e31c1ad Minor fixes for self updater 2021-05-05 08:28:55 +10:00
David Bomba
bd22dc3314 Fixes for Historical PDF generation 2021-05-04 19:56:15 +10:00
David Bomba
b2439bced8 Email Analytics 2021-05-04 13:46:45 +10:00
David Bomba
e8d6d29f17 Track bounced and spam mail 2021-05-04 12:49:32 +10:00
David Bomba
f7257e4335 Migration emails 2021-05-04 12:40:28 +10:00
David Bomba
5510993d13 Fixes for gateway fees 2021-05-03 21:51:00 +10:00
David Bomba
d68f96fb98 Minor fixes for migrations 2021-05-03 11:46:46 +10:00
David Bomba
e6e8b21c5e Fixes for deleting tokens from /logout route 2021-05-01 10:13:48 +10:00
David Bomba
2eae22221f Clean up update 2021-04-30 14:29:27 +10:00
David Bomba
dab7f5afba explicitly define the unwritable file 2021-04-30 14:22:36 +10:00
=
7d01858b3a Current_company=true 2021-04-29 21:36:34 +10:00
=
bdbcacb872 Add current_company filter on refresh route 2021-04-29 21:29:10 +10:00
=
460e0afb39 Add no-cache headers to prevent aggressive browser caching of assets 2021-04-29 21:07:05 +10:00
Benjamin Beganović
d4c51871ef - Update Braintree credit card to use amount_with_fee 
- Add amount_with_fee to payment hash
 2021-04-29 11:29:28 +02:00
David Bomba
003303a83b Output results on exec() 2021-04-29 13:15:39 +10:00
David Bomba
deb55dd6c8 Add in constrained queries 2021-04-29 11:31:04 +10:00
David Bomba
61828d412a Customize the login return request 2021-04-29 08:44:40 +10:00
Benjamin Beganović
9c97421a55 wip 2021-04-28 14:54:50 +02:00
David Bomba
207e5b4d4e Fixes for protected lists 2021-04-28 13:13:39 +10:00
David Bomba
f501a42e35 Fixes for domain validation 2021-04-28 13:12:51 +10:00
David Bomba
810ed113c7 Invoice / Quote / Credit created notification 2021-04-28 10:02:31 +10:00
David Bomba
ac3c1f349e Minor fixes for self update 2021-04-27 20:39:10 +10:00
David Bomba
b0f5ca8638 Logout Controller 2021-04-27 16:03:21 +10:00
David Bomba
1bcfa1b19d Add ability to logout all tokens from company 2021-04-27 09:34:35 +10:00
David Bomba
7a141f2631 cleanup 2021-04-26 15:47:54 +10:00
David Bomba
f2562dcec9 Add required include for ConnectAccountController 2021-04-25 19:00:11 +10:00
David Bomba
e7e298c917
Merge branch 'v5-develop' into db 2021-04-24 23:28:02 +10:00
David Bomba
74631e39e4 new clear cache route 2021-04-23 00:03:21 +10:00
David Bomba
20ea334106 Landing page for existing stripe connect acccounts 2021-04-22 23:51:18 +10:00
David Bomba
90d786211c Fixes for Stripe Connect 2021-04-22 23:40:36 +10:00
David Bomba
300cc9fb9e Fixes for Checkout.com 2021-04-22 23:32:34 +10:00
David Bomba
d6bd19e6c0 Fixes for stripe connect 2021-04-22 22:56:00 +10:00
David Bomba
bbaecb3c06 Fixes for routes file" 2021-04-22 21:53:21 +10:00
David Bomba
067c3cad62 Fixes for Stripe Connect 2021-04-22 21:22:55 +10:00
David Bomba
5d4bba2609 Remove dead wood 2021-04-22 20:42:12 +10:00
David Bomba
f62518f63b Stripe Connect 2021-04-22 20:38:22 +10:00
Benjamin Beganović
75da6df4fa wip 2021-04-22 11:55:19 +02:00
Lee Ween Jiann
062fe152f5 Updated SetupController.php 2021-04-22 11:12:48 +08:00
Benjamin Beganović
bdc564092e wip 2021-04-21 16:36:08 +02:00
David Bomba
af7939b002 Small fixes for one time tokens 2021-04-21 20:57:34 +10:00
David Bomba
d892e0b6ed Fixes for counter 2021-04-21 19:57:59 +10:00
David Bomba
033e221d2f Adjustments for recurring invoice cron 2021-04-21 13:54:10 +10:00
David Bomba
d879d1080b Fixes for stripe connecT 2021-04-21 08:38:50 +10:00
Benjamin Beganović
e58d5291e7
Merge branch 'stripe-connect' into v5-2004-stripe-connect 2021-04-20 23:42:34 +02:00
David Bomba
9388e75f77 Fixes for purge company data 2021-04-21 07:35:54 +10:00
Benjamin Beganović
eef9065f08 wip 2021-04-20 16:08:33 +02:00
David Bomba
b33df0746e Check white label license periodically 2021-04-20 22:45:35 +10:00
David Bomba
e6c083cf29 Stripe Connect 2021-04-20 21:30:52 +10:00
David Bomba
68ddc6e7b1 Tests for ClientGatewayToken routes 2021-04-20 16:03:14 +10:00
David Bomba
03b19e27f7 Add client gateway tokens 2021-04-20 14:26:16 +10:00
David Bomba
d40648ba27 Minor fixes 2021-04-20 07:47:50 +10:00
David Bomba
fadfdca2af fxies for tests 2021-04-19 19:59:11 +10:00
David Bomba
a1494a25d0 improve self updater 2021-04-19 10:54:16 +10:00
=
3cfabd88d7 Reset task statuses on delete/archive 2021-04-18 19:50:06 +10:00
David Bomba
b4afd1419e Update API definitions 2021-04-17 16:51:24 +10:00
David Bomba
af26285577 Log Task status 2021-04-17 08:57:07 +10:00
David Bomba
bc9ff3efae Log Task status 2021-04-17 08:51:24 +10:00
David Bomba
dd87bbd0e7 Log Task status 2021-04-17 08:40:27 +10:00
David Bomba
c329d1302f Return response 2021-04-17 08:35:36 +10:00
David Bomba
115637d4fa Sort tasks 2021-04-17 08:28:19 +10:00
David Bomba
7f1da78b92 small fixes for bulk actions for payments 2021-04-17 07:42:39 +10:00
David Bomba
7026dbd8f2 Add custom translations to email preview and sent emails 2021-04-16 16:22:42 +10:00
David Bomba
cba4a361ce Integrate credit payments into Subscriptions 2021-04-16 14:47:11 +10:00
David Bomba
0426b6c941 Add payment notification on manual payment creation 2021-04-16 07:58:34 +10:00
David Bomba
0b1569d6d9 refund subscriptions in cancellation window 2021-04-15 15:36:50 +10:00
=
d0cb09d094 Minor fixes for task controller 2021-04-14 19:55:43 +10:00
David Bomba
c2990a21d0 Fixes for tests 2021-04-14 16:48:32 +10:00
David Bomba
2237939491 Subscriptions 2021-04-14 12:40:16 +10:00
David Bomba
5c1eb7f7eb Update texts 2021-04-14 07:40:07 +10:00
David Bomba
a386a33a7e
Merge branch 'v5-develop' into v5-develop 2021-04-13 19:35:44 +10:00
David Bomba
f2342e640a Subscriptions 2021-04-13 19:34:59 +10:00
David Bomba
527d21bdc0 Subscription events 2021-04-13 13:09:47 +10:00
David Bomba
7e3a9205b9 Add event listeners for Subscriptions + fix user actioning the event() 2021-04-13 09:52:17 +10:00
David Bomba
bde5166827 Subscriptions 2021-04-12 21:56:08 +10:00
Benjamin Beganović
84e930e971
Merge pull request #5405 from beganovich/v5-1004-ach-message 
(v5) Send ACH notification e-mail after connecting bank account
 2021-04-12 11:51:55 +01:00
David Bomba
477aa691a9 Add custom exceptions 2021-04-12 14:36:51 +10:00
David Bomba
4ede6bd41e Add subscription delete routes 2021-04-11 13:52:37 +10:00
Benjamin Beganović
7e1cc64247 Send ACH notification e-mail after connecting bank account 2021-04-10 10:44:06 +02:00
David Bomba
62401555cd Working on pro rata refunds 2021-04-10 14:07:08 +10:00
David Bomba
fa9815ea48 Fixes for self-updater 2021-04-10 08:41:36 +10:00
David Bomba
5be620ccde Refactor self updater 2021-04-09 15:53:12 +10:00
David Bomba
b6d26fa7c9 Refactor self updater 2021-04-09 15:03:06 +10:00
David Bomba
c77faa746d refactor self updating 2021-04-09 11:22:11 +10:00
David Bomba
a6e12ee95b Working on new self updater 2021-04-09 10:33:54 +10:00
David Bomba
17a36fd14b minor fixes 2021-04-09 08:37:03 +10:00
David Bomba
5f7f18840f v5.1.42 2021-04-09 07:57:01 +10:00
Benjamin Beganović
ec1d4e05c1 - Rename: $target_subscription to $target and all references 
- Ability to pay for the upgrade
 2021-04-08 16:53:54 +02:00
David Bomba
084c3b78a6 Add update route 2021-04-08 20:01:00 +10:00
David Bomba
0225526756 Set password for new users 2021-04-08 14:35:02 +10:00
David Bomba
fbec084e9d
Merge pull request #5374 from turbo124/v5-develop 
Suppress optimize on shared hosting
 2021-04-08 10:33:31 +10:00
David Bomba
c2b4210241 Suppress optimize on shared hosting 2021-04-08 08:42:23 +10:00
Benjamin Beganović
969d9f03dc wip 2021-04-07 18:08:26 +02:00
David Bomba
161f20fae7 Fixes for paths to s3 type storage 2021-04-06 22:36:50 +10:00
David Bomba
f1f8201683 fixes for delivery note generation 2021-04-02 22:44:44 +11:00
David Bomba
f7cf6b521f
Merge pull request #5321 from turbo124/v5-develop 
fixes for subscriptions
 2021-04-02 10:19:37 +11:00
David Bomba
c3eb46d0b7 fixes for subscriptions 2021-04-02 09:09:01 +11:00
Benjamin Beganović
08b317f7b8 allow cancellation under specific conditions 2021-04-01 16:38:46 +02:00
David Bomba
404ee307fd Magic link maker 2021-03-31 11:07:54 +11:00
David Bomba
32fd16dfb7
Merge pull request #5284 from turbo124/v5-develop 
Subscriptions
 2021-03-30 20:37:28 +11:00
David Bomba
caf7ad5998 Minor fixes for self updater - more verbose messaging after self update 2021-03-30 18:01:20 +11:00
David Bomba
96c191daf0 Add system logs to first load 2021-03-30 09:32:33 +11:00
David Bomba
878f00b375 add additional query filter for recurring invoices 2021-03-30 09:30:41 +11:00
Benjamin Beganović
c4ff24132e wip 2021-03-29 14:35:27 +02:00
Benjamin Beganović
d37d727d2c - Fix typo in BaseController.php 
- Add labels on top of billing page (one-time, or/and subscription)
- Show products
- Pull the price from the service
 2021-03-29 12:58:03 +02:00
David Bomba
db7df69db7 Recurring services - trial phase' 2021-03-29 14:49:29 +11:00
David Bomba
d7bf927549 Set exchange rates on invoices 2021-03-29 13:14:55 +11:00
Benjamin Beganović
8e3508a2b1
Merge pull request #5253 from beganovich/v5-2503-billing-portal 
(v5) 25.03: Billing page
 2021-03-26 15:05:08 +01:00
David Bomba
fd24449f95 Fixes for deleting / restoring / removing users 2021-03-26 19:07:43 +11:00
Benjamin Beganović
ed4fff2385 - Bundle qty without ability to increment/decrement value ✅ 
- One time & subs ✅
- A table with all products included in subscription (qty, price, notes) ✅
- Two tables, one for subscriptions, one for one-time purchases ✅
- If no products, no table ✅
- Remove quantity from cached data that is being sent ✅
- Remove "billing_subscription_id" from data sent ✅
 2021-03-25 16:52:03 +01:00
David Bomba
abd3a89bc9
Subscriptions (#5248) 
* Fixes for converting quote to invoice

* Fixes for naming PDFs

* Refresh entity prior to sending

* Fixes for subscriptions

* Add in required use

* Fixes for notifications

* Fixes for notifications

* Add with trasheD

* Rename BillingSubscriptions to Subscriptions

* Refactoring subscriptions
 2021-03-25 21:55:59 +11:00
David Bomba
cb7f27462b
Client subscriptions + bug fixes (#5238) 
* Fixes for converting quote to invoice

* Fixes for naming PDFs

* Refresh entity prior to sending

* Fixes for subscriptions

* Add in required use

* Fixes for notifications

* Fixes for notifications
 2021-03-24 20:14:30 +11:00
Benjamin Beganović
77fdb25304
Merge branch 'v5-develop' into v5-2203-billing-portal 2021-03-23 16:23:56 +01:00
=
f74368e869 Set first user to gmail after first authorization 2021-03-23 17:19:06 +11:00
David Bomba
3ebe533fc8 include Account clas 2021-03-23 07:09:42 +11:00
Benjamin Beganović
e78fb7e891 Update quering the language/locale using Cache instead of DB 2021-03-22 14:09:29 +01:00
David Bomba
5700da5323 Fixes for password protection 2021-03-22 22:18:57 +11:00
David Bomba
5d28271df9 Fixes for default timeouts 2021-03-22 22:12:12 +11:00
David Bomba
793247e0f7 Fixes for default timeouts 2021-03-22 21:55:09 +11:00
Benjamin Beganović
187be058f7
Merge branch 'v5-develop' into v5-1803-billing 2021-03-22 09:38:34 +01:00
David Bomba
0c5b551ce1 Connected Gmail Account 2021-03-22 10:48:00 +11:00
David Bomba
c97dea08d2 Connected Gmail Account 2021-03-22 09:52:39 +11:00
David Bomba
24c8325fb1 Connected Gmail Account 2021-03-22 09:02:22 +11:00
David Bomba
32b8575ce1 Connected Gmail Account 2021-03-22 08:06:26 +11:00
=
4285b5f6fc Minor fixes for oauth login 2021-03-21 21:38:57 +11:00
=
42ae8d53dd Working on client subscriptions 2021-03-21 20:45:30 +11:00
=
e2314359b9 Pass back the correct entity! 2021-03-20 11:54:47 +11:00
=
5288893220 Small fixes for 2FA 2021-03-20 11:46:42 +11:00
=
b158fb430f Small fixes for 2FA 2021-03-20 11:41:41 +11:00
Benjamin Beganović
3bcb65efc2 Set locale from query parameter 2021-03-18 15:41:26 +01:00
David Bomba
10f7b1a309 Fixes for 2fa 2021-03-18 22:46:58 +11:00
David Bomba
ac6feb706e Small fix for new PDF generator 2021-03-18 20:57:55 +11:00
David Bomba
7fbe4ceb5d
Merge pull request #5162 from turbo124/v5-develop 
Remove illegal characters from pdf file names
 2021-03-18 08:19:56 +11:00
Benjamin Beganović
127c6cb3cd wip 2021-03-17 16:12:25 +01:00
David Bomba
f52fb31ced Remove illegal characters from pdf file names 2021-03-17 22:29:20 +11:00
Benjamin Beganović
eb2cfde303 Merge remote-tracking branch 'upstream/v5-develop' into v5-1103-billing-landing-page 2021-03-17 07:34:23 +01:00
David Bomba
b762ea37d2 Throw 400's on incorrect 2FA data 2021-03-17 00:40:58 +11:00
David Bomba
0422c95e13 Cache password protection on login 2021-03-16 23:10:15 +11:00
David Bomba
ae62bf63c6 Fixes for 2FA 2021-03-16 22:47:14 +11:00
David Bomba
aef2270f05 Fixes for connected account 2021-03-16 22:44:10 +11:00
David Bomba
816ea281ff Fixes for connected account 2021-03-16 22:33:48 +11:00
David Bomba
591bfb9e9d Fixes for connected account 2021-03-16 22:30:33 +11:00
David Bomba
6bb71dc33b Fixes for connected account 2021-03-16 22:29:16 +11:00
David Bomba
05b008ca60 Fixes for 2FA 2021-03-16 09:33:55 +11:00
Benjamin Beganović
4350816804 wip 2021-03-15 17:33:27 +01:00
Benjamin Beganović
dade7bad0a Merge upstream/v5-develop 2021-03-15 13:08:43 +01:00
David Bomba
8f37a06e24 Fixes for 2FA 2021-03-15 08:40:07 +11:00
David Bomba
e176be086a Fixes for 2FA 2021-03-15 07:18:53 +11:00
David Bomba
255643d7dc Fixes for connected account 2021-03-14 21:32:09 +11:00
Benjamin Beganović
0b9c6e782d merge upstream/v5-develop 2021-03-13 14:55:13 +01:00
=
0bf8b9c9e5 Fixes for setup flow 2021-03-13 17:45:41 +11:00
Benjamin Beganović
908678cdc4 wip 2021-03-12 15:00:33 +01:00
David Bomba
aef31d8193
Merge pull request #5104 from joshuadwire/v5-develop 
Support pre-configured installs where setup doesn't allow changing DB config
 2021-03-12 21:00:58 +11:00
Joshua Dwire
a844afd128 Support pre-configured installs where setup doesn't allow changing DB info 2021-03-11 19:48:41 -05:00
David Bomba
57ef1c9b78 Return user for /connected_account 2021-03-12 07:07:52 +11:00
Benjamin Beganović
d546c4711c wip 2021-03-11 17:20:30 +01:00
Benjamin Beganović
3696b06566 Scaffold landing page for billing, controller & endpoint 2021-03-11 14:05:23 +01:00
David Bomba
b9c9874533 Improve PDF creation performance 2021-03-10 21:00:18 +11:00
David Bomba
ed8c880750 add reconfirm route 2021-03-10 20:15:24 +11:00
David Bomba
9888d7acb9 Improve delete pdf performance 2021-03-10 13:28:35 +11:00
David Bomba
00eefcd781 Client Subscription scaffolding 2021-03-10 11:08:58 +11:00
David Bomba
e0b169b64b Fixes for billing subscriptions 2021-03-10 09:56:59 +11:00
David Bomba
b91fcf1b34
Merge branch 'v5-develop' into billing_subscriptions 2021-03-10 09:27:28 +11:00
David Bomba
90b3b25849 Fixes for tests - changed listResponse to itemResponse 2021-03-10 09:23:13 +11:00
David Bomba
9290873b8b Fixes for qr code" 2021-03-09 21:53:25 +11:00
David Bomba
cd48ae78f9 Minor fixes 2021-03-09 21:30:34 +11:00
David Bomba
0a3b5e0665 minor fixes 2021-03-09 17:06:03 +11:00
David Bomba
67cedb8348 minor fixes 2021-03-09 17:03:22 +11:00
David Bomba
4baa89382b Minor fix for connected account 2021-03-09 09:55:31 +11:00
David Bomba
68f0e99f26 Fixes for connected account 2021-03-09 09:53:04 +11:00
David Bomba
053c1ca5fa billing_subscriptions cleanup 2021-03-09 08:29:59 +11:00
David Bomba
4e9b92c2da Minor fix for 2fa method name 2021-03-09 07:46:30 +11:00
Benjamin Beganović
780ab6885b Billing subscriptions: Controller 2021-03-08 15:19:04 +01:00
David Bomba
e39ce7491b Feature permissions for hosted 2021-03-08 08:32:38 +11:00
David Bomba
8d6f6d9eb5 Fixes for 2FA 2021-03-08 07:49:33 +11:00
=
f4d1917f32 Hosted feature implementation 2021-03-07 21:14:53 +11:00
=
616dea2c9d Add webcron support 2021-03-07 17:45:48 +11:00
=
6360f62ef3 Integrate phantom js secret default value into config 2021-03-07 17:27:44 +11:00
David Bomba
1780db52bd Invite user route 2021-03-04 09:39:24 +11:00
David Bomba
bfbde2ba51 Fixes 2021-03-03 21:04:10 +11:00
=
c23b9b147d Fixes for attaching a user to different companies 2021-03-03 18:22:14 +11:00
=
7a2cea1d9c One Time Token 2021-03-02 19:54:23 +11:00
=
aa290172ae One Time Token Requests 2021-03-02 19:03:01 +11:00
=
18fa537791 Add one time token functionality 2021-03-02 18:52:25 +11:00
David Bomba
92f729c10d Catch if an OAuth user doesn't exist and attempts to login 2021-02-28 19:54:14 +11:00
David Bomba
c063aee812 enums for email delivery 2021-02-26 08:06:43 +11:00
David Bomba
f7e4bca5a5 Update task status_order on update() 2021-02-24 13:12:23 +11:00
David Bomba
90b33ef063 clean up 2021-02-24 11:48:32 +11:00
David Bomba
ab54f9f75c Custom reply to and from name 2021-02-24 10:39:37 +11:00
David Bomba
d1044a861e Bug fix for TwoFactorController 2021-02-24 10:00:51 +11:00
David Bomba
f54c482010 Postmark webhooks 2021-02-24 09:56:23 +11:00
David Bomba
47a2ff7df3 Fixes for tests 2021-02-23 09:47:54 +11:00
David Bomba
1b3a9e6398 Fixes for updating products 2021-02-23 09:08:43 +11:00
David Bomba
67d0f525af Postmark webhooks 2021-02-22 20:46:01 +11:00
David Bomba
c72fcfed64 Mail listeners to harvest message ids 2021-02-22 11:18:52 +11:00
David Bomba
53f79440c0 Connected accounts 2021-02-22 08:27:00 +11:00
David Bomba
9a46a886a1 fixes for surcharge tax calculations and also implemented Zero % tax rates 2021-02-21 20:36:34 +11:00
David Bomba
1b19b3d0a9
Merge pull request #4950 from turbo124/v5-develop 
Update dependencies
 2021-02-20 23:13:53 +11:00
=
087129788b Working on 2FA 2021-02-20 11:45:20 +11:00
=
4b1030f881 Add former email address for rollbacks 2021-02-20 08:42:29 +11:00
Benjamin Beganović
8ecc33087a
Merge pull request #4940 from beganovich/v5-1902-streamline-client-portal 
(v5) Streamline client portal (centralised pay now button)
 2021-02-19 16:53:21 +01:00
David Bomba
2735efedd2 Remove BaseMailerJob 2021-02-19 07:57:10 +11:00
Benjamin Beganović
3cb6d07c20 Change default full-screen view for invoices & quotes: 
- New $url property for file_path() for invoices & quotes
- "Full screen" mode now returns raw file
- Show default browser viewer for desktop devices
 2021-02-18 13:18:41 +01:00
David Bomba
8346875f88 Fixes for mails 2021-02-18 21:33:54 +11:00
David Bomba
704477f803 Imports 2021-02-18 14:37:17 +11:00
David Bomba
06bc49b0d6 Refactoring emails 2021-02-18 10:30:31 +11:00
Benjamin Beganović
10733418c6 Allow default company registration without company key in the URL 2021-02-17 12:13:27 +01:00
Benjamin Beganović
6872057207
Merge pull request #4912 from beganovich/v5-1502-client-portal-documents 
(v5) Client portal: "Documents" improvements & bug fixes
 2021-02-17 11:26:08 +01:00
Joshua Dwire
10462cdeb4 Merge remote-tracking branch 'origin/v5-develop' into v5-develop 
# Conflicts:
#	resources/views/email/import/completed.blade.php
 2021-02-16 18:20:27 -05:00
Joshua Dwire
68c2246e64 Remove dispatchNow used for testing 2021-02-16 18:17:41 -05:00
David Bomba
4612379811 Fixes for file upload on dedicated routes 2021-02-16 20:02:33 +11:00
David Bomba
6edaf5d557 Entity upload routes + reorder api.php routes file 2021-02-16 08:14:30 +11:00
David Bomba
e546764e29 Upload documents route 2021-02-16 07:58:19 +11:00
Benjamin Beganović
aacc3b6602 wip 2021-02-15 15:52:13 +01:00
David Bomba
292c7b8068 Invoice upload document route 2021-02-15 22:34:05 +11:00