Merge pull request 'changed regex qr code format for panel box' (#892) from ranjith-dev into master
All checks were successful
Scan for leaked secrets using Kingfisher / kingfisher-secrets-scan (push) Successful in 29s

Reviewed-on: #892
This commit was merged in pull request #892.
This commit is contained in:
2026-08-12 12:20:48 +00:00

View File

@@ -179,6 +179,7 @@ class PanelBoxValidationResource extends Resource
->live()
->afterStateUpdated(function (callable $set, callable $get, ?string $state) {
$state = trim($state);
$pId = $get('line_id');
$plantId = $get('plant_id');
$plaCode = Plant::find($plantId)?->code;
@@ -507,45 +508,27 @@ class PanelBoxValidationResource extends Resource
}
elseif (str_contains($state, '/'))
{
$parts = array_map('trim', explode('/', $state));
$parts = explode('/', $state);
if (count($parts) != 4) {
if (count($parts) < 3) {
Notification::make()
->title('Invalid QR Format')
->body('Expected format: plantcode/itemcode/yearmm/serialnumber')
->body('Expected format: plantcode/itemcode/yearmm/serialnumber (Or) plantcode/panelboxcode/serialnumber')
->danger()
->send();
$set('item_id', null);
return;
}
$plantCode = $parts[0];
$itemCode = $parts[1];
$yearMonth = $parts[2];
$serialNumber = $parts[3];
$supplier = $parts[0];
$panelBoxCode = $parts[1];
$yearMonth = $parts[2];
$serialNumber = $parts[3];
$panelBoxSerialNo = $parts[2] . $parts[3];
$panelBoxSerialNo = implode('/', array_slice($parts, 2)); // Keep rest of the string
if($serialNumber == '' || $serialNumber == null){
Notification::make()
->title('Unknown Serial number')
->body("Serial number can't be empty!")
->danger()
->send();
$set('item_id', null);
return;
}
if (! ctype_alnum($serialNumber)) {
$set('validationError', 'Serial Number should contain alpha-numeric values.');
$set('item_id', null);
return;
}
$itemCode = $panelBoxCode;
$serialNumber = $panelBoxSerialNo;
$existInMasterPo = PanelGrMaster::where('document_number', $pOrder)->where('plant_id', $plantId)->first();