Merge pull request 'Changed api logic in get gr pdf' (#1445) from ranjith-dev into master
All checks were successful
Scan for leaked secrets using Kingfisher / kingfisher-secrets-scan (push) Successful in 16s

Reviewed-on: #1445
This commit was merged in pull request #1445.
This commit is contained in:
2026-11-17 07:16:09 +00:00

View File

@@ -454,21 +454,86 @@ class PdfController extends Controller
], 404);
}
$filename = $request->header('gr-number');
$plantCode = $request->header('plant-code');
if (! $filename) {
$grNumber = $request->header('gr-number');
$sNo = $request->header('serial-number');
if (! $plantCode) {
return response()->json([
'status_code' => 'ERROR',
'status_description' => 'Plant code cannot be empty!',
], 404);
}else if (! $grNumber) {
return response()->json([
'status_code' => 'ERROR',
'status_description' => 'Gr Number cannot be empty!',
], 404);
// return response()->json(['error' => 'Missing file-name header'], 404);
}
else if (! $sNo) {
return response()->json([
'status_code' => 'ERROR',
'status_description' => 'Serial Number cannot be empty!',
], 404);
}
$filename = basename($filename);
$plantId = Plant::where('code', $plantCode)->first();
if(!$plantId){
return response()->json([
'status_code' => 'ERROR',
'status_description' => "Plant code '$plantCode' not found!",
], 404);
}
$grExists = GrMaster::where('plant_id', $plantId->id)->where('gr_number', $grNumber)->first();
if (! $grExists) {
return response()->json([
'status_code' => 'ERROR',
'status_description' => "GR Number '$grNumber' not found for the given Plant Code '$plantCode'",
], 404);
}
$serialExists = GrMaster::where('plant_id', $plantId->id)->where('gr_number', $grNumber)->where('serial_number', $sNo)->first();
if (! $serialExists) {
return response()->json([
'status_code' => 'ERROR',
'status_description' => "Serial Number '$sNo' not found for the given Plant Code '$plantCode' against gr number '$grNumber'",
], 404);
}
$printStatus = GrMaster::where('plant_id', $plantId->id)->where('gr_number', $grNumber)->where('serial_number', $sNo)->first();
if($printStatus->status == 'Printed'){
return response()->json([
'status_code' => 'ERROR',
'status_description' => "Serial Number '$sNo' already printed for the given Plant Code '$plantCode' against gr number '$grNumber'",
], 404);
}
$itemId = $serialExists->item_id;
$item = Item::where('plant_id', $plantId->id)->where('id', $itemId)->first();
if(!$item){
return response()->json([
'status_code' => 'ERROR',
'status_description' => "Item Code not found for serial number $sNo for the given Plant Code '$plantCode' against gr number '$grNumber'",
], 404);
}
$itemCode = $item->code;
// $filename = basename($filename);
$filename = $grNumber . '-' . $itemCode . '.pdf';
// Ensure the file has .pdf extension
if (! str_ends_with(strtolower($filename), '.pdf')) {
$filename .= '.pdf';
// $filename .= '.pdf';
$filename = $filename . '-' . $itemCode . '.pdf';
}
$filePath = 'uploads/GRNumber/'.$filename;
@@ -477,7 +542,7 @@ class PdfController extends Controller
// return response()->json(['error' => 'File not found'], 404);
return response()->json([
'status_code' => 'ERROR',
'status_description' => 'Pdf File not found for the provided GrNumber!',
'status_description' => "Pdf File not found for the provided GrNumber '$filename'",
], 404);
}
@@ -531,7 +596,7 @@ class PdfController extends Controller
], 404);
}
$grExist = GRMaster::where('gr_number', $grNumber)->first();
$grExist = GrMaster::where('gr_number', $grNumber)->first();
if (! $grExist) {
return response()->json([
@@ -540,7 +605,7 @@ class PdfController extends Controller
], 404);
}
$grExists = GRMaster::where('plant_id', $plantId)
$grExists = GrMaster::where('plant_id', $plantId)
->where('gr_number', $grNumber)
->first();