Merge pull request #1368 from dpfaffenbauer/feature/store-inheritance

[CoreBundle] only show restore-inheritance when actually inheritable
coreshop · Apr 30, 2020 · 155d991 · 155d991
2 parents 9e42ca0 + dc29602
commit 155d991
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/src/CoreShop/Bundle/CoreBundle/CoreExtension/StoreValues.php b/src/CoreShop/Bundle/CoreBundle/CoreExtension/StoreValues.php
@@ -512,6 +512,14 @@ public function getDataForEditmode($data, $object = null, $params = [])
             return $storeData;
         }
 
+        $class = Model\DataObject\ClassDefinition::getById($object->getClassId());
+
+        if (!$class instanceof Model\DataObject\ClassDefinition) {
+            return $storeData;
+        }
+
+        $inheritable = $class->getAllowInherit() && $object->getParent() instanceof $object;
+
         foreach ($data as $storeValuesEntity) {
             $context = SerializationContext::create();
             $context->setSerializeNull(true);
@@ -522,7 +530,8 @@ public function getDataForEditmode($data, $object = null, $params = [])
                 'name' => $storeValuesEntity->getStore()->getName(),
                 'currencySymbol' => $storeValuesEntity->getStore()->getCurrency()->getSymbol(),
                 'values' => $values,
-                'inherited' => false
+                'inherited' => false,
+                'inheritable' => $inheritable
             ];
         }
 
@@ -539,6 +548,7 @@ public function getDataForEditmode($data, $object = null, $params = [])
                 'name' => $store->getName(),
                 'currencySymbol' => $store->getCurrency()->getSymbol(),
                 'values' => ['price' => 0],
+                'inheritable' => $inheritable
             ];
         }
 

diff --git a/...p/Bundle/CoreBundle/Resources/public/pimcore/js/coreExtension/tags/coreShopStoreValues.js b/...p/Bundle/CoreBundle/Resources/public/pimcore/js/coreExtension/tags/coreShopStoreValues.js
@@ -208,7 +208,7 @@ pimcore.object.tags.coreShopStoreValues = Class.create(pimcore.object.tags.abstr
             data = this.data.hasOwnProperty(store.getId()) ? this.data[store.getId()] : null;
             valuesBuilder = new coreshop.product.storeValues.builder(this.fieldConfig, store, data, this.productUnitDefinitionsStore, this.object.id);
 
-            if (data && data.hasOwnProperty('inherited') && !data.inherited) {
+            if (data && data.hasOwnProperty('inherited') && !data.inherited && data.inheritable) {
                 formPanel.add({
                     xtype: 'button',
                     text: t('coreshop_restore_inheritance'),