Merge pull request #57 from stape-io/feature/event-value

Feature/event value

Author: chaikovskyia

CHANGELOG.md

@@ -1,5 +1,8 @@
 # Changelog
 
+v1.0.32
+- datalayer event value param added;
+
 v1.0.31
 - renamed module in admin panel;
 - added select_item event;

Model/Webhook/Adapter.php

@@ -13,7 +13,7 @@
 class Adapter
 {
 
-    public const MODULE_VERSION = '1.0.31';
+    public const MODULE_VERSION = '1.0.32';
 
     /**
      * @var Json $json

Observer/AddToCartComplete.php

@@ -87,6 +87,7 @@ public function execute(Observer $observer)
         $childItem = $quoteItem->getHasChildren() ? current($quoteItem->getChildren()) : null;
         $this->dataProvider->add('add_to_cart', [
             'currency' => $this->checkoutSession->getQuote()->getBaseCurrencyCode(),
+            'value' => (string) $this->priceCurrency->round($quoteItem->getBasePriceInclTax()),
             'items' => [
                 [
                     'item_name' => $product->getName(),

Plugin/Checkout/Cart/DeletePlugin.php

@@ -3,6 +3,7 @@
 namespace Stape\Gtm\Plugin\Checkout\Cart;
 
 use Magento\Checkout\Controller\Cart\Delete;
+use Magento\Checkout\Controller\Sidebar\RemoveItem;
 use Magento\Checkout\Model\Session as CheckoutSession;
 use Magento\Framework\Pricing\PriceCurrencyInterface;
 use Psr\Log\LoggerInterface;
@@ -71,19 +72,21 @@ public function __construct(
     /**
      * Add remove from cart event
      *
-     * @param Delete $subject
+     * @param Delete|RemoveItem $subject
      * @param callable $proceed
      * @return mixed
      * @throws \Magento\Framework\Exception\LocalizedException
      * @throws \Magento\Framework\Exception\NoSuchEntityException
      */
-    public function aroundExecute(Delete $subject, callable $proceed)
+    public function aroundExecute($subject, callable $proceed)
     {
         if (!$this->configProvider->isActive()) {
             return $proceed();
         }
 
-        $itemId = (int) $subject->getRequest()->getParam('id');
+        $request = $subject->getRequest();
+        $itemId = (int) ($request->getParam('id') ?: $request->getParam('item_id'));
+
         $quote = $this->checkoutSession->getQuote();
         /** @var \Magento\Quote\Model\Quote\Item $item */
         if (!$item = $quote->getItemById($itemId)) {
@@ -97,6 +100,7 @@ public function aroundExecute(Delete $subject, callable $proceed)
 
             if ($item->isDeleted()) {
                 $this->dataProvider->add('remove_from_cart', [
+                    'value' => $this->priceCurrency->round($item->getBasePriceInclTax()),
                     'items' => [
                         [
                             'item_name' => $item->getName(),

ViewModel/Cart.php

@@ -114,6 +114,7 @@ public function getJson()
             'cart_quantity' => (int) $quote->getItemsQty(),
             'cart_total' => $this->priceCurrency->round($quote->getBaseGrandTotal()),
             'ecommerce' => [
+                'value' => (string) $this->priceCurrency->round($quote->getBaseGrandTotal()),
                 'currency' => $this->storeManager->getStore()->getCurrentCurrency()->getCode(),
                 'items' => $this->prepareItems($quote),
             ],

ViewModel/Checkout.php

@@ -114,6 +114,7 @@ public function getJson()
             'cart_quantity' => (int) $quote->getItemsQty(),
             'cart_total' => $this->priceCurrency->round($quote->getBaseGrandTotal()),
             'ecommerce' => [
+                'value' => (string) $this->priceCurrency->round($quote->getBaseGrandTotal()),
                 'currency' => $this->storeManager->getStore()->getCurrentCurrency()->getCode(),
                 'items' => $this->prepareItems($quote),
             ],

ViewModel/Product.php

@@ -151,10 +151,13 @@ public function getProductData()
      */
     public function getJson()
     {
+        $value = $this->priceCurrency->round($this->getProduct()->getFinalPrice());
+
         return $this->json->serialize([
             'event' => $this->eventFormatter->formatName('view_item'),
             'ecomm_pagetype' => 'product',
             'ecommerce' => [
+                'value' => (string) $value,
                 'currency' => $this->storeManager->getStore()->getCurrentCurrency()->getCode(),
                 'items' => array_filter([
                     $this->getProductData()

ViewModel/Success.php

@@ -162,7 +162,7 @@ public function getJson()
                 'transaction_id' => $order->getIncrementId(),
                 'quote_id' => $order->getQuoteId(),
                 'affiliation' => $this->storeManager->getStore()->getName(),
-                'value' => $this->priceCurrency->round($order->getBaseGrandTotal()),
+                'value' => (string) $this->priceCurrency->round($order->getBaseGrandTotal()),
                 'tax' => $this->priceCurrency->round($order->getBaseTaxAmount()), // tax
                 'shipping' => $this->priceCurrency->round($order->getBaseShippingAmount()), // shipping price
                 'coupon' => $order->getCouponCode(), // coupon if exists

composer.json

@@ -5,7 +5,7 @@
     "license": [
         "GPL-3.0-only"
     ],
-    "version": "1.0.31",
+    "version": "1.0.32",
     "require": {
         "php": ">=7.4.0",
         "jeremykendall/php-domain-parser": "^6.0"

etc/frontend/di.xml

@@ -19,4 +19,7 @@
     <type name="Magento\Checkout\Controller\Cart\Delete">
         <plugin name="stape_gtm_cart_delete" type="Stape\Gtm\Plugin\Checkout\Cart\DeletePlugin" />
     </type>
+    <type name="Magento\Checkout\Controller\Sidebar\RemoveItem">
+        <plugin name="stape_gtm_cart_item_remove" type="Stape\Gtm\Plugin\Checkout\Cart\DeletePlugin" />
+    </type>
 </config>