@sabstravtech/obtservices 0.2.2511131440 → 0.2.2511200338

package/base/lib/vendor/services/requires-reason.service.d.ts

@@ -7,14 +7,15 @@ export type Required = Record<string, BasketItemManagementInfo[]>;
 export type RequiresReasonType = {
     basket: UserBasketResult;
     required: Required;
+    isDualSingleFlight?: boolean;
 };
 export interface RequiresReasonServiceInterface {
     currentBasketid: string;
     reasonChecked: BehaviorSubject<ReasonCheckedInterface>;
-    reasonSelected: BehaviorSubject<Boolean>;
+    reasonSelected: BehaviorSubject<boolean>;
     isReasonCancel: boolean;
     isBooking: boolean;
-    isReadyToBook: BehaviorSubject<Boolean>;
+    isReadyToBook: BehaviorSubject<boolean>;
 }
 export interface ReasonCheckedInterface {
     basketId: string;
@@ -25,12 +26,18 @@ export declare class BaseRequiresReasonService implements RequiresReasonServiceI
     private basketService;
     currentBasketid: string;
     private workingOn;
+    private processedDualSingleBasketItems;
+    private pendingDualSingleBasketItem;
     reasonChecked: BehaviorSubject<ReasonCheckedInterface>;
-    reasonSelected: BehaviorSubject<Boolean>;
+    reasonSelected: BehaviorSubject<boolean>;
     isReasonCancel: boolean;
     isBooking: boolean;
-    isReadyToBook: BehaviorSubject<Boolean>;
+    isReadyToBook: BehaviorSubject<boolean>;
     constructor(modalService: BaseModalOpenerService, basketService: EnterpriseBasketServiceInterface);
+    private isDualSingleFlight;
+    private isFirstLegOfDualSingle;
+    private getFilteredManagementInfo;
+    private buildWorkingOnForItems;
     addBasketItem(basket: UserBasketResult, basketItemId: string): Promise<void>;
     showDialogueWithNewData(workingOn: RequiresReasonType): Promise<void>;
     reasonKeysOverlap(biReasonKeys: string[], miReasonKeys: string[]): boolean;

package/base/lib/vendor/types/types.d.ts

@@ -992,22 +992,32 @@ export interface FavouriteGuest extends Guest {
 }
 export declare enum MealType {
     None = "None",
-    VGML = "Vegetarian-Vegan",
-    VOML = "Asian Vegetarian",
-    RVML = "Raw Vegetarian/Vegan",
+    AVML = "Asian Vegetarian",
+    BLML = "Bland",
+    CHML = "Child",
+    DBML = "Diabetic",
     FPML = "Fruit Plate",
-    SFML = "Seafood",
-    KSML = "Kosher",
-    MOML = "Muslim",
+    FSML = "Fish",
+    GFML = "Gluten intolerant",
     HNML = "Hindu",
+    IVML = "Indian Vegetarian",
+    JPML = "Japanese",
+    KSML = "Kosher",
+    KVML = "Kosher Vegetarian",
+    LCML = "Low Calorie",
     LFML = "Low Fat/Cholesterol",
-    VLML = "Vegetarian Lacto-Ovo",
     LSML = "Low Sodium",
-    GFML = "Gluten intolerant",
-    DBML = "Diabetic",
+    MOML = "Muslim",
+    NFML = "No Fish",
     NLML = "Non-Lactose",
-    CHML = "Child",
-    BLML = "Bland"
+    NSML = "No Salt",
+    PFML = "Peanuts Free",
+    RVML = "Raw Vegetarian/Vegan",
+    SFML = "Seafood",
+    VGML = "Vegetarian-Vegan",
+    VJML = "Vegetarian Jain",
+    VLML = "Vegetarian Lacto-Ovo",
+    VOML = "Vegetarian Oriental"
 }
 export declare enum SpecialNeeds {
     None = "None",

package/fesm2022/sabstravtech-obtservices-base.mjs

@@ -2844,22 +2844,32 @@ const genders = [
     Gender.Unspecified_Others
 ];
 const PREFERENCE_VALUES$1 = [
+    { label: "Asian Vegetarian", type: PreferenceKey.MealRequest, code: "AVML" },
     { label: "Bland", type: PreferenceKey.MealRequest, code: "BLML" },
     { label: "Child", type: PreferenceKey.MealRequest, code: "CHML" },
     { label: "Diabetic", type: PreferenceKey.MealRequest, code: "DBML" },
+    { label: "Fish", type: PreferenceKey.MealRequest, code: "FSML" },
     { label: "Fruit Plate", type: PreferenceKey.MealRequest, code: "FPML" },
-    { label: "Gluten intolerant", type: PreferenceKey.MealRequest, code: "GFML" },
+    { label: "Gluten Free", type: PreferenceKey.MealRequest, code: "GFML" },
     { label: "Hindu", type: PreferenceKey.MealRequest, code: "HNML" },
+    { label: "Indian Vegetarian", type: PreferenceKey.MealRequest, code: "IVML" },
+    { label: "Japanese", type: PreferenceKey.MealRequest, code: "JPML" },
     { label: "Kosher", type: PreferenceKey.MealRequest, code: "KSML" },
+    { label: "Kosher Vegetarian", type: PreferenceKey.MealRequest, code: "KVML" },
+    { label: "Low Calorie", type: PreferenceKey.MealRequest, code: "LCML" },
     { label: "Low Fat/Cholesterol", type: PreferenceKey.MealRequest, code: "LFML" },
     { label: "Low Sodium", type: PreferenceKey.MealRequest, code: "LSML" },
     { label: "Muslim", type: PreferenceKey.MealRequest, code: "MOML" },
+    { label: "No Fish", type: PreferenceKey.MealRequest, code: "NFML" },
     { label: "Non-Lactose", type: PreferenceKey.MealRequest, code: "NLML" },
+    { label: "No Salt", type: PreferenceKey.MealRequest, code: "NSML" },
+    { label: "Peanuts Free", type: PreferenceKey.MealRequest, code: "PFML" },
     { label: "Raw Vegetarian/Vegan", type: PreferenceKey.MealRequest, code: "RVML" },
     { label: "Seafood", type: PreferenceKey.MealRequest, code: "SFML" },
     { label: "Vegetarian-Vegan", type: PreferenceKey.MealRequest, code: "VGML" },
+    { label: "Vegetarian Jain", type: PreferenceKey.MealRequest, code: "VJML" },
     { label: "Vegetarian Lacto-Ovo", type: PreferenceKey.MealRequest, code: "VLML" },
-    { label: "Asian Vegetarian", type: PreferenceKey.MealRequest, code: "VOML" },
+    { label: "Vegetarian Oriental", type: PreferenceKey.MealRequest, code: "VOML" },
     { label: "Aisle", type: PreferenceKey.SeatingPreference },
     { label: "Window", type: PreferenceKey.SeatingPreference },
     { label: "Bassinet", type: PreferenceKey.SpecialNeed, code: "BSCT" },
@@ -4623,22 +4633,32 @@ var ErmFareTypes;
 var MealType;
 (function (MealType) {
     MealType["None"] = "None";
-    MealType["VGML"] = "Vegetarian-Vegan";
-    MealType["VOML"] = "Asian Vegetarian";
-    MealType["RVML"] = "Raw Vegetarian/Vegan";
+    MealType["AVML"] = "Asian Vegetarian";
+    MealType["BLML"] = "Bland";
+    MealType["CHML"] = "Child";
+    MealType["DBML"] = "Diabetic";
     MealType["FPML"] = "Fruit Plate";
-    MealType["SFML"] = "Seafood";
-    MealType["KSML"] = "Kosher";
-    MealType["MOML"] = "Muslim";
+    MealType["FSML"] = "Fish";
+    MealType["GFML"] = "Gluten intolerant";
     MealType["HNML"] = "Hindu";
+    MealType["IVML"] = "Indian Vegetarian";
+    MealType["JPML"] = "Japanese";
+    MealType["KSML"] = "Kosher";
+    MealType["KVML"] = "Kosher Vegetarian";
+    MealType["LCML"] = "Low Calorie";
     MealType["LFML"] = "Low Fat/Cholesterol";
-    MealType["VLML"] = "Vegetarian Lacto-Ovo";
     MealType["LSML"] = "Low Sodium";
-    MealType["GFML"] = "Gluten intolerant";
-    MealType["DBML"] = "Diabetic";
+    MealType["MOML"] = "Muslim";
+    MealType["NFML"] = "No Fish";
     MealType["NLML"] = "Non-Lactose";
-    MealType["CHML"] = "Child";
-    MealType["BLML"] = "Bland";
+    MealType["NSML"] = "No Salt";
+    MealType["PFML"] = "Peanuts Free";
+    MealType["RVML"] = "Raw Vegetarian/Vegan";
+    MealType["SFML"] = "Seafood";
+    MealType["VGML"] = "Vegetarian-Vegan";
+    MealType["VJML"] = "Vegetarian Jain";
+    MealType["VLML"] = "Vegetarian Lacto-Ovo";
+    MealType["VOML"] = "Vegetarian Oriental";
 })(MealType || (MealType = {}));
 var SpecialNeeds;
 (function (SpecialNeeds) {
@@ -12249,7 +12269,6 @@ class FlightEnterpriseSearch extends BaseEnterpriseSearch {
                             returnTimeWindow: ss.returnDepartureTimeWindow
                         }
                         : null);
-                    this.searchService.saveRecentSearch(this.getRecentSearchQuery(query));
                     delete this.ssoObject;
                     console.warn('+++ starting sso search +++');
                     return this._startSearch(this.flightfetcher.fetchList(query));
@@ -16504,7 +16523,7 @@ class HotelEnterpriseSearch extends BaseEnterpriseSearch {
             // build the query
             this.buildQuery();
             const query = this.getSearchQuery();
-            this.searchService.saveRecentSearch(this.getRecentSearchQuery(this.getSearchQuery()));
+            this.searchService.saveRecentSearch(this.getRecentSearchQuery(query));
             return this._startSearch(this.tempParams.location_type_select === LocationTypes.Shortlist
                 ? this.quickListFetcher.fetchList({
                     countryCode: this.country.cCode,
@@ -16541,7 +16560,10 @@ class HotelEnterpriseSearch extends BaseEnterpriseSearch {
                 countryCode: locationDetails.countryCode
             }
         };
-        this.boltSearchQuery = originalSearchHotel;
+        this.boltSearchQuery = _.clone(query);
+        this.boltSearchQuery.location_type_select = 'Address';
+        this.boltSearchQuery.checkin_date = moment(this.boltSearchQuery.startDate);
+        this.boltSearchQuery.checkout_date = moment(this.boltSearchQuery.endDate);
         this.resetSearch();
         this.checkin_date = null;
         this.checkout_date = null;
@@ -16631,7 +16653,11 @@ class HotelEnterpriseSearch extends BaseEnterpriseSearch {
         return this.helpers.removeNulls(this.query);
     }
     buildQuery(ogSearch = false) {
-        const tempParams = ogSearch && this.originalUserSearch ? this.originalUserSearch : this.tempParams;
+        const tempParams = ogSearch && this.originalUserSearch
+            ? this.originalUserSearch
+            : this.boltSearchQuery && this.boltSearchQuery?.length
+                ? this.boltSearchQuery
+                : this.tempParams;
         const currencyObject = this.userService.getUserFavoriteObject(UserFavorurite.PreferredCurrency);
         if ((!this.userCurrency || this.userCurrency !== currencyObject?.currency) &&
             currencyObject?.hotel?.enable) {
@@ -16672,46 +16698,56 @@ class HotelEnterpriseSearch extends BaseEnterpriseSearch {
         this.getRoomNumber();
         switch (tempParams.location_type_select) {
             case LocationTypes.Address:
-                switch (tempParams.location.type) {
-                    case LocationTypes.Airport:
-                        query.iata = tempParams.location.iata;
-                        break;
-                    case LocationTypes.City:
-                        query.countryCode = tempParams.location.countryCode;
-                        if (tempParams.location?.city || tempParams.location?.name) {
-                            query.cityName = tempParams.location?.city || tempParams.location?.name;
-                        }
-                        else if (tempParams.location.postcode) {
+                if (tempParams.location?.type) {
+                    switch (tempParams.location.type) {
+                        case LocationTypes.Airport:
+                            query.iata = tempParams.location.iata;
+                            query.countryCode = tempParams.location.countryCode;
+                            break;
+                        case LocationTypes.City:
+                            query.countryCode = tempParams.location.countryCode;
+                            if (tempParams.location?.name || tempParams.location?.city) {
+                                query.cityName = tempParams.location?.name || tempParams.location?.city;
+                            }
+                            else if (tempParams.location.postcode) {
+                                query.postOrZipCode = tempParams.location.postcode;
+                            }
+                            query.latitude = tempParams.location.latitude;
+                            query.longitude = tempParams.location.longitude;
+                            break;
+                        case LocationTypes.Hotel:
                             query.postOrZipCode = tempParams.location.postcode;
-                        }
-                        query.latitude = tempParams.location.latitude;
-                        query.longitude = tempParams.location.longitude;
-                        break;
-                    case LocationTypes.Hotel:
-                        query.postOrZipCode = tempParams.location.postcode;
-                        query.latitude = tempParams.location.latitude;
-                        query.longitude = tempParams.location.longitude;
-                        query.hotelName = tempParams.location.hotelTitle;
-                        query.countryCode = tempParams.location.countryCode;
-                        // Use location name as fallback for hotel name if hotel_name field is empty (for recent searches)
-                        if (!tempParams.hotel_name && tempParams.location?.name && !query.hotelName) {
-                            query.hotelName = tempParams.location.name;
-                        }
-                        // Also set cityName if location has city property
-                        if (tempParams.location?.city) {
-                            query.cityName = tempParams.location.city;
-                        }
-                        break;
-                    case LocationTypes.TrainStation:
-                        if (tempParams.location.latitude && tempParams.location.longitude) {
-                            //For EU stations
                             query.latitude = tempParams.location.latitude;
                             query.longitude = tempParams.location.longitude;
-                            if (tempParams.location.stationCode || tempParams.location.trainStationCode) {
-                                query.trainStationCode = tempParams.location.stationCode || tempParams.location.trainStationCode;
+                            query.hotelName = tempParams.location.hotelTitle;
+                            query.countryCode = tempParams.location.countryCode;
+                            // Use location name as fallback for hotel name if hotel_name field is empty (for recent searches)
+                            if (!tempParams.hotel_name && tempParams.location?.name && !query.hotelName) {
+                                query.hotelName = tempParams.location.name;
                             }
-                        }
-                        break;
+                            // Also set cityName if location has city property
+                            if (tempParams.location?.city) {
+                                query.cityName = tempParams.location.city;
+                            }
+                            break;
+                        case LocationTypes.TrainStation:
+                            if (tempParams.location.latitude && tempParams.location.longitude) {
+                                //For EU stations
+                                query.latitude = tempParams.location.latitude;
+                                query.longitude = tempParams.location.longitude;
+                                query.countryCode = tempParams.location.countryCode;
+                                if (tempParams.location.stationCode || tempParams.location.trainStationCode) {
+                                    query.trainStationCode =
+                                        tempParams.location.stationCode || tempParams.location.trainStationCode;
+                                }
+                            }
+                            break;
+                    }
+                }
+                else {
+                    query.countryCode = 'GB';
+                    query.latitude = tempParams.latitude;
+                    query.longitude = tempParams.longitude;
                 }
                 break;
             case LocationTypes.Office:
@@ -17428,7 +17464,13 @@ class HotelEnterpriseSearch extends BaseEnterpriseSearch {
                 const arriveLocation = outboundFlights[outboundFlights.length - 1]?.destinationAirportDetail;
                 if (arriveLocation) {
                     this.country = { cCode: arriveLocation.countryCode, cName: arriveLocation.countryName };
-                    this.location = { countryCode: arriveLocation.countryCode, latitude: arriveLocation.latitude, longitude: arriveLocation.longitude, type: LocationTypes.City, name: arriveLocation.city };
+                    this.location = {
+                        countryCode: arriveLocation.countryCode,
+                        latitude: arriveLocation.latitude,
+                        longitude: arriveLocation.longitude,
+                        type: LocationTypes.City,
+                        name: arriveLocation.city
+                    };
                 }
                 else {
                     this.location = null;
@@ -17450,6 +17492,9 @@ class HotelEnterpriseSearch extends BaseEnterpriseSearch {
                 if (railstation?.stationCode) {
                     locationDetail.stationCode = railstation.stationCode;
                 }
+                if (railstation?.locationDetails?.countryCode) {
+                    locationDetail.countryCode = railstation.locationDetails.countryCode;
+                }
                 this.location = locationDetail;
             }
             catch {
@@ -17470,6 +17515,9 @@ class HotelEnterpriseSearch extends BaseEnterpriseSearch {
                 if (railstation?.stationCode) {
                     locationDetail.stationCode = railstation.stationCode;
                 }
+                if (railstation?.locationDetails?.countryCode) {
+                    locationDetail.countryCode = railstation.locationDetails.countryCode;
+                }
                 this.location = locationDetail;
             }
             catch {
@@ -17485,7 +17533,13 @@ class HotelEnterpriseSearch extends BaseEnterpriseSearch {
                 const arriveLocation = outboundFlights[outboundFlights.length - 1]?.destinationAirportDetail;
                 if (arriveLocation) {
                     this.country = { cCode: arriveLocation.countryCode, cName: arriveLocation.countryName };
-                    this.location = { countryCode: arriveLocation.countryCode, latitude: arriveLocation.latitude, longitude: arriveLocation.longitude, type: LocationTypes.City, name: arriveLocation.city };
+                    this.location = {
+                        countryCode: arriveLocation.countryCode,
+                        latitude: arriveLocation.latitude,
+                        longitude: arriveLocation.longitude,
+                        type: LocationTypes.City,
+                        name: arriveLocation.city
+                    };
                 }
                 else {
                     this.location = null;
@@ -17508,13 +17562,25 @@ class HotelEnterpriseSearch extends BaseEnterpriseSearch {
                 switch (carHireSearch.locationType) {
                     case LocationTypes.Airport:
                         this.country = { cCode: pickup_location.countryCode, cName: pickup_location.country };
-                        this.location = { countryCode: pickup_location.countryCode, latitude: pickup_location.latitude, longitude: pickup_location.longitude, type: LocationTypes.City, name: pickup_location.destination };
+                        this.location = {
+                            countryCode: pickup_location.countryCode,
+                            latitude: pickup_location.latitude,
+                            longitude: pickup_location.longitude,
+                            type: LocationTypes.City,
+                            name: pickup_location.destination
+                        };
                         break;
                     case LocationTypes.City:
                         {
                             const cityCountryInfo = Countries.find(c => c.cCode === cityPickup.countryCode);
                             this.country = { cCode: cityCountryInfo.cCode, cName: cityCountryInfo.cName };
-                            this.location = { countryCode: cityPickup.countryCode, latitude: cityPickup.latitude, longitude: cityPickup.longitude, type: LocationTypes.City, name: cityPickup.city ? cityPickup.city : cityPickup.name };
+                            this.location = {
+                                countryCode: cityPickup.countryCode,
+                                latitude: cityPickup.latitude,
+                                longitude: cityPickup.longitude,
+                                type: LocationTypes.City,
+                                name: cityPickup.city ? cityPickup.city : cityPickup.name
+                            };
                         }
                         break;
                     case LocationTypes.Postcode:
@@ -17522,7 +17588,12 @@ class HotelEnterpriseSearch extends BaseEnterpriseSearch {
                             const postCodeCountryInfo = Countries.find(c => c.cCode === postcodePickup.countryCode);
                             this.country = { cCode: postCodeCountryInfo.cCode, cName: postCodeCountryInfo.cName };
                             this.location = null;
-                            this.location = { countryCode: postcodePickup.countryCode, postcode: postcodePickupRaw.postcode, type: LocationTypes.City, name: postcodePickupRaw.postcode };
+                            this.location = {
+                                countryCode: postcodePickup.countryCode,
+                                postcode: postcodePickupRaw.postcode,
+                                type: LocationTypes.City,
+                                name: postcodePickupRaw.postcode
+                            };
                             this.postcode = postcodePickupRaw;
                         }
                         break;
@@ -18020,9 +18091,7 @@ class HotelEnterpriseSearch extends BaseEnterpriseSearch {
         this.no_of_rooms = query.rooms;
         // Don't populate hotel_name from recent search to avoid duplication with location field
         // The hotel name will be used from location.name as fallback in buildQuery()
-        this.hotel_name = cloneBasketItem
-            ? this.clonedBasketItemDetails.hotelName
-            : null;
+        this.hotel_name = cloneBasketItem ? this.clonedBasketItemDetails.hotelName : null;
         this.hotel_chain = query.groupName ? { name: query.groupName } : null;
         this.country = query.countryCode
             ? (this.country = {
@@ -29317,6 +29386,8 @@ class BaseRequiresReasonService {
     basketService;
     currentBasketid;
     workingOn;
+    processedDualSingleBasketItems = new Set();
+    pendingDualSingleBasketItem = null;
     reasonChecked = new BehaviorSubject(null);
     reasonSelected = new BehaviorSubject(false);
     isReasonCancel;
@@ -29326,13 +29397,47 @@ class BaseRequiresReasonService {
         this.modalService = modalService;
         this.basketService = basketService;
     }
+    isDualSingleFlight(basket) {
+        return basket.basketItems.length === 2 &&
+            basket.basketItems.every(item => item?.service?.type === ServiceType.Flight && item?.detail?.journeyType === 'single') &&
+            basket.basketItems.every(item => item?.reasonKeys?.length > 0) &&
+            JSON.stringify(basket.basketItems[0]?.searchQuery) === JSON.stringify(basket.basketItems[1]?.searchQuery);
+    }
+    isFirstLegOfDualSingle(basket) {
+        return basket.basketItems.length === 1 &&
+            basket.basketItems[0]?.service?.type === ServiceType.Flight &&
+            basket.basketItems[0]?.detail?.journeyType === 'single' &&
+            basket.basketItems[0]?.reasonKeys?.length > 0 &&
+            basket.basketItems[0]?.searchQuery?.returnTrip === true;
+    }
+    getFilteredManagementInfo(basketItem) {
+        return basketItem.managementInfo?.filter((mi) => {
+            return mi.required && this.reasonKeysOverlap(basketItem.reasonKeys, mi.managementInfo.reasonKeys);
+        }) || [];
+    }
+    buildWorkingOnForItems(basket, basketItems, isDualSingle) {
+        return {
+            basket,
+            isDualSingleFlight: isDualSingle,
+            required: basketItems.reduce((required, bi) => {
+                required[bi.id] = this.getFilteredManagementInfo(bi);
+                return required;
+            }, {})
+        };
+    }
     async addBasketItem(basket, basketItemId) {
         if (basket.id !== this.currentBasketid) {
+            this.processedDualSingleBasketItems.clear();
+            this.pendingDualSingleBasketItem = null;
+            return;
+        }
+        const isDualSingle = this.isDualSingleFlight(basket);
+        if (isDualSingle && this.processedDualSingleBasketItems.has(basketItemId)) {
             return;
         }
         const basketItems = basket.basketItems.filter((bi) => {
-            return (!bi.agentOverrodeUnavailable && // we ask for reason and override in the override modal if applicable
-                basketItemId === bi.id &&
+            return (!bi.agentOverrodeUnavailable &&
+                (isDualSingle ? true : basketItemId === bi.id) &&
                 bi.reasonKeys?.length &&
                 !!bi.managementInfo?.filter((mi) => {
                     return mi.required && !mi.selectedValue && this.reasonKeysOverlap(bi.reasonKeys, mi.managementInfo.reasonKeys);
@@ -29340,22 +29445,31 @@ class BaseRequiresReasonService {
         });
         this.isReadyToBook.next(false);
         if (basketItems.length > 0) {
-            this.workingOn = {
-                basket,
-                required: basketItems.reduce((required, bi) => {
-                    required[bi.id] = bi.managementInfo?.filter((mi) => {
-                        return mi.required && this.reasonKeysOverlap(bi.reasonKeys, mi.managementInfo.reasonKeys);
-                    });
-                    return required;
-                }, {})
-            };
-            // Check if dialog is not already open
+            const isFirstLeg = this.isFirstLegOfDualSingle(basket);
+            const hasPendingItemThatNeedsModal = this.pendingDualSingleBasketItem && basket.basketItems.length === 2 && !isDualSingle;
+            if (hasPendingItemThatNeedsModal) {
+                const pendingItem = basket.basketItems.find(item => item.id === this.pendingDualSingleBasketItem);
+                if (pendingItem) {
+                    this.workingOn = this.buildWorkingOnForItems(basket, [pendingItem], false);
+                }
+                this.pendingDualSingleBasketItem = null;
+            }
+            else if (isFirstLeg && !hasPendingItemThatNeedsModal) {
+                this.pendingDualSingleBasketItem = basketItemId;
+                return;
+            }
+            else {
+                this.workingOn = this.buildWorkingOnForItems(basket, basketItems, isDualSingle);
+            }
             if (!this.basketService.isDialogOpen.value) {
                 this.basketService.isDialogOpen.next(true);
                 await this.showDialogueWithNewData(this.workingOn);
             }
         }
         else {
+            if (this.pendingDualSingleBasketItem && basket.basketItems.length === 2) {
+                this.pendingDualSingleBasketItem = null;
+            }
             this.reasonChecked.next({
                 basketId: this.currentBasketid,
                 reason: ''
@@ -29373,16 +29487,28 @@ class BaseRequiresReasonService {
             this.basketService.isDialogOpen.next(false);
             this.basketService.toggleMenu();
             this.reasonSelected.next(true);
+            workingOn.basket?.basketItems.forEach(bi => {
+                this.processedDualSingleBasketItems.add(bi.id);
+            });
+            const parentMiIdToValue = {};
+            Object.keys(results).forEach(miId => {
+                const bi = workingOn.basket?.basketItems.find(item => item.managementInfo?.some(mi => mi.managementInfo.id === miId));
+                const mi = bi?.managementInfo?.find(m => m.managementInfo.id === miId);
+                if (mi && results[miId]) {
+                    parentMiIdToValue[mi.managementInfo.parentManagementInfoId] = results[miId];
+                }
+            });
             await Promise.all(workingOn.basket?.basketItems.map((bi) => {
                 return Promise.all((bi.managementInfo || []).map((mi) => {
-                    if (results[mi.managementInfo.id]) {
+                    const selectedValue = results[mi.managementInfo.id] || parentMiIdToValue[mi.managementInfo.parentManagementInfoId];
+                    if (selectedValue && mi.required && this.reasonKeysOverlap(bi.reasonKeys, mi.managementInfo.reasonKeys)) {
                         this.reasonChecked.next({
                             basketId: this.currentBasketid,
-                            reason: results[mi.managementInfo.id]
+                            reason: selectedValue
                         });
                         const value = {
                             miId: mi.managementInfo.id,
-                            miValueId: results[mi.managementInfo.id],
+                            miValueId: selectedValue,
                             miFreeValue: ''
                         };
                         return this.basketService.setMiValues(false, value);
@@ -29398,6 +29524,10 @@ class BaseRequiresReasonService {
             workingOn = null;
         }
         else {
+            // Clear processed items for cancelled items
+            workingOn.basket?.basketItems.forEach(bi => {
+                this.processedDualSingleBasketItems.delete(bi.id);
+            });
             await Promise.all(Object.entries(workingOn.required).map(([biId, mis]) => {
                 return this.basketService.removeBasketItem(workingOn.basket.id, workingOn.basket.basketItems.find((bi) => bi.id === biId));
             }));
@@ -29692,16 +29822,20 @@ class InternalBasket {
         };
         toSend.mixedCurrency = Object.keys(toSend.prices).length > 1;
         this._basketSubject.next(toSend);
-        if (basket.basketItems.every(item => item?.detail?.outwardDetail?.splitID)) {
-            if (!(basket.basketItems.length % 2)) {
+        // Only check for requires-reason when a specific basket item is being added
+        // Don't trigger when basketItemId is empty (basket-wide updates like setting MI values)
+        if (basketItemId !== '') {
+            if (basket.basketItems.every(item => item?.detail?.outwardDetail?.splitID)) {
+                if (!(basket.basketItems.length % 2)) {
+                    this.requiresService.addBasketItem(basket, basketItemId);
+                    this.requiresOverrideService.addBasketItem(basket);
+                }
+            }
+            else {
                 this.requiresService.addBasketItem(basket, basketItemId);
                 this.requiresOverrideService.addBasketItem(basket);
             }
         }
-        else {
-            this.requiresService.addBasketItem(basket, basketItemId);
-            this.requiresOverrideService.addBasketItem(basket);
-        }
     }
 }
 class BaseEnterpriseBasketService {
@@ -30924,6 +31058,11 @@ class BaseEnterpriseBasketService {
                     intBasketItem.pnrLocator = basket.basketItems[i].pnrLocator;
                     intBasketItem.bookingDetail =
                         basket.basketItems[i]?.bookingDetail || intBasketItem.bookingDetail;
+                    intBasketItem.price = basket.basketItems[i].price;
+                    intBasketItem.latestValidationPrice = basket.basketItems[i].latestValidationPrice;
+                    intBasketItem.latestValidationPriceDifference = basket.basketItems[i].latestValidationPriceDifference;
+                    intBasketItem.latestValidationAvailable = basket.basketItems[i].latestValidationAvailable;
+                    intBasketItem.validated = basket.basketItems[i].validated;
                 }
                 else {
                     console.error(`+++ Unable to find basket item with id: ${responseBasketItems.id} +++`);
@@ -31699,22 +31838,32 @@ const PREFERENCE_KEYS = [
     { key: "7", label: "Flight Notifications", value: "FLIGHT_NOTIFICATIONS_ENABLED", type: "FLIGHT" },
 ];
 const PREFERENCE_VALUES = [
+    { label: "Asian Vegetarian", type: "MEAL_REQUEST", code: "AVML" },
     { label: "Bland", type: "MEAL_REQUEST", code: "BLML" },
     { label: "Child", type: "MEAL_REQUEST", code: "CHML" },
     { label: "Diabetic", type: "MEAL_REQUEST", code: "DBML" },
+    { label: "Fish", type: "MEAL_REQUEST", code: "FSML" },
     { label: "Fruit Plate", type: "MEAL_REQUEST", code: "FPML" },
-    { label: "Gluten intolerant", type: "MEAL_REQUEST", code: "GFML" },
+    { label: "Gluten Free", type: "MEAL_REQUEST", code: "GFML" },
     { label: "Hindu", type: "MEAL_REQUEST", code: "HNML" },
+    { label: "Indian Vegetarian", type: "MEAL_REQUEST", code: "IVML" },
+    { label: "Japanese", type: "MEAL_REQUEST", code: "JPML" },
     { label: "Kosher", type: "MEAL_REQUEST", code: "KSML" },
+    { label: "Kosher Vegetarian", type: "MEAL_REQUEST", code: "KVML" },
+    { label: "Low Calorie", type: "MEAL_REQUEST", code: "LCML" },
     { label: "Low Fat/Cholesterol", type: "MEAL_REQUEST", code: "LFML" },
     { label: "Low Sodium", type: "MEAL_REQUEST", code: "LSML" },
     { label: "Muslim", type: "MEAL_REQUEST", code: "MOML" },
+    { label: "No Fish", type: "MEAL_REQUEST", code: "NFML" },
     { label: "Non-Lactose", type: "MEAL_REQUEST", code: "NLML" },
+    { label: "No Salt", type: "MEAL_REQUEST", code: "NSML" },
+    { label: "Peanuts Free", type: "MEAL_REQUEST", code: "PFML" },
     { label: "Raw Vegetarian/Vegan", type: "MEAL_REQUEST", code: "RVML" },
     { label: "Seafood", type: "MEAL_REQUEST", code: "SFML" },
     { label: "Vegetarian-Vegan", type: "MEAL_REQUEST", code: "VGML" },
+    { label: "Vegetarian Jain", type: "MEAL_REQUEST", code: "VJML" },
     { label: "Vegetarian Lacto-Ovo", type: "MEAL_REQUEST", code: "VLML" },
-    { label: "Asian Vegetarian", type: "MEAL_REQUEST", code: "VOML" },
+    { label: "Vegetarian Oriental", type: "MEAL_REQUEST", code: "VOML" },
     { label: "Aisle", type: "SEATING_PREFERENCE" },
     { label: "Window", type: "SEATING_PREFERENCE" },
     { label: "Bassinet", type: "SPECIAL_NEED", code: "BSCT" },