From 58191aada6673915e066d1cb17b0d67520f0571e Mon Sep 17 00:00:00 2001
From: dhanabalan <dhana@example.com>
Date: Tue, 20 Jan 2026 18:20:14 +0530
Subject: [PATCH] changed logic for this week also in invoice chart

---
 app/Filament/Widgets/InvoiceChart.php | 20 +++-----------------
 1 file changed, 3 insertions(+), 17 deletions(-)

diff --git a/app/Filament/Widgets/InvoiceChart.php b/app/Filament/Widgets/InvoiceChart.php
index 124d24f..e495008 100644
--- a/app/Filament/Widgets/InvoiceChart.php
+++ b/app/Filament/Widgets/InvoiceChart.php
@@ -142,7 +142,7 @@ class InvoiceChart extends ChartWidget
                     $query->where('quantity', 1)->whereBetween('created_at', [$dayStart, $dayEnd]);
 
                     $completedQuery->where('quantity', 1)
-                        ->whereBetween('updated_at', [$dayStart, $dayEnd])
+                        ->whereBetween('created_at', [$dayStart, $dayEnd])
                         ->groupBy('invoice_number')
                         ->havingRaw(
                             "COUNT(*) = SUM(CASE WHEN serial_number IS NOT NULL AND serial_number != '' THEN 1 ELSE 0 END)"
@@ -153,7 +153,7 @@ class InvoiceChart extends ChartWidget
                     $query->whereNull('quantity')->whereBetween('created_at', [$dayStart, $dayEnd]);
 
                     $completedQuery->whereNull('quantity')
-                        ->whereBetween('updated_at', [$dayStart, $dayEnd])
+                        ->whereBetween('created_at', [$dayStart, $dayEnd])
                         ->groupBy('invoice_number')
                         ->havingRaw(
                             "COUNT(*) = SUM(CASE WHEN scanned_status = 'Scanned' THEN 1 ELSE 0 END)"
@@ -164,7 +164,7 @@ class InvoiceChart extends ChartWidget
                     $query->where('quantity', '>', 1)->whereBetween('created_at', [$dayStart, $dayEnd]);
 
                     $completedQuery->where('quantity', '>', 1)
-                        ->whereBetween('updated_at', [$dayStart, $dayEnd])
+                        ->whereBetween('created_at', [$dayStart, $dayEnd])
                         ->groupBy('invoice_number')
                         ->havingRaw(
                             "COUNT(*) = SUM(CASE WHEN serial_number IS NOT NULL AND serial_number != '' THEN 1 ELSE 0 END)"
@@ -252,20 +252,6 @@ class InvoiceChart extends ChartWidget
                     $queryCompleted->whereNull('quantity')
                         ->groupBy('invoice_number')
                         ->havingRaw("COUNT(*) = SUM(CASE WHEN scanned_status = 'Scanned' THEN 1 ELSE 0 END)");
-                    //  $queryCompleted
-                    //     ->whereNull('quantity')
-                    //     ->groupBy('invoice_number')
-                    //     ->havingRaw("
-                    //         COUNT(*) = SUM(
-                    //             CASE
-                    //                 WHEN scanned_status = 'Scanned' THEN 1
-                    //                 ELSE 0
-                    //             END
-                    //         )
-                    //     ")
-                    //     ->havingRaw("
-                    //         MAX(updated_at) BETWEEN ? AND ?
-                    //     ", [$weekStart, $weekEnd]);
                 } elseif ($selectedInvoice == 'bundle_material') {
                     $queryCompleted->where('quantity', '>', 1)
                         ->groupBy('invoice_number')