diff --git a/app/Filament/Resources/SerialValidationResource/Pages/CreateSerialValidation.php b/app/Filament/Resources/SerialValidationResource/Pages/CreateSerialValidation.php index 15eea23..80197d4 100644 --- a/app/Filament/Resources/SerialValidationResource/Pages/CreateSerialValidation.php +++ b/app/Filament/Resources/SerialValidationResource/Pages/CreateSerialValidation.php @@ -2311,7 +2311,7 @@ class CreateSerialValidation extends CreateRecord $plantId = $this->form->getState()['plant_id']; $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() ->danger() @@ -2333,7 +2333,7 @@ class CreateSerialValidation extends CreateRecord 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]; $serialNumber = $matches[2]; @@ -2342,13 +2342,13 @@ class CreateSerialValidation extends CreateRecord // $isMarkM = preg_match('/\/[Mm]$/', $serialNumber); // $isMarkP = preg_match('/\/[Pp]$/', $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; - $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; + $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; + $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; //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(); @@ -2378,7 +2378,6 @@ class CreateSerialValidation extends CreateRecord $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(); - $record = SerialValidation::where('serial_number', $serialNumber) ->where('plant_id', $plantId) ->whereHas('stickerMasterRelation.item', function ($query) use ($itemCode) {