fix:disable selected value

Author: itsemon245

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

@@ -62,12 +62,12 @@ public function appointmentPage(Request $request, ?ExpertProfile $expertProfile
         $defaultDistrict = $request->query('branch-district', 'Chattogram');
         if ($office == null) {
             $maps = Map::where(function (Builder $q) use ($request, $expertProfile, $admin, $defaultDistrict) {
-                if ($request->query('branch-thana')) {
-                    $q->where('thana', $request->query('branch-thana'));
-                }
                 if ($defaultDistrict) {
                     $q->where('district', $defaultDistrict);
                 }
+                if ($request->query('branch-thana')) {
+                    $q->where('thana', $request->query('branch-thana'));
+                }
                 if ($expertProfile != null) {
                     $q->where('user_id', $expertProfile->user_id);
                 } else {

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

@@ -156,7 +156,7 @@ class="text-danger">*</span></label>
                                                                 label="Select District" id="branch-district"
                                                                 name="branch-district" required
                                                                 placeholder="Select District...">
-                                                                <option selected disabled>Select a district</option>
+                                                                <option selected disabled value="">Select a district</option>
                                                                 @foreach ($branchDistricts as $district)
                                                                     <option value="{{ $district }}"
                                                                         @selected(trim($district) == 'Chattogram')>{{ trim($district) }}
@@ -175,7 +175,7 @@ class="text-danger">*</span></label>
                                                                 hx-target="#hx-filter-target" hx-swap="outerHTML"
                                                                 id="branch-thana" name="branch-thana" required
                                                                 placeholder="Select Thana...">
-                                                                <option selected disabled>Select a thana</option>
+                                                                <option selected disabled value="">Select a thana</option>
                                                                 @foreach ($branchThanas as $thana)
                                                                     <option value="{{ trim($thana) }}"
                                                                         @selected(trim($thana) == request()->query('branch-thana'))>{{ $thana }}

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

@@ -27,7 +27,7 @@
                                         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>Select a district</option>
+                                        <option selected disabled value="">Select a district</option>
                                         @foreach ($districts as $district)
                                             <option value="{{ $district }}" @selected(trim($district) == request()->query('district') || trim($district) == 'Chattogram')>
                                                 {{ trim($district) }}</option>
@@ -42,7 +42,7 @@
                                         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>Select a thana</option>
+                                        <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')>
                                                 {{ $thana }}</option>