2464 Commits

Author	SHA1	Message	Date
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
Benjamin Beganović	fca1d94afe	Support for SYSTEM_LOG_TYPE in: ... - Authorize.net - Stripe - PayPal	2020-11-16 13:36:29 +01:00
David Bomba	3353527333	Minor fixes for migrations	2020-11-16 21:29:17 +11:00
David Bomba	77929a6bc3	Minor fixes for bulk import	2020-11-16 15:40:52 +11:00
David Bomba	a8f186c921	Remove redundant entity notification	2020-11-16 13:41:43 +11:00
David Bomba	68a6ea4d22	Merge branch 'v5-develop' into v5-develop	2020-11-16 12:20:44 +11:00
Benjamin Beganović	f9b55dcd72	fix pdfmaker issues with special chars	2020-11-16 00:49:44 +01:00
Benjamin Beganović	956e1fe287	notes => description, cost => unit_cost	2020-11-16 00:42:21 +01:00
David Bomba	4b240b05ca	Add deleted_at column to paymentables	2020-11-16 08:23:20 +11:00
David Bomba	a1119f9bbe	Fix edge cases with cloning invoice	2020-11-15 19:24:57 +11:00
David Bomba	8d62b704e6	Merge pull request #4304 from turbo124/v5-develop ... Refactor login route response.	2020-11-14 17:04:46 +11:00
David Bomba	861c4ef4e7	Merge pull request #4296 from beganovich/v5-migration-fixes ... (v5) (wip) (no-merge) Refactor accepting new migrations	2020-11-14 17:03:26 +11:00
David Bomba	b1591632d8	Refactor defaults for invoice PDF	2020-11-13 22:52:11 +11:00
David Bomba	fe5218fd2c	Fixes for resolving company_user from user object	2020-11-13 21:42:06 +11:00
David Bomba	3bec5a4044	Refactor login routes	2020-11-13 20:09:20 +11:00
David Bomba	58c6cb415e	Merge pull request #4302 from turbo124/v5-develop ... Mail exceptions	2020-11-13 07:22:28 +11:00
David Bomba	d8bb01430f	Fixes for renaming company gateway columns	2020-11-12 22:09:31 +11:00
David Roizenman	039544e753	Use correct formula when adjust_fee_percent=true	2020-11-12 02:53:25 -08:00
David Bomba	f1c1243146	Fixes for mail	2020-11-12 20:41:19 +11:00
Benjamin Beganović	952b6a7e4f	Fix the way we process migration	2020-11-12 10:24:59 +01:00
David Bomba	ef9043db44	error handling for mail	2020-11-12 15:37:50 +11:00
David Bomba	5cd2ae0dbe	payment listeners	2020-11-12 14:04:27 +11:00
David Bomba	7af791a4c4	Working on from, replyTo and bcc emails	2020-11-12 12:43:32 +11:00
David Bomba	42c1f8fe5f	Minor fixes	2020-11-12 07:42:20 +11:00
Benjamin Beganović	d503f1ee58	Refactor accepting new migrations: ... - Remove {company} parameter from /migration/start - Refactor logic for startMigration	2020-11-11 18:26:17 +01:00
David Bomba	ddaba5a953	Fix for refresh query	2020-11-11 19:55:53 +11:00
David Bomba	28cbd75fcb	Fixes for credit PDF	2020-11-11 11:13:39 +11:00
David Bomba	c5643bea7b	Merge pull request #4287 from turbo124/v5-develop ... Fixes for reminder templates	2020-11-10 19:32:44 +11:00
David Bomba	277eec508a	Clean up TODOs	2020-11-10 15:07:25 +11:00
David Bomba	ade0148d67	custom translations	2020-11-10 15:06:46 +11:00
David Bomba	b329d317ef	Custom labels	2020-11-10 15:04:53 +11:00
David Bomba	58ef5240cd	Custom Translations	2020-11-10 14:36:16 +11:00
David Bomba	efb40f1777	Custom translations	2020-11-10 14:27:25 +11:00
David Bomba	7977b2a1e7	Remove stale classes	2020-11-10 08:04:57 +11:00
David Bomba	284bb9be9f	Merge pull request #4283 from beganovich/v5-fix-quote-approval-status ... (v5) Fix quotes approval process in client portal	2020-11-10 07:29:14 +11:00
Benjamin Beganović	4dc3443d16	fix quotes not approving	2020-11-09 16:37:53 +01:00
Benjamin Beganović	f02826deed	Don't render delivery-not-table on products/tasks	2020-11-09 16:10:47 +01:00
Benjamin Beganović	8adab67251	- Pass $invoice to the getInvoiceDeliveryNote() in InvoiceService ... - GenerateDeliveryNote action for InvoiceService - New delivery-note-table element in the \Services\PdfMaker\Design.php - $item & $description variables in the HtmlEngine	2020-11-09 14:30:50 +01:00
David Bomba	af39d5e50c	Fixes for payment notifications	2020-11-09 21:26:36 +11:00
David Bomba	9174b7e628	Fixes for emails and reminders	2020-11-09 21:17:20 +11:00
David Bomba	be2f83cfea	Endless reminder activity	2020-11-09 16:00:15 +11:00
David Bomba	2e8cb84570	Payment emails	2020-11-09 13:57:34 +11:00
David Bomba	fcef2c72b3	Working on payment emails	2020-11-09 13:39:42 +11:00
David Bomba	087c442a64	Add custom values to payments table	2020-11-09 08:21:52 +11:00
=	fc92fbdaab	Fixes for tests	2020-11-08 22:01:32 +11:00
=	cd0bbbe096	Remove redundant classes	2020-11-08 21:53:47 +11:00
David Bomba	b174334263	Fixes for invoice templates	2020-11-08 16:21:18 +11:00
David Bomba	0d4ad91cd4	Fixes for reminder template emails	2020-11-08 08:17:30 +11:00
=	3a7a35c845	Fixes for import	2020-11-07 21:13:04 +11:00
David Bomba	84888b0bf0	Merge pull request #4280 from turbo124/v5-develop ... Fixes for import	2020-11-07 20:08:52 +11:00
=	2cf97caaaf	Fixes for import	2020-11-07 20:08:21 +11:00
Clément Gayot	9fd76f60e6	Remove useless "use"	2020-11-07 03:18:25 +01:00
David Bomba	07af666ca4	Merge pull request #4273 from turbo124/v5-develop ... Reminders	2020-11-07 07:03:57 +11:00
Benjamin Beganović	3768add8a0	pass $task_id inside of row item	2020-11-06 13:13:13 +01:00
Benjamin Beganović	a601702a0e	geTaskTimeLogs() helper	2020-11-06 13:13:04 +01:00
Benjamin Beganović	892c440ea4	fix items count() & add support for task times	2020-11-06 13:12:51 +01:00
David Bomba	60a141d529	Fixes for reminders	2020-11-06 15:43:10 +11:00
David Bomba	3928ab3e39	Merge branch 'v5-develop' of https://github.com/turbo124/invoiceninja into v5-develop	2020-11-06 07:53:43 +11:00
David Bomba	67741010f0	Refactoring remindersg	2020-11-05 21:36:55 +11:00
David Bomba	09fbc9762a	Fixes for custom emails.	2020-11-05 21:14:30 +11:00
David Bomba	cd08367ce6	Working on reminders	2020-11-05 13:59:19 +11:00
David Bomba	8e2cea7129	Working on reminders	2020-11-05 12:33:31 +11:00
David Bomba	4784e80859	Working on templates / reminders and late fees	2020-11-05 09:48:46 +11:00
David Bomba	a1afb38514	Fix for invoice attachment	2020-11-05 08:19:44 +11:00
David Bomba	3d11639cb4	Fixes for tests	2020-11-05 07:50:39 +11:00
David Bomba	100207f4cb	Merge pull request #4267 from turbo124/v5-develop ... Company Settings Implmentation	2020-11-05 07:49:10 +11:00
Benjamin Beganović	5c2bfaa8ce	Alpha testing on tasks: ... - Change 'products' to '$product' with design within: CreateEntityPdf, ActivityRepository, HtmlGenerationTest, Phantom - New 'task-table' element in the Services\PdfMaker\Design.php - buildTableHeader & buildTableBody are now more generic - processTaxColumns() now requires $type to be specified	2020-11-04 14:56:08 +01:00
Benjamin Beganović	e222aa8620	Refactor 'product-table-footer' to 'table-totals'	2020-11-04 11:23:06 +01:00
Benjamin Beganović	14b11ecbbd	Refactor total table columns: ... - $task.cost => $task.rate - $task.quantity => $task.hours	2020-11-04 11:22:43 +01:00
David Bomba	5c5102baeb	Working on reminders	2020-11-04 20:32:49 +11:00
David Bomba	d598aeeb03	Working on reminders	2020-11-04 19:43:20 +11:00
David Bomba	697fa568db	Working on company settings implementation	2020-11-04 18:57:16 +11:00
David Bomba	5fe85ca3f0	Working on company settings implmentation	2020-11-04 17:02:15 +11:00
David Bomba	529ef5d686	Working on settings implementation	2020-11-04 16:22:51 +11:00
David Bomba	c995ac5f44	Add API Documentation to repo	2020-11-04 12:27:07 +11:00
David Bomba	37aaa1fc5b	Fixes for importing company logo	2020-11-04 11:32:18 +11:00
David Bomba	5089f2183b	Merge pull request #4263 from turbo124/v5-develop ... Fix for removing company logo from storage	2020-11-04 10:57:22 +11:00
David Bomba	870a41a93e	Fix for removing company logo from storage	2020-11-04 10:56:29 +11:00
David Bomba	a3acc6a019	Update or Create product	2020-11-04 09:47:06 +11:00
David Bomba	64b703513d	Refactor company gateway schema for required fields	2020-11-04 08:26:28 +11:00
David Bomba	bbf240be2d	New fields for company gateway	2020-11-04 07:19:59 +11:00
Clément Gayot	92b4df729b	Support PDF design with UTF-8 characters	2020-11-03 16:18:07 +01:00
David Bomba	f98e7d15da	fixes for updating products	2020-11-04 00:57:48 +11:00
David Bomba	d762c5e842	Psalm code cleanup	2020-11-04 00:34:24 +11:00
David Bomba	13a00fc897	Redundant code cleanup	2020-11-04 00:27:41 +11:00
David Bomba	552ac4ee8f	Merge pull request #4257 from turbo124/v5-develop ... Event Tests	2020-11-03 23:45:04 +11:00
David Bomba	6e6a24359c	Expense events	2020-11-03 23:39:41 +11:00
David Bomba	14fd4a5af4	Event Tests	2020-11-03 23:35:05 +11:00
David Bomba	a98e9c3b68	Merge pull request #4252 from beganovich/v5-ach-refactor ... (v5) ACH payments with Stripe	2020-11-03 23:14:02 +11:00
David Bomba	5c13e1681b	Tests for events	2020-11-03 21:19:32 +11:00
David Bomba	6eb9f0f6a6	Event testing	2020-11-03 21:04:15 +11:00
David Bomba	e7a1e4c4db	Working on activities	2020-11-03 16:44:50 +11:00
David Bomba	9717424ce1	Payment Tests	2020-11-03 08:18:02 +11:00
Benjamin Beganović	f50bbd1900	Fix issue with the form	2020-11-02 16:29:02 +01:00
Benjamin Beganović	0942169d4f	Handle Alipay payments ... - Refactored main Alipay class - Added new N/A translation - Fixed issue with alipay.js	2020-11-02 16:20:38 +01:00
David Bomba	aa0b9ed976	Deprecate invoice fields	2020-11-02 21:12:58 +11:00
David Bomba	3434d5dd70	Add events for payments	2020-11-02 15:58:43 +11:00
David Bomba	53fad7eb40	Fixes for composer	2020-11-02 13:13:31 +11:00
David Bomba	30bfd0b808	Validation rules for credits and payments	2020-11-02 12:11:49 +11:00
David Bomba	9bbffea260	Fixes for setup	2020-11-02 11:23:02 +11:00
David Bomba	a829db9890	Fixes for setup	2020-11-02 09:51:56 +11:00
David Bomba	ae361ed22f	Update composer	2020-11-02 08:49:58 +11:00
David Bomba	8e27999246	Merge pull request #4246 from turbo124/v5-develop ... is_disabled for recurring invoices	2020-11-02 07:35:09 +11:00
Benjamin Beganović	7f3c4ada5a	Merge remote-tracking branch 'upstream/v5-develop' into v2-frontend-refactor	2020-11-01 19:26:43 +01:00
Benjamin Beganović	4c27652545	ACH payments	2020-11-01 19:21:31 +01:00
Benjamin Beganović	1ae2649be6	Stripe ACH authorization & verification	2020-11-01 18:47:48 +01:00
Benjamin Beganović	99c30846ad	Stripe: Payments with tokens & error handling	2020-11-01 16:52:37 +01:00
Benjamin Beganović	7d50430a9e	Stripe with credit card: ... - Remove createPaymentData from StripePaymentDriver	2020-11-01 16:37:41 +01:00
Benjamin Beganović	7e30093429	Checkout.com payments with token: ... - Convert "true" from frontend to boolean in PaymentResponseRequest - Reference correct 'transaction_reference' in BaseDriver & Checkout\Utilities - Frontend switching between token & credit card when making payments with Checkout.com - New 'pay_with' translation string - Added 'save-card--container' to save card partial - Ensure we show whole transaction reference string in payments/show.blade	2020-11-01 15:56:17 +01:00
Benjamin Beganović	d15701b4b3	Checkout.com with credit card	2020-11-01 15:08:47 +01:00
Benjamin Beganović	d2e677cb9d	Merge remote-tracking branch 'origin/v5-stripe-backend-refactor' into v2-frontend-refactor	2020-11-01 14:49:11 +01:00
David Bomba	f6b53d27e6	is_disabled for recurring invoices	2020-11-01 21:29:34 +11:00
David Bomba	f911d17a6b	Fix for migration	2020-11-01 20:41:49 +11:00
David Bomba	503cc6a5a8	Link entities	2020-11-01 19:53:23 +11:00