Merge pull request 'changed regex logic in panel box valiation resource page' (#1296) from ranjith-dev into master
Some checks failed
Scan for leaked secrets using Kingfisher / kingfisher-secrets-scan (push) Has been cancelled
Some checks failed
Scan for leaked secrets using Kingfisher / kingfisher-secrets-scan (push) Has been cancelled
Reviewed-on: #1296
This commit was merged in pull request #1296.
This commit is contained in:
@@ -561,11 +561,11 @@ class PanelBoxValidationResource extends Resource
|
|||||||
{
|
{
|
||||||
$parts = explode('/', $state);
|
$parts = explode('/', $state);
|
||||||
|
|
||||||
if (count($parts) < 3) {
|
if (count($parts) < 4) {
|
||||||
|
|
||||||
Notification::make()
|
Notification::make()
|
||||||
->title('Invalid QR Format')
|
->title('Invalid QR Format')
|
||||||
->body('Expected format: plantcode/itemcode/yearmm/serialnumber (Or) plantcode/panelboxcode/serialnumber')
|
->body('Expected format: plantcode/itemcode/yearmm/serialnumber')
|
||||||
->danger()
|
->danger()
|
||||||
->send();
|
->send();
|
||||||
$set('item_id', null);
|
$set('item_id', null);
|
||||||
@@ -580,7 +580,7 @@ class PanelBoxValidationResource extends Resource
|
|||||||
$itemCode = $panelBoxCode;
|
$itemCode = $panelBoxCode;
|
||||||
$serialNumber = $panelBoxSerialNo;
|
$serialNumber = $panelBoxSerialNo;
|
||||||
|
|
||||||
if (strlen($serialNumber) > 30) {
|
if (strlen($serialNumber) > 15) {
|
||||||
Notification::make()
|
Notification::make()
|
||||||
->title('Invalid Serial Number')
|
->title('Invalid Serial Number')
|
||||||
->body("Serial number cannot be greater than 30 characters. Current length: " . strlen($panelBoxSerialNo))
|
->body("Serial number cannot be greater than 30 characters. Current length: " . strlen($panelBoxSerialNo))
|
||||||
|
|||||||
Reference in New Issue
Block a user