Merge pull request #64 from ivanhrytsaim/13682-GTM-Problems-V3

13682-GTM-Problems-V3

Author: magefan

Block/DataLayer/ViewItem.php

@@ -67,7 +67,8 @@ public function __construct(
      */
     protected function getDataLayer(): array
     {
-        $data = $this->viewItem->get($this->getCurrentProduct());
+        $product = $this->getCurrentProduct();
+        $data = $this->viewItem->get($product);
         if ($productId = $this->_request->getParam('mfpreselect')) {
             try {
                 $child = $this->productRepository->getById($productId);
@@ -78,7 +79,15 @@ protected function getDataLayer(): array
 
                     $delimiter = (false === strpos($childUrl, '?')) ? '?' : '&';
                     $childUrl .= $delimiter . 'mfpreselect=' . $child->getId();
-   
+
+                    $attributes = $product->getTypeInstance()->getConfigurableAttributes($product);
+                    foreach ($attributes as $attribute) {
+                        $attrCode = $attribute->getProductAttribute()->getAttributeCode();
+                        $value = $child->getData($attrCode);
+                        $delimiter = (false === strpos($childUrl, '?')) ? '?' : '&';
+                        $childUrl .= $delimiter . $attrCode . '=' . $value;
+                    }
+
                     $childData['ecommerce']['items'][0]['item_url'] = $childUrl;
                 }
                 $data = $childData;

Model/DataLayer/AbstractOrder.php

@@ -105,7 +105,8 @@ protected function getValue(Order $order): float
      */
     protected function setMfChildrenItem($entity)
     {
-        foreach ($entity->getAllItems() as $childrenItem) {
+        // Use getItem, not getAllItems, to prevent some errors with the custom plugins
+        foreach ($entity->getItems() as $childrenItem) {
             if ($parentItemId = $childrenItem->getParentItemId()) {
                 foreach ($entity->getAllVisibleItems() as $parentItem) {
                     if ($parentItem->getId() == $parentItemId) {