update marketing
All checks were successful
All checks were successful
This commit is contained in:
@@ -0,0 +1,155 @@
|
||||
<table>
|
||||
<thead>
|
||||
<tr>
|
||||
<th>{{ __('Date') }}</th>
|
||||
<th>{{ __('Invoice') }}</th>
|
||||
@if (Request::get('type') == 'sales')
|
||||
<th>{{ __('Customer') }}</th>
|
||||
@else
|
||||
<th>{{ __('Supplier') }}</th>
|
||||
@endif
|
||||
<th>{{ __('Tax Number') }}</th>
|
||||
<th>{{ __('Total Amount') }}</th>
|
||||
<th>{{ __('Payment Method') }}</th>
|
||||
<th>{{ __('Discount') }}</th>
|
||||
@foreach ($vats as $vat)
|
||||
<th>{{ $vat->name . '@' . $vat->rate . '%' }}</th>
|
||||
@endforeach
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<!-- Show sales data if sales tab is active -->
|
||||
@if (Request::get('type') == 'sales')
|
||||
@foreach ($sales as $sale)
|
||||
<tr>
|
||||
<td>{{ formatted_date($sale->created_at) }}</td>
|
||||
<td>{{ $sale->invoiceNumber }}</td>
|
||||
<td>{{ $sale->party->name ?? '' }}</td>
|
||||
<td>{{ $sale->party->tax_no ?? '' }}</td>
|
||||
<td>{{ currency_format($sale->totalAmount, currency: business_currency()) }}</td>
|
||||
<td>
|
||||
@if ($sale->transactions && $sale->transactions->isNotEmpty())
|
||||
{{ $sale->transactions->map(function($transaction) {
|
||||
if ($transaction->transaction_type === 'bank_payment' && !empty($transaction->paymentType?->name)) {
|
||||
return $transaction->paymentType->name;
|
||||
}
|
||||
return $transaction->transaction_type ? ucfirst(explode('_', $transaction->transaction_type)[0]) : '';
|
||||
})->unique()->implode(', ') }}
|
||||
@elseif ($sale->payment_type_id)
|
||||
{{ $sale->payment_type?->name }}
|
||||
@else
|
||||
{{ $sale->paymentType }}
|
||||
@endif
|
||||
</td>
|
||||
<td>{{ currency_format($sale->discountAmount, currency: business_currency()) }}</td>
|
||||
@foreach ($vats as $vat)
|
||||
@php
|
||||
// Product VAT
|
||||
$productVat = $saleVatRowMap[$sale->id][$vat->id] ?? 0;
|
||||
|
||||
// Returned VAT
|
||||
$returnVat = $saleReturnVatRowMap[$sale->id][$vat->id] ?? 0;
|
||||
|
||||
// Invoice VAT
|
||||
$invoiceVat = ($sale->vat_id == $vat->id) ? $sale->vat_amount : 0;
|
||||
|
||||
// Final VAT
|
||||
$totalVat = $productVat + $invoiceVat - $returnVat;
|
||||
@endphp
|
||||
<td>{{ currency_format($totalVat, currency: business_currency()) }}</td>
|
||||
@endforeach
|
||||
</tr>
|
||||
@endforeach
|
||||
@if ($sales->count() > 0)
|
||||
<tr class="table-footer">
|
||||
<td class="text-start fw-bold">{{ __('Total') }}</td>
|
||||
<td></td>
|
||||
<td></td>
|
||||
<td></td>
|
||||
<td class="text-center fw-bold">
|
||||
{{ currency_format($sales->sum('totalAmount'), currency: business_currency()) }}
|
||||
</td>
|
||||
<td class="d-print-none"></td>
|
||||
<td class="text-center fw-bold">
|
||||
{{ currency_format($sales->sum('discountAmount'), currency: business_currency()) }}
|
||||
</td>
|
||||
@foreach ($vats as $vat)
|
||||
@php
|
||||
$grandVatTotal = (($salesVatTotals[$vat->id] ?? 0)
|
||||
- ($salesReturnVatTotals[$vat->id] ?? 0))
|
||||
+ $sales->where('vat_id', $vat->id)->sum('vat_amount');
|
||||
@endphp
|
||||
<td class="text-center fw-bold">
|
||||
{{ currency_format($grandVatTotal, currency: business_currency()) }}
|
||||
</td>
|
||||
@endforeach
|
||||
</tr>
|
||||
@endif
|
||||
@endif
|
||||
|
||||
<!-- Show purchase data if purchase tab is active -->
|
||||
@if (Request::get('type') == 'purchases')
|
||||
@foreach ($purchases as $purchase)
|
||||
<tr>
|
||||
<td>{{ formatted_date($purchase->created_at) }}</td>
|
||||
<td>{{ $purchase->invoiceNumber }}</td>
|
||||
<td>{{ $purchase->party->name ?? '' }}</td>
|
||||
<td>{{ $purchase->party->tax_no ?? '' }}</td>
|
||||
<td>{{ currency_format($purchase->totalAmount, currency: business_currency()) }}</td>
|
||||
<td>
|
||||
@if ($purchase->transactions && $purchase->transactions->isNotEmpty())
|
||||
{{ $purchase->transactions->map(function($transaction) {
|
||||
if ($transaction->transaction_type === 'bank_payment' && !empty($transaction->paymentType?->name)) {
|
||||
return $transaction->paymentType->name;
|
||||
}
|
||||
return $transaction->transaction_type ? ucfirst(explode('_', $transaction->transaction_type)[0]) : '';
|
||||
})->unique()->implode(', ') }}
|
||||
@elseif ($purchase->payment_type_id)
|
||||
{{ $purchase->payment_type?->name }}
|
||||
@else
|
||||
{{ $purchase->paymentType }}
|
||||
@endif
|
||||
</td>
|
||||
<td>{{ 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>{{ currency_format($totalVat, currency: business_currency()) }}</td>
|
||||
@endforeach
|
||||
</tr>
|
||||
@endforeach
|
||||
@if ($purchases->count() > 0)
|
||||
<tr class="table-footer">
|
||||
<td class="text-start fw-bold">{{ __('Total') }}</td>
|
||||
<td></td>
|
||||
<td></td>
|
||||
<td></td>
|
||||
<td class="text-center fw-bold">{{ currency_format($purchases->sum('totalAmount'), currency: business_currency()) }}</td>
|
||||
<td class="d-print-none"></td>
|
||||
<td class="text-center fw-bold">{{ currency_format($purchases->sum('discountAmount'), currency: business_currency()) }}</td>
|
||||
@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()) }}
|
||||
</td>
|
||||
@endforeach
|
||||
</tr>
|
||||
@endif
|
||||
@endif
|
||||
</tbody>
|
||||
</table>
|
||||
@@ -22,6 +22,24 @@
|
||||
<div class="d-flex align-items-center justify-content-between table-top-form">
|
||||
<form action="{{ route('business.vat-reports.index') }}" method="GET" class="vat-report-filter-form">
|
||||
<div class="table-top-left d-flex gap-3 d-print-none flex-wrap p-3">
|
||||
<div class="gpt-up-down-arrow position-relative">
|
||||
<select name="per_page" class="form-control">
|
||||
<option @selected(request('per_page') == 20) value="20">{{ __('Show 20') }}</option>
|
||||
<option @selected(request('per_page') == 50) value="50">{{ __('Show 50') }}</option>
|
||||
<option @selected(request('per_page') == 100) value="100">{{ __('Show 100') }}</option>
|
||||
<option @selected(request('per_page') == 500) value="500">{{ __('Show 500') }}</option>
|
||||
</select>
|
||||
<span></span>
|
||||
</div>
|
||||
<div class="table-search position-relative">
|
||||
<input type="text" name="search" class="form-control" placeholder="{{ __('Search...') }}" value="{{ request('search') }}">
|
||||
<span class="position-absolute">
|
||||
<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
|
||||
<path d="M14.582 14.582L18.332 18.332" stroke="#4D4D4D" stroke-width="1.25" stroke-linecap="round" stroke-linejoin="round"/>
|
||||
<path d="M16.668 9.16797C16.668 5.02584 13.3101 1.66797 9.16797 1.66797C5.02584 1.66797 1.66797 5.02584 1.66797 9.16797C1.66797 13.3101 5.02584 16.668 9.16797 16.668C13.3101 16.668 16.668 13.3101 16.668 9.16797Z" stroke="#4D4D4D" stroke-width="1.25" stroke-linejoin="round"/>
|
||||
</svg>
|
||||
</span>
|
||||
</div>
|
||||
<div class="custom-from-to align-items-center date-filters d-none">
|
||||
<label class="header-label">{{ __('From Date') }}</label>
|
||||
<input type="date" name="from_date" value="{{ request('from_date') ?? now()->format('Y-m-d') }}" class="form-control">
|
||||
@@ -56,22 +74,18 @@
|
||||
</form>
|
||||
<div class="table-top-btn-group d-print-none p-3">
|
||||
<ul>
|
||||
<input type="hidden" id="csvBaseUrl" value="{{ route('business.vat.reports.csv') }}">
|
||||
<input type="hidden" id="excelBaseUrl" value="{{ route('business.vat.reports.excel') }}">
|
||||
<input type="hidden" id="pdfBaseUrl" value="{{ route('business.vat.reports.pdf') }}">
|
||||
|
||||
<li>
|
||||
<a id="csvExportLink" href="#">
|
||||
<a class="vat-export-btn" href="{{ route('business.vat.reports.csv') }}">
|
||||
<img src="{{ asset('assets/images/logo/csv.svg') }}" alt="CSV">
|
||||
</a>
|
||||
</li>
|
||||
<li>
|
||||
<a id="excelExportLink" href="#">
|
||||
<a class="vat-export-btn" href="{{ route('business.vat.reports.excel') }}">
|
||||
<img src="{{ asset('assets/images/logo/excel.svg') }}" alt="Excel">
|
||||
</a>
|
||||
</li>
|
||||
<li>
|
||||
<a target="blank" id="pdfExportLink" href="#">
|
||||
<a class="vat-export-btn" target="_blank" href="{{ route('business.vat.reports.pdf') }}">
|
||||
<img src="{{ asset('assets/images/logo/pdf.svg') }}" alt="Pdf">
|
||||
</a>
|
||||
</li>
|
||||
@@ -81,13 +95,12 @@
|
||||
</a>
|
||||
</li>
|
||||
</ul>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="custom-tabs d-print-none">
|
||||
<button class="tab-item active" onclick="showTab('sales')">{{ __('Sales') }}</button>
|
||||
<button class="tab-item" onclick="showTab('purchase')">{{ __('Purchases') }}</button>
|
||||
<button class="tab-item active" data-tab="sales">{{ __('Sales') }}</button>
|
||||
<button class="tab-item" data-tab="purchases">{{ __('Purchases') }}</button>
|
||||
</div>
|
||||
|
||||
<div id="sales" class="tab-content dashboard-tab active">
|
||||
@@ -96,7 +109,7 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div id="purchase" class="tab-content dashboard-tab">
|
||||
<div id="purchases" class="tab-content dashboard-tab">
|
||||
<div id="purchase-vat-reports-data">
|
||||
@include('business::reports.vats.purchase-datas')
|
||||
</div>
|
||||
|
||||
@@ -12,7 +12,19 @@
|
||||
{{ __('Tax Report List') }}
|
||||
@endif
|
||||
</h4>
|
||||
{{-- <p style="text-align: center; margin: 0; padding: 0; font-weight: 400; font-size: 14px;" class="">{{ __('Duration: 14-12-2025 to 24-12-2025') }}</p> --}}
|
||||
@if ($filter_from_date && $filter_to_date)
|
||||
<p style="text-align: center; margin: 0; padding: 0; font-weight: 400; font-size: 14px;" class="">{{ __('Duration:') }}
|
||||
@if ($duration === 'today')
|
||||
{{ Carbon\Carbon::parse($filter_from_date)->format('d-m-Y') }}
|
||||
@elseif ($duration === 'yesterday')
|
||||
{{ Carbon\Carbon::parse($filter_from_date)->format('d-m-Y') }}
|
||||
@else
|
||||
{{ Carbon\Carbon::parse($filter_from_date)->format('d-m-Y') }}
|
||||
{{ __('to') }}
|
||||
{{ Carbon\Carbon::parse($filter_to_date)->format('d-m-Y') }}
|
||||
@endif
|
||||
</p>
|
||||
@endif
|
||||
</div>
|
||||
@endsection
|
||||
|
||||
@@ -29,11 +41,12 @@
|
||||
@else
|
||||
<th style="font-size:12px; border:1px solid gainsboro; color: white" class="text-start">{{ __('Supplier') }}</th>
|
||||
@endif
|
||||
<th style="font-size:12px; border:1px solid gainsboro; color: white" class="text-start">{{ __('Tax Number') }}</th>
|
||||
<th style="font-size:12px; border:1px solid gainsboro; color: white" class="text-start">{{ __('Payment Type') }}</th>
|
||||
<th style="font-size:12px; border:1px solid gainsboro; color: white" class="text-start">{{ __('Total Amount') }}</th>
|
||||
<th style="font-size:12px; border:1px solid gainsboro; color: white" class="text-start">{{ __('Discount') }}</th>
|
||||
@foreach ($vats as $vat)
|
||||
<th style="font-size:12px; border:1px solid gainsboro; color: white" class="text-start">{{ $vat->name }}</th>
|
||||
<th style="font-size:12px; border:1px solid gainsboro; color: white" class="text-start">{{ $vat->name . '@' . $vat->rate . '%' }}</th>
|
||||
@endforeach
|
||||
</tr>
|
||||
</thead>
|
||||
@@ -50,6 +63,9 @@
|
||||
<td style="border:1px solid gainsboro; text-align:center;">
|
||||
{{ $sale->party?->name }}
|
||||
</td>
|
||||
<td style="border:1px solid gainsboro; text-align:center;">
|
||||
{{ $sale->party?->tax_no }}
|
||||
</td>
|
||||
<td style="border:1px solid gainsboro; text-align:center;" class="d-print-none">
|
||||
@if ($sale->transactions && $sale->transactions->isNotEmpty())
|
||||
{{ $sale->transactions->map(function($transaction) {
|
||||
@@ -73,8 +89,21 @@
|
||||
{{ currency_format($sale->discountAmount, currency: business_currency()) }}
|
||||
</td>
|
||||
@foreach ($vats as $vat)
|
||||
@php
|
||||
// Product VAT
|
||||
$productVat = $saleVatRowMap[$sale->id][$vat->id] ?? 0;
|
||||
|
||||
// Returned VAT
|
||||
$returnVat = $saleReturnVatRowMap[$sale->id][$vat->id] ?? 0;
|
||||
|
||||
// Invoice VAT
|
||||
$invoiceVat = ($sale->vat_id == $vat->id) ? $sale->vat_amount : 0;
|
||||
|
||||
// Final VAT
|
||||
$totalVat = $productVat + $invoiceVat - $returnVat;
|
||||
@endphp
|
||||
<td style="border:1px solid gainsboro; text-align:center;">
|
||||
{{ $sale->vat_id == $vat->id ? currency_format($sale->vat_amount, currency: business_currency()) : '0' }}
|
||||
{{ currency_format($totalVat, currency: business_currency()) }}
|
||||
</td>
|
||||
@endforeach
|
||||
</tr>
|
||||
@@ -89,6 +118,7 @@
|
||||
<td style="border:1px solid gainsboro; text-align:center;"></td>
|
||||
<td style="border:1px solid gainsboro; text-align:center;"></td>
|
||||
<td style="border:1px solid gainsboro; text-align:center;"></td>
|
||||
<td style="border:1px solid gainsboro; text-align:center;"></td>
|
||||
<td style="border:1px solid gainsboro; text-align:center; color: white; font-weight: 600;">
|
||||
{{ currency_format($sales->sum('totalAmount'), currency: business_currency()) }}
|
||||
</td>
|
||||
@@ -96,8 +126,13 @@
|
||||
{{ currency_format($sales->sum('discountAmount'), currency: business_currency()) }}
|
||||
</td>
|
||||
@foreach ($vats as $vat)
|
||||
@php
|
||||
$grandVatTotal = (($salesVatTotals[$vat->id] ?? 0)
|
||||
- ($salesReturnVatTotals[$vat->id] ?? 0))
|
||||
+ $sales->where('vat_id', $vat->id)->sum('vat_amount');
|
||||
@endphp
|
||||
<td style="border:1px solid gainsboro; text-align:center; color: white; font-weight: 600;">
|
||||
{{ currency_format($salesVatTotals[$vat->id] ?? 0, currency: business_currency()) }}
|
||||
{{ currency_format($grandVatTotal, currency: business_currency()) }}
|
||||
</td>
|
||||
@endforeach
|
||||
</tr>
|
||||
@@ -117,6 +152,9 @@
|
||||
<td style="border:1px solid gainsboro; text-align:center;">
|
||||
{{ $purchase->party?->name }}
|
||||
</td>
|
||||
<td style="border:1px solid gainsboro; text-align:center;">
|
||||
{{ $purchase->party?->tax_no }}
|
||||
</td>
|
||||
<td style="border:1px solid gainsboro; text-align:center;" class="d-print-none">
|
||||
@if ($purchase->transactions && $purchase->transactions->isNotEmpty())
|
||||
{{ $purchase->transactions->map(function($transaction) {
|
||||
@@ -140,8 +178,21 @@
|
||||
{{ 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 style="border:1px solid gainsboro; text-align:center;">
|
||||
{{ $purchase->vat_id == $vat->id ? currency_format($purchase->vat_amount, currency: business_currency()) : '0' }}
|
||||
{{ currency_format($totalVat, currency: business_currency()) }}
|
||||
</td>
|
||||
@endforeach
|
||||
</tr>
|
||||
@@ -156,6 +207,7 @@
|
||||
<td style="border:1px solid gainsboro; text-align:center;"></td>
|
||||
<td style="border:1px solid gainsboro; text-align:center;"></td>
|
||||
<td style="border:1px solid gainsboro; text-align:center;"></td>
|
||||
<td style="border:1px solid gainsboro; text-align:center;"></td>
|
||||
<td style="border:1px solid gainsboro; text-align:center; color: white; font-weight: 600;">
|
||||
{{ currency_format($purchases->sum('totalAmount'), currency: business_currency()) }}
|
||||
</td>
|
||||
@@ -163,8 +215,13 @@
|
||||
{{ currency_format($purchases->sum('discountAmount'), currency: business_currency()) }}
|
||||
</td>
|
||||
@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 style="border:1px solid gainsboro; text-align:center; color: white; font-weight: 600;">
|
||||
{{ currency_format($purchasesVatTotals[$vat->id] ?? 0, currency: business_currency()) }}
|
||||
{{ currency_format($grandVatTotal, currency: business_currency()) }}
|
||||
</td>
|
||||
@endforeach
|
||||
</tr>
|
||||
|
||||
@@ -19,11 +19,12 @@
|
||||
<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 }}</th>
|
||||
<th class="text-center">{{ $vat->name . '@' . $vat->rate . '%' }}</th>
|
||||
@endforeach
|
||||
</tr>
|
||||
</thead>
|
||||
@@ -33,6 +34,7 @@
|
||||
<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">
|
||||
@@ -50,10 +52,26 @@
|
||||
@endif
|
||||
</td>
|
||||
<td class="text-center d-print-none">
|
||||
{{ currency_format($purchase->discountAmount, currency: business_currency()) }}</td>
|
||||
{{ currency_format($purchase->discountAmount, currency: business_currency()) }}
|
||||
</td>
|
||||
{{-- VAT Columns --}}
|
||||
@foreach ($vats as $vat)
|
||||
<td class="text-center">
|
||||
{{ $purchase->vat_id == $vat->id ? currency_format($purchase->vat_amount, currency: business_currency()) : '0' }}
|
||||
@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>
|
||||
@endforeach
|
||||
</tr>
|
||||
@@ -64,12 +82,20 @@
|
||||
<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($purchasesVatTotals[$vat->id] ?? 0, currency: business_currency()) }}
|
||||
{{ currency_format($grandVatTotal, currency: business_currency()) }}
|
||||
</td>
|
||||
@endforeach
|
||||
</tr>
|
||||
@@ -77,5 +103,5 @@
|
||||
</table>
|
||||
</div>
|
||||
<div class="mt-3">
|
||||
{{ $purchases->appends(['tab' => 'purchases'])->links('vendor.pagination.bootstrap-5') }}
|
||||
{{ $purchases->links('vendor.pagination.bootstrap-5') }}
|
||||
</div>
|
||||
|
||||
@@ -12,6 +12,7 @@
|
||||
@endif
|
||||
</div>
|
||||
@endif
|
||||
|
||||
<div class="responsive-table tax-report-table m-0">
|
||||
<table class="table dashboard-table-content">
|
||||
<thead class="thead-light">
|
||||
@@ -19,30 +20,36 @@
|
||||
<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">{{ __('Customer') }}</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 }}</th>
|
||||
<th class="text-center">{{ $vat->name . '@' . $vat->rate . '%' }}</th>
|
||||
@endforeach
|
||||
</tr>
|
||||
</thead>
|
||||
|
||||
<tbody>
|
||||
@foreach ($sales as $sale)
|
||||
<tr>
|
||||
<td class="text-start">{{ formatted_date($sale->created_at) }}</td>
|
||||
<td class="text-center d-print-none">{{ $sale->invoiceNumber }}</td>
|
||||
<td class="text-center">{{ $sale->party->name ?? '' }}</td>
|
||||
<td class="text-center">{{ $sale->party->tax_no ?? '' }}</td>
|
||||
<td class="text-center">
|
||||
{{ currency_format($sale->totalAmount, currency: business_currency()) }}
|
||||
</td>
|
||||
|
||||
<td class="text-center d-print-none">
|
||||
@if ($sale->transactions && $sale->transactions->isNotEmpty())
|
||||
{{ $sale->transactions->map(function($transaction) {
|
||||
if ($transaction->transaction_type === 'bank_payment' && !empty($transaction->paymentType?->name)) {
|
||||
return $transaction->paymentType->name;
|
||||
}
|
||||
return $transaction->transaction_type ? ucfirst(explode('_', $transaction->transaction_type)[0]) : '';
|
||||
return $transaction->transaction_type
|
||||
? ucfirst(explode('_', $transaction->transaction_type)[0])
|
||||
: '';
|
||||
})->unique()->implode(', ') }}
|
||||
@elseif ($sale->payment_type_id)
|
||||
{{ $sale->payment_type?->name }}
|
||||
@@ -50,37 +57,70 @@
|
||||
{{ $sale->paymentType }}
|
||||
@endif
|
||||
</td>
|
||||
|
||||
<td class="text-center d-print-none">
|
||||
{{ currency_format($sale->discountAmount, currency: business_currency()) }}</td>
|
||||
{{ currency_format($sale->discountAmount, currency: business_currency()) }}
|
||||
</td>
|
||||
|
||||
{{-- VAT Columns --}}
|
||||
@foreach ($vats as $vat)
|
||||
<td class="text-center">
|
||||
{{ $sale->vat_id == $vat->id ? currency_format($sale->vat_amount, currency: business_currency()) : '0' }}
|
||||
@php
|
||||
// Product VAT
|
||||
$productVat = $saleVatRowMap[$sale->id][$vat->id] ?? 0;
|
||||
|
||||
// Returned VAT
|
||||
$returnVat = $saleReturnVatRowMap[$sale->id][$vat->id] ?? 0;
|
||||
|
||||
// Invoice VAT
|
||||
$invoiceVat = ($sale->vat_id == $vat->id) ? $sale->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>
|
||||
@endforeach
|
||||
</tr>
|
||||
@endforeach
|
||||
</tbody>
|
||||
|
||||
@if ($sales->count() > 0)
|
||||
<tr class="table-footer">
|
||||
<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($sales->sum('totalAmount'), currency: business_currency()) }}
|
||||
</td>
|
||||
|
||||
<td class="d-print-none"></td>
|
||||
|
||||
<td class="text-center fw-bold d-print-none">
|
||||
{{ currency_format($sales->sum('discountAmount'), currency: business_currency()) }}
|
||||
</td>
|
||||
|
||||
{{-- VAT Totals --}}
|
||||
@foreach ($vats as $vat)
|
||||
@php
|
||||
$grandVatTotal = (($salesVatTotals[$vat->id] ?? 0)
|
||||
- ($salesReturnVatTotals[$vat->id] ?? 0))
|
||||
+ $sales->where('vat_id', $vat->id)->sum('vat_amount');
|
||||
@endphp
|
||||
|
||||
<td class="text-center fw-bold">
|
||||
{{ currency_format($salesVatTotals[$vat->id] ?? 0, currency: business_currency()) }}
|
||||
{{ currency_format($grandVatTotal, currency: business_currency()) }}
|
||||
</td>
|
||||
@endforeach
|
||||
|
||||
</tr>
|
||||
@endif
|
||||
</table>
|
||||
</div>
|
||||
|
||||
<div class="mt-3">
|
||||
{{ $sales->appends(['tab' => 'sales'])->links('vendor.pagination.bootstrap-5') }}
|
||||
{{ $sales->links('vendor.pagination.bootstrap-5') }}
|
||||
</div>
|
||||
|
||||
Reference in New Issue
Block a user