changed regex qr code format for panel box
Some checks failed
Scan for leaked secrets using Kingfisher / kingfisher-secrets-scan (push) Successful in 29s
Gemini PR Review / Gemini PR Review (pull_request) Failing after 19s
Scan for leaked secrets using Kingfisher / kingfisher-secrets-scan (pull_request) Successful in 26s
Laravel Pint / pint (pull_request) Successful in 5m7s
Laravel Larastan / larastan (pull_request) Failing after 5m40s
Some checks failed
Scan for leaked secrets using Kingfisher / kingfisher-secrets-scan (push) Successful in 29s
Gemini PR Review / Gemini PR Review (pull_request) Failing after 19s
Scan for leaked secrets using Kingfisher / kingfisher-secrets-scan (pull_request) Successful in 26s
Laravel Pint / pint (pull_request) Successful in 5m7s
Laravel Larastan / larastan (pull_request) Failing after 5m40s
This commit is contained in:
@@ -179,6 +179,7 @@ class PanelBoxValidationResource extends Resource
|
|||||||
->live()
|
->live()
|
||||||
->afterStateUpdated(function (callable $set, callable $get, ?string $state) {
|
->afterStateUpdated(function (callable $set, callable $get, ?string $state) {
|
||||||
|
|
||||||
|
$state = trim($state);
|
||||||
$pId = $get('line_id');
|
$pId = $get('line_id');
|
||||||
$plantId = $get('plant_id');
|
$plantId = $get('plant_id');
|
||||||
$plaCode = Plant::find($plantId)?->code;
|
$plaCode = Plant::find($plantId)?->code;
|
||||||
@@ -507,45 +508,27 @@ class PanelBoxValidationResource extends Resource
|
|||||||
}
|
}
|
||||||
elseif (str_contains($state, '/'))
|
elseif (str_contains($state, '/'))
|
||||||
{
|
{
|
||||||
$parts = array_map('trim', explode('/', $state));
|
$parts = explode('/', $state);
|
||||||
|
|
||||||
if (count($parts) != 4) {
|
if (count($parts) < 3) {
|
||||||
|
|
||||||
Notification::make()
|
Notification::make()
|
||||||
->title('Invalid QR Format')
|
->title('Invalid QR Format')
|
||||||
->body('Expected format: plantcode/itemcode/yearmm/serialnumber')
|
->body('Expected format: plantcode/itemcode/yearmm/serialnumber (Or) plantcode/panelboxcode/serialnumber')
|
||||||
->danger()
|
->danger()
|
||||||
->send();
|
->send();
|
||||||
$set('item_id', null);
|
$set('item_id', null);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
$plantCode = $parts[0];
|
|
||||||
$itemCode = $parts[1];
|
|
||||||
$yearMonth = $parts[2];
|
|
||||||
$serialNumber = $parts[3];
|
|
||||||
|
|
||||||
$supplier = $parts[0];
|
$supplier = $parts[0];
|
||||||
$panelBoxCode = $parts[1];
|
$panelBoxCode = $parts[1];
|
||||||
$yearMonth = $parts[2];
|
$panelBoxSerialNo = implode('/', array_slice($parts, 2)); // Keep rest of the string
|
||||||
$serialNumber = $parts[3];
|
|
||||||
$panelBoxSerialNo = $parts[2] . $parts[3];
|
|
||||||
|
|
||||||
if($serialNumber == '' || $serialNumber == null){
|
|
||||||
Notification::make()
|
|
||||||
->title('Unknown Serial number')
|
|
||||||
->body("Serial number can't be empty!")
|
|
||||||
->danger()
|
|
||||||
->send();
|
|
||||||
|
|
||||||
$set('item_id', null);
|
$itemCode = $panelBoxCode;
|
||||||
return;
|
$serialNumber = $panelBoxSerialNo;
|
||||||
}
|
|
||||||
if (! ctype_alnum($serialNumber)) {
|
|
||||||
$set('validationError', 'Serial Number should contain alpha-numeric values.');
|
|
||||||
$set('item_id', null);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
$existInMasterPo = PanelGrMaster::where('document_number', $pOrder)->where('plant_id', $plantId)->first();
|
$existInMasterPo = PanelGrMaster::where('document_number', $pOrder)->where('plant_id', $plantId)->first();
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user