Merge pull request #16 from magefan/9365-add-ecomm_pagetype-to-data-layer-and-export-plus-розширені-конверсії

9365-add-ecomm_pagetype-to-data-layer-and-export-plus-розширені-конве…

Author: magefan

Model/AbstractDataLayer.php

@@ -62,6 +62,11 @@ class AbstractDataLayer
      */
     protected $customerGroupCode;
 
+    /**
+     * @var string
+     */
+    protected $ecommPageType = 'other';
+
     /**
      * AbstractDataLayer constructor.
      *
@@ -70,13 +75,13 @@ class AbstractDataLayer
      * @param CategoryRepositoryInterface $categoryRepository
      */
     public function __construct(
-        Config $config,
-        StoreManagerInterface $storeManager,
+        Config                      $config,
+        StoreManagerInterface       $storeManager,
         CategoryRepositoryInterface $categoryRepository,
-        RequestInterface $request = null,
-        Registry $registry = null,
-        Session $session = null,
-        GroupRepository $groupRepository = null
+        RequestInterface            $request = null,
+        Registry                    $registry = null,
+        Session                     $session = null,
+        GroupRepository             $groupRepository = null
     ) {
         $this->config = $config;
         $this->storeManager = $storeManager;
@@ -95,6 +100,24 @@ public function __construct(
         );
     }
 
+
+    /**
+     * @return string
+     */
+    public function getEcommPageType(): string
+    {
+        return $this->ecommPageType;
+    }
+
+    /**
+     * @param string $ecommPageType
+     * @return void
+     */
+    public function setEcommPageType(string $ecommPageType): void
+    {
+        $this->ecommPageType = $ecommPageType;
+    }
+
     /**
      * Get category names
      *
@@ -224,7 +247,7 @@ protected function getProductAttributeValue(Product $product, ?string $attribute
             if (is_array($result)) {
                 $result = implode(', ', $result);
             }
-            
+
             if ($result) {
                 return (string)$result;
             }
@@ -268,6 +291,7 @@ protected function eventWrap(array $data): array
 
         $data = $this->addCustomerGroup($data);
         $data = $this->addMfUniqueEventId($data);
+        $data = $this->addEcommPageType($data);
 
         return $data;
     }
@@ -299,4 +323,13 @@ protected function addMfUniqueEventId(array $data): array
 
         return $data;
     }
+
+    protected function addEcommPageType(array $data): array
+    {
+        if (!isset($data['ecomm_pagetype'])) {
+            $data['ecomm_pagetype'] = $this->getEcommPageType();
+        }
+
+        return $data;
+    }
 }

Model/DataLayer/Purchase.php

@@ -23,6 +23,11 @@ class Purchase extends AbstractDataLayer implements PurchaseInterface
      */
     private $gtmItem;
 
+    /**
+     * @var string
+     */
+    protected $ecommPageType = 'purchase';
+
     /**
      * Purchase constructor.
      *