TheCloneArmy/crater
1
0
Fork 1
mirror of https://github.com/crater-invoice/crater.git synced 2025-10-31 05:31:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix total discount issue

Browse Source
This commit is contained in:
spvarma
2020-12-24 13:43:29 +05:30
parent fa512629d9
commit 8b04e94446
2 changed files with 50 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
resources/views/app/pdf/estimate/partials/table.blade.php
View File

@ -94,26 +94,27 @@
</tr>
@endforeach
@endif
@if ($estimate->discount_per_item === 'NO')
<tr>
<td class="pl-10 border-0 total-table-attribute-label">
@if($estimate->discount_type === 'fixed')
@lang('pdf_discount_label')
@endif
@if($estimate->discount_type === 'percentage')
@lang('pdf_discount_label') ({{$estimate->discount}}%)
@endif
</td>
<td class="text-right border-0 item-cell total-table-attribute-value">
@if($estimate->discount_type === 'fixed')
{!! format_money_pdf($estimate->discount_val, $estimate->user->currency) !!}
@endif
@if($estimate->discount_type === 'percentage')
{!! format_money_pdf($estimate->discount_val, $estimate->user->currency) !!}
@endif
</td>
</tr>
@if($estimate->discount > 0)
@if ($estimate->discount_per_item === 'NO')
<tr>
<td class="pl-10 border-0 total-table-attribute-label">
@if($estimate->discount_type === 'fixed')
@lang('pdf_discount_label')
@endif
@if($estimate->discount_type === 'percentage')
@lang('pdf_discount_label') ({{$estimate->discount}}%)
@endif
</td>
<td class="text-right border-0 item-cell total-table-attribute-value">
@if($estimate->discount_type === 'fixed')
{!! format_money_pdf($estimate->discount_val, $estimate->user->currency) !!}
@endif
@if($estimate->discount_type === 'percentage')
{!! format_money_pdf($estimate->discount_val, $estimate->user->currency) !!}
@endif
</td>
</tr>
@endif
@endif
<tr>
<td class="py-3"></td>

53
resources/views/app/pdf/invoice/partials/table.blade.php
View File

@ -39,19 +39,21 @@
>
{!! format_money_pdf($item->price, $invoice->user->currency) !!}
</td>
@if($invoice->discount_per_item === 'YES')
<td
class="pl-10 text-right item-cell"
style="vertical-align: top;"
>
@if($item->discount_type === 'fixed')
{!! format_money_pdf($item->discount_val, $invoice->user->currency) !!}
@endif
@if($item->discount_type === 'percentage')
{{$item->discount}}%
@endif
{!! format_money_pdf($item->discount_val, $invoice->user->currency) !!}
@endif
@if($item->discount_type === 'percentage')
{{$item->discount}}%
@endif
</td>
@endif
<td
class="text-right item-cell"
style="vertical-align: top;"
@ -100,26 +102,29 @@
@endforeach
@endif
@if ($invoice->discount_per_item === 'NO')
<tr>
<td class="border-0 total-table-attribute-label">
@if($invoice->discount_type === 'fixed')
@lang('pdf_discount_label')
@endif
@if($invoice->discount_type === 'percentage')
@lang('pdf_discount_label') ({{$invoice->discount}}%)
@endif
</td>
<td class="py-2 border-0 item-cell total-table-attribute-value" >
@if($invoice->discount_type === 'fixed')
{!! format_money_pdf($invoice->discount_val, $invoice->user->currency) !!}
@endif
@if($invoice->discount_type === 'percentage')
{!! format_money_pdf($invoice->discount_val, $invoice->user->currency) !!}
@endif
</td>
</tr>
@if($invoice->discount > 0)
@if ($invoice->discount_per_item === 'NO')
<tr>
<td class="border-0 total-table-attribute-label">
@if($invoice->discount_type === 'fixed')
@lang('pdf_discount_label')
@endif
@if($invoice->discount_type === 'percentage')
@lang('pdf_discount_label') ({{$invoice->discount}}%)
@endif
</td>
<td class="py-2 border-0 item-cell total-table-attribute-value" >
@if($invoice->discount_type === 'fixed')
{!! format_money_pdf($invoice->discount_val, $invoice->user->currency) !!}
@endif
@if($invoice->discount_type === 'percentage')
{!! format_money_pdf($invoice->discount_val, $invoice->user->currency) !!}
@endif
</td>
</tr>
@endif
@endif
<tr>
<td class="py-3"></td>
<td class="py-3"></td>