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

5070 Commits

Author SHA1 Message Date
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
=
ae9e927039 Working on client subs 2021-03-23 23:35:48 +11: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
3ed8479411 Improve user migrations 2021-03-23 14:53:10 +11:00
David Bomba
3b72fa343f complete purchase - billing subscription 2021-03-23 14:26:21 +11:00
David Bomba
99bae98c65
Merge pull request #5229 from turbo124/v5-develop
v5.1.31
2021-03-23 09:59:28 +11:00
David Bomba
d57d159504
Merge pull request #5228 from turbo124/v5-stable
v5.1.31
2021-03-23 09:58:04 +11:00
David Bomba
48249f9245 Merge branch 'v5-develop' into v5-stable 2021-03-23 09:57:06 +11:00
David Bomba
fc3ae96b8e permissions 2021-03-23 09:57:04 +11:00
David Bomba
1379b8532d
Merge pull request #5227 from turbo124/v5-develop
v5.1.31
2021-03-23 08:55:03 +11:00
David Bomba
b7030ed014 v5.1.31 2021-03-23 08:54:40 +11:00
David Bomba
417ed6c13d Fixes for recurring 2021-03-23 08:24:05 +11:00
David Bomba
a1a54b3e18 Merge branch 'v5-develop' of https://github.com/turbo124/invoiceninja into v5-develop 2021-03-23 07:10:16 +11:00
David Bomba
db6a383b4b ttf 2021-03-23 07:10:14 +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ć
e04ed7c2bf Show per year per month as recurring_invoice frequency is defined using RecurringInvoice method helper 2021-03-22 14:01:36 +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ć
edbcb0690e Remove /unit from product quantity 2021-03-22 13:38:01 +01:00
Benjamin Beganović
b2c7226057 Hide coupon if trial is enabled 2021-03-22 13:37:26 +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
Benjamin Beganović
546619a498 Wrap quantity if per_seat_enabled 2021-03-22 13:24:58 +01:00
Benjamin Beganović
0c8dc5d822
Merge pull request #5224 from beganovich/v5-2203-wrap-stripe-in-border
(v5) Add borders on Stripe card input
2021-03-22 13:14:45 +01:00
hillelcoren
1eb15fb17e New admin portal build 2021-03-22 12:13:59 +00:00
Benjamin Beganović
5aa30ca582 Add border on stripe elements 2021-03-22 13:13:54 +01:00
hillelcoren
235e777312 New admin portal build 2021-03-22 11:58:11 +00:00
David Bomba
0d44249f41 Subdomain checks for hosted 2021-03-22 22:38:09 +11:00
David Bomba
dd46e6384a Clean line items for billing subscriptions 2021-03-22 22:31:53 +11:00
David Bomba
f058b16d06
Merge pull request #5223 from turbo124/v5-develop
Fixes for password protection
2021-03-22 22:19:16 +11:00
David Bomba
5700da5323 Fixes for password protection 2021-03-22 22:18:57 +11:00
David Bomba
a74e38902b
Merge pull request #5222 from turbo124/v5-develop
Fixes for default timeouts
2021-03-22 22:12:28 +11:00
David Bomba
5d28271df9 Fixes for default timeouts 2021-03-22 22:12:12 +11:00
Benjamin Beganović
9c6e14f33f
Merge pull request #5221 from beganovich/v5-2203-remove-nl2br-for-public-notes
(v5) Remove nl2br for public notes
2021-03-22 12:11:15 +01:00
Benjamin Beganović
296d3046e8 Add margins between items 2021-03-22 12:10:53 +01:00
Benjamin Beganović
500fa38a29 Remove nl2br for public notes 2021-03-22 12:08:59 +01: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ć
0b1834eabb
Merge pull request #5215 from beganovich/v5-2203-fix-translations
(v5) Fix translations for the design
2021-03-22 11:32:24 +01:00
Benjamin Beganović
ac547fa9a6 wip 2021-03-22 11:31:57 +01:00
Benjamin Beganović
d804dc6f17
Merge pull request #5196 from beganovich/v5-2003-fix-billing-subscription-integration
(v5) Construct the billing service with correct dependency
2021-03-22 11:15:19 +01:00
Benjamin Beganović
540f5b647a uncomment the initialization of billing service 2021-03-22 11:14:56 +01:00
Benjamin Beganović
44bf716fc9
Merge branch 'v5-develop' into v5-2003-fix-billing-subscription-integration 2021-03-22 11:12:14 +01:00