From 8c381ba1ee8eb8fbcb077f7c043fd8ec73c6830b Mon Sep 17 00:00:00 2001 From: husanjon Date: Mon, 6 Apr 2026 06:11:38 +0500 Subject: [PATCH] Fix show pages: add diller, regions, districts to order object Co-Authored-By: Claude Sonnet 4.6 --- app/Http/Controllers/AutoController.php | 6 ++++++ app/Http/Controllers/EstateController.php | 5 +++++ 2 files changed, 11 insertions(+) diff --git a/app/Http/Controllers/AutoController.php b/app/Http/Controllers/AutoController.php index a2f602f..6aa2158 100644 --- a/app/Http/Controllers/AutoController.php +++ b/app/Http/Controllers/AutoController.php @@ -111,6 +111,12 @@ class AutoController extends Controller $order->concernOne = (object)['uz' => $order->concern_uz, 'ru' => $order->concern_ru, 'cr' => $order->concern_cr]; } + if ($order) { + $dillerUser = $order->diller_id ? DB::table('users')->find($order->diller_id) : null; + $order->diller = $dillerUser->name ?? ''; + $order->dillerUser = $dillerUser; + } + $members = DB::table('order_members')->where('order_id', $order->id ?? 0)->where('order_type', 'auto_')->get(); $appraisers = DB::table('users')->whereRaw('LOWER(role) = ?', ['appraiser'])->where('status', 'active')->get(); $isAppraisers = $members->where('user_id', auth()->id())->count() > 0; diff --git a/app/Http/Controllers/EstateController.php b/app/Http/Controllers/EstateController.php index 6eca290..e5acd9a 100644 --- a/app/Http/Controllers/EstateController.php +++ b/app/Http/Controllers/EstateController.php @@ -88,6 +88,11 @@ class EstateController extends Controller if ($order) { $order->purposeOne = (object)['uz' => $order->purpose_uz, 'ru' => $order->purpose_ru, 'cr' => $order->purpose_cr]; + $order->regions = DB::table('regions')->find($order->region); + $order->districts = DB::table('districts')->find($order->district); + $dillerUser = $order->diller_id ? DB::table('users')->find($order->diller_id) : null; + $order->diller = $dillerUser->name ?? ''; + $order->dillerUser = $dillerUser; } $members = DB::table('order_members')->where('order_id', $order->id ?? 0)->where('order_type', 'estate_')->get();