Merge pull request #26 from magefan/10304-send-revenue-without-taxes-v2

10304-send-revenue-without-taxes-v2

Author: magefan

Model/DataLayer/Purchase.php

@@ -61,7 +61,7 @@ public function get(Order $order, string $requester = ''): array
                 'event' => 'purchase',
                 'ecommerce' => [
                     'transaction_id' => $order->getIncrementId(),
-                    'value' => $this->formatPrice((float)$order->getGrandTotal()),
+                    'value' => $this->getOrderValue($order),
                     'tax' => $this->formatPrice((float)$order->getTaxAmount()),
                     'shipping' => $this->formatPrice((float)$order->getShippingAmount()),
                     'currency' => $this->getCurrentCurrencyCode(),
@@ -79,16 +79,17 @@ public function get(Order $order, string $requester = ''): array
     }
 
     /**
-     * @param array $data
-     * @return array
+     * @param $order
+     * @return float
      */
-    protected function eventWrap(array $data): array
+    protected function getOrderValue($order): float
     {
-        $data = parent::eventWrap($data);
+        $orderValue = (float)$order->getGrandTotal();
+
         if (!$this->config->isPurchaseTaxEnabled()) {
-            unset($data['ecommerce']['tax']);
+            $orderValue -= $order->getTaxAmount();
         }
 
-        return $data;
+        return $this->formatPrice($orderValue);
     }
 }

etc/adminhtml/system.xml

@@ -346,7 +346,6 @@ To create a new secret, navigate in the
                     <comment><![CDATA[<strong class="colorRed">Warning!</strong> Enabling this option may cause the performance impact.]]></comment>
                 </field>
             </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">
@@ -358,7 +357,6 @@ To create a new secret, navigate in the
                     </field>
                 </group>
             </group>
-            -->
             <group id="page_speed_optimization" translate="label" type="text" sortOrder="65" showInDefault="1" showInWebsite="1" showInStore="1">
                 <label>Page Speed Optimization</label>
                 <field id="enabled" translate="label comment" type="select" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">