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

Update serial number validation regex to allow optional trailing pipe character

Browse Source
This commit is contained in:
dhanabalan
2025-10-16 14:54:14 +05:30
parent d79c7101b4
commit 52cd51d7d1
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
app/Filament/Resources/SerialValidationResource/Pages/CreateSerialValidation.php
View File

@@ -2311,7 +2311,7 @@ class CreateSerialValidation extends CreateRecord
$plantId = $this->form->getState()['plant_id']; $plantId = $this->form->getState()['plant_id'];
$this->plantId = $plantId; $this->plantId = $plantId;
if (!preg_match('/^([a-zA-Z0-9]{6,})\|([1-9][a-zA-Z0-9]{8,})(?:\/[MmPpCc])?$/', $serNo, $matches)) if (!preg_match('/^([a-zA-Z0-9]{6,})\|([1-9][a-zA-Z0-9]{8,})(?:\/[MmPpCc])?\|?$/', $serNo, $matches))
{ {
Notification::make() Notification::make()
->danger() ->danger()
@@ -2333,7 +2333,7 @@ class CreateSerialValidation extends CreateRecord
return; return;
} }
if (preg_match('/^([a-zA-Z0-9]{6,})\|([1-9][a-zA-Z0-9]{8,})(?:\/[MmPpCc])?$/', $serNo, $matches)) if (preg_match('/^([a-zA-Z0-9]{6,})\|([1-9][a-zA-Z0-9]{8,})(?:\/[MmPpCc])?\|?$/', $serNo, $matches))
{ {
$itemCode = $matches[1]; $itemCode = $matches[1];
$serialNumber = $matches[2]; $serialNumber = $matches[2];
@@ -2342,13 +2342,13 @@ class CreateSerialValidation extends CreateRecord
// $isMarkM = preg_match('/\/[Mm]$/', $serialNumber); // $isMarkM = preg_match('/\/[Mm]$/', $serialNumber);
// $isMarkP = preg_match('/\/[Pp]$/', $serialNumber); // $isMarkP = preg_match('/\/[Pp]$/', $serialNumber);
// $isMarkC = preg_match('/\/[Cc]$/', $serialNumber); // $isMarkC = preg_match('/\/[Cc]$/', $serialNumber);
$isMarkM = preg_match('/^([a-zA-Z0-9]{6,})\|([1-9][a-zA-Z0-9]{8,})\/[Mm]?$/', $serNo) ? true : false; $isMarkM = preg_match('/^([a-zA-Z0-9]{6,})\|([1-9][a-zA-Z0-9]{8,})\/[Mm]?\|?$/', $serNo) ? true : false;
$isMarkP = preg_match('/^([a-zA-Z0-9]{6,})\|([1-9][a-zA-Z0-9]{8,})\/[Pp]?$/', $serNo) ? true : false; $isMarkP = preg_match('/^([a-zA-Z0-9]{6,})\|([1-9][a-zA-Z0-9]{8,})\/[Pp]?\|?$/', $serNo) ? true : false;
$isMarkC = preg_match('/^([a-zA-Z0-9]{6,})\|([1-9][a-zA-Z0-9]{8,})\/[Cc]?$/', $serNo) ? true : false; $isMarkC = preg_match('/^([a-zA-Z0-9]{6,})\|([1-9][a-zA-Z0-9]{8,})\/[Cc]?\|?$/', $serNo) ? true : false;
$isMarkPs = (!$isMarkM && !$isMarkP && !$isMarkC) ? true : false; $isMarkPs = (!$isMarkM && !$isMarkP && !$isMarkC) ? true : false;
//dd($serialNumber, $isMarkM, $isMarkP, $isMarkC, $isMarkPs); //dd($serialNumber, $isMarkM, $isMarkP, $isMarkC, $isMarkPs);
$serialNumber = preg_replace('/\/[MmPpCc]$/', '', $serialNumber); $serialNumber = preg_replace('/\/[MmPpCc]?\|$/', '', $serialNumber);
$record = SerialValidation::where('serial_number', $serialNumber)->where('plant_id', $plantId)->first(); $record = SerialValidation::where('serial_number', $serialNumber)->where('plant_id', $plantId)->first();
@@ -2378,7 +2378,6 @@ class CreateSerialValidation extends CreateRecord
$totQuan = SerialValidation::where('invoice_number', $invoiceNumber)->where('plant_id', $plantId)->count(); $totQuan = SerialValidation::where('invoice_number', $invoiceNumber)->where('plant_id', $plantId)->count();
$scanSQuan = SerialValidation::where('invoice_number', $invoiceNumber)->where('scanned_status', 'Scanned')->where('plant_id', $plantId)->count(); $scanSQuan = SerialValidation::where('invoice_number', $invoiceNumber)->where('scanned_status', 'Scanned')->where('plant_id', $plantId)->count();
$record = SerialValidation::where('serial_number', $serialNumber) $record = SerialValidation::where('serial_number', $serialNumber)
->where('plant_id', $plantId) ->where('plant_id', $plantId)
->whereHas('stickerMasterRelation.item', function ($query) use ($itemCode) { ->whereHas('stickerMasterRelation.item', function ($query) use ($itemCode) {