Skip to content
This repository has been archived by the owner on Feb 16, 2022. It is now read-only.

Merge remote-tracking branch 'remotes/github/develop' into change/MAGE2-262/add-basketId-to-order-grid #129

Merged
merged 2 commits into from
Feb 14, 2020
+14 −13
Merged

Merge remote-tracking branch 'remotes/github/develop' into change/MAGE2-262/add-basketId-to-order-grid #129

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a20f25f
[change] (MAGE2-262) Fix problem with invoice and shipping table.
Feb 14, 2020
7bda927
Merge remote-tracking branch 'remotes/github/develop' into change/MAG…
Feb 14, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 0 additions & 13 deletions etc/adminhtml/di.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
14 changes: 14 additions & 0 deletions etc/di.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>