changes for implementation

Author: glo05363

app/code/Magento/Backend/Block/Widget/Grid/Extended.php

@@ -87,6 +87,8 @@ class Extended extends \Magento\Backend\Block\Widget\Grid implements \Magento\Ba
     protected $_massactionIdFilter;
 
     /**
+     * Massaction block name
+     *
      * @var string
      */
     protected $_massactionBlockName = \Magento\Backend\Block\Widget\Grid\Massaction\Extended::class;
@@ -120,6 +122,8 @@ class Extended extends \Magento\Backend\Block\Widget\Grid implements \Magento\Ba
     protected $_headersVisibility = true;
 
     /**
+     * Filter visibility
+     *
      * @var boolean
      */
     protected $_filterVisibility = true;
@@ -144,11 +148,15 @@ class Extended extends \Magento\Backend\Block\Widget\Grid implements \Magento\Ba
     protected $_isCollapsed;
 
     /**
+     * Count subtotals
+     *
      * @var boolean
      */
     protected $_countSubTotals = false;
 
     /**
+     * SubTotals
+     *
      * @var \Magento\Framework\DataObject[]
      */
     protected $_subtotals = [];
@@ -956,7 +964,6 @@ public function _exportIterateCollection($callback, array $args)
 
         while ($break !== true) {
             $collection = clone $originalCollection;
-            $collection->clear();
             $collection->setPageSize($this->_exportPageSize);
             $collection->setCurPage($page);
             $collection->load();
@@ -968,6 +975,7 @@ public function _exportIterateCollection($callback, array $args)
                 $break = true;
             }
             $page++;
+
             foreach ($collection as $item) {
                 //phpcs:ignore Magento2.Functions.DiscouragedFunction
                 call_user_func_array(

app/code/Magento/Reports/Controller/Adminhtml/Report/Shopcart/ExportAbandonedCsv.php

@@ -28,7 +28,7 @@ public function execute()
         $fileName = 'shopcart_abandoned.csv';
         $content = $this->_view->getLayout()->createBlock(
             \Magento\Reports\Block\Adminhtml\Shopcart\Abandoned\Grid::class
-        )->getCsvFile();
+        )->getCsv();
 
         return $this->_fileFactory->create($fileName, $content, DirectoryList::VAR_DIR);
     }

app/code/Magento/Reports/Model/ResourceModel/Quote/Collection.php

@@ -200,22 +200,9 @@ public function resolveCustomerNames()
         foreach ($this->getItems() as $item) {
             foreach ($customersData as $customerItemData) {
                 if ($item['customer_id'] == $customerItemData['entity_id']) {
-                    $item->setData('customer_name', $customerItemData['customer_name']);
-                    $item->setData('email', $customerItemData['email']);
-                    $item->setData($item->getData());
+                    $item->setData(array_merge($item->getData(), $customerItemData));
                 }
             }
         }
     }
-
-    /**
-     * Append customer data after collection load
-     *
-     * @return Collection|void
-     */
-    protected function _afterLoad()
-    {
-        parent::_afterLoad();
-        $this->resolveCustomerNames();
-    }
 }

app/code/Magento/Reports/Test/Unit/Controller/Adminhtml/Report/Shopcart/ExportAbandonedCsvTest.php

@@ -45,7 +45,7 @@ public function testExecute()
 
         $this->abstractBlockMock
             ->expects($this->once())
-            ->method('getCsvFile')
+            ->method('getCsv')
             ->willReturn($content);
 
         $this->layoutMock

app/code/Magento/Reports/Test/Unit/Model/ResourceModel/Quote/CollectionTest.php

@@ -131,41 +131,41 @@ public function testResolveCustomerNames()
         $this->selectMock->expects($this->any())
             ->method('getConnection')
             ->willReturn($this->connectionMock);
-        $this->selectMock->expects($this->atLeastOnce())
+        $this->selectMock->expects($this->once())
             ->method('from')
             ->with(['customer' => $customerTableName], ['entity_id', 'email'])
             ->willReturnSelf();
-        $this->selectMock->expects($this->atLeastOnce())
+        $this->selectMock->expects($this->once())
             ->method('columns')
             ->with(['customer_name' => $customerName])
             ->willReturnSelf();
-        $this->selectMock->expects($this->atLeastOnce())
+        $this->selectMock->expects($this->once())
             ->method('where')
             ->with('customer.entity_id IN (?)')
             ->willReturnSelf();
 
-        $this->connectionMock->expects($this->atLeastOnce())
+        $this->connectionMock->expects($this->once())
             ->method('getConcatSql')
             ->with(['firstname', 'lastname'], ' ')
             ->willReturn($customerName);
 
         $this->customerResourceMock->expects($this->any())
             ->method('getConnection')
             ->willReturn($this->connectionMock);
-        $this->customerResourceMock->expects($this->atLeastOnce())
+        $this->customerResourceMock->expects($this->once())
             ->method('getTable')
             ->with('customer_entity')
             ->willReturn($customerTableName);
 
         $this->connectionMock->expects($this->any())
             ->method('select')
             ->willReturn($this->selectMock);
-        $this->connectionMock->expects($this->atLeastOnce())
+        $this->connectionMock->expects($this->once())
             ->method('fetchAll')
             ->with($this->selectMock)
             ->willReturn($customersData);
 
-        $this->fetchStrategyMock->expects($this->atLeastOnce())
+        $this->fetchStrategyMock->expects($this->once())
             ->method('fetchAll')
             ->withAnyParameters()
             ->willReturn($customerId);