Merge pull request #28 from ivanhrytsaim/10727-Do-not-shipping-or-tax

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

Author: magefan

Model/AbstractDataLayer.php

@@ -231,6 +231,65 @@ protected function getPrice(Product $product): float
         return $this->formatPrice($price);
     }
 
+    /**
+     * @param $product
+     * @return float
+     */
+    protected function getProductValue($product): float
+    {
+        $value = $this->getPrice($product);
+
+        if (!$this->config->isPurchaseTaxEnabled()) {
+            $value = $product->getPriceInfo()->getPrice('final_price')->getAmount()->getValue('tax');
+        }
+
+        return $this->formatPrice($value);
+    }
+
+    /**
+     * @param $quote
+     * @return float
+     */
+    protected function getQuoteValue($quote): float
+    {
+        $quoteValue = (float)$quote->getGrandTotal();
+        $address = $quote->getShippingAddress() ?: $quote->getBillingAddress();
+
+        if (!$this->config->isPurchaseTaxEnabled()) {
+            $quoteValue -= (float)$address->getTaxAmount();
+        }
+
+        if (!$this->config->isPurchaseShippingEnabled()) {
+            $quoteValue -= (float)$address->getShippingAmount();
+        }
+
+        return $this->formatPrice($quoteValue);
+    }
+
+    /**
+     * @param $quoteItem
+     * @return float
+     */
+    protected function getQuoteItemValue($quoteItem): float
+    {
+        //fix for magento 2.3.2 - module-quote/Model/Quote/Item/Processor.php prepareItem does not set price to quote item
+        $quoteItemValue = $quoteItem->getPriceInclTax();
+        if (!$quoteItemValue && ($quoteItemProduct = $quoteItem->getProduct())) {
+            $quoteItemValue = (float)$quoteItemProduct->getPrice();
+        }
+
+        if (!$this->config->isPurchaseTaxEnabled()) {
+            $quoteItemValue -= (float)$quoteItem->getTaxAmount();
+        }
+
+        if (!$this->config->isPurchaseTaxEnabled()) {
+            $quoteItemValue -= (float)$quoteItem->getAddress()->getShippingAmount();
+        }
+
+        return $this->formatPrice($quoteItemValue);
+    }
+
+
     /**
      * @param Product $product
      * @param string $attributeCode

Model/DataLayer/BeginCheckout.php

@@ -56,7 +56,7 @@ public function get(Quote $quote): array
             'event' => 'begin_checkout',
             'ecommerce' => [
                 'currency' => $this->getCurrentCurrencyCode(),
-                'value' => $this->formatPrice((float)$quote->getGrandTotal()),
+                'value' => $this->getQuoteValue($quote),
                 'coupon' => $quote->getCouponCode() ?: '',
                 'items' => $items
             ],

Model/DataLayer/ViewCart.php

@@ -58,7 +58,7 @@ public function get(Quote $quote): array
             'event' => 'view_cart',
             'ecommerce' => [
                 'currency' => $this->getCurrentCurrencyCode(),
-                'value' => $this->formatPrice((float)$quote->getGrandTotal()),
+                'value' => $this->getQuoteValue($quote),
                 'items' => $items
             ],
             'items_count' => count($items),

Model/DataLayer/ViewItem.php

@@ -47,12 +47,11 @@ public function __construct(
     public function get(Product $product): array
     {
         $item = $this->gtmItem->get($product);
-
         return $this->eventWrap([
             'event' => 'view_item',
             'ecommerce' => [
                 'currency' => $this->getCurrentCurrencyCode(),
-                'value' => $this->getPrice($product),
+                'value' => $this->getProductValue($product),
                 'items' => [
                     $item
                 ]

etc/config.xml

@@ -64,8 +64,8 @@
             </attributes>
             <events>
                 <purchase>
-                    <shipping_enabled>1</shipping_enabled>
-                    <tax_enabled>1</tax_enabled>
+                    <shipping_enabled>0</shipping_enabled>
+                    <tax_enabled>0</tax_enabled>
                 </purchase>
             </events>
             <page_speed_optimization>