jothi/poc-pds1
1
0
Fork 0
forked from poc/pds
Code Pull Requests Activity

Merge pull request 'changed logic in invoice chart' (#207) from ranjith-dev into master

Browse Source 
Reviewed-on: poc/pds#207
This commit is contained in:
jothi
2026-01-20 11:09:45 +00:00
parent b2f5194ef9 d9319b1ec6
commit feab063017
1 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
app/Filament/Widgets/InvoiceChart.php
View File

@@ -202,12 +202,22 @@ class InvoiceChart extends ChartWidget
$completedInvoicesPerWeek = []; $completedInvoicesPerWeek = [];
$weekIndex = 0; $weekIndex = 0;
while ($weekStart < $endOfMonth) { while ($weekStart <= $endOfMonth) {
$weekEnd = $weekStart->copy()->addDays(6);
// $weekEnd = $weekStart->copy()->addDays(6);
$weekEnd = $weekStart->copy()->addDays(6)->endOfDay();
// If week end exceeds end of month, limit it
if ($weekEnd->greaterThan($endOfMonth)) {
$weekEnd = $endOfMonth->copy()->endOfDay();
}
$startDay = $weekStart->format('j'); $startDay = $weekStart->format('j');
$weekEndLimit = $weekEnd->copy()->subDay(); $endDay = $weekEnd->format('j');
$actualEnd = $weekEndLimit->greaterThan($endOfMonth) ? $endOfMonth : $weekEndLimit;
$endDay = $actualEnd->format('j'); // $startDay = $weekStart->format('j');
// $weekEndLimit = $weekEnd->copy()->subDay();
// $actualEnd = $weekEndLimit->greaterThan($endOfMonth) ? $endOfMonth : $weekEndLimit;
// $endDay = $actualEnd->format('j');
$labels[] = "{$monthName}({$startDay}-{$endDay})"; $labels[] = "{$monthName}({$startDay}-{$endDay})";
@@ -251,7 +261,8 @@ class InvoiceChart extends ChartWidget
$completedInvoicesPerWeek[$weekIndex] = $queryCompleted->count(); $completedInvoicesPerWeek[$weekIndex] = $queryCompleted->count();
// Move to next week // Move to next week
$weekStart = $weekEnd; // $weekStart = $weekEnd;
$weekStart = $weekEnd->copy()->addDay(1);
$weekIndex++; $weekIndex++;
} }