Merge pull request #2654 from dpfaffenbauer/issue/2650

[PaymentBundle/ShippingBundle] fix logo select form type
coreshop · Jun 20, 2024 · 030fedd · 030fedd
2 parents a7c3ff7 + 877a752
commit 030fedd
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/src/CoreShop/Bundle/PaymentBundle/Resources/public/pimcore/js/provider/item.js b/src/CoreShop/Bundle/PaymentBundle/Resources/public/pimcore/js/provider/item.js
@@ -14,6 +14,7 @@ pimcore.registerNS('coreshop.provider.item');
 coreshop.provider.item = Class.create(coreshop.resource.item, {
 
     iconCls: 'coreshop_icon_payment_provider',
+    logoSelect: null,
 
     routing: {
         save: 'coreshop_payment_provider_save'
@@ -81,6 +82,7 @@ coreshop.provider.item = Class.create(coreshop.resource.item, {
             langTabs.push(tab);
         });
 
+        this.logoSelect = this.getLogoSelect();
         var items = [
             {
                 fieldLabel: t('coreshop_identifier'),
@@ -98,7 +100,7 @@ coreshop.provider.item = Class.create(coreshop.resource.item, {
                 name: 'active',
                 checked: this.data.active
             },
-            this.getLogoSelect().getLayoutEdit(),
+            this.logoSelect.getLayoutEdit(),
             {
                 xtype: 'combobox',
                 itemId: 'paymentFactory',
@@ -306,6 +308,7 @@ coreshop.provider.item = Class.create(coreshop.resource.item, {
         };
 
         Ext.apply(data, this.formPanel.getForm().getFieldValues());
+        data.logo = this.logoSelect.getValue();
 
         var ruleGroups = this.paymentProviderRuleGroupsStore.getRange();
 

diff --git a/src/CoreShop/Bundle/ShippingBundle/Resources/public/pimcore/js/carrier/item.js b/src/CoreShop/Bundle/ShippingBundle/Resources/public/pimcore/js/carrier/item.js
@@ -24,6 +24,7 @@ coreshop.carrier.item = Class.create(coreshop.resource.item, {
         this.data = data;
         this.panelKey = panelKey;
         this.type = type;
+        this.logoSelect = null;
 
         var store = Ext.create('store.coreshop_carrier_shipping_rules');
 
@@ -91,6 +92,7 @@ coreshop.carrier.item = Class.create(coreshop.resource.item, {
             langTabs.push(tab);
         });
 
+        this.logoSelect = this.getLogoSelect();
         this.settingsForm = new Ext.form.Panel({
             iconCls: 'coreshop_icon_settings',
             title: t('settings'),
@@ -116,7 +118,7 @@ coreshop.carrier.item = Class.create(coreshop.resource.item, {
                         fieldLabel: t('coreshop_carrier_trackingUrl'),
                         value: data.trackingUrl
                     },
-                    this.getLogoSelect().getLayoutEdit(),
+                    this.logoSelect.getLayoutEdit(),
                     {
                         xtype: 'tabpanel',
                         activeTab: 0,
@@ -287,6 +289,7 @@ coreshop.carrier.item = Class.create(coreshop.resource.item, {
 
         Ext.apply(data, this.settingsForm.getForm().getFieldValues());
         Ext.apply(data, this.shippingLocationAndCosts.getForm().getFieldValues());
+        data.logo = this.logoSelect.getValue();
 
         var ruleGroups = this.shippingRuleGroupsStore.getRange();