Fixed issue with list filter scope conditions

Signed-off-by: Sam Poyigi <6567634+sampoyigi@users.noreply.github.com>
tastyigniter · Feb 2, 2023 · a85efb9 · a85efb9
1 parent 70362a5
commit a85efb9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/app/admin/models/config/orders_model.php b/app/admin/models/config/orders_model.php
@@ -1,4 +1,5 @@
 <?php
+
 $config['list']['filter'] = [
     'search' => [
         'prompt' => 'lang:admin::lang.orders.text_filter_search',
@@ -18,7 +19,7 @@
         'location' => [
             'label' => 'lang:admin::lang.text_filter_location',
             'type' => 'selectlist',
-            'conditions' => 'location_id = :filtered',
+            'scope' => 'whereHasLocation',
             'modelClass' => 'Admin\Models\Locations_model',
             'nameFrom' => 'location_name',
             'locationAware' => true,
@@ -41,7 +42,7 @@
         'payment' => [
             'label' => 'lang:admin::lang.orders.text_filter_payment',
             'type' => 'selectlist',
-            'conditions' => 'payment = :filtered',
+            'conditions' => 'payment IN(:filtered)',
             'modelClass' => 'Admin\Models\Payments_model',
             'options' => 'getDropdownOptions',
         ],

diff --git a/app/admin/models/config/reservations_model.php b/app/admin/models/config/reservations_model.php
@@ -19,7 +19,7 @@
         'location' => [
             'label' => 'lang:admin::lang.text_filter_location',
             'type' => 'selectlist',
-            'conditions' => 'location_id = :filtered',
+            'scope' => 'whereHasLocation',
             'modelClass' => 'Admin\Models\Locations_model',
             'nameFrom' => 'location_name',
             'locationAware' => true,