Fix problem with sorting and filtering on reservation grid (#49)

macopedia · Apr 21, 2020 · 7f837f9 · 7f837f9
1 parent 0b4fdcf
commit 7f837f9
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/Model/ResourceModel/Reservation/Collection/Grid.php b/Model/ResourceModel/Reservation/Collection/Grid.php
@@ -57,6 +57,15 @@ protected function _beforeLoad()
         return parent::_beforeLoad();
     }
 
+    protected function _initSelect()
+    {
+        $this
+            ->addFilterToMap("reservation_id", "main_table.reservation_id")
+            ->addFilterToMap("sku", "main_table.sku");
+
+        return parent::_initSelect();
+    }
+
     /**
      *
      */

diff --git a/view/adminhtml/ui_component/allegro_reservations_listing.xml b/view/adminhtml/ui_component/allegro_reservations_listing.xml
@@ -30,7 +30,6 @@
             </item>
         </argument>
         <bookmark name="bookmarks"/>
-        <filterSearch name="fulltext"/>
         <filters name="listing_filters" />
         <paging name="listing_paging"/>
         <exportButton name="export_button"/>
@@ -39,6 +38,7 @@
         <column name="entity_id" sortOrder="10">
             <argument name="data" xsi:type="array">
                 <item name="config" xsi:type="array">
+                    <item name="filter" xsi:type="string">textRange</item>
                     <item name="sorting" xsi:type="string">asc</item>
                     <item name="label" xsi:type="string" translate="true">ID</item>
                 </item>
@@ -47,6 +47,7 @@
         <column name="reservation_id" sortOrder="20">
             <argument name="data" xsi:type="array">
                 <item name="config" xsi:type="array">
+                    <item name="filter" xsi:type="string">textRange</item>
                     <item name="sorting" xsi:type="string">asc</item>
                     <item name="label" xsi:type="string" translate="true">Reservation ID</item>
                 </item>
@@ -56,7 +57,6 @@
             <argument name="data" xsi:type="array">
                 <item name="config" xsi:type="array">
                     <item name="filter" xsi:type="string">text</item>
-                    <item name="sorting" xsi:type="string">asc</item>
                     <item name="label" xsi:type="string" translate="true">Checkout form ID</item>
                 </item>
             </argument>
@@ -65,15 +65,13 @@
             <argument name="data" xsi:type="array">
                 <item name="config" xsi:type="array">
                     <item name="filter" xsi:type="string">text</item>
-                    <item name="sorting" xsi:type="string">asc</item>
                     <item name="label" xsi:type="string" translate="true">Product SKU</item>
                 </item>
             </argument>
         </column>
         <column name="quantity" sortOrder="50">
             <argument name="data" xsi:type="array">
                 <item name="config" xsi:type="array">
-                    <item name="sorting" xsi:type="string">asc</item>
                     <item name="label" xsi:type="string" translate="true">Quantity</item>
                 </item>
             </argument>