Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/2.4-develop' into 2.4-develop
Browse files Browse the repository at this point in the history
  • Loading branch information
PhamCuong committed Apr 2, 2021
2 parents dab53a1 + e8e981d commit 88e4889
Showing 1 changed file with 8 additions and 6 deletions.
14 changes: 8 additions & 6 deletions Helper/Data.php
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@

/**
* Class Data
*
* @package Mageplaza\DeleteOrders\Helper
*/
class Data extends AbstractData
Expand All @@ -50,10 +51,11 @@ class Data extends AbstractData
/**
* Data constructor.
*
* @param Context $context
* @param Context $context
* @param ObjectManagerInterface $objectManager
* @param StoreManagerInterface $storeManager
* @param OrderFactory $orderResourceFactory
* @param StoreManagerInterface $storeManager
* @param CollectionFactory $orderCollectionFactory
* @param OrderFactory $orderResourceFactory
*/
public function __construct(
Context $context,
Expand All @@ -72,7 +74,7 @@ public function __construct(
* Get order collection which matching the delete config condition
*
* @param null $storeId
* @param int $limit
* @param int $limit
*
* @return Collection
*/
Expand All @@ -83,7 +85,7 @@ public function getMatchingOrders($storeId = null, $limit = 1000)
->addFieldToFilter('customer_group_id', ['in' => $this->getOrderCustomerGroupConfig($storeId)]);

$storeIds = $this->getStoreViewConfig($storeId);
if (!in_array(Store::DEFAULT_STORE_ID, $storeIds, true)) {
if (!in_array(Store::DEFAULT_STORE_ID, $storeIds)) {
$orderCollection->addFieldToFilter('store_id', ['in' => $storeIds]);
}

Expand Down Expand Up @@ -223,7 +225,7 @@ public function getPeriodConfig($storeId = null)

/**
* @param $code
* @param null $storeId
* @param null $storeId
*
* @return mixed
*/
Expand Down

0 comments on commit 88e4889

Please sign in to comment.