10727-Do-not-include-shipping-or-tax

Author: ivanhrytsaim

Model/Config.php

@@ -46,8 +46,8 @@ class Config
     /**
      * Events config
      */
-    public const XML_PATH_EVENTS_PURCHASE_TAX_ENABLED = 'mfgoogletagmanager/events/purchase/tax_enabled';
-    public const XML_PATH_EVENTS_PURCHASE_SHIPPING_ENABLED = 'mfgoogletagmanager/events/purchase/shipping_enabled';
+    public const XML_PATH_EVENTS_PURCHASE_TAX_ENABLED = 'mfgoogletagmanager/events/price_tracking/tax_enabled';
+    public const XML_PATH_EVENTS_PURCHASE_SHIPPING_ENABLED = 'mfgoogletagmanager/events/price_tracking/shipping_enabled';
 
     /**
      * Customer data protection regulation config
@@ -187,7 +187,7 @@ public function getMeasurementId(string $storeId = null): string
      * @param string|null $storeId
      * @return bool
      */
-    public function isPurchaseTaxEnabled(string $storeId = null): bool
+    public function isTrackTaxEnabled(string $storeId = null): bool
     {
         return (bool)$this->getConfig(self::XML_PATH_EVENTS_PURCHASE_TAX_ENABLED, $storeId);
     }
@@ -196,7 +196,7 @@ public function isPurchaseTaxEnabled(string $storeId = null): bool
      * @param string|null $storeId
      * @return bool
      */
-    public function isPurchaseShippingEnabled(string $storeId = null): bool
+    public function isTrackShippingEnabled(string $storeId = null): bool
     {
         return (bool)$this->getConfig(self::XML_PATH_EVENTS_PURCHASE_SHIPPING_ENABLED, $storeId);
     }

Model/DataLayer/BeginCheckout.php

@@ -56,10 +56,23 @@ public function get(Quote $quote): array
             'event' => 'begin_checkout',
             'ecommerce' => [
                 'currency' => $this->getCurrentCurrencyCode(),
-                'value' => $this->formatPrice((float)$quote->getGrandTotal()),
+                'value' => $this->getOrderValue($quote),
                 'coupon' => $quote->getCouponCode() ?: '',
                 'items' => $items
             ]
         ]);
     }
+    protected function getOrderValue($quote): float
+    {
+        $quoteValue = (float)$quote->getGrandTotal();
+        if (!$this->config->isTrackTaxEnabled()) {
+            $quoteValue -= (float)$quote->getShippingAddress()->getTaxAmount();
+        }
+
+        if (!$this->config->isTrackShippingEnabled()) {
+            $quoteValue -= $quote->getShippingAddress()->getShippingAmount();
+        }
+
+        return $this->formatPrice($quoteValue);
+    }
 }

Model/DataLayer/Purchase.php

@@ -86,11 +86,11 @@ protected function getOrderValue($order): float
     {
         $orderValue = (float)$order->getGrandTotal();
 
-        if (!$this->config->isPurchaseTaxEnabled()) {
+        if (!$this->config->isTrackTaxEnabled()) {
             $orderValue -= $order->getTaxAmount();
         }
 
-        if (!$this->config->isPurchaseShippingEnabled()) {
+        if (!$this->config->isTrackShippingEnabled()) {
             $orderValue -= $order->getShippingAmount();
         }
 

Model/DataLayer/ViewCart.php

@@ -58,12 +58,25 @@ public function get(Quote $quote): array
             'event' => 'view_cart',
             'ecommerce' => [
                 'currency' => $this->getCurrentCurrencyCode(),
-                'value' => $this->formatPrice((float)$quote->getGrandTotal()),
+                'value' => $this->getOrderValue($quote),
                 'items' => $items
             ],
             'items_count' => count($items),
             'items_qty' => $itemsQty,
             'coupon_code' => $quote->getCouponCode() ?: ''
         ]);
     }
+    protected function getOrderValue($quote): float
+    {
+        $quoteValue = (float)$quote->getGrandTotal();
+        if (!$this->config->isTrackTaxEnabled()) {
+            $quoteValue -= (float)$quote->getShippingAddress()->getTaxAmount();
+        }
+
+        if (!$this->config->isTrackShippingEnabled()) {
+            $quoteValue -= $quote->getShippingAddress()->getShippingAmount();
+        }
+
+        return $this->formatPrice($quoteValue);
+    }
 }

Model/DataLayer/ViewItem.php

@@ -52,11 +52,21 @@ public function get(Product $product): array
             'event' => 'view_item',
             'ecommerce' => [
                 'currency' => $this->getCurrentCurrencyCode(),
-                'value' => $this->getPrice($product),
+                'value' => $this->getOrderValue($product),
                 'items' => [
                     $item
                 ]
             ]
         ]);
     }
+    protected function getOrderValue($product): float
+    {
+        $productValue = $this->getPrice($product);
+
+        if (!$this->config->isTrackTaxEnabled()) {
+            $productValue = $product->getPriceInfo()->getPrice('final_price')->getAmount()->getValue('tax');
+        }
+
+        return $this->formatPrice($productValue);
+    }
 }

etc/adminhtml/system.xml

@@ -348,8 +348,8 @@ To create a new secret, navigate in the
             </group>
             <group id="events" translate="label" type="text" sortOrder="62" showInDefault="1" showInWebsite="1" showInStore="1">
                 <label>Events</label>
-                <group id="purchase" translate="label" type="text" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
-                    <label>Purchase</label>
+                <group id="price_tracking" translate="label" type="text" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
+                    <label>Price Tracking</label>
                     <field id="shipping_enabled" translate="label comment" type="select" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
                         <label>Include Shipping In Purchase Value</label>
                         <comment>If enabled, shipping amount will be included into purchase value (the monetary value of the event).</comment>

etc/config.xml

@@ -63,10 +63,10 @@
                 <categories/>
             </attributes>
             <events>
-                <purchase>
+                <price_tracking>
                     <shipping_enabled>1</shipping_enabled>
                     <tax_enabled>1</tax_enabled>
-                </purchase>
+                </price_tracking>
             </events>
             <page_speed_optimization>
                 <enabled>0</enabled>