finishing to dev
All checks were successful
Build, Push and Deploy / build-and-push (push) Successful in 3m41s
Gitea Actions Demo / Explore-Gitea-Actions (push) Successful in 16s
Build, Push and Deploy / deploy-staging (push) Successful in 42s
Build, Push and Deploy / deploy-production (push) Has been skipped

This commit is contained in:
2026-05-14 22:50:44 +07:00
parent 2fabdf8fc9
commit 8307b9e66d
212 changed files with 2451 additions and 4493 deletions

View File

@@ -19,12 +19,11 @@
<th class="text-start" scope="col">{{ __('Date') }}</th>
<th class="text-center d-print-none" scope="col">{{ __('Invoice') }}</th>
<th class="text-center" scope="col">{{ __('Supplier') }}</th>
<th class="text-center" scope="col">{{ __('Tax Number') }}</th>
<th class="text-center" scope="col">{{ __('Total Amount') }}</th>
<th class="text-center d-print-none" scope="col">{{ __('Payment Method') }}</th>
<th class="text-center d-print-none" scope="col">{{ __('Discount') }}</th>
@foreach ($vats as $vat)
<th class="text-center">{{ $vat->name . '@' . $vat->rate . '%' }}</th>
<th class="text-center">{{ $vat->name }}</th>
@endforeach
</tr>
</thead>
@@ -34,7 +33,6 @@
<td class="text-start">{{ formatted_date($purchase->created_at) }}</td>
<td class="text-center d-print-none">{{ $purchase->invoiceNumber }}</td>
<td class="text-center">{{ $purchase->party->name ?? '' }}</td>
<td class="text-center">{{ $purchase->party->tax_no ?? '' }}</td>
<td class="text-center">
{{ currency_format($purchase->totalAmount, currency: business_currency()) }}</td>
<td class="text-center d-print-none">
@@ -52,26 +50,10 @@
@endif
</td>
<td class="text-center d-print-none">
{{ currency_format($purchase->discountAmount, currency: business_currency()) }}
</td>
{{-- VAT Columns --}}
{{ currency_format($purchase->discountAmount, currency: business_currency()) }}</td>
@foreach ($vats as $vat)
@php
// Product level VAT
$productVat = $purchaseVatRowMap[$purchase->id][$vat->id] ?? 0;
// Returned VAT
$returnVat = $purchaseReturnVatRowMap[$purchase->id][$vat->id] ?? 0;
// Invoice level VAT
$invoiceVat = ($purchase->vat_id == $vat->id) ? $purchase->vat_amount : 0;
// Final VAT
$totalVat = $productVat + $invoiceVat - $returnVat;
@endphp
<td @class(['text-center','fw-bold' => $totalVat > 0])>
{{ currency_format($totalVat, currency: business_currency()) }}
<td class="text-center">
{{ $purchase->vat_id == $vat->id ? currency_format($purchase->vat_amount, currency: business_currency()) : '0' }}
</td>
@endforeach
</tr>
@@ -82,20 +64,12 @@
<td class="text-start fw-bold">{{ __('Total') }}</td>
<td class="d-print-none"></td>
<td></td>
<td></td>
<td class="text-center fw-bold">{{ currency_format($purchases->sum('totalAmount'), currency: business_currency()) }}</th>
<td class="d-print-none"></td>
<td class="text-center fw-bold d-print-none">{{ currency_format($purchases->sum('discountAmount'), currency: business_currency()) }}</th>
{{-- VAT Totals --}}
@foreach ($vats as $vat)
@php
$grandVatTotal = (($purchasesVatTotals[$vat->id] ?? 0)
- ($purchaseReturnVatTotals[$vat->id] ?? 0))
+ $purchases->where('vat_id', $vat->id)->sum('vat_amount');
@endphp
<td class="text-center fw-bold">
{{ currency_format($grandVatTotal, currency: business_currency()) }}
{{ currency_format($purchasesVatTotals[$vat->id] ?? 0, currency: business_currency()) }}
</td>
@endforeach
</tr>
@@ -103,5 +77,5 @@
</table>
</div>
<div class="mt-3">
{{ $purchases->links('vendor.pagination.bootstrap-5') }}
{{ $purchases->appends(['tab' => 'purchases'])->links('vendor.pagination.bootstrap-5') }}
</div>