From 8c0a404665e3383f96de5ecbebca6e5f52ac593b Mon Sep 17 00:00:00 2001 From: dhanabalan Date: Tue, 6 Jan 2026 12:46:41 +0530 Subject: [PATCH] modified logic for proper pending days in invoice in transit --- .../Commands/SendInvoiceTransitReport.php | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/app/Console/Commands/SendInvoiceTransitReport.php b/app/Console/Commands/SendInvoiceTransitReport.php index 307cedf..6434f41 100644 --- a/app/Console/Commands/SendInvoiceTransitReport.php +++ b/app/Console/Commands/SendInvoiceTransitReport.php @@ -67,14 +67,21 @@ class SendInvoiceTransitReport extends Command 'im.id as invoice_master_id', 'im.transport_name', DB::raw('CAST(im.transit_days AS INTEGER) as transit_days'), - DB::raw('(CURRENT_DATE - CAST(it.lr_bl_aw_date AS DATE)) as delayed_days') + // DB::raw('(CURRENT_DATE - CAST(it.lr_bl_aw_date AS DATE)) as delayed_days') + DB::raw(' + GREATEST( + 0, + (CURRENT_DATE - CAST(it.lr_bl_aw_date AS DATE) - 1) + - CAST(im.transit_days AS INTEGER) + ) AS delayed_days + ') ) ->when($plantId != 0, fn($q) => $q->where('it.plant_id', $plantId)) ->whereNotNull('it.lr_bl_aw_date') - // ->whereRaw( - // '(CURRENT_DATE - CAST(it.lr_bl_aw_date AS DATE)) >= CAST(im.transit_days AS INTEGER)' - // ) - ->whereRaw('(CURRENT_DATE - CAST(it.lr_bl_aw_date AS DATE) + 1) >= CAST(im.transit_days AS INTEGER)') + ->whereRaw(' + (CURRENT_DATE - CAST(it.lr_bl_aw_date AS DATE)) + - CAST(im.transit_days AS INTEGER) > 0 + ') ->get(); -- 2.49.1