fix: reverse filtering when thana is selected

itsemon245 · itsemon245 · commit 4dc5eb867edb · 2024-06-26T01:19:49.000+06:00
diff --git a/app/Http/Controllers/Frontend/Page/PageController.php b/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('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('thana')) {
+            if ($request->query('dist_only', false) && $request->query('thana')) {
                 $q->where('thana', $request->query('thana'));
             }
             if ($request->query('district', 'Chattogram')) {
diff --git a/resources/views/frontend/layouts/app.blade.php b/resources/views/frontend/layouts/app.blade.php
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="{{ str_replace('_', '-', app()->getLocale()) }}">
+<html lang="{{ str_replace('_', '-', app()->getLocale()) }}" x-data>
 
 <x-frontend.layouts.head description="Fill tax with ease and comfort" :favicon="$settings->basic->favicon" />
 
diff --git a/resources/views/frontend/pages/appointment/makeAppointment.blade.php b/resources/views/frontend/pages/appointment/makeAppointment.blade.php
@@ -151,12 +151,14 @@ class="text-muted fs-6">(selected)</span></h5>
                                                                     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-target="#hx-filter-target" hx-swap="outerHTML"
                                                                 label="Select District" id="branch-district"
                                                                 name="branch-district" required
                                                                 placeholder="Select District...">
-                                                                <option selected disabled value="">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 +177,8 @@ 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 value="">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 }}
@@ -209,8 +212,9 @@ class="location-input"
                                                                     id="location-input-{{ $map->id }}"
                                                                     value="{{ $map->id }}" hidden>
                                                             </label>
-                                                            @empty
-                                                            <div class="p-5 rounded bg-gray-200">No branches found for selected location</div>
+                                                        @empty
+                                                            <div class="p-5 rounded bg-gray-200">No branches found for
+                                                                selected location</div>
                                                         @endforelse
                                                     </div>
 
diff --git a/resources/views/frontend/pages/office.blade.php b/resources/views/frontend/pages/office.blade.php
@@ -24,7 +24,9 @@
                                 <div class="flex items-center gap-2 mt-3">
                                     <label for="branch-thana">District: </label>
                                     <select class="grow hx-include" hx-include=".hx-include"
-                                        hx-get="{{ route('office') }}" hx-select="#hx-filter-target"
+                                        hx-get="{{ route('office') }}"
+                                        hx-vals="{'dist_only': 'true'}"
+                                        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>

Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ public function appointmentPage(Request $request, ?ExpertProfile $expertProfile`
`65`	`65`	`if ($defaultDistrict) {`
`66`	`66`	`$q->where('district', $defaultDistrict);`
`67`	`67`	`}`
`68`		`- if ($request->query('branch-thana')) {`
	`68`	`+ if ($request->query('dist_only', false) && $request->query('branch-thana')) {`
`69`	`69`	`$q->where('thana', $request->query('branch-thana'));`
`70`	`70`	`}`
`71`	`71`	`if ($expertProfile != null) {`
`@@ -135,7 +135,7 @@ public function officePage(Request $request)`
`135`	`135`	`{`
`136`	`136`	`$admin = User::role('super admin')->first();`
`137`	`137`	`$maps = Map::where(function (Builder $q) use ($request, $admin) {`
`138`		`- if ($request->query('thana')) {`
	`138`	`+ if ($request->query('dist_only', false) && $request->query('thana')) {`
`139`	`139`	`$q->where('thana', $request->query('thana'));`
`140`	`140`	`}`
`141`	`141`	`if ($request->query('district', 'Chattogram')) {`