Fix show pages: add diller, regions, districts to order object

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
2026-04-06 06:11:38 +05:00
parent 6c985c1b29
commit 8c381ba1ee
2 changed files with 11 additions and 0 deletions

View File

@@ -111,6 +111,12 @@ class AutoController extends Controller
$order->concernOne = (object)['uz' => $order->concern_uz, 'ru' => $order->concern_ru, 'cr' => $order->concern_cr]; $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(); $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(); $appraisers = DB::table('users')->whereRaw('LOWER(role) = ?', ['appraiser'])->where('status', 'active')->get();
$isAppraisers = $members->where('user_id', auth()->id())->count() > 0; $isAppraisers = $members->where('user_id', auth()->id())->count() > 0;

View File

@@ -88,6 +88,11 @@ class EstateController extends Controller
if ($order) { if ($order) {
$order->purposeOne = (object)['uz' => $order->purpose_uz, 'ru' => $order->purpose_ru, 'cr' => $order->purpose_cr]; $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(); $members = DB::table('order_members')->where('order_id', $order->id ?? 0)->where('order_type', 'estate_')->get();