Commit Graph

1254 Commits

Author SHA1 Message Date
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