fix for facility shipment list

loadpartner · Feb 26, 2025 · 874b3be · 874b3be
1 parent 6211456
commit 874b3be
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/app/Http/Controllers/ResourceSearchController.php b/app/Http/Controllers/ResourceSearchController.php
@@ -17,7 +17,10 @@ public function searchQuery(Builder $query, array $filters = [])
                 // this allows for customers.id to be correctly queried
                 if (str_contains($filter['name'], '.')) {
                     $relation = explode('.', $filter['name'])[0];
-                    $query = $query->whereHas($relation, fn ($b) => $b->where($filter['name'], $filter['value']));
+                    $relationField = explode('.', $filter['name'])[1];
+                    $query = $query->whereHas($relation, 
+                        fn ($b) => $b->where($b->getModel()->getTable() . '.' . $relationField, $filter['value'])
+                    );
                 } else {
                     $query = $query->where($filter['name'], $filter['value']);
                 }

diff --git a/resources/js/Pages/Facilities/Partials/FacilityDetails.tsx b/resources/js/Pages/Facilities/Partials/FacilityDetails.tsx
@@ -363,7 +363,7 @@ export default function FacilityDetails({ facility }: { facility: Facility }) {
                             <ShipmentList
                                 requiredFilters={[
                                     {
-                                        name: 'facility_id',
+                                        name: 'stops.facility_id',
                                         value: facility.id.toString() || '',
                                     },
                                 ]}