diff --git a/app/Http/Controllers/QrController.php b/app/Http/Controllers/QrController.php index 41f14aa..561663f 100644 --- a/app/Http/Controllers/QrController.php +++ b/app/Http/Controllers/QrController.php @@ -61,4 +61,16 @@ class QrController extends Controller $qr = QrCode::format('png')->size(200)->generate($url); Storage::put($dir . '/qr.png', $qr); } + + public function qrImage($type, $id) + { + $dbType = $type === 'auto' ? 'auto_' : 'estate_'; + $path = storage_path('app/public/attachments/' . $dbType . $id . '/qr.png'); + + if (!file_exists($path)) { + abort(404); + } + + return response()->file($path); + } } diff --git a/resources/views/auto/show.blade.php b/resources/views/auto/show.blade.php index 38ca5df..eba5551 100755 --- a/resources/views/auto/show.blade.php +++ b/resources/views/auto/show.blade.php @@ -121,7 +121,7 @@ {{ __('translation.conclusions') }}
- @if(in_array($order->status,[\App\Enums\OrderStatusEnum::STARTED->name,\App\Enums\OrderStatusEnum::REJECTED->name, \App\Enums\OrderStatusEnum::FINISHED->name]) || in_array(Auth::user()?->role, ['admin', \App\Enums\RoleEnum::MANAGER->name])) + @if($conclusions->count() > 0) @@ -129,14 +129,14 @@ Tayyor xulosani yuklab olish @endif - @if(in_array($order->status,[\App\Enums\OrderStatusEnum::STARTED->name,\App\Enums\OrderStatusEnum::REJECTED->name]) && ($isAppraisers || in_array(Auth::user()?->role, ['admin', \App\Enums\RoleEnum::MANAGER->name]))) - status, [\App\Enums\OrderStatusEnum::APPROVED->value, \App\Enums\OrderStatusEnum::MODERATED->value]) && (in_array(Auth::user()?->role, ['admin', 'manager']) || $isAppraisers)) + {{ __('translation.upload') }} @endif - @if($order->status == \App\Enums\OrderStatusEnum::FINISHED->name && in_array(Auth::user()?->role,['admin',\App\Enums\RoleEnum::MANAGER->name])) + @if($order->status == \App\Enums\OrderStatusEnum::FINISHED->value && in_array(Auth::user()?->role, ['admin', 'manager']))