Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-05-31 14:44:34 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4057 from beganovich/v2-show-fees-on-pdfs

Browse Source 
Show taxes/fees on bottom of PDFs
This commit is contained in:
David Bomba 2020-09-11 19:10:52 +10:00 committed by GitHub
commit ce4b5098fc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 44 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
app/Services/PdfMaker/Design.php
View File

@ -14,6 +14,7 @@ namespace App\Services\PdfMaker;
use App\Services\PdfMaker\Designs\Utilities\BaseDesign; use App\Services\PdfMaker\Designs\Utilities\BaseDesign;
use App\Services\PdfMaker\Designs\Utilities\DesignHelpers; use App\Services\PdfMaker\Designs\Utilities\DesignHelpers;
use App\Utils\Number;
use App\Utils\Traits\MakesInvoiceValues; use App\Utils\Traits\MakesInvoiceValues;
use Illuminate\Support\Str; use Illuminate\Support\Str;
@ -24,6 +25,9 @@ class Design extends BaseDesign
/** @var App\Models\Invoice || @var App\Models\Quote */ /** @var App\Models\Invoice || @var App\Models\Quote */
public $entity; public $entity;
/** @var App\Models\Client */
public $client;
/** Global state of the design, @var array */ /** Global state of the design, @var array */
public $context; public $context;
@ -243,15 +247,41 @@ class Design extends BaseDesign
} }
foreach ($variables as $variable) { foreach ($variables as $variable) {
if ($variable == '$total_taxes' || $variable == '$line_taxes') { if ($variable == '$total_taxes') {
continue; $taxes = $this->entity->calc()->getTotalTaxMap();
}
$elements[] = ['element' => 'div', 'elements' => [ if (!$taxes) {
['element' => 'span', 'content' => 'This is placeholder for the 3rd fraction of element.', 'properties' => ['style' => 'opacity: 0%']], // Placeholder for fraction of element (3fr) continue;
['element' => 'span', 'content' => $variable . '_label'], }
['element' => 'span', 'content' => $variable],
]]; foreach ($taxes as $tax) {
$elements[] = ['element' => 'div', 'elements' => [
['element' => 'span', 'content' => 'This is placeholder for the 3rd fraction of element.', 'properties' => ['style' => 'opacity: 0%']], // Placeholder for fraction of element (3fr)
['element' => 'span', 'content', 'content' => $tax['name']],
['element' => 'span', 'content', 'content' => Number::formatMoney($tax['total'], $this->context['client'])],
]];
}
} elseif ($variable == '$line_taxes') {
$taxes = $this->entity->calc()->getTaxMap();
if (!$taxes) {
continue;
}
foreach ($taxes as $tax) {
$elements[] = ['element' => 'div', 'elements' => [
['element' => 'span', 'content' => 'This is placeholder for the 3rd fraction of element.', 'properties' => ['style' => 'opacity: 0%']], // Placeholder for fraction of element (3fr)
['element' => 'span', 'content', 'content' => $tax['name']],
['element' => 'span', 'content', 'content' => Number::formatMoney($tax['total'], $this->context['client'])],
]];
}
} else {
$elements[] = ['element' => 'div', 'elements' => [
['element' => 'span', 'content' => 'This is placeholder for the 3rd fraction of element.', 'properties' => ['style' => 'opacity: 0%']], // Placeholder for fraction of element (3fr)
['element' => 'span', 'content' => $variable . '_label'],
['element' => 'span', 'content' => $variable],
]];
}
} }
return $elements; return $elements;

10
app/Utils/HtmlEngine.php
View File

@ -1,4 +1,5 @@
<?php <?php
/** /**
* Invoice Ninja (https://invoiceninja.com). * Invoice Ninja (https://invoiceninja.com).
* *
@ -108,10 +109,11 @@ class HtmlEngine
$data['$invoice.due_date'] = &$data['$due_date']; $data['$invoice.due_date'] = &$data['$due_date'];
$data['$invoice.number'] = ['value' => $this->entity->number ?: '&nbsp;', 'label' => ctrans('texts.invoice_number')]; $data['$invoice.number'] = ['value' => $this->entity->number ?: '&nbsp;', 'label' => ctrans('texts.invoice_number')];
$data['$invoice.po_number'] = ['value' => $this->entity->po_number ?: '&nbsp;', 'label' => ctrans('texts.po_number')]; $data['$invoice.po_number'] = ['value' => $this->entity->po_number ?: '&nbsp;', 'label' => ctrans('texts.po_number')];
$data['$line_taxes'] = ['value' => $this->makeLineTaxes() ?: '&nbsp;', 'label' => ctrans('texts.taxes')]; // $data['$line_taxes'] = ['value' => $this->makeLineTaxes() ?: '&nbsp;', 'label' => ctrans('texts.taxes')];
$data['$invoice.line_taxes'] = &$data['$line_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']; // $data['$total_taxes'] = ['value' => $this->makeTotalTaxes() ?: '&nbsp;', 'label' => ctrans('texts.taxes')];
// $data['$invoice.total_taxes'] = &$data['$total_taxes'];
if ($this->entity_string == 'invoice') { if ($this->entity_string == 'invoice') {
$data['$entity'] = ['value' => '', 'label' => ctrans('texts.invoice')]; $data['$entity'] = ['value' => '', 'label' => ctrans('texts.invoice')];