From 8b9cc874b5fd24cef870ebad515dc1117d52e3c5 Mon Sep 17 00:00:00 2001 From: dhanabalan Date: Thu, 29 Jan 2026 08:31:27 +0530 Subject: [PATCH] Updated alignment on commands --- .../Commands/SendInvoiceTransitReport.php | 26 +++++++++++-------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/app/Console/Commands/SendInvoiceTransitReport.php b/app/Console/Commands/SendInvoiceTransitReport.php index c036c4b..c773a02 100644 --- a/app/Console/Commands/SendInvoiceTransitReport.php +++ b/app/Console/Commands/SendInvoiceTransitReport.php @@ -48,12 +48,12 @@ class SendInvoiceTransitReport extends Command if ($plants->isEmpty()) { $this->error('No valid plant(s) found.'); + return; } - if (strtolower($scheduleType) == 'daily') - { - $results = DB::table('invoice_in_transits as it') + if (strtolower($scheduleType) == 'daily') { + $results = DB::table('invoice_in_transits as it') ->join('invoice_masters as im', function ($join) { $join->on('im.receiving_plant_name', '=', 'it.receiving_plant_name')->on('im.transport_name', '=', 'it.transport_name'); }) @@ -84,17 +84,18 @@ class SendInvoiceTransitReport extends Command ') ) - ->when($plantId != 0, fn($q) => $q->where('it.plant_id', $plantId)) + ->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) > 0 ') + // ->distinct('it.invoice_number') ->get(); - if ($results->isEmpty()) { $this->info('No invoice transit records found for today.'); + return; } @@ -103,24 +104,25 @@ 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); - + // $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."); - continue; // ❌ DO NOT SEND MAIL + + continue; } $invoiceMaster = InvoiceMaster::find($rule->invoice_master_id); $mailSubject = $invoiceMaster ? "Despatch Invoice In Transit ({$invoiceMaster->receiving_plant_name} - {$invoiceMaster->transport_name})" - : "Despatch Invoice In Transit"; + : 'Despatch Invoice In Transit'; if ($ruleInvoices->isEmpty()) { $tableData = []; $this->info("No despatch invoices in transit found for rule {$rule->id}."); } else { + $tableData = $ruleInvoices->values()->map(function ($item, $index) use ($plantCodes) { return [ 'no' => $index + 1, @@ -132,9 +134,10 @@ class SendInvoiceTransitReport extends Command 'lr_bl_aw_date' => $item->lr_bl_aw_date, 'lr_bl_aw_number' => $item->lr_bl_aw_number, 'transit_days' => $item->transit_days, - 'status' => $item->delayed_days . ' Days', + 'status' => $item->delayed_days.' Days', ]; })->toArray(); + } $mail = new InvoiceTransitMail($scheduleType, $tableData, $mailSubject); @@ -155,13 +158,14 @@ class SendInvoiceTransitReport extends Command if (empty($toEmails)) { $this->warn("Skipping rule {$rule->id} — no To emails."); + continue; } \Mail::to($toEmails)->cc($ccEmails)->send($mail); $this->info( - "Mail sent → Rule {$rule->id} | Invoice Master ID: {$rule->invoice_master_id} | To: " . implode(', ', $toEmails) + "Mail sent → Rule {$rule->id} | Invoice Master ID: {$rule->invoice_master_id} | To: ".implode(', ', $toEmails) ); } }