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

Merge pull request 'Added logic to tube sticker panel and warranty panel in panel box validation' (#995) from ranjith-dev into master
All checks were successful
Scan for leaked secrets using Kingfisher / kingfisher-secrets-scan (push) Successful in 15s
Details

Browse Source 
Reviewed-on: #995
This commit was merged in pull request #995.
This commit is contained in:
jothi
2026-09-08 09:50:55 +00:00
parent e5bdedbe3c 3f6852c5de
commit e3f870960b
1 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
app/Filament/Resources/PanelBoxValidationResource.php
View File

@@ -1254,7 +1254,7 @@ class PanelBoxValidationResource extends Resource
return;
}
$parts = explode('/', $state);
$parts = explode('/', $state);
if (count($parts) < 3) {
@@ -1331,18 +1331,20 @@ class PanelBoxValidationResource extends Resource
return;
}
if (!preg_match('/^\d+\/\d+\/\d+\/\d+$/', $state)) {
$parts = explode('/', $state);
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('serial_number_panel_qr', null);
$set('item_id', null);
return;
}
$parts = explode('/', $state);
$extracted = trim(end($parts));
$extracted = trim(implode('/', array_slice($parts, 2)));
if ($extracted == '') {
$set('tubeStickerPanelError', "SerialNumber can't be empty!");
@@ -1361,13 +1363,13 @@ class PanelBoxValidationResource extends Resource
$set('tubeStickerPanelError', null);
$set('tube_sticker_panel_qr', $extracted);
$set('tube_sticker_panel', '1');
$panelParts = array_map('trim', explode('/', $state));
$panelParts = explode('/', $state);
if (count($panelParts) != 4) {
if (count($panelParts) < 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);
@@ -1376,9 +1378,7 @@ class PanelBoxValidationResource extends Resource
$supplier = $panelParts[0];
$panelBoxCode = $panelParts[1];
$yearMonth = $panelParts[2];
$serialNumber = $panelParts[3];
$panelBoxSerialNo = $yearMonth . $serialNumber;
$panelBoxSerialNo = implode('/', array_slice($panelParts, 2));
$set('panel_box_supplier', $supplier);
$set('panel_box_serial_number', $panelBoxSerialNo);
@@ -1407,18 +1407,20 @@ class PanelBoxValidationResource extends Resource
return;
}
if (!preg_match('/^\d+\/\d+\/\d+\/\d+$/', $state)) {
$parts = explode('/', $state);
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('serial_number_panel_qr', null);
$set('item_id', null);
return;
}
$parts = explode('/', $state);
$extracted = trim(end($parts));
$extracted = trim(implode('/', array_slice($parts, 2)));
if ($extracted == '') {
$set('warrantyCardPanelError', "SerialNumber can't be empty!");
@@ -1437,13 +1439,13 @@ class PanelBoxValidationResource extends Resource
$set('warrantyCardPanelError', null);
$set('warranty_card_qr', $extracted);
$set('warranty_card_panel', '1');
$panelParts = array_map('trim', explode('/', $state));
$panelParts = explode('/', $state);
if (count($panelParts) != 4) {
if (count($panelParts) < 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);
@@ -1452,9 +1454,7 @@ class PanelBoxValidationResource extends Resource
$supplier = $panelParts[0];
$panelBoxCode = $panelParts[1];
$yearMonth = $panelParts[2];
$serialNumber = $panelParts[3];
$panelBoxSerialNo = $yearMonth . $serialNumber;
$panelBoxSerialNo = implode('/', array_slice($panelParts, 2));
$set('panel_box_supplier', $supplier);
$set('panel_box_serial_number', $panelBoxSerialNo);