Merge pull request 'ranjith-dev' (#1299) from ranjith-dev into master
All checks were successful
Scan for leaked secrets using Kingfisher / kingfisher-secrets-scan (push) Successful in 19s
All checks were successful
Scan for leaked secrets using Kingfisher / kingfisher-secrets-scan (push) Successful in 19s
Reviewed-on: #1299
This commit was merged in pull request #1299.
This commit is contained in:
@@ -288,11 +288,11 @@ class PanelBoxInspectionStock extends Page
|
|||||||
{
|
{
|
||||||
$parts = explode('/', $itemId);
|
$parts = explode('/', $itemId);
|
||||||
|
|
||||||
if (count($parts) < 4) {
|
if (!preg_match('/^\d+\/\d+\/\d{4}\/\d+$/', $itemId) || preg_match('/[a-zA-Z]/', $itemId)) {
|
||||||
|
|
||||||
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 : $itemId")
|
||||||
->danger()
|
->danger()
|
||||||
->send();
|
->send();
|
||||||
$this->form->fill([
|
$this->form->fill([
|
||||||
@@ -358,10 +358,11 @@ class PanelBoxInspectionStock extends Page
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else {
|
else
|
||||||
|
{
|
||||||
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();
|
||||||
$this->form->fill([
|
$this->form->fill([
|
||||||
|
|||||||
@@ -327,7 +327,6 @@ class InvoiceValidationResource extends Resource
|
|||||||
->alignCenter(),
|
->alignCenter(),
|
||||||
Tables\Columns\TextColumn::make('panel_box_serial_number')
|
Tables\Columns\TextColumn::make('panel_box_serial_number')
|
||||||
->label('Panel Box Serial Number')
|
->label('Panel Box Serial Number')
|
||||||
->searchable()
|
|
||||||
->alignCenter(),
|
->alignCenter(),
|
||||||
Tables\Columns\TextColumn::make('load_rate')
|
Tables\Columns\TextColumn::make('load_rate')
|
||||||
->label('Load Rate')
|
->label('Load Rate')
|
||||||
|
|||||||
Reference in New Issue
Block a user