Compare commits

...

2 Commits

2 changed files with 303 additions and 285 deletions

View File

@@ -108,12 +108,47 @@ 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(
'sales_data',
'report_date',
'paymentOptions',
'creditCollections',
'creditTotals',
'summaryData'
));
}

View File

@@ -62,9 +62,9 @@
<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;">
<!-- <button class="btn btn-secondary" onclick="window.print()" style="border-radius: 10px;">
<i class="fa fa-print"></i> Print Report
</button>
</button> -->
</div>
</div>
@@ -182,7 +182,6 @@
</tfoot>
</table>
</div>
</div>
<div class="container-fluid mt-5 mb-5">
<!-- Payment Method Summary Table -->
@@ -200,51 +199,35 @@
</tr>
</thead>
<tbody>
@php
$grand_sale = 0;
$grand_received = 0;
$grand_total = 0;
@endphp
@foreach ($summaryData as $summary)
<tr>
<td>Cash</td>
<td>0.00</td>
<td>0.00</td>
<td>0.00</td>
</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>
<td>{{ $summary['name'] }}</td>
<td class="text-right">{{ number_format($summary['sale_amount'], 2) }}</td>
<td class="text-right">{{ number_format($summary['received_amount'], 2) }}</td>
<td class="text-right">{{ number_format($summary['total_amount'], 2) }}</td>
</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>0.00</td>
<td>0.00</td>
<td>0.00</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>
</table>
</div>
</div>