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

Merge branch 'discount-issue' into 'master'

Browse Source 
fix total discount issue

See merge request mohit.panjvani/crater-web!655
This commit is contained in:
Mohit Panjwani
2021-01-06 06:58:07 +00:00
parent ead0ebb012 8b04e94446
commit 607b1795bb
2 changed files with 50 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -94,7 +94,7 @@
</tr>
@endforeach
@endif
@if($estimate->discount > 0)
@if ($estimate->discount_per_item === 'NO')
<tr>
<td class="pl-10 border-0 total-table-attribute-label">
@ -115,6 +115,7 @@
</td>
</tr>
@endif
@endif
<tr>
<td class="py-3"></td>
<td class="py-3"></td>

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

@ -39,6 +39,7 @@
>
{!! format_money_pdf($item->price, $invoice->user->currency) !!}
</td>
@if($invoice->discount_per_item === 'YES')
<td
class="pl-10 text-right item-cell"
@ -52,6 +53,7 @@
@endif
</td>
@endif
<td
class="text-right item-cell"
style="vertical-align: top;"
@ -100,6 +102,7 @@
@endforeach
@endif
@if($invoice->discount > 0)
@if ($invoice->discount_per_item === 'NO')
<tr>
<td class="border-0 total-table-attribute-label">
@ -120,6 +123,8 @@
</td>
</tr>
@endif
@endif
<tr>
<td class="py-3"></td>
<td class="py-3"></td>