Sandithi/dailySalePaymentReport
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Implement dynamic Payment Method Summary (Table 3)

Browse Source
This commit is contained in:
Nethma-Yasith
2026-07-03 16:14:19 +05:30
parent d849bd41ff f8e6dbb81e
commit 26273d92c2
2 changed files with 111 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
Http/Controllers/DailySalePaymentReportModuleController.php
View File

@@ -23,7 +23,18 @@ class DailySalePaymentReportModuleController extends Controller
->orderBy('id')
->get(['id', 'name']);
$creditCollections = $this->getCreditSaleCollections($report_date);
$creditCollections = $this->getCreditSaleCollections($report_date);
$creditTotals = [
'grand_total' => $creditCollections->sum('grand_total'),
'methods' => [],
];
foreach ($paymentOptions as $option) {
$creditTotals['methods'][$option->id] = $creditCollections->sum(
fn($row) => $row['methods'][$option->id] ?? 0
);
}
$sales = DB::table('sales')
@@ -71,7 +82,7 @@ class DailySalePaymentReportModuleController extends Controller
$sales_data = [];
foreach ($sales as $sale) {
$methodTotals = [];
// Sum from payments table
foreach ($paymentsTable->where('sale_id', $sale->id) as $p) {
$optionId = $p->payment_option_id;
@@ -97,7 +108,48 @@ class DailySalePaymentReportModuleController extends Controller
];
}
return view('dailysalepaymentreportmodule::index', compact('sales_data', 'report_date', 'paymentOptions', 'creditCollections'));
// --- 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(
'sales_data',
'report_date',
'paymentOptions',
'creditCollections',
'creditTotals',
'summaryData'
));
}
private function getCreditSaleCollections($date)
@@ -166,12 +218,12 @@ class DailySalePaymentReportModuleController extends Controller
}
$rows[] = [
'date' => $sale->created_at,
'reference' => $sale->reference_no,
'cashier' => $users[$sale->user_id] ?? '-',
'customer' => $customers[$sale->customer_id] ?? '-',
'date' => $sale->created_at,
'reference' => $sale->reference_no,
'cashier' => $users[$sale->user_id] ?? '-',
'customer' => $customers[$sale->customer_id] ?? '-',
'grand_total' => $sale->grand_total - $sale->paid_amount,
'methods' => $methodTotals,
'methods' => $methodTotals,
];
}