[IMP]google_tag_manager_advanced_tracking: updates

JrAdhoc · JrAdhoc · commit b6e6f9eb5fda · 2025-03-07T12:28:59.000-03:00
diff --git a/google_tag_manager_advanced_tracking/static/src/js/website_sale_tracking.js b/google_tag_manager_advanced_tracking/static/src/js/website_sale_tracking.js
@@ -23,43 +23,58 @@ odoo.define("google_tag_manager_advanced_tracking.tracking", function (require)
             var dataTarget = ev.target.closest('a#add_to_cart');
             var product_id = dataTarget.dataset.product_id;
             var product_name = dataTarget.dataset.product_name;
+            var currency = dataTarget.dataset.currency;
             var product_price = dataTarget.dataset.product_price;
             var product_amount = $("[name=add_qty]").val();
             var amount = parseFloat(product_price * product_amount).toFixed(2);
             const dict = {
                 'event': 'add_to_cart',
-                'value': amount,
-                'items': [{
-                    'item_name': product_name,
-                    'item_id': product_id,
-                    'price': product_price
-                }]
+                'ecommerce': {
+                    'currency': currency,
+                    'value': amount,
+                    'items': [{
+                        'item_name': product_name,
+                        'item_id': product_id,
+                        'price': product_price,
+                        'quantity': product_amount,
+                    }]
+                }
             }
             this._pushInfo(dict);
         },
         _onClickAddToCartProductsItem: function(ev) {
             var dataTarget = ev.target.closest('div.o_wsale_product_btn');
             var product_id = dataTarget.dataset.product_id;
+            var currency = dataTarget.dataset.currency;
             var product_sku = dataTarget.dataset.product_sku;
             var product_name = dataTarget.dataset.product_name;
             var product_price = dataTarget.dataset.product_price;
             const dict = {
                 'event': 'add_to_cart',
-                'value': product_price,
-                'items': {
-                    'item_name': product_name,
-                    'item_id': product_sku || product_id,
-                    'price': product_price
+                'ecommerce': {
+                    'value': product_price,
+                    'currency': currency,
+                    'items': {
+                        'item_name': product_name,
+                        'item_id': product_sku || product_id,
+                        'price': product_price,
+                    }
                 }
             }
             this._pushInfo(dict);
         },
         _onCheckoutStartJs: function () {
             var dataTarget = $("#cart_products")[0];
+            var currency = dataTarget.dataset.currency;
+            var value = dataTarget.dataset.value;
             const info = dataTarget.dataset.cart_info;
             const dict = {
                 'event':'begin_checkout',
-                'ecommerce':{'items':info}
+                'ecommerce':{
+                    'currency': currency,
+                    'value': value,
+                    'items':info
+                }
             }
             this._pushInfo(dict);
         },
diff --git a/website_sale_advanced_tracking/models/sale_order.py b/website_sale_advanced_tracking/models/sale_order.py
@@ -9,22 +9,18 @@ def prepare_purchase_information(self):
         for line in self.order_line:
             products.append(
                 {
-                    "id": line.product_id.default_code or line.product_id.id,
-                    "name": line.product_id.name,
-                    "category": line.product_id.categ_id.name,
+                    "item_id": line.product_id.default_code or line.product_id.id,
+                    "item_name": line.product_id.name,
+                    "item_category": line.product_id.categ_id.name,
                     "quantity": line.product_uom_qty,
-                    "price": line.price_subtotal,
+                    "price": line.price_reduce_taxinc,
                 }
             )
         res = {
-            'purchase': {
-                    'actionField': {
-                        'id': self.id,
-                        'affiliation': self.partner_id.name,
-                        'revenue': self.amount_total,
-                        'tax':self.amount_tax,
-                    },
-                    'products': products
+                'transaction_id': self.id,
+                'value': self.amount_total,
+                'tax': self.amount_tax,
+                'currency': self.currency_id.name,
+                'items': products
             }
-        }
         return res
diff --git a/website_sale_advanced_tracking/models/sale_order_line.py b/website_sale_advanced_tracking/models/sale_order_line.py
@@ -11,7 +11,7 @@ def prepare_checkout_information(self):
                 {
                     'item_name': line.name,
                     'item_id': line.product_id.default_code or line.product_id.id,
-                    'price': (line.price_reduce_taxinc / line.product_uom_qty),
+                    'price': (line.price_reduce_taxinc),
                     'quantity': line.product_uom_qty
                 }
             )
diff --git a/website_sale_advanced_tracking/views/templates.xml b/website_sale_advanced_tracking/views/templates.xml
@@ -5,13 +5,15 @@
             <attribute name="t-att-data-product_id">product.id</attribute>
             <attribute name="t-att-data-product_name">product.name</attribute>
             <attribute name="t-att-data-product_price">combination_info['base_unit_price']</attribute>
+            <attribute name="t-att-data-currency">website.currency_id.name</attribute>
         </xpath>
     </template>
     <template id="products_item" inherit_id="website_sale.products_item">
         <xpath expr="//div[hasclass('o_wsale_product_btn')]" position="attributes">
             <attribute name="t-att-data-product_id">product.id</attribute>
             <attribute name="t-att-data-product_sku">product.default_code</attribute>
             <attribute name="t-att-data-product_name">product.name</attribute>
+            <attribute name="t-att-data-currency">website.currency_id.name</attribute>
             <attribute name="t-att-data-product_price">template_price_vals['price_reduce']</attribute>
         </xpath>
     </template>
@@ -33,6 +35,8 @@
     <template id="cart_lines" inherit_id="website_sale.cart_lines">
         <xpath expr="//table" position="attributes">
             <attribute name="t-att-data-cart_info">website_sale_order.website_order_line.prepare_checkout_information()</attribute>
+            <attribute name="t-att-data-currency">website.currency_id.name</attribute>
+            <attribute name="t-att-data-value">website_sale_order.amount_total</attribute>
         </xpath>
     </template>
     <template id="payment_footer" inherit_id="website_sale.payment_footer">

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ def prepare_checkout_information(self):`
`11`	`11`	`{`
`12`	`12`	`'item_name': line.name,`
`13`	`13`	`'item_id': line.product_id.default_code or line.product_id.id,`
`14`		`- 'price': (line.price_reduce_taxinc / line.product_uom_qty),`
	`14`	`+ 'price': (line.price_reduce_taxinc),`
`15`	`15`	`'quantity': line.product_uom_qty`
`16`	`16`	`}`
`17`	`17`	`)`