diff --git a/app/Console/Commands/SendInvoiceTransitReport.php b/app/Console/Commands/SendInvoiceTransitReport.php index 999462d..3a37c9b 100644 --- a/app/Console/Commands/SendInvoiceTransitReport.php +++ b/app/Console/Commands/SendInvoiceTransitReport.php @@ -44,7 +44,7 @@ class SendInvoiceTransitReport extends Command ? Plant::all() : Plant::where('id', $plantId)->get(); - $plantCodes = $plants->pluck('code', 'id'); + $plantCodes = $plants->pluck('name', 'id'); if ($plants->isEmpty()) { $this->error('No valid plant(s) found.'); @@ -63,6 +63,7 @@ class SendInvoiceTransitReport extends Command 'it.plant_id', 'it.receiving_plant_name', 'it.lr_bl_aw_date', + 'it.lr_bl_aw_number', 'im.id as invoice_master_id', 'im.transport_name', DB::raw('CAST(im.transit_days AS INTEGER) as transit_days'), @@ -106,6 +107,7 @@ class SendInvoiceTransitReport extends Command 'invoice_number' => $item->invoice_number, 'transport_name' => $item->transport_name, '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', ]; diff --git a/app/Mail/InvoiceTransitMail.php b/app/Mail/InvoiceTransitMail.php index fb548ed..acfcd73 100644 --- a/app/Mail/InvoiceTransitMail.php +++ b/app/Mail/InvoiceTransitMail.php @@ -52,7 +52,9 @@ class InvoiceTransitMail extends Mailable public function content(): Content { - $greeting = 'Dear Sir/Madam,

We are sending here with list of pending sale invoices currently in transit.'; + $greeting = 'Dear Service Provider,

The following consignments to our branch warehouse are overdue beyond the agreed timeline.Immediate delivery is required today; Failure to complain will result to not able to fulfill customer requirements and leads to potential sales loss.Please treat this as the critical and confirm despatch without delay.

Dear C.R.I Branch Team,

Please follow and ensure the same.'; + + //$greeting1 = 'Dear C.R.I Branch Team,

Please follow and ensure the same'; if (strtolower($this->scheduleType) == 'daily') { @@ -73,8 +75,8 @@ class InvoiceTransitMail extends Mailable $reportPeriod = "

" . "Report Period: {$startDate->format('d-m-Y')} " - . "to {$endDate->format('d-m-Y')}." - . "
Please arrange to receipt the same immediately."; + . "to {$endDate->format('d-m-Y')}."; + // . "
Please arrange to receipt the same immediately."; $greeting .= $reportPeriod; } diff --git a/resources/views/mail/invoice-in-transit-report.blade.php b/resources/views/mail/invoice-in-transit-report.blade.php index 18bd00d..35b451c 100644 --- a/resources/views/mail/invoice-in-transit-report.blade.php +++ b/resources/views/mail/invoice-in-transit-report.blade.php @@ -78,26 +78,27 @@ No - Plant Code Receiving Plant Code + Plant Name Receiving Plant Name Invoice Number Transport Name - LR_BL_AW Date + LR Number + LR Date Transit Days - Status + Pending Days @foreach ($tableData as $row) {{ $row['no'] }} - {{ $row['plant'] }} {{ $row['receiving_plant'] }} + {{ $row['plant'] }} {{ $row['receiving_plant_name'] }} {{ $row['invoice_number'] }} {{ $row['transport_name'] }} - + {{ $row['lr_bl_aw_number'] }} @if(!empty($row['lr_bl_aw_date']) && $row['lr_bl_aw_date'] != '-') {{ \Carbon\Carbon::parse($row['lr_bl_aw_date'])->format('d-M-Y') }} @@ -105,6 +106,7 @@ - @endif + {{-- {{ $row['lr_bl_aw_date'] }} --}} {{ $row['transit_days'] }} {{ $row['status'] }}