3521 Commits

Author	SHA1	Message	Date
David Bomba	8f91969c49	bug fixes for subscriptions	2021-04-08 12:43:31 +10:00
David Bomba	fbec084e9d	Merge pull request #5374 from turbo124/v5-develop ... Suppress optimize on shared hosting	2021-04-08 10:33:31 +10:00
David Bomba	3857b1dc3e	Test for recurring updates	2021-04-08 09:21:09 +10:00
David Bomba	c2b4210241	Suppress optimize on shared hosting	2021-04-08 08:42:23 +10:00
David Bomba	4c56d7328c	Add page layout option	2021-04-08 08:19:36 +10:00
Benjamin Beganović	969d9f03dc	wip	2021-04-07 18:08:26 +02:00
Benjamin Beganović	71d28e691b	wip	2021-04-07 14:23:14 +02:00
Benjamin Beganović	43e6ba2ec6	Check if payment is eligible to process	2021-04-07 13:26:50 +02:00
David Bomba	c1b6e2043e	Fixes for subscriptions	2021-04-07 21:05:09 +10:00
David Bomba	3a3ddc031c	Working on subscriptions	2021-04-07 18:06:50 +10:00
David Bomba	498d8e4efc	Subscription Crons	2021-04-07 13:35:16 +10:00
David Bomba	38a648866c	Account cleanup	2021-04-07 12:40:48 +10:00
David Bomba	73e7aadaad	Working on pro plan;	2021-04-07 08:56:36 +10:00
David Bomba	23206d7a67	Add licenses table	2021-04-07 00:00:24 +10:00
David Bomba	048405decc	check object prior to testing properties	2021-04-06 22:38:59 +10:00
David Bomba	161f20fae7	Fixes for paths to s3 type storage	2021-04-06 22:36:50 +10:00
David Bomba	69f6179e6a	5.1.36	2021-04-06 20:38:56 +10:00
David Bomba	db5e896e46	5.1.35	2021-04-06 19:07:21 +10:00
David Bomba	fcac89a92c	Subscription service	2021-04-06 17:55:18 +10:00
David Bomba	06c5cf0519	add response to system logger for subscription API calls	2021-04-06 17:14:30 +10:00
David Bomba	6b9001684e	Fixes for tests	2021-04-06 17:11:58 +10:00
David Bomba	fe7b3c79e7	Working on subscriptions	2021-04-06 16:07:35 +10:00
David Bomba	355d0ae7b5	Testing Permissions	2021-04-06 14:02:27 +10:00
David Bomba	6d1d950c4e	Ninja Feature Tests	2021-04-06 13:05:40 +10:00
David Bomba	fac1eebd2c	PHP 8.0 suppotr	2021-04-06 10:43:56 +10:00
David Bomba	378cf1c60c	Fixes for localizing emails	2021-04-06 08:35:27 +10:00
David Bomba	9cb8e865fc	Fixes for assigned_user_id and group_id not sticking to subscriptions	2021-04-06 08:21:55 +10:00
David Bomba	b1e6325ef8	Fixes for tests	2021-04-06 08:19:27 +10:00
David Bomba	40335c0d92	Add rest method and headers to webhooks	2021-04-06 07:41:51 +10:00
David Bomba	d9047b413a	Disable product price updating if currencies do not match	2021-04-06 07:36:20 +10:00
David Bomba	d293c28a55	Merge pull request #5339 from turbo124/v5-develop ... Subscriptions	2021-04-05 22:59:27 +10:00
David Bomba	660dca561b	subscriptions	2021-04-05 22:37:25 +10:00
Benjamin Beganović	2cd3ceed2e	Allow expenses to be part of products table	2021-04-05 14:21:49 +02:00
Benjamin Beganović	4738920475	Merge pull request #5333 from beganovich/v5-0504-fillables-fields-over-queries ... (v5) Billing portal: Allow prefilling the client/contact fields over query parameters	2021-04-05 13:24:45 +02:00
Benjamin Beganović	5ac1ae16ff	Fixes #5314 (https://github.com/invoiceninja/invoiceninja/issues/5314)	2021-04-05 13:22:21 +02:00
Benjamin Beganović	c1a92bfb52	Fixes #5312 (https://github.com/invoiceninja/invoiceninja/issues/5312)	2021-04-05 11:04:33 +02:00
Benjamin Beganović	b230680e8f	Allow prefilling the client/contact fields over query parameters	2021-04-05 10:43:25 +02:00
David Bomba	8d4fa8cb42	Working on subs	2021-04-05 12:42:49 +10:00
David Bomba	fcaabace7f	Subscriptions	2021-04-05 09:21:54 +10:00
David Bomba	51c7a16423	Subscriptions	2021-04-05 09:08:16 +10:00
David Bomba	c814a754c3	Subscriptions	2021-04-05 08:37:01 +10:00
=	bf71acfe2d	Fixes for tests	2021-04-04 22:47:59 +10:00
=	858c99e09d	Working on subscriptions	2021-04-04 22:14:33 +10:00
David Bomba	f1f8201683	fixes for delivery note generation	2021-04-02 22:44:44 +11:00
David Bomba	f7cf6b521f	Merge pull request #5321 from turbo124/v5-develop ... fixes for subscriptions	2021-04-02 10:19:37 +11:00
David Bomba	c3eb46d0b7	fixes for subscriptions	2021-04-02 09:09:01 +11:00
Benjamin Beganović	9ce4a787e9	Merge pull request #5318 from beganovich/v5-0104-billing-portal ... (v5) Billing portal: Show OG price when discount is applied	2021-04-01 17:03:43 +02:00
Benjamin Beganović	83844652e5	show og price when discount is applied	2021-04-01 17:02:11 +02:00
Benjamin Beganović	e67b5acbe9	Merge pull request #5313 from beganovich/v5-0104-tax-column-hiding-fix ... (v5) Alias the $task.rate to $task.cost for column support	2021-04-01 16:44:05 +02:00
Benjamin Beganović	08b317f7b8	allow cancellation under specific conditions	2021-04-01 16:38:46 +02:00
Benjamin Beganović	b25f79f4e1	carry coupon over magic link	2021-04-01 16:20:31 +02:00
Benjamin Beganović	6af6668ba6	remove price() from subscriptionservice	2021-04-01 16:10:26 +02:00
Benjamin Beganović	0b2613146b	Show spinner after clicking payment method	2021-04-01 16:09:30 +02:00
Benjamin Beganović	30d3c8a92e	pull the initial price from the model itself	2021-04-01 16:04:22 +02:00
Benjamin Beganović	ecbe6494c6	Alias the $task.rate to $task.cost for column support	2021-04-01 15:00:09 +02:00
David Bomba	a2e0fd0849	Unique subscription nameS	2021-04-01 20:56:50 +11:00
David Bomba	1e83b729d5	Minor fixes for subscriptions	2021-04-01 20:33:50 +11:00
David Bomba	3a770361aa	Set valid until when a quote is marked as sent	2021-04-01 19:07:32 +11:00
David Bomba	3b9ffb431f	Fixes for tests	2021-04-01 19:02:28 +11:00
David Bomba	61489ca7d3	fixes for service methods	2021-04-01 13:24:05 +11:00
David Bomba	be648230de	Working on subscriptions	2021-04-01 12:58:12 +11:00
David Bomba	9bf9bc35ad	Merge pull request #5305 from turbo124/v5-develop ... Payment mailer fixes	2021-04-01 08:29:12 +11:00
David Bomba	c78feb80e8	Fixes for payment mailer	2021-04-01 08:28:51 +11:00
David Bomba	c279cf013e	add per_seat_enabled to fillable	2021-04-01 07:04:53 +11:00
Benjamin Beganović	c300ffc4d9	passwordless login	2021-03-31 18:10:44 +02:00
David Bomba	b9e56a271d	Add expense type id for invoice items	2021-03-31 21:41:17 +11:00
David Bomba	9c4a223923	Fixes for notification gates	2021-03-31 13:28:03 +11:00
David Bomba	89a271e59c	Improve custom label replacements in emails	2021-03-31 12:55:33 +11:00
David Bomba	e453030b4b	Fixes for subscriptions repo naming	2021-03-31 11:20:41 +11:00
David Bomba	6cbfe6b1bf	rename method for subcsriptions	2021-03-31 11:14:19 +11:00
David Bomba	404ee307fd	Magic link maker	2021-03-31 11:07:54 +11:00
David Bomba	ffdd81ab6b	Merge pull request #5296 from turbo124/v5-develop ... Fixes for subscriptions	2021-03-31 10:08:29 +11:00
David Bomba	f1131c07fe	Fixes	2021-03-31 10:03:18 +11:00
David Bomba	8e2c07b0df	Fixes	2021-03-31 09:58:50 +11:00
David Bomba	b5e0276b1c	Mark approved quotes as sent	2021-03-31 08:57:14 +11:00
Benjamin Beganović	eec902429a	Merge pull request #5286 from beganovich/v5-3003-company-user-registration ... (v5) Fix acessing client register route without company instance	2021-03-30 16:30:16 +02:00
Benjamin Beganović	1e618dcbad	Merge pull request #5287 from beganovich/v5-3003-locale-fixes-for-literal ... (v5) Show "literal" months using locale on PDFs	2021-03-30 16:30:07 +02:00
Benjamin Beganović	6af83a8675	wip	2021-03-30 15:50:39 +02:00
Benjamin Beganović	eb0aed513f	wip	2021-03-30 14:44:33 +02:00
Benjamin Beganović	d5109af225	wip	2021-03-30 14:07:31 +02:00
David Bomba	3eb9688a83	fix subscriptions schema	2021-03-30 21:08:02 +11:00
David Bomba	f5c6847a36	Minor fixes for subscription types	2021-03-30 20:41:58 +11:00
David Bomba	32fd16dfb7	Merge pull request #5284 from turbo124/v5-develop ... Subscriptions	2021-03-30 20:37:28 +11:00
David Bomba	caf7ad5998	Minor fixes for self updater - more verbose messaging after self update	2021-03-30 18:01:20 +11:00
David Bomba	1af565abd3	minor fixes for texts	2021-03-30 16:10:31 +11:00
David Bomba	9377b9cae4	Fixes for authorize credit cards	2021-03-30 12:28:49 +11:00
David Bomba	96c191daf0	Add system logs to first load	2021-03-30 09:32:33 +11:00
David Bomba	878f00b375	add additional query filter for recurring invoices	2021-03-30 09:30:41 +11:00
Benjamin Beganović	972c1ef56e	wip	2021-03-29 15:51:03 +02:00
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