ENGCOM-6901: [#25963] Fixed grids export: option labels are taken fro…

…m grid filters and columns now. #26523 - Merge Pull Request #26523 from novikor/magento2:25963-grid-export-labels - Merged commits: 1. b43980b 2. 93793d8 3. c517f5f 4. 9bb416f 5. cd24e41 6. 6b434ba 7. b117b0c 8. 4a78ca5 9. 34d1876 10. 4483911 11. 0d3e478 12. 1a1ab4d 13. 5849cb6
magento · Feb 14, 2020 · dd89574 · dd89574
2 parents 79ab7c8 + 5849cb6
commit dd89574
Show file tree

Hide file tree

Showing 6 changed files with 326 additions and 370 deletions.
diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Invoice/Grid/Collection.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Invoice/Grid/Collection.php
diff --git a/app/code/Magento/Sales/Test/Unit/Ui/Component/DataProvider/DocumentTest.php b/app/code/Magento/Sales/Test/Unit/Ui/Component/DataProvider/DocumentTest.php
diff --git a/app/code/Magento/Sales/Ui/Component/DataProvider/Document.php b/app/code/Magento/Sales/Ui/Component/DataProvider/Document.php
diff --git a/app/code/Magento/Sales/etc/di.xml b/app/code/Magento/Sales/etc/di.xml
@@ -832,6 +832,12 @@
             </argument>
         </arguments>
     </type>
+    <virtualType name="Magento\Sales\Model\ResourceModel\Order\Invoice\Grid\Collection" type="Magento\Framework\View\Element\UiComponent\DataProvider\SearchResult">
+        <arguments>
+            <argument name="mainTable" xsi:type="string">sales_invoice_grid</argument>
+            <argument name="resourceModel" xsi:type="string">Magento\Sales\Model\ResourceModel\Order\Invoice</argument>
+        </arguments>
+    </virtualType>
     <type name="Magento\Sales\Model\Order\Config">
         <arguments>
             <argument name="state" xsi:type="object">Magento\Framework\App\State\Proxy</argument>