Merge pull request 'Added logic in panel box validation changed regex pattern' (#1298) from ranjith-dev into master
All checks were successful
Scan for leaked secrets using Kingfisher / kingfisher-secrets-scan (push) Successful in 13s
All checks were successful
Scan for leaked secrets using Kingfisher / kingfisher-secrets-scan (push) Successful in 13s
Reviewed-on: #1298
This commit was merged in pull request #1298.
This commit is contained in:
@@ -561,11 +561,11 @@ class PanelBoxValidationResource extends Resource
|
|||||||
{
|
{
|
||||||
$parts = explode('/', $state);
|
$parts = explode('/', $state);
|
||||||
|
|
||||||
if (count($parts) < 4) {
|
if (!preg_match('/^\d+\/\d+\/\d{4}\/\d+$/', $state) || preg_match('/[a-zA-Z]/', $state)) {
|
||||||
|
|
||||||
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 Format Received : $state")
|
||||||
->danger()
|
->danger()
|
||||||
->send();
|
->send();
|
||||||
$set('item_id', null);
|
$set('item_id', null);
|
||||||
@@ -583,7 +583,7 @@ class PanelBoxValidationResource extends Resource
|
|||||||
if (strlen($serialNumber) > 15) {
|
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 15 characters. Current length: " . strlen($panelBoxSerialNo))
|
||||||
->danger()
|
->danger()
|
||||||
->send();
|
->send();
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user