Compare commits

...

2 Commits

2 changed files with 303 additions and 285 deletions

View File

@@ -23,8 +23,8 @@ class DailySalePaymentReportModuleController extends Controller
->orderBy('id') ->orderBy('id')
->get(['id', 'name']); ->get(['id', 'name']);
$creditCollections = $this->getCreditSaleCollections($report_date); $creditCollections = $this->getCreditSaleCollections($report_date);
$creditTotals = [ $creditTotals = [
'grand_total' => $creditCollections->sum('grand_total'), 'grand_total' => $creditCollections->sum('grand_total'),
'methods' => [], 'methods' => [],
@@ -32,7 +32,7 @@ class DailySalePaymentReportModuleController extends Controller
foreach ($paymentOptions as $option) { foreach ($paymentOptions as $option) {
$creditTotals['methods'][$option->id] = $creditCollections->sum( $creditTotals['methods'][$option->id] = $creditCollections->sum(
fn($row) => $row['methods'][$option->id] ?? 0 fn($row) => $row['methods'][$option->id] ?? 0
); );
} }
@@ -82,7 +82,7 @@ class DailySalePaymentReportModuleController extends Controller
$sales_data = []; $sales_data = [];
foreach ($sales as $sale) { foreach ($sales as $sale) {
$methodTotals = []; $methodTotals = [];
// Sum from payments table // Sum from payments table
foreach ($paymentsTable->where('sale_id', $sale->id) as $p) { foreach ($paymentsTable->where('sale_id', $sale->id) as $p) {
$optionId = $p->payment_option_id; $optionId = $p->payment_option_id;
@@ -108,13 +108,48 @@ class DailySalePaymentReportModuleController extends Controller
]; ];
} }
// --- Table 3: Payment Method Summary Calculation ---
$summaryData = [];
// මුලින්ම හැම Payment Option එකටම බින්දුව දාලා Array එකක් හදාගන්නවා
foreach ($paymentOptions as $option) {
$summaryData[$option->id] = [
'name' => $option->name,
'sale_amount' => 0,
'received_amount' => 0,
'total_amount' => 0
];
}
// Table 1 (Daily Sales) වල සල්ලි ටික එකතු කරනවා
foreach ($sales_data as $sale) {
foreach ($paymentOptions as $option) {
$amount = $sale->methods[$option->id] ?? 0;
$summaryData[$option->id]['sale_amount'] += $amount;
$summaryData[$option->id]['total_amount'] += $amount;
}
}
// Table 2 (Credit Collections) වල සල්ලි ටික එකතු කරනවා
foreach ($creditCollections as $credit) {
foreach ($paymentOptions as $option) {
$amount = $credit['methods'][$option->id] ?? 0;
$summaryData[$option->id]['received_amount'] += $amount;
$summaryData[$option->id]['total_amount'] += $amount;
}
}
return view('dailysalepaymentreportmodule::index', compact( return view('dailysalepaymentreportmodule::index', compact(
'sales_data', 'sales_data',
'report_date', 'report_date',
'paymentOptions', 'paymentOptions',
'creditCollections', 'creditCollections',
'creditTotals', 'creditTotals',
)); 'summaryData'
));
} }
private function getCreditSaleCollections($date) private function getCreditSaleCollections($date)
@@ -183,12 +218,12 @@ class DailySalePaymentReportModuleController extends Controller
} }
$rows[] = [ $rows[] = [
'date' => $sale->created_at, 'date' => $sale->created_at,
'reference' => $sale->reference_no, 'reference' => $sale->reference_no,
'cashier' => $users[$sale->user_id] ?? '-', 'cashier' => $users[$sale->user_id] ?? '-',
'customer' => $customers[$sale->customer_id] ?? '-', 'customer' => $customers[$sale->customer_id] ?? '-',
'grand_total' => $sale->grand_total - $sale->paid_amount, 'grand_total' => $sale->grand_total - $sale->paid_amount,
'methods' => $methodTotals, 'methods' => $methodTotals,
]; ];
} }

View File

@@ -1,299 +1,282 @@
@extends('backend.layout.main') @extends('backend.layout.main')
@section('content') @section('content')
@if ($errors->has('title')) @if ($errors->has('title'))
<div class="alert alert-danger alert-dismissible text-center"> <div class="alert alert-danger alert-dismissible text-center">
<button type="button" class="close" data-dismiss="alert" aria-label="Close"><span <button type="button" class="close" data-dismiss="alert" aria-label="Close"><span
aria-hidden="true">&times;</span></button>{{ $errors->first('title') }} aria-hidden="true">&times;</span></button>{{ $errors->first('title') }}
</div> </div>
@endif @endif
@if (session()->has('message')) @if (session()->has('message'))
<div class="alert alert-success alert-dismissible text-center"> <div class="alert alert-success alert-dismissible text-center">
<button type="button" class="close" data-dismiss="alert" aria-label="Close"> <button type="button" class="close" data-dismiss="alert" aria-label="Close">
<span aria-hidden="true">&times;</span> <span aria-hidden="true">&times;</span>
</button>{{ session()->get('message') }} </button>{{ session()->get('message') }}
</div> </div>
@endif @endif
@if (session()->has('not_permitted')) @if (session()->has('not_permitted'))
<div class="alert alert-danger alert-dismissible text-center"> <div class="alert alert-danger alert-dismissible text-center">
<button type="button" class="close" data-dismiss="alert" aria-label="Close"> <button type="button" class="close" data-dismiss="alert" aria-label="Close">
<span aria-hidden="true">&times;</span> <span aria-hidden="true">&times;</span>
</button>{{ session()->get('not_permitted') }} </button>{{ session()->get('not_permitted') }}
</div> </div>
@endif @endif
<section> <section>
<div class="container-fluid"> <div class="container-fluid">
<div style="border-radius: 30px;" class="card pb-4 "> <div style="border-radius: 30px;" class="card pb-4 ">
<link rel="stylesheet" href="{{ asset('public/css/cloudma.css') }}"> <link rel="stylesheet" href="{{ asset('public/css/cloudma.css') }}">
<div style="background: linear-gradient(to right, #00c1e3, #00489f); border-radius: 30px 30px 0px 0px; font-weight: bold; color: white;" <div style="background: linear-gradient(to right, #00c1e3, #00489f); border-radius: 30px 30px 0px 0px; font-weight: bold; color: white;"
class="card-header mt-2"> class="card-header mt-2">
<h3 class="text-center">Daily Sale Payment Report</h3> <h3 class="text-center">Daily Sale Payment Report</h3>
</div> </div>
<form action="{{ url('dailysalepaymentreportmodule') }}" method="GET"> <form action="{{ url('dailysalepaymentreportmodule') }}" method="GET">
<div class="row mr-1 mt-4 pl-4 align-items-center"> <div class="row mr-1 mt-4 pl-4 align-items-center">
<div class="col-md-4"> <div class="col-md-4">
<label><strong>Select Date</strong> &nbsp;</label> <label><strong>Select Date</strong> &nbsp;</label>
<div class="input-group"> <div class="input-group">
<input type="date" name="report_date" id="report_date" <input type="date" name="report_date" id="report_date"
value="{{ request()->input('report_date', date('Y-m-d')) }}" class="form-control" value="{{ request()->input('report_date', date('Y-m-d')) }}" class="form-control"
required /> required />
</div>
</div>
<div class="col-md-3 pt-md-4">
<button type="submit" class="btn btn-primary" id="generate-report-btn">Generate Report</button>
</div> </div>
</div> </div>
<div class="col-md-3 pt-md-4"> </form>
<button type="submit" class="btn btn-primary" id="generate-report-btn">Generate Report</button>
</div>
</div>
</form>
</div>
</div>
<div class="container-fluid mt-4">
<!-- අලුතෙන් දාපු Single Export Buttons ටික -->
<div class="row mb-3">
<div class="col-md-12 text-right">
<button class="btn btn-danger" onclick="exportFullReport('pdf')" style="border-radius: 10px;">
<i class="fa fa-file-pdf-o"></i> Export PDF
</button>
<button class="btn btn-success" onclick="exportFullReport('excel')" style="border-radius: 10px;">
<i class="dripicons-document-new"></i> Export Excel
</button>
<button class="btn btn-info" onclick="exportFullReport('csv')" style="border-radius: 10px;">
<i class="fa fa-file-text-o"></i> Export CSV
</button>
<button class="btn btn-secondary" onclick="window.print()" style="border-radius: 10px;">
<i class="fa fa-print"></i> Print Report
</button>
</div> </div>
</div> </div>
<!-- Sales Table --> <div class="container-fluid mt-4">
<h4 class="mb-3" style="color: #00489f; font-weight: bold;">Sales Table (Daily Sale)</h4> <!-- අලුතෙන් දාපු Single Export Buttons ටික -->
<div class="table-responsive"> <div class="row mb-3">
<table style="border-radius: 15px; background-color: #e0e5ea;" class="table table-hover table-bordered"> <div class="col-md-12 text-right">
<thead <button class="btn btn-danger" onclick="exportFullReport('pdf')" style="border-radius: 10px;">
style="border-radius: 50px; background: linear-gradient(to right, #078bce, #1a1d1e); color: white;"> <i class="fa fa-file-pdf-o"></i> Export PDF
<tr> </button>
<th>Date</th> <button class="btn btn-success" onclick="exportFullReport('excel')" style="border-radius: 10px;">
<th>Reference Number</th> <i class="dripicons-document-new"></i> Export Excel
<th>Cashier</th> </button>
<th>Customer</th> <button class="btn btn-info" onclick="exportFullReport('csv')" style="border-radius: 10px;">
<th>Grand Total</th> <i class="fa fa-file-text-o"></i> Export CSV
@foreach($paymentOptions as $option) </button>
<th>{{ $option->name }}</th> <!-- <button class="btn btn-secondary" onclick="window.print()" style="border-radius: 10px;">
<i class="fa fa-print"></i> Print Report
</button> -->
</div>
</div>
<!-- Sales Table -->
<h4 class="mb-3" style="color: #00489f; font-weight: bold;">Sales Table (Daily Sale)</h4>
<div class="table-responsive">
<table style="border-radius: 15px; background-color: #e0e5ea;" class="table table-hover table-bordered">
<thead
style="border-radius: 50px; background: linear-gradient(to right, #078bce, #1a1d1e); color: white;">
<tr>
<th>Date</th>
<th>Reference Number</th>
<th>Cashier</th>
<th>Customer</th>
<th>Grand Total</th>
@foreach($paymentOptions as $option)
<th>{{ $option->name }}</th>
@endforeach
<th>Due Amount</th>
</tr>
</thead>
<tbody>
@php
$tot_grand = 0;
$tot_due = 0;
// Initialize dynamic option totals
$option_totals = [];
foreach ($paymentOptions as $opt) {
$option_totals[$opt->id] = 0;
}
@endphp
@foreach ($sales_data as $sale)
<tr>
<td>{{ $sale->date }}</td>
<td>{{ $sale->reference_no }}</td>
<td>{{ $sale->cashier }}</td>
<td>{{ $sale->customer }}</td>
<td class="text-right">{{ number_format($sale->grand_total, 2) }}</td>
@foreach($paymentOptions as $option)
<td class="text-right">{{ number_format($sale->methods[$option->id] ?? 0, 2) }}</td>
@endforeach
<td class="text-right">{{ number_format($sale->due_amount, 2) }}</td>
</tr>
@php
$tot_grand += $sale->grand_total;
$tot_due += $sale->due_amount;
// Accumulate dynamic option totals
foreach ($paymentOptions as $opt) {
$option_totals[$opt->id] += ($sale->methods[$opt->id] ?? 0);
}
@endphp
@endforeach @endforeach
<th>Due Amount</th> </tbody>
</tr> <tfoot style="background-color: #cdd4da; font-weight: bold;">
</thead> <tr>
<tbody> <td colspan="4" class="text-right">Total</td>
@php <td class="text-right">{{ number_format($tot_grand, 2) }}</td>
$tot_grand = 0;
$tot_due = 0;
// Initialize dynamic option totals
$option_totals = [];
foreach ($paymentOptions as $opt) {
$option_totals[$opt->id] = 0;
}
@endphp
@foreach ($sales_data as $sale) @foreach($paymentOptions as $option)
<tr> <td class="text-right">{{ number_format($option_totals[$option->id], 2) }}</td>
<td>{{ $sale->date }}</td> @endforeach
<td>{{ $sale->reference_no }}</td>
<td>{{ $sale->cashier }}</td>
<td>{{ $sale->customer }}</td>
<td class="text-right">{{ number_format($sale->grand_total, 2) }}</td>
@foreach($paymentOptions as $option) <td class="text-right">{{ number_format($tot_due, 2) }}</td>
<td class="text-right">{{ number_format($sale->methods[$option->id] ?? 0, 2) }}</td> </tr>
@endforeach </tfoot>
</table>
<td class="text-right">{{ number_format($sale->due_amount, 2) }}</td> </div>
</tr>
@php
$tot_grand += $sale->grand_total;
$tot_due += $sale->due_amount;
// Accumulate dynamic option totals
foreach ($paymentOptions as $opt) {
$option_totals[$opt->id] += ($sale->methods[$opt->id] ?? 0);
}
@endphp
@endforeach
</tbody>
<tfoot style="background-color: #cdd4da; font-weight: bold;">
<tr>
<td colspan="4" class="text-right">Total</td>
<td class="text-right">{{ number_format($tot_grand, 2) }}</td>
@foreach($paymentOptions as $option)
<td class="text-right">{{ number_format($option_totals[$option->id], 2) }}</td>
@endforeach
<td class="text-right">{{ number_format($tot_due, 2) }}</td>
</tr>
</tfoot>
</table>
</div> </div>
</div>
<div class="container-fluid mt-5"> <div class="container-fluid mt-5">
<!-- Credit Sale Collections Table --> <!-- Credit Sale Collections Table -->
<h4 class="mb-3" style="color: #00489f; font-weight: bold;">Credit Sale Collections</h4> <h4 class="mb-3" style="color: #00489f; font-weight: bold;">Credit Sale Collections</h4>
<div class="table-responsive"> <div class="table-responsive">
<table style="border-radius: 15px; background-color: #e0e5ea;" class="table table-hover table-bordered"> <table style="border-radius: 15px; background-color: #e0e5ea;" class="table table-hover table-bordered">
<thead <thead
style="border-radius: 50px; background: linear-gradient(to right, #078bce, #1a1d1e); color: white;"> style="border-radius: 50px; background: linear-gradient(to right, #078bce, #1a1d1e); color: white;">
<tr> <tr>
<th>Original Bill Date</th> <th>Original Bill Date</th>
<th>Reference Number</th> <th>Reference Number</th>
<th>Cashier</th> <th>Cashier</th>
<th>Customer</th> <th>Customer</th>
<th>Grand Total</th> <th>Grand Total</th>
@foreach ($paymentOptions as $option) @foreach ($paymentOptions as $option)
<th>{{ $option->name }}</th> <th>{{ $option->name }}</th>
@endforeach
</tr>
</thead>
<tbody>
@foreach ($creditCollections as $row)
<tr>
<td>{{ \Carbon\Carbon::parse($row['date'])->format('Y-m-d') }}</td>
<td>{{ $row['reference'] }}</td>
<td>{{ $row['cashier'] }}</td>
<td>{{ $row['customer'] }}</td>
<td>{{ number_format($row['grand_total'], 2) }}</td>
@foreach ($paymentOptions as $option)
<td>{{ number_format($row['methods'][$option->id] ?? 0, 2) }}</td>
@endforeach
</tr>
@endforeach @endforeach
</tr> </tbody>
</thead> <tfoot style="background-color: #cdd4da; font-weight: bold;">
<tbody> <tr>
@foreach ($creditCollections as $row) <td colspan="4" class="text-right">Total</td>
<tr> <td>{{ number_format($creditTotals['grand_total'], 2) }}</td>
<td>{{ \Carbon\Carbon::parse($row['date'])->format('Y-m-d') }}</td> @foreach ($paymentOptions as $option)
<td>{{ $row['reference'] }}</td> <td>{{ number_format($creditTotals['methods'][$option->id] ?? 0, 2) }}</td>
<td>{{ $row['cashier'] }}</td> @endforeach
<td>{{ $row['customer'] }}</td> </tr>
<td>{{ number_format($row['grand_total'], 2) }}</td> </tfoot>
@foreach ($paymentOptions as $option) </table>
<td>{{ number_format($row['methods'][$option->id] ?? 0, 2) }}</td> </div>
@endforeach
</tr>
@endforeach
</tbody>
<tfoot style="background-color: #cdd4da; font-weight: bold;">
<tr>
<td colspan="4" class="text-right">Total</td>
<td>{{ number_format($creditTotals['grand_total'], 2) }}</td>
@foreach ($paymentOptions as $option)
<td>{{ number_format($creditTotals['methods'][$option->id] ?? 0, 2) }}</td>
@endforeach
</tr>
</tfoot>
</table>
</div>
</div>
<div class="container-fluid mt-5 mb-5"> <div class="container-fluid mt-5 mb-5">
<!-- Payment Method Summary Table --> <!-- Payment Method Summary Table -->
<h4 class="mb-3" style="color: #00489f; font-weight: bold;">Payment Method Summary</h4> <h4 class="mb-3" style="color: #00489f; font-weight: bold;">Payment Method Summary</h4>
<div class="table-responsive"> <div class="table-responsive">
<table style="border-radius: 15px; background-color: #e0e5ea; width: 60%;" <table style="border-radius: 15px; background-color: #e0e5ea; width: 60%;"
class="table table-hover table-bordered"> class="table table-hover table-bordered">
<thead <thead
style="border-radius: 50px; background: linear-gradient(to right, #078bce, #1a1d1e); color: white;"> style="border-radius: 50px; background: linear-gradient(to right, #078bce, #1a1d1e); color: white;">
<tr> <tr>
<th>Payment Option</th> <th>Payment Option</th>
<th>Sale Amount</th> <th>Sale Amount</th>
<th>Received Amount</th> <th>Received Amount</th>
<th>Total Amount</th> <th>Total Amount</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<tr> @php
<td>Cash</td> $grand_sale = 0;
<td>0.00</td> $grand_received = 0;
<td>0.00</td> $grand_total = 0;
<td>0.00</td> @endphp
</tr>
<tr>
<td>Card 1</td>
<td>0.00</td>
<td>0.00</td>
<td>0.00</td>
</tr>
<tr>
<td>Card 2</td>
<td>0.00</td>
<td>0.00</td>
<td>0.00</td>
</tr>
<tr>
<td>Card 3</td>
<td>0.00</td>
<td>0.00</td>
<td>0.00</td>
</tr>
<tr>
<td>Online Transfer</td>
<td>0.00</td>
<td>0.00</td>
<td>0.00</td>
</tr>
<tr>
<td>Link Pay</td>
<td>0.00</td>
<td>0.00</td>
<td>0.00</td>
</tr>
</tbody>
<tfoot style="background-color: #cdd4da; font-weight: bold;">
<tr>
<td class="text-right">Grand Total</td>
<td>0.00</td>
<td>0.00</td>
<td>0.00</td>
</tr>
</tfoot>
</table>
</div>
</div>
</section>
<style> @foreach ($summaryData as $summary)
.bootstrap-select.form-control, <tr>
.form-control, <td>{{ $summary['name'] }}</td>
.input-group-text { <td class="text-right">{{ number_format($summary['sale_amount'], 2) }}</td>
background-color: #fdfdff; <td class="text-right">{{ number_format($summary['received_amount'], 2) }}</td>
border-color: #002250; <td class="text-right">{{ number_format($summary['total_amount'], 2) }}</td>
border-radius: 15px; </tr>
} @php
$grand_sale += $summary['sale_amount'];
$grand_received += $summary['received_amount'];
$grand_total += $summary['total_amount'];
@endphp
@endforeach
</tbody>
<tfoot style="background-color: #cdd4da; font-weight: bold;">
<tr>
<td class="text-right">Grand Total</td>
<td class="text-right">{{ number_format($grand_sale, 2) }}</td>
<td class="text-right">{{ number_format($grand_received, 2) }}</td>
<td class="text-right">{{ number_format($grand_total, 2) }}</td>
</tr>
</tfoot>
.btn-primary { </table>
background-color: #002250; </div>
border-color: #002250; </div>
border-radius: 15px; </section>
padding: 10px 25px;
}
.btn-primary:hover { <style>
background-color: #0068e3; .bootstrap-select.form-control,
} .form-control,
.input-group-text {
background-color: #fdfdff;
border-color: #002250;
border-radius: 15px;
}
table { .btn-primary {
border-collapse: collapse !important; background-color: #002250;
} border-color: #002250;
</style> border-radius: 15px;
padding: 10px 25px;
}
.btn-primary:hover {
background-color: #0068e3;
}
table {
border-collapse: collapse !important;
}
</style>
@endsection @endsection
@push('scripts') @push('scripts')
<script type="text/javascript"> <script type="text/javascript">
$.ajaxSetup({ $.ajaxSetup({
headers: { headers: {
'X-CSRF-TOKEN': $('meta[name="csrf-token"]').attr('content') 'X-CSRF-TOKEN': $('meta[name="csrf-token"]').attr('content')
}
});
// මුළු රිපෝට් එකම එක්ස්පෝර්ට් කරන්න හදපු Function එක
function exportFullReport(exportType) {
var selectedDate = $('#report_date').val();
// ඔයාගේ Controller එකේ export route එකට මේක හරවන්න ඕනේ.
// උදාහරණයක් විදිහට: url('/dailysalepaymentreportmodule/export')
var exportUrl = "{{ url('/dailysalepaymentreportmodule/export') }}" + "?date=" + selectedDate + "&type=" + exportType;
window.location.href = exportUrl;
} }
}); </script>
// මුළු රිපෝට් එකම එක්ස්පෝර්ට් කරන්න හදපු Function එක
function exportFullReport(exportType) {
var selectedDate = $('#report_date').val();
// ඔයාගේ Controller එකේ export route එකට මේක හරවන්න ඕනේ.
// උදාහරණයක් විදිහට: url('/dailysalepaymentreportmodule/export')
var exportUrl = "{{ url('/dailysalepaymentreportmodule/export') }}" + "?date=" + selectedDate + "&type=" + exportType;
window.location.href = exportUrl;
}
</script>
@endpush @endpush