Merged in feat/SW-2680-tracking-fixes (pull request #2373)

fix(SW-2680): Added new properties used for tracking

* fix(SW-2680): Added new properties used for tracking


Approved-by: Michael Zetterberg

apps/scandic-web/components/HotelReservation/BookingConfirmation/PriceDetails/mapToPrice.ts

@@ -110,6 +110,7 @@ export function mapToPrice(rooms: (Room | null)[], nights: number) {
         bedType: {
           description: room.bedDescription,
           roomTypeCode: room.roomTypeCode || "",
+          type: room.bedType,
         },
         breakfast,
         breakfastIncluded: room.rateDefinition.breakfastIncluded,

apps/scandic-web/components/HotelReservation/BookingConfirmation/Tracking/tracking.ts

@@ -102,7 +102,7 @@ export function getTracking(
       .join("|"),
     arrivalDate: format(arrivalDate, "yyyy-MM-dd"),
     bedType: rooms
-      .map((r) => r.bedDescription)
+      .map((r) => r.bedType)
       .join(",")
       .toLowerCase(),
     bnr: rooms.map((r) => r.confirmationNumber).join(","),
@@ -139,13 +139,10 @@ export function getTracking(
     noOfRooms,
     rateCode: rooms.map((r) => r.rateDefinition.rateCode).join(","),
     rateCodeCancellationRule: rooms
-      .map((r) => r.rateDefinition.cancellationText)
-      .join(",")
-      .toLowerCase(),
-    rateCodeName: rooms
-      .map((r) => r.rateDefinition.title)
+      .map((r) => r.rateDefinition.cancellationRule)
       .join(",")
       .toLowerCase(),
+    rateCodeName: rooms.map(constructRateCodeName).join(","),
     //rateCodeType: , //TODO: Add when available in API. "regular, promotion, corporate etx",
     region: hotel?.address.city,
     revenueCurrencyCode: [...new Set(rooms.map((r) => r.currencyCode))].join(
@@ -189,3 +186,25 @@ export function getTracking(
     ancillaries,
   }
 }
+
+function constructRateCodeName(room: Room) {
+  if (room.cheques) {
+    return "corporate cheque"
+  } else if (room.vouchers) {
+    return "voucher"
+  } else if (room.roomPoints) {
+    return "redemption"
+  }
+
+  const rate = getRate(room.rateDefinition.cancellationRule)
+
+  const bookingCodeStr = room.bookingCode ? room.bookingCode.toUpperCase() : ""
+
+  const breakfastIncludedStr = room.breakfastIncluded
+    ? "incl. breakfast"
+    : "excl. breakfast"
+
+  return [bookingCodeStr, rate, breakfastIncludedStr]
+    .filter(Boolean)
+    .join(" - ")
+}

apps/scandic-web/components/HotelReservation/BookingConfirmation/utils.ts

@@ -62,6 +62,7 @@ export function mapRoomState(
   return {
     adults: booking.adults,
     bedDescription: room.bedType.description,
+    bedType: room.bedType.mainBed.type,
     bookingCode: booking.bookingCode,
     breakfast,
     breakfastIncluded,