Merged in feat/SW-1719-strikethrough-rates (pull request #2266)

Feat/SW-1719 strikethrough rates

* feat(SW-1719): Strikethrough rate if logged in on regular rate cards

* feat(SW-1719): Strikethrough rate if logged in on rate summary

* feat(SW-1719): Strikethrough rate if logged in on mobile rate summary

* feat(SW-1719): Strikethrough rate if logged in on enter details

* feat(SW-1719): Strikethrough rate support for multiple rooms

* feat(SW-1719): booking receipt fixes on confirmation page

* feat(SW-1719): improve initial total price calculation

* feat: harmonize enter details total price to use one and the same function


Approved-by: Michael Zetterberg

apps/scandic-web/stores/enter-details/index.ts

@@ -3,21 +3,12 @@ import { produce } from "immer"
 import { useContext } from "react"
 import { create, useStore } from "zustand"
 
-import { REDEMPTION } from "@/constants/booking"
 import { getDefaultCountryFromLang } from "@/constants/languages"
 import { dt } from "@/lib/dt"
 
-import {
-  sumPackages,
-  sumPackagesRequestedPrice,
-} from "@/components/HotelReservation/utils"
 import { DetailsContext } from "@/contexts/Details"
 
 import {
-  add,
-  calcTotalPrice,
-  calculateCorporateChequePrice,
-  calculateVoucherPrice,
   checkRoomProgress,
   extractGuestFromUser,
   getRoomPrice,
@@ -27,7 +18,6 @@ import {
 
 import type { BreakfastPackages } from "@/types/components/hotelReservation/breakfast"
 import type { Price } from "@/types/components/hotelReservation/price"
-import { CurrencyEnum } from "@/types/enums/currency"
 import { StepEnum } from "@/types/enums/step"
 import type {
   DetailsState,
@@ -60,89 +50,37 @@ export function createDetailsStore(
   lang: Lang
 ) {
   const isMember = !!user
-  const isRedemption =
-    new URLSearchParams(searchParams).get("searchtype") === REDEMPTION
-
-  const isVoucher = initialState.rooms.some(
-    (room) => "voucher" in room.roomRate
-  )
-  const isCorpChq = initialState.rooms.some(
-    (room) => "corporateCheque" in room.roomRate
+  const nights = dt(initialState.booking.toDate).diff(
+    initialState.booking.fromDate,
+    "days"
   )
 
-  let initialTotalPrice: Price
-  const roomOneRoomRate = initialState.rooms[0].roomRate
-  const initialRoomRates = initialState.rooms.map((r) => r.roomRate)
-  if (isRedemption && "redemption" in roomOneRoomRate) {
-    initialTotalPrice = {
-      local: {
-        currency: CurrencyEnum.POINTS,
-        price: roomOneRoomRate.redemption.localPrice.pointsPerStay,
+  const initialRooms = initialState.rooms.map((room, idx) => {
+    return {
+      ...room,
+      adults: initialState.booking.rooms[idx].adults,
+      childrenInRoom: initialState.booking.rooms[idx].childrenInRoom,
+      bedType: room.bedType,
+      breakfast:
+        !breakfastPackages.length || room.breakfastIncluded
+          ? (false as const)
+          : undefined,
+      guest:
+        isMember && idx === 0
+          ? deepmerge(defaultGuestState, extractGuestFromUser(user))
+          : {
+              ...defaultGuestState,
+              phoneNumberCC: getDefaultCountryFromLang(lang),
+            },
+      roomPrice: getRoomPrice(room.roomRate, isMember && idx === 0),
+      specialRequest: {
+        comment: "",
       },
     }
-    if (roomOneRoomRate.redemption.localPrice.currency) {
-      initialTotalPrice.local.additionalPriceCurrency =
-        roomOneRoomRate.redemption.localPrice.currency
-    }
-    if (roomOneRoomRate.redemption.localPrice.additionalPricePerStay) {
-      initialTotalPrice.local.additionalPrice =
-        roomOneRoomRate.redemption.localPrice.additionalPricePerStay
-    }
-  } else if (isVoucher) {
-    const pkgs = initialState.rooms.flatMap((room) => room.roomFeatures || [])
-    initialTotalPrice = calculateVoucherPrice(initialRoomRates, pkgs)
-  } else if (isCorpChq) {
-    initialTotalPrice = calculateCorporateChequePrice(initialRoomRates)
-  } else {
-    initialTotalPrice = getTotalPrice(initialRoomRates, isMember)
-  }
-
-  initialState.rooms.forEach((room) => {
-    if (room.roomFeatures) {
-      const pkgsSum = sumPackages(room.roomFeatures)
-      const pkgsSumRequested = sumPackagesRequestedPrice(room.roomFeatures)
-
-      if ("corporateCheque" in room.roomRate || "redemption" in room.roomRate) {
-        initialTotalPrice.local.additionalPrice = add(
-          initialTotalPrice.local.additionalPrice,
-          pkgsSum.price
-        )
-        if (
-          !initialTotalPrice.local.additionalPriceCurrency &&
-          pkgsSum.currency
-        ) {
-          initialTotalPrice.local.additionalPriceCurrency = pkgsSum.currency
-        }
-
-        if (initialTotalPrice.requested) {
-          initialTotalPrice.requested.additionalPrice = add(
-            initialTotalPrice.requested.additionalPrice,
-            pkgsSumRequested.price
-          )
-          if (
-            !initialTotalPrice.requested.additionalPriceCurrency &&
-            pkgsSumRequested.currency
-          ) {
-            initialTotalPrice.requested.additionalPriceCurrency =
-              pkgsSumRequested.currency
-          }
-        }
-      } else if ("public" in room.roomRate) {
-        if (initialTotalPrice.requested) {
-          initialTotalPrice.requested.price = add(
-            initialTotalPrice.requested.price,
-            pkgsSumRequested.price
-          )
-        }
-
-        initialTotalPrice.local.price = add(
-          initialTotalPrice.local.price,
-          pkgsSum.price
-        )
-      }
-    }
   })
 
+  const initialTotalPrice: Price = getTotalPrice(initialRooms, isMember, nights)
+
   const availableBeds = initialState.rooms.reduce<
     DetailsState["availableBeds"]
   >((total, room) => {
@@ -162,7 +100,7 @@ export function createDetailsStore(
     isSubmitting: false,
     isSummaryOpen: false,
     lastRoom: initialState.booking.rooms.length - 1,
-    rooms: initialState.rooms.map((room, idx) => {
+    rooms: initialRooms.map((room, idx) => {
       const steps: RoomState["steps"] = {
         [StepEnum.selectBed]: {
           step: StepEnum.selectBed,
@@ -235,9 +173,8 @@ export function createDetailsStore(
                   "days"
                 )
 
-                state.totalPrice = calcTotalPrice(
-                  state.rooms,
-                  currentRoom.room.roomPrice.perStay.local.currency,
+                state.totalPrice = getTotalPrice(
+                  state.rooms.map((r) => r.room),
                   isMember,
                   nights
                 )
@@ -275,9 +212,8 @@ export function createDetailsStore(
                   "days"
                 )
 
-                state.totalPrice = calcTotalPrice(
-                  state.rooms,
-                  state.totalPrice.local.currency,
+                state.totalPrice = getTotalPrice(
+                  state.rooms.map((r) => r.room),
                   isMember,
                   nights
                 )
@@ -307,9 +243,8 @@ export function createDetailsStore(
                   "days"
                 )
 
-                state.totalPrice = calcTotalPrice(
-                  state.rooms,
-                  state.totalPrice.local.currency,
+                state.totalPrice = getTotalPrice(
+                  state.rooms.map((r) => r.room),
                   isMember,
                   nights
                 )
@@ -368,9 +303,8 @@ export function createDetailsStore(
                   "days"
                 )
 
-                state.totalPrice = calcTotalPrice(
-                  state.rooms,
-                  state.totalPrice.local.currency,
+                state.totalPrice = getTotalPrice(
+                  state.rooms.map((r) => r.room),
                   isMember,
                   nights
                 )
@@ -390,27 +324,7 @@ export function createDetailsStore(
             )
           },
         },
-        room: {
-          ...room,
-          adults: initialState.booking.rooms[idx].adults,
-          childrenInRoom: initialState.booking.rooms[idx].childrenInRoom,
-          bedType: room.bedType,
-          breakfast:
-            !breakfastPackages.length || room.breakfastIncluded
-              ? false
-              : undefined,
-          guest:
-            isMember && idx === 0
-              ? deepmerge(defaultGuestState, extractGuestFromUser(user))
-              : {
-                  ...defaultGuestState,
-                  phoneNumberCC: getDefaultCountryFromLang(lang),
-                },
-          roomPrice: getRoomPrice(room.roomRate, isMember && idx === 0),
-          specialRequest: {
-            comment: "",
-          },
-        },
+        room,
         isComplete: false,
         steps,
       }
@@ -429,14 +343,6 @@ export function createDetailsStore(
           })
         )
       },
-      setTotalPrice(totalPrice) {
-        return set(
-          produce((state: DetailsState) => {
-            state.totalPrice.requested = totalPrice.requested
-            state.totalPrice.local = totalPrice.local
-          })
-        )
-      },
       toggleSummaryOpen() {
         return set(
           produce((state: DetailsState) => {