Removed unwanted space line

app/Filament/Exports/LocatorInvoiceValidationExporter.php

@@ -23,8 +23,8 @@ class LocatorInvoiceValidationExporter extends Exporter
                 // Increment and return the row number
                 return ++$rowNumber;
             }),
-            ExportColumn::make('plant.name')
-                ->label('PLANT'),
+            ExportColumn::make('plant.code')
+                ->label('PLANT CODE'),
             ExportColumn::make('invoice_number')
                 ->label('INVOICE NUMBER'),
             ExportColumn::make('serial_number')

app/Filament/Exports/PalletValidationExporter.php

@@ -24,8 +24,8 @@ class PalletValidationExporter extends Exporter
                     // Increment and return the row number
                     return ++$rowNumber;
                 }),
-            ExportColumn::make('plant.name')
-                ->label('PLANT'),
+            ExportColumn::make('plant.code')
+                ->label('PLANT CODE'),
             ExportColumn::make('pallet_number')
                 ->label('PALLET NUMBER'),
             ExportColumn::make('serial_number')

app/Filament/Exports/ReworkLocatorInvoiceValidationExporter.php

@@ -24,8 +24,8 @@ class ReworkLocatorInvoiceValidationExporter extends Exporter
                 // Increment and return the row number
                 return ++$rowNumber;
             }),
-            ExportColumn::make('plant.name')
-                ->label('PLANT'),
+            ExportColumn::make('plant.code')
+                ->label('PLANT CODE'),
             ExportColumn::make('invoice_number')
                 ->label('INVOICE NUMBER'),
             ExportColumn::make('serial_number')

app/Filament/Imports/LocatorImporter.php

@@ -52,22 +52,31 @@ class LocatorImporter extends Importer
     public function resolveRecord(): ?Locator
     {
         $warnMsg = [];
-        $plant = Plant::where('code', $this->data['plant'])->first();
+        $plantCod = $this->data['plant'];
+        $plant = null;
+        $user = null;
         $locator = $this->data['locator_number'];
         // $locatorQuantity = $this->data['locator_quantity'];
         $palletQuantity = 0;
-        $user = Filament::auth()->user()->name;
-        if (!$plant) {
-            $warnMsg[] = "Plant not found";
+        if (Str::length($plantCod) < 4 || !is_numeric($plantCod) || !preg_match('/^[1-9]\d{3,}$/', $plantCod)) {
+            $warnMsg[] = "Invalid plant code found";
         }
         else
         {
-            if (Str::length($locator) < 7) {
-                $warnMsg[] = "Invalid locator number found";
+            $plant = Plant::where('code', $plantCod)->first();
+            if (!$plant) {
+                $warnMsg[] = "Plant not found";
             }
-            else {
-                // $locat = Locator::where('name', $locator)->where('plant_id', $plant->id)->first();
-                $palletQuantity = PalletValidation::where('locator_number', $locator)->where('plant_id', $plant->id)->distinct('pallet_number')->count('pallet_number');
+            else
+            {
+                $user = Filament::auth()->user()->name;
+                if (Str::length($locator) < 7) {
+                    $warnMsg[] = "Invalid locator number found";
+                }
+                else {
+                    // $locat = Locator::where('name', $locator)->where('plant_id', $plant->id)->first();
+                    $palletQuantity = PalletValidation::where('locator_number', $locator)->where('plant_id', $plant->id)->distinct('pallet_number')->count('pallet_number');
+                }
             }
         }
 

app/Filament/Imports/LocatorInvoiceValidationImporter.php

@@ -3,9 +3,15 @@
 namespace App\Filament\Imports;
 
 use App\Models\LocatorInvoiceValidation;
+use App\Models\Plant;
+use App\Models\User;
+use Carbon\Carbon;
+use Filament\Actions\Imports\Exceptions\RowImportFailedException;
 use Filament\Actions\Imports\ImportColumn;
 use Filament\Actions\Imports\Importer;
 use Filament\Actions\Imports\Models\Import;
+use Filament\Facades\Filament;
+use Str;
 
 class LocatorInvoiceValidationImporter extends Importer
 {
@@ -16,10 +22,10 @@ class LocatorInvoiceValidationImporter extends Importer
         return [
             ImportColumn::make('plant')
                 ->requiredMapping()
-                ->exampleHeader('Plant Name')
-                ->example('Ransar Industries-I')
-                ->label('Plant Name')
-                ->relationship(resolveUsing: 'name')
+                ->exampleHeader('Plant Code')
+                ->example('1000')
+                ->label('Plant Code')
+                ->relationship(resolveUsing: 'code')
                 ->rules(['required']),
             ImportColumn::make('invoice_number')
                 ->requiredMapping()
@@ -34,56 +40,222 @@ class LocatorInvoiceValidationImporter extends Importer
                 ->label('Serial Number')
                 ->rules(['required']),
             ImportColumn::make('pallet_number')
+                ->requiredMapping()
                 ->exampleHeader('Pallet Number')
                 ->example('EP-2506001')
                 ->label('Pallet Number'),
             ImportColumn::make('locator_number')
+                ->requiredMapping()
                 ->exampleHeader('Locator Number')
                 ->example('W05-D1B')
                 ->label('Locator Number'),
             ImportColumn::make('scanned_status')
+                ->requiredMapping()
                 ->exampleHeader('Scanned Status')
                 ->example('')
                 ->label('Scanned Status'),
             ImportColumn::make('upload_status')
+                ->requiredMapping()
                 ->exampleHeader('Upload Status')
                 ->example('Y')
                 ->label('Upload Status'),
             ImportColumn::make('created_at')
+                ->requiredMapping()
                 ->exampleHeader('Created At')
                 ->example('2025-06-17 01:42:16')
                 ->label('Created At')
-                ->rules(['date_format:Y-m-d H:i:s']),
+                ->rules(['required']),
             ImportColumn::make('scanned_at')
+                ->requiredMapping()
                 ->exampleHeader('Scanned At')
                 ->example('2025-06-17 08:42:16')
-                ->label('Scanned At')
-                ->rules(['date_format:Y-m-d H:i:s']),
+                ->label('Scanned At'),
+            ImportColumn::make('updated_at')
+                ->requiredMapping()
+                ->exampleHeader('Updated At')
+                ->example('2025-06-17 08:42:16')
+                ->label('Updated At'),
             ImportColumn::make('created_by')
                 ->requiredMapping()
                 ->exampleHeader('Created by')
-                ->example('RAW002365')
+                ->example('RAW012345')
                 ->label('Created by')
                 ->rules(['required']),
             ImportColumn::make('scanned_by')
+                ->requiredMapping()
                 ->exampleHeader('Scanned by')
-                ->example('')
+                ->example('RAW012345')
                 ->label('Scanned by'),
             ImportColumn::make('updated_by')
+                ->requiredMapping()
                 ->exampleHeader('Updated by')
-                ->example('')
+                ->example('RAW012345')
                 ->label('Updated by'),
         ];
     }
 
     public function resolveRecord(): ?LocatorInvoiceValidation
     {
-        // return LocatorInvoiceValidation::firstOrNew([
-        //     // Update existing records, matching them by `$this->data['column_name']`
-        //     'email' => $this->data['email'],
-        // ]);
+        $warnMsg = [];
+        $plantCod = $this->data['plant'];
+        $plant = null;
+        $invoiceNo = $this->data['invoice_number'];
+        $serialNo = $this->data['serial_number'];
+        $palletNo = $this->data['pallet_number'];
+        $locatorNo = $this->data['locator_number'];
+        $scannedStat = $this->data['scanned_status'];
+        $uploadStat = $this->data['upload_status'];
+        $createdAt = $this->data['created_at'];
+        $scannedAt = $this->data['scanned_at'];
+        $updatedAt = $this->data['updated_at'];
+        $cDateTime = null;
+        $sDateTime = null;
+        $uDateTime = null;
+        $createdBy = $this->data['created_by'];
+        $scannedBy = $this->data['scanned_by'];
+        $updatedBy = $this->data['updated_by'];
 
-        return new LocatorInvoiceValidation();
+        if (Str::length($plantCod) < 4 || !is_numeric($plantCod) || !preg_match('/^[1-9]\d{3,}$/', $plantCod)) {
+            $warnMsg[] = "Invalid plant code found";
+        }
+        else
+        {
+            $plant = Plant::where('code', $this->data['plant'])->first();
+            if (!$plant) {
+                $warnMsg[] = "Plant not found";
+            }
+            else
+            {
+                if (Str::length($invoiceNo) < 5 || !ctype_alnum($invoiceNo)) {
+                    $warnMsg[] = "Invalid invoice number found";
+                }
+                if (Str::length($serialNo) < 9 || !ctype_alnum($serialNo)) {
+                    $warnMsg[] = "Invalid serial number found";
+                }
+                if (Str::length($palletNo) > 0 && Str::length($palletNo) < 10) {
+                    $warnMsg[] = "Invalid pallet number found";
+                }
+                if (Str::length($locatorNo) > 0 && Str::length($locatorNo) < 7) {
+                    $warnMsg[] = "Invalid locator number found";
+                }
+                if (Str::length($scannedStat) > 0 && $scannedStat != 'Scanned') {
+                    $warnMsg[] = "Invalid scanned status found";
+                }
+                if ($uploadStat != 'Y' && $uploadStat != 'N') {
+                    $warnMsg[] = "Invalid upload status found";
+                }
+                $created = User::where('name', $createdBy)->first();
+                if (!$created) {
+                    $warnMsg[] = "Created by not found";
+                }
+                if (Str::length($scannedBy) > 0) {
+                    $scanned = User::where('name', $scannedBy)->first();
+                    if (!$scanned) {
+                        $warnMsg[] = "Scanned by not found";
+                    }
+                }
+                if (Str::length($updatedBy) > 0) {
+                    $updated = User::where('name', $updatedBy)->first();
+                    if (!$updated) {
+                        $warnMsg[] = "Updated by not found";
+                    }
+                }
+
+                $formats = ['d-m-Y H:i', 'd-m-Y H:i:s']; //'07-05-2025 08:00' or '07-05-2025 08:00:00'
+
+                foreach ($formats as $format) {
+                    try {
+                        $cDateTime = Carbon::createFromFormat($format, $createdAt);
+                        break;
+                    } catch (\Exception $e) {
+                        // Optionally collect warning messages
+                        // $warnMsg[] = "Date format mismatch with format: $format";
+                    }
+                }
+
+                if (!isset($cDateTime)) {
+                    // throw new \Exception('Invalid date time format');
+                    $warnMsg[] = "Invalid 'Created DateTime' format. Expected DD-MM-YYYY HH:MM:SS";
+                }
+
+                if (Str::length($scannedAt) > 0)
+                {
+                    foreach ($formats as $format) {
+                        try {
+                            $sDateTime = Carbon::createFromFormat($format, $scannedAt);
+                            break;
+                        } catch (\Exception $e) {
+                            // Optionally collect warning messages
+                            // $warnMsg[] = "Date format mismatch with format: $format";
+                        }
+                    }
+
+                    if (!isset($sDateTime)) {
+                        $warnMsg[] = "Invalid 'Scanned DateTime' format. Expected DD-MM-YYYY HH:MM:SS";
+                    }
+                }
+
+                if (Str::length($updatedAt) > 0)
+                {
+                    foreach ($formats as $format) {
+                        try {
+                            $uDateTime = Carbon::createFromFormat($format, $updatedAt);
+                            break;
+                        } catch (\Exception $e) {
+                            // Optionally collect warning messages
+                            // $warnMsg[] = "Date format mismatch with format: $format";
+                        }
+                    }
+
+                    if (!isset($uDateTime)) {
+                        $warnMsg[] = "Invalid 'Updated DateTime' format. Expected DD-MM-YYYY HH:MM:SS";
+                    }
+                    else
+                    {
+                        if (isset($cDateTime) && isset($uDateTime)) {
+                            if ($cDateTime->greaterThan($uDateTime)) {
+                                $warnMsg[] = "'Created DataTime' is greater than 'Updated DateTime'.";
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        // if (!is_numeric($locatorQuantity) || $locatorQuantity < 0 || $locatorQuantity > 2) {
+        //     $warnMsg[] = "Invalid locator quantity found";
+        // }
+
+        if (!empty($warnMsg)) {
+            throw new RowImportFailedException(implode(', ', $warnMsg));
+        }
+
+        LocatorInvoiceValidation::updateOrCreate(
+            [
+                'plant_id' => $plant->id,
+                'serial_number' => $serialNo
+            ],
+            [
+                'invoice_number' => $invoiceNo,
+                'pallet_number' => $palletNo,
+                'locator_number' => $locatorNo,
+                'scanned_status' => $scannedStat,
+                'upload_status' => $uploadStat,
+                'created_at' => $cDateTime->format('Y-m-d H:i:s'),
+                'scanned_at' => (Str::length($scannedAt) > 0) ? $sDateTime->format('Y-m-d H:i:s') : null,
+                'updated_at' => (Str::length($updatedAt) > 0) ? $uDateTime->format('Y-m-d H:i:s') : null,
+                'created_by' => $createdBy,
+                'scanned_by' => $scannedBy,
+                'updated_by' => $updatedBy
+            ]
+        );
+        return null;
+        // // return LocatorInvoiceValidation::firstOrNew([
+        // //     // Update existing records, matching them by `$this->data['column_name']`
+        // //     'email' => $this->data['email'],
+        // // ]);
+
+        // return new LocatorInvoiceValidation();
     }
 
     public static function getCompletedNotificationBody(Import $import): string

app/Filament/Imports/PalletValidationImporter.php

@@ -3,9 +3,14 @@
 namespace App\Filament\Imports;
 
 use App\Models\PalletValidation;
+use App\Models\Plant;
+use App\Models\User;
+use Carbon\Carbon;
+use Filament\Actions\Imports\Exceptions\RowImportFailedException;
 use Filament\Actions\Imports\ImportColumn;
 use Filament\Actions\Imports\Importer;
 use Filament\Actions\Imports\Models\Import;
+use Str;
 
 class PalletValidationImporter extends Importer
 {
@@ -14,75 +19,229 @@ class PalletValidationImporter extends Importer
     public static function getColumns(): array
     {
         return [
+            ImportColumn::make('plant')
+                ->requiredMapping()
+                ->label('Plant Code')
+                ->exampleHeader('Plant Code')
+                ->example('1000')
+                ->relationship(resolveUsing: 'code')
+                ->rules(['required']),
+            ImportColumn::make('serial_number')
+                ->requiredMapping()
+                ->label('Serial Number')
+                ->exampleHeader('Serial Number')
+                ->example('12345678901234')
+                ->rules(['required']),
             ImportColumn::make('pallet_number')
                 ->requiredMapping()
                 ->label('Pallet Number')
-                ->example('EP-2505001'),
-            ImportColumn::make('serial_number')
-                ->requiredMapping()
-                ->example('12345678901234')
-                ->rules(['required']),
+                ->exampleHeader('Pallet Number')
+                ->example('EP-2507001'),
             ImportColumn::make('pallet_status')
                 ->requiredMapping()
                 ->label('Pallet Status')
+                ->exampleHeader('Pallet Status')
                 ->example('Completed'),
             ImportColumn::make('locator_number')
                 ->requiredMapping()
                 ->label('Locator Number')
+                ->exampleHeader('Locator Number')
                 ->example('W05-D1B'),
             ImportColumn::make('locator_quantity')
+                ->requiredMapping()
                 ->label('Locator Quantity')
-                ->requiredMapping()
-                ->numeric()
+                ->exampleHeader('Locator Quantity')
                 ->example(1)
-                ->rules(['required', 'integer']),
-            ImportColumn::make('plant')
-                ->requiredMapping()
-                ->exampleHeader('Plant Name')
-                ->example('Ransar Industries-I')
-                ->label('Plant Name')
-                ->relationship(resolveUsing: 'name')
                 ->rules(['required']),
             ImportColumn::make('created_at')
+                ->requiredMapping()
                 ->label('Created At')
-                ->requiredMapping()
-                ->example('01-01-2025 08:00:00')
-                ->rules(['required']),
-            ImportColumn::make('updated_at')
-                ->label('Updated At')
-                ->requiredMapping()
+                ->exampleHeader('Created At')
                 ->example('01-01-2025 08:00:00')
                 ->rules(['required']),
             ImportColumn::make('scanned_at')
-                ->label('Scanned At')
                 ->requiredMapping()
+                ->label('Scanned At')
+                ->exampleHeader('Scanned At')
+                ->example('01-01-2025 08:00:00')
+                ->rules(['required']),
+            ImportColumn::make('updated_at')
+                ->requiredMapping()
+                ->label('Updated At')
+                ->exampleHeader('Updated At')
                 ->example('01-01-2025 08:00:00')
                 ->rules(['required']),
             ImportColumn::make('created_by')
-                ->label('Created By')
                 ->requiredMapping()
-                ->example('Jothi')
+                ->label('Created By')
+                ->exampleHeader('Created By')
+                ->example('Admin')
                 ->rules(['required']),
             ImportColumn::make('scanned_by')
-                ->label('Scanned By')
                 ->requiredMapping()
-                ->example('Jothi')
+                ->label('Scanned By')
+                ->exampleHeader('Scanned By')
+                ->example('Admin')
                 ->rules(['required']),
             ImportColumn::make('updated_by')
+                ->requiredMapping()
                 ->label('Updated By')
-                ->example('Jothi')
-                ->requiredMapping(),
+                ->exampleHeader('Updated By')
+                ->example('Admin'),
         ];
     }
 
     public function resolveRecord(): ?PalletValidation
     {
-        // return PalletValidation::firstOrNew([
-        //     // Update existing records, matching them by `$this->data['column_name']`
-        //     'email' => $this->data['email'],
-        // ]);
+        $warnMsg = [];
+        $plantCod = $this->data['plant'];
+        $plant = null;
+        $serialNo = $this->data['serial_number'];
+        $palletNo = $this->data['pallet_number'];
+        $palletStat = $this->data['pallet_status'];
+        $locatorNo = $this->data['locator_number'];
+        $locatorQty = $this->data['locator_quantity'];
+        $createdAt = $this->data['created_at'];
+        $scannedAt = $this->data['scanned_at'];
+        $updatedAt = $this->data['updated_at'];
+        $cDateTime = null;
+        $sDateTime = null;
+        $uDateTime = null;
+        $createdBy = $this->data['created_by'];
+        $scannedBy = $this->data['scanned_by'];
+        $updatedBy = $this->data['updated_by'];
 
-        return new PalletValidation();
+        if (Str::length($plantCod) < 4 || !is_numeric($plantCod) || !preg_match('/^[1-9]\d{3,}$/', $plantCod)) {
+            $warnMsg[] = "Invalid plant code found";
+        }
+        else
+        {
+            $plant = Plant::where('code', $this->data['plant'])->first();
+            if (!$plant) {
+                $warnMsg[] = "Plant not found";
+            }
+            else
+            {
+                if (Str::length($serialNo) < 9 || !ctype_alnum($serialNo)) {
+                    $warnMsg[] = "Invalid serial number found";
+                }
+                if (Str::length($palletNo) > 0 && Str::length($palletNo) < 10) {
+                    $warnMsg[] = "Invalid pallet number found";
+                }
+                if (Str::length($palletStat) > 0 && $palletStat != 'Completed') {
+                    $warnMsg[] = "Invalid pallet status found";
+                }
+                if (Str::length($locatorNo) > 0 && Str::length($locatorNo) < 7) {
+                    $warnMsg[] = "Invalid locator number found";
+                }
+                if (Str::length($palletNo) <= 0 && Str::length($locatorNo) <= 0) {
+                    $warnMsg[] = "Pallet and locator number found";
+                }
+                if (Str::length($locatorQty) < 0 || !is_numeric($locatorQty) || $locatorQty < 0 || $locatorQty > 2) {
+                    $warnMsg[] = "Invalid locator quantity found";
+                }
+                $created = User::where('name', $createdBy)->first();
+                if (!$created) {
+                    $warnMsg[] = "Created by not found";
+                }
+                $scanned = User::where('name', $scannedBy)->first();
+                if (!$scanned) {
+                    $warnMsg[] = "Scanned by not found";
+                }
+                $updated = User::where('name', $updatedBy)->first();
+                if (!$updated) {
+                    $warnMsg[] = "Updated by not found";
+                }
+
+                $formats = ['d-m-Y H:i', 'd-m-Y H:i:s']; //'07-05-2025 08:00' or '07-05-2025 08:00:00'
+
+                foreach ($formats as $format) {
+                    try {
+                        $cDateTime = Carbon::createFromFormat($format, $createdAt);
+                        break;
+                    } catch (\Exception $e) {
+                        // Optionally collect warning messages
+                        // $warnMsg[] = "Date format mismatch with format: $format";
+                    }
+                }
+
+                if (!isset($cDateTime)) {
+                    // throw new \Exception('Invalid date time format');
+                    $warnMsg[] = "Invalid 'Created DateTime' format. Expected DD-MM-YYYY HH:MM:SS";
+                }
+
+                foreach ($formats as $format) {
+                    try {
+                        $sDateTime = Carbon::createFromFormat($format, $scannedAt);
+                        break;
+                    } catch (\Exception $e) {
+                        // Optionally collect warning messages
+                        // $warnMsg[] = "Date format mismatch with format: $format";
+                    }
+                }
+
+                if (!isset($sDateTime)) {
+                    $warnMsg[] = "Invalid 'Scanned DateTime' format. Expected DD-MM-YYYY HH:MM:SS";
+                }
+
+                foreach ($formats as $format) {
+                    try
+                    {
+                        $uDateTime = Carbon::createFromFormat($format, $updatedAt);
+                        break;
+                    } catch (\Exception $e) {
+                        // Optionally collect warning messages
+                        // $warnMsg[] = "Date format mismatch with format: $format";
+                    }
+                }
+
+                if (!isset($uDateTime)) {
+                    $warnMsg[] = "Invalid 'Updated DateTime' format. Expected DD-MM-YYYY HH:MM:SS";
+                }
+                else
+                {
+                    if (isset($cDateTime) && isset($uDateTime)) {
+                        if ($cDateTime->greaterThan($uDateTime)) {
+                            $warnMsg[] = "'Created DataTime' is greater than 'Updated DateTime'.";
+                        }
+                    }
+                }
+            }
+        }
+
+        // if (!is_numeric($locatorQuantity) || $locatorQuantity < 0 || $locatorQuantity > 2) {
+        //     $warnMsg[] = "Invalid locator quantity found";
+        // }
+
+        if (!empty($warnMsg)) {
+            throw new RowImportFailedException(implode(', ', $warnMsg));
+        }
+
+        PalletValidation::updateOrCreate(
+            [
+                'plant_id' => $plant->id,
+                'serial_number' => $serialNo
+            ],
+            [
+                'pallet_number' => $palletNo,
+                'pallet_status' => $palletStat,
+                'locator_number' => $locatorNo,
+                'locator_quantity' => $locatorQty,
+                'created_at' => $cDateTime->format('Y-m-d H:i:s'),
+                'scanned_at' => $sDateTime->format('Y-m-d H:i:s'),
+                'updated_at' => $uDateTime->format('Y-m-d H:i:s'),
+                'created_by' => $createdBy,
+                'scanned_by' => $scannedBy,
+                'updated_by' => $updatedBy
+            ]
+        );
+        return null;
+        // // return PalletValidation::firstOrNew([
+        // //     // Update existing records, matching them by `$this->data['column_name']`
+        // //     'email' => $this->data['email'],
+        // // ]);
+
+        // return new PalletValidation();
     }
 
     public static function getCompletedNotificationBody(Import $import): string

app/Filament/Imports/ReworkLocatorInvoiceValidationImporter.php

@@ -2,10 +2,15 @@
 
 namespace App\Filament\Imports;
 
+use App\Models\Plant;
 use App\Models\ReworkLocatorInvoiceValidation;
+use App\Models\User;
+use Carbon\Carbon;
+use Filament\Actions\Imports\Exceptions\RowImportFailedException;
 use Filament\Actions\Imports\ImportColumn;
 use Filament\Actions\Imports\Importer;
 use Filament\Actions\Imports\Models\Import;
+use Str;
 
 class ReworkLocatorInvoiceValidationImporter extends Importer
 {
@@ -16,10 +21,10 @@ class ReworkLocatorInvoiceValidationImporter extends Importer
         return [
             ImportColumn::make('plant')
                 ->requiredMapping()
-                ->exampleHeader('Plant Name')
-                ->example('Ransar Industries-I')
-                ->label('Plant Name')
-                ->relationship(resolveUsing: 'name')
+                ->exampleHeader('Plant Code')
+                ->example('1000')
+                ->label('Plant Code')
+                ->relationship(resolveUsing: 'code')
                 ->rules(['required']),
             ImportColumn::make('invoice_number')
                 ->requiredMapping()
@@ -34,23 +39,51 @@ class ReworkLocatorInvoiceValidationImporter extends Importer
                 ->label('Serial Number')
                 ->rules(['required']),
             ImportColumn::make('pallet_number')
+                ->requiredMapping()
                 ->exampleHeader('Pallet Number')
                 ->example('')
                 ->label('Pallet Number'),
             ImportColumn::make('locator_number')
+                ->requiredMapping()
                 ->exampleHeader('Locator Number')
                 ->example('')
                 ->label('Locator Number'),
             ImportColumn::make('scanned_status')
+                ->requiredMapping()
                 ->exampleHeader('Scanned Status')
                 ->example('')
-                ->label('Scanned Status'),
+                ->label('Scanned Status')
+                ->rules(['required']),
             ImportColumn::make('upload_status')
                 ->requiredMapping()
                 ->exampleHeader('Upload Status')
                 ->example('Y')
                 ->label('Upload Status')
                 ->rules(['required']),
+            ImportColumn::make('created_at')
+                ->requiredMapping()
+                ->exampleHeader('Created At')
+                ->example('2025-06-17 08:42:16')
+                ->label('Created At')
+                ->rules(['required']),
+            ImportColumn::make('scanned_at')
+                ->requiredMapping()
+                ->exampleHeader('Scanned At')
+                ->example('2025-06-17 08:42:16')
+                ->label('Scanned At')
+                ->rules(['required']),
+            ImportColumn::make('updated_at')
+                ->requiredMapping()
+                ->exampleHeader('Updated At')
+                ->example('2025-06-17 08:42:16')
+                ->label('Updated At')
+                ->rules(['required']),
+            ImportColumn::make('reworked_at')
+                ->requiredMapping()
+                ->exampleHeader('Reworked At')
+                ->example('2025-06-17 08:42:16')
+                ->label('Reworked At')
+                ->rules(['required']),
             ImportColumn::make('created_by')
                 ->requiredMapping()
                 ->exampleHeader('Created By')
@@ -58,43 +91,211 @@ class ReworkLocatorInvoiceValidationImporter extends Importer
                 ->label('Created By')
                 ->rules(['required']),
             ImportColumn::make('scanned_by')
+                ->requiredMapping()
                 ->exampleHeader('Scanned By')
                 ->example('admin')
-                ->label('Scanned By'),
+                ->label('Scanned By')
+                ->rules(['required']),
             ImportColumn::make('updated_by')
+                ->requiredMapping()
                 ->exampleHeader('Updated By')
                 ->example('admin')
                 ->label('Updated By'),
             ImportColumn::make('reworked_by')
+                ->requiredMapping()
                 ->exampleHeader('Reworked By')
                 ->example('admin')
-                ->label('Reworked By'),
-            ImportColumn::make('created_at')
-                ->exampleHeader('Created At')
-                ->example('2025-06-17 08:42:16')
-                ->label('Created At')
-                ->rules(['date_format:Y-m-d H:i:s']),
-            ImportColumn::make('scanned_at')
-                ->exampleHeader('Scanned At')
-                ->example('2025-06-17 08:42:16')
-                ->label('Scanned At')
-                ->rules(['date_format:Y-m-d H:i:s']),
-            ImportColumn::make('reworked_at')
-                ->exampleHeader('Reworked At')
-                ->example('2025-06-17 08:42:16')
-                ->label('Reworked At')
-                ->rules(['date_format:Y-m-d H:i:s']),
+                ->label('Reworked By')
+                ->rules(['required']),
         ];
     }
 
     public function resolveRecord(): ?ReworkLocatorInvoiceValidation
     {
-        // return ReworkLocatorInvoiceValidation::firstOrNew([
-        //     // Update existing records, matching them by `$this->data['column_name']`
-        //     'email' => $this->data['email'],
-        // ]);
+        $warnMsg = [];
+        $plantCod = $this->data['plant'];
+        $plant = null;
+        $invoiceNo = $this->data['invoice_number'];
+        $serialNo = $this->data['serial_number'];
+        $palletNo = $this->data['pallet_number'];
+        $locatorNo = $this->data['locator_number'];
+        $scannedStat = $this->data['scanned_status'];
+        $uploadStat = $this->data['upload_status'];
+        $createdAt = $this->data['created_at'];
+        $scannedAt = $this->data['scanned_at'];
+        $updatedAt = $this->data['updated_at'];
+        $reworkedAt = $this->data['reworked_at'];
+        $cDateTime = null;
+        $sDateTime = null;
+        $uDateTime = null;
+        $rDateTime = null;
+        $createdBy = $this->data['created_by'];
+        $scannedBy = $this->data['scanned_by'];
+        $updatedBy = $this->data['updated_by'];
+        $reworkedBy = $this->data['reworked_by'];
 
-        return new ReworkLocatorInvoiceValidation();
+        if (Str::length($plantCod) < 4 || !is_numeric($plantCod) || !preg_match('/^[1-9]\d{3,}$/', $plantCod)) {
+            $warnMsg[] = "Invalid plant code found";
+        }
+        else
+        {
+            $plant = Plant::where('code', $this->data['plant'])->first();
+            if (!$plant) {
+                $warnMsg[] = "Plant not found";
+            }
+            else
+            {
+                if (Str::length($invoiceNo) < 5 || !ctype_alnum($invoiceNo)) {
+                    $warnMsg[] = "Invalid invoice number found";
+                }
+                if (Str::length($serialNo) < 9 || !ctype_alnum($serialNo)) {
+                    $warnMsg[] = "Invalid serial number found";
+                }
+                if (Str::length($palletNo) > 0 && Str::length($palletNo) < 10) {
+                    $warnMsg[] = "Invalid pallet number found";
+                }
+                if (Str::length($locatorNo) > 0 && Str::length($locatorNo) < 7) {
+                    $warnMsg[] = "Invalid locator number found";
+                }
+                if ($scannedStat != 'Scanned') {
+                    $warnMsg[] = "Invalid scanned status found";
+                }
+                if ($uploadStat != 'Y' && $uploadStat != 'N') {
+                    $warnMsg[] = "Invalid upload status found";
+                }
+                $created = User::where('name', $createdBy)->first();
+                if (!$created) {
+                    $warnMsg[] = "Created by not found";
+                }
+                $scanned = User::where('name', $scannedBy)->first();
+                if (!$scanned) {
+                    $warnMsg[] = "Scanned by not found";
+                }
+                if (Str::length($updatedBy) > 0) {
+                    $updated = User::where('name', $updatedBy)->first();
+                    if (!$updated) {
+                        $warnMsg[] = "Updated by not found";
+                    }
+                }
+                $reworked = User::where('name', $reworkedBy)->first();
+                if (!$reworked) {
+                    $warnMsg[] = "Reworked by not found";
+                }
+
+                $formats = ['d-m-Y H:i', 'd-m-Y H:i:s']; //'07-05-2025 08:00' or '07-05-2025 08:00:00'
+
+                foreach ($formats as $format) {
+                    try {
+                        $cDateTime = Carbon::createFromFormat($format, $createdAt);
+                        break;
+                    } catch (\Exception $e) {
+                        // Optionally collect warning messages
+                        // $warnMsg[] = "Date format mismatch with format: $format";
+                    }
+                }
+
+                if (!isset($cDateTime)) {
+                    // throw new \Exception('Invalid date time format');
+                    $warnMsg[] = "Invalid 'Created DateTime' format. Expected DD-MM-YYYY HH:MM:SS";
+                }
+
+                foreach ($formats as $format) {
+                    try {
+                        $sDateTime = Carbon::createFromFormat($format, $scannedAt);
+                        break;
+                    } catch (\Exception $e) {
+                        // Optionally collect warning messages
+                        // $warnMsg[] = "Date format mismatch with format: $format";
+                    }
+                }
+
+                if (!isset($sDateTime)) {
+                    $warnMsg[] = "Invalid 'Scanned DateTime' format. Expected DD-MM-YYYY HH:MM:SS";
+                }
+
+                if (Str::length($updatedAt) > 0)
+                {
+                    foreach ($formats as $format) {
+                        try {
+                            $uDateTime = Carbon::createFromFormat($format, $updatedAt);
+                            break;
+                        } catch (\Exception $e) {
+                            // Optionally collect warning messages
+                            // $warnMsg[] = "Date format mismatch with format: $format";
+                        }
+                    }
+
+                    if (!isset($uDateTime)) {
+                        $warnMsg[] = "Invalid 'Updated DateTime' format. Expected DD-MM-YYYY HH:MM:SS";
+                    }
+                    else
+                    {
+                        if (isset($cDateTime) && isset($uDateTime)) {
+                            if ($cDateTime->greaterThan($uDateTime)) {
+                                $warnMsg[] = "'Created DataTime' is greater than 'Updated DateTime'.";
+                            }
+                        }
+                    }
+                }
+
+                foreach ($formats as $format) {
+                    try {
+                        $rDateTime = Carbon::createFromFormat($format, $reworkedAt);
+                        break;
+                    } catch (\Exception $e) {
+                        // Optionally collect warning messages
+                        // $warnMsg[] = "Date format mismatch with format: $format";
+                    }
+                }
+
+                if (!isset($rDateTime)) {
+                    $warnMsg[] = "Invalid 'Reworked DateTime' format. Expected DD-MM-YYYY HH:MM:SS";
+                }
+                else
+                {
+                    if (isset($cDateTime) && isset($rDateTime)) {
+                        if ($cDateTime->greaterThan($rDateTime)) {
+                            $warnMsg[] = "'Created DataTime' is greater than 'Reworked DateTime'.";
+                        }
+                    }
+                }
+            }
+        }
+
+        // if (!is_numeric($locatorQuantity) || $locatorQuantity < 0 || $locatorQuantity > 2) {
+            //     $warnMsg[] = "Invalid locator quantity found";
+        // }
+
+        if (!empty($warnMsg)) {
+            throw new RowImportFailedException(implode(', ', $warnMsg));
+        }
+
+        ReworkLocatorInvoiceValidation::updateOrCreate(
+            [
+                'plant_id' => $plant->id,
+                'serial_number' => $serialNo,
+                'invoice_number' => $invoiceNo,
+                'pallet_number' => $palletNo,
+                'locator_number' => $locatorNo,
+                'scanned_status' => $scannedStat,
+                'upload_status' => $uploadStat,
+                'created_at' => $cDateTime->format('Y-m-d H:i:s'),
+                'scanned_at' => (Str::length($scannedAt) > 0) ? $sDateTime->format('Y-m-d H:i:s') : null,
+                'updated_at' => (Str::length($updatedAt) > 0) ? $uDateTime->format('Y-m-d H:i:s') : null,
+                'reworked_at' => (Str::length($reworkedAt) > 0) ? $rDateTime->format('Y-m-d H:i:s') : null,
+                'created_by' => $createdBy,
+                'scanned_by' => $scannedBy,
+                'updated_by' => $updatedBy,
+                'reworked_by' => $reworkedBy
+                ]
+            );
+            return null;
+        // // return ReworkLocatorInvoiceValidation::firstOrNew([
+        // //     // Update existing records, matching them by `$this->data['column_name']`
+        // //     'email' => $this->data['email'],
+        // // ]);
+
+        // return new ReworkLocatorInvoiceValidation();
     }
 
     public static function getCompletedNotificationBody(Import $import): string

app/Filament/Pages/InvoiceFinder.php

@@ -23,6 +23,8 @@ class InvoiceFinder extends Page implements HasForms
 
     protected static ?string $navigationGroup = 'Export Dispatch';
 
+    protected static ?int $navigationSort = 6;
+
     //use InteractsWithForms;
 
     public $pId, $invoiceNumber;

app/Filament/Pages/LocatorValidation.php

@@ -31,6 +31,8 @@ class LocatorValidation extends Page implements HasForms
 
     protected static ?string $navigationGroup = 'Export Dispatch';
 
+    protected static ?int $navigationSort = 2;
+
     use InteractsWithForms;
 
     public $pId, $palletNo, $serialNo;
@@ -1790,7 +1792,7 @@ class LocatorValidation extends Page implements HasForms
 
     public static function getNavigationLabel(): string
     {
-        return 'Locator Validations';
+        return 'Scan Locator';
     }
 
     public static function canAccess(): bool

app/Filament/Pages/PalletFromLocator.php

@@ -26,6 +26,8 @@ class PalletFromLocator extends Page implements HasForms
 
     protected static ?string $navigationGroup = 'Export Dispatch';
 
+    protected static ?int $navigationSort = 4;
+
     public $plantId;
 
     public $locatorNo;

app/Filament/Pages/UploadSerialLocator.php

@@ -32,6 +32,8 @@ class UploadSerialLocator extends Page implements HasForms
 
     protected static ?string $navigationGroup = 'Export Dispatch';
 
+    protected static ?int $navigationSort = 3;
+
     public $upload_serial_locator;
 
     public $scan_locator = '';

app/Filament/Resources/LocatorInvoiceValidationResource.php

@@ -43,6 +43,8 @@ class LocatorInvoiceValidationResource extends Resource
 
     protected static ?string $navigationGroup = 'Export Dispatch';
 
+    protected static ?int $navigationSort = 5;
+
     public static function form(Form $form): Form
     {
         return $form
@@ -640,11 +642,15 @@ class LocatorInvoiceValidationResource extends Resource
 
                 ImportAction::make()
                     ->importer(LocatorInvoiceValidationImporter::class)
+                    ->label('Import Locator Invoice')
+                    ->color('warning')
                     ->visible(function() {
                         return Filament::auth()->user()->can('view import locator invoice validation');
                     }),
                 ExportAction::make()
                     ->exporter(LocatorInvoiceValidationExporter::class)
+                    ->label('Export Locator Invoice')
+                    ->color('warning')
                     ->visible(function() {
                         return Filament::auth()->user()->can('view export locator invoice validation');
                     }),
@@ -894,6 +900,11 @@ class LocatorInvoiceValidationResource extends Resource
         ];
     }
 
+    public static function getNavigationLabel(): string
+    {
+        return 'Scan Invoice';
+    }
+
     public static function getPages(): array
     {
         return [

app/Filament/Resources/PalletValidationResource.php

@@ -36,8 +36,11 @@ class PalletValidationResource extends Resource
     protected static ?string $model = PalletValidation::class;
 
     protected static ?string $navigationIcon = 'heroicon-o-rectangle-stack';
+
     protected static ?string $navigationGroup = 'Export Dispatch';
 
+    protected static ?int $navigationSort = 1;
+
     public static function form(Form $form): Form
     {
 
@@ -526,11 +529,15 @@ class PalletValidationResource extends Resource
                     }),
                 ImportAction::make()
                     ->importer(PalletValidationImporter::class)
+                    ->label('Import Pallet')
+                    ->color('warning')
                     ->visible(function() {
                         return Filament::auth()->user()->can('view import pallet validation');
                     }),
                 ExportAction::make()
                     ->exporter(PalletValidationExporter::class)
+                    ->label('Export Pallet')
+                    ->color('warning')
                     ->visible(function() {
                         return Filament::auth()->user()->can('view export pallet validation');
                     }),
@@ -544,6 +551,11 @@ class PalletValidationResource extends Resource
         ];
     }
 
+    public static function getNavigationLabel(): string
+    {
+        return 'Scan Pallet';
+    }
+
     public static function getPages(): array
     {
         return [

app/Filament/Resources/ReworkLocatorInvoiceValidationResource.php

@@ -38,6 +38,8 @@ class ReworkLocatorInvoiceValidationResource extends Resource
 
     protected static ?string $navigationGroup = 'Export Dispatch';
 
+    protected static ?int $navigationSort = 7;
+
     public static function form(Form $form): Form
     {
         return $form
@@ -241,6 +243,7 @@ class ReworkLocatorInvoiceValidationResource extends Resource
                     }),
                 Tables\Columns\TextColumn::make('plant.name')
                     ->label('Plant')
+                    ->alignCenter()
                     ->sortable(),
                 Tables\Columns\TextColumn::make('invoice_number')
                     ->label('Invoice Number')
@@ -314,11 +317,15 @@ class ReworkLocatorInvoiceValidationResource extends Resource
             ->headerActions([
                 ImportAction::make()
                     ->importer(ReworkLocatorInvoiceValidationImporter::class)
+                    ->label('Import Rework Invoice')
+                    ->color('warning')
                     ->visible(function() {
                         return Filament::auth()->user()->can('view import rework invoice validation');
                     }),
                 ExportAction::make()
                     ->exporter(ReworkLocatorInvoiceValidationExporter::class)
+                    ->label('Export Rework Invoice')
+                    ->color('warning')
                     ->visible(function() {
                         return Filament::auth()->user()->can('view export rework invoice validation');
                     }),
@@ -531,6 +538,11 @@ class ReworkLocatorInvoiceValidationResource extends Resource
         ];
     }
 
+    public static function getNavigationLabel(): string
+    {
+        return 'Scan Rework';
+    }
+
     public static function getPages(): array
     {
         return [
@@ -540,10 +552,6 @@ class ReworkLocatorInvoiceValidationResource extends Resource
             'edit' => Pages\EditReworkLocatorInvoiceValidation::route('/{record}/edit'),
         ];
     }
-    public static function getNavigationLabel(): string
-    {
-        return 'Rework Invoice / Pallet';
-    }
 
     public static function getEloquentQuery(): Builder
     {

app/Http/Controllers/TestingPanelController.php

@@ -366,7 +366,6 @@ class TestingPanelController extends Controller
         $expectedToken = $expectedUser . ':' . $expectedPw;
 
         //$data = $request->all();
-
         if ("Bearer " . $expectedToken != $header_auth)
         {
             return response()->json([