@roomstay/frontend 2.6.102 → 2.6.103

package/dist/src/contexts/BasketContext/BasketContextType.d.ts

@@ -23,6 +23,7 @@ export interface BasketContextType {
     addRate: (rate: RoomRate, notify?: boolean) => Promise<void>;
     getAllValidRows: () => BasketRow[];
     getAllDatelessRows: () => BasketRow[];
+    isValidDateRange: () => boolean;
     getNumberOfAdults: (withTranslation: boolean) => number | string;
     getNumberOfChildren: (withTranslation: boolean) => number | string;
     getNumberOfInfants: (withTranslation: boolean) => number | string;
@@ -61,4 +62,7 @@ export interface BasketContextType {
     updateBasketFeeRows: () => void;
     onDatePickerOpenChange: (isOpen: boolean) => void;
     isDatePickerOpen: boolean;
+    canAddAnotherRoom: boolean;
+    hasPriceQuoteError: boolean;
+    isQuoteOrPencilReady: boolean;
 }

package/dist/src/contexts/BasketContext/BasketContextType.js.map

@@ -1 +1 @@
-{"version":3,"file":"BasketContextType.js","sourceRoot":"/","sources":["src/contexts/BasketContext/BasketContextType.ts"],"names":[],"mappings":"","sourcesContent":["import { IPaymentCheckoutDetails, IPromoCodeDetails, ReservationsDTO } from '@roomstay/core';\nimport type dayjs from 'dayjs';\n\nimport type { Addon } from '@/models/Addon/Addon';\nimport type BasketAddonRow from '@/models/BasketAddonRow';\nimport type BasketRow from '@/models/BasketRow';\nimport { ItemisedFee } from '@/models/Fee';\nimport type { IPromotion } from '@/models/Promotion/IPromotion.type';\nimport type { RoomRate } from '@/models/Room/RoomRate';\nimport { RoomstaySession } from '@/models/RoomstaySession';\n\nexport interface BasketContextType {\n    selectedBasketRow: BasketRow;\n    currentBasketRows: BasketRow[];\n    basketAddonRows: BasketAddonRow[];\n    basketFeeRows: ItemisedFee[];\n    loadedPromotion: IPromotion | null;\n    promoCodeDetails: IPromoCodeDetails | null; // Promo code details from availability response\n    quoteQueryID: string; // This ID is used to detect changes and re-fetch deposit quotes during checkout.\n\n    startDate: dayjs.Dayjs;\n    endDate: dayjs.Dayjs;\n    pencilId: string | undefined;\n\n    isLoadingPriceQuote: boolean;\n\n    addBasketRow: (row: BasketRow) => void;\n    addRate: (rate: RoomRate, notify?: boolean) => Promise<void>;\n\n    getAllValidRows: () => BasketRow[];\n    getAllDatelessRows: () => BasketRow[];\n\n    getNumberOfAdults: (withTranslation: boolean) => number | string;\n    getNumberOfChildren: (withTranslation: boolean) => number | string;\n    getNumberOfInfants: (withTranslation: boolean) => number | string;\n    getNumberOfRooms: (withTranslation: boolean) => number | string;\n\n    getTotalPrice: () => any;\n    getTotalQuoteDeposit: () => number;\n    getDepositQuoteFees: () => number;\n    getTotalFees: () => number;\n    getItemisedFees: () => ItemisedFee[];\n    // Can be null if we don't know the pay now amount (SynXis)\n    getTotalPayNow: () => number | null;\n\n    updateBasketRow: (row: BasketRow, updateGlobalDates?: boolean) => void;\n    removeBasketRow: (row: BasketRow) => void;\n\n    clearBasketRows: (confirm: boolean) => void;\n    selectBasketRow: (row: BasketRow | null) => void;\n\n    setStartDate: (date: dayjs.Dayjs) => void;\n    setEndDate: (date: dayjs.Dayjs) => void;\n    setPromoCodeDetails: (details: IPromoCodeDetails | null) => void;\n\n    quoteOrPencilReservation: (applyQuote: () => boolean) => void;\n\n    hasCheckedOut: boolean;\n    reservationData: ReservationsDTO;\n    booked: (data: ReservationsDTO, reservationRequest?: RoomstaySession['reservationRequest']) => Promise<void>;\n    rollback: () => void;\n    checkedOut: (data: ReservationsDTO) => void;\n    clearSelectedRates: () => void;\n    finish: () => void;\n    additionalPaymentRequired: (data: IPaymentCheckoutDetails) => void;\n\n    getRowForAddon: (selectedAddon: Addon) => BasketAddonRow | undefined;\n\n    setAddonQuantities: (addon: Addon, quantities: { quantity: number; adult: number; child: number }, selectedDate: string, selectedTime: string) => void;\n\n    removeBasketAddonRow: (row: BasketAddonRow) => void;\n    attemptSelectUnfilledRow: () => BasketRow | undefined;\n\n    initBasketRows: (basketRows: BasketRow[]) => void;\n    updateBasketFeeRows: () => void;\n\n    onDatePickerOpenChange: (isOpen: boolean) => void;\n    isDatePickerOpen: boolean;\n}\n"]}
+{"version":3,"file":"BasketContextType.js","sourceRoot":"/","sources":["src/contexts/BasketContext/BasketContextType.ts"],"names":[],"mappings":"","sourcesContent":["import { IPaymentCheckoutDetails, IPromoCodeDetails, ReservationsDTO } from '@roomstay/core';\nimport type dayjs from 'dayjs';\n\nimport type { Addon } from '@/models/Addon/Addon';\nimport type BasketAddonRow from '@/models/BasketAddonRow';\nimport type BasketRow from '@/models/BasketRow';\nimport { ItemisedFee } from '@/models/Fee';\nimport type { IPromotion } from '@/models/Promotion/IPromotion.type';\nimport type { RoomRate } from '@/models/Room/RoomRate';\nimport { RoomstaySession } from '@/models/RoomstaySession';\n\nexport interface BasketContextType {\n    selectedBasketRow: BasketRow;\n    currentBasketRows: BasketRow[];\n    basketAddonRows: BasketAddonRow[];\n    basketFeeRows: ItemisedFee[];\n    loadedPromotion: IPromotion | null;\n    promoCodeDetails: IPromoCodeDetails | null; // Promo code details from availability response\n    quoteQueryID: string; // This ID is used to detect changes and re-fetch deposit quotes during checkout.\n\n    startDate: dayjs.Dayjs;\n    endDate: dayjs.Dayjs;\n    pencilId: string | undefined;\n\n    isLoadingPriceQuote: boolean;\n\n    addBasketRow: (row: BasketRow) => void;\n    addRate: (rate: RoomRate, notify?: boolean) => Promise<void>;\n\n    getAllValidRows: () => BasketRow[];\n    getAllDatelessRows: () => BasketRow[];\n    isValidDateRange: () => boolean;\n\n    getNumberOfAdults: (withTranslation: boolean) => number | string;\n    getNumberOfChildren: (withTranslation: boolean) => number | string;\n    getNumberOfInfants: (withTranslation: boolean) => number | string;\n    getNumberOfRooms: (withTranslation: boolean) => number | string;\n\n    getTotalPrice: () => any;\n    getTotalQuoteDeposit: () => number;\n    getDepositQuoteFees: () => number;\n    getTotalFees: () => number;\n    getItemisedFees: () => ItemisedFee[];\n    // Can be null if we don't know the pay now amount (SynXis)\n    getTotalPayNow: () => number | null;\n\n    updateBasketRow: (row: BasketRow, updateGlobalDates?: boolean) => void;\n    removeBasketRow: (row: BasketRow) => void;\n\n    clearBasketRows: (confirm: boolean) => void;\n    selectBasketRow: (row: BasketRow | null) => void;\n\n    setStartDate: (date: dayjs.Dayjs) => void;\n    setEndDate: (date: dayjs.Dayjs) => void;\n    setPromoCodeDetails: (details: IPromoCodeDetails | null) => void;\n\n    quoteOrPencilReservation: (applyQuote: () => boolean) => void;\n\n    hasCheckedOut: boolean;\n    reservationData: ReservationsDTO;\n    booked: (data: ReservationsDTO, reservationRequest?: RoomstaySession['reservationRequest']) => Promise<void>;\n    rollback: () => void;\n    checkedOut: (data: ReservationsDTO) => void;\n    clearSelectedRates: () => void;\n    finish: () => void;\n    additionalPaymentRequired: (data: IPaymentCheckoutDetails) => void;\n\n    getRowForAddon: (selectedAddon: Addon) => BasketAddonRow | undefined;\n\n    setAddonQuantities: (addon: Addon, quantities: { quantity: number; adult: number; child: number }, selectedDate: string, selectedTime: string) => void;\n\n    removeBasketAddonRow: (row: BasketAddonRow) => void;\n    attemptSelectUnfilledRow: () => BasketRow | undefined;\n\n    initBasketRows: (basketRows: BasketRow[]) => void;\n    updateBasketFeeRows: () => void;\n\n    onDatePickerOpenChange: (isOpen: boolean) => void;\n    isDatePickerOpen: boolean;\n    canAddAnotherRoom: boolean;\n    hasPriceQuoteError: boolean;\n    isQuoteOrPencilReady: boolean;\n}\n"]}

package/dist/src/contexts/BasketContext/BasketContextWrapper.js

@@ -105,6 +105,7 @@ function BasketContextWrapper(props) {
     // Promo code details from availability response
     const [promoCodeDetails, setPromoCodeDetails] = (0, react_1.useState)(null);
     const [isLoadingPriceQuote, setIsLoadingPriceQuote] = (0, react_1.useState)(false);
+    const [hasPriceQuoteError, setHasPriceQuoteError] = (0, react_1.useState)(false); // If true, showing an error and enabling retry
     let loadedStartDate = null;
     let loadedEndDate = null;
     if ((_d = initialSession === null || initialSession === void 0 ? void 0 : initialSession.basketRows) === null || _d === void 0 ? void 0 : _d.length) {
@@ -276,7 +277,9 @@ function BasketContextWrapper(props) {
         const availableRow = filteredRows.find((row) => !row.getRate());
         // Return a row without a rate if found
         // If no such row exists , return the last row in the list
-        return availableRow !== null && availableRow !== void 0 ? availableRow : filteredRows[filteredRows.length - 1];
+        const nextBasketRow = availableRow !== null && availableRow !== void 0 ? availableRow : filteredRows[filteredRows.length - 1];
+        nextBasketRow.normalizeDateRange();
+        return nextBasketRow;
     };
     const updateQueryParameters = (row) => {
         if (!row)
@@ -497,12 +500,36 @@ function BasketContextWrapper(props) {
         setBasketFeeRows(newFees);
     };
     const quoteQueryID = (0, react_1.useMemo)(() => {
-        const requireQuote = (hotel === null || hotel === void 0 ? void 0 : hotel.rmsUseDepositQuote) || (hotel === null || hotel === void 0 ? void 0 : hotel.bookingFlow) !== core_1.EBookingFlow.Default;
+        const requireQuote = (hotel === null || hotel === void 0 ? void 0 : hotel.rmsUseDepositQuote) || (hotel === null || hotel === void 0 ? void 0 : hotel.bookingFlow) === core_1.EBookingFlow.PreCheckoutPencil;
         if (!hotel || !requireQuote) {
             return '';
         }
         return BookingAPI_1.default.Reservation.buildQuoteQueryID(currentBasketRows, isExternalMemberHotel ? memberNumber : undefined);
     }, [currentBasketRows, isExternalMemberHotel, memberNumber, hotel === null || hotel === void 0 ? void 0 : hotel.hotelID]);
+    /**
+     * Indicates whether required pricing data is ready.
+     *
+     * - Returns `true` when the hotel does not require a quote.
+     * - While a quote is loading, verifies all basket rows contain
+     *   the required pricing data (`quoteDetails` or `pencilId`).
+     * - Used to block UI actions until pricing is ready.
+     */
+    const isQuoteOrPencilReady = (0, react_1.useMemo)(() => {
+        const requireQuote = !!(hotel === null || hotel === void 0 ? void 0 : hotel.rmsUseDepositQuote) || !!((hotel === null || hotel === void 0 ? void 0 : hotel.bookingFlow) && (hotel === null || hotel === void 0 ? void 0 : hotel.bookingFlow) == core_1.EBookingFlow.PreCheckoutPencil);
+        const isLoadedQuoteOrPencil = currentBasketRows.every((basketRow) => {
+            if ((hotel === null || hotel === void 0 ? void 0 : hotel.bookingFlow) === core_1.EBookingFlow.PreCheckoutPencil) {
+                return !!basketRow.pencilId;
+            }
+            if (hotel === null || hotel === void 0 ? void 0 : hotel.rmsUseDepositQuote) {
+                return !!basketRow.quoteDetails;
+            }
+            return true;
+        });
+        if (!hotel || !requireQuote || (requireQuote && !isLoadingPriceQuote && isLoadedQuoteOrPencil)) {
+            return true;
+        }
+        return false;
+    }, [isLoadingPriceQuote, hotel === null || hotel === void 0 ? void 0 : hotel.rmsUseDepositQuote, hotel === null || hotel === void 0 ? void 0 : hotel.bookingFlow, currentBasketRows]);
     /**
      * Calculate total price of all addons with promo code discounts applied.
      * Uses AddonDiscountCalculator to handle sequential discount allocation.
@@ -510,6 +537,10 @@ function BasketContextWrapper(props) {
     const calculateAddonTotalWithDiscounts = (0, react_1.useCallback)(() => {
         return AddonDiscountCalculator_1.AddonDiscountCalculator.calculateTotal(basketAddonRows, currentBasketRows, promoCodeDetails);
     }, [basketAddonRows, currentBasketRows, promoCodeDetails]);
+    // Whether another room can be added (within max rooms per booking limit)
+    const canAddAnotherRoom = (0, react_1.useMemo)(() => {
+        return !(hotel === null || hotel === void 0 ? void 0 : hotel.maxRoomsPerBooking) || (hotel === null || hotel === void 0 ? void 0 : hotel.maxRoomsPerBooking) > currentBasketRows.length;
+    }, [hotel === null || hotel === void 0 ? void 0 : hotel.maxRoomsPerBooking, currentBasketRows.length]);
     const workingContext = {
         startDate: startDate,
         endDate: endDate,
@@ -541,6 +572,8 @@ function BasketContextWrapper(props) {
          * @param {BasketRow} row - The basket row to add.
          */
         addBasketRow: (row) => {
+            if (!canAddAnotherRoom)
+                return;
             syncSelectedDateRange(row);
             checkAndApplyMemberOnlyPromo(row);
             // Determine if the basket is currently empty
@@ -675,6 +708,7 @@ function BasketContextWrapper(props) {
                 return false;
             }
             setIsLoadingPriceQuote(true);
+            setHasPriceQuoteError(false);
             // Clear currently assigned quote details
             // If we're fetching basket row information the currently held info should be disregarded.
             currentBasketRows.forEach((row) => {
@@ -693,24 +727,23 @@ function BasketContextWrapper(props) {
                 if ((hotel === null || hotel === void 0 ? void 0 : hotel.bookingFlow) === core_1.EBookingFlow.PreCheckoutPencil) {
                     // Pencil call also passes back the quote (if applicable)
                     pencilResponse = response;
+                    // Important: When `hotel?.rmsUseDepositQuote` is false, `pencilResponse.quote` is always null
                     quoteResponse = pencilResponse.quote;
                     // Store parent pencil ID to pass back to the server later
                     setPencilId(pencilResponse.pencilId);
                     (_a = beContext.sessionProvider) === null || _a === void 0 ? void 0 : _a.updateSession({ pencilId: pencilResponse.pencilId });
                     // Future improvement: Handle availability errors
                 }
-                else {
+                else if (hotel.rmsUseDepositQuote) {
                     quoteResponse = response;
                 }
-                if (!quoteResponse) {
-                    return;
-                }
                 if (!applyQuote()) {
                     // User has left the Confirmation step before the quote was ready, we'll stop here instead of updating the basket.
                     // If we don't stop here, the user will be redirected back to the Confirmation step.
                     setIsLoadingPriceQuote(false);
                     return;
                 }
+                // Ensure pencilId is assigned even when quoteResponse is not available
                 for (const basketRow of currentBasketRows) {
                     const quoteRow = (_b = quoteResponse === null || quoteResponse === void 0 ? void 0 : quoteResponse.rows) === null || _b === void 0 ? void 0 : _b.find((row) => row.rowId === basketRow.getID());
                     const pencilRow = (_c = pencilResponse === null || pencilResponse === void 0 ? void 0 : pencilResponse.rows) === null || _c === void 0 ? void 0 : _c.find((row) => row.rowId === basketRow.getID());
@@ -723,6 +756,7 @@ function BasketContextWrapper(props) {
                     updateBasketRow(basketRow);
                 }
             }, (error) => {
+                setHasPriceQuoteError(true);
                 console.log(error);
                 console.log(`Error!: Retried  ${maxRetryAttempts} times then quit!`);
             }, () => {
@@ -740,6 +774,9 @@ function BasketContextWrapper(props) {
         getAllDatelessRows: () => {
             return currentBasketRows.filter((item) => !item.getStartDate() || !item.getEndDate());
         },
+        isValidDateRange: () => {
+            return !!startDate && !!endDate && startDate.isBefore(endDate);
+        },
         getNumberOfAdults: (withTranslation = false) => {
             return returnAggregationAndTranslation((row) => row.getAdults(), withTranslation ? Translation_1.Translation.Step.Date.Adult : undefined);
         },
@@ -1055,6 +1092,9 @@ function BasketContextWrapper(props) {
         },
         // Indicates whether the DatePicker is currently open.
         isDatePickerOpen: isDatePickerOpen,
+        canAddAnotherRoom: canAddAnotherRoom,
+        hasPriceQuoteError: hasPriceQuoteError,
+        isQuoteOrPencilReady: isQuoteOrPencilReady,
     };
     return (react_1.default.createElement(contexts_1.BasketContext.Provider, { value: workingContext },
         react_1.default.createElement(contexts_1.AuthenticationContextProvider, null,