poc/pds
1
0
Fork 1
Code Issues Pull Requests 12 Actions 58 Packages Projects Releases Wiki Activity

changed logic in invoice chart #207

Merged
jothi merged 1 commits from ranjith-dev into master 2026-01-20 11:09:46 +00:00
Conversation 0 Commits 1 Files Changed 1 +17 -6
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 = [];
$weekIndex = 0;
while ($weekStart < $endOfMonth) {
$weekEnd = $weekStart->copy()->addDays(6);
while ($weekStart <= $endOfMonth) {
// $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');
$weekEndLimit = $weekEnd->copy()->subDay();
$actualEnd = $weekEndLimit->greaterThan($endOfMonth) ? $endOfMonth : $weekEndLimit;
$endDay = $actualEnd->format('j');
$endDay = $weekEnd->format('j');
// $startDay = $weekStart->format('j');
// $weekEndLimit = $weekEnd->copy()->subDay();
// $actualEnd = $weekEndLimit->greaterThan($endOfMonth) ? $endOfMonth : $weekEndLimit;
// $endDay = $actualEnd->format('j');
$labels[] = "{$monthName}({$startDay}-{$endDay})";
@@ -251,7 +261,8 @@ class InvoiceChart extends ChartWidget
$completedInvoicesPerWeek[$weekIndex] = $queryCompleted->count();
// Move to next week
$weekStart = $weekEnd;
// $weekStart = $weekEnd;
$weekStart = $weekEnd->copy()->addDay(1);
$weekIndex++;
}