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

Refactor SendInvoiceDataReport command to streamline email recipient handling and improve clarity in processing mail rules

Browse Source
This commit is contained in:
dhanabalan
2025-11-05 11:17:17 +05:30
parent d8acd8ed52
commit 9b2e7b4e98
1 changed files with 54 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
app/Console/Commands/SendInvoiceDataReport.php
View File

@@ -55,17 +55,20 @@ class SendInvoiceDataReport extends Command
->where('plant', $plantId) ->where('plant', $plantId)
->get(); ->get();
$toEmails = $mailRules->pluck('email')->filter()->unique()->toArray(); // $toEmails = $mailRules->pluck('email')
// ->flatMap(function ($emails) {
$ccEmails = $mailRules->pluck('cc_emails') // return array_map('trim', explode(',', $emails));
->filter() // remove null or empty // })
->flatMap(function ($emails) { // ->filter()
return array_map('trim', explode(',', $emails)); // ->toArray();
})
->filter()
->unique()
->toArray();
// $ccEmails = $mailRules->pluck('cc_emails')
// ->filter() // remove null or empty
// ->flatMap(function ($emails) {
// return array_map('trim', explode(',', $emails));
// })
// ->filter()
// ->toArray();
$plants = $plantId == 0 $plants = $plantId == 0
? Plant::all() ? Plant::all()
@@ -212,15 +215,48 @@ class SendInvoiceDataReport extends Command
// } // }
// $this->info("Invoice data report sent to " . count($emails) . " recipient(s)."); // $this->info("Invoice data report sent to " . count($emails) . " recipient(s).");
// } // }
if (!empty($toEmails)) { // if (!empty($toEmails)) {
foreach ($toEmails as $email){ // foreach ($toEmails as $email){
\Mail::to($email)->cc($ccEmails)->send(new InvoiceDataMail($scheduleType, $tableData)); // \Mail::to($email)->cc($ccEmails)->send(new InvoiceDataMail($scheduleType, $tableData));
} // }
$this->info("Invoice data report sent to " . count($toEmails) . " recipient(s)."); // $this->info("Invoice data report sent to " . count($toEmails) . " recipient(s).");
} // }
else { // else {
$this->warn('No recipients found for InvoiceDataMail.'); // $this->warn('No recipients found for InvoiceDataMail.');
} // }
//..
foreach ($mailRules as $rule)
{
$toEmails = collect(explode(',', $rule->email))
->map(fn($e) => trim($e))
->filter()
->unique()
->values()
->toArray();
$ccEmails = collect(explode(',', $rule->cc_emails))
->map(fn($e) => trim($e))
->filter()
->unique()
->values()
->toArray();
if (empty($toEmails)) {
$this->warn("Skipping rule ID {$rule->id} — no valid To emails found.");
continue;
} }
$mail = new InvoiceDataMail($scheduleType, $tableData);
foreach ($toEmails as $email) {
\Mail::to($email)->cc($ccEmails)->send($mail);
}
$this->info("Mail sent for rule ID {$rule->id} → To: " . implode(', ', $toEmails) .
($ccEmails ? " | CC: " . implode(', ', $ccEmails) : ''));
}
}
} }