From 4a78ca5d3270009fe79e74431263e96acd7e8c83 Mon Sep 17 00:00:00 2001
From: Maksym Novik <novik.kor@gmail.com>
Date: Fri, 31 Jan 2020 14:54:21 +0200
Subject: [PATCH] Grid Export rendered data is not reflecting in the exported
 File, Displayed ID instead of Rendered Label #25963. Removed deprecated
 class.

---
 .../Order/Invoice/Grid/Collection.php         | 36 -------------------
 app/code/Magento/Sales/etc/di.xml             |  6 ++++
 2 files changed, 6 insertions(+), 36 deletions(-)
 delete mode 100644 app/code/Magento/Sales/Model/ResourceModel/Order/Invoice/Grid/Collection.php

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
deleted file mode 100644
index b73395780ac70..0000000000000
--- a/app/code/Magento/Sales/Model/ResourceModel/Order/Invoice/Grid/Collection.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\Sales\Model\ResourceModel\Order\Invoice\Grid;
-
-use Magento\Framework\Data\Collection\Db\FetchStrategyInterface as FetchStrategy;
-use Magento\Framework\Data\Collection\EntityFactoryInterface as EntityFactory;
-use Magento\Framework\Event\ManagerInterface as EventManager;
-use Psr\Log\LoggerInterface as Logger;
-
-class Collection extends \Magento\Framework\View\Element\UiComponent\DataProvider\SearchResult
-{
-    /**
-     * Initialize dependencies.
-     *
-     * @param EntityFactory $entityFactory
-     * @param Logger $logger
-     * @param FetchStrategy $fetchStrategy
-     * @param EventManager $eventManager
-     * @param string $mainTable
-     * @param string $resourceModel
-     */
-    public function __construct(
-        EntityFactory $entityFactory,
-        Logger $logger,
-        FetchStrategy $fetchStrategy,
-        EventManager $eventManager,
-        $mainTable = 'sales_invoice_grid',
-        $resourceModel = \Magento\Sales\Model\ResourceModel\Order\Invoice::class
-    ) {
-        parent::__construct($entityFactory, $logger, $fetchStrategy, $eventManager, $mainTable, $resourceModel);
-    }
-}
diff --git a/app/code/Magento/Sales/etc/di.xml b/app/code/Magento/Sales/etc/di.xml
index 9f705c1a674c1..4ae1482da65d1 100644
--- 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>