From 4de8a306eaaf9e75104c68a34fc81e4a6fdbe3cb Mon Sep 17 00:00:00 2001 From: dhanabalan Date: Thu, 30 Apr 2026 15:44:39 +0530 Subject: [PATCH] Updated plant code length should be 4 to 7 --- app/Filament/Imports/PlantImporter.php | 2 +- app/Filament/Imports/ProcessOrderImporter.php | 2 +- app/Filament/Imports/ProductionOrderImporter.php | 2 +- app/Filament/Imports/StickerMasterImporter.php | 10 ++++++++-- app/Http/Controllers/StickerMasterController.php | 4 ++-- 5 files changed, 13 insertions(+), 7 deletions(-) diff --git a/app/Filament/Imports/PlantImporter.php b/app/Filament/Imports/PlantImporter.php index 10a0762..5101126 100644 --- a/app/Filament/Imports/PlantImporter.php +++ b/app/Filament/Imports/PlantImporter.php @@ -66,7 +66,7 @@ class PlantImporter extends Importer $warnMsg[] = 'Code should contain only numeric values!'; } elseif (Str::length($code) < 4 || Str::length($code) > 7) { $warnMsg[] = 'Code must be between 4 and 7 digits only!'; - } elseif (! preg_match('/^[1-9]\d{6,}$/', $code)) { + } elseif (! preg_match('/^[1-9]\d{3,6}$/', $code)) { $warnMsg[] = 'Invalid plant code found!'; } if ($name == null || $name == '' || ! $name) { diff --git a/app/Filament/Imports/ProcessOrderImporter.php b/app/Filament/Imports/ProcessOrderImporter.php index abcd15f..24b2f06 100644 --- a/app/Filament/Imports/ProcessOrderImporter.php +++ b/app/Filament/Imports/ProcessOrderImporter.php @@ -127,7 +127,7 @@ class ProcessOrderImporter extends Importer if ($plantCod == null || $plantCod == '') { $warnMsg[] = "Plant code can't be empty!"; - } elseif (Str::length($plantCod) < 4 || ! is_numeric($plantCod) || ! preg_match('/^[1-9]\d{3,}$/', $plantCod)) { + } elseif (Str::length($plantCod) < 4 || ! is_numeric($plantCod) || ! preg_match('/^[1-9]\d{3,6}$/', $plantCod)) { $warnMsg[] = 'Invalid plant code found'; } if ($iCode == null || $iCode == '') { diff --git a/app/Filament/Imports/ProductionOrderImporter.php b/app/Filament/Imports/ProductionOrderImporter.php index 59d30fc..c09d8d6 100644 --- a/app/Filament/Imports/ProductionOrderImporter.php +++ b/app/Filament/Imports/ProductionOrderImporter.php @@ -100,7 +100,7 @@ class ProductionOrderImporter extends Importer $warnMsg[] = 'Plant code should contain only numeric values!'; } elseif (Str::length($plantCod) < 4 || Str::length($plantCod) > 7) { $warnMsg[] = 'Plant code must be between 4 and 7 digits only!'; - } elseif (! preg_match('/^[1-9]\d{6,}$/', $plantCod)) { + } elseif (! preg_match('/^[1-9]\d{3,6}$/', $plantCod)) { $warnMsg[] = 'Invalid plant code found!'; } diff --git a/app/Filament/Imports/StickerMasterImporter.php b/app/Filament/Imports/StickerMasterImporter.php index 029008a..6d24a26 100644 --- a/app/Filament/Imports/StickerMasterImporter.php +++ b/app/Filament/Imports/StickerMasterImporter.php @@ -182,8 +182,14 @@ class StickerMasterImporter extends Importer $createdBy = Filament::auth()->user()->name; $updatedBy = Filament::auth()->user()->name; - if (Str::length($plantCod) < 4 || ! is_numeric($plantCod) || ! preg_match('/^[1-9]\d{3,}$/', $plantCod)) { - $warnMsg[] = 'Invalid plant code found'; + if ($plantCod == null || $plantCod == '') { + $warnMsg[] = "Plant code can't be empty!"; + } elseif (! is_numeric($plantCod)) { + $warnMsg[] = 'Plant code should contain only numeric values!'; + } elseif (Str::length($plantCod) < 4 || Str::length($plantCod) > 7) { + $warnMsg[] = 'Plant code must be between 4 and 7 digits only!'; + } elseif (! preg_match('/^[1-9]\d{3,6}$/', $plantCod)) { + $warnMsg[] = 'Invalid plant code found!'; } else { $plant = Plant::where('code', $plantCod)->first(); } diff --git a/app/Http/Controllers/StickerMasterController.php b/app/Http/Controllers/StickerMasterController.php index a349987..6eec0c7 100644 --- a/app/Http/Controllers/StickerMasterController.php +++ b/app/Http/Controllers/StickerMasterController.php @@ -58,7 +58,7 @@ class StickerMasterController extends Controller 'status_code' => 'ERROR', 'status_description' => 'Plant code must be between 4 and 7 digits only!', ], 400); - } elseif (! preg_match('/^[1-9]\d{3,}$/', $plantCode)) { + } elseif (! preg_match('/^[1-9]\d{3,6}$/', $plantCode)) { return response()->json([ 'status_code' => 'ERROR', 'status_description' => 'Invalid plant code found!', @@ -190,7 +190,7 @@ class StickerMasterController extends Controller 'status_code' => 'ERROR', 'status_description' => 'Plant code must be between 4 and 7 digits only!', ], 400); - } elseif (! preg_match('/^[1-9]\d{3,}$/', $plantCode)) { + } elseif (! preg_match('/^[1-9]\d{3,6}$/', $plantCode)) { return response()->json([ 'status_code' => 'ERROR', 'status_description' => 'Invalid plant code found!', -- 2.49.1