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ć
c2406563ef
Merge pull request #5276 from beganovich/v5-2903-fix-contact-initialization
...
(v5) Fix contact initalization for billing page
2021-03-29 12:26:01 +02:00
Benjamin Beganović
97d92cd127
wip
2021-03-29 12:25:29 +02:00
David Bomba
7c417f6ced
Merge pull request #5275 from turbo124/v5-develop
...
Subscriptions
2021-03-29 21:19:48 +11:00
David Bomba
3183186d4d
Working on subscriptions
2021-03-29 21:19:30 +11:00
David Bomba
de99ed2ba4
Fixes for quote numbering
2021-03-29 21:00:22 +11:00
David Bomba
0a655c6b6b
Merge pull request #5273 from turbo124/v5-develop
...
Subscriptions
2021-03-29 19:43:39 +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
=
646130a104
Fixes for tests
2021-03-28 13:26:46 +11:00
=
40dc8efd46
limit logging conditionally
2021-03-28 13:19:44 +11:00
=
6e813e233e
Fix missing USE in CreditWasViewed event
2021-03-28 13:09:47 +11:00
David Bomba
6489d73ad6
Fixes for subscriptions
2021-03-28 09:15:12 +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
=
9fd40f55c6
Exchange rates
2021-03-27 14:51:34 +11:00
=
3479c127fd
Fixes for subscription refactor
2021-03-27 14:22:19 +11:00
=
83c636aa55
update todos
2021-03-27 09:05:37 +11:00
=
46a525f04d
Create invoice for subscription
2021-03-27 08:55:04 +11:00
=
95749b4822
Subscriptions - invoice generation logic
2021-03-27 08:39:08 +11:00
David Bomba
2c83abe432
Subscriptions
2021-03-27 07:28:56 +11:00
David Bomba
f067290462
Update rules for updating an entity
2021-03-27 06:43:52 +11:00
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
