From 48f7f784b950b95e3f41d3678a1d534c8c309c4d Mon Sep 17 00:00:00 2001
From: husanjon <husanjon@felixits.uz>
Date: Mon, 6 Apr 2026 21:55:50 +0500
Subject: [PATCH] uppercese category qoshildi

---
 app/Http/Controllers/QrController.php           |  12 ++++++++++++
 resources/views/auto/show.blade.php             |   8 ++++----
 resources/views/estate/show.blade.php           |  15 +++++++++++----
 resources/views/qr/auto.blade.php               |   2 +-
 resources/views/qr/estate.blade.php             |   2 +-
 routes/web.php                                  |   1 +
 storage/app/public/attachments/AUTO7884/qr.png  | Bin
 storage/app/public/attachments/auto_7883/qr.png | Bin
 storage/app/public/attachments/auto_7884/qr.png | Bin
 storage/app/public/attachments/auto_7885/qr.png | Bin
 storage/app/public/attachments/auto_7886/qr.png | Bin
 storage/app/public/attachments/auto_7887/qr.png | Bin
 storage/app/public/attachments/auto_7889/qr.png | Bin
 storage/app/public/attachments/auto_7890/qr.png | Bin 0 -> 2845 bytes
 14 files changed, 30 insertions(+), 10 deletions(-)
 mode change 100644 => 100755 storage/app/public/attachments/AUTO7884/qr.png
 mode change 100644 => 100755 storage/app/public/attachments/auto_7883/qr.png
 mode change 100644 => 100755 storage/app/public/attachments/auto_7884/qr.png
 mode change 100644 => 100755 storage/app/public/attachments/auto_7885/qr.png
 mode change 100644 => 100755 storage/app/public/attachments/auto_7886/qr.png
 mode change 100644 => 100755 storage/app/public/attachments/auto_7887/qr.png
 mode change 100644 => 100755 storage/app/public/attachments/auto_7889/qr.png
 create mode 100644 storage/app/public/attachments/auto_7890/qr.png

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') }}
                                                 </h4>
                                                 <div class="flex-shrink-0">
-                                                    @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)
                                                         <a href="{{ route('auto.generate_pdf', $order->id) }}"
                                                            target="_blank"
                                                            class="btn btn-soft-success btn-sm me-1">
@@ -129,14 +129,14 @@
                                                             Tayyor xulosani yuklab olish
                                                         </a>
                                                     @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])))
-                                                        <a href="{{ route('conclusion.add', ['id' => $order->id,'type'=>\App\Enums\OrderTypeEnum::AUTO->name]) }}"
+                                                    @if(!in_array($order->status, [\App\Enums\OrderStatusEnum::APPROVED->value, \App\Enums\OrderStatusEnum::MODERATED->value]) && (in_array(Auth::user()?->role, ['admin', 'manager']) || $isAppraisers))
+                                                        <a href="{{ route('conclusion.add', ['id' => $order->id, 'type' => \App\Enums\OrderTypeEnum::AUTO->name]) }}"
                                                            type="button" class="btn btn-soft-info btn-sm">
                                                             <i class="ri-upload-2-fill me-1 align-bottom"></i>
                                                             {{ __('translation.upload') }}
                                                         </a>
                                                     @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']))
                                                         <button type="button" class="btn btn-soft-info btn-sm"
                                                                 data-bs-toggle="modal"
                                                                 data-bs-target="#givingBonusModal">
diff --git a/resources/views/estate/show.blade.php b/resources/views/estate/show.blade.php
index 3e4e365..7345f25 100755
--- a/resources/views/estate/show.blade.php
+++ b/resources/views/estate/show.blade.php
@@ -116,15 +116,22 @@
                                                 <h4 class="card-title mb-0 flex-grow-1">
                                                     {{ __('translation.conclusions') }}
                                                 </h4>
-                                                <div class="flex-shrink-0">
-                                                    @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])))
-                                                        <a href="{{ route('conclusion.add', ['id' => $order->id,'type'=>\App\Enums\OrderTypeEnum::ESTATE->name]) }}"
+                                                    @if($conclusions->count() > 0)
+                                                        <a href="{{ route('estate.generate_pdf', $order->id) }}"
+                                                           target="_blank"
+                                                           class="btn btn-soft-success btn-sm me-1">
+                                                            <i class="ri-download-2-line me-1 align-bottom"></i>
+                                                            Tayyor xulosani yuklab olish
+                                                        </a>
+                                                    @endif
+                                                    @if(!in_array($order->status, [\App\Enums\OrderStatusEnum::APPROVED->value, \App\Enums\OrderStatusEnum::MODERATED->value]) && (in_array(Auth::user()?->role, ['admin', 'manager']) || $isAppraisers))
+                                                        <a href="{{ route('conclusion.add', ['id' => $order->id, 'type' => \App\Enums\OrderTypeEnum::ESTATE->name]) }}"
                                                            type="button" class="btn btn-soft-info btn-sm">
                                                             <i class="ri-upload-2-fill me-1 align-bottom"></i>
                                                             {{ __('translation.upload') }}
                                                         </a>
                                                     @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']))
                                                         <button type="button" class="btn btn-soft-info btn-sm"
                                                                 data-bs-toggle="modal"
                                                                 data-bs-target="#givingBonusModal">
diff --git a/resources/views/qr/auto.blade.php b/resources/views/qr/auto.blade.php
index 0cb39b3..be09a6b 100755
--- a/resources/views/qr/auto.blade.php
+++ b/resources/views/qr/auto.blade.php
@@ -51,7 +51,7 @@
                         <div class="card mt-4">
                             <div class="card-body p-4">
                                 <div class="text-center mt-2">
-                                    <img width="100" src="{{ URL::asset('storage/attachments/auto_'.$order->id.'/qr.png') }}"
+                                    <img width="100" src="{{ route('qr.image', ['type' => 'auto', 'id' => $order->id]) }}"
                                          alt="Order qr code image">
                                 </div>
                                 <div class="p-2 mt-4">
diff --git a/resources/views/qr/estate.blade.php b/resources/views/qr/estate.blade.php
index 326b436..9968968 100755
--- a/resources/views/qr/estate.blade.php
+++ b/resources/views/qr/estate.blade.php
@@ -51,7 +51,7 @@
                         <div class="card mt-4">
                             <div class="card-body p-4">
                                 <div class="text-center mt-2">
-                                    <img width="100" src="{{ URL::asset('storage/attachments/estate_'.$order->id.'/qr.png') }}"
+                                    <img width="100" src="{{ route('qr.image', ['type' => 'estate', 'id' => $order->id]) }}"
                                          alt="Order qr code image">
                                 </div>
                                 <div class="p-2 mt-4">
diff --git a/routes/web.php b/routes/web.php
index fc85d77..932eb34 100755
--- a/routes/web.php
+++ b/routes/web.php
@@ -43,6 +43,7 @@ Route::get('index/{locale}', [HomeController::class, 'lang']);
 Route::get('/', [HomeController::class, 'index'])->name('root');
 Route::get('index', [HomeController::class, 'index'])->name('index');
 Route::get('v/{type}/{id}', [QrController::class, 'verify'])->name('qr.verify');
+Route::get('qr-image/{type}/{id}', [QrController::class, 'qrImage'])->name('qr.image');
 Route::get('/download/{file}', [FileStoreController::class, 'downloadFile'])->name('download');
 
 Route::group(['middleware' => ['auth']], function () {
diff --git a/storage/app/public/attachments/AUTO7884/qr.png b/storage/app/public/attachments/AUTO7884/qr.png
old mode 100644
new mode 100755
diff --git a/storage/app/public/attachments/auto_7883/qr.png b/storage/app/public/attachments/auto_7883/qr.png
old mode 100644
new mode 100755
diff --git a/storage/app/public/attachments/auto_7884/qr.png b/storage/app/public/attachments/auto_7884/qr.png
old mode 100644
new mode 100755
diff --git a/storage/app/public/attachments/auto_7885/qr.png b/storage/app/public/attachments/auto_7885/qr.png
old mode 100644
new mode 100755
diff --git a/storage/app/public/attachments/auto_7886/qr.png b/storage/app/public/attachments/auto_7886/qr.png
old mode 100644
new mode 100755
diff --git a/storage/app/public/attachments/auto_7887/qr.png b/storage/app/public/attachments/auto_7887/qr.png
old mode 100644
new mode 100755
diff --git a/storage/app/public/attachments/auto_7889/qr.png b/storage/app/public/attachments/auto_7889/qr.png
old mode 100644
new mode 100755
diff --git a/storage/app/public/attachments/auto_7890/qr.png b/storage/app/public/attachments/auto_7890/qr.png
new file mode 100644
index 0000000000000000000000000000000000000000..98956b067749d961dd7fd321b773c4b2e8bd6219
GIT binary patch
literal 2845
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

literal 0
HcmV?d00001