529 Commits

Author	SHA1	Message	Date
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	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
David Bomba	1181f9de62	Merge branch 'v5-develop' into authorize_refactor	2020-11-26 22:43:25 +11:00
David Bomba	5e0bcfbc88	working on authorize	2020-11-26 20:39:35 +11:00
Benjamin Beganović	ae88d5e08e	php-cs-fixer format	2020-11-25 15:19:52 +01:00
David Bomba	137231c95e	cs-fixer	2020-11-25 21:30:00 +11:00
David Bomba	efbf8069b5	Merge pull request #4360 from turbo124/v5-develop ... Fixes for migrations	2020-11-25 20:24:06 +11:00
Benjamin Beganović	242d48cd1a	update variables for .env instead of writing completely new file	2020-11-24 11:45:27 +01: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	b5fe5070b5	Working on migrations	2020-11-23 23:55:04 +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	6eaf78a1d5	Fix for casting line items	2020-11-22 16:34:05 +11:00
David Bomba	68a6ea4d22	Merge branch 'v5-develop' into v5-develop	2020-11-16 12:20:44 +11:00
Benjamin Beganović	956e1fe287	notes => description, cost => unit_cost	2020-11-16 00:42:21 +01:00
David Bomba	a1119f9bbe	Fix edge cases with cloning invoice	2020-11-15 19:24:57 +11:00
David Bomba	b1591632d8	Refactor defaults for invoice PDF	2020-11-13 22:52:11 +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	58ef5240cd	Custom Translations	2020-11-10 14:36:16 +11: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	9174b7e628	Fixes for emails and reminders	2020-11-09 21:17:20 +11:00
=	2cf97caaaf	Fixes for import	2020-11-07 20:08:21 +11: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
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	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ć	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	529ef5d686	Working on settings implementation	2020-11-04 16:22:51 +11:00
David Bomba	37aaa1fc5b	Fixes for importing company logo	2020-11-04 11:32:18 +11:00
David Bomba	870a41a93e	Fix for removing company logo from storage	2020-11-04 10:56:29 +11:00
David Bomba	53fad7eb40	Fixes for composer	2020-11-02 13:13:31 +11:00
David Bomba	9bbffea260	Fixes for setup	2020-11-02 11:23:02 +11:00
David Bomba	ae44b9c032	Version bump + linking tasks expenses with invoices	2020-11-01 18:53:43 +11:00
=	6479b2fd3e	Fix for laravel 8 route file regression + psalm cleanup	2020-11-01 16:09:09 +11:00
=	dfb55dbd8b	remove is_migrating	2020-11-01 14:19:03 +11:00
David Bomba	86d472fa05	Project numbers	2020-10-29 22:01:37 +11:00
David Bomba	c1c8b6c14e	Change start_time datatype	2020-10-29 20:40:13 +11:00
David Bomba	9aeb2d7a5b	Psalm cleanup	2020-10-28 21:10:49 +11:00
David Bomba	7886482fb5	Localize dates in entities	2020-10-28 19:32:14 +11:00
David Bomba	d7930e4c14	Remove redundant classes	2020-10-28 17:27:10 +11:00
David Bomba	a07f04e1df	Refactor Template Engine	2020-10-28 16:50:06 +11:00
David Bomba	f6435ab030	Working on emails	2020-10-27 22:57:12 +11:00
David Bomba	6650f5404f	Fixes for camelcase Invitation names	2020-10-27 15:26:56 +11:00
David Bomba	417562b80d	Fixes for phantom JS view invitation	2020-10-27 15:26:04 +11:00
David Bomba	1de7a693cc	Refactor Phantom JS building HTML	2020-10-27 14:09:13 +11:00
David Bomba	8f53424017	Fixes	2020-10-27 06:10:04 +11:00
David Bomba	0453c989eb	PDF Entity generation tests	2020-10-26 20:13:00 +11:00
David Bomba	8d508bb1f9	Refactor pdf generation	2020-10-26 15:06:58 +11:00
David Bomba	5ffd2b4678	Add sort order to task status	2020-10-26 08:05:33 +11:00
David Bomba	f26a20dbbd	working on date formatting	2020-10-26 06:15:03 +11:00
David Bomba	3e21c301a5	Fix for custom values	2020-10-24 18:01:07 +11:00
David Bomba	50eaf0cc78	Fix for date localization	2020-10-24 14:38:53 +11:00
David Bomba	bc2b0f4aae	Fix for recurring number collisions - use dispatchNow()	2020-10-20 11:53:54 +11:00
David Bomba	686f12261d	Project number	2020-10-20 10:55:14 +11:00
David Bomba	f0e4a94bee	Task Statuses	2020-10-20 10:01:59 +11:00
David Bomba	93ea785131	Fix for incorrect company country being displayed	2020-10-19 08:21:14 +11:00
David Bomba	3d40df6264	Fixes for ledger id in transformer	2020-10-16 08:55:24 +11:00
David Bomba	07cbb6a71a	Fixes for showing recurring invoices in the client portal	2020-10-16 07:35:15 +11:00
Benjamin Beganović	1d89656bad	Setup changes: ... - Return actual SQL error when connection is failing - Update buttons on setup with correct color	2020-10-14 13:40:00 +02:00
David Bomba	b7292a0432	Update email validation	2020-10-13 08:27:42 +11:00
David Bomba	61646ec55c	Merge pull request #4151 from turbo124/v2 ... Console commands for small test data batches	2020-10-10 14:32:49 +11:00
David Bomba	6e00b09065	Add partial payment template	2020-10-10 07:31:24 +11:00
Benjamin Beganović	b0c383f75b	Show empty string if country is not set: ... - Replace "No country set" with empty string in HtmlEngine.php - Allow country_id & shipping_country_id to be null in shipping-address.blade.php & personal-address.blade.php	2020-10-09 16:03:27 +02:00
David Bomba	9187946760	Fixes for gateway	2020-10-09 22:13:33 +11:00
David Bomba	44d31ce326	Move cache clearance to base controller	2020-10-09 17:55:03 +11:00
David Bomba	c48b02a690	Static template data	2020-10-09 13:28:33 +11:00
David Bomba	b8b3149582	Working on recurring & analytics	2020-10-07 14:00:32 +11:00
David Bomba	70a575386c	Fixes for designs in migration:	2020-10-07 10:16:57 +11:00
David Bomba	3aa5e2e4eb	Minor release	2020-10-06 21:06:14 +11:00
David Bomba	484b28d3ce	Fixes for recurring migratoin	2020-10-06 11:52:16 +11:00
David Bomba	be388ba493	Fixes for tests	2020-10-05 08:37:12 +11:00
David Bomba	f6ac4a8201	Add mysqlnd requirement to systemhealth check	2020-10-04 19:52:58 +11:00
David Bomba	ee8ae09314	Fixes for no invitation	2020-10-03 18:09:48 +10:00
David Bomba	a4ddcc90fa	Fixes for Email preview with blank entity	2020-10-02 07:29:11 +10:00
David Bomba	15320500c0	Merge pull request #4126 from turbo124/v2 ... Laravel 8 support	2020-10-01 21:47:07 +10:00
David Bomba	92c65f73da	Merge pull request #4125 from beganovich/v2-fix-font-size-variable ... Rename $font-size to $font_size & remove all comments from designs	2020-10-01 21:45:00 +10:00
David Bomba	b94bfacc19	Fixes for demo mode in l8	2020-10-01 21:41:23 +10:00
Benjamin Beganović	b40d2bc50b	Replace $font-size with $font_size	2020-10-01 13:37:34 +02:00
Benjamin Beganović	5e773a03c8	Add $primary_color & $seconday_color to variables list	2020-10-01 13:20:32 +02:00
David Bomba	8756a89885	Allow login using contact_key or client_hash	2020-09-30 08:42:55 +10:00
David Bomba	e310118bf4	Fixes for cleanly deleting and restoring users	2020-09-29 08:08:44 +10:00
Benjamin Beganović	69b24f95c4	Centralised variables: ... - New Helpers.php with sharedEmailVariables - Merged settings from TemplateEngine - @isset check for $whitelabel in the master.blade	2020-09-28 12:36:51 +02:00
David Bomba	7b926980f1	Merge pull request #4111 from turbo124/v2 ... Only show implemented gateways	2020-09-28 20:34:52 +10:00
David Bomba	fd67a48c91	Bug fixes	2020-09-27 20:39:13 +10:00
Benjamin Beganović	c5fcb56ca6	Add whitelabel to e-mail	2020-09-25 13:57:02 +02:00
David Bomba	b906e1e92f	Fixes for hasrecurrence trait	2020-09-24 13:40:13 +10:00
David Bomba	a43688fd30	Append DELETED to invoice number on delete action	2020-09-23 20:52:54 +10:00
David Bomba	2627ec8894	PHP Cli version	2020-09-23 14:11:34 +10:00
David Bomba	ab0ec5e2cb	Vendor API endpoints	2020-09-23 10:16:19 +10:00
David Bomba	617a923894	Fixes for notifications:	2020-09-21 20:54:58 +10:00
Benjamin Beganović	792f9717f7	Dynamic primary color borders on e-mails	2020-09-18 14:27:20 +02:00
David Bomba	083e834400	Merge pull request #4082 from turbo124/v2 ... Working on recurring invoices	2020-09-18 17:05:05 +10:00
Benjamin Beganović	32b5ee26ba	Update $whitelabel variable	2020-09-17 14:28:55 +02:00
David Bomba	7f825f9ed0	Fixes for paid_to_date formatting	2020-09-17 08:24:56 +10:00
David Bomba	6a0f958c2e	Fixes for previewing email templates	2020-09-17 08:22:23 +10:00
Benjamin Beganović	1dcc24d06b	Fix $details_label & texts.thanks on Elegant design	2020-09-16 12:16:56 +02:00
David Bomba	766343d8b9	Recurring dates	2020-09-14 22:13:15 +10:00
David Bomba	bae82b56c1	Add license	2020-09-14 21:11:46 +10:00
David Bomba	559a4d831f	Show npm/node status in health check	2020-09-14 08:25:09 +10:00
David Bomba	ce4b5098fc	Merge pull request #4057 from beganovich/v2-show-fees-on-pdfs ... Show taxes/fees on bottom of PDFs	2020-09-11 19:10:52 +10:00
Benjamin Beganović	6673d58b3a	Show fees on bottom of PDFs	2020-09-11 10:07:59 +02:00
Benjamin Beganović	de6034f3d4	Don't skip items with type_id = 4	2020-09-11 09:23:16 +02:00
David Bomba	c55f660f7f	Generic handling page for unsuccessful payments	2020-09-11 08:30:12 +10:00
Benjamin Beganović	3b7bf97dd8	Add $font-size variable & fix insert of designs	2020-09-09 17:14:55 +02:00
Benjamin Beganović	6288529907	- Accept every design as CUSTOM in PreviewController ... - Logic for excluding elements in table footer - PdfMaker will now return plain HTML + str_replace filter - HTMLEngine updated variables and aliases - Added 'payment_due' translation - Hipster: Updated variables	2020-09-09 14:47:26 +02:00
David Bomba	c389ff49f2	Add missing data fields from HtmlEngine	2020-09-08 14:06:46 +10:00
David Bomba	77119e69fe	Add primary/secondary_color to companysettings	2020-09-08 14:02:00 +10:00
Benjamin Beganović	0bf39c739d	Merge branch 'v2' into v2-fix-setup-issues	2020-09-07 00:15:45 +02:00
David Bomba	ba75a44eb8	Laravel 7.x Shift (#40) ... * Adopt Laravel coding style The Laravel framework adopts the PSR-2 coding style with some additions. Laravel apps *should* adopt this coding style as well. However, Shift allows you to customize the adopted coding style by adding your own [PHP CS Fixer][1] `.php_cs` config to your project. You may use [Shift's .php_cs][2] file as a base. [1]: https://github.com/FriendsOfPHP/PHP-CS-Fixer [2]: https://gist.github.com/laravel-shift/cab527923ed2a109dda047b97d53c200 * Shift bindings PHP 5.5.9+ adds the new static `class` property which provides the fully qualified class name. This is preferred over using class name strings as these references are checked by the parser. * Shift core files * Shift to Throwable * Add laravel/ui dependency * Unindent vendor mail templates * Shift config files * Default config files In an effort to make upgrading the constantly changing config files easier, Shift defaulted them so you can review the commit diff for changes. Moving forward, you should use ENV variables or create a separate config file to allow the core config files to remain automatically upgradeable. * Shift Laravel dependencies * Shift cleanup * Upgrade to Laravel 7 Co-authored-by: Laravel Shift <shift@laravelshift.com>	2020-09-06 19:38:10 +10:00
Benjamin Beganović	7a5027f1b4	Enable sandboxing with PDFs & fix setup page issues	2020-09-06 04:23:04 +02:00
Benjamin Beganović	1a66f1835f	Merge remote-tracking branch 'upstream/v2' into v2-pdfmaker-design-improvements	2020-09-04 13:20:39 +02:00
Benjamin Beganović	219666f765	Generating PDFs using new templates	2020-09-04 13:17:30 +02:00
David Bomba	bb4aac1aeb	Merge pull request #4025 from turbo124/v2 ... Gateway fees implementation	2020-08-31 17:58:43 +10:00
David Bomba	32e987a1b2	Remove require NPM/NODE from setup checks	2020-08-29 23:32:11 +10:00
Benjamin Beganović	c8ff06e61d	Update designs with new margins & paddings	2020-08-27 13:01:19 +02:00
David Bomba	79e0fa56e2	Convert currency string to float	2020-08-26 10:47:50 +10:00
=	f6c62f3607	fixes for invoice designs	2020-08-22 22:24:41 +10:00
David Bomba	9e75283380	Add label field to company gateways table	2020-08-22 08:16:40 +10:00
David Bomba	92036b74af	Add exchange_rate to entities	2020-08-19 13:08:25 +10:00
David Bomba	05ce11138e	Fixes for payment number creation for online payments	2020-08-19 11:06:19 +10:00
David Bomba	3850c6b516	Change to display only	2020-08-19 08:51:30 +10:00
Benjamin Beganović	0a493c275e	Enable is_public for document uploads	2020-08-18 16:12:46 +02:00
David Bomba	5bfcdc80b2	Merge pull request #3972 from beganovich/v2-0708-pdfmaker-integration ... (wip) End-to-end PDF Maker integration	2020-08-14 06:53:00 +10:00
Benjamin Beganović	4769aeac67	Reduce logo size & update balance due string for invoices	2020-08-13 13:46:53 +02:00
Benjamin Beganović	a29e3b83ae	Variables improvements: ... - Update $balance_due - Update $total	2020-08-13 13:10:59 +02:00
David Bomba	e21e70bdcd	Fixes for tests	2020-08-13 10:57:06 +10:00
David Bomba	e347c5ad51	Document permissions	2020-08-12 13:13:39 +10:00
Benjamin Beganović	d00bbc7a37	Alias $outstanding as $balance_due	2020-08-10 17:04:42 +02:00
Benjamin Beganović	2f40804568	Update designs so they reference Invoice or Quote	2020-08-10 13:18:05 +02:00
Benjamin Beganović	f7408e1fb3	Added new labels & update designs	2020-08-07 17:47:17 +02:00
David Bomba	c220108168	Add documents as default includes	2020-08-06 13:04:09 +10:00
David Bomba	eb4af3150a	Merge pull request #3967 from turbo124/v2 ... Customize bulk templates	2020-08-06 08:48:37 +10:00
David Bomba	f773356f70	Merge pull request #3951 from beganovich/v2-pdfmaker-integration ... Designs integration with new PDF Maker	2020-08-06 07:57:56 +10:00
David Bomba	2fdf351be3	Customize bulk templates	2020-08-05 22:18:29 +10:00
David Bomba	8b9c83da1e	Polish for Phantom JS implementation	2020-08-04 21:29:22 +10:00
David Bomba	d7dbde3789	Implement PhantomJS	2020-08-04 21:00:19 +10:00