Merge pull request #5035 in SW/shopware from sw-18913/5.3/fix-custome…

…rstream-selection to 5.3 * commit '43765dea5a3de35c9de936a04492fb19c59fec76': SW-18913 - Fix customer stream selection
shopware5 · Jun 1, 2017 · b06ed50 · b06ed50
2 parents e2f7493 + 43765de
commit b06ed50
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/...tJs/backend/base/attribute/field_handler/Shopware.attribute.CustomerStreamFieldHandler.js b/...tJs/backend/base/attribute/field_handler/Shopware.attribute.CustomerStreamFieldHandler.js
@@ -31,7 +31,7 @@
 
 Ext.define('Shopware.attribute.CustomerStreamFieldHandler', {
     extend: 'Shopware.attribute.AbstractEntityFieldHandler',
-    entity: "Shopware\\Models\\Customer\\CustomerStream",
+    entity: "Shopware\\Models\\CustomerStream\\CustomerStream",
     singleSelectionClass: 'Shopware.form.field.CustomerStreamSingleSelection',
     multiSelectionClass: 'Shopware.form.field.CustomerStreamGrid'
 });

diff --git a/themes/Backend/ExtJs/backend/emotion/view/detail/settings.js b/themes/Backend/ExtJs/backend/emotion/view/detail/settings.js
@@ -550,8 +550,8 @@ Ext.define('Shopware.apps.Emotion.view.detail.Settings', {
             height: 150,
             fieldLabel: '{s name="customer_streams"}{/s}',
             helpText: '{s name="customer_streams_help"}{/s}',
-            store: factory.createEntitySearchStore("Shopware\\Models\\Customer\\CustomerStream"),
-            searchStore: factory.createEntitySearchStore("Shopware\\Models\\Customer\\CustomerStream")
+            store: factory.createEntitySearchStore("Shopware\\Models\\CustomerStream\\CustomerStream"),
+            searchStore: factory.createEntitySearchStore("Shopware\\Models\\CustomerStream\\CustomerStream")
         });
 
         me.replacementSelection = Ext.create('Shopware.form.field.EmotionGrid', {

diff --git a/themes/Backend/ExtJs/backend/newsletter_manager/controller/main.js b/themes/Backend/ExtJs/backend/newsletter_manager/controller/main.js
@@ -59,7 +59,7 @@ Ext.define('Shopware.apps.NewsletterManager.controller.Main', {
         me.subApplication.recipientGroupStore = me.getStore('RecipientGroup').load();
         me.subApplication.newsletterGroupStore = me.getStore('NewsletterGroup').load();
         me.subApplication.customerGroupStore = me.getStore('Shopware.apps.Base.store.CustomerGroup').load();
-        me.subApplication.customerStreamStore = Ext.create('Shopware.attribute.SelectionFactory').createEntitySearchStore("Shopware\\Models\\Customer\\CustomerStream").load();
+        me.subApplication.customerStreamStore = Ext.create('Shopware.attribute.SelectionFactory').createEntitySearchStore("Shopware\\Models\\CustomerStream\\CustomerStream").load();
 
         // Don't do the default filtering - get all shops
         me.subApplication.shopStore = Ext.create('Shopware.apps.Base.store.Shop', {

diff --git a/themes/Backend/ExtJs/backend/voucher/view/voucher/base_configuration.js b/themes/Backend/ExtJs/backend/voucher/view/voucher/base_configuration.js
@@ -387,7 +387,7 @@ Ext.define('Shopware.apps.Voucher.view.voucher.BaseConfiguration', {
      */
     createRestrictionFormRight: function () {
         var factory = Ext.create('Shopware.attribute.SelectionFactory');
-        var customerStreamStore = factory.createEntitySearchStore('Shopware\\Models\\Customer\\CustomerStream');
+        var customerStreamStore = factory.createEntitySearchStore('Shopware\\Models\\CustomerStream\\CustomerStream');
 
         return [
             {