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

changed logic for this week also in invoice chart

Browse Source
This commit is contained in:
dhanabalan
2026-01-20 18:20:14 +05:30
parent 7e96c3cdbf
commit 58191aada6
1 changed files with 3 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -142,7 +142,7 @@ class InvoiceChart extends ChartWidget
$query->where('quantity', 1)->whereBetween('created_at', [$dayStart, $dayEnd]); $query->where('quantity', 1)->whereBetween('created_at', [$dayStart, $dayEnd]);
$completedQuery->where('quantity', 1) $completedQuery->where('quantity', 1)
->whereBetween('updated_at', [$dayStart, $dayEnd]) ->whereBetween('created_at', [$dayStart, $dayEnd])
->groupBy('invoice_number') ->groupBy('invoice_number')
->havingRaw( ->havingRaw(
"COUNT(*) = SUM(CASE WHEN serial_number IS NOT NULL AND serial_number != '' THEN 1 ELSE 0 END)" "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]); $query->whereNull('quantity')->whereBetween('created_at', [$dayStart, $dayEnd]);
$completedQuery->whereNull('quantity') $completedQuery->whereNull('quantity')
->whereBetween('updated_at', [$dayStart, $dayEnd]) ->whereBetween('created_at', [$dayStart, $dayEnd])
->groupBy('invoice_number') ->groupBy('invoice_number')
->havingRaw( ->havingRaw(
"COUNT(*) = SUM(CASE WHEN scanned_status = 'Scanned' THEN 1 ELSE 0 END)" "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]); $query->where('quantity', '>', 1)->whereBetween('created_at', [$dayStart, $dayEnd]);
$completedQuery->where('quantity', '>', 1) $completedQuery->where('quantity', '>', 1)
->whereBetween('updated_at', [$dayStart, $dayEnd]) ->whereBetween('created_at', [$dayStart, $dayEnd])
->groupBy('invoice_number') ->groupBy('invoice_number')
->havingRaw( ->havingRaw(
"COUNT(*) = SUM(CASE WHEN serial_number IS NOT NULL AND serial_number != '' THEN 1 ELSE 0 END)" "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') $queryCompleted->whereNull('quantity')
->groupBy('invoice_number') ->groupBy('invoice_number')
->havingRaw("COUNT(*) = SUM(CASE WHEN scanned_status = 'Scanned' THEN 1 ELSE 0 END)"); ->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') { } elseif ($selectedInvoice == 'bundle_material') {
$queryCompleted->where('quantity', '>', 1) $queryCompleted->where('quantity', '>', 1)
->groupBy('invoice_number') ->groupBy('invoice_number')