Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-09-21 00:41:34 +02:00
Code Issues Releases Activity
8d62b704e6
invoiceninja/app/Utils/Traits/MakesInvoiceValues.php

887 lines
37 KiB
PHP
Raw Normal View History

working on invoice labels and template values
2019-09-02 07:08:26 +02:00
<?php
/**
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 11:38:10 +02:00
* Invoice Ninja (https://invoiceninja.com).
working on invoice labels and template values
2019-09-02 07:08:26 +02:00
*
* @link https://github.com/invoiceninja/invoiceninja source repository
*
Fix for password protected authorization (#3198) * Remove unnecessary save() on invoice * Update copyright * Working on Credit Repository * Implement credits as a paymentable entity * Add credit_id to transformer * fix rules for update payment * Fix random deleted_at keys in transformers * Fix for password_protect check
2020-01-07 01:13:47 +01:00
* @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com)
working on invoice labels and template values
2019-09-02 07:08:26 +02:00
*
* @license https://opensource.org/licenses/AAL
*/
namespace App\Utils\Traits;
Refactors (#3148) * Refactor company properties to be presented from settings object instead of company properties * Working on Email Tests * Working on emails * Working on email templats * Include text version of email * Refactor Email template builder into trait' * Fix for custom_value4 * Refactor payment_date -> date && payment_type_id -> type_id * expose paymentables to API * expose paymentables to API * Implement a next_send_date field in invoice/quote tables to allow control over reminder scheduling * Add custom_values to users,documents and company_gateways tables
2019-12-16 12:34:38 +01:00
use App\Models\Country;
Fixes for designs (#3376) * Fixes for detaching a useR * Fixes for designs
2020-02-26 05:11:17 +01:00
use App\Models\Credit;
use App\Models\Invoice;
use App\Models\Quote;
working on invoice labels and template values
2019-09-02 07:08:26 +02:00
use App\Utils\Number;
/**
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 11:38:10 +02:00
* Class MakesInvoiceValues.
working on invoice labels and template values
2019-09-02 07:08:26 +02:00
*/
trait MakesInvoiceValues
{
Fixes for tests (#3184) * fix typo * php-cs traits * CS fixer pass * Password protect User routes * Implement checks to prevent editing a deleted record * Clean up payment flows * Fixes for tests
2019-12-30 22:59:12 +01:00
/**
* Master list of columns used
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 11:38:10 +02:00
* for invoice tables.
Fixes for tests (#3184) * fix typo * php-cs traits * CS fixer pass * Password protect User routes * Implement checks to prevent editing a deleted record * Clean up payment flows * Fixes for tests
2019-12-30 22:59:12 +01:00
* @var array
*/
Dynamic invoice tables for PDF generation
2019-09-04 01:16:23 +02:00
private static $master_columns = [
'date',
'discount',
'product_key',
'notes',
'cost',
'quantity',
'tax_name1',
'tax_name2',
Add additional tax rate 3 into the system
2019-10-05 04:28:23 +02:00
'tax_name3',
Dynamic invoice tables for PDF generation
2019-09-04 01:16:23 +02:00
'line_total',
'custom_label1',
'custom_label2',
'custom_label3',
'custom_label4',
];
Fixes for invoice update and invoice designs (#3302) * BaseController cleanup * Working on invoice designs * Working on invoice designs * working on invoice designs * working on invoice designs * invoice designs * Working on Invoice Designs * Fixes for user settings object * Working on invoice designs * Fixes for encoded user settings * Working on contact localized invoice pdfs * working on invoice designs * Fix for invoice update 500 error
2020-02-10 10:53:02 +01:00
private static $custom_label_fields = [
'invoice1',
'invoice2',
'invoice3',
'invoice4',
'surcharge1',
'surcharge2',
'surcharge3',
'surcharge4',
'client1',
'client2',
'client3',
'client4',
'contact1',
'contact2',
'contact3',
'contact4',
'company1',
'company2',
'company3',
'company4',
Invoice templates
2019-09-04 03:45:53 +02:00
];
Design Changes (#3504) * Fixes for tests * Working on PDF tables * Fixes for null values in designs * Refactoring entity variables for PDF * Fixes for pdf variables * Minor fixes for designs * Working on variable replacement for tables * Refactoring designs * Refactoring designs * Refactoring design implementation * Working on refactoring designs * Serve tailwind locally * Design changes
2020-03-16 11:12:10 +01:00
public function makeCustomField($field) :string
Working on building dynamic tables for invoices
2019-09-03 01:00:52 +02:00
{
Improve eager loads (#3289) * Working on invoice designs * Working on Invoice Designs * Improve eager loads
2020-02-06 10:35:51 +01:00
$custom_fields = $this->company->custom_fields;
Fixes for self-update (#3514) * minor fix for payment notifications * styleci * Limit Self updating to self hosters only : * Fixes for designs * Minor fixes for self-update
2020-03-21 06:37:30 +01:00
if ($custom_fields && property_exists($custom_fields, $field)) {
Design Changes (#3504) * Fixes for tests * Working on PDF tables * Fixes for null values in designs * Refactoring entity variables for PDF * Fixes for pdf variables * Minor fixes for designs * Working on variable replacement for tables * Refactoring designs * Refactoring designs * Refactoring design implementation * Working on refactoring designs * Serve tailwind locally * Design changes
2020-03-16 11:12:10 +01:00
$custom_field = $custom_fields->{$field};
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 11:38:10 +02:00
$custom_field_parts = explode('|', $custom_field);
Design Changes (#3504) * Fixes for tests * Working on PDF tables * Fixes for null values in designs * Refactoring entity variables for PDF * Fixes for pdf variables * Minor fixes for designs * Working on variable replacement for tables * Refactoring designs * Refactoring designs * Refactoring design implementation * Working on refactoring designs * Serve tailwind locally * Design changes
2020-03-16 11:12:10 +01:00
return $custom_field_parts[0];
Fixes for tests (#3184) * fix typo * php-cs traits * CS fixer pass * Password protect User routes * Implement checks to prevent editing a deleted record * Clean up payment flows * Fixes for tests
2019-12-30 22:59:12 +01:00
}
Working on building dynamic tables for invoices
2019-09-03 01:00:52 +02:00
Design Changes (#3504) * Fixes for tests * Working on PDF tables * Fixes for null values in designs * Refactoring entity variables for PDF * Fixes for pdf variables * Minor fixes for designs * Working on variable replacement for tables * Refactoring designs * Refactoring designs * Refactoring design implementation * Working on refactoring designs * Serve tailwind locally * Design changes
2020-03-16 11:12:10 +01:00
return '';
}
Implement Custom Values (#3619) * Add report errors to account transformer * Implement resolving custom values
2020-04-11 03:41:43 +02:00
private function findCustomType($field)
{
$custom_fields = $this->company->custom_fields;
if ($custom_fields && property_exists($custom_fields, $field)) {
$custom_field = $custom_fields->{$field};
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 11:38:10 +02:00
$custom_field_parts = explode('|', $custom_field);
Implement Custom Values (#3619) * Add report errors to account transformer * Implement resolving custom values
2020-04-11 03:41:43 +02:00
return $custom_field_parts[1];
}
return '';
}
/**
* This method produces the key /value pairs for
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 11:38:10 +02:00
* custom fields.
Implement Custom Values (#3619) * Add report errors to account transformer * Implement resolving custom values
2020-04-11 03:41:43 +02:00
*
* We need to explode the field name and search for the |
* we split on the pipe, the first value is the field name
* and the second is the field _type_
*
* We transform the $value depending the $field type
Reminders (#3630) * Performance improvements moving from str_replace to strtr * Remove legacy docs * Clean up credit transformer * Working on invoice emails * Clean up for invoice designs * Tests for light and dark theme emails * Working on reminder scheduling * Reminder Job Class * Fixes for github actions * PHP CS * Test for reminders * Test for reminders
2020-04-15 02:30:52 +02:00
*
Implement Custom Values (#3619) * Add report errors to account transformer * Implement resolving custom values
2020-04-11 03:41:43 +02:00
* @param string $field The full field name
* @param string $value The custom value
* @return array The key value pair
*/
private function makeCustomFieldKeyValuePair($field, $value)
{
Reminders (#3630) * Performance improvements moving from str_replace to strtr * Remove legacy docs * Clean up credit transformer * Working on invoice emails * Clean up for invoice designs * Tests for light and dark theme emails * Working on reminder scheduling * Reminder Job Class * Fixes for github actions * PHP CS * Test for reminders * Test for reminders
2020-04-15 02:30:52 +02:00
if ($this->findCustomType($field) == 'date') {
Implement Custom Values (#3619) * Add report errors to account transformer * Implement resolving custom values
2020-04-11 03:41:43 +02:00
$value = $this->formatDate($value, $this->client->date_format());
Reminders (#3630) * Performance improvements moving from str_replace to strtr * Remove legacy docs * Clean up credit transformer * Working on invoice emails * Clean up for invoice designs * Tests for light and dark theme emails * Working on reminder scheduling * Reminder Job Class * Fixes for github actions * PHP CS * Test for reminders * Test for reminders
2020-04-15 02:30:52 +02:00
} elseif ($this->findCustomType($field) == 'switch') {
Implement Custom Values (#3619) * Add report errors to account transformer * Implement resolving custom values
2020-04-11 03:41:43 +02:00
$value = ctrans('texts.'.$value);
Reminders (#3630) * Performance improvements moving from str_replace to strtr * Remove legacy docs * Clean up credit transformer * Working on invoice emails * Clean up for invoice designs * Tests for light and dark theme emails * Working on reminder scheduling * Reminder Job Class * Fixes for github actions * PHP CS * Test for reminders * Test for reminders
2020-04-15 02:30:52 +02:00
}
Implement Custom Values (#3619) * Add report errors to account transformer * Implement resolving custom values
2020-04-11 03:41:43 +02:00
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 11:38:10 +02:00
if (! $value) {
Implement Custom Values (#3619) * Add report errors to account transformer * Implement resolving custom values
2020-04-11 03:41:43 +02:00
$value = '';
Reminders (#3630) * Performance improvements moving from str_replace to strtr * Remove legacy docs * Clean up credit transformer * Working on invoice emails * Clean up for invoice designs * Tests for light and dark theme emails * Working on reminder scheduling * Reminder Job Class * Fixes for github actions * PHP CS * Test for reminders * Test for reminders
2020-04-15 02:30:52 +02:00
}
Implement Custom Values (#3619) * Add report errors to account transformer * Implement resolving custom values
2020-04-11 03:41:43 +02:00
return ['value' => $value, 'field' => $this->makeCustomField($field)];
}
Design Changes (#3504) * Fixes for tests * Working on PDF tables * Fixes for null values in designs * Refactoring entity variables for PDF * Fixes for pdf variables * Minor fixes for designs * Working on variable replacement for tables * Refactoring designs * Refactoring designs * Refactoring design implementation * Working on refactoring designs * Serve tailwind locally * Design changes
2020-03-16 11:12:10 +01:00
public function makeLabels($contact = null) :array
{
$data = [];
$values = $this->makeLabelsAndValues($contact);
Fixes for self-update (#3514) * minor fix for payment notifications * styleci * Limit Self updating to self hosters only : * Fixes for designs * Minor fixes for self-update
2020-03-21 06:37:30 +01:00
foreach ($values as $key => $value) {
Design Changes (#3504) * Fixes for tests * Working on PDF tables * Fixes for null values in designs * Refactoring entity variables for PDF * Fixes for pdf variables * Minor fixes for designs * Working on variable replacement for tables * Refactoring designs * Refactoring designs * Refactoring design implementation * Working on refactoring designs * Serve tailwind locally * Design changes
2020-03-16 11:12:10 +01:00
$data[$key.'_label'] = $value['label'];
}
Improve eager loads (#3289) * Working on invoice designs * Working on Invoice Designs * Improve eager loads
2020-02-06 10:35:51 +01:00
Fixes for tests (#3184) * fix typo * php-cs traits * CS fixer pass * Password protect User routes * Implement checks to prevent editing a deleted record * Clean up payment flows * Fixes for tests
2019-12-30 22:59:12 +01:00
return $data;
}
Working on building dynamic tables for invoices
2019-09-03 01:00:52 +02:00
Fixes for tests (#3184) * fix typo * php-cs traits * CS fixer pass * Password protect User routes * Implement checks to prevent editing a deleted record * Clean up payment flows * Fixes for tests
2019-12-30 22:59:12 +01:00
/**
* Transforms all placeholders
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 11:38:10 +02:00
* to invoice values.
Fixes for tests (#3184) * fix typo * php-cs traits * CS fixer pass * Password protect User routes * Implement checks to prevent editing a deleted record * Clean up payment flows * Fixes for tests
2019-12-30 22:59:12 +01:00
*
Psalm cleanup
2020-10-28 11:10:49 +01:00
* @param null $contact
Fixes for tests (#3184) * fix typo * php-cs traits * CS fixer pass * Password protect User routes * Implement checks to prevent editing a deleted record * Clean up payment flows * Fixes for tests
2019-12-30 22:59:12 +01:00
* @return array returns an array
Clean up trait
2019-09-04 23:50:16 +02:00
* of keyed labels (appended with _label)
Working on building dynamic tables for invoices
2019-09-03 01:00:52 +02:00
*/
Bug fixes for middleware/ (#3167) * Fix formatting and variable insertion for email templates * Refactoring for invoice emails * Fixes for midddleware
2019-12-24 22:55:29 +01:00
public function makeValues($contact = null) :array
Design Changes (#3504) * Fixes for tests * Working on PDF tables * Fixes for null values in designs * Refactoring entity variables for PDF * Fixes for pdf variables * Minor fixes for designs * Working on variable replacement for tables * Refactoring designs * Refactoring designs * Refactoring design implementation * Working on refactoring designs * Serve tailwind locally * Design changes
2020-03-16 11:12:10 +01:00
{
$data = [];
$values = $this->makeLabelsAndValues($contact);
Fixes for self-update (#3514) * minor fix for payment notifications * styleci * Limit Self updating to self hosters only : * Fixes for designs * Minor fixes for self-update
2020-03-21 06:37:30 +01:00
foreach ($values as $key => $value) {
Design Changes (#3504) * Fixes for tests * Working on PDF tables * Fixes for null values in designs * Refactoring entity variables for PDF * Fixes for pdf variables * Minor fixes for designs * Working on variable replacement for tables * Refactoring designs * Refactoring designs * Refactoring design implementation * Working on refactoring designs * Serve tailwind locally * Design changes
2020-03-16 11:12:10 +01:00
$data[$key] = $value['value'];
}
return $data;
}
Remove redundant classes
2020-10-28 07:27:10 +01:00
// public function buildLabelsAndValues($contact)
// {
// $data = [];
// $values = $this->makeLabelsAndValues($contact);
// foreach ($values as $key => $value) {
// $data['values'][$key] = $value['value'];
// $data['labels'][$key.'_label'] = $value['label'];
// }
// return $data;
// }
// private function makeLabelsAndValues($contact = null) :array
// {
// if (! $this->client->currency() || ! $this->client) {
// throw new \Exception(debug_backtrace()[1]['function'], 1);
// exit;
// }
// $settings = $this->client->getMergedSettings();
// if (! $contact) {
// $contact = $this->client->primary_contact()->first();
// }
// $calc = $this->calc();
// $invitation = $this->invitations->where('client_contact_id', $contact->id)->first();
// $data = [];
// $data['$tax'] = ['value' => '', 'label' => ctrans('texts.tax')];
// $data['$app_url'] = ['value' => $this->generateAppUrl(), 'label' => ''];
// $data['$from'] = ['value' => '', 'label' => ctrans('texts.from')];
// $data['$to'] = ['value' => '', 'label' => ctrans('texts.to')];
// $data['$total_tax_labels'] = ['value' => $this->totalTaxLabels(), 'label' => ctrans('texts.taxes')];
// $data['$total_tax_values'] = ['value' => $this->totalTaxValues(), 'label' => ctrans('texts.taxes')];
// $data['$line_tax_labels'] = ['value' => $this->lineTaxLabels(), 'label' => ctrans('texts.taxes')];
// $data['$line_tax_values'] = ['value' => $this->lineTaxValues(), 'label' => ctrans('texts.taxes')];
// $data['$date'] = ['value' => $this->date ?: '&nbsp;', 'label' => ctrans('texts.date')];
// //$data['$invoice_date'] = ['value' => $this->date ?: '&nbsp;', 'label' => ctrans('texts.invoice_date')];
// $data['$invoice.date'] = &$data['$date'];
// $data['$invoice.due_date'] = ['value' => $this->due_date ?: '&nbsp;', 'label' => ctrans('texts.due_date')];
// $data['$due_date'] = &$data['$invoice.due_date'];
// $data['$invoice.number'] = ['value' => $this->number ?: '&nbsp;', 'label' => ctrans('texts.invoice_number')];
// $data['$invoice.po_number'] = ['value' => $this->po_number ?: '&nbsp;', 'label' => ctrans('texts.po_number')];
// $data['$line_taxes'] = ['value' => $this->makeLineTaxes() ?: '&nbsp;', 'label' => ctrans('texts.taxes')];
// $data['$invoice.line_taxes'] = &$data['$line_taxes'];
// $data['$total_taxes'] = ['value' => $this->makeTotalTaxes() ?: '&nbsp;', 'label' => ctrans('texts.taxes')];
// $data['$invoice.total_taxes'] = &$data['$total_taxes'];
// if ($this instanceof Invoice) {
// $data['$entity_label'] = ['value' => '', 'label' => ctrans('texts.invoice')];
// $data['$number'] = ['value' => $this->number ?: '&nbsp;', 'label' => ctrans('texts.invoice_number')];
// $data['$entity.terms'] = ['value' => $this->terms ?: '&nbsp;', 'label' => ctrans('texts.invoice_terms')];
// $data['$terms'] = &$data['$entity.terms'];
// if($invitation)
// $data['$view_link'] = ['value' => '<a href="'.$invitation->getLink().'">'.ctrans('texts.view_invoice').'</a>', 'label' => ctrans('texts.view_invoice')];
// // $data['$view_link'] = ['value' => $invitation->getLink(), 'label' => ctrans('texts.view_invoice')];
// }
// if ($this instanceof Quote) {
// $data['$entity_label'] = ['value' => '', 'label' => ctrans('texts.quote')];
// $data['$number'] = ['value' => $this->number ?: '&nbsp;', 'label' => ctrans('texts.quote_number')];
// $data['$entity.terms'] = ['value' => $this->terms ?: '&nbsp;', 'label' => ctrans('texts.quote_terms')];
// $data['$terms'] = &$data['$entity.terms'];
Psalm cleanup
2020-10-28 11:10:49 +01:00
Remove redundant classes
2020-10-28 07:27:10 +01:00
// if($invitation)
// $data['$view_link'] = ['value' => '<a href="'.$invitation->getLink().'">'.ctrans('texts.view_quote').'</a>', 'label' => ctrans('texts.view_quote')];
// // $data['$view_link'] = ['value' => $invitation->getLink(), 'label' => ctrans('texts.view_quote')];
// }
// if ($this instanceof Credit) {
// $data['$entity_label'] = ['value' => '', 'label' => ctrans('texts.credit')];
// $data['$number'] = ['value' => $this->number ?: '&nbsp;', 'label' => ctrans('texts.credit_number')];
// $data['$entity.terms'] = ['value' => $this->terms ?: '&nbsp;', 'label' => ctrans('texts.credit_terms')];
// $data['$terms'] = &$data['$entity.terms'];
Psalm cleanup
2020-10-28 11:10:49 +01:00
Remove redundant classes
2020-10-28 07:27:10 +01:00
// if($invitation)
// $data['$view_link'] = ['value' => '<a href="'.$invitation->getLink().'">'.ctrans('texts.view_credit').'</a>', 'label' => ctrans('texts.view_credit')];
// // $data['$view_link'] = ['value' => $invitation->getLink(), 'label' => ctrans('texts.view_credit')];
// }
// $data['$entity_number'] = &$data['$number'];
// $data['$invoice.discount'] = ['value' => Number::formatMoney($calc->getTotalDiscount(), $this->client) ?: '&nbsp;', 'label' => ctrans('texts.discount')];
// $data['$discount'] = &$data['$invoice.discount'];
// $data['$subtotal'] = ['value' => Number::formatMoney($calc->getSubTotal(), $this->client) ?: '&nbsp;', 'label' => ctrans('texts.subtotal')];
// $data['$invoice.subtotal'] = &$data['$subtotal'];
// $data['$invoice.balance_due'] = ['value' => Number::formatMoney($this->balance, $this->client) ?: '&nbsp;', 'label' => ctrans('texts.balance_due')];
// $data['$quote.balance_due'] = &$data['$invoice.balance_due'];
// $data['$balance_due'] = &$data['$invoice.balance_due'];
// $data['$invoice.partial_due'] = ['value' => Number::formatMoney($this->partial, $this->client) ?: '&nbsp;', 'label' => ctrans('texts.partial_due')];
// $data['$total'] = ['value' => Number::formatMoney($calc->getTotal(), $this->client) ?: '&nbsp;', 'label' => ctrans('texts.total')];
// $data['$amount'] = &$data['$total'];
// $data['$quote.total'] = &$data['$total'];
// $data['$invoice.total'] = ['value' => Number::formatMoney($calc->getTotal(), $this->client) ?: '&nbsp;', 'label' => ctrans('texts.invoice_total')];
// $data['$invoice.amount'] = &$data['$total'];
// $data['$quote.amount'] = ['value' => Number::formatMoney($calc->getTotal(), $this->client) ?: '&nbsp;', 'label' => ctrans('texts.quote_total')];
// $data['$credit.total'] = ['value' => Number::formatMoney($calc->getTotal(), $this->client) ?: '&nbsp;', 'label' => ctrans('texts.credit_total')];
// $data['$credit.number'] = ['value' => $this->number ?: '&nbsp;', 'label' => ctrans('texts.credit_number')];
// $data['$credit.total'] = &$data['$credit.total'];
// $data['$credit.po_number'] = &$data['$invoice.po_number'];
// $data['$credit.date'] = ['value' => $this->date, 'label' => ctrans('texts.credit_date')];
// $data['$balance'] = ['value' => Number::formatMoney($calc->getBalance(), $this->client) ?: '&nbsp;', 'label' => ctrans('texts.balance')];
// $data['$credit.balance'] = &$data['$balance'];
// $data['$invoice.balance'] = &$data['$balance'];
// $data['$taxes'] = ['value' => Number::formatMoney($calc->getItemTotalTaxes(), $this->client) ?: '&nbsp;', 'label' => ctrans('texts.taxes')];
// $data['$invoice.taxes'] = &$data['$taxes'];
// $data['$invoice.custom1'] = ['value' => $this->custom_value1 ?: '&nbsp;', 'label' => $this->makeCustomField('invoice1')];
// $data['$invoice.custom2'] = ['value' => $this->custom_value2 ?: '&nbsp;', 'label' => $this->makeCustomField('invoice2')];
// $data['$invoice.custom3'] = ['value' => $this->custom_value3 ?: '&nbsp;', 'label' => $this->makeCustomField('invoice3')];
// $data['$invoice.custom4'] = ['value' => $this->custom_value4 ?: '&nbsp;', 'label' => $this->makeCustomField('invoice4')];
// $data['$invoice.public_notes'] = ['value' => $this->public_notes ?: '&nbsp;', 'label' => ctrans('texts.public_notes')];
// $data['$entity.public_notes'] = &$data['$invoice.public_notes'];
// // $data['$your_invoice'] = ;
// // $data['$quote'] = ;
// // $data['$your_quote'] = ;
// //
// $data['$quote.date'] = ['value' => $this->date ?: '&nbsp;', 'label' => ctrans('texts.quote_date')];
// $data['$quote.number'] = ['value' => $this->number ?: '&nbsp;', 'label' => ctrans('texts.quote_number')];
// $data['$quote.po_number'] = &$data['$invoice.po_number'];
// $data['$quote.quote_number'] = &$data['$quote.number'];
// $data['$quote_no'] = &$data['$quote.number'];
// $data['$quote.quote_no'] = &$data['$quote.number'];
// $data['$quote.valid_until'] = ['value' => $this->due_date, 'label' => ctrans('texts.valid_until')];
// $data['$credit_amount'] = ['value' => Number::formatMoney($calc->getTotal(), $this->client) ?: '&nbsp;', 'label' => ctrans('texts.credit_amount')];
// $data['$credit_balance'] = ['value' => Number::formatMoney($this->balance, $this->client) ?: '&nbsp;', 'label' => ctrans('texts.credit_balance')];
// $data['$credit_number'] = &$data['$number'];
// $data['$credit_no'] = &$data['$number'];
// $data['$credit.credit_no'] = &$data['$number'];
// // $data['$invoice_issued_to'] = ;
// // $data['$quote_issued_to'] = ;
// // $data['$rate'] = ;
// // $data['$hours'] = ;
// // $data['$from'] = ;
// // $data['$to'] = ;
// // $data['$invoice_to'] = ;
// // $data['$quote_to'] = ;
// // $data['$details'] = ;
// $data['$invoice_no'] = &$data['$number'];
// $data['$invoice.invoice_no'] = &$data['$number'];
// $data['$client1'] = ['value' => $this->client->custom_value1 ?: '&nbsp;', 'label' => $this->makeCustomField('client1')];
// $data['$client2'] = ['value' => $this->client->custom_value2 ?: '&nbsp;', 'label' => $this->makeCustomField('client2')];
// $data['$client3'] = ['value' => $this->client->custom_value3 ?: '&nbsp;', 'label' => $this->makeCustomField('client3')];
// $data['$client4'] = ['value' => $this->client->custom_value4 ?: '&nbsp;', 'label' => $this->makeCustomField('client4')];
// $data['$address1'] = ['value' => $this->client->address1 ?: '&nbsp;', 'label' => ctrans('texts.address1')];
// $data['$address2'] = ['value' => $this->client->address2 ?: '&nbsp;', 'label' => ctrans('texts.address2')];
// $data['$id_number'] = ['value' => $this->client->id_number ?: '&nbsp;', 'label' => ctrans('texts.id_number')];
// $data['$vat_number'] = ['value' => $this->client->vat_number ?: '&nbsp;', 'label' => ctrans('texts.vat_number')];
// $data['$website'] = ['value' => $this->client->present()->website() ?: '&nbsp;', 'label' => ctrans('texts.website')];
// $data['$phone'] = ['value' => $this->client->present()->phone() ?: '&nbsp;', 'label' => ctrans('texts.phone')];
// $data['$country'] = ['value' => isset($this->client->country->name) ? $this->client->country->name : 'No Country Set', 'label' => ctrans('texts.country')];
// $data['$email'] = ['value' => isset($contact) ? $contact->email : 'no contact email on record', 'label' => ctrans('texts.email')];
// $data['$client_name'] = ['value' => $this->present()->clientName() ?: '&nbsp;', 'label' => ctrans('texts.client_name')];
// $data['$client.name'] = &$data['$client_name'];
// $data['$client.balance'] = ['value' => Number::formatMoney($this->client->balance, $this->client), 'label' => ctrans('texts.account_balance')];
// $data['$outstanding'] = ['value' => Number::formatMoney($this->client->balance, $this->client), 'label' => ctrans('texts.account_balance')];
// $data['$client_balance'] = ['value' => Number::formatMoney($this->client->balance, $this->client), 'label' => ctrans('texts.account_balance')];
// $data['$paid_to_date'] = ['value' => Number::formatMoney($this->client->paid_to_date, $this->client), 'label' => ctrans('texts.paid_to_date')];
// $data['$client.address1'] = &$data['$address1'];
// $data['$client.address2'] = &$data['$address2'];
// $data['$client_address'] = ['value' => $this->present()->address() ?: '&nbsp;', 'label' => ctrans('texts.address')];
// $data['$client.address'] = &$data['$client_address'];
// $data['$client.id_number'] = &$data['$id_number'];
// $data['$client.vat_number'] = &$data['$vat_number'];
// $data['$client.website'] = &$data['$website'];
// $data['$client.phone'] = &$data['$phone'];
// $data['$city_state_postal'] = ['value' => $this->present()->cityStateZip($this->client->city, $this->client->state, $this->client->postal_code, false) ?: '&nbsp;', 'label' => ctrans('texts.city_state_postal')];
// $data['$client.city_state_postal'] = &$data['$city_state_postal'];
// $data['$postal_city_state'] = ['value' => $this->present()->cityStateZip($this->client->city, $this->client->state, $this->client->postal_code, true) ?: '&nbsp;', 'label' => ctrans('texts.postal_city_state')];
// $data['$client.postal_city_state'] = &$data['$postal_city_state'];
// $data['$client.country'] = &$data['$country'];
// $data['$client.email'] = &$data['$email'];
// $data['$contact.full_name'] = ['value' => $contact->present()->name(), 'label' => ctrans('texts.name')];
// $data['$contact.email'] = ['value' => $contact->email, 'label' => ctrans('texts.email')];
// $data['$contact.phone'] = ['value' => $contact->phone, 'label' => ctrans('texts.phone')];
// $data['$contact.name'] = ['value' => isset($contact) ? $contact->present()->name() : 'no contact name on record', 'label' => ctrans('texts.contact_name')];
// $data['$contact.first_name'] = ['value' => isset($contact) ? $contact->first_name : '', 'label' => ctrans('texts.first_name')];
// $data['$contact.last_name'] = ['value' => isset($contact) ? $contact->last_name : '', 'label' => ctrans('texts.last_name')];
// $data['$contact.custom1'] = ['value' => isset($contact) ? $contact->custom_value1 : '&nbsp;', 'label' => $this->makeCustomField('contact1')];
// $data['$contact.custom2'] = ['value' => isset($contact) ? $contact->custom_value2 : '&nbsp;', 'label' => $this->makeCustomField('contact1')];
// $data['$contact.custom3'] = ['value' => isset($contact) ? $contact->custom_value3 : '&nbsp;', 'label' => $this->makeCustomField('contact1')];
// $data['$contact.custom4'] = ['value' => isset($contact) ? $contact->custom_value4 : '&nbsp;', 'label' => $this->makeCustomField('contact1')];
// $data['$company.city_state_postal'] = ['value' => $this->company->present()->cityStateZip($settings->city, $settings->state, $settings->postal_code, false) ?: '&nbsp;', 'label' => ctrans('texts.city_state_postal')];
// $data['$company.postal_city_state'] = ['value' => $this->company->present()->cityStateZip($settings->city, $settings->state, $settings->postal_code, true) ?: '&nbsp;', 'label' => ctrans('texts.postal_city_state')];
// $data['$company.name'] = ['value' => $this->company->present()->name() ?: '&nbsp;', 'label' => ctrans('texts.company_name')];
// $data['$company.address1'] = ['value' => $settings->address1 ?: '&nbsp;', 'label' => ctrans('texts.address1')];
// $data['$company.address2'] = ['value' => $settings->address2 ?: '&nbsp;', 'label' => ctrans('texts.address2')];
// $data['$company.city'] = ['value' => $settings->city ?: '&nbsp;', 'label' => ctrans('texts.city')];
// $data['$company.state'] = ['value' => $settings->state ?: '&nbsp;', 'label' => ctrans('texts.state')];
// $data['$company.postal_code'] = ['value' => $settings->postal_code ?: '&nbsp;', 'label' => ctrans('texts.postal_code')];
// $data['$company.country'] = ['value' => Country::find($settings->country_id)->first()->name ?: '&nbsp;', 'label' => ctrans('texts.country')];
// $data['$company.phone'] = ['value' => $settings->phone ?: '&nbsp;', 'label' => ctrans('texts.phone')];
// $data['$company.email'] = ['value' => $settings->email ?: '&nbsp;', 'label' => ctrans('texts.email')];
// $data['$company.vat_number'] = ['value' => $settings->vat_number ?: '&nbsp;', 'label' => ctrans('texts.vat_number')];
// $data['$company.id_number'] = ['value' => $settings->id_number ?: '&nbsp;', 'label' => ctrans('texts.id_number')];
// $data['$company.website'] = ['value' => $settings->website ?: '&nbsp;', 'label' => ctrans('texts.website')];
// $data['$company.address'] = ['value' => $this->company->present()->address($settings) ?: '&nbsp;', 'label' => ctrans('texts.address')];
// $logo = $this->company->present()->logo($settings);
// $data['$company.logo'] = ['value' => "<img src='{$logo}' class='h-32' alt='logo'>" ?: '&nbsp;', 'label' => ctrans('texts.logo')];
// $data['$company_logo'] = &$data['$company.logo'];
// $data['$company1'] = ['value' => $settings->custom_value1 ?: '&nbsp;', 'label' => $this->makeCustomField('company1')];
// $data['$company2'] = ['value' => $settings->custom_value2 ?: '&nbsp;', 'label' => $this->makeCustomField('company2')];
// $data['$company3'] = ['value' => $settings->custom_value3 ?: '&nbsp;', 'label' => $this->makeCustomField('company3')];
// $data['$company4'] = ['value' => $settings->custom_value4 ?: '&nbsp;', 'label' => $this->makeCustomField('company4')];
// $data['$custom_surcharge1'] = ['value' => $this->custom_surcharge1, 'label' => $this->makeCustomField('custom_surcharge1')];
// $data['$custom_surcharge2'] = ['value' => $this->custom_surcharge2, 'label' => $this->makeCustomField('custom_surcharge2')];
// $data['$custom_surcharge3'] = ['value' => $this->custom_surcharge3, 'label' => $this->makeCustomField('custom_surcharge3')];
// $data['$custom_surcharge4'] = ['value' => $this->custom_surcharge4, 'label' => $this->makeCustomField('custom_surcharge4')];
// $data['$product.date'] = ['value' => '', 'label' => ctrans('texts.date')];
// $data['$product.discount'] = ['value' => '', 'label' => ctrans('texts.discount')];
// $data['$product.product_key'] = ['value' => '', 'label' => ctrans('texts.product_key')];
// $data['$product.notes'] = ['value' => '', 'label' => ctrans('texts.notes')];
// $data['$product.cost'] = ['value' => '', 'label' => ctrans('texts.cost')];
// $data['$product.quantity'] = ['value' => '', 'label' => ctrans('texts.quantity')];
// $data['$product.tax_name1'] = ['value' => '', 'label' => ctrans('texts.tax')];
// $data['$product.tax'] = ['value' => '', 'label' => ctrans('texts.tax')];
// $data['$product.tax_name2'] = ['value' => '', 'label' => ctrans('texts.tax')];
// $data['$product.tax_name3'] = ['value' => '', 'label' => ctrans('texts.tax')];
// $data['$product.line_total'] = ['value' => '', 'label' => ctrans('texts.line_total')];
// $data['$task.date'] = ['value' => '', 'label' => ctrans('texts.date')];
// $data['$task.discount'] = ['value' => '', 'label' => ctrans('texts.discount')];
// $data['$task.product_key'] = ['value' => '', 'label' => ctrans('texts.product_key')];
// $data['$task.notes'] = ['value' => '', 'label' => ctrans('texts.notes')];
// $data['$task.cost'] = ['value' => '', 'label' => ctrans('texts.cost')];
// $data['$task.quantity'] = ['value' => '', 'label' => ctrans('texts.quantity')];
// $data['$task.tax'] = ['value' => '', 'label' => ctrans('texts.tax')];
// $data['$task.tax_name1'] = ['value' => '', 'label' => ctrans('texts.tax')];
// $data['$task.tax_name2'] = ['value' => '', 'label' => ctrans('texts.tax')];
// $data['$task.tax_name3'] = ['value' => '', 'label' => ctrans('texts.tax')];
// $data['$task.line_total'] = ['value' => '', 'label' => ctrans('texts.line_total')];
// //$data['$contact.signature']
// // $data['custom_label1'] = ['value' => '', 'label' => ctrans('texts.')];
// // $data['custom_label2'] = ['value' => '', 'label' => ctrans('texts.')];
// // $data['custom_label3'] = ['value' => '', 'label' => ctrans('texts.')];
// // $data['custom_label4'] = ['value' => '', 'label' => ctrans('texts.')];
// //$data['$blank'] = ;
// //$data['$surcharge'] = ;
// /*
// $data['$tax_invoice'] =
// $data['$tax_quote'] =
// $data['$statement'] = ;
// $data['$statement_date'] = ;
// $data['$your_statement'] = ;
// $data['$statement_issued_to'] = ;
// $data['$statement_to'] = ;
// $data['$credit_note'] = ;
// $data['$credit_date'] = ;
// $data['$credit_issued_to'] = ;
// $data['$credit_to'] = ;
// $data['$your_credit'] = ;
// $data['$phone'] = ;
// $data['$outstanding'] = ;
// $data['$invoice_due_date'] = ;
// $data['$quote_due_date'] = ;
// $data['$service'] = ;
// $data['$product_key'] = ;
// $data['$unit_cost'] = ;
// $data['$custom_value1'] = ;
// $data['$custom_value2'] = ;
// $data['$delivery_note'] = ;
// $data['$date'] = ;
// $data['$method'] = ;
// $data['$payment_date'] = ;
// $data['$reference'] = ;
// $data['$amount'] = ;
// $data['$amount_paid'] =;
// */
// $arrKeysLength = array_map('strlen', array_keys($data));
// array_multisort($arrKeysLength, SORT_DESC, $data);
// return $data;
// }
working on invoice labels and template values
2019-09-02 07:08:26 +02:00
Working on building dynamic tables for invoices
2019-09-03 01:00:52 +02:00
/**
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 11:38:10 +02:00
* V2 of building a table header for PDFs.
Design Changes (#3504) * Fixes for tests * Working on PDF tables * Fixes for null values in designs * Refactoring entity variables for PDF * Fixes for pdf variables * Minor fixes for designs * Working on variable replacement for tables * Refactoring designs * Refactoring designs * Refactoring design implementation * Working on refactoring designs * Serve tailwind locally * Design changes
2020-03-16 11:12:10 +01:00
* @param array $columns The array (or string of column headers)
* @return string injectable HTML string
Working on building dynamic tables for invoices
2019-09-03 01:00:52 +02:00
*/
Design Changes (#3504) * Fixes for tests * Working on PDF tables * Fixes for null values in designs * Refactoring entity variables for PDF * Fixes for pdf variables * Minor fixes for designs * Working on variable replacement for tables * Refactoring designs * Refactoring designs * Refactoring design implementation * Working on refactoring designs * Serve tailwind locally * Design changes
2020-03-16 11:12:10 +01:00
public function buildTableHeader($columns) :?string
Working on building dynamic tables for invoices
2019-09-03 01:00:52 +02:00
{
Design Changes (#3504) * Fixes for tests * Working on PDF tables * Fixes for null values in designs * Refactoring entity variables for PDF * Fixes for pdf variables * Minor fixes for designs * Working on variable replacement for tables * Refactoring designs * Refactoring designs * Refactoring design implementation * Working on refactoring designs * Serve tailwind locally * Design changes
2020-03-16 11:12:10 +01:00
$data = $this->makeLabels();
Working on building dynamic tables for invoices
2019-09-03 01:00:52 +02:00
Design Changes (#3504) * Fixes for tests * Working on PDF tables * Fixes for null values in designs * Refactoring entity variables for PDF * Fixes for pdf variables * Minor fixes for designs * Working on variable replacement for tables * Refactoring designs * Refactoring designs * Refactoring design implementation * Working on refactoring designs * Serve tailwind locally * Design changes
2020-03-16 11:12:10 +01:00
$table_header = '<tr>';
Working on building dynamic tables for invoices
2019-09-03 01:00:52 +02:00
Design Changes (#3504) * Fixes for tests * Working on PDF tables * Fixes for null values in designs * Refactoring entity variables for PDF * Fixes for pdf variables * Minor fixes for designs * Working on variable replacement for tables * Refactoring designs * Refactoring designs * Refactoring design implementation * Working on refactoring designs * Serve tailwind locally * Design changes
2020-03-16 11:12:10 +01:00
foreach ($columns as $key => $column) {
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 11:38:10 +02:00
$table_header .= '<td class="table_header_td_class">'.$column.'_label</td>';
Fixes for tests (#3184) * fix typo * php-cs traits * CS fixer pass * Password protect User routes * Implement checks to prevent editing a deleted record * Clean up payment flows * Fixes for tests
2019-12-30 22:59:12 +01:00
}
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 11:38:10 +02:00
Fixes for designs (#3463) * Fixes for designs * remove logs
2020-03-09 21:07:46 +01:00
$table_header .= '</tr>';
Fixes for refunds (#3285) * Working self-updater package * Fixes for travis * Working on invoice designs * Working on invoice builder * Tests for invoice design * Working on invoice designs * Minor fixes * Working on Invoice Design Engine * Working on invoice designs * Fixes for refunds
2020-02-05 11:28:56 +01:00
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 11:38:10 +02:00
$table_header = strtr($table_header, $data); // str_replace(array_keys($data), array_values($data), $table_header);
Design Changes (#3504) * Fixes for tests * Working on PDF tables * Fixes for null values in designs * Refactoring entity variables for PDF * Fixes for pdf variables * Minor fixes for designs * Working on variable replacement for tables * Refactoring designs * Refactoring designs * Refactoring design implementation * Working on refactoring designs * Serve tailwind locally * Design changes
2020-03-16 11:12:10 +01:00
Fixes for refunds (#3285) * Working self-updater package * Fixes for travis * Working on invoice designs * Working on invoice builder * Tests for invoice design * Working on invoice designs * Minor fixes * Working on Invoice Design Engine * Working on invoice designs * Fixes for refunds
2020-02-05 11:28:56 +01:00
return $table_header;
}
Refactor Designs (#3449) * Refactor custom invoice HTML generation * remove table_styles() method from designs * Refactor designs * Clean up designs
2020-03-07 07:31:26 +01:00
/**
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 11:38:10 +02:00
* V2 of building a table body for PDFs.
Psalm cleanup
2020-10-28 11:10:49 +01:00
* @param array $default_columns
* @param $user_columns
* @param string $table_prefix
Design Changes (#3504) * Fixes for tests * Working on PDF tables * Fixes for null values in designs * Refactoring entity variables for PDF * Fixes for pdf variables * Minor fixes for designs * Working on variable replacement for tables * Refactoring designs * Refactoring designs * Refactoring design implementation * Working on refactoring designs * Serve tailwind locally * Design changes
2020-03-16 11:12:10 +01:00
* @return string injectable HTML string
Refactor Designs (#3449) * Refactor custom invoice HTML generation * remove table_styles() method from designs * Refactor designs * Clean up designs
2020-03-07 07:31:26 +01:00
*/
Fixes for self-update (#3514) * minor fix for payment notifications * styleci * Limit Self updating to self hosters only : * Fixes for designs * Minor fixes for self-update
2020-03-21 06:37:30 +01:00
public function buildTableBody(array $default_columns, $user_columns, string $table_prefix) :?string
Fixes for refunds (#3285) * Working self-updater package * Fixes for travis * Working on invoice designs * Working on invoice builder * Tests for invoice design * Working on invoice designs * Minor fixes * Working on Invoice Design Engine * Working on invoice designs * Fixes for refunds
2020-02-05 11:28:56 +01:00
{
Design Changes (#3504) * Fixes for tests * Working on PDF tables * Fixes for null values in designs * Refactoring entity variables for PDF * Fixes for pdf variables * Minor fixes for designs * Working on variable replacement for tables * Refactoring designs * Refactoring designs * Refactoring design implementation * Working on refactoring designs * Serve tailwind locally * Design changes
2020-03-16 11:12:10 +01:00
$items = $this->transformLineItems($this->line_items, $table_prefix);
Fixes for self-update (#3514) * minor fix for payment notifications * styleci * Limit Self updating to self hosters only : * Fixes for designs * Minor fixes for self-update
2020-03-21 06:37:30 +01:00
if (count($items) == 0) {
Design Changes (#3504) * Fixes for tests * Working on PDF tables * Fixes for null values in designs * Refactoring entity variables for PDF * Fixes for pdf variables * Minor fixes for designs * Working on variable replacement for tables * Refactoring designs * Refactoring designs * Refactoring design implementation * Working on refactoring designs * Serve tailwind locally * Design changes
2020-03-16 11:12:10 +01:00
return '';
Fixes for self-update (#3514) * minor fix for payment notifications * styleci * Limit Self updating to self hosters only : * Fixes for designs * Minor fixes for self-update
2020-03-21 06:37:30 +01:00
}
Fixes for refunds (#3285) * Working self-updater package * Fixes for travis * Working on invoice designs * Working on invoice builder * Tests for invoice design * Working on invoice designs * Minor fixes * Working on Invoice Design Engine * Working on invoice designs * Fixes for refunds
2020-02-05 11:28:56 +01:00
Design Changes (#3504) * Fixes for tests * Working on PDF tables * Fixes for null values in designs * Refactoring entity variables for PDF * Fixes for pdf variables * Minor fixes for designs * Working on variable replacement for tables * Refactoring designs * Refactoring designs * Refactoring design implementation * Working on refactoring designs * Serve tailwind locally * Design changes
2020-03-16 11:12:10 +01:00
$data = $this->makeValues();
Fixes for refunds (#3285) * Working self-updater package * Fixes for travis * Working on invoice designs * Working on invoice builder * Tests for invoice design * Working on invoice designs * Minor fixes * Working on Invoice Design Engine * Working on invoice designs * Fixes for refunds
2020-02-05 11:28:56 +01:00
Design Changes (#3504) * Fixes for tests * Working on PDF tables * Fixes for null values in designs * Refactoring entity variables for PDF * Fixes for pdf variables * Minor fixes for designs * Working on variable replacement for tables * Refactoring designs * Refactoring designs * Refactoring design implementation * Working on refactoring designs * Serve tailwind locally * Design changes
2020-03-16 11:12:10 +01:00
$output = '';
Fixes for refunds (#3285) * Working self-updater package * Fixes for travis * Working on invoice designs * Working on invoice builder * Tests for invoice design * Working on invoice designs * Minor fixes * Working on Invoice Design Engine * Working on invoice designs * Fixes for refunds
2020-02-05 11:28:56 +01:00
Fixes for self-update (#3514) * minor fix for payment notifications * styleci * Limit Self updating to self hosters only : * Fixes for designs * Minor fixes for self-update
2020-03-21 06:37:30 +01:00
if (strlen($user_columns) > 1) {
foreach ($items as $key => $item) {
Reminders (#3630) * Performance improvements moving from str_replace to strtr * Remove legacy docs * Clean up credit transformer * Working on invoice emails * Clean up for invoice designs * Tests for light and dark theme emails * Working on reminder scheduling * Reminder Job Class * Fixes for github actions * PHP CS * Test for reminders * Test for reminders
2020-04-15 02:30:52 +02:00
// $tmp = str_replace(array_keys($data), array_values($data), $user_columns);
// $tmp = str_replace(array_keys($item), array_values($item), $tmp);
$tmp = strtr($user_columns, $data);
$tmp = strtr($tmp, $item);
Fixes for refunds (#3285) * Working self-updater package * Fixes for travis * Working on invoice designs * Working on invoice builder * Tests for invoice design * Working on invoice designs * Minor fixes * Working on Invoice Design Engine * Working on invoice designs * Fixes for refunds
2020-02-05 11:28:56 +01:00
Design Changes (#3504) * Fixes for tests * Working on PDF tables * Fixes for null values in designs * Refactoring entity variables for PDF * Fixes for pdf variables * Minor fixes for designs * Working on variable replacement for tables * Refactoring designs * Refactoring designs * Refactoring design implementation * Working on refactoring designs * Serve tailwind locally * Design changes
2020-03-16 11:12:10 +01:00
$output .= $tmp;
Fixes for refunds (#3285) * Working self-updater package * Fixes for travis * Working on invoice designs * Working on invoice builder * Tests for invoice design * Working on invoice designs * Minor fixes * Working on Invoice Design Engine * Working on invoice designs * Fixes for refunds
2020-02-05 11:28:56 +01:00
}
Fixes for self-update (#3514) * minor fix for payment notifications * styleci * Limit Self updating to self hosters only : * Fixes for designs * Minor fixes for self-update
2020-03-21 06:37:30 +01:00
} else {
Design Changes (#3504) * Fixes for tests * Working on PDF tables * Fixes for null values in designs * Refactoring entity variables for PDF * Fixes for pdf variables * Minor fixes for designs * Working on variable replacement for tables * Refactoring designs * Refactoring designs * Refactoring design implementation * Working on refactoring designs * Serve tailwind locally * Design changes
2020-03-16 11:12:10 +01:00
$table_row = '<tr>';
Fixes for refunds (#3285) * Working self-updater package * Fixes for travis * Working on invoice designs * Working on invoice builder * Tests for invoice design * Working on invoice designs * Minor fixes * Working on Invoice Design Engine * Working on invoice designs * Fixes for refunds
2020-02-05 11:28:56 +01:00
Design Changes (#3504) * Fixes for tests * Working on PDF tables * Fixes for null values in designs * Refactoring entity variables for PDF * Fixes for pdf variables * Minor fixes for designs * Working on variable replacement for tables * Refactoring designs * Refactoring designs * Refactoring design implementation * Working on refactoring designs * Serve tailwind locally * Design changes
2020-03-16 11:12:10 +01:00
foreach ($default_columns as $key => $column) {
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 11:38:10 +02:00
$table_row .= '<td class="table_header_td_class">'.$column.'</td>';
Design Changes (#3504) * Fixes for tests * Working on PDF tables * Fixes for null values in designs * Refactoring entity variables for PDF * Fixes for pdf variables * Minor fixes for designs * Working on variable replacement for tables * Refactoring designs * Refactoring designs * Refactoring design implementation * Working on refactoring designs * Serve tailwind locally * Design changes
2020-03-16 11:12:10 +01:00
}
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 11:38:10 +02:00
Design Changes (#3504) * Fixes for tests * Working on PDF tables * Fixes for null values in designs * Refactoring entity variables for PDF * Fixes for pdf variables * Minor fixes for designs * Working on variable replacement for tables * Refactoring designs * Refactoring designs * Refactoring design implementation * Working on refactoring designs * Serve tailwind locally * Design changes
2020-03-16 11:12:10 +01:00
$table_row .= '</tr>';
Fixes for self-update (#3514) * minor fix for payment notifications * styleci * Limit Self updating to self hosters only : * Fixes for designs * Minor fixes for self-update
2020-03-21 06:37:30 +01:00
foreach ($items as $key => $item) {
Reminders (#3630) * Performance improvements moving from str_replace to strtr * Remove legacy docs * Clean up credit transformer * Working on invoice emails * Clean up for invoice designs * Tests for light and dark theme emails * Working on reminder scheduling * Reminder Job Class * Fixes for github actions * PHP CS * Test for reminders * Test for reminders
2020-04-15 02:30:52 +02:00
// $tmp = str_replace(array_keys($item), array_values($item), $table_row);
// $tmp = str_replace(array_keys($data), array_values($data), $tmp);
$tmp = strtr($table_row, $item);
$tmp = strtr($tmp, $data);
Design Changes (#3504) * Fixes for tests * Working on PDF tables * Fixes for null values in designs * Refactoring entity variables for PDF * Fixes for pdf variables * Minor fixes for designs * Working on variable replacement for tables * Refactoring designs * Refactoring designs * Refactoring design implementation * Working on refactoring designs * Serve tailwind locally * Design changes
2020-03-16 11:12:10 +01:00
$output .= $tmp;
}
Fixes for refunds (#3285) * Working self-updater package * Fixes for travis * Working on invoice designs * Working on invoice builder * Tests for invoice design * Working on invoice designs * Minor fixes * Working on Invoice Design Engine * Working on invoice designs * Fixes for refunds
2020-02-05 11:28:56 +01:00
}
Design Changes (#3504) * Fixes for tests * Working on PDF tables * Fixes for null values in designs * Refactoring entity variables for PDF * Fixes for pdf variables * Minor fixes for designs * Working on variable replacement for tables * Refactoring designs * Refactoring designs * Refactoring design implementation * Working on refactoring designs * Serve tailwind locally * Design changes
2020-03-16 11:12:10 +01:00
return $output;
Fixes for refunds (#3285) * Working self-updater package * Fixes for travis * Working on invoice designs * Working on invoice builder * Tests for invoice design * Working on invoice designs * Minor fixes * Working on Invoice Design Engine * Working on invoice designs * Fixes for refunds
2020-02-05 11:28:56 +01:00
}
Custom values for invoice templates
2019-09-03 08:01:40 +02:00
/**
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 11:38:10 +02:00
* Transform the column headers into translated header values.
Fixes for tests (#3184) * fix typo * php-cs traits * CS fixer pass * Password protect User routes * Implement checks to prevent editing a deleted record * Clean up payment flows * Fixes for tests
2019-12-30 22:59:12 +01:00
*
Dynamic invoice tables for PDF generation
2019-09-04 01:16:23 +02:00
* @param array $columns The column header values
* @return array The new column header variables
*/
private function transformColumnsForHeader(array $columns) :array
{
Fixes for self-update (#3514) * minor fix for payment notifications * styleci * Limit Self updating to self hosters only : * Fixes for designs * Minor fixes for self-update
2020-03-21 06:37:30 +01:00
if (count($columns) == 0) {
Repeating header and footers on Invoice PDFs (#3424) * remove jobs table * Working on notifications * Working on notifications * Fixes for setting group level currency id on new client * Working on repeating headers * Use CSS to force headers and footers * recurring headers and footers * Preview PDF * Working on PDF Preview
2020-03-05 08:14:57 +01:00
return [];
Fixes for self-update (#3514) * minor fix for payment notifications * styleci * Limit Self updating to self hosters only : * Fixes for designs * Minor fixes for self-update
2020-03-21 06:37:30 +01:00
}
Repeating header and footers on Invoice PDFs (#3424) * remove jobs table * Working on notifications * Working on notifications * Fixes for setting group level currency id on new client * Working on repeating headers * Use CSS to force headers and footers * recurring headers and footers * Preview PDF * Working on PDF Preview
2020-03-05 08:14:57 +01:00
Working on tests for line item taxes
2019-09-04 07:10:10 +02:00
$pre_columns = $columns;
$columns = array_intersect($columns, self::$master_columns);
Dynamic invoice tables for PDF generation
2019-09-04 01:16:23 +02:00
Fixes for tests (#3184) * fix typo * php-cs traits * CS fixer pass * Password protect User routes * Implement checks to prevent editing a deleted record * Clean up payment flows * Fixes for tests
2019-12-30 22:59:12 +01:00
return str_replace(
[
Dynamic invoice tables for PDF generation
2019-09-04 01:16:23 +02:00
'tax_name1',
Modifications to Designs (#3353) * Working on Quotes * Naming refactor for Quotes * Quote Actions * Quote Pdfs * Quote PDFs * Refunds in Stripe * Fixes tests * Company Ledger work
2020-02-19 21:44:12 +01:00
'tax_name2',
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 11:38:10 +02:00
'tax_name3',
Fixes for tests (#3184) * fix typo * php-cs traits * CS fixer pass * Password protect User routes * Implement checks to prevent editing a deleted record * Clean up payment flows * Fixes for tests
2019-12-30 22:59:12 +01:00
],
Dynamic invoice tables for PDF generation
2019-09-04 01:16:23 +02:00
[
'tax',
'tax',
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 11:38:10 +02:00
'tax',
Fixes for tests (#3184) * fix typo * php-cs traits * CS fixer pass * Password protect User routes * Implement checks to prevent editing a deleted record * Clean up payment flows * Fixes for tests
2019-12-30 22:59:12 +01:00
],
$columns
);
Dynamic invoice tables for PDF generation
2019-09-04 01:16:23 +02:00
}
/**
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 11:38:10 +02:00
* Transform the column headers into invoice variables.
Fixes for tests (#3184) * fix typo * php-cs traits * CS fixer pass * Password protect User routes * Implement checks to prevent editing a deleted record * Clean up payment flows * Fixes for tests
2019-12-30 22:59:12 +01:00
*
Custom values for invoice templates
2019-09-03 08:01:40 +02:00
* @param array $columns The column header values
* @return array The invoice variables
*/
Dynamic invoice tables for PDF generation
2019-09-04 01:16:23 +02:00
private function transformColumnsForLineItems(array $columns) :array
Custom values for invoice templates
2019-09-03 08:01:40 +02:00
{
Dynamic invoice tables for PDF generation
2019-09-04 01:16:23 +02:00
/* Removes any invalid columns the user has entered. */
Working on tests for line item taxes
2019-09-04 07:10:10 +02:00
$columns = array_intersect($columns, self::$master_columns);
Dynamic invoice tables for PDF generation
2019-09-04 01:16:23 +02:00
Fixes for tests (#3184) * fix typo * php-cs traits * CS fixer pass * Password protect User routes * Implement checks to prevent editing a deleted record * Clean up payment flows * Fixes for tests
2019-12-30 22:59:12 +01:00
return str_replace(
[
'custom_invoice_label1',
'custom_invoice_label2',
'custom_invoice_label3',
'custom_invoice_label4',
'tax_name1',
Modifications to Designs (#3353) * Working on Quotes * Naming refactor for Quotes * Quote Actions * Quote Pdfs * Quote PDFs * Refunds in Stripe * Fixes tests * Company Ledger work
2020-02-19 21:44:12 +01:00
'tax_name2',
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 11:38:10 +02:00
'tax_name3',
Fixes for tests (#3184) * fix typo * php-cs traits * CS fixer pass * Password protect User routes * Implement checks to prevent editing a deleted record * Clean up payment flows * Fixes for tests
2019-12-30 22:59:12 +01:00
],
[
Invoice Item Array factory
2019-09-04 00:16:53 +02:00
'custom_invoice_value1',
'custom_invoice_value2',
'custom_invoice_value3',
'custom_invoice_value4',
'tax_rate1',
Modifications to Designs (#3353) * Working on Quotes * Naming refactor for Quotes * Quote Actions * Quote Pdfs * Quote PDFs * Refunds in Stripe * Fixes tests * Company Ledger work
2020-02-19 21:44:12 +01:00
'tax_rate2',
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 11:38:10 +02:00
'tax_rate3',
Fixes for tests (#3184) * fix typo * php-cs traits * CS fixer pass * Password protect User routes * Implement checks to prevent editing a deleted record * Clean up payment flows * Fixes for tests
2019-12-30 22:59:12 +01:00
],
$columns
);
Custom values for invoice templates
2019-09-03 08:01:40 +02:00
}
/**
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 11:38:10 +02:00
* Formats the line items for display.
Psalm cleanup
2020-10-28 11:10:49 +01:00
* @param array $items The array of invoice items
* @param string $table_type
Custom values for invoice templates
2019-09-03 08:01:40 +02:00
* @return array The formatted array of invoice items
*/
wip with table bodies & footer
2020-07-30 17:47:40 +02:00
public function transformLineItems($items, $table_type = '$product') :array
Custom values for invoice templates
2019-09-03 08:01:40 +02:00
{
Design Changes (#3504) * Fixes for tests * Working on PDF tables * Fixes for null values in designs * Refactoring entity variables for PDF * Fixes for pdf variables * Minor fixes for designs * Working on variable replacement for tables * Refactoring designs * Refactoring designs * Refactoring design implementation * Working on refactoring designs * Serve tailwind locally * Design changes
2020-03-16 11:12:10 +01:00
$data = [];
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 11:38:10 +02:00
if (! is_array($items)) {
Design Changes (#3504) * Fixes for tests * Working on PDF tables * Fixes for null values in designs * Refactoring entity variables for PDF * Fixes for pdf variables * Minor fixes for designs * Working on variable replacement for tables * Refactoring designs * Refactoring designs * Refactoring design implementation * Working on refactoring designs * Serve tailwind locally * Design changes
2020-03-16 11:12:10 +01:00
$data;
Fixes for self-update (#3514) * minor fix for payment notifications * styleci * Limit Self updating to self hosters only : * Fixes for designs * Minor fixes for self-update
2020-03-21 06:37:30 +01:00
}
Fixes and Refactors for Invoice Emails. (#3339) * Working on emailing invoices * Working on emailing and displaying email * Working on emailing and displaying email * Email invoices * Fixes for html emails * Ensure valid client prior to store * Ensure client exists when storing an entity * Update variable name send -> send_email for client_contacts * Mailable download files * Extend timeouts of password protected routes when a protected route is hit * Add default portal design to company settings * Minor fixes * Fixes for Tests * Fixes for invoicing emails * Refactors for InvoiceEmail * Implement abstractservice * Refactors for services * Refactors for emails * Fixes for Invoice Emails
2020-02-17 10:37:44 +01:00
Design Changes (#3504) * Fixes for tests * Working on PDF tables * Fixes for null values in designs * Refactoring entity variables for PDF * Fixes for pdf variables * Minor fixes for designs * Working on variable replacement for tables * Refactoring designs * Refactoring designs * Refactoring design implementation * Working on refactoring designs * Serve tailwind locally * Design changes
2020-03-16 11:12:10 +01:00
foreach ($items as $key => $item) {
Fixes for self-update (#3514) * minor fix for payment notifications * styleci * Limit Self updating to self hosters only : * Fixes for designs * Minor fixes for self-update
2020-03-21 06:37:30 +01:00
if ($table_type == '$product' && $item->type_id != 1) {
Don't skip items with type_id = 4
2020-09-11 09:23:16 +02:00
if ($item->type_id != 4) {
continue;
Psalm cleanup
2020-10-28 11:10:49 +01:00
}
Fixes for self-update (#3514) * minor fix for payment notifications * styleci * Limit Self updating to self hosters only : * Fixes for designs * Minor fixes for self-update
2020-03-21 06:37:30 +01:00
}
Design Changes (#3504) * Fixes for tests * Working on PDF tables * Fixes for null values in designs * Refactoring entity variables for PDF * Fixes for pdf variables * Minor fixes for designs * Working on variable replacement for tables * Refactoring designs * Refactoring designs * Refactoring design implementation * Working on refactoring designs * Serve tailwind locally * Design changes
2020-03-16 11:12:10 +01:00
Fixes for self-update (#3514) * minor fix for payment notifications * styleci * Limit Self updating to self hosters only : * Fixes for designs * Minor fixes for self-update
2020-03-21 06:37:30 +01:00
if ($table_type == '$task' && $item->type_id != 2) {
Don't skip items with type_id = 4
2020-09-11 09:23:16 +02:00
if ($item->type_id != 4) {
continue;
Psalm cleanup
2020-10-28 11:10:49 +01:00
}
Fixes for self-update (#3514) * minor fix for payment notifications * styleci * Limit Self updating to self hosters only : * Fixes for designs * Minor fixes for self-update
2020-03-21 06:37:30 +01:00
}
Design Changes (#3504) * Fixes for tests * Working on PDF tables * Fixes for null values in designs * Refactoring entity variables for PDF * Fixes for pdf variables * Minor fixes for designs * Working on variable replacement for tables * Refactoring designs * Refactoring designs * Refactoring design implementation * Working on refactoring designs * Serve tailwind locally * Design changes
2020-03-16 11:12:10 +01:00
$data[$key][$table_type.'.product_key'] = $item->product_key;
$data[$key][$table_type.'.notes'] = $item->notes;
$data[$key][$table_type.'.custom_value1'] = $item->custom_value1;
$data[$key][$table_type.'.custom_value2'] = $item->custom_value2;
$data[$key][$table_type.'.custom_value3'] = $item->custom_value3;
$data[$key][$table_type.'.custom_value4'] = $item->custom_value4;
$data[$key][$table_type.'.quantity'] = $item->quantity;
$data[$key][$table_type.'.cost'] = Number::formatMoney($item->cost, $this->client);
$data[$key][$table_type.'.line_total'] = Number::formatMoney($item->line_total, $this->client);
Invoice Item Array factory
2019-09-04 00:16:53 +02:00
Fixes for tests (#3184) * fix typo * php-cs traits * CS fixer pass * Password protect User routes * Implement checks to prevent editing a deleted record * Clean up payment flows * Fixes for tests
2019-12-30 22:59:12 +01:00
if (isset($item->discount) && $item->discount > 0) {
if ($item->is_amount_discount) {
Design Changes (#3504) * Fixes for tests * Working on PDF tables * Fixes for null values in designs * Refactoring entity variables for PDF * Fixes for pdf variables * Minor fixes for designs * Working on variable replacement for tables * Refactoring designs * Refactoring designs * Refactoring design implementation * Working on refactoring designs * Serve tailwind locally * Design changes
2020-03-16 11:12:10 +01:00
$data[$key][$table_type.'.discount'] = Number::formatMoney($item->discount, $this->client);
Fixes for tests (#3184) * fix typo * php-cs traits * CS fixer pass * Password protect User routes * Implement checks to prevent editing a deleted record * Clean up payment flows * Fixes for tests
2019-12-30 22:59:12 +01:00
} else {
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 11:38:10 +02:00
$data[$key][$table_type.'.discount'] = $item->discount.'%';
Fixes for tests (#3184) * fix typo * php-cs traits * CS fixer pass * Password protect User routes * Implement checks to prevent editing a deleted record * Clean up payment flows * Fixes for tests
2019-12-30 22:59:12 +01:00
}
Fixes for self-update (#3514) * minor fix for payment notifications * styleci * Limit Self updating to self hosters only : * Fixes for designs * Minor fixes for self-update
2020-03-21 06:37:30 +01:00
} else {
Design Changes (#3504) * Fixes for tests * Working on PDF tables * Fixes for null values in designs * Refactoring entity variables for PDF * Fixes for pdf variables * Minor fixes for designs * Working on variable replacement for tables * Refactoring designs * Refactoring designs * Refactoring design implementation * Working on refactoring designs * Serve tailwind locally * Design changes
2020-03-16 11:12:10 +01:00
$data[$key][$table_type.'.discount'] = '';
Fixes for self-update (#3514) * minor fix for payment notifications * styleci * Limit Self updating to self hosters only : * Fixes for designs * Minor fixes for self-update
2020-03-21 06:37:30 +01:00
}
Fixes for invoice update and invoice designs (#3302) * BaseController cleanup * Working on invoice designs * Working on invoice designs * working on invoice designs * working on invoice designs * invoice designs * Working on Invoice Designs * Fixes for user settings object * Working on invoice designs * Fixes for encoded user settings * Working on contact localized invoice pdfs * working on invoice designs * Fix for invoice update 500 error
2020-02-10 10:53:02 +01:00
Fixes for self-update (#3514) * minor fix for payment notifications * styleci * Limit Self updating to self hosters only : * Fixes for designs * Minor fixes for self-update
2020-03-21 06:37:30 +01:00
if (isset($item->tax_rate1) && $item->tax_rate1 > 0) {
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 11:38:10 +02:00
$data[$key][$table_type.'.tax_rate1'] = round($item->tax_rate1, 2).'%';
Design Changes (#3504) * Fixes for tests * Working on PDF tables * Fixes for null values in designs * Refactoring entity variables for PDF * Fixes for pdf variables * Minor fixes for designs * Working on variable replacement for tables * Refactoring designs * Refactoring designs * Refactoring design implementation * Working on refactoring designs * Serve tailwind locally * Design changes
2020-03-16 11:12:10 +01:00
$data[$key][$table_type.'.tax1'] = &$data[$key][$table_type.'.tax_rate1'];
}
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 11:38:10 +02:00
Fixes for self-update (#3514) * minor fix for payment notifications * styleci * Limit Self updating to self hosters only : * Fixes for designs * Minor fixes for self-update
2020-03-21 06:37:30 +01:00
if (isset($item->tax_rate2) && $item->tax_rate2 > 0) {
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 11:38:10 +02:00
$data[$key][$table_type.'.tax_rate2'] = round($item->tax_rate2, 2).'%';
Design Changes (#3504) * Fixes for tests * Working on PDF tables * Fixes for null values in designs * Refactoring entity variables for PDF * Fixes for pdf variables * Minor fixes for designs * Working on variable replacement for tables * Refactoring designs * Refactoring designs * Refactoring design implementation * Working on refactoring designs * Serve tailwind locally * Design changes
2020-03-16 11:12:10 +01:00
$data[$key][$table_type.'.tax2'] = &$data[$key][$table_type.'.tax_rate2'];
}
Fixes for invoice update and invoice designs (#3302) * BaseController cleanup * Working on invoice designs * Working on invoice designs * working on invoice designs * working on invoice designs * invoice designs * Working on Invoice Designs * Fixes for user settings object * Working on invoice designs * Fixes for encoded user settings * Working on contact localized invoice pdfs * working on invoice designs * Fix for invoice update 500 error
2020-02-10 10:53:02 +01:00
Fixes for self-update (#3514) * minor fix for payment notifications * styleci * Limit Self updating to self hosters only : * Fixes for designs * Minor fixes for self-update
2020-03-21 06:37:30 +01:00
if (isset($item->tax_rate3) && $item->tax_rate3 > 0) {
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 11:38:10 +02:00
$data[$key][$table_type.'.tax_rate3'] = round($item->tax_rate3, 2).'%';
Design Changes (#3504) * Fixes for tests * Working on PDF tables * Fixes for null values in designs * Refactoring entity variables for PDF * Fixes for pdf variables * Minor fixes for designs * Working on variable replacement for tables * Refactoring designs * Refactoring designs * Refactoring design implementation * Working on refactoring designs * Serve tailwind locally * Design changes
2020-03-16 11:12:10 +01:00
$data[$key][$table_type.'.tax3'] = &$data[$key][$table_type.'.tax_rate3'];
}
Fixes for invoice update and invoice designs (#3302) * BaseController cleanup * Working on invoice designs * Working on invoice designs * working on invoice designs * working on invoice designs * invoice designs * Working on Invoice Designs * Fixes for user settings object * Working on invoice designs * Fixes for encoded user settings * Working on contact localized invoice pdfs * working on invoice designs * Fix for invoice update 500 error
2020-02-10 10:53:02 +01:00
Fixes for self-update (#3514) * minor fix for payment notifications * styleci * Limit Self updating to self hosters only : * Fixes for designs * Minor fixes for self-update
2020-03-21 06:37:30 +01:00
if (isset($item->tax_rate1) && $item->tax_rate1 == 0) {
Design Changes (#3504) * Fixes for tests * Working on PDF tables * Fixes for null values in designs * Refactoring entity variables for PDF * Fixes for pdf variables * Minor fixes for designs * Working on variable replacement for tables * Refactoring designs * Refactoring designs * Refactoring design implementation * Working on refactoring designs * Serve tailwind locally * Design changes
2020-03-16 11:12:10 +01:00
$data[$key][$table_type.'.tax_rate1'] = '';
$data[$key][$table_type.'.tax1'] = &$data[$key][$table_type.'.tax_rate1'];
}
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 11:38:10 +02:00
Fixes for self-update (#3514) * minor fix for payment notifications * styleci * Limit Self updating to self hosters only : * Fixes for designs * Minor fixes for self-update
2020-03-21 06:37:30 +01:00
if (isset($item->tax_rate2) && $item->tax_rate2 == 0) {
Design Changes (#3504) * Fixes for tests * Working on PDF tables * Fixes for null values in designs * Refactoring entity variables for PDF * Fixes for pdf variables * Minor fixes for designs * Working on variable replacement for tables * Refactoring designs * Refactoring designs * Refactoring design implementation * Working on refactoring designs * Serve tailwind locally * Design changes
2020-03-16 11:12:10 +01:00
$data[$key][$table_type.'.tax_rate2'] = '';
$data[$key][$table_type.'.tax2'] = &$data[$key][$table_type.'.tax_rate2'];
}
Fixes for invoice update and invoice designs (#3302) * BaseController cleanup * Working on invoice designs * Working on invoice designs * working on invoice designs * working on invoice designs * invoice designs * Working on Invoice Designs * Fixes for user settings object * Working on invoice designs * Fixes for encoded user settings * Working on contact localized invoice pdfs * working on invoice designs * Fix for invoice update 500 error
2020-02-10 10:53:02 +01:00
Fixes for self-update (#3514) * minor fix for payment notifications * styleci * Limit Self updating to self hosters only : * Fixes for designs * Minor fixes for self-update
2020-03-21 06:37:30 +01:00
if (isset($item->tax_rate3) && $item->tax_rate3 == 0) {
Design Changes (#3504) * Fixes for tests * Working on PDF tables * Fixes for null values in designs * Refactoring entity variables for PDF * Fixes for pdf variables * Minor fixes for designs * Working on variable replacement for tables * Refactoring designs * Refactoring designs * Refactoring design implementation * Working on refactoring designs * Serve tailwind locally * Design changes
2020-03-16 11:12:10 +01:00
$data[$key][$table_type.'.tax_rate3'] = '';
$data[$key][$table_type.'.tax3'] = &$data[$key][$table_type.'.tax_rate3'];
}
pass $task_id inside of row item
2020-11-06 13:13:13 +01:00
$data[$key]['task_id'] = optional($item)->task_id;
Invoice Item Array factory
2019-09-04 00:16:53 +02:00
}
Design Changes (#3504) * Fixes for tests * Working on PDF tables * Fixes for null values in designs * Refactoring entity variables for PDF * Fixes for pdf variables * Minor fixes for designs * Working on variable replacement for tables * Refactoring designs * Refactoring designs * Refactoring design implementation * Working on refactoring designs * Serve tailwind locally * Design changes
2020-03-16 11:12:10 +01:00
return $data;
Custom values for invoice templates
2019-09-03 08:01:40 +02:00
}
Cleaning up Tests
2019-09-04 14:01:19 +02:00
/**
Fixes for tests (#3184) * fix typo * php-cs traits * CS fixer pass * Password protect User routes * Implement checks to prevent editing a deleted record * Clean up payment flows * Fixes for tests
2019-12-30 22:59:12 +01:00
* Due to the way we are compiling the blade template we
Cleaning up Tests
2019-09-04 14:01:19 +02:00
* have no ability to iterate, so in the case
Fixes for tests (#3184) * fix typo * php-cs traits * CS fixer pass * Password protect User routes * Implement checks to prevent editing a deleted record * Clean up payment flows * Fixes for tests
2019-12-30 22:59:12 +01:00
* of line taxes where there are multiple rows,
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 11:38:10 +02:00
* we use this function to format a section of rows.
Fixes for tests (#3184) * fix typo * php-cs traits * CS fixer pass * Password protect User routes * Implement checks to prevent editing a deleted record * Clean up payment flows * Fixes for tests
2019-12-30 22:59:12 +01:00
*
* @return string a collection of <tr> rows with line item
Cleaning up Tests
2019-09-04 14:01:19 +02:00
* aggregate data
*/
private function makeLineTaxes() :string
{
$tax_map = $this->calc()->getTaxMap();
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 11:38:10 +02:00
Cleaning up Tests
2019-09-04 14:01:19 +02:00
$data = '';
Fixes for tests (#3184) * fix typo * php-cs traits * CS fixer pass * Password protect User routes * Implement checks to prevent editing a deleted record * Clean up payment flows * Fixes for tests
2019-12-30 22:59:12 +01:00
foreach ($tax_map as $tax) {
Cleaning up Tests
2019-09-04 14:01:19 +02:00
$data .= '<tr class="line_taxes">';
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 11:38:10 +02:00
$data .= '<td>'.$tax['name'].'</td>';
$data .= '<td>'.Number::formatMoney($tax['total'], $this->client).'</td></tr>';
Cleaning up Tests
2019-09-04 14:01:19 +02:00
}
return $data;
}
Invoice Calculations (#2985) * Fixes for invoice item line totals * Refactoring invoice calculations * Update api-docs * Fixes for invoice calculations * remove tests * fixes for config files
2019-10-13 12:59:55 +02:00
/**
Fixes for tests (#3184) * fix typo * php-cs traits * CS fixer pass * Password protect User routes * Implement checks to prevent editing a deleted record * Clean up payment flows * Fixes for tests
2019-12-30 22:59:12 +01:00
* @return string a collectino of <tr> with
Invoice Calculations (#2985) * Fixes for invoice item line totals * Refactoring invoice calculations * Update api-docs * Fixes for invoice calculations * remove tests * fixes for config files
2019-10-13 12:59:55 +02:00
* itemised total tax data
*/
private function makeTotalTaxes() :string
{
$data = '';
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 11:38:10 +02:00
if (! $this->calc()->getTotalTaxMap()) {
Invoice calculations (#2994) * Add traits for invoice calculations * V2 of invoice calculator * Tests for invoice item calculator * Test for Invoice Item Calculations * Invoice Calculation Tests * fix for tests * Fixes for invoice calculations
2019-10-16 11:28:52 +02:00
return $data;
Fixes for tests (#3184) * fix typo * php-cs traits * CS fixer pass * Password protect User routes * Implement checks to prevent editing a deleted record * Clean up payment flows * Fixes for tests
2019-12-30 22:59:12 +01:00
}
Invoice calculations (#2994) * Add traits for invoice calculations * V2 of invoice calculator * Tests for invoice item calculator * Test for Invoice Item Calculations * Invoice Calculation Tests * fix for tests * Fixes for invoice calculations
2019-10-16 11:28:52 +02:00
Fixes for tests (#3184) * fix typo * php-cs traits * CS fixer pass * Password protect User routes * Implement checks to prevent editing a deleted record * Clean up payment flows * Fixes for tests
2019-12-30 22:59:12 +01:00
foreach ($this->calc()->getTotalTaxMap() as $tax) {
Invoice Calculations (#2985) * Fixes for invoice item line totals * Refactoring invoice calculations * Update api-docs * Fixes for invoice calculations * remove tests * fixes for config files
2019-10-13 12:59:55 +02:00
$data .= '<tr class="total_taxes">';
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 11:38:10 +02:00
$data .= '<td>'.$tax['name'].'</td>';
$data .= '<td>'.Number::formatMoney($tax['total'], $this->client).'</td></tr>';
Invoice Calculations (#2985) * Fixes for invoice item line totals * Refactoring invoice calculations * Update api-docs * Fixes for invoice calculations * remove tests * fixes for config files
2019-10-13 12:59:55 +02:00
}
return $data;
}
Improve eager loads (#3289) * Working on invoice designs * Working on Invoice Designs * Improve eager loads
2020-02-06 10:35:51 +01:00
private function totalTaxLabels() :string
{
$data = '';
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 11:38:10 +02:00
if (! $this->calc()->getTotalTaxMap()) {
Improve eager loads (#3289) * Working on invoice designs * Working on Invoice Designs * Improve eager loads
2020-02-06 10:35:51 +01:00
return $data;
}
foreach ($this->calc()->getTotalTaxMap() as $tax) {
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 11:38:10 +02:00
$data .= '<span>'.$tax['name'].'</span>';
Improve eager loads (#3289) * Working on invoice designs * Working on Invoice Designs * Improve eager loads
2020-02-06 10:35:51 +01:00
}
return $data;
}
private function totalTaxValues() :string
{
$data = '';
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 11:38:10 +02:00
if (! $this->calc()->getTotalTaxMap()) {
Improve eager loads (#3289) * Working on invoice designs * Working on Invoice Designs * Improve eager loads
2020-02-06 10:35:51 +01:00
return $data;
}
foreach ($this->calc()->getTotalTaxMap() as $tax) {
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 11:38:10 +02:00
$data .= '<span>'.Number::formatMoney($tax['total'], $this->client).'</span>';
Improve eager loads (#3289) * Working on invoice designs * Working on Invoice Designs * Improve eager loads
2020-02-06 10:35:51 +01:00
}
return $data;
}
private function lineTaxLabels() :string
{
$tax_map = $this->calc()->getTaxMap();
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 11:38:10 +02:00
Improve eager loads (#3289) * Working on invoice designs * Working on Invoice Designs * Improve eager loads
2020-02-06 10:35:51 +01:00
$data = '';
Fixes for self-update (#3514) * minor fix for payment notifications * styleci * Limit Self updating to self hosters only : * Fixes for designs * Minor fixes for self-update
2020-03-21 06:37:30 +01:00
foreach ($tax_map as $tax) {
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 11:38:10 +02:00
$data .= '<span>'.$tax['name'].'</span>';
Fixes for self-update (#3514) * minor fix for payment notifications * styleci * Limit Self updating to self hosters only : * Fixes for designs * Minor fixes for self-update
2020-03-21 06:37:30 +01:00
}
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 11:38:10 +02:00
Improve eager loads (#3289) * Working on invoice designs * Working on Invoice Designs * Improve eager loads
2020-02-06 10:35:51 +01:00
return $data;
}
private function lineTaxValues() :string
{
$tax_map = $this->calc()->getTaxMap();
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 11:38:10 +02:00
Improve eager loads (#3289) * Working on invoice designs * Working on Invoice Designs * Improve eager loads
2020-02-06 10:35:51 +01:00
$data = '';
Fixes for self-update (#3514) * minor fix for payment notifications * styleci * Limit Self updating to self hosters only : * Fixes for designs * Minor fixes for self-update
2020-03-21 06:37:30 +01:00
foreach ($tax_map as $tax) {
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 11:38:10 +02:00
$data .= '<span>'.Number::formatMoney($tax['total'], $this->client).'</span>';
Fixes for self-update (#3514) * minor fix for payment notifications * styleci * Limit Self updating to self hosters only : * Fixes for designs * Minor fixes for self-update
2020-03-21 06:37:30 +01:00
}
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 11:38:10 +02:00
Improve eager loads (#3289) * Working on invoice designs * Working on Invoice Designs * Improve eager loads
2020-02-06 10:35:51 +01:00
return $data;
}
Design Changes (#3504) * Fixes for tests * Working on PDF tables * Fixes for null values in designs * Refactoring entity variables for PDF * Fixes for pdf variables * Minor fixes for designs * Working on variable replacement for tables * Refactoring designs * Refactoring designs * Refactoring design implementation * Working on refactoring designs * Serve tailwind locally * Design changes
2020-03-16 11:12:10 +01:00
/*
| Ensures the URL doesn't have duplicated trailing slash
*/
public function generateAppUrl()
{
only send one notification per invoice
2020-07-14 11:55:28 +02:00
//return rtrim(config('ninja.app_url'), "/");
return config('ninja.app_url');
Design Changes (#3504) * Fixes for tests * Working on PDF tables * Fixes for null values in designs * Refactoring entity variables for PDF * Fixes for pdf variables * Minor fixes for designs * Working on variable replacement for tables * Refactoring designs * Refactoring designs * Refactoring design implementation * Working on refactoring designs * Serve tailwind locally * Design changes
2020-03-16 11:12:10 +01:00
}
Repeating headers and footers for PDF (#3622) * Subclass Notification class * Subclass Notification class * Working on invoice design * Working on page headers and footers * Fixes for headers and footers * Fixes for invoices
2020-04-12 13:51:27 +02:00
Refactor invoice emails (#3625)
2020-04-13 03:49:58 +02:00
/**
* Builds CSS to assist with the generation
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 11:38:10 +02:00
* of Repeating headers and footers on the PDF.
Refactor invoice emails (#3625)
2020-04-13 03:49:58 +02:00
* @return string The css string
*/
public function generateCustomCSS() :string
Repeating headers and footers for PDF (#3622) * Subclass Notification class * Subclass Notification class * Working on invoice design * Working on page headers and footers * Fixes for headers and footers * Fixes for invoices
2020-04-12 13:51:27 +02:00
{
$settings = $this->client->getMergedSettings();
$header_and_footer = '
Recurring Headers on PDFs (#3624) * Working on recurring headers and footers * Fixes for isolating headers and footer repeat
2020-04-13 02:24:02 +02:00
.header, .header-space {
height: 160px;
}
.footer, .footer-space {
height: 160px;
}
.footer {
position: fixed;
bottom: 0;
width: 100%;
}
.header {
position: fixed;
top: 0mm;
width: 100%;
}
Repeating headers and footers for PDF (#3622) * Subclass Notification class * Subclass Notification class * Working on invoice design * Working on page headers and footers * Fixes for headers and footers * Fixes for invoices
2020-04-12 13:51:27 +02:00
@media print {
Psalm cleanup
2020-10-28 11:10:49 +01:00
thead {display: table-header-group;}
Repeating headers and footers for PDF (#3622) * Subclass Notification class * Subclass Notification class * Working on invoice design * Working on page headers and footers * Fixes for headers and footers * Fixes for invoices
2020-04-12 13:51:27 +02:00
tfoot {display: table-footer-group;}
button {display: none;}
body {margin: 0;}
Reminders (#3630) * Performance improvements moving from str_replace to strtr * Remove legacy docs * Clean up credit transformer * Working on invoice emails * Clean up for invoice designs * Tests for light and dark theme emails * Working on reminder scheduling * Reminder Job Class * Fixes for github actions * PHP CS * Test for reminders * Test for reminders
2020-04-15 02:30:52 +02:00
}';
Repeating headers and footers for PDF (#3622) * Subclass Notification class * Subclass Notification class * Working on invoice design * Working on page headers and footers * Fixes for headers and footers * Fixes for invoices
2020-04-12 13:51:27 +02:00
$header = '
Recurring Headers on PDFs (#3624) * Working on recurring headers and footers * Fixes for isolating headers and footer repeat
2020-04-13 02:24:02 +02:00
.header, .header-space {
height: 160px;
}
.header {
position: fixed;
top: 0mm;
width: 100%;
}
Repeating headers and footers for PDF (#3622) * Subclass Notification class * Subclass Notification class * Working on invoice design * Working on page headers and footers * Fixes for headers and footers * Fixes for invoices
2020-04-12 13:51:27 +02:00
@media print {
Psalm cleanup
2020-10-28 11:10:49 +01:00
thead {display: table-header-group;}
Repeating headers and footers for PDF (#3622) * Subclass Notification class * Subclass Notification class * Working on invoice design * Working on page headers and footers * Fixes for headers and footers * Fixes for invoices
2020-04-12 13:51:27 +02:00
button {display: none;}
body {margin: 0;}
Reminders (#3630) * Performance improvements moving from str_replace to strtr * Remove legacy docs * Clean up credit transformer * Working on invoice emails * Clean up for invoice designs * Tests for light and dark theme emails * Working on reminder scheduling * Reminder Job Class * Fixes for github actions * PHP CS * Test for reminders * Test for reminders
2020-04-15 02:30:52 +02:00
}';
Repeating headers and footers for PDF (#3622) * Subclass Notification class * Subclass Notification class * Working on invoice design * Working on page headers and footers * Fixes for headers and footers * Fixes for invoices
2020-04-12 13:51:27 +02:00
$footer = '
Recurring Headers on PDFs (#3624) * Working on recurring headers and footers * Fixes for isolating headers and footer repeat
2020-04-13 02:24:02 +02:00
.footer, .footer-space {
height: 160px;
}
.footer {
position: fixed;
bottom: 0;
width: 100%;
}
Repeating headers and footers for PDF (#3622) * Subclass Notification class * Subclass Notification class * Working on invoice design * Working on page headers and footers * Fixes for headers and footers * Fixes for invoices
2020-04-12 13:51:27 +02:00
@media print {
tfoot {display: table-footer-group;}
button {display: none;}
body {margin: 0;}
Reminders (#3630) * Performance improvements moving from str_replace to strtr * Remove legacy docs * Clean up credit transformer * Working on invoice emails * Clean up for invoice designs * Tests for light and dark theme emails * Working on reminder scheduling * Reminder Job Class * Fixes for github actions * PHP CS * Test for reminders * Test for reminders
2020-04-15 02:30:52 +02:00
}';
Repeating headers and footers for PDF (#3622) * Subclass Notification class * Subclass Notification class * Working on invoice design * Working on page headers and footers * Fixes for headers and footers * Fixes for invoices
2020-04-12 13:51:27 +02:00
$css = '';
Reminders (#3630) * Performance improvements moving from str_replace to strtr * Remove legacy docs * Clean up credit transformer * Working on invoice emails * Clean up for invoice designs * Tests for light and dark theme emails * Working on reminder scheduling * Reminder Job Class * Fixes for github actions * PHP CS * Test for reminders * Test for reminders
2020-04-15 02:30:52 +02:00
if ($settings->all_pages_header && $settings->all_pages_footer) {
Repeating headers and footers for PDF (#3622) * Subclass Notification class * Subclass Notification class * Working on invoice design * Working on page headers and footers * Fixes for headers and footers * Fixes for invoices
2020-04-12 13:51:27 +02:00
$css .= $header_and_footer;
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 11:38:10 +02:00
} elseif ($settings->all_pages_header && ! $settings->all_pages_footer) {
Repeating headers and footers for PDF (#3622) * Subclass Notification class * Subclass Notification class * Working on invoice design * Working on page headers and footers * Fixes for headers and footers * Fixes for invoices
2020-04-12 13:51:27 +02:00
$css .= $header;
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 11:38:10 +02:00
} elseif (! $settings->all_pages_header && $settings->all_pages_footer) {
Repeating headers and footers for PDF (#3622) * Subclass Notification class * Subclass Notification class * Working on invoice design * Working on page headers and footers * Fixes for headers and footers * Fixes for invoices
2020-04-12 13:51:27 +02:00
$css .= $footer;
Reminders (#3630) * Performance improvements moving from str_replace to strtr * Remove legacy docs * Clean up credit transformer * Working on invoice emails * Clean up for invoice designs * Tests for light and dark theme emails * Working on reminder scheduling * Reminder Job Class * Fixes for github actions * PHP CS * Test for reminders * Test for reminders
2020-04-15 02:30:52 +02:00
}
Repeating headers and footers for PDF (#3622) * Subclass Notification class * Subclass Notification class * Working on invoice design * Working on page headers and footers * Fixes for headers and footers * Fixes for invoices
2020-04-12 13:51:27 +02:00
$css .= '
.page {
page-break-after: always;
}
@page {
margin: 0mm
}
html {
';
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 11:38:10 +02:00
$css .= 'font-size:'.$settings->font_size.'px;';
Refactor invoice emails (#3625)
2020-04-13 03:49:58 +02:00
// $css .= 'font-size:14px;';
Repeating headers and footers for PDF (#3622) * Subclass Notification class * Subclass Notification class * Working on invoice design * Working on page headers and footers * Fixes for headers and footers * Fixes for invoices
2020-04-12 13:51:27 +02:00
$css .= '}';
return $css;
}
Fixes for tests (#3184) * fix typo * php-cs traits * CS fixer pass * Password protect User routes * Implement checks to prevent editing a deleted record * Clean up payment flows * Fixes for tests
2019-12-30 22:59:12 +01:00
}
Copy Permalink