From a20f25f211b60c79c2d2b239b645c29f15f9cdd2 Mon Sep 17 00:00:00 2001
From: sixer1182 <simon.gabriel@gmx.de>
Date: Fri, 14 Feb 2020 09:46:05 +0100
Subject: [PATCH] [change] (MAGE2-262) Fix problem with invoice and shipping
 table.

---
 etc/adminhtml/di.xml | 13 -------------
 etc/di.xml           | 14 ++++++++++++++
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/etc/adminhtml/di.xml b/etc/adminhtml/di.xml
index e3732d3b188..f7af3bfc7fb 100644
--- 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>
\ No newline at end of file
diff --git a/etc/di.xml b/etc/di.xml
index 7994ef456b5..e4a77c143ee 100755
--- 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>
\ No newline at end of file