2577 Commits

Author	SHA1	Message	Date
David Bomba	5025949eaa	CSV import	2020-12-15 15:31:49 +11:00
David Bomba	57ee54032f	Import CSV	2020-12-15 09:59:41 +11:00
David Bomba	864892a7d2	Migrate white label license	2020-12-15 08:52:14 +11:00
David Bomba	ed20f2c4bc	Null safety in translations	2020-12-15 07:53:31 +11:00
Benjamin Beganović	dcd6574b2d	Experimental PDF rendering: ... - Added experimental flag in ninja.php - Added experimental rendering in PdfMaker.php - Added dynamic $global-margin for 1cm/0cm based on PDF method	2020-12-14 17:23:04 +01:00
David Bomba	141f45f402	Minor fixes for currency in expenses	2020-12-14 22:18:54 +11:00
David Bomba	05f4572454	Merge branch 'v5-develop' into v5-develop	2020-12-14 21:44:01 +11:00
David Bomba	64b9f94299	Working on Import / Export	2020-12-14 21:43:07 +11:00
Benjamin Beganović	79570b6118	Merge pull request #4453 from beganovich/v5-custom-payment-driver ... (v5) Custom payment driver	2020-12-14 10:12:56 +01:00
David Bomba	c0aa30ab58	Import|Export	2020-12-14 16:03:23 +11:00
David Bomba	d115609d3c	Import | Exports	2020-12-14 15:59:15 +11:00
David Bomba	8b808c97fa	Fixes for expense currency not setting default	2020-12-14 07:58:18 +11:00
David Bomba	2c4aaa2131	Fixes for sentry reporting	2020-12-14 07:37:29 +11:00
David Bomba	0f86b3ec21	Fixes	2020-12-13 21:33:30 +11:00
David Bomba	6f451b8924	Remove redundant info() Change document download route	2020-12-13 20:46:29 +11:00
David Bomba	d440d4421d	Fix for doubling client balance erroneously on emailing"	2020-12-13 11:04:56 +11:00
David Bomba	8abce54d7e	Fixes for customised language options for Preview Controller	2020-12-13 10:20:03 +11:00
David Bomba	0f861554f0	Fixes for exec and open_basedir checks	2020-12-13 08:06:47 +11:00
David Bomba	1913318124	bump the import cache timeout from 10 minutes to 60 minutes	2020-12-13 07:54:25 +11:00
David Bomba	419b381c21	Filter exceptions	2020-12-12 22:23:29 +11:00
David Bomba	2a1a9e2a16	Working on import	2020-12-12 21:47:52 +11:00
David Bomba	3419d7900f	Tests for importing CSV files	2020-12-12 21:35:42 +11:00
David Bomba	584bef52fc	Working on import	2020-12-12 21:01:53 +11:00
David Bomba	aa1a788d6e	Public document download route	2020-12-12 19:46:28 +11:00
David Bomba	f6ed7be0da	Fixes for expense and project numbers	2020-12-12 07:51:10 +11:00
David Bomba	23f07a901b	Version bump to 5.0.35	2020-12-11 23:20:46 +11:00
David Bomba	c94eaa4599	Force Custom Language translations before pushing to PhantomJS	2020-12-11 19:54:40 +11:00
David Bomba	6ee4e45d1e	Add custom variables	2020-12-11 17:50:54 +11:00
David Bomba	f49faf8f16	Fix for custom gateway query	2020-12-11 08:10:50 +11:00
David Bomba	763fa6ef08	Fix for custom gateway query	2020-12-11 08:09:04 +11:00
David Bomba	44fdadff07	Return NPM String error rather than bool	2020-12-11 07:24:43 +11:00
Benjamin Beganović	e6890e5430	Merge branch 'v5-develop' into v5-custom-payment-driver	2020-12-10 12:40:27 +01:00
Benjamin Beganović	5f796aeab6	php-cs-fixer	2020-12-10 12:38:46 +01:00
Benjamin Beganović	9df4938837	change gateway type & remove processPayment	2020-12-10 12:38:23 +01:00
David Bomba	c5a4b1fcfd	Fixes for version check + schema fixes	2020-12-10 21:48:16 +11:00
David Bomba	3fc8374cb5	Fixes for attempting to create a user with duplicate email	2020-12-10 21:28:19 +11:00
David Bomba	bb1ca556c4	wire up custom gateway	2020-12-10 21:20:12 +11:00
David Bomba	22cd6cdff0	Fixes for NPM/NODE status	2020-12-10 21:06:24 +11:00
David Bomba	8c46e140af	Also factor in optin and optout for auto_enabled	2020-12-10 19:51:00 +11:00
David Bomba	894481989c	Also factor in optin and optout for auto_enabled	2020-12-10 19:47:17 +11:00
David Bomba	91f90c94e3	Merge pull request #4454 from turbo124/v5-develop ... Notifications clean up.	2020-12-10 07:58:08 +11:00
Benjamin Beganović	d45571d7f9	wip	2020-12-09 15:17:48 +01:00
Benjamin Beganović	23a64562c9	fix issue with setup & apply php-cs-fixer	2020-12-09 13:38:22 +01:00
David Bomba	df9fe5677d	Notification for quotes credits and invoices	2020-12-09 21:05:26 +11:00
David Bomba	7ba78cc342	Reduce notification emails to one per entity	2020-12-09 20:52:08 +11:00
David Bomba	dc2e5706c6	Fixes for how to display CHF currency	2020-12-09 07:35:26 +11:00
David Bomba	6a03bcc546	Merge branch 'v5-develop' into v5-develop	2020-12-09 07:25:16 +11:00
David Bomba	7075ec5096	Reorder default includes	2020-12-09 07:12:10 +11:00
Benjamin Beganović	829d4feaff	Merge pull request #4445 from beganovich/v5-task-product-key-to-service ... (v5) Rename task.product_key to taks.service	2020-12-08 16:53:03 +01:00
Benjamin Beganović	ef0584b442	add entity_string in htmlengine	2020-12-08 16:44:35 +01:00
Benjamin Beganović	0f62c6c2f2	remove info()	2020-12-08 16:15:36 +01:00
Benjamin Beganović	53525dc93f	rename task.service to task.product key	2020-12-08 16:10:29 +01:00
Benjamin Beganović	0155907b27	php-cs-fixer	2020-12-08 15:05:05 +01:00
Benjamin Beganović	82bbe5b389	php-cs-fixer	2020-12-08 15:04:45 +01:00
Benjamin Beganović	1d0f5b2ad7	add post-submit checks to smtp & db	2020-12-08 15:04:07 +01:00
Benjamin Beganović	68a84df0dd	prefix all smtp fields with mail_	2020-12-08 14:29:15 +01:00
Benjamin Beganović	3ffb600117	prefix all db field with db_	2020-12-08 14:21:00 +01:00
Benjamin Beganović	3505c89e2d	remove fallback to log driver	2020-12-08 14:20:24 +01:00
Benjamin Beganović	4bf46a45b1	Update reference on balance due	2020-12-08 13:57:31 +01:00
Benjamin Beganović	bdedec19db	remove balance due & total from delivery note pdf	2020-12-08 13:19:38 +01:00
Benjamin Beganović	812824100c	wrap getting file into try-catch	2020-12-08 13:10:27 +01:00
David Bomba	634e5cadcc	remove redundant code	2020-12-08 21:49:23 +11:00
David Bomba	beccfd00c7	Only send email changed notification if new and old emails are different.	2020-12-08 20:32:17 +11:00
David Bomba	594dda9b65	fixes for delivery notes{	2020-12-08 20:18:17 +11:00
David Bomba	e765bcce08	Fixes for swagger	2020-12-08 07:25:56 +11:00
David Bomba	8107a49677	remove trailing slash from app url	2020-12-08 07:21:08 +11:00
Benjamin Beganović	a92d38ae06	php-cs-fixer	2020-12-07 14:56:23 +01:00
Benjamin Beganović	5c89fdab02	pass client id in paymentResponse	2020-12-07 14:50:43 +01:00
Benjamin Beganović	7818afddf8	getParent() ref to utilities	2020-12-07 14:50:30 +01:00
Benjamin Beganović	fdafc068bb	processWebhookRequest for checkoutpaymentdriver	2020-12-07 14:49:56 +01:00
Benjamin Beganović	c548bc2e0d	refactor paymentwebhook suite with new methods	2020-12-07 14:49:30 +01:00
Benjamin Beganović	2609e0027a	allow paymentfailed exception for guest middleware	2020-12-07 14:49:11 +01:00
David Bomba	269fff3fc8	Changes for counters	2020-12-07 21:43:21 +11:00
Benjamin Beganović	1f2c3f2823	update pagination links & apply php-cs-fixer	2020-12-05 14:24:21 +01:00
David Bomba	d8efdc6817	Tests for deleting and restoring an invoice	2020-12-05 09:10:32 +11:00
David Bomba	4f0776a323	Working on tests for deleted invoice	2020-12-05 09:08:10 +11:00
David Bomba	bc621aa01a	fixes for directories	2020-12-04 08:24:34 +11:00
David Bomba	41e39fa9c4	Fixes for directory creation error	2020-12-04 08:22:31 +11:00
David Bomba	34463eac64	Merge branch 'v5-develop' into v5-develop	2020-12-04 07:41:36 +11:00
David Bomba	a94b0357e0	Merge branch 'delete_paymentables_on_invoice_deleting' into v5-develop	2020-12-04 07:40:22 +11:00
David Bomba	76fb186f02	Fix for calculating balance with inclusive taxes	2020-12-04 07:40:00 +11:00
Benjamin Beganović	4959917b7e	fix issue with multiple companies switching	2020-12-03 15:33:18 +01:00
Benjamin Beganović	458e207fe3	fixes for smtp testing on setup	2020-12-03 14:10:40 +01:00
Benjamin Beganović	8ad5d14659	Merge pull request #4419 from beganovich/v5-checkout-frames ... (v5) Checkout.com migration to Frames	2020-12-03 13:49:52 +01:00
Benjamin Beganović	d84f5bc5bb	Fixes for Checkout.com refunding	2020-12-03 13:38:57 +01:00
David Bomba	528a02db6f	fixes for mail order	2020-12-03 22:00:34 +11:00
David Bomba	02c810633a	Working on invoice delete restore refactor	2020-12-03 21:46:49 +11:00
David Bomba	fceaab9e40	Working on invoice delete restore refactor	2020-12-03 21:46:36 +11:00
David Bomba	d30ef031a2	refactor invoice deletion	2020-12-03 15:30:32 +11:00
David Bomba	f96bde6fca	Refactor invoice delete/restore	2020-12-03 15:20:39 +11:00
David Bomba	73c9474912	Working on invoice delete refactor	2020-12-03 14:56:00 +11:00
David Bomba	48f2f469d3	refactor for invoice deletion	2020-12-03 14:11:24 +11:00
David Bomba	e772a2b638	Fix for regression	2020-12-03 11:05:22 +11:00
David Bomba	53c2db072f	Fixes for pdf attachment to invoices	2020-12-03 09:26:46 +11:00
Benjamin Beganović	00ab670d71	Checkout.com migration to Frames: ... - Changed cardToken to token in CreditCard reference - Updated checkout.com.js - Added "Pay" translation - Fix issue with switching between token & credt card	2020-12-02 15:33:43 +01:00
David Bomba	bcb21fb234	Working on invoice deletion	2020-12-02 22:01:50 +11:00
David Bomba	bc0a925f39	Fixes for include	2020-12-02 19:59:45 +11:00
David Bomba	aa852930e6	refactor from email names to use config() values	2020-12-02 14:08:35 +11:00
David Bomba	b63972e250	fixes for payment refunds	2020-12-02 11:56:29 +11:00
David Bomba	66fc75bb83	Merge pull request #4410 from turbo124/v5-develop ... V5 develop	2020-12-02 08:32:45 +11:00
David Bomba	54fd048614	Merge pull request #4408 from turbo124/v5-develop ... V5 develop	2020-12-02 07:28:23 +11:00
Benjamin Beganović	9198cf5175	support tasks as of same day	2020-12-01 15:52:12 +01:00
Benjamin Beganović	e5af99d884	fix issue with client date formatc	2020-12-01 15:25:48 +01:00
Benjamin Beganović	1a066f2f9f	add alias to task searvice from task product	2020-12-01 15:18:48 +01:00
Benjamin Beganović	b373a3df52	fix stripe refunding & apply php-cs-fixer	2020-12-01 13:46:09 +01:00
David Bomba	9623dba2c8	fix for showinvoicerequest	2020-12-01 21:22:48 +11:00
David Bomba	a8958f4b09	Minor fixes for batch migrations	2020-11-30 18:43:33 +11:00
David Bomba	1210a81a09	Minor changes to migration	2020-11-30 09:58:31 +11:00
David Bomba	f2f8837269	Merge branch 'v5-stable' of https://github.com/turbo124/invoiceninja into v5-stable	2020-11-30 08:32:27 +11:00
David Bomba	4368dc7272	Merge pull request #4392 from turbo124/v5-develop ... Fixes for migration file location	2020-11-30 08:31:30 +11:00
David Bomba	d7dd592d18	Fixes for migration file location	2020-11-30 08:28:12 +11:00
Benjamin Beganović	d888780ed8	update quotes logic	2020-11-29 14:20:47 +01:00
Benjamin Beganović	ba6c157128	Surround multiple words with quotes in env file	2020-11-29 13:54:12 +01:00
David Bomba	9aee129737	Fixes for import	2020-11-28 17:22:43 +11:00
David Bomba	7d96a6d389	Merge pull request #4385 from turbo124/v5-develop ... Fixes for lock	2020-11-28 15:16:00 +11:00
Benjamin Beganović	4284870c4e	Merge remote-tracking branch 'upstream/v5-develop' into v5-paypal-refactor	2020-11-28 01:01:18 +01:00
David Bomba	c0c7fd8de4	Minor fixes	2020-11-28 07:44:27 +11:00
Benjamin Beganović	0aff363f5d	php-cs-fixer	2020-11-27 12:08:42 +01:00
Benjamin Beganović	2618a1d3b8	add ability to edit client's phone	2020-11-27 12:08:39 +01:00
Benjamin Beganović	50ae8fd608	php-cs-fixer & required fields check	2020-11-27 11:12:05 +01:00
David Bomba	9f4979095b	Temp routes"	2020-11-27 20:21:18 +11:00
David Bomba	3a78326a83	Temp routes"	2020-11-27 20:19:23 +11:00
David Bomba	78e5a91175	Temp routes"	2020-11-27 20:17:47 +11:00
David Bomba	5a3c93bb3c	Temp routes"	2020-11-27 20:14:01 +11:00
David Bomba	e410a99f91	Phantom adjustment for preview	2020-11-27 13:31:21 +11:00
David Bomba	b5840f8e45	Phantom adjustment for preview	2020-11-27 13:30:37 +11:00
David Bomba	3cdd5bc544	Phantom adjustment for preview	2020-11-27 13:29:46 +11:00
David Bomba	2d80e12457	Phantom adjustment for preview	2020-11-27 13:24:13 +11:00
David Bomba	a99f871fb7	Phantom adjustment for preview	2020-11-27 13:23:02 +11:00
David Bomba	b593cb0ff3	Fixes for preview PDF using phantom js	2020-11-27 13:02:05 +11:00
David Bomba	2c2d1b50f4	Fix for invitation resolution with PhantomJS	2020-11-27 08:24:25 +11:00
David Bomba	f1e1fa0b82	Fix for invitation resolution with PhantomJS	2020-11-27 08:22:28 +11:00
David Bomba	d07dedf264	Add tax_rates relation to company_user	2020-11-27 08:05:30 +11:00
Benjamin Beganović	5d3d31ddef	paypal	2020-11-26 16:36:43 +01:00
David Bomba	1181f9de62	Merge branch 'v5-develop' into authorize_refactor	2020-11-26 22:43:25 +11:00
David Bomba	ccac432978	Fixes for authorize	2020-11-26 22:35:17 +11:00
David Bomba	dff41d4881	Fixes for authorize	2020-11-26 22:27:32 +11:00
David Bomba	0e1b6c9341	Fixes for authorize	2020-11-26 22:22:33 +11:00
David Bomba	a8daa31167	Fixes for authorize	2020-11-26 21:12:36 +11:00
David Bomba	ed1539db50	Fixes for authorize	2020-11-26 21:00:55 +11:00
David Bomba	150bb9c396	Fix for payment method route	2020-11-26 20:53:01 +11:00
David Bomba	5e0bcfbc88	working on authorize	2020-11-26 20:39:35 +11:00
David Bomba	72bbf24c69	Working on refactor	2020-11-26 15:43:53 +11:00
David Bomba	4888a7dc4f	Working on authorize refactor	2020-11-26 13:30:36 +11:00
David Bomba	56ac6c7b1f	Refactoring authorize	2020-11-26 10:42:59 +11:00
David Bomba	b2c005a1aa	Create driver template	2020-11-26 08:07:09 +11:00
David Bomba	b3cdb19b4d	Merge pull request #4362 from beganovich/v5-gateways-required-fields ... (v5) Support for pre-checking gateway requirements	2020-11-26 06:57:48 +11:00
Benjamin Beganović	ae88d5e08e	php-cs-fixer format	2020-11-25 15:19:52 +01:00
Benjamin Beganović	169e5ba93e	support for checking requirements based on gateway	2020-11-25 14:38:49 +01:00
David Bomba	137231c95e	cs-fixer	2020-11-25 21:30:00 +11:00
David Bomba	79e8f096fe	Fix for custom_values breaking invoicesum	2020-11-25 20:53:50 +11:00
David Bomba	efbf8069b5	Merge pull request #4360 from turbo124/v5-develop ... Fixes for migrations	2020-11-25 20:24:06 +11:00
David Bomba	b0740b46dd	fixes for tests	2020-11-25 20:21:26 +11:00
David Bomba	656bf13510	Fixes for tests	2020-11-25 14:44:37 +11:00
David Bomba	c2b07c3ebc	Fixes for migration data checks	2020-11-25 13:59:23 +11:00
David Bomba	2f4b46e435	Refactor webhook handler	2020-11-25 11:23:39 +11:00
Benjamin Beganović	549fd92671	wrap into try catch	2020-11-24 11:52:01 +01:00
Benjamin Beganović	242d48cd1a	update variables for .env instead of writing completely new file	2020-11-24 11:45:27 +01:00
David Bomba	ffc87c4dc1	Check Data Script	2020-11-24 21:37:48 +11:00
David Bomba	4f35c6f894	explicit where for client in payment repo	2020-11-24 21:14:06 +11:00
Benjamin Beganović	3b765d32c1	log as an option for mail driver	2020-11-24 11:12:44 +01:00
David Bomba	63cc567244	Working on migrations	2020-11-24 21:12:05 +11:00
David Bomba	0c9f982bdf	Fixes for imports	2020-11-24 16:11:20 +11:00
David Bomba	6f1b4d4548	Change JSON parser	2020-11-24 08:33:37 +11:00
David Bomba	8cbaac53c6	Fixes for projects in migration	2020-11-24 08:00:59 +11:00
David Bomba	b5fe5070b5	Working on migrations	2020-11-23 23:55:04 +11:00
David Bomba	0991dbf8d7	Fixes for migrations	2020-11-23 14:51:49 +11:00
David Bomba	4b1aabbac7	Fixes for migration	2020-11-23 12:46:16 +11:00
David Bomba	388c0e8467	Add withTrashed() for queries in migration	2020-11-23 08:25:29 +11:00
David Bomba	9f420ba084	Merge pull request #4346 from turbo124/v5-develop ... Change default queue to Database.	2020-11-22 22:22:52 +11:00
David Bomba	e55de0fb1b	Change default queue to database	2020-11-22 22:14:49 +11:00
David Bomba	6eaf78a1d5	Fix for casting line items	2020-11-22 16:34:05 +11:00
Benjamin Beganović	18312b9583	always show invoice.totals	2020-11-20 14:31:47 +01:00
Benjamin Beganović	952899c8ec	Merge pull request #4339 from beganovich/v5-fix-issue-with-invitation ... (v5) Fix refernece to $invitation in QuoteEmailEngine	2020-11-20 11:38:09 +01:00
Benjamin Beganović	a1c714c51e	reference correct invitation	2020-11-20 11:37:07 +01:00
Benjamin Beganović	c434d6313c	start database migration with correct key	2020-11-20 10:34:54 +01:00
David Bomba	e82d8e0d8d	Fail gracefully if cannot upload logo	2020-11-19 22:33:14 +11:00
David Bomba	4140051877	fixes for check data	2020-11-19 16:16:47 +11:00
David Bomba	4318423a05	fixes for check data	2020-11-19 14:53:32 +11:00
David Bomba	e7376aa42b	fixes for check data	2020-11-19 14:52:22 +11:00
David Bomba	7fb9877eca	Fixes for currency seeder	2020-11-18 21:46:36 +11:00
David Bomba	e91c82aa8b	Fixes for bulk import	2020-11-18 20:35:09 +11:00
David Bomba	6376d5fa98	Merge pull request #4325 from turbo124/v5-develop ... Minor fixes for client portal	2020-11-18 08:00:02 +11:00
Benjamin Beganović	f81526af2d	Merge pull request #4322 from beganovich/v5-display-signature-and-terms-on-quotes ... (v5) Display signatures & accepting terms for invoices & quotes	2020-11-17 17:00:59 +01:00
Benjamin Beganović	d64308fdd1	production builds	2020-11-17 16:57:42 +01:00
Benjamin Beganović	501f3c9b0e	injecting signatures into entity invitations	2020-11-17 16:57:34 +01:00
Benjamin Beganović	1bf6f34c7c	Add task to PortalComposer	2020-11-17 15:01:28 +01:00
Benjamin Beganović	1b70f24dbc	Update logic for rendering task hours	2020-11-17 14:47:32 +01:00
Benjamin Beganović	3112efcded	Support for .description	2020-11-17 14:46:22 +01:00
Benjamin Beganović	2144153e41	pass correct company	2020-11-17 13:28:13 +01:00
Benjamin Beganović	42ca352409	Fix issue with webhook handler	2020-11-17 13:23:16 +01:00
David Bomba	3f9bea3f91	Minor fixes for tests	2020-11-17 20:53:32 +11:00
David Bomba	c231dca308	Merge pull request #4314 from turbo124/v5-develop ... Remove redundant entity notification	2020-11-17 20:18:09 +11:00
David Bomba	a182c5a8ca	minor fixes for imports	2020-11-17 10:04:10 +11:00
David Bomba	5a6d543e34	Minor fixes for imports	2020-11-17 08:56:52 +11:00
Benjamin Beganović	b886ceac4d	Merge pull request #4311 from beganovich/v5-stripe-failure ... (v5) Fix bug with Stripe saving credit card	2020-11-16 22:19:38 +01:00
Benjamin Beganović	8080dffa85	show custom messages in cp	2020-11-16 15:37:09 +01:00
Benjamin Beganović	54014d93ee	pass correct $customer->id	2020-11-16 14:10:45 +01:00
Benjamin Beganović	5457838c4d	Store 'amount' in payment hash (Stripe/CC)	2020-11-16 13:37:13 +01:00
Benjamin Beganović	1ab8d1322b	Logic for getting amount in internallyFailedPayments	2020-11-16 13:36:47 +01:00