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