Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-16 08:02:40 +01:00
Code Issues Releases Activity
8,267 Commits 7 Branches 925 Tags 2 GiB
5357731a46
Commit Graph

2107 Commits

Author SHA1 Message Date
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
019d6eb009 Fixes for company requests 2021-05-20 17:09:29 +10:00
David Bomba
c43d122e91 Fixes for importing Ninja clients/contacts 2021-05-20 14:13:54 +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ć
1eaecdd8c6
Merge pull request #5700 from beganovich/v5-1405-client-portal-settings 
(v5) Update client settings to match the one's at the admin panel
 2021-05-18 12:05:59 +02: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
Benjamin Beganović
708073a83e
Merge branch 'v5-develop' into v5-1405-client-portal-settings 2021-05-18 10:57: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
0506b08ee0 Email invoice paid receipts 2021-05-17 08:09:20 +10:00
David Bomba
f9347fc652 fixes for factories 2021-05-16 19:44:44 +10:00
David Bomba
499d9f6b86 Fixes for client portal constraint 2021-05-15 17:00:17 +10:00
David Bomba
f9fae690a0 Tests for import 2021-05-15 16:54:27 +10:00
David Bomba
e59f00d390 Fixes for domains 2021-05-15 14:38:32 +10:00
David Bomba
364f7addb6 Fixes for subdomain resolution for MultiDB 2021-05-15 14:00:29 +10:00
David Bomba
d7d76ae6ea MultiDB domain resolution for client portals 2021-05-15 13:31:41 +10:00
David Bomba
c7dfa8547f
Merge pull request #5706 from turbo124/v5-develop 
Don't store PDFs
 2021-05-15 12:19:59 +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
Benjamin Beganović
a48556a557 Improve CheckClientExistence.php middleware 2021-05-14 12:33:12 +02:00
David Bomba
de8fb374ab Fixes for S3 storage and delivery notes 2021-05-14 19:43:06 +10:00
Benjamin Beganović
567fcd8e30 Update client settings to match the one's at the admin panel 2021-05-14 10:18:26 +02: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
c05cb2868a Fixes for middleware priority 2021-05-14 08:29:52 +10:00
David Bomba
f5435e0f8e Fixes for middleware priority 2021-05-14 08:03:57 +10:00
David Bomba
6e967035d8 Reorder middleware to allow route model binding to be delayed 2021-05-13 23:01:23 +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
899784cf45 Do not show deleted invoices 2021-05-11 22:03:44 +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
f19af6290a fixes for event listeners 2021-05-11 15:17:45 +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
3fca12f970
Merge pull request #5661 from turbo124/v5-develop 
Disable client portal
 2021-05-11 14:37:22 +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ć
3fb202be2c
Merge pull request #5656 from beganovich/v5-1005-stripe-hiding-cvv 
(v5) Prefill the postal code with Stripe Elements
 2021-05-10 14:54:21 +02:00
Benjamin Beganović
d28bc96b99 Block viewing deleted credit in the client portal 2021-05-10 14:46:22 +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
4979ed94de Minor fixes 2021-05-10 21:05:44 +10:00
Benjamin Beganović
3764389e04 Pass 'client_postal_code' when emitting 'passed-required-field-check' 2021-05-10 13:01:40 +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
1740f11715 We Pay 2021-05-08 16:46:14 +10:00
David Bomba
51effc3dfe Fixes for query logging 2021-05-08 07:43:53 +10:00
=
31db5b44c1 WePay 2021-05-07 18:03:37 +10:00
David Bomba
bdda63a214 We Pay 2021-05-07 17:07:49 +10:00
David Bomba
3c9b096f01 WePay 2021-05-07 15:39:45 +10:00
David Bomba
ae1af32b59 Improve quality for url 2021-05-07 08:31:00 +10:00
David Bomba
f3a56c8174 Add activities to entities 2021-05-07 07:41:37 +10:00
David Bomba
85c05f7c30 Fixes for VarEvents 2021-05-07 07:12:07 +10:00
David Bomba
1a947d720d we pay 2021-05-06 19:39:24 +10:00
David Bomba
2b8d7c26da Fixes for checkout gateway 2021-05-06 15:38:39 +10:00
David Bomba
eff664a586 WePayg 2021-05-06 14:39:18 +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
=
d3f14887e1 WePay 2021-05-05 20:50:36 +10:00
David Bomba
991fa7079e Fixes for password protection 2021-05-05 16:44:31 +10:00
David Bomba
a7abc2cd1b Fixes for password protection 2021-05-05 16:30:12 +10:00
David Bomba
d61e7f57a2 Fixes for wepay 2021-05-05 16:21:37 +10:00
David Bomba
23f7a74e2c Fixes for password protection 2021-05-05 16:11:40 +10:00
David Bomba
b9fece424f Minor fixes for password protection cache 2021-05-05 15:56:54 +10:00
David Bomba
ab3e635447 Fixes for user updating their own record 2021-05-05 15:33:52 +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
=
e53d5dcb13 fixes for logging 2021-05-02 21:40:15 +10:00
=
a76d584ae4 Clean up company request 2021-05-02 20:15:11 +10:00
=
01cb9a091e Fixes for namespaces 2021-05-02 19:14:42 +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
592aba6bb0 analytics 2021-04-29 13:43:40 +10:00
David Bomba
003303a83b Output results on exec() 2021-04-29 13:15:39 +10:00
David Bomba
342b383115 Minor fixes for imports 2021-04-29 12:12:44 +10:00
David Bomba
deb55dd6c8 Add in constrained queries 2021-04-29 11:31:04 +10:00
David Bomba
f26948b76f Log query analytics 2021-04-29 09:19:00 +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
4c2df3e1ff Fixes for company sub domain 2021-04-28 14:19:32 +10:00
David Bomba
ee94ed6ac9 Fixes for company validation rules 2021-04-28 13:21:27 +10: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
73bcaae3f6 Allow invoice balances to change - but do no allow them to go negative 2021-04-28 11:18:27 +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
1f87ca6ca2 Delete migration directory after Import 2021-04-25 21:04:48 +10:00
David Bomba
a09de38f35 Default mailer middleware 2021-04-25 20:22:24 +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
06f08adaf2
Merge pull request #5475 from turbo124/v5-develop 
v5.1.48
 2021-04-20 07:28:40 +10:00
Benjamin Beganović
de5b6473bb wip 2021-04-19 16:57:25 +02: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
797d0597aa SortRequest 2021-04-17 08:32:34 +10:00
David Bomba
5df313b9fd SortRequest 2021-04-17 08:31:24 +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
cac8056832 Refund subscriptions 2021-04-15 15:46:50 +10:00
David Bomba
0b1569d6d9 refund subscriptions in cancellation window 2021-04-15 15:36:50 +10:00
David Bomba
7c8bf53951 updgrade and downgrade 2021-04-15 13:40:03 +10:00
David Bomba
bb6a1c6b27 Working on downgrading subscriptions 2021-04-15 12:28:31 +10:00
David Bomba
218aa6de73 Checks for partial/deposit greater than amount/balance 2021-04-15 08:09:36 +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
aabe5683e1 Refactoring subscriptions 2021-04-14 14:41:04 +10:00
David Bomba
986e7fee86 Add validation rules for recurring productS 2021-04-14 12:51:22 +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ć
9a0417c1ba
Merge pull request #5412 from beganovich/v5-1004-billing-portal 
(v5) Billing portal
 2021-04-12 11:53:23 +01:00
Benjamin Beganović
b860dde7c6
Merge pull request #5411 from beganovich/v5-1004-show-error-from-api-billing 
(v5) Billing: Show message from eligible service
 2021-04-12 11:53:01 +01:00
Benjamin Beganović
94a7515244
Merge pull request #5408 from beganovich/v5-1004-desc-sort-invoices 
(v5) Client portal: Sort invoices in descending order
 2021-04-12 11:52:39 +01:00
Benjamin Beganović
24d6705b7f
Merge pull request #5406 from beganovich/v5-1004-add-with-trashed-for-invoices 
(v5) Add withTrashed() for invoices table
 2021-04-12 11:52:08 +01: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ć
8a93cda5ff wip 2021-04-10 14:01:09 +02:00
Benjamin Beganović
cb9bfe02c2 Show message from eligible service 2021-04-10 13:56:29 +02:00
Benjamin Beganović
bb7f9c64d5 Sort invoices in descending order 2021-04-10 12:48:51 +02:00
Benjamin Beganović
b345e12678 Add withTrashed for invoices table 2021-04-10 10:56:48 +02: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ć
c0f5780172 wip 2021-04-08 17:11:14 +02: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
8e327d3a75 v5.1.41 2021-04-08 21:08:29 +10:00
David Bomba
47113da4fa Fixes for invoice properties 2021-04-08 20:50:53 +10: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
Benjamin Beganović
71d28e691b wip 2021-04-07 14:23:14 +02:00
Benjamin Beganović
43e6ba2ec6 Check if payment is eligible to process 2021-04-07 13:26:50 +02:00
David Bomba
161f20fae7 Fixes for paths to s3 type storage 2021-04-06 22:36:50 +10:00
David Bomba
9cb8e865fc Fixes for assigned_user_id and group_id not sticking to subscriptions 2021-04-06 08:21:55 +10:00
David Bomba
b1e6325ef8 Fixes for tests 2021-04-06 08:19:27 +10:00
David Bomba
d293c28a55
Merge pull request #5339 from turbo124/v5-develop 
Subscriptions
 2021-04-05 22:59:27 +10:00
Benjamin Beganović
b230680e8f Allow prefilling the client/contact fields over query parameters 2021-04-05 10:43:25 +02: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ć
83844652e5 show og price when discount is applied 2021-04-01 17:02:11 +02:00
Benjamin Beganović
08b317f7b8 allow cancellation under specific conditions 2021-04-01 16:38:46 +02:00
Benjamin Beganović
b25f79f4e1 carry coupon over magic link 2021-04-01 16:20:31 +02:00
Benjamin Beganović
0b2613146b Show spinner after clicking payment method 2021-04-01 16:09:30 +02:00
Benjamin Beganović
30d3c8a92e pull the initial price from the model itself 2021-04-01 16:04:22 +02:00
David Bomba
a2e0fd0849 Unique subscription nameS 2021-04-01 20:56:50 +11:00
David Bomba
1e83b729d5 Minor fixes for subscriptions 2021-04-01 20:33:50 +11:00
Benjamin Beganović
c300ffc4d9 passwordless login 2021-03-31 18:10:44 +02:00
David Bomba
404ee307fd Magic link maker 2021-03-31 11:07:54 +11:00
David Bomba
ffdd81ab6b
Merge pull request #5296 from turbo124/v5-develop 
Fixes for subscriptions
 2021-03-31 10:08:29 +11:00
David Bomba
f1131c07fe Fixes 2021-03-31 10:03:18 +11:00
David Bomba
8e2c07b0df Fixes 2021-03-31 09:58:50 +11:00
Benjamin Beganović
d5109af225 wip 2021-03-30 14:07:31 +02:00
David Bomba
f5c6847a36 Minor fixes for subscription types 2021-03-30 20:41:58 +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ć
05cbd30bef wip 2021-03-29 15:50:36 +02: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
f1ece9ab6b Subscriptions 2021-03-29 21:43:42 +11:00
Benjamin Beganović
97d92cd127 wip 2021-03-29 12:25:29 +02:00
David Bomba
de99ed2ba4 Fixes for quote numbering 2021-03-29 21:00:22 +11: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
David Bomba
2e139a633b Validation rules for subscriptions 2021-03-28 08:45:46 +11:00
David Bomba
8dedfa4cb5
Merge pull request #5266 from turbo124/v5-develop 
Subscriptions
 2021-03-27 20:26:53 +11:00
David Bomba
f067290462 Update rules for updating an entity 2021-03-27 06:43:52 +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ć
49c4707e38
Update BillingPortalPurchase.php 2021-03-23 16:27:30 +01:00
Benjamin Beganović
77fdb25304
Merge branch 'v5-develop' into v5-2203-billing-portal 2021-03-23 16:23:56 +01:00
=
3d375e4148 Workig on client subscriptions 2021-03-23 23:17:28 +11:00
=
f74368e869 Set first user to gmail after first authorization 2021-03-23 17:19:06 +11:00
David Bomba
417ed6c13d Fixes for recurring 2021-03-23 08:24:05 +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
Benjamin Beganović
535d9ae471 Update data passed to startTrial 2021-03-22 14:03:32 +01:00
Benjamin Beganović
d5ad6088f6 Create data mapper for cached data / billing context 2021-03-22 13:56:26 +01:00
Benjamin Beganović
6e714747bd Update price per quantity 2021-03-22 13:53:34 +01:00
Benjamin Beganović
8bc4896daa Hide/show coupon code field if promo code configured in billing tableclear 2021-03-22 13:34:59 +01:00
Benjamin Beganović
8839bfabd3 Hide quantity if max_seats_limit = 1 2021-03-22 13:32: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
22f81a036f
Merge pull request #5220 from turbo124/v5-develop 
Fixes for default timeouts
 2021-03-22 21:55:25 +11:00
David Bomba
793247e0f7 Fixes for default timeouts 2021-03-22 21:55:09 +11:00
Benjamin Beganović
44bf716fc9
Merge branch 'v5-develop' into v5-2003-fix-billing-subscription-integration 2021-03-22 11:12:14 +01: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
David Bomba
f80179814d fix conflicts 2021-03-22 07:22:20 +11:00
David Bomba
1b5d6d44f2 Set default time out 2021-03-22 07:21:51 +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
Benjamin Beganović
fdd1601120 wip 2021-03-20 23:15:26 +01: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
=
7173ba2931 catch project exceptions 2021-03-20 11:16:29 +11:00
David Bomba
9e0328757a Tests for number validation across entities 2021-03-20 10:06:44 +11:00
David Bomba
451e4e1bbe Ensure better unique rules 2021-03-20 09:51:52 +11:00
David Bomba
b841fe7000 Working on unique rules for numbers 2021-03-20 09:29:20 +11:00
David Bomba
34b9877868 Minor fixes 2021-03-19 23:37:57 +11:00
Benjamin Beganović
d98165a8dd Set client language_id if locale is present 2021-03-18 16:01:13 +01:00
Benjamin Beganović
3bcb65efc2 Set locale from query parameter 2021-03-18 15:41:26 +01:00
Benjamin Beganović
69eecbf281 Qty 2021-03-18 15:22:22 +01:00
Benjamin Beganović
415ea81eec Support for "Start Free Trial" 2021-03-18 14:14:10 +01:00
Benjamin Beganović
85c09ecf11 Show the message about coupon code/discount under the input field 2021-03-18 13:51:10 +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
9ca9736de6 resolved conflicts' 2021-03-18 12:00:01 +11:00
David Bomba
ee15ea9434 v5.1.27 2021-03-18 11:58:10 +11:00
David Bomba
086189a1ea Hosted PDFs by invoice ninja 2021-03-18 11:53:08 +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ć
81f5808bf6 - Use user from $billing_subscription to create client 
- Disable generating the cache for temporary state
- Generate the blank invoice based on the product
 2021-03-17 12:06:58 +01: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
Benjamin Beganović
851a31b3c0 Proof of concept for billing page 2021-03-16 14:35:57 +01: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
David Bomba
1e72f20c3d Fix for invite resend permission 2021-03-16 07:35:19 +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
Benjamin Beganović
b9bea02b68 wip 2021-03-13 14:51:01 +01:00
=
0bf8b9c9e5 Fixes for setup flow 2021-03-13 17:45:41 +11:00
David Bomba
d01b97104a
Merge pull request #5111 from joshuadwire/v5-develop 
Fix request validation for preconfigured installs
 2021-03-13 14:58:23 +11:00
Joshua Dwire
941132133c Fix request validation for preconfigured installs 2021-03-12 18:46:56 -05: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