Merged in fix/SW-3020-paymentInfo-tracking (pull request #2403)

fix(SW-3020): add correct paymentInfo in booking flow and ancillary flow

* fix(SW-3020): add correct paymentInfo in booking flow and ancillary flow

* fix(SW-3020): fix pr comments


Approved-by: Tobias Johansson

apps/scandic-web/components/HotelReservation/EnterDetails/Payment/PaymentCallback/HandleErrorCallback.tsx

@@ -11,6 +11,10 @@ import { trackPaymentEvent } from "@/utils/tracking"
 import { trackEvent } from "@/utils/tracking/base"
 import { serializeBookingSearchParams } from "@/utils/url"
 
+import {
+  clearPaymentInfoSessionStorage,
+  readPaymentInfoFromSessionStorage,
+} from "../helpers"
 import { clearGlaSessionStorage, readGlaFromSessionStorage } from "./helpers"
 
 import type { PersistedState } from "@/types/stores/enter-details"
@@ -41,6 +45,7 @@ export default function HandleErrorCallback({
       )
 
       const glaSessionData = readGlaFromSessionStorage()
+      const paymentInfoSessionData = readPaymentInfoFromSessionStorage()
 
       if (status === PaymentCallbackStatusEnum.Cancel) {
         if (glaSessionData) {
@@ -54,6 +59,8 @@ export default function HandleErrorCallback({
             paymentInfo: {
               hotelId: glaSessionData.hotelId,
               status: "glacardsavecancelled",
+              type: glaSessionData.paymentMethod,
+              isSavedCreditCard: glaSessionData.isSavedCreditCard,
             },
           })
         } else {
@@ -61,6 +68,8 @@ export default function HandleErrorCallback({
             event: "paymentCancel",
             hotelId: detailsStorage.booking.hotelId,
             status: "cancelled",
+            method: paymentInfoSessionData?.paymentMethod,
+            isSavedCreditCard: paymentInfoSessionData?.isSavedCreditCard,
           })
         }
       }
@@ -76,6 +85,8 @@ export default function HandleErrorCallback({
             paymentInfo: {
               hotelId: glaSessionData.hotelId,
               status: "glacardsavefailed",
+              type: glaSessionData.paymentMethod,
+              isSavedCreditCard: glaSessionData.isSavedCreditCard,
             },
           })
         } else {
@@ -84,10 +95,13 @@ export default function HandleErrorCallback({
             hotelId: detailsStorage.booking.hotelId,
             errorMessage,
             status: "failed",
+            method: paymentInfoSessionData?.paymentMethod,
+            isSavedCreditCard: paymentInfoSessionData?.isSavedCreditCard,
           })
         }
       }
       clearGlaSessionStorage()
+      clearPaymentInfoSessionStorage()
 
       if (searchParams.size > 0) {
         router.replace(`${returnUrl}?${searchParams.toString()}`)

apps/scandic-web/components/HotelReservation/EnterDetails/Payment/PaymentCallback/HandleSuccessCallback.tsx

@@ -66,6 +66,11 @@ export default function HandleSuccessCallback({
             hotelId: glaSessionData.hotelId,
             guaranteedProduct: "room",
           },
+          paymentInfo: {
+            hotelId: glaSessionData.hotelId,
+            type: glaSessionData.paymentMethod,
+            isSavedCreditCard: glaSessionData.isSavedCreditCard,
+          },
         })
         clearGlaSessionStorage()
       }

apps/scandic-web/components/HotelReservation/EnterDetails/Payment/PaymentCallback/helpers.ts

@@ -5,6 +5,8 @@ export const glaStorageName = "gla-storage"
 type GlaSessionData = {
   lateArrivalGuarantee: string
   hotelId: string
+  paymentMethod?: string
+  isSavedCreditCard?: boolean
 }
 
 export function readGlaFromSessionStorage(): GlaSessionData | null {
@@ -20,12 +22,19 @@ export function readGlaFromSessionStorage(): GlaSessionData | null {
 
 export function writeGlaToSessionStorage(
   lateArrivalGuarantee: string,
-  hotelId: string
+  hotelId: string,
+  paymentMethod: string,
+  isSavedCreditCard: boolean
 ) {
   try {
     sessionStorage.setItem(
       glaStorageName,
-      JSON.stringify({ lateArrivalGuarantee, hotelId })
+      JSON.stringify({
+        lateArrivalGuarantee,
+        hotelId,
+        paymentMethod,
+        isSavedCreditCard,
+      })
     )
   } catch (error) {
     console.error("Error writing to session storage:", error)