Merge pull request #2380 from dpfaffenbauer/issue/2375

[Core] re-add mainObjectId and objectId

Author: dpfaffenbauer

composer.json

@@ -130,7 +130,8 @@
     "vimeo/psalm": "^4.10"
   },
   "conflict": {
-    "jms/serializer-bundle": "4.1.0"
+    "jms/serializer-bundle": "4.1.0",
+    "league/csv": ">= 9.11"
   },
   "suggest": {
     "dpfaffenbauer/process-manager": "Allows to start Processes from within Pimcore UI and also tracks the status."

src/CoreShop/Component/Core/Model/OrderItemInterface.php

@@ -49,4 +49,12 @@ public function setItemWeight(?float $itemWeight);
     public function getTotalWeight(): ?float;
 
     public function setTotalWeight(?float $totalWeight);
+
+    public function getObjectId(): ?float;
+
+    public function setObjectId(?float $objectId);
+
+    public function getMainObjectId(): ?float;
+
+    public function setMainObjectId(?float $objectId);
 }

src/CoreShop/Component/Core/Order/Processor/CartTextProcessor.php

@@ -18,10 +18,12 @@
 
 namespace CoreShop\Component\Core\Order\Processor;
 
+use CoreShop\Component\Core\Model\OrderItemInterface;
 use CoreShop\Component\Order\Model\OrderInterface;
 use CoreShop\Component\Order\Model\PurchasableInterface;
 use CoreShop\Component\Order\Processor\CartProcessorInterface;
 use CoreShop\Component\Resource\Translation\Provider\TranslationLocaleProviderInterface;
+use Pimcore\Model\DataObject\AbstractObject;
 
 final class CartTextProcessor implements CartProcessorInterface
 {
@@ -32,12 +34,38 @@ public function __construct(
 
     public function process(OrderInterface $cart): void
     {
+        /**
+         * @var OrderItemInterface $item
+         */
         foreach ($cart->getItems() as $item) {
+            $product = $item->getProduct();
+
+            if (!$product instanceof PurchasableInterface) {
+                continue;
+            }
+
             foreach ($this->localeProvider->getDefinedLocalesCodes() as $locale) {
-                if ($item->getProduct() instanceof PurchasableInterface) {
-                    $item->setName($item->getProduct()->getName($locale), $locale);
-                }
+                $item->setName($product->getName($locale), $locale);
+            }
+
+            $item->setObjectId((float)$product->getId());
+
+            if (($product instanceof AbstractObject) && $product->getType() === AbstractObject::OBJECT_TYPE_VARIANT) {
+                $mainProduct = $this->findVariantMain($product);
+                $item->setMainObjectId((float)$mainProduct->getId());
             }
         }
     }
+
+    private function findVariantMain(AbstractObject $object): AbstractObject
+    {
+        $master = $object;
+        while ($master->getType() === AbstractObject::OBJECT_TYPE_VARIANT) {
+            if ($master->getParent() instanceof $master) {
+                $master = $master->getParent();
+            }
+        }
+
+        return $master;
+    }
 }