finally fix

Author: itsemon245

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

@@ -65,7 +65,7 @@ public function appointmentPage(Request $request, ?ExpertProfile $expertProfile
                 if ($defaultDistrict) {
                     $q->where('district', $defaultDistrict);
                 }
-                if ($request->query('dist_only', false) && $request->query('branch-thana')) {
+                if (!$request->query('dist_only', false) && $request->query('branch-thana')) {
                     $q->where('thana', $request->query('branch-thana'));
                 }
                 if ($expertProfile != null) {
@@ -135,7 +135,7 @@ public function officePage(Request $request)
     {
         $admin = User::role('super admin')->first();
         $maps = Map::where(function (Builder $q) use ($request, $admin) {
-            if ($request->query('dist_only', false) && $request->query('thana')) {
+            if (!$request->query('dist_only', false) && $request->query('thana')) {
                 $q->where('thana', $request->query('thana'));
             }
             if ($request->query('district', 'Chattogram')) {

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

@@ -147,12 +147,14 @@ class="text-muted fs-6">(selected)</span></h5>
                                                     </div>
                                                     <div class="col-md-6">
                                                         <div class="mb-2">
+                                    <input type="hidden" name="dist_only" value="1">
+
                                                             <label for="branch-thana">District <span
                                                                     class="text-danger">*</span></label>
                                                             <select class="hx-include !w-full"
                                                                 hx-get="{{ $expertProfile ?? false ? route('consultation.make', ['expertProfile' => $expertProfile]) : route('appointment.make') }}"
                                                                 hx-vals="{'dist_only': 'true'}"
-                                                                hx-select="#hx-filter-target" hx-include=".hx-include"
+                                                                hx-select="#hx-filter-target" hx-include=".hx-include, [name='dist_only']"
                                                                 hx-target="#hx-filter-target" hx-swap="outerHTML"
                                                                 label="Select District" id="branch-district"
                                                                 name="branch-district" required

resources/views/frontend/pages/office.blade.php

@@ -22,11 +22,10 @@
                             </div>
                             <div class="col-md-6">
                                 <div class="flex items-center gap-2 mt-3">
+                                    <input type="hidden" name="dist_only" value="1">
                                     <label for="branch-thana">District: </label>
-                                    <select class="grow hx-include" hx-include=".hx-include"
-                                        hx-get="{{ route('office') }}"
-                                        hx-vals="{'dist_only': 'true'}"
-                                        hx-select="#hx-filter-target"
+                                    <select class="grow hx-include" hx-include=".hx-include, [name='dist_only']"
+                                        hx-get="{{ route('office') }}" hx-select="#hx-filter-target"
                                         hx-target="#hx-filter-target" hx-swap="outerHTML" label="Select District"
                                         id="branch-district" name="district" placeholder="Select District...">
                                         <option selected disabled value="">Select a district</option>
@@ -40,10 +39,9 @@
                             <div class="col-md-6">
                                 <div class="mb-2 flex items-center gap-2 mt-3" id="thanas" hx-swap-oob="true">
                                     <label for="branch-thana">Thana: </label>
-                                    <select class="grow hx-include" hx-include=".hx-include"
-                                        hx-get={{ route('office') }} hx-select="#hx-filter-target"
-                                        hx-target="#hx-filter-target" hx-swap="outerHTML" id="branch-thana" name="thana"
-                                        placeholder="Select Thana...">
+                                    <select class="grow hx-include" hx-include=".hx-include" hx-get={{ route('office') }}
+                                        hx-select="#hx-filter-target" hx-target="#hx-filter-target" hx-swap="outerHTML"
+                                        id="branch-thana" name="thana" placeholder="Select Thana...">
                                         <option selected disabled value="">Select a thana</option>
                                         @foreach ($thanas as $thana)
                                             <option value="{{ trim($thana) }}" @selected(trim($thana) == request()->query('thana') || trim($thana) == 'Karnaphuli')>
@@ -87,7 +85,8 @@ class="text-dark fw-bold"
                                 </div>
                             </div>
                         @else
-                            <div class="col-12 p-10 rounded bg-gray-200 text-center -ml-3">No branches found for selected location</div>
+                            <div class="col-12 p-10 rounded bg-gray-200 text-center -ml-3">No branches found for selected
+                                location</div>
                         @endif
                     </div>
                 </div>