From 25e3b8323564cc66da2f652b04697efe7b0890bc Mon Sep 17 00:00:00 2001
From: hiteshkumar87 <hitesh.kumar@safelite.com>
Date: Fri, 20 Sep 2024 15:05:11 +0530
Subject: [PATCH 1/2] CSR-1629

fixed price subTotal
---
 src/mixins/analytics-mixin.js | 27 ++++++++++++++++-----------
 1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/src/mixins/analytics-mixin.js b/src/mixins/analytics-mixin.js
index eddf4463b..4f034c93c 100644
--- a/src/mixins/analytics-mixin.js
+++ b/src/mixins/analytics-mixin.js
@@ -409,31 +409,36 @@ export default {
                     let productSku = part.partNumber;
                     let productType = part.partType;
                     let promoCode = part.promoCode;
-                    let productPrice = baseMixin.methods
-                        .getTotalPriceOfAllLineItemsAndChildParts([part], false)
-                        .toFixed(2);
+                    let productPrice = baseMixin.methods.getTotalPriceOfAllLineItemsAndChildParts(
+                        [part],
+                        false
+                    );
 
-                    if (productSku == "DISCOUNT") {
+                    if (productSku == "DISCOUNT" || productType == "SERVICE PACKAGE DISCOUNT") {
                         if (coupon) {
                             coupon += ",";
                         }
-                        coupon += productSku;
-                        discount = discount + parseFloat(productPrice) * -1;
+                        if (productSku == "DISCOUNT") {
+                            coupon += promoCode;
+                        } else {
+                            coupon += productSku;
+                        }
+                        discount += productPrice * -1;
                     } else {
                         products.push({
                             productType: productType,
                             productSku: productSku,
-                            productPrice: productPrice.toString(),
+                            productPrice: productPrice.toFixed(2),
                             productQuantity: "1",
                         });
-                        subTotal += parseFloat(productPrice);
+                        subTotal += productPrice;
                     }
                 }
                 pushToDataLayerIfDefined({
                     productArray: {
                         coupon: coupon,
-                        discount: discount.toString(),
-                        subTotal: subTotal.toString(),
+                        discount: discount.toFixed(2),
+                        subTotal: subTotal.toFixed(2),
                         products: products,
                     },
                 });
@@ -557,7 +562,7 @@ export default {
                 const filteredCookie = sortedCookies?.find(
                     (x) => x.tagEvent?.length > 0 && x.batchEvent?.length > 0
                 );
-                if (filteredCookie?.length > 0) {
+                if (isDefined(filteredCookie)) {
                     cjEvent = filteredCookie.tagEvent;
                     const hasSubmittedOrder = baseMixin.methods.hasSubmittedOrder();
                     const submittedOrder = baseMixin.methods.getSubmittedOrder();

From 26b465f9ec0eb5f3f1cd40ec0139f75efc1705e6 Mon Sep 17 00:00:00 2001
From: hiteshkumar87 <hitesh.kumar@safelite.com>
Date: Fri, 20 Sep 2024 15:09:15 +0530
Subject: [PATCH 2/2] CSR-1629

formatting
---
 src/mixins/analytics-mixin.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/mixins/analytics-mixin.js b/src/mixins/analytics-mixin.js
index bb7317292..f219c5586 100644
--- a/src/mixins/analytics-mixin.js
+++ b/src/mixins/analytics-mixin.js
@@ -428,7 +428,6 @@ export default {
                         }
 
                         discount += productPrice * -1;
-
                     } else {
                         products.push({
                             productType: productType,