changed logic for this week also in invoice chart
Some checks failed
Scan for leaked secrets using Kingfisher / kingfisher-secrets-scan (push) Successful in 12s
Gemini PR Review / Gemini PR Review (pull_request) Failing after 19s
Scan for leaked secrets using Kingfisher / kingfisher-secrets-scan (pull_request) Successful in 9s
Laravel Pint / pint (pull_request) Successful in 2m25s
Laravel Larastan / larastan (pull_request) Failing after 3m29s

This commit is contained in:
dhanabalan
2026-01-20 18:20:14 +05:30
parent 7e96c3cdbf
commit 58191aada6

View File

@@ -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')