Skip to content

[Backport] Change sort order for customer group options #18280

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 28, 2018
Merged

[Backport] Change sort order for customer group options #18280

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
484bbba
Change sort order for customer group options #18101
dmytro-ch Sep 18, 2018
dd9b294
Minor code style fixes
rogyar Sep 19, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 28 additions & 10 deletions app/code/Magento/Customer/Model/GroupManagement.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,20 @@
namespace Magento\Customer\Model;

use Magento\Customer\Api\Data\GroupInterface;
use Magento\Customer\Api\Data\GroupInterfaceFactory;
use Magento\Customer\Api\GroupRepositoryInterface;
use Magento\Framework\Api\FilterBuilder;
use Magento\Framework\Api\SearchCriteriaBuilder;
use Magento\Framework\Api\SortOrderBuilder;
use Magento\Framework\App\Config\ScopeConfigInterface;
use Magento\Framework\Api\FilterBuilder;
use Magento\Framework\App\ObjectManager;
use Magento\Framework\Data\Collection;
use Magento\Framework\Exception\NoSuchEntityException;
use Magento\Store\Model\StoreManagerInterface;
use Magento\Customer\Api\GroupRepositoryInterface;
use Magento\Customer\Api\Data\GroupInterfaceFactory;
use Magento\Customer\Model\GroupFactory;

/**
* The class contains methods for getting information about a customer group
*
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class GroupManagement implements \Magento\Customer\Api\GroupManagementInterface
Expand Down Expand Up @@ -65,6 +69,11 @@ class GroupManagement implements \Magento\Customer\Api\GroupManagementInterface
*/
protected $filterBuilder;

/**
* @var SortOrderBuilder
*/
private $sortOrderBuilder;

/**
* @param StoreManagerInterface $storeManager
* @param ScopeConfigInterface $scopeConfig
Expand All @@ -73,6 +82,7 @@ class GroupManagement implements \Magento\Customer\Api\GroupManagementInterface
* @param GroupInterfaceFactory $groupDataFactory
* @param SearchCriteriaBuilder $searchCriteriaBuilder
* @param FilterBuilder $filterBuilder
* @param SortOrderBuilder $sortOrderBuilder
*/
public function __construct(
StoreManagerInterface $storeManager,
Expand All @@ -81,7 +91,8 @@ public function __construct(
GroupRepositoryInterface $groupRepository,
GroupInterfaceFactory $groupDataFactory,
SearchCriteriaBuilder $searchCriteriaBuilder,
FilterBuilder $filterBuilder
FilterBuilder $filterBuilder,
SortOrderBuilder $sortOrderBuilder = null
) {
$this->storeManager = $storeManager;
$this->scopeConfig = $scopeConfig;
Expand All @@ -90,10 +101,12 @@ public function __construct(
$this->groupDataFactory = $groupDataFactory;
$this->searchCriteriaBuilder = $searchCriteriaBuilder;
$this->filterBuilder = $filterBuilder;
$this->sortOrderBuilder = $sortOrderBuilder ?: ObjectManager::getInstance()
->get(SortOrderBuilder::class);
}

/**
* {@inheritdoc}
* @inheritdoc
*/
public function isReadonly($groupId)
{
Expand All @@ -107,7 +120,7 @@ public function isReadonly($groupId)
}

/**
* {@inheritdoc}
* @inheritdoc
*/
public function getDefaultGroup($storeId = null)
{
Expand All @@ -133,15 +146,15 @@ public function getDefaultGroup($storeId = null)
}

/**
* {@inheritdoc}
* @inheritdoc
*/
public function getNotLoggedInGroup()
{
return $this->groupRepository->getById(self::NOT_LOGGED_IN_ID);
}

/**
* {@inheritdoc}
* @inheritdoc
*/
public function getLoggedInGroups()
{
Expand All @@ -155,15 +168,20 @@ public function getLoggedInGroups()
->setConditionType('neq')
->setValue(self::CUST_GROUP_ALL)
->create();
$groupNameSortOrder = $this->sortOrderBuilder
->setField('customer_group_code')
->setDirection(Collection::SORT_ORDER_ASC)
->create();
$searchCriteria = $this->searchCriteriaBuilder
->addFilters($notLoggedInFilter)
->addFilters($groupAll)
->addSortOrder($groupNameSortOrder)
->create();
return $this->groupRepository->getList($searchCriteria)->getItems();
}

/**
* {@inheritdoc}
* @inheritdoc
*/
public function getAllCustomersGroup()
{
Expand Down