635 Commits

Author	SHA1	Message	Date
=	d0cb09d094	Minor fixes for task controller	2021-04-14 19:55:43 +10:00
David Bomba	aabe5683e1	Refactoring subscriptions	2021-04-14 14:41:04 +10:00
David Bomba	2237939491	Subscriptions	2021-04-14 12:40:16 +10:00
David Bomba	5c1eb7f7eb	Update texts	2021-04-14 07:40:07 +10:00
Benjamin Beganović	dba330bcb3	wip	2021-04-13 16:43:35 +02:00
David Bomba	a386a33a7e	Merge branch 'v5-develop' into v5-develop	2021-04-13 19:35:44 +10:00
David Bomba	f2342e640a	Subscriptions	2021-04-13 19:34:59 +10:00
David Bomba	7e3a9205b9	Add event listeners for Subscriptions + fix user actioning the event()	2021-04-13 09:52:17 +10:00
David Bomba	bde5166827	Subscriptions	2021-04-12 21:56:08 +10:00
Benjamin Beganović	c319dedf75	Merge pull request #5395 from beganovich/v5-0904-decode-html-on-frontend ... (v5) Switch decoding HTML from backend to Javascript	2021-04-12 11:40:20 +01:00
David Bomba	477aa691a9	Add custom exceptions	2021-04-12 14:36:51 +10:00
David Bomba	f5092e8cf4	Fixes for custom email templates	2021-04-11 13:46:40 +10:00
David Bomba	d91e8c438e	Working on Pro Rata Refunds	2021-04-10 14:53:16 +10:00
David Bomba	62401555cd	Working on pro rata refunds	2021-04-10 14:07:08 +10:00
Benjamin Beganović	d44691c613	wip	2021-04-09 13:11:28 +02:00
Benjamin Beganović	7799b34346	wip	2021-04-09 13:06:14 +02:00
=	e7707a919b	Delete invoice when payments are applied	2021-04-09 19:51:17 +10:00
Benjamin Beganović	c0f5780172	wip	2021-04-08 17:11:14 +02:00
Benjamin Beganović	ec1d4e05c1	- Rename: $target_subscription to $target and all references ... - Ability to pay for the upgrade	2021-04-08 16:53:54 +02:00
David Bomba	d9d042724e	Add daily reset	2021-04-08 20:38:31 +10:00
David Bomba	8f91969c49	bug fixes for subscriptions	2021-04-08 12:43:31 +10: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	73e7aadaad	Working on pro plan;	2021-04-07 08:56:36 +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	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	b1e6325ef8	Fixes for tests	2021-04-06 08:19:27 +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ć	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
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
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ć	6af6668ba6	remove price() from subscriptionservice	2021-04-01 16:10:26 +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	3a770361aa	Set valid until when a quote is marked as sent	2021-04-01 19:07:32 +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	6cbfe6b1bf	rename method for subcsriptions	2021-03-31 11:14:19 +11:00
David Bomba	f5c6847a36	Minor fixes for subscription types	2021-03-30 20:41:58 +11:00
David Bomba	f1ece9ab6b	Subscriptions	2021-03-29 21:43:42 +11:00
David Bomba	3183186d4d	Working on subscriptions	2021-03-29 21:19:30 +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
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
=	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
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	98e314b6c0	Fixes for calculating the correct gateway fee depending on the payment method	2021-03-26 19:18:25 +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	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
=	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
David Bomba	3b72fa343f	complete purchase - billing subscription	2021-03-23 14:26:21 +11:00
David Bomba	3ebe533fc8	include Account clas	2021-03-23 07:09:42 +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
=	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
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	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ć	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	c95e0c3d7e	Tuning company settings for missing properties	2021-03-17 20:28:44 +11:00
David Bomba	1012c8df4b	Working on billing subscriptions	2021-03-17 13:21:06 +11:00
David Bomba	1e72f20c3d	Fix for invite resend permission	2021-03-16 07:35:19 +11:00
David Bomba	6a2332526b	Biling Subscription Service	2021-03-15 08:42:05 +11:00
=	e2bc086f75	Type check on custom fields	2021-03-13 19:36:00 +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
Benjamin Beganović	7c01b3bb64	Support for custom fields in company details section	2021-03-10 16:55:49 +01:00
David Bomba	b9c9874533	Improve PDF creation performance	2021-03-10 21:00:18 +11:00
David Bomba	9888d7acb9	Improve delete pdf performance	2021-03-10 13:28:35 +11:00
David Bomba	18e8934e70	Delete pdf in service rather than child job	2021-03-10 12:28:12 +11:00
David Bomba	7dae7cb326	Fixes for mailer	2021-03-04 19:42:22 +11:00
David Bomba	07aca3d8c0	Fixes for tests	2021-03-04 10:34:18 +11:00
David Bomba	1780db52bd	Invite user route	2021-03-04 09:39:24 +11:00
Benjamin Beganović	2ab76adfad	Reduce default white label logo size	2021-03-03 08:49:02 +01:00
=	b57d4bfb7c	Fixes for recurring invoice number not being prefixed	2021-03-02 21:57:14 +11:00
David Bomba	d238d53b26	Delete PDF helper	2021-03-01 10:40:18 +11:00
Benjamin Beganović	da9e2e1759	Prevent word breaking from unit costs & task rates	2021-02-26 07:47:04 +01:00
Benjamin Beganović	b7a9700f90	Fix issue with entity footer items causing 500 error	2021-02-18 10:12:57 +01:00
David Bomba	704477f803	Imports	2021-02-18 14:37:17 +11:00
David Bomba	64afdc20fa	Fixes for payment failure mailer	2021-02-18 10:51:56 +11:00
Benjamin Beganović	deb0cd345a	Merge pull request #4923 from beganovich/v5-1602-invoice-footer-variable-parsing ... (v5) PDF: Support for dynamic variables in invoice footer, public notes & terms	2021-02-17 11:25:28 +01:00
Benjamin Beganović	001b6902f2	wip	2021-02-16 14:42:35 +01:00
David Bomba	0b8bf4fbf1	Remove invoice deletion observer	2021-02-17 00:31:00 +11:00
Benjamin Beganović	5f443116f3	Merge pull request #4909 from beganovich/v5-1502-alias-task-as-service ... (v5) PDF: Alias task.product key for task.service	2021-02-15 13:17:54 +01:00
Benjamin Beganović	a593ecc48d	wip	2021-02-15 13:16:47 +01:00
David Bomba	4ff96c0f58	Merge pull request #4908 from turbo124/v5-develop ... Refactoring emails	2021-02-15 22:40:12 +11:00
David Bomba	7bf6d7c48a	Document route for clients / company	2021-02-15 21:52:50 +11:00
Benjamin Beganović	29e4566be8	Inject signature on PDfs	2021-02-12 13:03:46 +01:00
David Bomba	ac2c7b2bbe	Fixes for deleting a payment	2021-02-12 09:01:39 +11:00
David Bomba	3c23d5e31f	Add updateBalance method to credit service	2021-02-12 08:16:43 +11:00
Benjamin Beganović	6607442740	wip	2021-02-10 12:31:14 +01:00
Benjamin Beganović	d8c6d40cab	wip	2021-02-09 16:47:41 +01:00
David Bomba	e56a37a718	Return object not null if you have to return early!!	2021-02-08 00:03:59 +11:00
David Bomba	47eabf5434	Invoice Actions	2021-02-05 16:03:34 +11:00
David Bomba	55839d66ed	Auto archive invoice - Mark Paid	2021-02-05 16:02:38 +11:00
David Bomba	0ae2c6db27	Fix for pausing recurring invoices	2021-02-02 07:14:38 +11:00
Benjamin Beganović	84f7e14d11	Merge pull request #4781 from beganovich/v5-2701-checkout-autobill ... (v5) Checkout.com auto-billing	2021-01-29 12:01:54 +01:00
Benjamin Beganović	dbade2f497	wip	2021-01-29 12:00:30 +01:00
Benjamin Beganović	1727f3948e	Fix issue with	2021-01-28 16:57:32 +01:00
Benjamin Beganović	874732f55d	fix translation reference	2021-01-28 15:42:11 +01:00
David Bomba	756f421319	Add gateway fees for autobill	2021-01-28 08:31:31 +11:00
David Bomba	9d27480f2d	Fixes for getPaymentMethods	2021-01-27 16:18:30 +11:00
David Bomba	b5ff2d8a02	Fixes for company gateway payment method resolution	2021-01-27 12:06:25 +11:00
Benjamin Beganović	c5ad3a94eb	hide empty columns now pulling from settings	2021-01-26 17:41:36 +01:00
David Bomba	f950f84b61	Fix for 500 on updating quote by removing contacts	2021-01-25 21:54:36 +11:00
David Bomba	8e06644fac	Track payment ID with Activity 54	2021-01-25 07:55:04 +11:00
David Bomba	3fa8158bc3	Fixes for refunds	2021-01-24 20:53:45 +11:00
David Bomba	cecee6cbfe	Fixes for tests	2021-01-24 20:28:18 +11:00
David Bomba	0f8ee2d101	Tests for paid_to_date	2021-01-24 20:08:57 +11:00
David Bomba	6170dfae12	Fixes for tests	2021-01-24 20:00:45 +11:00
David Bomba	24dfbe48dc	working on paid_to_date fields and calculations	2021-01-24 17:44:14 +11:00
David Bomba	c173fdcc5b	Fixes for ledger	2021-01-21 15:42:30 +11:00
David Bomba	05ea7f092a	Fixes for ledger adjustments	2021-01-21 15:05:05 +11:00
David Bomba	ff4f2f3953	Checks on Company Ledger sanity	2021-01-21 12:33:39 +11:00
David Bomba	db9e8ff830	Add rules preventing overpayment on invoices	2021-01-21 10:53:02 +11:00
David Bomba	e054894ffa	Working on payments	2021-01-20 21:59:24 +11:00
David Bomba	5ce2a035da	Fixes for approve / convert quotes	2021-01-20 08:30:04 +11:00
David Bomba	63eae6000a	fixes for service methods	2021-01-19 07:04:13 +11:00
David Bomba	40f336c469	Fixes for defaults	2021-01-19 07:02:32 +11:00
David Bomba	1a4b5ed51d	Add public notes to invoices	2021-01-18 22:08:18 +11:00
David Bomba	69bc2f0183	Fixes for getPaymentMethods	2021-01-18 13:12:48 +11:00
David Bomba	bd5defe455	Refactor getPaymentMethods()	2021-01-18 12:36:13 +11:00
David Bomba	a33c781919	Payment notifications for online payments to the client	2021-01-18 08:31:49 +11:00