coreshop · dpfaffenbauer · Jul 31, 2025 · Aug 1, 2025
diff --git a/config/bundles.php b/config/bundles.php
@@ -7,4 +7,5 @@
     Pimcore\Bundle\StaticRoutesBundle\PimcoreStaticRoutesBundle::class => ['all' => true],
     Pimcore\Bundle\NewsletterBundle\PimcoreNewsletterBundle::class => ['all' => true],
     Pimcore\Bundle\OpenSearchClientBundle\PimcoreOpenSearchClientBundle::class => ['all' => true],
+    CoreShop\Bundle\FrontendBundle\CoreShopFrontendBundle::class => ['all' => true],
 ];
diff --git a/src/CoreShop/Bundle/AddressBundle/DependencyInjection/Configuration.php b/src/CoreShop/Bundle/AddressBundle/DependencyInjection/Configuration.php
@@ -278,7 +278,7 @@ private function addPimcoreResourcesSection(ArrayNodeDefinition $node): void
                     ->end()
                     ->scalarNode('permissions')
                         ->cannotBeOverwritten()
-                        ->defaultValue(['country', 'state', 'zone'])
+                        ->defaultValue([])
                     ->end()
                 ->end()
             ->end()

diff --git a/src/CoreShop/Bundle/AddressBundle/Resources/public/pimcore/js/country/item.js b/src/CoreShop/Bundle/AddressBundle/Resources/public/pimcore/js/country/item.js
@@ -20,11 +20,7 @@ coreshop.country.item = Class.create(coreshop.resource.item, {
         save: 'coreshop_country_save'
     },
 
-    getItems: function () {
-        return [this.getFormPanel()];
-    },
-
-    getFormPanel: function () {
+    getFormPanelItems: function () {
         var data = this.data,
             langTabs = [],
             salutationsStore = Ext.create('Ext.data.ArrayStore', {
@@ -104,35 +100,7 @@ coreshop.country.item = Class.create(coreshop.resource.item, {
             }
         ];
 
-        this.formPanel = new Ext.form.Panel({
-            bodyStyle: 'padding:20px 5px 20px 5px;',
-            border: false,
-            region: 'center',
-            autoScroll: true,
-            forceLayout: true,
-            defaults: {
-                forceLayout: true
-            },
-            buttons: [
-                {
-                    text: t('save'),
-                    handler: this.save.bind(this),
-                    iconCls: 'pimcore_icon_apply'
-                }
-            ],
-            items: [
-                {
-                    xtype: 'fieldset',
-                    autoHeight: true,
-                    labelWidth: 350,
-                    defaultType: 'textfield',
-                    defaults: {width: 300},
-                    items: items
-                }
-            ]
-        });
-
-        return this.formPanel;
+        return items;
     },
 
     getSaveData: function () {

diff --git a/src/CoreShop/Bundle/AddressBundle/Resources/public/pimcore/js/country/panel.js b/src/CoreShop/Bundle/AddressBundle/Resources/public/pimcore/js/country/panel.js
@@ -21,6 +21,7 @@ coreshop.country.panel = Class.create(coreshop.resource.panel, {
     storeId: 'coreshop_countries',
     iconCls: 'coreshop_icon_country',
     type: 'coreshop_countries',
+    permission: 'coreshop_permission_country',
 
     routing: {
         add: 'coreshop_country_add',

diff --git a/src/CoreShop/Bundle/AddressBundle/Resources/public/pimcore/js/state/item.js b/src/CoreShop/Bundle/AddressBundle/Resources/public/pimcore/js/state/item.js
@@ -20,11 +20,7 @@ coreshop.state.item = Class.create(coreshop.resource.item, {
         save: 'coreshop_state_save'
     },
 
-    getItems: function () {
-        return [this.getFormPanel()];
-    },
-
-    getFormPanel: function () {
+    getFormPanelItems: function () {
         var data = this.data,
             langTabs = [];
 
@@ -45,62 +41,35 @@ coreshop.state.item = Class.create(coreshop.resource.item, {
             langTabs.push(tab);
         });
 
-        this.formPanel = new Ext.form.Panel({
-            bodyStyle: 'padding:20px 5px 20px 5px;',
-            border: false,
-            region: 'center',
-            autoScroll: true,
-            forceLayout: true,
-            defaults: {
-                forceLayout: true
-            },
-            buttons: [
-                {
-                    text: t('save'),
-                    handler: this.save.bind(this),
-                    iconCls: 'pimcore_icon_apply'
-                }
-            ],
-            items: [
-                {
-                    xtype: 'fieldset',
-                    autoHeight: true,
-                    labelWidth: 350,
-                    defaultType: 'textfield',
-                    defaults: {width: 300},
-                    items: [
-                        {
-                            xtype: 'tabpanel',
-                            activeTab: 0,
-                            defaults: {
-                                autoHeight: true,
-                                bodyStyle: 'padding:10px;'
-                            },
-                            width: '100%',
-                            items: langTabs
-                        },
-                        {
-                            fieldLabel: t('coreshop_state_isoCode'),
-                            name: 'isoCode',
-                            value: data.isoCode
-                        },
-                        {
-                            xtype: 'checkbox',
-                            fieldLabel: t('active'),
-                            name: 'active',
-                            checked: data.active
-                        },
-                        {
-                            xtype: 'coreshop.country',
-                            value: data.country,
-                            name: 'country'
-                        }
-                    ]
-                }
-            ]
-        });
 
-        return this.formPanel;
+        return [
+            {
+                xtype: 'tabpanel',
+                activeTab: 0,
+                defaults: {
+                    autoHeight: true,
+                    bodyStyle: 'padding:10px;'
+                },
+                width: '100%',
+                items: langTabs
+            },
+            {
+                fieldLabel: t('coreshop_state_isoCode'),
+                name: 'isoCode',
+                value: data.isoCode
+            },
+            {
+                xtype: 'checkbox',
+                fieldLabel: t('active'),
+                name: 'active',
+                checked: data.active
+            },
+            {
+                xtype: 'coreshop.country',
+                value: data.country,
+                name: 'country'
+            }
+        ];
     },
 
     getSaveData: function () {

diff --git a/src/CoreShop/Bundle/AddressBundle/Resources/public/pimcore/js/state/panel.js b/src/CoreShop/Bundle/AddressBundle/Resources/public/pimcore/js/state/panel.js
@@ -21,6 +21,7 @@ coreshop.state.panel = Class.create(coreshop.resource.panel, {
     storeId: 'coreshop_states',
     iconCls: 'coreshop_icon_state',
     type: 'coreshop_states',
+    permission: 'coreshop_permission_state',
 
     routing: {
         add: 'coreshop_state_add',

diff --git a/src/CoreShop/Bundle/AddressBundle/Resources/public/pimcore/js/zone/item.js b/src/CoreShop/Bundle/AddressBundle/Resources/public/pimcore/js/zone/item.js
@@ -20,53 +20,20 @@ coreshop.zone.item = Class.create(coreshop.resource.item, {
         save: 'coreshop_zone_save'
     },
 
-    getItems: function () {
-        return [this.getFormPanel()];
-    },
-
-    getFormPanel: function () {
-
-        this.formPanel = new Ext.form.Panel({
-            bodyStyle: 'padding:20px 5px 20px 5px;',
-            border: false,
-            region: 'center',
-            autoScroll: true,
-            forceLayout: true,
-            defaults: {
-                forceLayout: true
+    getFormPanelItems: function () {
+        return [
+            {
+                fieldLabel: t('name'),
+                name: 'name',
+                value: this.data.name
             },
-            buttons: [
-                {
-                    text: t('save'),
-                    handler: this.save.bind(this),
-                    iconCls: 'pimcore_icon_apply'
-                }
-            ],
-            items: [
-                {
-                    xtype: 'fieldset',
-                    autoHeight: true,
-                    labelWidth: 250,
-                    defaultType: 'textfield',
-                    defaults: {width: 300},
-                    items: [
-                        {
-                            fieldLabel: t('name'),
-                            name: 'name',
-                            value: this.data.name
-                        },
-                        {
-                            xtype: 'checkbox',
-                            fieldLabel: t('active'),
-                            name: 'active',
-                            checked: this.data.active
-                        }
-                    ]
-                }
-            ]
-        });
-
-        return this.formPanel;
+            {
+                xtype: 'checkbox',
+                fieldLabel: t('active'),
+                name: 'active',
+                checked: this.data.active
+            }
+        ];
     },
 
     getSaveData: function () {

diff --git a/src/CoreShop/Bundle/AddressBundle/Resources/public/pimcore/js/zone/panel.js b/src/CoreShop/Bundle/AddressBundle/Resources/public/pimcore/js/zone/panel.js
@@ -21,6 +21,7 @@ coreshop.zone.panel = Class.create(coreshop.resource.panel, {
     storeId: 'coreshop_zones',
     iconCls: 'coreshop_icon_zone',
     type: 'coreshop_zones',
+    permission: 'coreshop_permission_zone',
 
     routing: {
         add: 'coreshop_zone_add',

diff --git a/src/CoreShop/Bundle/AddressBundle/Resources/translations/admin.de.yml b/src/CoreShop/Bundle/AddressBundle/Resources/translations/admin.de.yml
@@ -9,9 +9,21 @@ coreshop_state_isoCode: 'ISO'
 coreshop_state_country: 'Land'
 coreshop_country_addressFormat: 'Adressformatierung'
 coreshop_country_salutations: 'Anreden'
-coreshop_permission_country: 'CoreShop: Land'
-coreshop_permission_state: 'CoreShop: Staat'
-coreshop_permission_zone: 'CoreShop: Zone'
+coreshop_permission_country_list: 'CoreShop: Länder Liste'
+coreshop_permission_country_create: 'CoreShop: Land erstellen'
+coreshop_permission_country_edit: 'CoreShop: Land bearbeiten'
+coreshop_permission_country_delete: 'CoreShop: Land löschen'
+coreshop_permission_country_view: 'CoreShop: Land ansehen'
+coreshop_permission_state_list: 'CoreShop: Staaten Liste'
+coreshop_permission_state_create: 'CoreShop: Staat erstellen'
+coreshop_permission_state_edit: 'CoreShop: Staat bearbeiten'
+coreshop_permission_state_delete: 'CoreShop: Staat löschen'
+coreshop_permission_state_view: 'CoreShop: Staat ansehen'
+coreshop_permission_zone_list: 'CoreShop: Zonen Liste'
+coreshop_permission_zone_create: 'CoreShop: Zone erstellen'
+coreshop_permission_zone_edit: 'CoreShop: Zone bearbeiten'
+coreshop_permission_zone_delete: 'CoreShop: Zone löschen'
+coreshop_permission_zone_view: 'CoreShop: Zone ansehen'
 coreshop_address_company: 'Unternehmen'
 coreshop_address_firstname: 'Vorname'
 coreshop_address_lastname: 'Nachname'

diff --git a/src/CoreShop/Bundle/AddressBundle/Resources/translations/admin.en.yml b/src/CoreShop/Bundle/AddressBundle/Resources/translations/admin.en.yml
@@ -8,9 +8,21 @@ coreshop_state_isoCode: 'ISO Code'
 coreshop_state_country: 'Country'
 coreshop_country_addressFormat: 'Address Format'
 coreshop_country_salutations: 'Salutations'
-coreshop_permission_country: 'CoreShop: Country'
-coreshop_permission_state: 'CoreShop: State'
-coreshop_permission_zone: 'CoreShop: Zone'
+coreshop_permission_country_list: 'CoreShop Country: List'
+coreshop_permission_country_create: 'CoreShop Country: Create'
+coreshop_permission_country_edit: 'CoreShop : Edit'
+coreshop_permission_country_delete: 'CoreShop Country: Delete'
+coreshop_permission_country_view: 'CoreShop Country: View'
+coreshop_permission_state_list: 'CoreShop State: List'
+coreshop_permission_state_create: 'CoreShop State: Create'
+coreshop_permission_state_edit: 'CoreShop State: Edit'
+coreshop_permission_state_delete: 'CoreShop State: Delete'
+coreshop_permission_state_view: 'CoreShop State: View'
+coreshop_permission_zone_list: 'CoreShop: Zone List'
+coreshop_permission_zone_create: 'CoreShop Zone: Create'
+coreshop_permission_zone_edit: 'CoreShop Zone: Edit'
+coreshop_permission_zone_delete: 'CoreShop Zone: Delete'
+coreshop_permission_zone_view: 'CoreShop Zone: View'
 coreshop_address_company: 'Company'
 coreshop_address_firstname: 'Firstname'
 coreshop_address_lastname: 'Lastname'

diff --git a/src/CoreShop/Bundle/AddressBundle/Resources/translations/admin.it.yml b/src/CoreShop/Bundle/AddressBundle/Resources/translations/admin.it.yml
@@ -8,8 +8,6 @@ coreshop_state_isoCode: 'Codice ISO'
 coreshop_state_country: 'Paese'
 coreshop_country_addressFormat: 'Formato indirizzo'
 coreshop_country_salutations: 'Titoli'
-coreshop_permission_country: 'CoreShop: Paese'
-coreshop_permission_zone: 'CoreShop: Zona'
 coreshop_address_company: 'Azienda'
 coreshop_address_firstname: 'Nome'
 coreshop_address_lastname: 'Cognome'

diff --git a/src/CoreShop/Bundle/AddressBundle/Resources/translations/admin.pl.yml b/src/CoreShop/Bundle/AddressBundle/Resources/translations/admin.pl.yml
@@ -8,9 +8,6 @@ coreshop_state_isoCode: 'Kod ISO'
 coreshop_state_country: 'Kraj'
 coreshop_country_addressFormat: 'Format adresu'
 coreshop_country_salutations: 'Zwroty grzecznościowe'
-coreshop_permission_country: 'CoreShop: Kraj'
-coreshop_permission_state: 'CoreShop: Stan'
-coreshop_permission_zone: 'CoreShop: Strefa'
 coreshop_address_company: 'Firma'
 coreshop_address_firstname: 'Imię'
 coreshop_address_lastname: 'Nazwisko'

diff --git a/src/CoreShop/Bundle/AddressBundle/Resources/translations/admin.sv.yml b/src/CoreShop/Bundle/AddressBundle/Resources/translations/admin.sv.yml
@@ -9,9 +9,6 @@ coreshop_state_isoCode: 'ISO-kod'
 coreshop_state_country: 'Land'
 coreshop_country_addressFormat: 'Adressformat'
 coreshop_country_salutations: 'Hälsningsfras'
-coreshop_permission_country: 'CoreShop: Land'
-coreshop_permission_state: 'CoreShop: Delstat'
-coreshop_permission_zone: 'CoreShop: Zon'
 coreshop_address_company: 'Företag'
 coreshop_address_firstname: 'Förnamn'
 coreshop_address_lastname: 'Efternamn'