Merge pull request #7329 in SW/shopware from ntr/5.5/country-sorting to 5.5

soebbing · soebbing · commit 01552431214d · 2019-01-18T09:57:05.000+01:00
* commit '2957da598eaf289726aef91d24d29adff596a61d':
  NTR - Add more sorting for countries
diff --git a/engine/Shopware/Controllers/Backend/Order.php b/engine/Shopware/Controllers/Backend/Order.php
@@ -276,8 +276,19 @@ public function loadStoresAction()
             return $paymentStateItem;
         }, $paymentState);
 
+        $countriesSort = [
+            [
+                'property' => 'countries.active',
+                'direction' => 'DESC',
+            ],
+            [
+                'property' => 'countries.name',
+                'direction' => 'ASC',
+            ],
+        ];
+
         $shops = $this->getShopRepository()->getBaseListQuery()->getArrayResult();
-        $countries = $this->getCountryRepository()->getCountriesQuery()->getArrayResult();
+        $countries = $this->getCountryRepository()->getCountriesQuery(null, $countriesSort)->getArrayResult();
         $payments = $this->getPaymentRepository()->getAllPaymentsQuery()->getArrayResult();
         $dispatches = $this->getDispatchRepository()->getDispatchesQuery()->getArrayResult();
         $documentTypes = $this->getRepository()->getDocumentTypesQuery()->getArrayResult();
diff --git a/engine/Shopware/Controllers/Backend/Payment.php b/engine/Shopware/Controllers/Backend/Payment.php
@@ -91,7 +91,7 @@ public function getPaymentsAction()
     public function getCountriesAction()
     {
         $result = $this->getCountryRepository()
-            ->getCountriesQuery()
+            ->getCountriesQuery(null, $this->Request()->getParam('sort', []))
             ->getArrayResult();
         $this->View()->assign(['success' => true, 'data' => $result]);
     }
diff --git a/themes/Backend/ExtJs/backend/base/attribute/Shopware.attribute.Form.js b/themes/Backend/ExtJs/backend/base/attribute/Shopware.attribute.Form.js
@@ -394,6 +394,7 @@ Ext.define('Shopware.attribute.Form', {
             Ext.create('Shopware.attribute.MediaFieldHandler'),
             Ext.create('Shopware.attribute.ProductFieldHandler'),
             Ext.create('Shopware.attribute.BlogFieldHandler'),
+            Ext.create('Shopware.attribute.CountryFieldHandler'),
             Ext.create('Shopware.attribute.BooleanFieldHandler'),
             Ext.create('Shopware.attribute.DateFieldHandler'),
             Ext.create('Shopware.attribute.DateTimeFieldHandler'),
diff --git a/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.CountryGrid.js b/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.CountryGrid.js
@@ -0,0 +1,42 @@
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our dual licensing model, this program can be used either
+ * under the terms of the GNU Affero General Public License, version 3,
+ * or under a proprietary license.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission and of our proprietary license can be found at and
+ * in the LICENSE file you have received along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore any rights, title and interest in
+ * our trademarks remain entirely with us.
+ *
+ * @category    Shopware
+ * @package     Base
+ * @subpackage  Attribute
+ * @version     $Id$
+ * @author      shopware AG
+ */
+
+//{namespace name="backend/attributes/fields"}
+
+// {block name="backend/base/attribute/field/country_grid"}
+Ext.define('Shopware.form.field.CountryGrid', {
+    extend: 'Shopware.form.field.Grid',
+    alias: 'widget.shopware-form-field-country-grid',
+    mixins: ['Shopware.model.Helper'],
+
+    createSearchField: function() {
+        return Ext.create('Shopware.form.field.CountrySingleSelection', this.getComboConfig());
+    }
+});
+// {/block}
diff --git a/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.CountrySingleSelection.js b/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.CountrySingleSelection.js
@@ -0,0 +1,56 @@
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our dual licensing model, this program can be used either
+ * under the terms of the GNU Affero General Public License, version 3,
+ * or under a proprietary license.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission and of our proprietary license can be found at and
+ * in the LICENSE file you have received along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore any rights, title and interest in
+ * our trademarks remain entirely with us.
+ *
+ * @category    Shopware
+ * @package     Base
+ * @subpackage  Attribute
+ * @version     $Id$
+ * @author      shopware AG
+ */
+
+//{namespace name="backend/attributes/fields"}
+
+// {block name="backend/base/attribute/field/country"}
+Ext.define('Shopware.form.field.CountrySingleSelection', {
+    extend: 'Shopware.form.field.SingleSelection',
+    alias: 'widget.shopware-form-field-country-single-selection',
+
+    getComboConfig: function() {
+        var me = this;
+        var config = me.callParent(arguments);
+
+        config.store.remoteSort = true;
+        config.store.sort([
+            {
+                property: 'active',
+                direction: 'DESC'
+            },
+            {
+                property: 'name',
+                direction: 'ASC'
+            }
+        ]);
+
+        return config;
+    }
+});
+// {/block}
diff --git a/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.SingleSelection.js b/themes/Backend/ExtJs/backend/base/attribute/field/Shopware.form.field.SingleSelection.js
@@ -47,7 +47,9 @@ Ext.define('Shopware.form.field.SingleSelection', {
         var store = me.store;
         me.store = Ext.create('Ext.data.Store', {
             model: store.model,
-            proxy: store.getProxy()
+            proxy: store.getProxy(),
+            remoteSort: store.remoteSort,
+            sorters: store.getSorters(),
         });
         me.items = me.createItems();
 
diff --git a/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.CountryFieldHandler.js b/themes/Backend/ExtJs/backend/base/attribute/field_handler/Shopware.attribute.CountryFieldHandler.js
@@ -0,0 +1,37 @@
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our dual licensing model, this program can be used either
+ * under the terms of the GNU Affero General Public License, version 3,
+ * or under a proprietary license.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission and of our proprietary license can be found at and
+ * in the LICENSE file you have received along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore any rights, title and interest in
+ * our trademarks remain entirely with us.
+ *
+ * @category    Shopware
+ * @package     Base
+ * @subpackage  Attribute
+ * @version     $Id$
+ * @author      shopware AG
+ */
+
+// {block name="backend/base/attribute/field_handler/country"}
+Ext.define('Shopware.attribute.CountryFieldHandler', {
+    extend: 'Shopware.attribute.AbstractEntityFieldHandler',
+    entity: "Shopware\\Models\\Country\\Country",
+    singleSelectionClass: 'Shopware.form.field.CountrySingleSelection',
+    multiSelectionClass: 'Shopware.form.field.CountryGrid'
+});
+// {/block}
diff --git a/themes/Backend/ExtJs/backend/base/bootstrap.js b/themes/Backend/ExtJs/backend/base/bootstrap.js
@@ -253,9 +253,11 @@
 {include file='backend/base/attribute/field/Shopware.form.field.ProductGrid.js'}
 {include file='backend/base/attribute/field/Shopware.form.field.PropertyOptionGrid.js'}
 {include file='backend/base/attribute/field/Shopware.form.field.BlogGrid.js'}
+{include file='backend/base/attribute/field/Shopware.form.field.CountryGrid.js'}
 {include file='backend/base/attribute/field/Shopware.form.field.CategoryGrid.js'}
 {include file='backend/base/attribute/field/Shopware.form.field.ProductSingleSelection.js'}
 {include file='backend/base/attribute/field/Shopware.form.field.BlogSingleSelection.js'}
+{include file='backend/base/attribute/field/Shopware.form.field.CountrySingleSelection.js'}
 {include file='backend/base/attribute/field/Shopware.form.field.PropertyOptionSingleSelection.js'}
 {include file='backend/base/attribute/field/Shopware.form.field.CategorySingleSelection.js'}
 {include file='backend/base/attribute/field/Shopware.form.field.VoucherSingleSelection.js'}
@@ -292,6 +294,7 @@
 {include file='backend/base/attribute/field_handler/Shopware.attribute.AbstractEntityFieldHandler.js'}
 {include file='backend/base/attribute/field_handler/Shopware.attribute.CategoryFieldHandler.js'}
 {include file='backend/base/attribute/field_handler/Shopware.attribute.BlogFieldHandler.js'}
+{include file='backend/base/attribute/field_handler/Shopware.attribute.CountryFieldHandler.js'}
 {include file='backend/base/attribute/field_handler/Shopware.attribute.ProductFieldHandler.js'}
 {include file='backend/base/attribute/field_handler/Shopware.attribute.PropertyOptionFieldHandler.js'}
 {include file='backend/base/attribute/field_handler/Shopware.attribute.MediaFieldHandler.js'}
diff --git a/themes/Backend/ExtJs/backend/customer/view/address/detail/address.js b/themes/Backend/ExtJs/backend/customer/view/address/detail/address.js
@@ -76,6 +76,7 @@ Ext.define('Shopware.apps.Customer.view.address.detail.Address', {
 
         var factory = Ext.create('Shopware.attribute.SelectionFactory');
         var countryStore = factory.createEntitySearchStore("Shopware\\Models\\Country\\Country");
+        countryStore.remoteSort = true;
 
         countryStore.sort([{
             property: 'active',
@@ -185,7 +186,10 @@ Ext.define('Shopware.apps.Customer.view.address.detail.Address', {
                                 select: me.onCountrySelect,
                                 scope: me
                             },
-                            store: countryStore
+                            store: countryStore,
+                            xtype: 'pagingcombobox',
+                            valueField:'id',
+                            displayField: 'name'
                         },
                         stateId: {
                             fieldLabel: me.snippets.fields.state,
diff --git a/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/has_address_with_country_condition.js b/themes/Backend/ExtJs/backend/customer/view/customer_stream/conditions/has_address_with_country_condition.js
@@ -53,6 +53,18 @@ Ext.define('Shopware.apps.Customer.view.customer_stream.conditions.HasAddressWit
 
     _create: function() {
         var factory = Ext.create('Shopware.attribute.SelectionFactory');
+        var store = factory.createEntitySearchStore('Shopware\\Models\\Country\\Country');
+        store.remoteSort = true;
+        store.sort([
+            {
+                property: 'active',
+                direction: 'DESC'
+            },
+            {
+                property: 'name',
+                direction: 'ASC'
+            }
+        ]);
 
         return {
             title: '{s name="has_address_with_country_condition_selection"}{/s}',
@@ -65,7 +77,7 @@ Ext.define('Shopware.apps.Customer.view.customer_stream.conditions.HasAddressWit
                 useSeparator: false,
                 allowBlank: false,
                 store: factory.createEntitySearchStore('Shopware\\Models\\Country\\Country'),
-                searchStore: factory.createEntitySearchStore('Shopware\\Models\\Country\\Country')
+                searchStore: store,
             }]
         };
     }
diff --git a/themes/Backend/ExtJs/backend/customer/view/main/customer_list_filter.js b/themes/Backend/ExtJs/backend/customer/view/main/customer_list_filter.js
@@ -45,6 +45,7 @@ Ext.define('Shopware.apps.Customer.view.main.CustomerListFilter', {
         var shopStore = factory.createEntitySearchStore("Shopware\\Models\\Shop\\Shop");
         var salutationStore = Ext.create('Shopware.apps.Base.store.Salutation');
         var countryStore = factory.createEntitySearchStore("Shopware\\Models\\Country\\Country");
+        countryStore.remoteSort = true;
 
         countryStore.sort([{
             property: 'active',
diff --git a/themes/Backend/ExtJs/backend/order/view/list/filter.js b/themes/Backend/ExtJs/backend/order/view/list/filter.js
@@ -339,33 +339,32 @@ Ext.define('Shopware.apps.Order.view.list.Filter', {
     },
 
     createDeliveryCountrySelection: function() {
-        var selectionFactory = Ext.create('Shopware.attribute.SelectionFactory', {});
-        return Ext.create('Shopware.form.field.PagingComboBox', {
+        return Ext.create('Ext.form.field.ComboBox', {
             name: 'shipping.countryId',
             store: this.getCountryStore(),
             valueField: 'id',
             queryMode: 'remote',
             displayField: 'name',
-            fieldLabel: this.snippets.shipping,
-            pageSize: 7
+            fieldLabel: this.snippets.shipping
         });
     },
 
     createBillingCountrySelection: function() {
-        return Ext.create('Shopware.form.field.PagingComboBox', {
+        return Ext.create('Ext.form.field.ComboBox', {
             name: 'billing.countryId',
             store: this.getCountryStore(),
             valueField: 'id',
             queryMode: 'remote',
             displayField: 'name',
-            fieldLabel: this.snippets.billing,
-            pageSize: 7
+            fieldLabel: this.snippets.billing
         });
     },
 
     getCountryStore: function() {
         var selectionFactory = Ext.create('Shopware.attribute.SelectionFactory', {});
         var store = selectionFactory.createEntitySearchStore("Shopware\\Models\\Country\\Country");
+        store.pageSize = 999;
+        store.remoteSort = true;
 
         store.sort([{
             property: 'active',
diff --git a/themes/Backend/ExtJs/backend/payment/store/countries.js b/themes/Backend/ExtJs/backend/payment/store/countries.js
@@ -40,13 +40,14 @@ Ext.define('Shopware.apps.Payment.store.Countries', {
     pageSize : 30,
     model : 'Shopware.apps.Payment.model.Country',
 
+    remoteSort: true,
     sorters: [
         {
-            property: 'active',
+            property: 'countries.active',
             direction: 'DESC'
         },
         {
-            property: 'name',
+            property: 'countries.name',
             direction: 'ASC'
         }
     ]
diff --git a/themes/Backend/ExtJs/backend/shipping/view/edit/country.js b/themes/Backend/ExtJs/backend/shipping/view/edit/country.js
@@ -107,6 +107,7 @@ Ext.define('Shopware.apps.Shipping.view.edit.Country', {
         me.usedCountriesStore.each(function(element) {
             ids.push(element.get('id'));
         });
+        me.availableCountries.remoteSort = true;
         me.availableCountries.filters.clear();
         me.availableCountries.filter('usedIds', ids);
         me.availableCountries.sort([

Original file line number	Diff line number	Diff line change
`@@ -91,7 +91,7 @@ public function getPaymentsAction()`
`91`	`91`	`public function getCountriesAction()`
`92`	`92`	`{`
`93`	`93`	`$result = $this->getCountryRepository()`
`94`		`- ->getCountriesQuery()`
	`94`	`+ ->getCountriesQuery(null, $this->Request()->getParam('sort', []))`
`95`	`95`	`->getArrayResult();`
`96`	`96`	`$this->View()->assign(['success' => true, 'data' => $result]);`
`97`	`97`	`}`