Merge pull request 'removed unique logic in gr master resource page' (#1442) from ranjith-dev into master
All checks were successful
Scan for leaked secrets using Kingfisher / kingfisher-secrets-scan (push) Successful in 26s
All checks were successful
Scan for leaked secrets using Kingfisher / kingfisher-secrets-scan (push) Successful in 26s
Reviewed-on: #1442
This commit was merged in pull request #1442.
This commit is contained in:
@@ -74,12 +74,7 @@ class GrMasterResource extends Resource
|
|||||||
Forms\Components\TextInput::make('gr_number')
|
Forms\Components\TextInput::make('gr_number')
|
||||||
->label('GR Number')
|
->label('GR Number')
|
||||||
->minLength(7)
|
->minLength(7)
|
||||||
->required()
|
->required(),
|
||||||
->rule(function (Get $get) {
|
|
||||||
return Rule::unique('gr_masters', 'gr_number')
|
|
||||||
->where('plant_id', $get('plant_id'))
|
|
||||||
->ignore($get('id'));
|
|
||||||
}),
|
|
||||||
Forms\Components\TextInput::make('serial_number')
|
Forms\Components\TextInput::make('serial_number')
|
||||||
->label('Serial Number')
|
->label('Serial Number')
|
||||||
->rule(function (callable $get) {
|
->rule(function (callable $get) {
|
||||||
@@ -105,11 +100,16 @@ class GrMasterResource extends Resource
|
|||||||
$uploaded = reset($uploadedFiles);
|
$uploaded = reset($uploadedFiles);
|
||||||
|
|
||||||
if ($uploaded instanceof TemporaryUploadedFile) {
|
if ($uploaded instanceof TemporaryUploadedFile) {
|
||||||
|
$plantId = $get('plant_id');
|
||||||
$grNumber = $get('gr_number');
|
$grNumber = $get('gr_number');
|
||||||
|
$itemId = $get('item_id');
|
||||||
|
|
||||||
|
$itemCode = Item::where('plant_id', $plantId)->where('id', $itemId)->first();
|
||||||
|
|
||||||
$safeName = preg_replace('/[^A-Za-z0-9_\-]/', '_', $grNumber);
|
$safeName = preg_replace('/[^A-Za-z0-9_\-]/', '_', $grNumber);
|
||||||
// $originalName = $uploaded->getClientOriginalName();
|
// $originalName = $uploaded->getClientOriginalName();
|
||||||
// $path = 'uploads/GRNumber/' . $originalName;
|
// $path = 'uploads/GRNumber/' . $originalName;
|
||||||
$finalFileName = $safeName.'.pdf';
|
$finalFileName = $safeName . '-' . $itemCode->code . '.pdf';
|
||||||
$finalPath = 'uploads/GRNumber/'.$finalFileName;
|
$finalPath = 'uploads/GRNumber/'.$finalFileName;
|
||||||
|
|
||||||
if (Storage::disk('local')->exists($finalPath)) {
|
if (Storage::disk('local')->exists($finalPath)) {
|
||||||
|
|||||||
Reference in New Issue
Block a user