diff --git a/app/Console/Commands/SendInvoiceTransitReport.php b/app/Console/Commands/SendInvoiceTransitReport.php index 8056617..307cedf 100644 --- a/app/Console/Commands/SendInvoiceTransitReport.php +++ b/app/Console/Commands/SendInvoiceTransitReport.php @@ -71,9 +71,10 @@ class SendInvoiceTransitReport extends Command ) ->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)) >= CAST(im.transit_days AS INTEGER)' + // ) + ->whereRaw('(CURRENT_DATE - CAST(it.lr_bl_aw_date AS DATE) + 1) >= CAST(im.transit_days AS INTEGER)') ->get(); @@ -87,6 +88,8 @@ class SendInvoiceTransitReport extends Command foreach ($mailRules as $rule) { $ruleInvoices = $results->where('invoice_master_id', $rule->invoice_master_id); + //$ruleInvoices = $results->filter(fn($item) => $item->invoice_master_id == (int)$rule->invoice_master_id); + if ($ruleInvoices->isEmpty()) { $this->info("Skipping rule {$rule->id} — no invoice transit data.");