From 484bbba6407f03c7b2261992c0ec2433d00a2cb4 Mon Sep 17 00:00:00 2001
From: Dmytro Cheshun <mitry@atwix.com>
Date: Tue, 18 Sep 2018 15:44:00 +0300
Subject: [PATCH 1/2] Change sort order for customer group options #18101

---
 .../Customer/Model/GroupManagement.php        | 26 +++++++++++++++----
 1 file changed, 21 insertions(+), 5 deletions(-)

diff --git a/app/code/Magento/Customer/Model/GroupManagement.php b/app/code/Magento/Customer/Model/GroupManagement.php
index 47d7d7ad1ac41..73396edec6622 100644
--- a/app/code/Magento/Customer/Model/GroupManagement.php
+++ b/app/code/Magento/Customer/Model/GroupManagement.php
@@ -8,14 +8,16 @@
 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;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -65,6 +67,11 @@ class GroupManagement implements \Magento\Customer\Api\GroupManagementInterface
      */
     protected $filterBuilder;
 
+    /**
+     * @var SortOrderBuilder
+     */
+    private $sortOrderBuilder;
+
     /**
      * @param StoreManagerInterface $storeManager
      * @param ScopeConfigInterface $scopeConfig
@@ -73,6 +80,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,
@@ -81,7 +89,8 @@ public function __construct(
         GroupRepositoryInterface $groupRepository,
         GroupInterfaceFactory $groupDataFactory,
         SearchCriteriaBuilder $searchCriteriaBuilder,
-        FilterBuilder $filterBuilder
+        FilterBuilder $filterBuilder,
+        SortOrderBuilder $sortOrderBuilder = null
     ) {
         $this->storeManager = $storeManager;
         $this->scopeConfig = $scopeConfig;
@@ -90,6 +99,8 @@ public function __construct(
         $this->groupDataFactory = $groupDataFactory;
         $this->searchCriteriaBuilder = $searchCriteriaBuilder;
         $this->filterBuilder = $filterBuilder;
+        $this->sortOrderBuilder = $sortOrderBuilder ?: ObjectManager::getInstance()
+            ->get(SortOrderBuilder::class);
     }
 
     /**
@@ -155,9 +166,14 @@ 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();
     }

From dd9b2948a03abdc487e712d4237a9180484cb17b Mon Sep 17 00:00:00 2001
From: Yaroslav Rogoza <enarc@atwix.com>
Date: Wed, 19 Sep 2018 14:42:51 +0200
Subject: [PATCH 2/2] Minor code style fixes

---
 app/code/Magento/Customer/Model/GroupManagement.php | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/app/code/Magento/Customer/Model/GroupManagement.php b/app/code/Magento/Customer/Model/GroupManagement.php
index 73396edec6622..eb5d90f2fd7ea 100644
--- a/app/code/Magento/Customer/Model/GroupManagement.php
+++ b/app/code/Magento/Customer/Model/GroupManagement.php
@@ -20,6 +20,8 @@
 use Magento\Store\Model\StoreManagerInterface;
 
 /**
+ * The class contains methods for getting information about a customer group
+ *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class GroupManagement implements \Magento\Customer\Api\GroupManagementInterface
@@ -104,7 +106,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function isReadonly($groupId)
     {
@@ -118,7 +120,7 @@ public function isReadonly($groupId)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getDefaultGroup($storeId = null)
     {
@@ -144,7 +146,7 @@ public function getDefaultGroup($storeId = null)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getNotLoggedInGroup()
     {
@@ -152,7 +154,7 @@ public function getNotLoggedInGroup()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getLoggedInGroups()
     {
@@ -179,7 +181,7 @@ public function getLoggedInGroups()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getAllCustomersGroup()
     {