mirror of
https://github.com/InvoiceShelf/InvoiceShelf.git
synced 2026-04-19 03:04:05 +00:00
Adding Flat Tax support with fixed amount (#253)
* Possibility to set a fixed amount on tax types settings * Pint and manage flat taxes on items * Fix display errors and handle global taxes * Tests * Pint with PHP 8.2 cause with PHP 8.3 version it cause workflow error * Merging percent and fixed amount into one column * Now display the currency on SelectTaxPopup on fixed taxes
This commit is contained in:
@@ -106,7 +106,11 @@
|
||||
@foreach ($taxes as $tax)
|
||||
<tr>
|
||||
<td class="border-0 total-table-attribute-label">
|
||||
{{$tax->name.' ('.$tax->percent.'%)'}}
|
||||
@if($tax->calculation_type === 'fixed')
|
||||
{{$tax->name }} ({!! format_money_pdf($tax->fixed_amount, $estimate->customer->currency) !!})
|
||||
@else
|
||||
{{$tax->name.' ('.$tax->percent.'%)'}}
|
||||
@endif
|
||||
</td>
|
||||
<td class="py-2 border-0 item-cell total-table-attribute-value">
|
||||
{!! format_money_pdf($tax->amount, $estimate->customer->currency) !!}
|
||||
@@ -117,7 +121,11 @@
|
||||
@foreach ($estimate->taxes as $tax)
|
||||
<tr>
|
||||
<td class="border-0 total-table-attribute-label">
|
||||
{{$tax->name.' ('.$tax->percent.'%)'}}
|
||||
@if($tax->calculation_type === 'fixed')
|
||||
{{$tax->name }} ({!! format_money_pdf($tax->fixed_amount, $estimate->customer->currency) !!})
|
||||
@else
|
||||
{{$tax->name.' ('.$tax->percent.'%)'}}
|
||||
@endif
|
||||
</td>
|
||||
<td class="border-0 item-cell total-table-attribute-value" >
|
||||
{!! format_money_pdf($tax->amount, $estimate->customer->currency) !!}
|
||||
|
||||
Reference in New Issue
Block a user