Commit Graph

67 Commits

Author SHA1 Message Date
Benjamin Beganović ef0584b442 add entity_string in htmlengine 2020-12-08 16:44:35 +01:00
Benjamin Beganović 4bf46a45b1 Update reference on balance due 2020-12-08 13:57:31 +01:00
Benjamin Beganović 1a066f2f9f add alias to task searvice from task product 2020-12-01 15:18:48 +01:00
Benjamin Beganović ae88d5e08e php-cs-fixer format 2020-11-25 15:19:52 +01: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
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 100207f4cb
Merge pull request #4267 from turbo124/v5-develop
Company Settings Implmentation
2020-11-05 07:49:10 +11: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 529ef5d686 Working on settings implementation 2020-11-04 16:22:51 +11:00
David Bomba 53fad7eb40 Fixes for composer 2020-11-02 13:13:31 +11:00
= 6479b2fd3e Fix for laravel 8 route file regression + psalm cleanup 2020-11-01 16:09:09 +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 f6435ab030 Working on emails 2020-10-27 22:57:12 +11:00
David Bomba 8f53424017 Fixes 2020-10-27 06:10:04 +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 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
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 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
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 fd67a48c91 Bug fixes 2020-09-27 20:39:13 +10: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 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
Benjamin Beganović 6673d58b3a Show fees on bottom of PDFs 2020-09-11 10:07:59 +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
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ć 219666f765 Generating PDFs using new templates 2020-09-04 13:17:30 +02:00
Benjamin Beganović c8ff06e61d Update designs with new margins & paddings 2020-08-27 13:01:19 +02:00
David Bomba 9e75283380 Add label field to company gateways table 2020-08-22 08:16:40 +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