@roomstay/frontend 2.6.61-0 → 2.6.62

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

@@ -58,6 +58,7 @@ const Text_1 = __importDefault(require("../../components/generic/Text"));
 const MemberSignInModal_1 = require("../../components/members/SignInModal/MemberSignInModal");
 const PromoCodeVerificationAlert_1 = require("../../components/steps/room/UserSearchSummary/PromoCodeVerificationAlert");
 const useSignedInMember_1 = require("../../hooks/useSignedInMember");
+const Addon_1 = require("../../models/Addon/Addon");
 const BasketAddonRow_1 = __importDefault(require("../../models/BasketAddonRow"));
 const BasketRow_1 = __importDefault(require("../../models/BasketRow"));
 const Fee_1 = require("../../models/Fee");
@@ -71,7 +72,7 @@ const GetStepRoom_1 = __importDefault(require("../../util/GetStepRoom"));
 const StepManager_1 = __importDefault(require("../../util/StepManager"));
 const StringHelper_1 = __importDefault(require("../../util/StringHelper"));
 function BasketContextWrapper(props) {
-    var _a, _b, _c, _d;
+    var _a, _b, _c;
     const { t } = (0, react_i18next_1.useTranslation)();
     const { hotel } = (0, hooks_1.useCurrentHotel)();
     const updateQueryParams = (0, UpdateQueryParameters_1.useUpdateQueryParameters)();
@@ -83,7 +84,6 @@ function BasketContextWrapper(props) {
     const { showPromoCodeAlert } = (0, react_1.useContext)(contexts_1.HotelOverridesContext);
     const initialSession = (_a = beContext === null || beContext === void 0 ? void 0 : beContext.engine) === null || _a === void 0 ? void 0 : _a.getInitialSession();
     const [currentBasketRows, basketRowReducer] = (0, react_1.useReducer)(BasketReducer_1.BasketReducer, (_b = initialSession === null || initialSession === void 0 ? void 0 : initialSession.basketRows) !== null && _b !== void 0 ? _b : []);
-    const [pencilId, setPencilId] = (0, react_1.useState)((_c = initialSession === null || initialSession === void 0 ? void 0 : initialSession.pencilId) !== null && _c !== void 0 ? _c : undefined);
     const [selectedBasketRow, setSelectedBasketRow] = (0, react_1.useState)(null);
     const [basketAddonRows, setBasketAddonRows] = (0, react_1.useState)([]);
     // This is where we store the fees that aren't included in the rates/addons.
@@ -91,7 +91,7 @@ function BasketContextWrapper(props) {
     const [isLoadingPriceQuote, setIsLoadingPriceQuote] = (0, react_1.useState)(false);
     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) {
+    if ((_c = initialSession === null || initialSession === void 0 ? void 0 : initialSession.basketRows) === null || _c === void 0 ? void 0 : _c.length) {
         loadedStartDate = initialSession.basketRows[0].getStartDate();
         loadedEndDate = initialSession.basketRows[0].getEndDate();
     }
@@ -244,8 +244,6 @@ function BasketContextWrapper(props) {
             queryParameters[AppQueryParameters_1.EAppQueryParameters.Children] = row.getChildren().toString();
         if (row.getAdults() !== undefined)
             queryParameters[AppQueryParameters_1.EAppQueryParameters.Adults] = row.getAdults().toString();
-        if (row.getRoomCode() !== '')
-            queryParameters[AppQueryParameters_1.EAppQueryParameters.Room] = row.getRoomCode();
         updateQueryParams(queryParameters);
     };
     const updateBasketRow = (row, updateGlobalDates = true) => {
@@ -282,16 +280,6 @@ function BasketContextWrapper(props) {
             return (0, rxjs_1.timer)(scalingDuration);
         }), (0, operators_1.finalize)(() => console.log('We are done!')));
     };
-    const getTotalQuoteDepositFees = () => {
-        //Retrieves the total quote deposit's fees
-        const totalQuoteFees = returnAggregationAndTranslation((row) => { var _a; return (row.quoteDetails ? (_a = row.quoteDetails) === null || _a === void 0 ? void 0 : _a.totalFees : 0); });
-        return totalQuoteFees;
-    };
-    const getTotalQuoteFullPaymentFees = () => {
-        //Retrieves the total quote full payment's fees
-        const totalQuoteFullPaymentFees = returnAggregationAndTranslation((row) => row.quoteDetails ? row.quoteDetails.fullPaymentAmount - row.quoteDetails.totalRate : 0);
-        return totalQuoteFullPaymentFees;
-    };
     const updateBasketFeeRows = () => {
         var _a, _b;
         const validBasketRows = currentBasketRows === null || currentBasketRows === void 0 ? void 0 : currentBasketRows.filter((row) => row.isValid());
@@ -432,7 +420,6 @@ function BasketContextWrapper(props) {
         reservationData: reservationData,
         isLoadingPriceQuote,
         loadedPromotion,
-        pencilId,
         /**
          * Adds a new basket row and applies relevant updates:
          * - Synchronizes the selected date range.
@@ -558,17 +545,9 @@ function BasketContextWrapper(props) {
                 }
             }
         }),
-        quoteOrPencilReservation: (applyQuote) => {
-            const maxRetryAttempts = 1;
-            let callApi;
-            // To avoid multiple requests, pencil reservation step also generates a quote (if applicable)
-            if ((hotel === null || hotel === void 0 ? void 0 : hotel.bookingFlow) === core_1.EBookingFlow.PreCheckoutPencil) {
-                callApi = BookingAPI_1.default.Reservation.pencilReservation;
-            }
-            else if (hotel === null || hotel === void 0 ? void 0 : hotel.requireDeposit) {
-                callApi = BookingAPI_1.default.Reservation.getPriceQuote;
-            }
-            else {
+        getBasketQuoteDetails: (preventApplyingOutcome) => {
+            const maxRetryAttempts = 5;
+            if (!hotel || !(hotel === null || hotel === void 0 ? void 0 : hotel.requireDeposit)) {
                 return false;
             }
             setIsLoadingPriceQuote(true);
@@ -580,43 +559,26 @@ function BasketContextWrapper(props) {
                     updateBasketRow(row);
                 }
             });
-            const retryableGetQuote = () => (0, rxjs_1.defer)(() => callApi(hotel.hotelID, currentBasketRows, isExternalMemberHotel ? memberNumber : undefined, pencilId)).pipe((0, operators_1.retryWhen)(genericRetryStrategy({
+            const getData = () => (0, rxjs_1.defer)(() => BookingAPI_1.default.Reservation.getPriceQuote(hotel.hotelID, currentBasketRows, isExternalMemberHotel ? memberNumber : undefined)).pipe((0, operators_1.retryWhen)(genericRetryStrategy({
                 maxRetryAttempts: maxRetryAttempts,
             })));
-            retryableGetQuote().subscribe((response) => {
-                var _a, _b, _c;
-                let pencilResponse = null;
-                let quoteResponse;
-                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;
-                    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 {
-                    quoteResponse = response;
-                }
-                if (!quoteResponse) {
+            const retryableObservable = getData();
+            retryableObservable.subscribe((quote) => {
+                if (quote === null)
                     return;
-                }
-                if (!applyQuote()) {
+                if (!preventApplyingOutcome()) {
                     // 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;
                 }
-                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());
-                    if (quoteRow) {
-                        basketRow.quoteDetails = quoteRow;
-                    }
-                    if (pencilRow) {
-                        basketRow.pencilId = pencilRow.pencilId;
+                for (const quoteRow of quote.rows) {
+                    const basketRow = currentBasketRows.find((row) => row.getID() === quoteRow.rowId);
+                    if (!basketRow) {
+                        console.warn('API Returned unfamiliar row ID', quoteRow.rowId);
+                        continue;
                     }
+                    basketRow.quoteDetails = quoteRow;
                     updateBasketRow(basketRow);
                 }
             }, (error) => {
@@ -649,33 +611,13 @@ function BasketContextWrapper(props) {
         getNumberOfRooms: (withTranslation = false) => {
             return returnAggregationAndTranslation(currentBasketRows.length, withTranslation ? Translation_1.Translation.Step.Date.Room : undefined);
         },
-        /**
-         * Calculates the total booking price, including:
-         * - Nightly rates
-         * - Deposit fees
-         * - Add-ons
-         *
-         * @returns {number} The total booking price.
-         */
         getTotalPrice: () => {
-            let totalPrice = 0;
-            if (!!(hotel === null || hotel === void 0 ? void 0 : hotel.requireDeposit)) {
-                // If deposit is required, get the total price from quote details
-                totalPrice = returnAggregationAndTranslation((row) => { var _a; return (row.quoteDetails ? (_a = row.quoteDetails) === null || _a === void 0 ? void 0 : _a.totalRate : 0); });
-                // Add deposit fees if credit card surcharge is disabled
-                if (!(hotel === null || hotel === void 0 ? void 0 : hotel.enableCreditCardSurcharge)) {
-                    // **Previous logic**: totalPrice  = total Base rate +  Fees on Deposit amount
-                    // const totalQuoteFees = getTotalQuoteDepositFees();
-                    // totalPrice += totalQuoteFees;
-                    // **Updated logic**: totalPrice = total Base rate + its fees
-                    totalPrice = returnAggregationAndTranslation((row) => { var _a; return (row.quoteDetails ? (_a = row.quoteDetails) === null || _a === void 0 ? void 0 : _a.fullPaymentAmount : 0); });
-                }
-            }
-            else {
-                // Otherwise, calculate the total price from valid rows
-                totalPrice = returnAggregationAndTranslation((row) => { var _a; return (row.isValid() ? (_a = row.getRate()) === null || _a === void 0 ? void 0 : _a.getTotalPrice() : 0); });
+            let totalPrice = returnAggregationAndTranslation((row) => { var _a; return (row.isValid() ? (_a = row.getRate()) === null || _a === void 0 ? void 0 : _a.getTotalPrice() : 0); });
+            // If the hotel requires a deposit, and enableCreditCardSurchase is false, we need to add the deposit fees to the total price.
+            if ((hotel === null || hotel === void 0 ? void 0 : hotel.requireDeposit) && !(hotel === null || hotel === void 0 ? void 0 : hotel.enableCreditCardSurcharge) && (hotel === null || hotel === void 0 ? void 0 : hotel.addDepositFeeToBookingTotal)) {
+                const depositFees = returnAggregationAndTranslation((row) => { var _a; return (row.quoteDetails ? (_a = row.quoteDetails) === null || _a === void 0 ? void 0 : _a.totalFees : 0); });
+                totalPrice += depositFees;
             }
-            // Add prices from any additional add-ons in the booking basket
             basketAddonRows.forEach((row) => {
                 totalPrice += row.getTotalPrice();
             });
@@ -685,11 +627,6 @@ function BasketContextWrapper(props) {
             });
             return totalPrice;
         },
-        /**
-         * Returns the total quote deposit amount, excluding fees.
-         *
-         * @returns {number} The sum of the quote deposit.
-         */
         getTotalDeposit: () => {
             const totalDeposit = returnAggregationAndTranslation((row) => { var _a; return (row.quoteDetails ? (_a = row.quoteDetails) === null || _a === void 0 ? void 0 : _a.totalDeposit : 0); });
             return totalDeposit;
@@ -702,7 +639,7 @@ function BasketContextWrapper(props) {
             let totalFees = returnAggregationAndTranslation((row) => { var _a; return (row.isValid() ? (_a = row.getRate()) === null || _a === void 0 ? void 0 : _a.getTotalFees() : 0); });
             if (totalFees == 0 && (hotel === null || hotel === void 0 ? void 0 : hotel.requireDeposit)) {
                 // Hotel may have credit card surcharges disabled, but they could still be included as a part of the quote.
-                totalFees = getTotalQuoteFullPaymentFees();
+                totalFees = returnAggregationAndTranslation((row) => { var _a; return (row.quoteDetails ? (_a = row.quoteDetails) === null || _a === void 0 ? void 0 : _a.totalFees : 0); });
             }
             basketAddonRows.forEach((row) => {
                 totalFees += row.getTotalFees();
@@ -741,26 +678,12 @@ function BasketContextWrapper(props) {
             const fees = (0, Fee_1.feeMapToArray)(feeMap);
             return (0, Fee_1.sortFees)(fees, (hotel === null || hotel === void 0 ? void 0 : hotel.fees) || []);
         },
-        /**
-         * Calculates the total amount to be paid immediately, including:
-         * - Required deposit
-         * - Deposit fees (if applicable)
-         * - Add-ons
-         *
-         * @returns {number} The total amount to pay now.
-         */
         getTotalPayNow: () => {
-            let totalDeposit = workingContext.getTotalDeposit();
-            if (!!(hotel === null || hotel === void 0 ? void 0 : hotel.requireDeposit) && !(hotel === null || hotel === void 0 ? void 0 : hotel.enableCreditCardSurcharge)) {
-                // Add deposit fees if credit card surcharge is disabled
-                const totalDepositFees = getTotalQuoteDepositFees();
-                totalDeposit += totalDepositFees;
+            if (hotel === null || hotel === void 0 ? void 0 : hotel.requireDeposit) {
+                const depositFees = returnAggregationAndTranslation((row) => { var _a; return (row.quoteDetails ? (_a = row.quoteDetails) === null || _a === void 0 ? void 0 : _a.totalFees : 0); });
+                return workingContext.getTotalDeposit() + depositFees;
             }
-            // Add prices from any additional add-ons in the booking basket
-            basketAddonRows.forEach((row) => {
-                totalDeposit += row.getTotalPrice();
-            });
-            return totalDeposit;
+            return workingContext.getTotalPrice();
         },
         /**
          * Pops the provided row from the current basket array
@@ -809,12 +732,12 @@ function BasketContextWrapper(props) {
         setStartDate,
         setEndDate,
         booked: (data, requestData) => __awaiter(this, void 0, void 0, function* () {
-            var _e;
+            var _d;
             const updateObject = { reservation: data };
             if (requestData) {
                 updateObject.reservationRequest = requestData;
             }
-            yield ((_e = beContext.sessionProvider) === null || _e === void 0 ? void 0 : _e.updateSessionAsync(updateObject));
+            yield ((_d = beContext.sessionProvider) === null || _d === void 0 ? void 0 : _d.updateSessionAsync(updateObject));
             setReservationData(data);
         }),
         rollback: () => {
@@ -873,14 +796,14 @@ function BasketContextWrapper(props) {
             addonRow.setSelectedDate(selectedDate);
             addonRow.setSelectedTime(addon.availability[selectedDate].selectorTimes ? selectedTime : undefined);
             // TODO: Quick hack to fix Synxis Basic Addon quantities.
-            if (addon.pricingType === core_1.EAddonPricingType.PER_ADULT_OCCUPANCY_PER_NIGHT) {
+            if (addon.pricingType === Addon_1.AddonPricingType.PER_ADULT_OCCUPANCY_PER_NIGHT) {
                 // TODO: Because all addons only apply to first room, we can select the 0th from the list.
                 const basketRow = currentBasketRows === null || currentBasketRows === void 0 ? void 0 : currentBasketRows[0];
                 if (basketRow) {
                     addonRow.setAdultQuantity(basketRow.getAdults());
                 }
             }
-            if (addon.pricingType === core_1.EAddonPricingType.PER_CHILD_OCCUPANCY_PER_NIGHT) {
+            if (addon.pricingType === Addon_1.AddonPricingType.PER_CHILD_OCCUPANCY_PER_NIGHT) {
                 // TODO: Because all addons only apply to first room, we can select the 0th from the list.
                 const basketRow = currentBasketRows === null || currentBasketRows === void 0 ? void 0 : currentBasketRows[0];
                 if (basketRow) {
@@ -888,7 +811,7 @@ function BasketContextWrapper(props) {
                 }
             }
             // TODO: More hackyness to handle RMS Per Person Fee requirements
-            if (addon.pricingType === core_1.EAddonPricingType.PER_ALL_PERSONS || addon.pricingType === core_1.EAddonPricingType.PER_ALL_PERSONS_PER_NIGHT) {
+            if (addon.pricingType === Addon_1.AddonPricingType.PER_ALL_PERSONS || addon.pricingType === Addon_1.AddonPricingType.PER_ALL_PERSONS_PER_NIGHT) {
                 const basketRow = currentBasketRows === null || currentBasketRows === void 0 ? void 0 : currentBasketRows[0];
                 if (basketRow) {
                     addonRow.setAdultQuantity(basketRow.getAdults());