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

Updated completed invoice count chart query

Browse Source
This commit is contained in:
dhanabalan
2025-05-10 08:42:58 +05:30
parent e6438cf46d
commit 64e74b8d67
1 changed files with 117 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -30,15 +30,15 @@ class InvoiceChart extends ChartWidget
// ]; // ];
// } // }
// if ($activeFilter === 'yesterday') { // if ($activeFilter == 'yesterday') {
// $startDate = now()->subDay()->setTime(8, 0, 0); // $startDate = now()->subDay()->setTime(8, 0, 0);
// $endDate = now()->setTime(8, 0, 0); // $endDate = now()->setTime(8, 0, 0);
// $groupBy = 'none'; // No grouping by hour // $groupBy = 'none'; // No grouping by hour
// } elseif ($activeFilter === 'this_week') { // } elseif ($activeFilter == 'this_week') {
// $startDate = now()->startOfWeek()->setTime(8, 0, 0); // $startDate = now()->startOfWeek()->setTime(8, 0, 0);
// $endDate = now()->endOfWeek()->addDay()->setTime(8, 0, 0); // $endDate = now()->endOfWeek()->addDay()->setTime(8, 0, 0);
// $groupBy = 'day_of_week'; // $groupBy = 'day_of_week';
// } elseif ($activeFilter === 'this_month') { // } elseif ($activeFilter == 'this_month') {
// $startDate = now()->startOfMonth(); // $startDate = now()->startOfMonth();
// $endDate = now()->endOfMonth(); // $endDate = now()->endOfMonth();
// $groupBy = 'week_of_month'; // $groupBy = 'week_of_month';
@@ -49,7 +49,7 @@ class InvoiceChart extends ChartWidget
// } // }
// // Get fully scanned invoices // // Get fully scanned invoices
// if ($selectedInvoice === 'individual_material') { // if ($selectedInvoice == 'individual_material') {
// $allInvoiceNumbers = DB::table('invoice_validations') // $allInvoiceNumbers = DB::table('invoice_validations')
// ->select('invoice_number') // ->select('invoice_number')
@@ -66,7 +66,7 @@ class InvoiceChart extends ChartWidget
// ->havingRaw("SUM(CASE WHEN serial_number IS NOT NULL AND serial_number != '' THEN 1 ELSE 0 END) = COUNT(*)") // ->havingRaw("SUM(CASE WHEN serial_number IS NOT NULL AND serial_number != '' THEN 1 ELSE 0 END) = COUNT(*)")
// ->pluck('invoice_number'); // ->pluck('invoice_number');
// } // }
// else if($selectedInvoice === 'serial_invoice') { // else if($selectedInvoice == 'serial_invoice') {
// $allInvoiceNumbers = DB::table('invoice_validations') // $allInvoiceNumbers = DB::table('invoice_validations')
// ->select('invoice_number') // ->select('invoice_number')
// ->where('plant_id', $selectedPlant) // ->where('plant_id', $selectedPlant)
@@ -81,7 +81,7 @@ class InvoiceChart extends ChartWidget
// ->havingRaw("SUM(CASE WHEN scanned_status = 'Scanned' THEN 1 ELSE 0 END) = COUNT(*)") // ->havingRaw("SUM(CASE WHEN scanned_status = 'Scanned' THEN 1 ELSE 0 END) = COUNT(*)")
// ->pluck('invoice_number'); // ->pluck('invoice_number');
// } // }
// if ($selectedInvoice === 'bundle_material') { // if ($selectedInvoice == 'bundle_material') {
// //Get all invoice numbers that contain bundle materials // //Get all invoice numbers that contain bundle materials
// $allInvoiceNumbers = DB::table('invoice_validations') // $allInvoiceNumbers = DB::table('invoice_validations')
@@ -193,12 +193,12 @@ class InvoiceChart extends ChartWidget
// // } // // }
// // // Build x-axis labels and data arrays // // // Build x-axis labels and data arrays
// // if ($groupBy === 'hour') { // // if ($groupBy == 'hour') {
// // $shiftedKeys = array_merge(range(8, 23), range(0, 7)); // // $shiftedKeys = array_merge(range(8, 23), range(0, 7));
// // $labels = array_map(fn($h) => date("g A", strtotime("$h:00")), $shiftedKeys); // // $labels = array_map(fn($h) => date("g A", strtotime("$h:00")), $shiftedKeys);
// // $scannedData = array_map(fn($h) => $scannedGrouped[$h] ?? 0, $shiftedKeys); // // $scannedData = array_map(fn($h) => $scannedGrouped[$h] ?? 0, $shiftedKeys);
// // $notScannedData = array_map(fn($h) => $notScannedGrouped[$h] ?? 0, $shiftedKeys); // // $notScannedData = array_map(fn($h) => $notScannedGrouped[$h] ?? 0, $shiftedKeys);
// // } elseif ($groupBy === 'day_of_week') { // // } elseif ($groupBy == 'day_of_week') {
// // $labels = ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun']; // // $labels = ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun'];
// // $scannedData = array_fill(0, 7, 0); // // $scannedData = array_fill(0, 7, 0);
// // $notScannedData = array_fill(0, 7, 0); // // $notScannedData = array_fill(0, 7, 0);
@@ -312,15 +312,15 @@ class InvoiceChart extends ChartWidget
} }
// Define the date range based on the active filter // Define the date range based on the active filter
if ($activeFilter === 'yesterday') { if ($activeFilter == 'yesterday') {
$startDate = now()->subDay()->setTime(8, 0, 0); $startDate = now()->subDay()->setTime(8, 0, 0);
$endDate = now()->setTime(8, 0, 0); $endDate = now()->setTime(8, 0, 0);
$groupBy = 'none'; // No grouping by hour $groupBy = 'none'; // No grouping by hour
} elseif ($activeFilter === 'this_week') { } elseif ($activeFilter == 'this_week') {
$startDate = now()->startOfWeek()->setTime(8, 0, 0); $startDate = now()->startOfWeek()->setTime(8, 0, 0);
$endDate = now()->endOfWeek()->addDay()->setTime(8, 0, 0); $endDate = now()->endOfWeek()->addDay()->setTime(8, 0, 0);
$groupBy = 'day_of_week'; $groupBy = 'day_of_week';
} elseif ($activeFilter === 'this_month') { } elseif ($activeFilter == 'this_month') {
$startDate = now()->startOfMonth()->setTime(8, 0, 0); $startDate = now()->startOfMonth()->setTime(8, 0, 0);
$endDate = now()->endOfMonth()->setTime(8, 0, 0); $endDate = now()->endOfMonth()->setTime(8, 0, 0);
$groupBy = 'week_of_month'; $groupBy = 'week_of_month';
@@ -331,7 +331,7 @@ class InvoiceChart extends ChartWidget
} }
// Get the counts for Imported Invoices (unique invoice numbers) and Completed Invoices // Get the counts for Imported Invoices (unique invoice numbers) and Completed Invoices
if ($selectedInvoice === 'individual_material') { if ($selectedInvoice == 'individual_material') {
$importedInvoicesCount = DB::table('invoice_validations') $importedInvoicesCount = DB::table('invoice_validations')
->where('plant_id', $selectedPlant) ->where('plant_id', $selectedPlant)
->where('quantity', 1) ->where('quantity', 1)
@@ -339,29 +339,44 @@ class InvoiceChart extends ChartWidget
->distinct('invoice_number') // Only distinct invoice numbers ->distinct('invoice_number') // Only distinct invoice numbers
->count('invoice_number'); ->count('invoice_number');
$completedInvoicesCount = DB::table('invoice_validations') $completedInvoicesCount = DB::table('invoice_validations')
->select('invoice_number')
->where('plant_id', $selectedPlant) ->where('plant_id', $selectedPlant)
->where('quantity', 1) ->where('quantity', 1)
->whereNotNull('serial_number') // assuming serial_number presence means completed ->whereBetween('updated_at', [$startDate, $endDate])
->whereBetween('updated_at', [$startDate, $endDate]) // Filter by date range ->groupBy('invoice_number')
->distinct('invoice_number') // Only distinct invoice numbers ->havingRaw(
->count('invoice_number'); "COUNT(*) = SUM(CASE WHEN serial_number IS NOT NULL AND serial_number != '' THEN 1 ELSE 0 END)"
} elseif ($selectedInvoice === 'serial_invoice') { )
->count();
} elseif ($selectedInvoice == 'serial_invoice') {
$importedInvoicesCount = DB::table('invoice_validations') $importedInvoicesCount = DB::table('invoice_validations')
->where('plant_id', $selectedPlant) ->where('plant_id', $selectedPlant)
->whereNull('quantity') ->whereNull('quantity')
->whereBetween('created_at', [$startDate, $endDate]) // Filter by date range ->whereBetween('created_at', [$startDate, $endDate])
->distinct('invoice_number') // Only distinct invoice numbers ->distinct('invoice_number')
->count('invoice_number'); ->count('invoice_number');
$completedInvoicesCount = DB::table('invoice_validations') // $completedInvoicesCount = DB::table('invoice_validations')
// ->where('plant_id', $selectedPlant)
// ->whereNull('quantity')
// ->where('scanned_status', 'Scanned') // assuming scanned_status means completed
// ->whereBetween('updated_at', [$startDate, $endDate]) // Filter by date range
// ->distinct('invoice_number') // Only distinct invoice numbers
// ->count('invoice_number');
$completedInvoicesCount = DB::table('invoice_validations')
->select('invoice_number')
->where('plant_id', $selectedPlant) ->where('plant_id', $selectedPlant)
->whereNull('quantity') ->whereNull('quantity')
->where('scanned_status', 'Scanned') // assuming scanned_status means completed ->whereBetween('updated_at', [$startDate, $endDate])
->whereBetween('updated_at', [$startDate, $endDate]) // Filter by date range ->groupBy('invoice_number')
->distinct('invoice_number') // Only distinct invoice numbers ->havingRaw(
->count('invoice_number'); "COUNT(*) = SUM(CASE WHEN scanned_status = 'Scanned' THEN 1 ELSE 0 END)"
} elseif ($selectedInvoice === 'bundle_material') { )
->count();
} elseif ($selectedInvoice == 'bundle_material') {
$importedInvoicesCount = DB::table('invoice_validations') $importedInvoicesCount = DB::table('invoice_validations')
->where('plant_id', $selectedPlant) ->where('plant_id', $selectedPlant)
->where('quantity', '>', 1) ->where('quantity', '>', 1)
@@ -369,20 +384,31 @@ class InvoiceChart extends ChartWidget
->distinct('invoice_number') // Only distinct invoice numbers ->distinct('invoice_number') // Only distinct invoice numbers
->count('invoice_number'); ->count('invoice_number');
// $completedInvoicesCount = DB::table('invoice_validations')
// ->where('plant_id', $selectedPlant)
// ->where('quantity', '>', 1)
// ->whereNotNull('serial_number') // assuming serial_number presence means completed
// ->whereBetween('updated_at', [$startDate, $endDate]) // Filter by date range
// ->distinct('invoice_number') // Only distinct invoice numbers
// ->count('invoice_number');
$completedInvoicesCount = DB::table('invoice_validations') $completedInvoicesCount = DB::table('invoice_validations')
->select('invoice_number')
->where('plant_id', $selectedPlant) ->where('plant_id', $selectedPlant)
->where('quantity', '>', 1) ->where('quantity', '>', 1)
->whereNotNull('serial_number') // assuming serial_number presence means completed ->whereBetween('updated_at', [$startDate, $endDate])
->whereBetween('updated_at', [$startDate, $endDate]) // Filter by date range ->groupBy('invoice_number')
->distinct('invoice_number') // Only distinct invoice numbers ->havingRaw(
->count('invoice_number'); "COUNT(*) = SUM(CASE WHEN serial_number IS NOT NULL AND serial_number != '' THEN 1 ELSE 0 END)"
)
->count();
} }
// Prepare the chart data // Prepare the chart data
$labels = []; // Labels for each bar $labels = []; // Labels for each bar
$datasets = []; // Datasets for the chart $datasets = []; // Datasets for the chart
if (in_array($activeFilter, ['yesterday', 'today'])) { if (in_array($activeFilter, ['yesterday'])) {
$labels = ['Imported Invoice', 'Completed Invoice']; $labels = ['Imported Invoice', 'Completed Invoice'];
$datasets = [[ $datasets = [[
'label' => 'Invoices', 'label' => 'Invoices',
@@ -391,37 +417,61 @@ class InvoiceChart extends ChartWidget
'fill' => false, 'fill' => false,
]]; ]];
} }
elseif ($activeFilter === 'this_week') {
elseif ($activeFilter == 'this_week') {
$daysOfWeek = ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun']; $daysOfWeek = ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun'];
$importedInvoicesPerDay = array_fill(0, 7, 0); $importedInvoicesPerDay = array_fill(0, 7, 0);
$completedInvoicesPerDay = array_fill(0, 7, 0); $completedInvoicesPerDay = array_fill(0, 7, 0);
foreach ($daysOfWeek as $index => $day) { for ($index = 0; $index < 7; $index++) {
$dayStart = now()->startOfWeek()->addDays($index)->setTime(8, 0, 0); $dayStart = now()->startOfWeek()->addDays($index)->setTime(8, 0, 0);
$dayEnd = $dayStart->copy()->addDay()->setTime(8, 0, 0); $dayEnd = $dayStart->copy()->addDay()->setTime(8, 0, 0);
$query = DB::table('invoice_validations')->where('plant_id', $selectedPlant); $query = DB::table('invoice_validations')->where('plant_id', $selectedPlant);
$completedQuery = DB::table('invoice_validations')->where('plant_id', $selectedPlant);
if ($selectedInvoice === 'individual_material') { // Build completedQuery with only 'invoice_number' in select
$completedQuery = DB::table('invoice_validations')
->select('invoice_number')
->where('plant_id', $selectedPlant);
if ($selectedInvoice == 'individual_material')
{
$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)
->whereNotNull('serial_number') ->whereBetween('updated_at', [$dayStart, $dayEnd])
->whereBetween('updated_at', [$dayStart, $dayEnd]); ->groupBy('invoice_number')
} elseif ($selectedInvoice === 'serial_invoice') { ->havingRaw(
"COUNT(*) = SUM(CASE WHEN serial_number IS NOT NULL AND serial_number != '' THEN 1 ELSE 0 END)"
);
}
elseif ($selectedInvoice == 'serial_invoice')
{
$query->whereNull('quantity')->whereBetween('created_at', [$dayStart, $dayEnd]); $query->whereNull('quantity')->whereBetween('created_at', [$dayStart, $dayEnd]);
$completedQuery->whereNull('quantity') $completedQuery->whereNull('quantity')
->where('scanned_status', 'Scanned') ->whereBetween('updated_at', [$dayStart, $dayEnd])
->whereBetween('updated_at', [$dayStart, $dayEnd]); ->groupBy('invoice_number')
} elseif ($selectedInvoice === 'bundle_material') { ->havingRaw(
"COUNT(*) = SUM(CASE WHEN scanned_status = 'Scanned' THEN 1 ELSE 0 END)"
);
}
elseif ($selectedInvoice == 'bundle_material')
{
$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)
->whereNotNull('serial_number') ->whereBetween('updated_at', [$dayStart, $dayEnd])
->whereBetween('updated_at', [$dayStart, $dayEnd]); ->groupBy('invoice_number')
->havingRaw(
"COUNT(*) = SUM(CASE WHEN serial_number IS NOT NULL AND serial_number != '' THEN 1 ELSE 0 END)"
);
} }
// Imported invoices count (distinct invoice_number)
$importedInvoicesPerDay[$index] = $query->distinct('invoice_number')->count('invoice_number'); $importedInvoicesPerDay[$index] = $query->distinct('invoice_number')->count('invoice_number');
$completedInvoicesPerDay[$index] = $completedQuery->distinct('invoice_number')->count('invoice_number');
$completedInvoicesPerDay[$index] = $completedQuery->count();
} }
$labels = $daysOfWeek; $labels = $daysOfWeek;
@@ -438,7 +488,9 @@ class InvoiceChart extends ChartWidget
], ],
]; ];
} }
elseif ($activeFilter === 'this_month') {
elseif ($activeFilter == 'this_month')
{
$startOfMonth = now()->startOfMonth(); $startOfMonth = now()->startOfMonth();
$endOfMonth = now()->endOfMonth(); $endOfMonth = now()->endOfMonth();
$monthName = $startOfMonth->format('M'); $monthName = $startOfMonth->format('M');
@@ -464,15 +516,20 @@ class InvoiceChart extends ChartWidget
$queryImported = DB::table('invoice_validations')->where('plant_id', $selectedPlant)->whereBetween('created_at', [$weekStart, $weekEnd]); $queryImported = DB::table('invoice_validations')->where('plant_id', $selectedPlant)->whereBetween('created_at', [$weekStart, $weekEnd]);
$queryCompleted = DB::table('invoice_validations')->where('plant_id', $selectedPlant)->whereBetween('updated_at', [$weekStart, $weekEnd]); $queryCompleted = DB::table('invoice_validations')->where('plant_id', $selectedPlant)->whereBetween('updated_at', [$weekStart, $weekEnd]);
if ($selectedInvoice === 'individual_material') { if ($selectedInvoice == 'individual_material') {
$queryImported->where('quantity', 1); $queryImported->where('quantity', 1);
$queryCompleted->where('quantity', 1)->whereNotNull('serial_number'); $queryCompleted->where('quantity', 1)
} elseif ($selectedInvoice === 'serial_invoice') { ->whereNotNull('serial_number')
->where('serial_number','!=', '');
} elseif ($selectedInvoice == 'serial_invoice') {
$queryImported->whereNull('quantity'); $queryImported->whereNull('quantity');
$queryCompleted->whereNull('quantity')->where('scanned_status', 'Scanned'); $queryCompleted->whereNull('quantity')
} elseif ($selectedInvoice === 'bundle_material') { ->where('scanned_status', 'Scanned');
} elseif ($selectedInvoice == 'bundle_material') {
$queryImported->where('quantity', '>', 1); $queryImported->where('quantity', '>', 1);
$queryCompleted->where('quantity', '>', 1)->whereNotNull('serial_number'); $queryCompleted->where('quantity', '>', 1)
->whereNotNull('serial_number')
->where('serial_number','!=', '');
} }
$importedInvoicesPerWeek[$index] = $queryImported->distinct('invoice_number')->count('invoice_number'); $importedInvoicesPerWeek[$index] = $queryImported->distinct('invoice_number')->count('invoice_number');
@@ -492,7 +549,15 @@ class InvoiceChart extends ChartWidget
], ],
]; ];
} }
else {
$labels = ['Imported Invoice', 'Completed Invoice'];
$datasets = [[
'label' => 'Invoices',
'data' => [$importedInvoicesCount, $completedInvoicesCount],
'backgroundColor' => ['rgba(75, 192, 192, 1)', 'rgba(23, 211, 80, 1)'],
'fill' => false,
]];
}
return [ return [
'datasets' => $datasets, 'datasets' => $datasets,