merge

components/HotelReservation/SelectRate/RoomFilter/index.tsx

@@ -99,11 +99,13 @@ export default function RoomFilter({
         <form onSubmit={handleSubmit(submitFilter)}>
           <div className={styles.roomsFilter}>
             {filterOptions.map((option) => {
-              const { code, description } = option
+              const { code, description, itemCode } = option
               const isPetRoom = code === RoomPackageCodeEnum.PET_ROOM
               const isAllergyRoom = code === RoomPackageCodeEnum.ALLERGY_ROOM
               const isDisabled =
-                (isAllergyRoom && petFriendly) || (isPetRoom && allergyFriendly)
+                (isAllergyRoom && petFriendly) ||
+                (isPetRoom && allergyFriendly) ||
+                !itemCode
 
               const checkboxChip = (
                 <CheckboxChip

components/HotelReservation/SelectRate/RoomSelection/FlexibilityOption/index.tsx

@@ -36,7 +36,7 @@ export default function FlexibilityOption({
         </div>
         <Label size="regular" className={styles.noPricesLabel}>
           <Caption color="uiTextHighContrast" type="bold">
-            {intl.formatMessage({ id: "No Prices available" })}
+            {intl.formatMessage({ id: "No prices available" })}
           </Caption>
         </Label>
       </div>

components/HotelReservation/SelectRate/RoomSelection/index.tsx

@@ -14,7 +14,7 @@ export default function RoomSelection({
   roomsAvailability,
   roomCategories,
   user,
-  packages,
+  availablePackages,
   selectedPackages,
   setRateCode,
   rateSummary,
@@ -72,7 +72,7 @@ export default function RoomSelection({
                 roomCategories={roomCategories}
                 handleSelectRate={setRateCode}
                 selectedPackages={selectedPackages}
-                packages={packages}
+                packages={availablePackages}
               />
             </li>
           ))}
@@ -81,7 +81,7 @@ export default function RoomSelection({
           <RateSummary
             rateSummary={rateSummary}
             isUserLoggedIn={isUserLoggedIn}
-            packages={packages}
+            packages={availablePackages}
             roomsAvailability={roomsAvailability}
           />
         )}

components/HotelReservation/SelectRate/RoomSelection/utils.ts

@@ -50,6 +50,54 @@ export function getQueryParamsForEnterDetails(
       roomTypeCode: room.roomtype,
       rateCode: room.ratecode,
       packages: room.packages?.split(",") as RoomPackageCodeEnum[],
+      counterRateCode: room.counterratecode,
     })),
   }
 }
+
+export function createQueryParamsForEnterDetails(
+  bookingData: BookingData,
+  intitalSearchParams: URLSearchParams
+) {
+  const { hotel, fromDate, toDate, rooms } = bookingData
+
+  const bookingSearchParams = new URLSearchParams({ hotel, fromDate, toDate })
+  const searchParams = new URLSearchParams([
+    ...intitalSearchParams,
+    ...bookingSearchParams,
+  ])
+
+  rooms.forEach((item, index) => {
+    if (item?.adults) {
+      searchParams.set(`room[${index}].adults`, item.adults.toString())
+    }
+    if (item?.children) {
+      item.children.forEach((child, childIndex) => {
+        searchParams.set(
+          `room[${index}].child[${childIndex}].age`,
+          child.age.toString()
+        )
+        searchParams.set(
+          `room[${index}].child[${childIndex}].bed`,
+          child.bed.toString()
+        )
+      })
+    }
+    if (item?.roomTypeCode) {
+      searchParams.set(`room[${index}].roomtype`, item.roomTypeCode)
+    }
+    if (item?.rateCode) {
+      searchParams.set(`room[${index}].ratecode`, item.rateCode)
+    }
+
+    if (item?.counterRateCode) {
+      searchParams.set(`room[${index}].counterratecode`, item.counterRateCode)
+    }
+
+    if (item.packages && item.packages.length > 0) {
+      searchParams.set(`room[${index}].packages`, item.packages.join(","))
+    }
+  })
+
+  return searchParams
+}

components/HotelReservation/SelectRate/Rooms/RoomsContainer.tsx

@@ -88,7 +88,7 @@ export async function RoomsContainer({
   return (
     <Rooms
       user={user}
-      packages={packages ?? []}
+      availablePackages={packages ?? []}
       roomsAvailability={roomsAvailability}
       roomCategories={hotelData?.included ?? []}
     />

components/HotelReservation/SelectRate/Rooms/index.tsx

@@ -9,6 +9,7 @@ import { filterDuplicateRoomTypesByLowestPrice } from "./utils"
 import styles from "./rooms.module.css"
 
 import {
+  DefaultFilterOptions,
   RoomPackageCodeEnum,
   type RoomPackageCodes,
 } from "@/types/components/hotelReservation/selectRate/roomFilter"
@@ -20,17 +21,39 @@ export default function Rooms({
   roomsAvailability,
   roomCategories = [],
   user,
-  packages,
+  availablePackages,
 }: SelectRateProps) {
   const visibleRooms: RoomConfiguration[] =
     filterDuplicateRoomTypesByLowestPrice(roomsAvailability.roomConfigurations)
-  // const [internalRateSummary, setRateSummary] = useState<Rate | null>(null)
   const [selectedRate, setSelectedRate] = useState<
     { publicRateCode: string; roomTypeCode: string } | undefined
   >(undefined)
   const [selectedPackages, setSelectedPackages] = useState<RoomPackageCodes[]>(
     []
   )
+  const defaultPackages: DefaultFilterOptions[] = [
+    {
+      code: RoomPackageCodeEnum.ACCESSIBILITY_ROOM,
+      description: "Accessible Room",
+      itemCode: availablePackages.find(
+        (pkg) => pkg.code === RoomPackageCodeEnum.ACCESSIBILITY_ROOM
+      )?.itemCode,
+    },
+    {
+      code: RoomPackageCodeEnum.ALLERGY_ROOM,
+      description: "Allergy Room",
+      itemCode: availablePackages.find(
+        (pkg) => pkg.code === RoomPackageCodeEnum.ALLERGY_ROOM
+      )?.itemCode,
+    },
+    {
+      code: RoomPackageCodeEnum.PET_ROOM,
+      description: "Pet Room",
+      itemCode: availablePackages.find(
+        (pkg) => pkg.code === RoomPackageCodeEnum.PET_ROOM
+      )?.itemCode,
+    },
+  ]
 
   const handleFilter = useCallback(
     (filter: Record<RoomPackageCodeEnum, boolean | undefined>) => {
@@ -39,7 +62,6 @@ export default function Rooms({
       ) as RoomPackageCodeEnum[]
 
       setSelectedPackages(filteredPackages)
-      // setRateSummary(null)
     },
     []
   )
@@ -94,7 +116,9 @@ export default function Rooms({
 
     const petRoomPackage =
       (selectedPackages.includes(RoomPackageCodeEnum.PET_ROOM) &&
-        packages.find((pkg) => pkg.code === RoomPackageCodeEnum.PET_ROOM)) ||
+        availablePackages.find(
+          (pkg) => pkg.code === RoomPackageCodeEnum.PET_ROOM
+        )) ||
       undefined
 
     const features = filteredRooms.find((room) =>
@@ -113,7 +137,7 @@ export default function Rooms({
     }
 
     return rateSummary
-  }, [filteredRooms, packages, selectedPackages, selectedRate])
+  }, [filteredRooms, availablePackages, selectedPackages, selectedRate])
 
   useEffect(() => {
     if (rateSummary) return
@@ -127,13 +151,13 @@ export default function Rooms({
       <RoomFilter
         numberOfRooms={rooms.roomConfigurations.length}
         onFilter={handleFilter}
-        filterOptions={packages}
+        filterOptions={defaultPackages}
       />
       <RoomSelection
         roomsAvailability={rooms}
         roomCategories={roomCategories}
         user={user}
-        packages={packages}
+        availablePackages={availablePackages}
         selectedPackages={selectedPackages}
         setRateCode={setSelectedRate}
         rateSummary={rateSummary}