Merge pull request 'Added logic in both edit and view production order page' (#624) 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: #624
This commit was merged in pull request #624.
This commit is contained in:
@@ -94,7 +94,7 @@ class EditProductionOrder extends EditRecord
|
||||
$pOrder = trim($this->form->getState()['production_order'] ?? '') ?? null;
|
||||
|
||||
$plantId = trim($this->form->getState()['plant_id'] ?? '') ?? null;
|
||||
|
||||
$plantCode = Plant::where('id', $plantId)->value('code');
|
||||
if (empty($plantId)) {
|
||||
Notification::make()
|
||||
->title('Plant name cannot be empty!')
|
||||
@@ -118,7 +118,7 @@ class EditProductionOrder extends EditRecord
|
||||
->send();
|
||||
return;
|
||||
} else {
|
||||
return redirect()->route('production-orders.printItemSerial', ['production_order' => $pOrder]);
|
||||
return redirect()->route('production-orders.printItemSerial', ['production_order' => $pOrder, 'plant_code' => $plantCode]);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -95,6 +95,8 @@ class ViewProductionOrder extends ViewRecord
|
||||
|
||||
$plantId = trim($this->form->getState()['plant_id'] ?? '') ?? null;
|
||||
|
||||
$plantCode = Plant::where('id', $plantId)->value('code');
|
||||
|
||||
if (empty($plantId)) {
|
||||
Notification::make()
|
||||
->title('Plant name cannot be empty!')
|
||||
@@ -118,12 +120,10 @@ class ViewProductionOrder extends ViewRecord
|
||||
->send();
|
||||
return;
|
||||
} else {
|
||||
return redirect()->route('production-orders.printItemSerial', ['production_order' => $pOrder]);
|
||||
return redirect()->route('production-orders.printItemSerial', ['production_order' => $pOrder, 'plant_code' => $plantCode]);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
protected function getHeaderActions(): array
|
||||
{
|
||||
return [
|
||||
|
||||
Reference in New Issue
Block a user