Merge pull request 'changed part validation uploaded image logic in sticker master' (#98) from ranjith-dev into master
All checks were successful
Scan for leaked secrets using Kingfisher / kingfisher-secrets-scan (push) Successful in 14s
All checks were successful
Scan for leaked secrets using Kingfisher / kingfisher-secrets-scan (push) Successful in 14s
Reviewed-on: #98
This commit was merged in pull request #98.
This commit is contained in:
@@ -844,50 +844,56 @@ class StickerMasterResource extends Resource
|
|||||||
|
|
||||||
$plantCode = $plant->code;
|
$plantCode = $plant->code;
|
||||||
|
|
||||||
$sticker = StickerMaster::where('plant_id', $plantId)
|
// $sticker = StickerMaster::where('plant_id', $plantId)
|
||||||
->where('item_id', $itemId)
|
// ->where('item_id', $itemId)
|
||||||
->first();
|
// ->first();
|
||||||
|
|
||||||
if (! $sticker) {
|
// if (! $sticker) {
|
||||||
Notification::make()
|
// Notification::make()
|
||||||
->title('Unknown Sticker Master')
|
// ->title('Unknown Sticker Master')
|
||||||
->body('Sticker Master data not found.')
|
// ->body('Sticker Master data not found.')
|
||||||
->danger()
|
// ->danger()
|
||||||
->seconds(2)
|
// ->seconds(2)
|
||||||
->send();
|
// ->send();
|
||||||
}
|
// }
|
||||||
|
|
||||||
$value = $sticker->{$column};
|
// $value = $sticker->{$column};
|
||||||
|
|
||||||
if (empty($value)) {
|
// if (empty($value)) {
|
||||||
Notification::make()
|
// Notification::make()
|
||||||
->title('Unknown Part validation')
|
// ->title('Unknown Part validation')
|
||||||
->body("Selected validation '$column' has no value.")
|
// ->body("Selected validation '$column' has no value.")
|
||||||
->danger()
|
// ->danger()
|
||||||
->seconds(2)
|
// ->seconds(2)
|
||||||
->send();
|
// ->send();
|
||||||
}
|
// }
|
||||||
|
|
||||||
$newFileName = $value.'.png';
|
// $newFileName = $value.'.png';
|
||||||
|
|
||||||
$directory = "uploads/PartValidation/{$plantCode}";
|
$originalName = $uploadedFile->getClientOriginalName();
|
||||||
|
$directory = 'uploads/PartValidation';
|
||||||
|
|
||||||
$disk = Storage::disk('local');
|
$disk = Storage::disk('local');
|
||||||
if (! $disk->exists($directory)) {
|
if (! $disk->exists($directory)) {
|
||||||
$disk->makeDirectory($directory, 0755, true);
|
$disk->makeDirectory($directory, 0755, true);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// $fullPath = Storage::disk('local')->path($directory);
|
||||||
|
|
||||||
|
// $directory = "uploads/PartValidation/{$plantCode}";
|
||||||
|
|
||||||
|
// $disk = Storage::disk('local');
|
||||||
|
// if (! $disk->exists($directory)) {
|
||||||
|
// $disk->makeDirectory($directory, 0755, true);
|
||||||
|
// }
|
||||||
|
|
||||||
// $path = $uploadedFile->storeAs(
|
// $path = $uploadedFile->storeAs(
|
||||||
// $directory,
|
// $directory,
|
||||||
// $newFileName,
|
// $newFileName,
|
||||||
// 'local'
|
// 'local'
|
||||||
// );
|
// );
|
||||||
try {
|
try {
|
||||||
$path = $uploadedFile->storeAs(
|
$path = $disk->putFileAs($directory, $uploadedFile, $originalName);
|
||||||
$directory,
|
|
||||||
$newFileName,
|
|
||||||
'local'
|
|
||||||
);
|
|
||||||
} catch (\Exception $e) {
|
} catch (\Exception $e) {
|
||||||
Notification::make()
|
Notification::make()
|
||||||
->title('Upload Failed')
|
->title('Upload Failed')
|
||||||
|
|||||||
Reference in New Issue
Block a user