Add Quote ID to ACE grid and update Customer Group options

mageplaza · Sep 7, 2020 · 84f2b0b · 84f2b0b
1 parent 1244962
commit 84f2b0b
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 49 deletions.
diff --git a/Model/ResourceModel/AbandonedCart/Grid/Collection.php b/Model/ResourceModel/AbandonedCart/Grid/Collection.php
@@ -34,8 +34,9 @@ class Collection extends SearchResult
      */
     public function _initSelect()
     {
+        parent::_initSelect();
+
         $this->getSelect()
-            ->from(['main_table' => $this->getMainTable()])
             ->where('main_table.is_active = ?', 1)
             ->where('main_table.customer_email != ?', null)
             ->where('main_table.items_count != ?', 0);

diff --git a/Ui/Component/Listing/Column/CustomerGroup.php b/Ui/Component/Listing/Column/CustomerGroup.php
diff --git a/composer.json b/composer.json
@@ -5,7 +5,7 @@
     "mageplaza/module-core": "^1.4.5"
   },
   "type": "magento2-module",
-  "version": "1.4.2",
+  "version": "1.4.3",
   "license": "proprietary",
   "authors": [
     {

diff --git a/view/adminhtml/ui_component/mpsmtp_abandoned_cart_grid.xml b/view/adminhtml/ui_component/mpsmtp_abandoned_cart_grid.xml
@@ -31,13 +31,13 @@
         <argument name="dataProvider" xsi:type="configurableObject">
             <argument name="class" xsi:type="string">Magento\Framework\View\Element\UiComponent\DataProvider\DataProvider</argument>
             <argument name="name" xsi:type="string">mpsmtp_abandoned_cart_grid_data_source</argument>
-            <argument name="primaryFieldName" xsi:type="string">id</argument>
+            <argument name="primaryFieldName" xsi:type="string">entity_id</argument>
             <argument name="requestFieldName" xsi:type="string">id</argument>
             <argument name="data" xsi:type="array">
                 <item name="config" xsi:type="array">
                     <item name="update_url" xsi:type="url" path="mui/index/render"/>
                     <item name="storageConfig" xsi:type="array">
-                        <item name="indexField" xsi:type="string">id</item>
+                        <item name="indexField" xsi:type="string">entity_id</item>
                     </item>
                 </item>
             </argument>
@@ -91,11 +91,21 @@
                 <item name="config" xsi:type="array">
                     <item name="resizeEnabled" xsi:type="boolean">false</item>
                     <item name="resizeDefaultWidth" xsi:type="string">55</item>
-                    <item name="indexField" xsi:type="string">id</item>
+                    <item name="indexField" xsi:type="string">entity_id</item>
                     <item name="sortOrder" xsi:type="number">9</item>
                 </item>
             </argument>
         </selectionsColumn>
+        <column name="entity_id">
+            <argument name="data" xsi:type="array">
+                <item name="config" xsi:type="array">
+                    <item name="filter" xsi:type="string">text</item>
+                    <item name="align" xsi:type="string">left</item>
+                    <item name="label" xsi:type="string" translate="true">Quote ID</item>
+                    <item name="sortOrder" xsi:type="number">10</item>
+                </item>
+            </argument>
+        </column>
         <column name="store_id" class="Magento\Store\Ui\Component\Listing\Column\Store">
             <argument name="data" xsi:type="array">
                 <item name="config" xsi:type="array">
@@ -129,12 +139,12 @@
         </column>
         <column name="customer_group_id">
             <argument name="data" xsi:type="array">
-                <item name="options" xsi:type="object">Mageplaza\Smtp\Ui\Component\Listing\Column\CustomerGroup</item>
+                <item name="options" xsi:type="object">Magento\Customer\Ui\Component\Listing\Column\Group\Options</item>
                 <item name="config" xsi:type="array">
                     <item name="filter" xsi:type="string">select</item>
+                    <item name="label" xsi:type="string" translate="true">Customer Group</item>
                     <item name="component" xsi:type="string">Magento_Ui/js/grid/columns/select</item>
                     <item name="dataType" xsi:type="string">select</item>
-                    <item name="label" xsi:type="string" translate="true">Customer Group</item>
                     <item name="sortOrder" xsi:type="number">50</item>
                 </item>
             </argument>