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

Enhance SendInvoiceDataReport to include 'WOS' distribution and improve email handling logic

Browse Source
This commit is contained in:
dhanabalan
2025-11-05 17:27:30 +05:30
parent 7e66c8f2ea
commit bd555564a0
1 changed files with 239 additions and 181 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -81,7 +81,7 @@ class SendInvoiceDataReport extends Command
if (strtolower($scheduleType) == 'daily') {
$startDate = now()->subDay()->setTime(10, 0, 0);//8:00
$endDate = now()->setTime(10, 0, 0);//10
$endDate = now()->setTime(10, 0, 0);//8
} else {
$startDate = now()->setTime(8, 0, 0);
$endDate = now()->copy()->addDay()->setTime(8, 0, 0);
@@ -147,15 +147,96 @@ class SendInvoiceDataReport extends Command
// }
// }
// $tableData = [];
// $no = 1;
// foreach ($plants as $plant)
// {
// $distributions = ['Direct Sale', 'Branch Sale', 'Internal Transfer', 'WOS'];
// foreach ($distributions as $selectedDistribution) {
// $invoices = \App\Models\InvoiceDataValidation::where('plant_id', $plant->id)
// ->where('distribution_channel_desc', $selectedDistribution)
// ->whereBetween('document_date', [$startDate, $endDate])
// ->select('customer_code', 'document_number', 'document_date', 'customer_trade_name', 'customer_location')
// ->distinct('document_number')
// ->get();
// if ($invoices->isEmpty()) {
// continue;
// }
// $wentOutInvoices = \App\Models\InvoiceOutValidation::where('plant_id', $plant->id)
// ->whereIn('qr_code', $invoices->pluck('document_number')->toArray())
// ->whereBetween('scanned_at', [$startDate, $endDate])
// ->distinct('qr_code')
// ->pluck('qr_code')
// ->toArray();
// $pendingInvoices = $invoices->filter(function ($inv) use ($wentOutInvoices) {
// return !in_array($inv->document_number, $wentOutInvoices);
// });
// if ($pendingInvoices->isEmpty()) {
// continue;
// }
// foreach ($pendingInvoices as $inv) {
// $tableData[] = [
// 'no' => $no++,
// 'plant' => $plant->name,
// // 'distribution_type' => $selectedDistribution,
// // 'customer_code' => $inv->customer_code,
// 'document_number' => $inv->document_number,
// 'document_date' => $inv->document_date,
// 'customer_trade_name' => $inv->customer_trade_name,
// 'customer_location' => $inv->customer_location,
// 'status' => 'Pending',
// ];
// }
// }
// }
// $mail = new InvoiceDataMail($scheduleType, $tableData);
// $contentVars = $mail->content()->with;
// $this->info($contentVars['greeting'] ?? 'Invoice Data Report');
// $this->table(
// ['No', 'Plant', 'Document Number', 'Document Date', 'Trade Name', 'Location', 'Status'],//'Distribution Type', 'Customer Code',
// $tableData
// );
// $this->info($contentVars['wishes'] ?? '');
// Send Mail //
// if (!empty($emails)) {
// foreach ($emails as $email){
// \Mail::to($email)->cc($ccEmails)->send(new InvoiceDataMail($scheduleType, $tableData));
// }
// $this->info("Invoice data report sent to " . count($emails) . " recipient(s).");
// }
// if (!empty($toEmails)) {
// foreach ($toEmails as $email){
// \Mail::to($email)->cc($ccEmails)->send(new InvoiceDataMail($scheduleType, $tableData));
// }
// $this->info("Invoice data report sent to " . count($toEmails) . " recipient(s).");
// }
// else {
// $this->warn('No recipients found for InvoiceDataMail.');
// }
//..
foreach ($plants as $plant)
{
$tableData = [];
$no = 1;
$distributions = ['Direct Sale', 'Branch Sale', 'Internal Transfer', 'WOS'];
foreach ($plants as $plant) {
$distributions = ['Direct Sale', 'Branch Sale', 'Internal Transfer', 'WOS',];
foreach ($distributions as $selectedDistribution) {
foreach ($distributions as $selectedDistribution)
{
$invoices = \App\Models\InvoiceDataValidation::where('plant_id', $plant->id)
->where('distribution_channel_desc', $selectedDistribution)
->whereBetween('document_date', [$startDate, $endDate])
@@ -196,7 +277,6 @@ class SendInvoiceDataReport extends Command
];
}
}
}
$mail = new InvoiceDataMail($scheduleType, $tableData);
$contentVars = $mail->content()->with;
@@ -208,25 +288,6 @@ class SendInvoiceDataReport extends Command
);
$this->info($contentVars['wishes'] ?? '');
// Send Mail //
// if (!empty($emails)) {
// foreach ($emails as $email){
// \Mail::to($email)->cc($ccEmails)->send(new InvoiceDataMail($scheduleType, $tableData));
// }
// $this->info("Invoice data report sent to " . count($emails) . " recipient(s).");
// }
// if (!empty($toEmails)) {
// foreach ($toEmails as $email){
// \Mail::to($email)->cc($ccEmails)->send(new InvoiceDataMail($scheduleType, $tableData));
// }
// $this->info("Invoice data report sent to " . count($toEmails) . " recipient(s).");
// }
// else {
// $this->warn('No recipients found for InvoiceDataMail.');
// }
//..
foreach ($mailRules as $rule)
{
@@ -249,14 +310,11 @@ class SendInvoiceDataReport extends Command
continue;
}
$mail = new InvoiceDataMail($scheduleType, $tableData);
foreach ($toEmails as $email) {
\Mail::to($email)->cc($ccEmails)->send($mail);
}
\Mail::to($toEmails)->cc($ccEmails)->send($mail);
$this->info("Mail sent for rule ID {$rule->id} → To: " . implode(', ', $toEmails) .
($ccEmails ? " | CC: " . implode(', ', $ccEmails) : ''));
}
}
}
}