3382 Commits

Author	SHA1	Message	Date
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ć	97d92cd127	wip	2021-03-29 12:25:29 +02: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	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
David Bomba	750da31021	Transform id's correctly	2021-03-26 20:38:51 +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	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
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	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ć	49c4707e38	Update BillingPortalPurchase.php	2021-03-23 16:27:30 +01:00
Benjamin Beganović	77fdb25304	Merge branch 'v5-develop' into v5-2203-billing-portal	2021-03-23 16:23:56 +01: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	417ed6c13d	Fixes for recurring	2021-03-23 08:24:05 +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ć	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ć	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
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ć	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ć	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
Benjamin Beganović	187be058f7	Merge branch 'v5-develop' into v5-1803-billing	2021-03-22 09:38:34 +01:00
David Bomba	cfdcf889ad	Small type check fix	2021-03-22 17:46:59 +11:00
David Bomba	56b0452d2e	Add oauth user token	2021-03-22 12:54:50 +11: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
David Bomba	f80179814d	fix conflicts	2021-03-22 07:22:20 +11:00
David Bomba	1b5d6d44f2	Set default time out	2021-03-22 07:21:51 +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
=	932185e6c2	Working on client subscriptions	2021-03-21 20:26:30 +11:00
David Bomba	c7d7916b04	Update defaults	2021-03-21 16:35:09 +11:00
David Bomba	8d490200b6	Merge branch 'v5-develop' of https://github.com/turbo124/invoiceninja into v5-develop	2021-03-21 13:51:45 +11:00
David Bomba	58aee4250e	Fixes for task policy	2021-03-21 13:51:28 +11:00
Benjamin Beganović	fdd1601120	wip	2021-03-20 23:15:26 +01:00
=	5b290b1770	Small fix for usernotifies	2021-03-21 08:57:11 +11:00
=	36ffeb9344	bug fixes	2021-03-21 08:53:33 +11:00
=	2eb7de95ad	Add invoie_id to client subs	2021-03-20 14:39:30 +11:00
David Bomba	6be79ad022	Billing Subs	2021-03-20 13:57:03 +11:00
David Bomba	ba91c96c40	update texts	2021-03-20 13:49:45 +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
=	7173ba2931	catch project exceptions	2021-03-20 11:16:29 +11:00
David Bomba	9e0328757a	Tests for number validation across entities	2021-03-20 10:06:44 +11:00
David Bomba	451e4e1bbe	Ensure better unique rules	2021-03-20 09:51:52 +11:00
David Bomba	b841fe7000	Working on unique rules for numbers	2021-03-20 09:29:20 +11:00
David Bomba	422fd4f88c	Merge pull request #5182 from turbo124/v5-develop ... Minor fixes	2021-03-19 23:40:05 +11:00
David Bomba	34b9877868	Minor fixes	2021-03-19 23:37:57 +11:00
Benjamin Beganović	d98165a8dd	Set client language_id if locale is present	2021-03-18 16:01:13 +01:00
Benjamin Beganović	3bcb65efc2	Set locale from query parameter	2021-03-18 15:41:26 +01:00
Benjamin Beganović	69eecbf281	Qty	2021-03-18 15:22:22 +01:00
Benjamin Beganović	415ea81eec	Support for "Start Free Trial"	2021-03-18 14:14:10 +01:00
Benjamin Beganović	85c09ecf11	Show the message about coupon code/discount under the input field	2021-03-18 13:51:10 +01:00
David Bomba	2a89a12b69	Merge pull request #5175 from turbo124/v5-develop ... Fixes for 2fa	2021-03-18 22:47:31 +11:00
David Bomba	10f7b1a309	Fixes for 2fa	2021-03-18 22:46:58 +11:00
Benjamin Beganović	c75e4e678f	Set min-width for designs when using repeating headers/footers	2021-03-18 12:12:44 +01:00
David Bomba	ea1156cc81	Merge pull request #5172 from turbo124/v5-develop ... Small fix for new PDF generator	2021-03-18 20:58:36 +11:00
David Bomba	ac6feb706e	Small fix for new PDF generator	2021-03-18 20:57:55 +11:00
Benjamin Beganović	d706d226e8	Disable automatic custom column processing on the PDF	2021-03-18 09:32:11 +01:00
David Bomba	9ca9736de6	resolved conflicts'	2021-03-18 12:00:01 +11:00
David Bomba	ee15ea9434	v5.1.27	2021-03-18 11:58:10 +11:00
David Bomba	086189a1ea	Hosted PDFs by invoice ninja	2021-03-18 11:53:08 +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ć	c320b6bfbb	Merge branch 'v5-develop' into v5-1103-billing-landing-page	2021-03-17 17:14:55 +01: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ć	81f5808bf6	- Use user from $billing_subscription to create client ... - Disable generating the cache for temporary state - Generate the blank invoice based on the product	2021-03-17 12:06:58 +01:00
David Bomba	dc4980a8b2	Update demo data	2021-03-17 21:26:02 +11:00
David Bomba	f00c1f95c0	Add new counter settings	2021-03-17 21:06:08 +11:00
David Bomba	c95e0c3d7e	Tuning company settings for missing properties	2021-03-17 20:28:44 +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	1012c8df4b	Working on billing subscriptions	2021-03-17 13:21:06 +11:00
David Bomba	86ea2f0709	Fixes for free plan invoice designs - default to clean	2021-03-17 12:04:54 +11:00
David Bomba	059cec705d	Small fix for user notifications	2021-03-17 11:13:29 +11:00
David Bomba	db03dccbaf	Limit reminders for free plans	2021-03-17 08:15:43 +11:00
David Bomba	5ef6afdc28	Limit attachment features on free plan	2021-03-17 08:08:23 +11:00
David Bomba	b762ea37d2	Throw 400's on incorrect 2FA data	2021-03-17 00:40:58 +11:00
Benjamin Beganović	851a31b3c0	Proof of concept for billing page	2021-03-16 14:35:57 +01: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
David Bomba	eb70c7c2ed	Merge pull request #5139 from turbo124/v5-develop ... Fix for invite resend	2021-03-16 07:35:47 +11:00
David Bomba	1e72f20c3d	Fix for invite resend permission	2021-03-16 07:35:19 +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
Benjamin Beganović	4918423124	use ->getData()	2021-03-15 11:14:09 +01:00
Benjamin Beganović	b07eedb755	PayPal fixes for loggin	2021-03-15 11:12:01 +01:00
David Bomba	6a2332526b	Biling Subscription Service	2021-03-15 08:42:05 +11: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
Benjamin Beganović	b9bea02b68	wip	2021-03-13 14:51:01 +01:00
=	e2bc086f75	Type check on custom fields	2021-03-13 19:36:00 +11:00
=	94b1e59535	Improvements in Setup workflow	2021-03-13 17:55:18 +11:00
=	0bf8b9c9e5	Fixes for setup flow	2021-03-13 17:45:41 +11:00
=	487cf555b9	Fix for displaying logo	2021-03-13 16:56:52 +11:00
David Bomba	f67652cf88	Merge pull request #5100 from beganovich/v5-1003-company-custom-fields ... (v5) Support for custom company fields on the PDF	2021-03-13 15:07:08 +11:00
David Bomba	d01b97104a	Merge pull request #5111 from joshuadwire/v5-develop ... Fix request validation for preconfigured installs	2021-03-13 14:58:23 +11:00
Joshua Dwire	941132133c	Fix request validation for preconfigured installs	2021-03-12 18:46:56 -05: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
David Bomba	4f626ca90d	Merge pull request #5105 from turbo124/v5-develop ... Improve PDF creation performance	2021-03-12 15:00:50 +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	ff2f43d8fc	Do no add value from custom_value to invoice total	2021-03-12 07:24:09 +11:00
David Bomba	57ef1c9b78	Return user for /connected_account	2021-03-12 07:07:52 +11:00