Merge pull request #2068 from dpfaffenbauer/variants-recursive

[Variant] allow recursive attributes and variants
coreshop · Sep 8, 2022 · 5b0cdc3 · 5b0cdc3
2 parents 4248343 + de50139
commit 5b0cdc3
Show file tree

Hide file tree

Showing 6 changed files with 43 additions and 16 deletions.
diff --git a/src/CoreShop/Bundle/VariantBundle/EventListener/AttributeListener.php b/src/CoreShop/Bundle/VariantBundle/EventListener/AttributeListener.php
@@ -49,13 +49,17 @@ public function preUpdate(DataObjectEvent $dataObjectEvent): void
             return;
         }
 
-        $parent = $object->getParent();
+        $parent = $object;
 
-        if ($parent instanceof AttributeGroupInterface) {
-            $object->setAttributeGroup($parent);
-        } else {
-            $object->setAttributeGroup(null);
-        }
+        do {
+            $parent = $parent->getParent();
+
+            if ($parent instanceof AttributeGroupInterface) {
+                $object->setAttributeGroup($parent);
+                break;
+            }
+
+        } while($parent != null);
 
         $this->validate($object);
     }

diff --git a/src/CoreShop/Bundle/VariantBundle/Twig/Extension/VariantExtension.php b/src/CoreShop/Bundle/VariantBundle/Twig/Extension/VariantExtension.php
@@ -76,7 +76,7 @@ public function serializeGroups(array $attributeGroups, array $groups = ['coresh
         return $this->serializer->normalize($attributeGroups, 'json', [
             'groups' => $groups,
             AbstractNormalizer::CALLBACKS => [
-                'valueColor' => static function (?string $innerObject) {
+                'valueColor' => static function (string $innerObject) {
                     return $innerObject;
                 },
             ],

diff --git a/src/CoreShop/Bundle/VariantBundle/Validator/Constraints/ValidAttributesTypeValidator.php b/src/CoreShop/Bundle/VariantBundle/Validator/Constraints/ValidAttributesTypeValidator.php
@@ -16,7 +16,7 @@
 
 use CoreShop\Component\Variant\Model\AttributeGroupInterface;
 use CoreShop\Component\Variant\Model\AttributeInterface;
-use Pimcore\Model\DataObject\Concrete;
+use Pimcore\Model\DataObject;
 use Symfony\Component\Validator\Constraint;
 use Symfony\Component\Validator\ConstraintValidator;
 use Webmozart\Assert\Assert;
@@ -48,7 +48,14 @@ public function validate($value, Constraint $constraint): void
             return;
         }
 
-        foreach ($parent->getChildren() as $child) {
+        $concreteListing = new DataObject\Listing();
+        $concreteListing->setCondition('o_path LIKE \''.$parent->getFullPath().'/%\'');
+
+        foreach ($concreteListing as $child) {
+            if (!$child instanceof AttributeInterface) {
+                continue;
+            }
+
             if (!$value instanceof $child) {
                 $this->context->buildViolation($constraint->message)
                     ->addViolation();

diff --git a/src/CoreShop/Component/Variant/AttributeCollector.php b/src/CoreShop/Component/Variant/AttributeCollector.php
@@ -33,7 +33,7 @@ public function getAttributesFromVariants(ProductVariantAwareInterface $product,
         if (AbstractObject::OBJECT_TYPE_VARIANT === $product->getType()) {
             $variants = [$product];
         } else {
-            $variants = $product->getChildren([AbstractObject::OBJECT_TYPE_VARIANT]);
+            $variants = $product->getVariants();
         }
 
         return $this->getAttributes($variants, $showInList);
@@ -99,9 +99,8 @@ public function getAttributesFromObject(ProductVariantAwareInterface $product, b
         if (AbstractObject::OBJECT_TYPE_VARIANT === $product->getType()) {
             $product = $product->getVariantParent();
         }
-        $variants = $product->getChildren([AbstractObject::OBJECT_TYPE_VARIANT]);
 
-        return $this->getAttributes($variants, $showInList);
+        return $this->getAttributes($product->getVariants(), $showInList);
     }
 
     public function getIndex(ProductVariantAwareInterface $product)
@@ -111,7 +110,7 @@ public function getIndex(ProductVariantAwareInterface $product)
             $product = $product->getVariantParent();
         }
 
-        $variants = $product->getChildren([AbstractObject::OBJECT_TYPE_VARIANT]);
+        $variants = $product->getVariants();
 
         foreach ($variants as $variant) {
             if (!$variant instanceof ProductVariantAwareInterface) {

diff --git a/src/CoreShop/Component/Variant/Model/ProductVariantAwareInterface.php b/src/CoreShop/Component/Variant/Model/ProductVariantAwareInterface.php
@@ -46,4 +46,6 @@ public function getMainVariant(): ?Concrete;
     public function setMainVariant(?Concrete $purchasable);
 
     public function getVariantParent();
+
+    public function getVariants(): array;
 }
diff --git a/src/CoreShop/Component/Variant/Model/ProductVariantTrait.php b/src/CoreShop/Component/Variant/Model/ProductVariantTrait.php
@@ -24,11 +24,26 @@ trait ProductVariantTrait
      */
     abstract public function getAttributes(): ?array;
 
+    public function getVariants(): array
+    {
+        if ($this instanceof Concrete) {
+            $list = $this::getList();
+            $list->setCondition('o_path LIKE \'' . $this->getFullPath() . '/%\'');
+            $list->setObjectTypes([AbstractObject::OBJECT_TYPE_VARIANT]);
+
+            $variants = $list->getObjects();
+        }
+        else {
+            $variants = $this->getChildren([AbstractObject::OBJECT_TYPE_VARIANT]);
+        }
+
+        return $variants;
+    }
+
     public function findAttributeForGroup(AttributeGroupInterface $attributeGroup): ?AttributeInterface
     {
         foreach ($this->getAttributes() as $attribute) {
-            if ($attribute->getAttributeGroup() && $attribute->getAttributeGroup()->getId() === $attributeGroup->getId(
-                )) {
+            if ($attribute->getAttributeGroup() && $attribute->getAttributeGroup()->getId() === $attributeGroup->getId()) {
                 return $attribute;
             }
         }
@@ -54,7 +69,7 @@ public function findMainVariant(): ?ProductVariantAwareInterface
         /**
          * @var ProductVariantAwareInterface[] $variants
          */
-        $variants = $this->getChildren([AbstractObject::OBJECT_TYPE_VARIANT]);
+        $variants = $this->getVariants();
 
         if (!$variants) {
             return null;