Merged in feature/select-rate-vertical-data-flow (pull request #2535)

Feature/select rate vertical data flow

* add fix from SW-2666

* use translations for room packages

* move types to it's own file

* Merge branch 'master' of bitbucket.org:scandic-swap/web into feature/select-rate-vertical-data-flow

* merge

* feature/select-rate: double rate for campaing rates

* revert NODE_ENV check in Cookiebot script

* revert testing values

* fix(SW-3171): fix all filter selected in price details

* fix(SW-3166): multiroom anchoring when changing filter

* fix(SW-3172): check hotelType, show correct breakfast message

* Merge branch 'feature/select-rate-vertical-data-flow' of bitbucket.org:scandic-swap/web into feature/select-rate-vertical-data-flow

* fix: show special needs icons for subsequent roomTypes SW-3167

* fix: Display strike through text when logged in SW-3168

* fix: Reinstate the scrollToView behaviour when selecting a rate SW-3169

* merge

* .

* PR fixes

* fix: don't return notFound()

* .

* always include defaults for room packages

* merge

* merge

* merge

* Remove floating h1 for new select-rate


Approved-by: Anton Gunnarsson

packages/common/dt/dt.ts

@@ -39,3 +39,4 @@ d.extend(customParseFormat)
 d.extend(isBetween)
 
 export const dt = d
+export type Dayjs = d.Dayjs

packages/trpc/lib/routers/hotels/query.ts

@@ -202,7 +202,6 @@ export const hotelQueryRouter = router({
           ctx.serviceToken,
           ctx.userPoints
         )
-
         const hotelData = await getHotel(
           {
             hotelId: input.booking.hotelId,
@@ -256,8 +255,9 @@ export const hotelQueryRouter = router({
           if ("member" in product && product.member && counterRateCode) {
             memberRateDefinition = rateDefinitions.find(
               (rate) =>
-                (rate.rateCode === counterRateCode ||
-                  rate.rateCode === rateCode) &&
+                (rate.rateCode.toLowerCase() ===
+                  counterRateCode.toLowerCase() ||
+                  rate.rateCode.toLowerCase() === rateCode.toLowerCase()) &&
                 rate.isMemberRate
             )
           }
@@ -318,6 +318,7 @@ export const hotelQueryRouter = router({
         }
 
         if (selectedRooms.some((sr) => !sr)) {
+          console.log("DEBUG: REDIRECTING TO SELECT RATE", selectedRooms)
           return selectRateRedirectURL(input, selectedRooms.map(Boolean))
         }
 

packages/trpc/lib/routers/hotels/schemas/roomAvailability/configuration.ts

@@ -55,3 +55,5 @@ export const roomConfigurationSchema = z.object({
     .optional()
     .transform((val) => (val ? val.filter(Boolean) : [])),
 })
+
+export type RoomConfiguration = z.infer<typeof roomConfigurationSchema>

packages/trpc/lib/routers/hotels/utils.ts

@@ -1377,8 +1377,8 @@ export function selectRateRedirectURL(
       searchParams.set(`room[${idx}].ratecode`, room.rateCode)
       searchParams.set(`room[${idx}].roomtype`, room.roomTypeCode)
     } else {
-      if (!searchParams.has("modifyRateIndex")) {
-        searchParams.set("modifyRateIndex", idx.toString())
+      if (!searchParams.has("activeRoomIndex")) {
+        searchParams.set("activeRoomIndex", idx.toString())
       }
     }
     if (room.bookingCode) {