Merge pull request #7328 in SW/shopware from ntr/5.5/add-sorting-payment-shipping to 5.5

* commit 'd7e9f3936d151b3d867afa76e29a15fd410d5c32':
  NTR - Add sorting for countries in payment and shipping module

Author: soebbing

themes/Backend/ExtJs/backend/payment/store/countries.js

@@ -38,6 +38,17 @@ Ext.define('Shopware.apps.Payment.store.Countries', {
     extend : 'Ext.data.Store',
     autoLoad : false,
     pageSize : 30,
-    model : 'Shopware.apps.Payment.model.Country'
+    model : 'Shopware.apps.Payment.model.Country',
+
+    sorters: [
+        {
+            property: 'active',
+            direction: 'DESC'
+        },
+        {
+            property: 'name',
+            direction: 'ASC'
+        }
+    ]
 });
 //{/block}

themes/Backend/ExtJs/backend/shipping/view/edit/country.js

@@ -109,8 +109,26 @@ Ext.define('Shopware.apps.Shipping.view.edit.Country', {
         });
         me.availableCountries.filters.clear();
         me.availableCountries.filter('usedIds', ids);
-        me.availableCountries.sort('position', 'ASC');
-        me.usedCountriesStore.sort('position', 'ASC');
+        me.availableCountries.sort([
+            {
+                property: 'active',
+                direction: 'DESC'
+            },
+            {
+                property: 'name',
+                direction: 'ASC'
+            },
+        ]);
+        me.usedCountriesStore.sort([
+            {
+                property: 'active',
+                direction: 'DESC'
+            },
+            {
+                property: 'name',
+                direction: 'ASC'
+            },
+        ]);
 
         // Create the view
         me.items = me.getItems();