1
0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-18 00:53:10 +01:00
Commit Graph

5815 Commits

Author SHA1 Message Date
David Bomba
fc3889671e Fixes for HTMLEngine 2021-03-27 06:30:46 +11:00
David Bomba
c47318df1e Fixes for company presenter 2021-03-27 06:21:47 +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
hillelcoren
c1b673e6f9 New admin portal build 2021-03-26 13:23:33 +00:00
David Bomba
3c41069d28
Merge pull request #5260 from lwj5/patch-2
Prevent chrome download chrome in Docker
2021-03-26 21:10:48 +11:00
Ween Jiann
4e965dd6b9
Prevent chrome download chrome in Docker 2021-03-26 18:07:38 +08:00
David Bomba
3d5f494723
Merge pull request #5259 from turbo124/v5-develop
Transform id's correctly
2021-03-26 20:39:09 +11:00
David Bomba
750da31021 Transform id's correctly 2021-03-26 20:38:51 +11:00
David Bomba
9a4371a2eb
Merge pull request #5258 from turbo124/v5-develop
Subscriptions
2021-03-26 20:20:55 +11:00
David Bomba
b3863581ae Stubs for products / recurring products and subscription price 2021-03-26 20:20:37 +11:00
David Bomba
b40751a2b9 Auto optimize after composer install 2021-03-26 19:34:39 +11:00
David Bomba
40340397e2
Merge pull request #5257 from turbo124/v5-develop
Merge pull request #5256 from turbo124/v5-stable
2021-03-26 19:29:28 +11:00
David Bomba
63c0363f19
Merge pull request #5256 from turbo124/v5-stable
v5.1.32
2021-03-26 19:27:38 +11:00
David Bomba
4f78b39edc
Merge pull request #5255 from turbo124/v5-develop
v5.1.32
2021-03-26 19:21:59 +11:00
David Bomba
99bfe1c0b4 v5.1.32 2021-03-26 19:21:32 +11:00
David Bomba
98e314b6c0 Fixes for calculating the correct gateway fee depending on the payment method 2021-03-26 19:18:25 +11:00
David Bomba
fd24449f95 Fixes for deleting / restoring / removing users 2021-03-26 19:07:43 +11:00
hillelcoren
fdc19892b4 New admin portal build 2021-03-26 07:13:01 +00:00
David Bomba
8eb8f6e098 Fixes for tests 2021-03-26 06:42:25 +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
67a444ad2b Do no download snap if binary exists 2021-03-25 23:07:38 +11:00
David Bomba
0173d0fe46
Merge pull request #5252 from turbo124/v5-develop
Fixes for subscriptions
2021-03-25 22:30:40 +11:00
David Bomba
52079aca69
Fixes for subscriptions (#5251)
* 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

* Add name to subscription

* Refactoring subscriptions
2021-03-25 22:29:04 +11:00
David Bomba
d7d4066e2d Merge branch 'v5-develop' of https://github.com/turbo124/invoiceninja into v5-develop 2021-03-25 22:28:35 +11:00
David Bomba
90a777397e
Fixes for subscriptions (#5250)
* 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

* Add name to subscription

* Refactoring subscriptions
2021-03-25 22:28:22 +11:00
David Bomba
951af497ed Refactoring subscriptions 2021-03-25 22:27:52 +11:00
David Bomba
02de6c1041 Merge branch 'v5-develop' of https://github.com/turbo124/invoiceninja into v5-develop 2021-03-25 22:08:04 +11:00
David Bomba
acbb8af053
Fixes for subscriptions (#5249)
* 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

* Add name to subscription
2021-03-25 22:01:36 +11:00
David Bomba
0e63c6db1c
Merge branch 'v5-develop' into v5-develop 2021-03-25 22:01:27 +11:00
David Bomba
b70eac484a Add name to subscription 2021-03-25 22:00:51 +11: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
31eac0a761 Refactoring subscriptions 2021-03-25 21:55:35 +11:00
David Bomba
103fa1b974 Rename BillingSubscriptions to Subscriptions 2021-03-25 19:48:54 +11:00
David Bomba
07eb89acfe Add with trasheD 2021-03-25 15:37:32 +11:00
hillelcoren
64a43fbb51 New admin portal build 2021-03-24 13:53:20 +00:00
David Bomba
2ab62a821e Merge branch 'v5-develop' of https://github.com/turbo124/invoiceninja into v5-develop 2021-03-24 20:14:49 +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
=
f1ced66226 Fixes for notifications 2021-03-24 14:26:51 +11:00
=
41de6a4062 Fixes for notifications 2021-03-24 14:20:51 +11:00
=
db4f8946e4 Add in required use 2021-03-24 12:12:37 +11:00
=
946ab58f13 Fixes for subscriptions 2021-03-24 10:43:21 +11:00
=
90540d6403 Refresh entity prior to sending 2021-03-24 09:47:05 +11:00
David Bomba
a6e529f658 Merge branch 'v5-develop' of https://github.com/turbo124/invoiceninja into v5-develop 2021-03-24 09:28:47 +11:00
David Bomba
89598d44ef Fixes for naming PDFs 2021-03-24 09:28:42 +11:00
=
fb9bb7e269 Fixes for converting quote to invoice 2021-03-24 09:28:12 +11:00
hillelcoren
442a93caab New admin portal build 2021-03-23 18:45:28 +00:00
Benjamin Beganović
49c4707e38
Update BillingPortalPurchase.php 2021-03-23 16:27:30 +01:00
Benjamin Beganović
7b89f1cd1e
Merge pull request #5225 from beganovich/v5-2203-billing-portal
(v5) 2203: Billing portal
2021-03-23 16:24:04 +01:00
Benjamin Beganović
77fdb25304
Merge branch 'v5-develop' into v5-2203-billing-portal 2021-03-23 16:23:56 +01:00
David Bomba
63655f7076
Merge pull request #5231 from turbo124/v5-develop
Client Subscriptions
2021-03-23 23:36:11 +11:00