diff --git a/app/Filament/Resources/InvoiceValidationResource/Pages/CreateInvoiceValidation.php b/app/Filament/Resources/InvoiceValidationResource/Pages/CreateInvoiceValidation.php
index 7777fc929..689d8ff6c 100644
--- a/app/Filament/Resources/InvoiceValidationResource/Pages/CreateInvoiceValidation.php
+++ b/app/Filament/Resources/InvoiceValidationResource/Pages/CreateInvoiceValidation.php
@@ -2370,18 +2370,18 @@ class CreateInvoiceValidation extends CreateRecord
 
                         // .Mail
 
-                        $mailData = $this->getMail();
-                        $mPlantName = $mailData['plant_name'];
-                        $emails = $mailData['emails'];
-                        $mInvoiceType = 'Material';
+                        // $mailData = $this->getMail();
+                        // $mPlantName = $mailData['plant_name'];
+                        // $emails = $mailData['emails'];
+                        // $mInvoiceType = 'Material';
 
-                        if (! empty($emails)) {
-                            Mail::to($emails)->send(
-                                new InvalidSerialMail($mSerNo, $invoiceNumber, $mPlantName, $mInvoiceType, $itemCode, 'InvalidMaterialFormat')
-                            );
-                        } else {
-                            \Log::warning("No recipients found for plant {$plantId}, module Serial, rule invalid_serial.");
-                        }
+                        // if (! empty($emails)) {
+                        //     Mail::to($emails)->send(
+                        //         new InvalidSerialMail($mSerNo, $invoiceNumber, $mPlantName, $mInvoiceType, $itemCode, 'InvalidMaterialFormat')
+                        //     );
+                        // } else {
+                        //     \Log::warning("No recipients found for plant {$plantId}, module Serial, rule invalid_serial.");
+                        // }
 
                         $this->form->fill([
                             'plant_id' => $plantId,
@@ -2404,19 +2404,19 @@ class CreateInvoiceValidation extends CreateRecord
 
                         // .Mail
 
-                        $mailData = $this->getMail();
-                        $mPlantName = $mailData['plant_name'];
-                        $emails = $mailData['emails'];
-                        $mInvoiceType = 'Material';
+                        // $mailData = $this->getMail();
+                        // $mPlantName = $mailData['plant_name'];
+                        // $emails = $mailData['emails'];
+                        // $mInvoiceType = 'Material';
 
-                        if (! empty($emails)) {
-                            // Mail::to($emails)->send(new InvalidSerialMail($serNo, $invoiceNumber, $mPlantName, $mInvoiceType));
-                            Mail::to($emails)->send(
-                                new InvalidSerialMail($mSerNo, $invoiceNumber, $mPlantName, $mInvoiceType, $itemCode, 'InvalidMaterialFormat')
-                            );
-                        } else {
-                            \Log::warning("No recipients found for plant {$plantId}, module Serial, rule invalid_serial.");
-                        }
+                        // if (! empty($emails)) {
+                        //     // Mail::to($emails)->send(new InvalidSerialMail($serNo, $invoiceNumber, $mPlantName, $mInvoiceType));
+                        //     Mail::to($emails)->send(
+                        //         new InvalidSerialMail($mSerNo, $invoiceNumber, $mPlantName, $mInvoiceType, $itemCode, 'InvalidMaterialFormat')
+                        //     );
+                        // } else {
+                        //     \Log::warning("No recipients found for plant {$plantId}, module Serial, rule invalid_serial.");
+                        // }
 
                         $this->form->fill([
                             'plant_id' => $plantId,
@@ -2439,19 +2439,19 @@ class CreateInvoiceValidation extends CreateRecord
 
                         // .Mail
 
-                        $mailData = $this->getMail();
-                        $mPlantName = $mailData['plant_name'];
-                        $emails = $mailData['emails'];
-                        $mInvoiceType = 'Material';
+                        // $mailData = $this->getMail();
+                        // $mPlantName = $mailData['plant_name'];
+                        // $emails = $mailData['emails'];
+                        // $mInvoiceType = 'Material';
 
-                        if (! empty($emails)) {
-                            // Mail::to($emails)->send(new InvalidSerialMail($serNo, $invoiceNumber, $mPlantName, $mInvoiceType));
-                            Mail::to($emails)->send(
-                                new InvalidSerialMail($mSerNo, $invoiceNumber, $mPlantName, $mInvoiceType, $itemCode, 'InvalidMaterialFormat')
-                            );
-                        } else {
-                            \Log::warning("No recipients found for plant {$plantId}, module Serial, rule invalid_serial.");
-                        }
+                        // if (! empty($emails)) {
+                        //     // Mail::to($emails)->send(new InvalidSerialMail($serNo, $invoiceNumber, $mPlantName, $mInvoiceType));
+                        //     Mail::to($emails)->send(
+                        //         new InvalidSerialMail($mSerNo, $invoiceNumber, $mPlantName, $mInvoiceType, $itemCode, 'InvalidMaterialFormat')
+                        //     );
+                        // } else {
+                        //     \Log::warning("No recipients found for plant {$plantId}, module Serial, rule invalid_serial.");
+                        // }
 
                         $this->form->fill([
                             'plant_id' => $plantId,
@@ -2481,18 +2481,18 @@ class CreateInvoiceValidation extends CreateRecord
                         $this->dispatch('playWarnSound');
                         // .Mail
 
-                        $mailData = $this->getMail();
-                        $mPlantName = $mailData['plant_name'];
-                        $emails = $mailData['emails'];
-                        $mInvoiceType = 'Material';
+                        // $mailData = $this->getMail();
+                        // $mPlantName = $mailData['plant_name'];
+                        // $emails = $mailData['emails'];
+                        // $mInvoiceType = 'Material';
 
-                        if (! empty($emails)) {
-                            Mail::to($emails)->send(
-                                new InvalidSerialMail($mSerNo, $invoiceNumber, $mPlantName, $mInvoiceType, $itemCode, 'InvalidMaterialFormat')
-                            );
-                        } else {
-                            \Log::warning("No recipients found for plant {$plantId}, module Serial, rule invalid_serial.");
-                        }
+                        // if (! empty($emails)) {
+                        //     Mail::to($emails)->send(
+                        //         new InvalidSerialMail($mSerNo, $invoiceNumber, $mPlantName, $mInvoiceType, $itemCode, 'InvalidMaterialFormat')
+                        //     );
+                        // } else {
+                        //     \Log::warning("No recipients found for plant {$plantId}, module Serial, rule invalid_serial.");
+                        // }
 
                         $this->form->fill([
                             'plant_id' => $plantId,
@@ -2513,18 +2513,18 @@ class CreateInvoiceValidation extends CreateRecord
                             ->send();
                         $this->dispatch('playWarnSound');
 
-                        $mailData = $this->getMail();
-                        $mPlantName = $mailData['plant_name'];
-                        $emails = $mailData['emails'];
-                        $mInvoiceType = 'Material';
+                        // $mailData = $this->getMail();
+                        // $mPlantName = $mailData['plant_name'];
+                        // $emails = $mailData['emails'];
+                        // $mInvoiceType = 'Material';
 
-                        if (! empty($emails)) {
-                            Mail::to($emails)->send(
-                                new InvalidSerialMail($mSerNo, $invoiceNumber, $mPlantName, $mInvoiceType, $itemCode, 'InvalidMaterialFormat')
-                            );
-                        } else {
-                            \Log::warning("No recipients found for plant {$plantId}, module Serial, rule invalid_serial.");
-                        }
+                        // if (! empty($emails)) {
+                        //     Mail::to($emails)->send(
+                        //         new InvalidSerialMail($mSerNo, $invoiceNumber, $mPlantName, $mInvoiceType, $itemCode, 'InvalidMaterialFormat')
+                        //     );
+                        // } else {
+                        //     \Log::warning("No recipients found for plant {$plantId}, module Serial, rule invalid_serial.");
+                        // }
 
                         $this->form->fill([
                             'plant_id' => $plantId,
@@ -2555,18 +2555,18 @@ class CreateInvoiceValidation extends CreateRecord
 
                         // .Mail
 
-                        $mailData = $this->getMail();
-                        $mPlantName = $mailData['plant_name'];
-                        $emails = $mailData['emails'];
-                        $mInvoiceType = 'Material';
+                        // $mailData = $this->getMail();
+                        // $mPlantName = $mailData['plant_name'];
+                        // $emails = $mailData['emails'];
+                        // $mInvoiceType = 'Material';
 
-                        if (! empty($emails)) {
-                            Mail::to($emails)->send(
-                                new InvalidSerialMail($mSerNo, $invoiceNumber, $mPlantName, $mInvoiceType, $itemCode, 'InvalidMaterialFormat')
-                            );
-                        } else {
-                            \Log::warning("No recipients found for plant {$plantId}, module Serial, rule invalid_serial.");
-                        }
+                        // if (! empty($emails)) {
+                        //     Mail::to($emails)->send(
+                        //         new InvalidSerialMail($mSerNo, $invoiceNumber, $mPlantName, $mInvoiceType, $itemCode, 'InvalidMaterialFormat')
+                        //     );
+                        // } else {
+                        //     \Log::warning("No recipients found for plant {$plantId}, module Serial, rule invalid_serial.");
+                        // }
 
                         $this->form->fill([
                             'plant_id' => $plantId,
@@ -2588,18 +2588,18 @@ class CreateInvoiceValidation extends CreateRecord
                         $this->dispatch('playWarnSound');
                         // .Mail
 
-                        $mailData = $this->getMail();
-                        $mPlantName = $mailData['plant_name'];
-                        $emails = $mailData['emails'];
-                        $mInvoiceType = 'Material';
+                        // $mailData = $this->getMail();
+                        // $mPlantName = $mailData['plant_name'];
+                        // $emails = $mailData['emails'];
+                        // $mInvoiceType = 'Material';
 
-                        if (! empty($emails)) {
-                            Mail::to($emails)->send(
-                                new InvalidSerialMail($mSerNo, $invoiceNumber, $mPlantName, $mInvoiceType, $itemCode, 'InvalidMaterialFormat')
-                            );
-                        } else {
-                            \Log::warning("No recipients found for plant {$plantId}, module Serial, rule invalid_serial.");
-                        }
+                        // if (! empty($emails)) {
+                        //     Mail::to($emails)->send(
+                        //         new InvalidSerialMail($mSerNo, $invoiceNumber, $mPlantName, $mInvoiceType, $itemCode, 'InvalidMaterialFormat')
+                        //     );
+                        // } else {
+                        //     \Log::warning("No recipients found for plant {$plantId}, module Serial, rule invalid_serial.");
+                        // }
 
                         $this->form->fill([
                             'plant_id' => $plantId,
@@ -2630,18 +2630,18 @@ class CreateInvoiceValidation extends CreateRecord
 
                     // .Mail
 
-                    $mailData = $this->getMail();
-                    $mPlantName = $mailData['plant_name'];
-                    $emails = $mailData['emails'];
-                    $mInvoiceType = 'Material';
+                    // $mailData = $this->getMail();
+                    // $mPlantName = $mailData['plant_name'];
+                    // $emails = $mailData['emails'];
+                    // $mInvoiceType = 'Material';
 
-                    if (! empty($emails)) {
-                        Mail::to($emails)->send(
-                            new InvalidSerialMail($mSerNo, $invoiceNumber, $mPlantName, $mInvoiceType, $itemCode, 'InvalidMaterialFormat')
-                        );
-                    } else {
-                        \Log::warning("No recipients found for plant {$plantId}, module Serial, rule invalid_serial.");
-                    }
+                    // if (! empty($emails)) {
+                    //     Mail::to($emails)->send(
+                    //         new InvalidSerialMail($mSerNo, $invoiceNumber, $mPlantName, $mInvoiceType, $itemCode, 'InvalidMaterialFormat')
+                    //     );
+                    // } else {
+                    //     \Log::warning("No recipients found for plant {$plantId}, module Serial, rule invalid_serial.");
+                    // }
 
                     $this->form->fill([
                         'plant_id' => $plantId,
@@ -2668,18 +2668,18 @@ class CreateInvoiceValidation extends CreateRecord
                         ->send();
                     $this->dispatch('playWarnSound');
 
-                    $mailData = $this->getMail();
-                    $mPlantName = $mailData['plant_name'];
-                    $emails = $mailData['emails'];
-                    $mInvoiceType = 'Material';
+                    // $mailData = $this->getMail();
+                    // $mPlantName = $mailData['plant_name'];
+                    // $emails = $mailData['emails'];
+                    // $mInvoiceType = 'Material';
 
-                    if (! empty($emails)) {
-                        Mail::to($emails)->send(
-                            new InvalidSerialMail($mSerNo, $invoiceNumber, $mPlantName, $mInvoiceType, $itemCode, 'ItemNotFound')
-                        );
-                    } else {
-                        \Log::warning("No recipients found for plant {$plantId}, module Serial, rule invalid_serial.");
-                    }
+                    // if (! empty($emails)) {
+                    //     Mail::to($emails)->send(
+                    //         new InvalidSerialMail($mSerNo, $invoiceNumber, $mPlantName, $mInvoiceType, $itemCode, 'ItemNotFound')
+                    //     );
+                    // } else {
+                    //     \Log::warning("No recipients found for plant {$plantId}, module Serial, rule invalid_serial.");
+                    // }
 
                     $this->form->fill([
                         'plant_id' => $plantId,
@@ -2705,18 +2705,18 @@ class CreateInvoiceValidation extends CreateRecord
                         ->send();
                     $this->dispatch('playWarnSound');
 
-                    $mailData = $this->getMail();
-                    $mPlantName = $mailData['plant_name'];
-                    $emails = $mailData['emails'];
-                    $mInvoiceType = 'Material';
+                    // $mailData = $this->getMail();
+                    // $mPlantName = $mailData['plant_name'];
+                    // $emails = $mailData['emails'];
+                    // $mInvoiceType = 'Material';
 
-                    if (! empty($emails)) {
-                        Mail::to($emails)->send(
-                            new InvalidSerialMail($mSerNo, $invoiceNumber, $mPlantName, $mInvoiceType, $itemCode, 'ItemNotFoundDB')
-                        );
-                    } else {
-                        \Log::warning("No recipients found for plant {$plantId}, module Serial, rule invalid_serial.");
-                    }
+                    // if (! empty($emails)) {
+                    //     Mail::to($emails)->send(
+                    //         new InvalidSerialMail($mSerNo, $invoiceNumber, $mPlantName, $mInvoiceType, $itemCode, 'ItemNotFoundDB')
+                    //     );
+                    // } else {
+                    //     \Log::warning("No recipients found for plant {$plantId}, module Serial, rule invalid_serial.");
+                    // }
 
                     $this->form->fill([
                         'plant_id' => $plantId,
@@ -2741,18 +2741,18 @@ class CreateInvoiceValidation extends CreateRecord
                         ->send();
                     $this->dispatch('playWarnSound');
 
-                    $mailData = $this->getMail();
-                    $mPlantName = $mailData['plant_name'];
-                    $emails = $mailData['emails'];
-                    $mInvoiceType = 'Material';
+                    // $mailData = $this->getMail();
+                    // $mPlantName = $mailData['plant_name'];
+                    // $emails = $mailData['emails'];
+                    // $mInvoiceType = 'Material';
 
-                    if (! empty($emails)) {
-                        Mail::to($emails)->send(
-                            new InvalidSerialMail($mSerNo, $invoiceNumber, $mPlantName, $mInvoiceType, $itemCode, 'ItemNotValidMaterialType')
-                        );
-                    } else {
-                        \Log::warning("No recipients found for plant {$plantId}, module Serial, rule invalid_serial.");
-                    }
+                    // if (! empty($emails)) {
+                    //     Mail::to($emails)->send(
+                    //         new InvalidSerialMail($mSerNo, $invoiceNumber, $mPlantName, $mInvoiceType, $itemCode, 'ItemNotValidMaterialType')
+                    //     );
+                    // } else {
+                    //     \Log::warning("No recipients found for plant {$plantId}, module Serial, rule invalid_serial.");
+                    // }
 
                     $this->form->fill([
                         'plant_id' => $plantId,
@@ -2783,18 +2783,18 @@ class CreateInvoiceValidation extends CreateRecord
                         ->send();
                     $this->dispatch('playWarnSound');
 
-                    $mailData = $this->getMail();
-                    $mPlantName = $mailData['plant_name'];
-                    $emails = $mailData['emails'];
-                    $mInvoiceType = 'Material';
+                    // $mailData = $this->getMail();
+                    // $mPlantName = $mailData['plant_name'];
+                    // $emails = $mailData['emails'];
+                    // $mInvoiceType = 'Material';
 
-                    if (! empty($emails)) {
-                        Mail::to($emails)->send(
-                            new InvalidSerialMail($mSerNo, $invoiceNumber, $mPlantName, $mInvoiceType, $itemCode, 'ItemNotInvoice')
-                        );
-                    } else {
-                        \Log::warning("No recipients found for plant {$plantId}, module Serial, rule invalid_serial.");
-                    }
+                    // if (! empty($emails)) {
+                    //     Mail::to($emails)->send(
+                    //         new InvalidSerialMail($mSerNo, $invoiceNumber, $mPlantName, $mInvoiceType, $itemCode, 'ItemNotInvoice')
+                    //     );
+                    // } else {
+                    //     \Log::warning("No recipients found for plant {$plantId}, module Serial, rule invalid_serial.");
+                    // }
 
                     $this->form->fill([
                         'plant_id' => $plantId,
@@ -2824,18 +2824,18 @@ class CreateInvoiceValidation extends CreateRecord
                         ->send();
                     $this->dispatch('playWarnSound');
 
-                    $mailData = $this->getMail();
-                    $mPlantName = $mailData['plant_name'];
-                    $emails = $mailData['emails'];
-                    $mInvoiceType = 'Material';
+                    // $mailData = $this->getMail();
+                    // $mPlantName = $mailData['plant_name'];
+                    // $emails = $mailData['emails'];
+                    // $mInvoiceType = 'Material';
 
-                    if (! empty($emails)) {
-                        Mail::to($emails)->send(
-                            new InvalidSerialMail($mSerNo, $invoiceNumber, $mPlantName, $mInvoiceType, $itemCode, 'Item')
-                        );
-                    } else {
-                        \Log::warning("No recipients found for plant {$plantId}, module Serial, rule invalid_serial.");
-                    }
+                    // if (! empty($emails)) {
+                    //     Mail::to($emails)->send(
+                    //         new InvalidSerialMail($mSerNo, $invoiceNumber, $mPlantName, $mInvoiceType, $itemCode, 'Item')
+                    //     );
+                    // } else {
+                    //     \Log::warning("No recipients found for plant {$plantId}, module Serial, rule invalid_serial.");
+                    // }
 
                     $this->form->fill([
                         'plant_id' => $plantId,
diff --git a/app/Mail/InvalidSerialMail.php b/app/Mail/InvalidSerialMail.php
index 422aae37e..7c06d35e2 100644
--- a/app/Mail/InvalidSerialMail.php
+++ b/app/Mail/InvalidSerialMail.php
@@ -110,8 +110,14 @@ class InvalidSerialMail extends Mailable
             case 'DuplicateCapacitorQR':
                 $this->subjectLine = "Invoice - Second Scanning({$this->mplantName})";
                 break;
+            case 'CompletedSerialInvoice':
+                $this->subjectLine = "Invoice - Second Scanning({$this->mplantName})";
+                break;
+            case 'CSerialInvoice':
+                $this->subjectLine = "Invoice - Second Scanning({$this->mplantName})";
+                break;
             case 'ComSerInv':
-                $this->subjectLine = "Completed Serial Invoice ({$this->mplantName})";
+                $this->subjectLine = "Invoice - Second Scanning({$this->mplantName})";
                 break;
         }
 
@@ -147,6 +153,26 @@ class InvalidSerialMail extends Mailable
                     <b>Scanned QR Code:</b> {$this->serial}<br>
                 ";
                 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':
                  $this->greeting = "
                     Dear Sir/Madam,<br><br>