Merge pull request #129 from heidelpay/change/MAGE2-262/add-basketId-…

…to-order-grid Merge remote-tracking branch 'remotes/github/develop' into change/MAGE2-262/add-basketId-to-order-grid
heidelpay · Feb 14, 2020 · fe114bc · fe114bc
2 parents 298012f + 7bda927
commit fe114bc
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 13 deletions.
diff --git a/etc/adminhtml/di.xml b/etc/adminhtml/di.xml
@@ -3,17 +3,4 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
 
-    <type name="Magento\Framework\View\Element\UiComponent\DataProvider\CollectionFactory">
-        <arguments>
-            <argument name="collections" xsi:type="array">
-                <item name="sales_order_grid_data_source" xsi:type="string">Heidelpay\Gateway\Model\ResourceModel\Order\Grid\Collection</item>
-            </argument>
-        </arguments>
-    </type>
-    <virtualType name="Heidelpay\Gateway\Model\ResourceModel\Order\Grid\Collection">
-        <arguments>
-            <argument name="mainTable" xsi:type="string">sales_order_grid</argument>
-            <argument name="resourceModel" xsi:type="string">Magento\Sales\Model\ResourceModel\Order</argument>
-        </arguments>
-    </virtualType>
 </config>
diff --git a/etc/di.xml b/etc/di.xml
@@ -157,4 +157,18 @@
     <preference for="Heidelpay\Gateway\Api\Data\TransactionInterface" type="Heidelpay\Gateway\Model\Transaction"/>
     <preference for="Heidelpay\Gateway\Api\Data\TransactionSearchResultInterface" type="Heidelpay\Gateway\Model\TransactionSearchResult"/>
 
+    <type name="Magento\Framework\View\Element\UiComponent\DataProvider\CollectionFactory">
+        <arguments>
+            <argument name="collections" xsi:type="array">
+                <item name="sales_order_grid_data_source" xsi:type="string">Heidelpay\Gateway\Model\ResourceModel\Order\Grid\Collection</item>
+            </argument>
+        </arguments>
+    </type>
+    <virtualType name="Heidelpay\Gateway\Model\ResourceModel\Order\Grid\Collection">
+        <arguments>
+            <argument name="mainTable" xsi:type="string">sales_order_grid</argument>
+            <argument name="resourceModel" xsi:type="string">Magento\Sales\Model\ResourceModel\Order</argument>
+        </arguments>
+    </virtualType>
+
 </config>