Skip to content

Commit c4fa28d

Browse files
vkholoshenkoOlexii Korshenko
authored and
Olexii Korshenko
committed
MAGETWO-36857: Abandoned Carts report grid is not displayed
- remove dead code - unit-test for Magento\Quote\Model\Quote\Item
1 parent d582414 commit c4fa28d

File tree

6 files changed

+283
-119
lines changed

6 files changed

+283
-119
lines changed

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ class Grid extends \Magento\Reports\Block\Adminhtml\Grid\Shopcart
1616
/**
1717
* @var \Magento\Reports\Model\Resource\Quote\CollectionFactory
1818
*/
19-
protected $_quoteItemsFactory;
19+
protected $quoteItemCollectionFactory;
2020

2121
/**
2222
* @var \Magento\Quote\Model\QueryResolver
@@ -26,18 +26,18 @@ class Grid extends \Magento\Reports\Block\Adminhtml\Grid\Shopcart
2626
/**
2727
* @param \Magento\Backend\Block\Template\Context $context
2828
* @param \Magento\Backend\Helper\Data $backendHelper
29-
* @param \Magento\Reports\Model\Resource\Quote\Item\CollectionFactoryInterface $quoteItemsFactory
29+
* @param \Magento\Reports\Model\Resource\Quote\Item\CollectionFactory $quoteItemCollectionFactory
3030
* @param \Magento\Quote\Model\QueryResolver $queryResolver
3131
* @param array $data
3232
*/
3333
public function __construct(
3434
\Magento\Backend\Block\Template\Context $context,
3535
\Magento\Backend\Helper\Data $backendHelper,
36-
\Magento\Reports\Model\Resource\Quote\Item\CollectionFactoryInterface $quoteItemsFactory,
3736
\Magento\Quote\Model\QueryResolver $queryResolver,
37+
\Magento\Reports\Model\Resource\Quote\Item\CollectionFactory $quoteItemCollectionFactory,
3838
array $data = []
3939
) {
40-
$this->_quoteItemsFactory = $quoteItemsFactory;
40+
$this->quoteItemCollectionFactory = $quoteItemCollectionFactory;
4141
$this->queryResolver = $queryResolver;
4242
parent::__construct($context, $backendHelper, $data);
4343
}
@@ -57,7 +57,7 @@ protected function _construct()
5757
protected function _prepareCollection()
5858
{
5959
/** @var \Magento\Reports\Model\Resource\Quote\Item\Collection $collection */
60-
$collection = $this->_quoteItemsFactory->create();
60+
$collection = $this->quoteItemCollectionFactory->create();
6161
$collection->prepareActiveCartItems();
6262
$this->setCollection($collection);
6363
return parent::_prepareCollection();

app/code/Magento/Reports/Model/Resource/Quote/Item/Collection.php

Lines changed: 2 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,6 @@
1111
*/
1212
class Collection extends \Magento\Framework\Model\Resource\Db\Collection\AbstractCollection
1313
{
14-
const SELECT_COUNT_SQL_TYPE_CART = 1;
15-
16-
/**
17-
* @var int
18-
*/
19-
protected $_selectCountSqlType = 0;
20-
2114
/**
2215
* Join fields
2316
*
@@ -26,7 +19,7 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
2619
protected $_joinedFields = [];
2720

2821
/**
29-
* Map
22+
* Fields map for correlation names & real selected fields
3023
*
3124
* @var array
3225
*/
@@ -55,7 +48,7 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
5548
* @param \Magento\Catalog\Model\Resource\Product\Collection $productResource
5649
* @param \Magento\Customer\Model\Resource\Customer $customerResource
5750
* @param \Magento\Sales\Model\Resource\Order\Collection $orderResource
58-
* @param null $connection
51+
* @param \Zend_Db_Adapter_Abstract $connection
5952
* @param \Magento\Framework\Model\Resource\Db\AbstractDb $resource
6053
*/
6154
public function __construct(
@@ -92,17 +85,6 @@ protected function _construct()
9285
$this->_init('Magento\Quote\Model\Quote\Item', 'Magento\Quote\Model\Resource\Quote\Item');
9386
}
9487

95-
/**
96-
* Set type for COUNT SQL select
97-
*
98-
* @param int $type
99-
* @return $this
100-
*/
101-
public function setSelectCountSqlType($type)
102-
{
103-
$this->_selectCountSqlType = $type;
104-
return $this;
105-
}
10688

10789
/**
10890
* Prepare select query for products in carts report
@@ -232,32 +214,6 @@ protected function getCustomerNames($select)
232214
return $select;
233215
}
234216

235-
/**
236-
* Resolve customers data based on ids quote table.
237-
*
238-
* @return void
239-
*/
240-
public function resolveCustomerNames()
241-
{
242-
$select = $this->customerResource->getReadConnection()->select();
243-
$customerName = $select->getAdapter()->getConcatSql(['cust_fname.value', 'cust_lname.value'], ' ');
244-
245-
$select->from(
246-
['customer' => 'customer_entity']
247-
)->columns(
248-
['customer_name' => $customerName]
249-
)->where(
250-
'customer.entity_id IN (?)',
251-
array_column($this->getData(), 'customer_id')
252-
);
253-
$customersData = $select->getAdapter()->fetchAll($this->getCustomerNames($select));
254-
255-
foreach ($this->getItems() as $item) {
256-
$item->setData(array_merge($item->getData(), current($customersData)));
257-
next($customersData);
258-
}
259-
}
260-
261217
/**
262218
* Separate query for product and order data
263219
*

app/code/Magento/Reports/Model/Resource/Quote/Item/CollectionFactory.php

Lines changed: 0 additions & 50 deletions
This file was deleted.

app/code/Magento/Reports/Model/Resource/Quote/Item/CollectionFactoryInterface.php

Lines changed: 0 additions & 17 deletions
This file was deleted.

0 commit comments

Comments
 (0)