Merge remote-tracking branch 'origin/MAGETWO-36857' into develop

Author: Roman Ganin

app/code/Magento/Reports/Block/Adminhtml/Shopcart/Abandoned/Grid.php

@@ -8,6 +8,8 @@
 /**
  * Adminhtml abandoned shopping carts report grid block
  *
+ * @method \Magento\Reports\Model\Resource\Quote\Collection getCollection
+ *
  * @author      Magento Core Team <core@magentocommerce.com>
  * @SuppressWarnings(PHPMD.DepthOfInheritance)
  */

app/code/Magento/Reports/Block/Adminhtml/Shopcart/Product/Grid.php

@@ -16,7 +16,7 @@ class Grid extends \Magento\Reports\Block\Adminhtml\Grid\Shopcart
     /**
      * @var \Magento\Reports\Model\Resource\Quote\CollectionFactory
      */
-    protected $_quotesFactory;
+    protected $quoteItemCollectionFactory;
 
     /**
      * @var \Magento\Quote\Model\QueryResolver
@@ -26,18 +26,18 @@ class Grid extends \Magento\Reports\Block\Adminhtml\Grid\Shopcart
     /**
      * @param \Magento\Backend\Block\Template\Context $context
      * @param \Magento\Backend\Helper\Data $backendHelper
-     * @param \Magento\Reports\Model\Resource\Quote\CollectionFactoryInterface $quotesFactory
+     * @param \Magento\Reports\Model\Resource\Quote\Item\CollectionFactory $quoteItemCollectionFactory
      * @param \Magento\Quote\Model\QueryResolver $queryResolver
      * @param array $data
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
         \Magento\Backend\Helper\Data $backendHelper,
-        \Magento\Reports\Model\Resource\Quote\CollectionFactoryInterface $quotesFactory,
         \Magento\Quote\Model\QueryResolver $queryResolver,
+        \Magento\Reports\Model\Resource\Quote\Item\CollectionFactory $quoteItemCollectionFactory,
         array $data = []
     ) {
-        $this->_quotesFactory = $quotesFactory;
+        $this->quoteItemCollectionFactory = $quoteItemCollectionFactory;
         $this->queryResolver = $queryResolver;
         parent::__construct($context, $backendHelper, $data);
     }
@@ -56,7 +56,8 @@ protected function _construct()
      */
     protected function _prepareCollection()
     {
-        $collection = $this->_quotesFactory->create();
+        /** @var \Magento\Reports\Model\Resource\Quote\Item\Collection $collection */
+        $collection = $this->quoteItemCollectionFactory->create();
         $collection->prepareActiveCartItems();
         $this->setCollection($collection);
         return parent::_prepareCollection();
@@ -68,11 +69,11 @@ protected function _prepareCollection()
     protected function _prepareColumns()
     {
         $this->addColumn(
-            'entity_id',
+            'product_id',
             [
                 'header' => __('ID'),
                 'align' => 'right',
-                'index' => 'entity_id',
+                'index' => 'product_id',
                 'sortable' => false,
                 'header_css_class' => 'col-id',
                 'column_css_class' => 'col-id'
@@ -146,6 +147,6 @@ protected function _prepareColumns()
      */
     public function getRowUrl($row)
     {
-        return $this->getUrl('catalog/product/edit', ['id' => $row->getEntityId()]);
+        return $this->getUrl('catalog/product/edit', ['id' => $row->getProductId()]);
     }
 }