fix: district and thana for appointment page

Author: itsemon245

app/Http/Controllers/Frontend/Page/PageController.php

@@ -58,8 +58,9 @@ public function appointmentPage(Request $request, ?ExpertProfile $expertProfile
             $dates[$date->format('l, F d, Y')] = AppointmentTime::where('user_id', $userId)->where('day', $date->format('l'))->first()->times ?? [];
         }
         $office = !empty($request->query('office_id')) ? Map::find($request->query('office_id')) : null;
+        $admin = User::role('super admin')->first();
         if ($office == null) {
-            $maps = Map::where(function (Builder $q) use ($request, $expertProfile) {
+            $maps = Map::where(function (Builder $q) use ($request, $expertProfile, $admin) {
                 if ($request->query('branch-thana')) {
                     $q->where('thana', $request->query('branch-thana'));
                 }
@@ -68,25 +69,33 @@ public function appointmentPage(Request $request, ?ExpertProfile $expertProfile
                 }
                 if ($expertProfile != null) {
                     $q->where('user_id', $expertProfile->user_id);
+                } else {
+                    $q->where('user_id', $admin->id)->orWhere('user_id', null);
                 }
             })->latest()->get();
         } else {
             $maps = [ $office ];
         }
         $branchDistricts = Map::select([ 'district', 'thana', 'user_id' ])
-        ->where(function (Builder $q) use ($request, $expertProfile) {
+        ->where(function (Builder $q) use ($request, $expertProfile, $admin) {
             if ($expertProfile != null) {
                 $q->where('user_id', $expertProfile->user_id);
+            } else {
+                $q->where('user_id', $admin->id)->orWhere('user_id', null);
             }
         })
         ->distinct()->latest()->get()->pluck('district');
-        $branchThanas    = Map::select([ 'district', 'thana', 'user_id' ])->distinct()->where(function (Builder $q) use ($request, $expertProfile) {
+        $branchThanas    = Map::select([ 'district', 'thana', 'user_id' ])
+        ->distinct()
+        ->where(function (Builder $q) use ($request, $expertProfile, $admin) {
             if (!empty($request->query('branch-district'))) {
                 $q->where('district', $request->query('branch-district'));
             }
             if ($expertProfile != null) {
                 $q->where('user_id', $expertProfile->user_id);
-            }
+            }else {
+            $q->where('user_id', $admin->id)->orWhere('user_id', null);
+        }
         })->latest()->get()->pluck('thana');
         $banners      = getRecords('banners');
         $infos1       = Info::where('section_id', 1)->latest()->get();
@@ -103,7 +112,7 @@ public function appointmentVirtual(Request $request, ?ExpertProfile $expertProfi
             $date = $carbon->addDay();
             $dates[$date->format('l, F d, Y')] = AppointmentTime::where('user_id', $userId)->where('day', $date->format('l'))->first()->times ?? [];
         }
-        
+
         $office = !empty($request->query('office_id')) ? Map::find($request->query('office_id')) : null;
         $banners      = getRecords('banners');
         $infos1       = Info::where('section_id', 1)->latest()->get();

resources/views/frontend/pages/appointment/makeAppointment.blade.php

@@ -1,4 +1,3 @@
-
 @extends('frontend.layouts.app')
 
 @section('main')
@@ -162,7 +161,7 @@ class="text-muted fs-6">(selected)</span></h5>
                                                             <label for="branch-thana">District <span
                                                                     class="text-danger">*</span></label>
                                                             <select class="tail-select !w-full"
-                                                                hx-get="{{ route('appointment.make') }}"
+                                                                hx-get="{{ $expertProfile ?? false ? route('consultation.make', ['expertProfile' => $expertProfile]) : route('appointment.make') }}"
                                                                 hx-select="#hx-filter-target"
                                                                 hx-target="#hx-filter-target" hx-swap="outerHTML"
                                                                 label="Select District" id="branch-district"
@@ -182,7 +181,7 @@ class="text-danger">*</span></label>
                                                             <label for="branch-thana">Thana <span
                                                                     class="text-danger">*</span></label>
                                                             <select class="tail-select !w-full"
-                                                                hx-get={{ route('appointment.make') }}
+                                                                hx-get="{{ $expertProfile ?? false ? route('consultation.make', ['expertProfile' => $expertProfile]) : route('appointment.make') }}"
                                                                 hx-select="#hx-filter-target"
                                                                 hx-target="#hx-filter-target" hx-swap="outerHTML"
                                                                 id="branch-thana" name="branch-thana" required