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

Refactor SendInvoiceDataReport command for improved readability and consistency

Browse Source
This commit is contained in:
dhanabalan
2025-11-08 20:23:11 +05:30
parent af0db6275f
commit 26ad8b2ed8
1 changed files with 155 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3,6 +3,9 @@
namespace App\Console\Commands; namespace App\Console\Commands;
use App\Mail\InvoiceDataMail; use App\Mail\InvoiceDataMail;
use App\Models\AlertMailRule;
use App\Models\InvoiceDataValidation;
use App\Models\InvoiceOutValidation;
use App\Models\Line; use App\Models\Line;
use App\Models\Plant; use App\Models\Plant;
use App\Models\ProductionPlan; use App\Models\ProductionPlan;
@@ -29,22 +32,18 @@ class SendInvoiceDataReport extends Command
/** /**
* Execute the console command. * Execute the console command.
*/ */
public function handle() public function handle()
{ {
$scheduleType = $this->argument('schedule_type'); $scheduleType = $this->argument('schedule_type');
$plantId = (int) $this->argument('plant'); $plantId = (int) $this->argument('plant');
$mailRules = AlertMailRule::where('module', 'InvoiceDataReport')
$mailRules = \App\Models\AlertMailRule::where('module', 'InvoiceDataReport')
->where('rule_name', 'InvoiceDataMail') ->where('rule_name', 'InvoiceDataMail')
->where('schedule_type', $scheduleType) ->where('schedule_type', $scheduleType)
->where('plant', $plantId) ->where('plant', $plantId)
->get(); ->get();
$plants = $plantId == 0 $plants = ($plantId == 0) ? Plant::all() : Plant::where('id', $plantId)->get();
? Plant::all()
: Plant::where('id', $plantId)->get();
if ($plants->isEmpty()) { if ($plants->isEmpty()) {
$this->error("No valid plant(s) found."); $this->error("No valid plant(s) found.");
@@ -55,10 +54,11 @@ class SendInvoiceDataReport extends Command
// $startDate = now()->subDay()->setTime(10, 0, 0);//8:00 // $startDate = now()->subDay()->setTime(10, 0, 0);//8:00
// $endDate = now()->setTime(10, 0, 0);//8 // $endDate = now()->setTime(10, 0, 0);//8
// } // }
if (strtolower($scheduleType) == 'daily') if (strtolower($scheduleType) == 'daily')
{ {
$firstRecord = \App\Models\InvoiceDataValidation::orderBy('document_date', 'asc')->first(); $firstRecord = InvoiceDataValidation::orderBy('document_date', 'asc')->first();
$lastRecord = \App\Models\InvoiceDataValidation::orderBy('document_date', 'desc')->first(); $lastRecord = InvoiceDataValidation::orderBy('document_date', 'desc')->first();
if ($firstRecord && $lastRecord) { if ($firstRecord && $lastRecord) {
$startDate = \Carbon\Carbon::parse($firstRecord->document_date)->startOfDay(); $startDate = \Carbon\Carbon::parse($firstRecord->document_date)->startOfDay();
@@ -73,7 +73,8 @@ class SendInvoiceDataReport extends Command
$endDate = now()->endOfDay(); $endDate = now()->endOfDay();
} }
} }
else { else
{
$startDate = now()->setTime(8, 0, 0); $startDate = now()->setTime(8, 0, 0);
$endDate = now()->copy()->addDay()->setTime(8, 0, 0); $endDate = now()->copy()->addDay()->setTime(8, 0, 0);
} }
@@ -85,8 +86,7 @@ class SendInvoiceDataReport extends Command
$tableData = []; $tableData = [];
// $distributions = ['Direct Sale', 'Branch Sale', 'Internal Transfer', 'WOS', '']; // $distributions = ['Direct Sale', 'Branch Sale', 'Internal Transfer', 'WOS', ''];
$distributions = InvoiceDataValidation::whereNotNull('distribution_channel_desc')
$distributions = \App\Models\InvoiceDataValidation::whereNotNull('distribution_channel_desc')
->distinct() ->distinct()
->pluck('distribution_channel_desc') ->pluck('distribution_channel_desc')
->filter(fn($val) => trim($val) != '') ->filter(fn($val) => trim($val) != '')
@@ -97,7 +97,7 @@ class SendInvoiceDataReport extends Command
foreach ($distributions as $selectedDistribution) foreach ($distributions as $selectedDistribution)
{ {
$invoices = \App\Models\InvoiceDataValidation::where('plant_id', $plant->id) $invoices = InvoiceDataValidation::where('plant_id', $plant->id)
->where('distribution_channel_desc', $selectedDistribution) ->where('distribution_channel_desc', $selectedDistribution)
->whereBetween('document_date', [$startDate, $endDate]) ->whereBetween('document_date', [$startDate, $endDate])
->orderBy('document_date', 'asc') ->orderBy('document_date', 'asc')
@@ -130,7 +130,7 @@ class SendInvoiceDataReport extends Command
->map(fn($n) => preg_replace('/\s+/', '', strtoupper((string) $n))) ->map(fn($n) => preg_replace('/\s+/', '', strtoupper((string) $n)))
->toArray(); ->toArray();
$wentOutInvoices = \App\Models\InvoiceOutValidation::where('plant_id', $plant->id) $wentOutInvoices = InvoiceOutValidation::where('plant_id', $plant->id)
->whereIn('qr_code', $invoiceNumbers) ->whereIn('qr_code', $invoiceNumbers)
->whereBetween('scanned_at', [$startDate, $endDate]) ->whereBetween('scanned_at', [$startDate, $endDate])
->distinct('qr_code') ->distinct('qr_code')
@@ -139,10 +139,10 @@ class SendInvoiceDataReport extends Command
->toArray(); ->toArray();
// if (!empty($wentOutInvoices)) { // if (!empty($wentOutInvoices)) {
// $deletedValidations = \App\Models\InvoiceDataValidation::whereIn('document_number', $wentOutInvoices) // $deletedValidations = InvoiceDataValidation::whereIn('document_number', $wentOutInvoices)
// ->delete(); // ->delete();
// $deletedOuts = \App\Models\InvoiceOutValidation::whereIn('qr_code', $wentOutInvoices) // $deletedOuts = InvoiceOutValidation::whereIn('qr_code', $wentOutInvoices)
// ->delete(); // ->delete();
// $this->info("Deleted {$deletedValidations} from invoice_data_validations and {$deletedOuts} from invoice_out_validations for plant {$plant->name} ({$selectedDistribution})."); // $this->info("Deleted {$deletedValidations} from invoice_data_validations and {$deletedOuts} from invoice_out_validations for plant {$plant->name} ({$selectedDistribution}).");
@@ -167,10 +167,8 @@ class SendInvoiceDataReport extends Command
foreach ($pendingInvoices as $inv) foreach ($pendingInvoices as $inv)
{ {
$yesterday = now()->subDay()->toDateString(); $yesterday = now()->subDay()->toDateString();
$today = now()->toDateString(); $today = now()->toDateString();
$documentDate = \Carbon\Carbon::parse($inv->document_date); $documentDate = \Carbon\Carbon::parse($inv->document_date);
if (in_array($documentDate->toDateString(), [$today, $yesterday])) { if (in_array($documentDate->toDateString(), [$today, $yesterday])) {
@@ -215,7 +213,6 @@ class SendInvoiceDataReport extends Command
foreach ($mailRules as $rule) foreach ($mailRules as $rule)
{ {
$toEmails = collect(explode(',', $rule->email)) $toEmails = collect(explode(',', $rule->email))
->map(fn($e) => trim($e)) ->map(fn($e) => trim($e))
->filter() ->filter()
@@ -237,8 +234,7 @@ class SendInvoiceDataReport extends Command
\Mail::to($toEmails)->cc($ccEmails)->send($mail); \Mail::to($toEmails)->cc($ccEmails)->send($mail);
$this->info("Mail sent for rule ID {$rule->id} → To: " . implode(', ', $toEmails) . $this->info("Mail sent for rule ID {$rule->id} → To: " . implode(', ', $toEmails) . ($ccEmails ? " | CC: " . implode(', ', $ccEmails) : ''));
($ccEmails ? " | CC: " . implode(', ', $ccEmails) : ''));
} }
} }
} }