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

Merge pull request 'Added proper mail trigger for serial invoice' (#76) from ranjith-dev into master
All checks were successful
Scan for leaked secrets using Kingfisher / kingfisher-secrets-scan (push) Successful in 14s
Details

Browse Source 
Reviewed-on: #76
This commit was merged in pull request #76.
This commit is contained in:
jothi
2025-12-06 06:39:07 +00:00
parent 9edbaf3d43 764a14990b
commit aca5d6c957
2 changed files with 172 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

290
app/Filament/Resources/InvoiceValidationResource/Pages/CreateInvoiceValidation.php
View File

@@ -2370,18 +2370,18 @@ class CreateInvoiceValidation extends CreateRecord
// .Mail // .Mail
$mailData = $this->getMail(); // $mailData = $this->getMail();
$mPlantName = $mailData['plant_name']; // $mPlantName = $mailData['plant_name'];
$emails = $mailData['emails']; // $emails = $mailData['emails'];
$mInvoiceType = 'Material'; // $mInvoiceType = 'Material';
if (! empty($emails)) { // if (! empty($emails)) {
Mail::to($emails)->send( // Mail::to($emails)->send(
new InvalidSerialMail($mSerNo, $invoiceNumber, $mPlantName, $mInvoiceType, $itemCode, 'InvalidMaterialFormat') // new InvalidSerialMail($mSerNo, $invoiceNumber, $mPlantName, $mInvoiceType, $itemCode, 'InvalidMaterialFormat')
); // );
} else { // } else {
\Log::warning("No recipients found for plant {$plantId}, module Serial, rule invalid_serial."); // \Log::warning("No recipients found for plant {$plantId}, module Serial, rule invalid_serial.");
} // }
$this->form->fill([ $this->form->fill([
'plant_id' => $plantId, 'plant_id' => $plantId,
@@ -2404,19 +2404,19 @@ class CreateInvoiceValidation extends CreateRecord
// .Mail // .Mail
$mailData = $this->getMail(); // $mailData = $this->getMail();
$mPlantName = $mailData['plant_name']; // $mPlantName = $mailData['plant_name'];
$emails = $mailData['emails']; // $emails = $mailData['emails'];
$mInvoiceType = 'Material'; // $mInvoiceType = 'Material';
if (! empty($emails)) { // if (! empty($emails)) {
// Mail::to($emails)->send(new InvalidSerialMail($serNo, $invoiceNumber, $mPlantName, $mInvoiceType)); // // Mail::to($emails)->send(new InvalidSerialMail($serNo, $invoiceNumber, $mPlantName, $mInvoiceType));
Mail::to($emails)->send( // Mail::to($emails)->send(
new InvalidSerialMail($mSerNo, $invoiceNumber, $mPlantName, $mInvoiceType, $itemCode, 'InvalidMaterialFormat') // new InvalidSerialMail($mSerNo, $invoiceNumber, $mPlantName, $mInvoiceType, $itemCode, 'InvalidMaterialFormat')
); // );
} else { // } else {
\Log::warning("No recipients found for plant {$plantId}, module Serial, rule invalid_serial."); // \Log::warning("No recipients found for plant {$plantId}, module Serial, rule invalid_serial.");
} // }
$this->form->fill([ $this->form->fill([
'plant_id' => $plantId, 'plant_id' => $plantId,
@@ -2439,19 +2439,19 @@ class CreateInvoiceValidation extends CreateRecord
// .Mail // .Mail
$mailData = $this->getMail(); // $mailData = $this->getMail();
$mPlantName = $mailData['plant_name']; // $mPlantName = $mailData['plant_name'];
$emails = $mailData['emails']; // $emails = $mailData['emails'];
$mInvoiceType = 'Material'; // $mInvoiceType = 'Material';
if (! empty($emails)) { // if (! empty($emails)) {
// Mail::to($emails)->send(new InvalidSerialMail($serNo, $invoiceNumber, $mPlantName, $mInvoiceType)); // // Mail::to($emails)->send(new InvalidSerialMail($serNo, $invoiceNumber, $mPlantName, $mInvoiceType));
Mail::to($emails)->send( // Mail::to($emails)->send(
new InvalidSerialMail($mSerNo, $invoiceNumber, $mPlantName, $mInvoiceType, $itemCode, 'InvalidMaterialFormat') // new InvalidSerialMail($mSerNo, $invoiceNumber, $mPlantName, $mInvoiceType, $itemCode, 'InvalidMaterialFormat')
); // );
} else { // } else {
\Log::warning("No recipients found for plant {$plantId}, module Serial, rule invalid_serial."); // \Log::warning("No recipients found for plant {$plantId}, module Serial, rule invalid_serial.");
} // }
$this->form->fill([ $this->form->fill([
'plant_id' => $plantId, 'plant_id' => $plantId,
@@ -2481,18 +2481,18 @@ class CreateInvoiceValidation extends CreateRecord
$this->dispatch('playWarnSound'); $this->dispatch('playWarnSound');
// .Mail // .Mail
$mailData = $this->getMail(); // $mailData = $this->getMail();
$mPlantName = $mailData['plant_name']; // $mPlantName = $mailData['plant_name'];
$emails = $mailData['emails']; // $emails = $mailData['emails'];
$mInvoiceType = 'Material'; // $mInvoiceType = 'Material';
if (! empty($emails)) { // if (! empty($emails)) {
Mail::to($emails)->send( // Mail::to($emails)->send(
new InvalidSerialMail($mSerNo, $invoiceNumber, $mPlantName, $mInvoiceType, $itemCode, 'InvalidMaterialFormat') // new InvalidSerialMail($mSerNo, $invoiceNumber, $mPlantName, $mInvoiceType, $itemCode, 'InvalidMaterialFormat')
); // );
} else { // } else {
\Log::warning("No recipients found for plant {$plantId}, module Serial, rule invalid_serial."); // \Log::warning("No recipients found for plant {$plantId}, module Serial, rule invalid_serial.");
} // }
$this->form->fill([ $this->form->fill([
'plant_id' => $plantId, 'plant_id' => $plantId,
@@ -2513,18 +2513,18 @@ class CreateInvoiceValidation extends CreateRecord
->send(); ->send();
$this->dispatch('playWarnSound'); $this->dispatch('playWarnSound');
$mailData = $this->getMail(); // $mailData = $this->getMail();
$mPlantName = $mailData['plant_name']; // $mPlantName = $mailData['plant_name'];
$emails = $mailData['emails']; // $emails = $mailData['emails'];
$mInvoiceType = 'Material'; // $mInvoiceType = 'Material';
if (! empty($emails)) { // if (! empty($emails)) {
Mail::to($emails)->send( // Mail::to($emails)->send(
new InvalidSerialMail($mSerNo, $invoiceNumber, $mPlantName, $mInvoiceType, $itemCode, 'InvalidMaterialFormat') // new InvalidSerialMail($mSerNo, $invoiceNumber, $mPlantName, $mInvoiceType, $itemCode, 'InvalidMaterialFormat')
); // );
} else { // } else {
\Log::warning("No recipients found for plant {$plantId}, module Serial, rule invalid_serial."); // \Log::warning("No recipients found for plant {$plantId}, module Serial, rule invalid_serial.");
} // }
$this->form->fill([ $this->form->fill([
'plant_id' => $plantId, 'plant_id' => $plantId,
@@ -2555,18 +2555,18 @@ class CreateInvoiceValidation extends CreateRecord
// .Mail // .Mail
$mailData = $this->getMail(); // $mailData = $this->getMail();
$mPlantName = $mailData['plant_name']; // $mPlantName = $mailData['plant_name'];
$emails = $mailData['emails']; // $emails = $mailData['emails'];
$mInvoiceType = 'Material'; // $mInvoiceType = 'Material';
if (! empty($emails)) { // if (! empty($emails)) {
Mail::to($emails)->send( // Mail::to($emails)->send(
new InvalidSerialMail($mSerNo, $invoiceNumber, $mPlantName, $mInvoiceType, $itemCode, 'InvalidMaterialFormat') // new InvalidSerialMail($mSerNo, $invoiceNumber, $mPlantName, $mInvoiceType, $itemCode, 'InvalidMaterialFormat')
); // );
} else { // } else {
\Log::warning("No recipients found for plant {$plantId}, module Serial, rule invalid_serial."); // \Log::warning("No recipients found for plant {$plantId}, module Serial, rule invalid_serial.");
} // }
$this->form->fill([ $this->form->fill([
'plant_id' => $plantId, 'plant_id' => $plantId,
@@ -2588,18 +2588,18 @@ class CreateInvoiceValidation extends CreateRecord
$this->dispatch('playWarnSound'); $this->dispatch('playWarnSound');
// .Mail // .Mail
$mailData = $this->getMail(); // $mailData = $this->getMail();
$mPlantName = $mailData['plant_name']; // $mPlantName = $mailData['plant_name'];
$emails = $mailData['emails']; // $emails = $mailData['emails'];
$mInvoiceType = 'Material'; // $mInvoiceType = 'Material';
if (! empty($emails)) { // if (! empty($emails)) {
Mail::to($emails)->send( // Mail::to($emails)->send(
new InvalidSerialMail($mSerNo, $invoiceNumber, $mPlantName, $mInvoiceType, $itemCode, 'InvalidMaterialFormat') // new InvalidSerialMail($mSerNo, $invoiceNumber, $mPlantName, $mInvoiceType, $itemCode, 'InvalidMaterialFormat')
); // );
} else { // } else {
\Log::warning("No recipients found for plant {$plantId}, module Serial, rule invalid_serial."); // \Log::warning("No recipients found for plant {$plantId}, module Serial, rule invalid_serial.");
} // }
$this->form->fill([ $this->form->fill([
'plant_id' => $plantId, 'plant_id' => $plantId,
@@ -2630,18 +2630,18 @@ class CreateInvoiceValidation extends CreateRecord
// .Mail // .Mail
$mailData = $this->getMail(); // $mailData = $this->getMail();
$mPlantName = $mailData['plant_name']; // $mPlantName = $mailData['plant_name'];
$emails = $mailData['emails']; // $emails = $mailData['emails'];
$mInvoiceType = 'Material'; // $mInvoiceType = 'Material';
if (! empty($emails)) { // if (! empty($emails)) {
Mail::to($emails)->send( // Mail::to($emails)->send(
new InvalidSerialMail($mSerNo, $invoiceNumber, $mPlantName, $mInvoiceType, $itemCode, 'InvalidMaterialFormat') // new InvalidSerialMail($mSerNo, $invoiceNumber, $mPlantName, $mInvoiceType, $itemCode, 'InvalidMaterialFormat')
); // );
} else { // } else {
\Log::warning("No recipients found for plant {$plantId}, module Serial, rule invalid_serial."); // \Log::warning("No recipients found for plant {$plantId}, module Serial, rule invalid_serial.");
} // }
$this->form->fill([ $this->form->fill([
'plant_id' => $plantId, 'plant_id' => $plantId,
@@ -2668,18 +2668,18 @@ class CreateInvoiceValidation extends CreateRecord
->send(); ->send();
$this->dispatch('playWarnSound'); $this->dispatch('playWarnSound');
$mailData = $this->getMail(); // $mailData = $this->getMail();
$mPlantName = $mailData['plant_name']; // $mPlantName = $mailData['plant_name'];
$emails = $mailData['emails']; // $emails = $mailData['emails'];
$mInvoiceType = 'Material'; // $mInvoiceType = 'Material';
if (! empty($emails)) { // if (! empty($emails)) {
Mail::to($emails)->send( // Mail::to($emails)->send(
new InvalidSerialMail($mSerNo, $invoiceNumber, $mPlantName, $mInvoiceType, $itemCode, 'ItemNotFound') // new InvalidSerialMail($mSerNo, $invoiceNumber, $mPlantName, $mInvoiceType, $itemCode, 'ItemNotFound')
); // );
} else { // } else {
\Log::warning("No recipients found for plant {$plantId}, module Serial, rule invalid_serial."); // \Log::warning("No recipients found for plant {$plantId}, module Serial, rule invalid_serial.");
} // }
$this->form->fill([ $this->form->fill([
'plant_id' => $plantId, 'plant_id' => $plantId,
@@ -2705,18 +2705,18 @@ class CreateInvoiceValidation extends CreateRecord
->send(); ->send();
$this->dispatch('playWarnSound'); $this->dispatch('playWarnSound');
$mailData = $this->getMail(); // $mailData = $this->getMail();
$mPlantName = $mailData['plant_name']; // $mPlantName = $mailData['plant_name'];
$emails = $mailData['emails']; // $emails = $mailData['emails'];
$mInvoiceType = 'Material'; // $mInvoiceType = 'Material';
if (! empty($emails)) { // if (! empty($emails)) {
Mail::to($emails)->send( // Mail::to($emails)->send(
new InvalidSerialMail($mSerNo, $invoiceNumber, $mPlantName, $mInvoiceType, $itemCode, 'ItemNotFoundDB') // new InvalidSerialMail($mSerNo, $invoiceNumber, $mPlantName, $mInvoiceType, $itemCode, 'ItemNotFoundDB')
); // );
} else { // } else {
\Log::warning("No recipients found for plant {$plantId}, module Serial, rule invalid_serial."); // \Log::warning("No recipients found for plant {$plantId}, module Serial, rule invalid_serial.");
} // }
$this->form->fill([ $this->form->fill([
'plant_id' => $plantId, 'plant_id' => $plantId,
@@ -2741,18 +2741,18 @@ class CreateInvoiceValidation extends CreateRecord
->send(); ->send();
$this->dispatch('playWarnSound'); $this->dispatch('playWarnSound');
$mailData = $this->getMail(); // $mailData = $this->getMail();
$mPlantName = $mailData['plant_name']; // $mPlantName = $mailData['plant_name'];
$emails = $mailData['emails']; // $emails = $mailData['emails'];
$mInvoiceType = 'Material'; // $mInvoiceType = 'Material';
if (! empty($emails)) { // if (! empty($emails)) {
Mail::to($emails)->send( // Mail::to($emails)->send(
new InvalidSerialMail($mSerNo, $invoiceNumber, $mPlantName, $mInvoiceType, $itemCode, 'ItemNotValidMaterialType') // new InvalidSerialMail($mSerNo, $invoiceNumber, $mPlantName, $mInvoiceType, $itemCode, 'ItemNotValidMaterialType')
); // );
} else { // } else {
\Log::warning("No recipients found for plant {$plantId}, module Serial, rule invalid_serial."); // \Log::warning("No recipients found for plant {$plantId}, module Serial, rule invalid_serial.");
} // }
$this->form->fill([ $this->form->fill([
'plant_id' => $plantId, 'plant_id' => $plantId,
@@ -2783,18 +2783,18 @@ class CreateInvoiceValidation extends CreateRecord
->send(); ->send();
$this->dispatch('playWarnSound'); $this->dispatch('playWarnSound');
$mailData = $this->getMail(); // $mailData = $this->getMail();
$mPlantName = $mailData['plant_name']; // $mPlantName = $mailData['plant_name'];
$emails = $mailData['emails']; // $emails = $mailData['emails'];
$mInvoiceType = 'Material'; // $mInvoiceType = 'Material';
if (! empty($emails)) { // if (! empty($emails)) {
Mail::to($emails)->send( // Mail::to($emails)->send(
new InvalidSerialMail($mSerNo, $invoiceNumber, $mPlantName, $mInvoiceType, $itemCode, 'ItemNotInvoice') // new InvalidSerialMail($mSerNo, $invoiceNumber, $mPlantName, $mInvoiceType, $itemCode, 'ItemNotInvoice')
); // );
} else { // } else {
\Log::warning("No recipients found for plant {$plantId}, module Serial, rule invalid_serial."); // \Log::warning("No recipients found for plant {$plantId}, module Serial, rule invalid_serial.");
} // }
$this->form->fill([ $this->form->fill([
'plant_id' => $plantId, 'plant_id' => $plantId,
@@ -2824,18 +2824,18 @@ class CreateInvoiceValidation extends CreateRecord
->send(); ->send();
$this->dispatch('playWarnSound'); $this->dispatch('playWarnSound');
$mailData = $this->getMail(); // $mailData = $this->getMail();
$mPlantName = $mailData['plant_name']; // $mPlantName = $mailData['plant_name'];
$emails = $mailData['emails']; // $emails = $mailData['emails'];
$mInvoiceType = 'Material'; // $mInvoiceType = 'Material';
if (! empty($emails)) { // if (! empty($emails)) {
Mail::to($emails)->send( // Mail::to($emails)->send(
new InvalidSerialMail($mSerNo, $invoiceNumber, $mPlantName, $mInvoiceType, $itemCode, 'Item') // new InvalidSerialMail($mSerNo, $invoiceNumber, $mPlantName, $mInvoiceType, $itemCode, 'Item')
); // );
} else { // } else {
\Log::warning("No recipients found for plant {$plantId}, module Serial, rule invalid_serial."); // \Log::warning("No recipients found for plant {$plantId}, module Serial, rule invalid_serial.");
} // }
$this->form->fill([ $this->form->fill([
'plant_id' => $plantId, 'plant_id' => $plantId,

28
app/Mail/InvalidSerialMail.php
View File

@@ -110,8 +110,14 @@ class InvalidSerialMail extends Mailable
case 'DuplicateCapacitorQR': case 'DuplicateCapacitorQR':
$this->subjectLine = "Invoice - Second Scanning({$this->mplantName})"; $this->subjectLine = "Invoice - Second Scanning({$this->mplantName})";
break; break;
case 'CompletedSerialInvoice':
$this->subjectLine = "Invoice - Second Scanning({$this->mplantName})";
break;
case 'CSerialInvoice':
$this->subjectLine = "Invoice - Second Scanning({$this->mplantName})";
break;
case 'ComSerInv': case 'ComSerInv':
$this->subjectLine = "Completed Serial Invoice ({$this->mplantName})"; $this->subjectLine = "Invoice - Second Scanning({$this->mplantName})";
break; break;
} }
@@ -147,6 +153,26 @@ class InvalidSerialMail extends Mailable
<b>Scanned QR Code:</b> {$this->serial}<br> <b>Scanned QR Code:</b> {$this->serial}<br>
"; ";
break; break;
case 'CompletedSerialInvoice':
$this->greeting = "
Dear Sir/Madam,<br><br>
Serial invoice <b>'{$this->invoiceNumber}'</b> completed the scanning process.<br>
<b>Plant:</b> {$this->mplantName}<br>
<b>Invoice Type:</b> {$this->mInvoiceType}<br>
<b>Invoice Number:</b> {$this->invoiceNumber}<br>
<b>Scanned QR Code:</b> {$this->serial}<br>
";
break;
case 'CSerialInvoice':
$this->greeting = "
Dear Sir/Madam,<br><br>
Serial invoice <b>'{$this->invoiceNumber}'</b> completed the scanning process.<br>
<b>Plant:</b> {$this->mplantName}<br>
<b>Invoice Type:</b> {$this->mInvoiceType}<br>
<b>Invoice Number:</b> {$this->invoiceNumber}<br>
<b>Scanned QR Code:</b> {$this->serial}<br>
";
break;
case 'ComSerInv': case 'ComSerInv':
$this->greeting = " $this->greeting = "
Dear Sir/Madam,<br><br> Dear Sir/Madam,<br><br>