@sabstravtech/obtservices 0.0.22051001 → 0.0.26051001

package/fesm2015/sabstravtech-obtservices-base.js

@@ -6,9 +6,10 @@ import moment from 'moment';
 import Ajv from 'ajv';
 
 class BaseEnterpriseSearch {
-    constructor(storageService, helpers) {
+    constructor(storageService, helpers, searchService) {
         this.storageService = storageService;
         this.helpers = helpers;
+        this.searchService = searchService;
         this._cheapestResultPrice = {
             amount: null,
             currencyCode: null
@@ -32,6 +33,11 @@ class BaseEnterpriseSearch {
     get originalUserSearch() {
         return this._originalUserSearch;
     }
+    performSearch() {
+        this.searchService.search_objects[this.type].chosen = true;
+        this.searchService.determineHighestSearchPriority();
+        this.searchService.startSearches();
+    }
     processResults(results) {
         return results;
     }
@@ -154,7 +160,8 @@ ModalTypes.RailTicketsDialogComponent = new ModalTypes('RailTicketsDialogCompone
 ModalTypes.ModalFlightFareComponent = new ModalTypes('ModalFlightFareComponent');
 ModalTypes.FlightExtrasDialogComponent = new ModalTypes('FlightExtrasDialogComponent');
 ModalTypes.OfflineRequestDialogComponent = new ModalTypes('OfflineRequestDialogComponent');
-ModalTypes.RequiresReasonDialogComponent = new ModalTypes('RequiresReasonDialogComponent');
+ModalTypes.RequiresReasonDialogComponent = new ModalTypes('RequiresReasonDialogComponent');
+ModalTypes.DifferentInvokdedUserComponent = new ModalTypes('DifferentInvokdedUserComponent');
 
 class BaseNetworkCall {
     constructor(modelService) {
@@ -560,6 +567,11 @@ var IrlTravellerStatus;
     IrlTravellerStatus["Placeholder"] = "placeholder";
     IrlTravellerStatus["Complete"] = "complete";
 })(IrlTravellerStatus || (IrlTravellerStatus = {}));
+var LeadPassengerType;
+(function (LeadPassengerType) {
+    LeadPassengerType["User"] = "USER";
+    LeadPassengerType["Guest"] = "GUEST";
+})(LeadPassengerType || (LeadPassengerType = {}));
 var LogLevelType;
 (function (LogLevelType) {
     LogLevelType["Error"] = "ERROR";
@@ -596,7 +608,7 @@ var PreferenceKey;
 (function (PreferenceKey) {
     PreferenceKey["MealRequest"] = "MEAL_REQUEST";
     PreferenceKey["SeatingPreference"] = "SEATING_PREFERENCE";
-    PreferenceKey["SpeacialNeed"] = "SPEACIAL_NEED";
+    PreferenceKey["SpecialNeed"] = "SPECIAL_NEED";
     PreferenceKey["SeatLocation"] = "SEAT_LOCATION";
     PreferenceKey["SeatPosition"] = "SEAT_POSITION";
     PreferenceKey["SeatDirection"] = "SEAT_DIRECTION";
@@ -733,8 +745,8 @@ class FreeTextManagementInfo extends ManagementInfoAndIsValid {
             }
         ];
     }
-    save(basketid, userId) {
-        this.basketService.setMiFreeValue(basketid, this, this.selectedValues[0] ? this.selectedValues[0].freeValue : '', userId);
+    save(basketid, userId, guest) {
+        this.basketService.setMiFreeValue(basketid, this, this.selectedValues[0] ? this.selectedValues[0].freeValue : '', userId, guest);
     }
     hasErrors(value) {
         return new Promise((resolve, reject) => {
@@ -779,15 +791,18 @@ class AutoSugestManagementInfo extends ManagementInfoAndIsValid {
         if (((_a = this.values) === null || _a === void 0 ? void 0 : _a.length) > 0) {
             this.avaliableItems = this.values;
         }
+        else {
+            console.error('No values for AutoSugest field');
+        }
     }
     getValue() {
         return this.selectedValues[0] ? this.selectedValues[0].value.id : '__NONE';
     }
-    hasErrors(id) {
+    hasErrors(value) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
                 return !this.avaliableItems.find((value1) => {
-                    return value1.id === id;
+                    return value1.id === value.id;
                 })
                     ? { hasErrors: true }
                     : null;
@@ -826,8 +841,9 @@ class AutoSugestManagementInfo extends ManagementInfoAndIsValid {
             this.selectedValues = [];
         }
     }
-    save(basketid, userid) {
-        this.basketService.setMiSelectedValue(basketid, this, this.selectedValues[0].value.id, userid);
+    save(basketid, userid, guest) {
+        var _a, _b;
+        this.basketService.setMiSelectedValue(basketid, this, this.selectedValues[0] ? (_b = (_a = this.selectedValues[0]) === null || _a === void 0 ? void 0 : _a.value) === null || _b === void 0 ? void 0 : _b.id : '', userid, guest);
     }
 }
 class HiddenManagementInfo extends ManagementInfoAndIsValid {
@@ -897,8 +913,8 @@ class DropdownManagementInfo extends ManagementInfoAndIsValid {
             this.selectedValues = [];
         }
     }
-    save(basketid, userid) {
-        this.basketService.setMiSelectedValue(basketid, this, this.selectedValues[0].value.id, userid);
+    save(basketid, userid, guest) {
+        this.basketService.setMiSelectedValue(basketid, this, this.selectedValues[0].value.id || '', userid, guest);
     }
 }
 const makeManagamentInfo = (managementInfo, basketService) => {
@@ -951,7 +967,20 @@ class BasketInfoMiDetailsImpl {
             };
             return userAccum;
         }, {});
+        this.miPerGuest = item.guests.reduce((userAccum, user) => {
+            userAccum[user.id] = {
+                managementInfo: this.helpers
+                    .clone(perUser)
+                    .map((miItem) => {
+                    const miItemObj = makeManagamentInfo(miItem, this.basketService);
+                    this.isValidObservers.push(miItemObj);
+                    return miItemObj;
+                })
+            };
+            return userAccum;
+        }, {});
         this.users = Object.keys(this.miPerUser);
+        this.guests = Object.keys(this.miPerGuest);
     }
 }
 
@@ -1001,6 +1030,7 @@ var BookingStatus;
     BookingStatus[BookingStatus["ApprovedBook"] = 13] = "ApprovedBook";
     BookingStatus[BookingStatus["PartiallyBooked"] = 14] = "PartiallyBooked";
     BookingStatus[BookingStatus["Complete"] = 15] = "Complete";
+    BookingStatus[BookingStatus["Expired"] = 16] = "Expired";
 })(BookingStatus || (BookingStatus = {}));
 var SchemaFormat;
 (function (SchemaFormat) {
@@ -1093,10 +1123,18 @@ const BreakBastExcluded = [
     'Breakfast Costs',
     'no breakfast'
 ];
+const AccessibleIncluded = [
+    'Accessibility',
+    'Accessible and Disabled',
+    'Accessible',
+    'Disabled'
+];
 const excludedPattern = '(' + BreakBastExcluded.join(')|(') + ')';
 const includedPattern = '(' + BreakFastIncluded.join(')|(') + ')';
+const includedAccessibilityPattern = '(' + AccessibleIncluded.join(')|(') + ')';
 const includedExpression = new RegExp(includedPattern, 'i');
 const excludedExpression = new RegExp(excludedPattern, 'i');
+const includedAccessibilityExpression = new RegExp(includedAccessibilityPattern, 'i');
 var SearchHandler;
 (function (SearchHandler) {
     SearchHandler["AVAILABILITY"] = "Availability";
@@ -1133,7 +1171,8 @@ const filtersKeys = {
     extra: 'extra',
     hotelName: 'hotelName',
     priceRange: 'priceRange',
-    breakfastType: 'breakfastType'
+    breakfastType: 'breakfastType',
+    accessibleRoomType: 'accessibleRoomType'
 };
 var ServiceProvider;
 (function (ServiceProvider) {
@@ -1177,20 +1216,20 @@ const PREFERENCE_VALUES = [
     { label: 'Raw Vegeterian', type: PreferenceKey.MealRequest },
     { label: 'Seafood', type: PreferenceKey.MealRequest },
     { label: 'Vegan Vegeterian', type: PreferenceKey.MealRequest },
-    { label: 'Vegeterain Lacto-Ovo', type: PreferenceKey.MealRequest },
+    { label: 'Vegeterian Lacto-Ovo', type: PreferenceKey.MealRequest },
     { label: 'Aisle', type: PreferenceKey.SeatingPreference },
     { label: 'Window', type: PreferenceKey.SeatingPreference },
-    { label: 'Bassinet', type: PreferenceKey.SpeacialNeed },
-    { label: 'Bicycle', type: PreferenceKey.SpeacialNeed },
-    { label: 'Blind passenger', type: PreferenceKey.SpeacialNeed },
-    { label: 'Deaf passenger', type: PreferenceKey.SpeacialNeed },
-    { label: 'Meet and assist', type: PreferenceKey.SpeacialNeed },
-    { label: 'Wheelchair, can ascend steps', type: PreferenceKey.SpeacialNeed },
-    { label: 'Wheelchair, can walk to seat', type: PreferenceKey.SpeacialNeed },
-    { label: 'Wheelchair, manual', type: PreferenceKey.SpeacialNeed },
-    { label: 'Wheelchair, must be carried', type: PreferenceKey.SpeacialNeed },
-    { label: 'Wheelchair, with dry battery', type: PreferenceKey.SpeacialNeed },
-    { label: 'Wheelchair, with wet battery', type: PreferenceKey.SpeacialNeed },
+    { label: 'Bassinet', type: PreferenceKey.SpecialNeed },
+    { label: 'Bicycle', type: PreferenceKey.SpecialNeed },
+    { label: 'Blind passenger', type: PreferenceKey.SpecialNeed },
+    { label: 'Deaf passenger', type: PreferenceKey.SpecialNeed },
+    { label: 'Meet and assist', type: PreferenceKey.SpecialNeed },
+    { label: 'Wheelchair, can ascend steps', type: PreferenceKey.SpecialNeed },
+    { label: 'Wheelchair, can walk to seat', type: PreferenceKey.SpecialNeed },
+    { label: 'Wheelchair, manual', type: PreferenceKey.SpecialNeed },
+    { label: 'Wheelchair, must be carried', type: PreferenceKey.SpecialNeed },
+    { label: 'Wheelchair, with dry battery', type: PreferenceKey.SpecialNeed },
+    { label: 'Wheelchair, with wet battery', type: PreferenceKey.SpecialNeed },
     { label: 'Quiet', type: PreferenceKey.SeatLocation },
     { label: 'Business', type: PreferenceKey.SeatLocation },
     { label: 'Family', type: PreferenceKey.SeatLocation },
@@ -2849,7 +2888,14 @@ const Airlines = [
     { label: 'Zimex Aviation', value: 'C4' },
     { label: 'Zoom Airlines', value: 'Z4' },
     { label: 'Zuliana De Aviacion', value: 'OD' }
-];
+];
+var DifferentInvokdedUserReasons;
+(function (DifferentInvokdedUserReasons) {
+    DifferentInvokdedUserReasons[DifferentInvokdedUserReasons["continue"] = 0] = "continue";
+    DifferentInvokdedUserReasons[DifferentInvokdedUserReasons["newBasket"] = 1] = "newBasket";
+    DifferentInvokdedUserReasons[DifferentInvokdedUserReasons["cancel"] = 2] = "cancel";
+    DifferentInvokdedUserReasons[DifferentInvokdedUserReasons["research"] = 3] = "research";
+})(DifferentInvokdedUserReasons || (DifferentInvokdedUserReasons = {}));
 
 class BookableBasket {
     constructor(basketService, helpers) {
@@ -2890,7 +2936,13 @@ class BookableBasket {
         this.basketService.subsribeToBasket(id, {
             next: (basket) => {
                 this.basket.next(basket);
-                this.updateBasket(basket);
+                // before updating the basket check if there is an expired basket item/s
+                if (this.expiredItemInTheBasket()) {
+                    this.status.next(BookingStatus.Expired);
+                }
+                else {
+                    this.updateBasket(basket);
+                }
             },
             error: (error) => {
                 this.basket.error(error);
@@ -2902,6 +2954,14 @@ class BookableBasket {
             }
         });
     }
+    expiredItemInTheBasket() {
+        this.isUpdating.next(false);
+        let expiredItemInTheBasket;
+        this.basket.subscribe((basket) => {
+            expiredItemInTheBasket = basket.basketItems.some((item) => item.expired);
+        });
+        return expiredItemInTheBasket;
+    }
     updateBasket(basket) {
         this.isUpdating.next(false);
         switch (basket.status) {
@@ -3065,16 +3125,18 @@ class BookableBasket {
         });
     }
     _splitTravellers(basketItem) {
-        return (basketItem.userPassengerTypes || []).reduce((accum, user, index) => {
+        return (basketItem.userPassengerTypes.concat(basketItem.guestPassengerTypes) || []).reduce((accum, user, index) => {
+            const userPassenger = this._findUser(basketItem.users, Number(user.id));
+            const guestPassenger = this._findGuest(basketItem.guests, Number(user.id));
             switch (user.passengerType) {
                 case PassengerType.Adult:
-                    accum.adults.push(this._findUser(basketItem.users, Number(user.id)));
+                    accum.adults.push(userPassenger || guestPassenger);
                     break;
                 case PassengerType.Child:
-                    accum.children.push(this._findUser(basketItem.users, Number(user.id)));
+                    accum.children.push(userPassenger || guestPassenger);
                     break;
                 case PassengerType.Infant:
-                    accum.infants.push(this._findUser(basketItem.users, Number(user.id)));
+                    accum.infants.push(userPassenger || guestPassenger);
                     break;
             }
             return accum;
@@ -3085,6 +3147,11 @@ class BookableBasket {
             return Number(user.id) === id;
         });
     }
+    _findGuest(users, id) {
+        return users.find((user) => {
+            return Number(user.id) === id;
+        });
+    }
     getId() {
         return this.id;
     }
@@ -3165,7 +3232,11 @@ const COACH_MAX_INFANT_AGE_YEARS = 0;
 const LOUNGES_MAX_INFANT_AGE_YEARS = 0;
 const METRES_TO_MILES_CONVERSION = 1609;
 const TIME_BASE = 60;
+const GROUP_TICKET_CODES = ['GS', 'AIG', 'GRP', 'GU3', 'GU4', 'GUC', 'MPG', '2TR', 'SGU'];
 class BaseHelperRoutines {
+    isGroupTicket(code) {
+        return GROUP_TICKET_CODES.includes(code.toUpperCase().trim());
+    }
     minToHour(dur) {
         return `${Math.floor(dur / 60)}h ${dur % 60}m`;
     }
@@ -3858,7 +3929,14 @@ class BaseHelperRoutines {
                 return value ? this.toStrings(value, schema) : isRequired ? {} : null;
             case 'array':
                 return value; // TODO write array translation
+            case 'date-time':
+                if (value.year) {
+                    value = this.formatIsoDate(this.ngDateToMoment(value));
+                }
+                return value;
+                break;
             default:
+                console.warn(`+++ unknown schema type ${schema.type} | returning value as is +++`);
                 return value;
         }
     }
@@ -3913,19 +3991,24 @@ class BaseHelperRoutines {
                 return miItem.isValid();
             }));
     }
-    isMiValid(miPerItem, miPerUser) {
+    isMiValid(miPerItem, miPerUser, miPerGuest) {
         const userMis = Object.values(miPerUser || {});
+        const guestMis = Object.values(miPerGuest || {});
         return (this.miIsValid(miPerItem) &&
             (userMis.length === 0 ||
                 !!userMis.find((userMis1) => {
                     return this.miIsValid(userMis1.managementInfo);
+                })) &&
+            (guestMis.length === 0 ||
+                !!guestMis.find((userMis1) => {
+                    return this.miIsValid(userMis1.managementInfo);
                 })));
     }
     needsMi(basket, needsToViewMi) {
         return (basket.basketInfoMiDetails.length > 0 &&
             (needsToViewMi ||
                 !basket.basketInfoMiDetails.find((miDetail) => {
-                    return this.isMiValid(miDetail.miPerItem, miDetail.miPerUser);
+                    return this.isMiValid(miDetail.miPerItem, miDetail.miPerUser, miDetail.miPerGuest);
                 })));
     }
     findService(services, id) {
@@ -4554,9 +4637,8 @@ var ActionType;
 
 class CabHireEnterpriseSearch extends BaseEnterpriseSearch {
     constructor(cabfetcher, helpers, storageService, searchService, basketService) {
-        super(storageService, helpers);
+        super(storageService, helpers, searchService);
         this.cabfetcher = cabfetcher;
-        this.searchService = searchService;
         this.basketService = basketService;
         this.type = ServiceType.Cab;
         this.airportChange = new Subject();
@@ -5035,8 +5117,12 @@ class CabHireEnterpriseSearch extends BaseEnterpriseSearch {
             adults: this.tempParams.adults,
             children: this.tempParams.children,
             departs: this.tempParams.departs,
-            fromLocation: simplifiedLocation ? this.createCabHireLocation(this.tempParams.fromAddress) : this.tempParams.fromAddress,
-            toLocation: simplifiedLocation ? this.createCabHireLocation(this.tempParams.toAddress) : this.tempParams.toAddress,
+            fromLocation: simplifiedLocation
+                ? this.createCabHireLocation(this.tempParams.fromAddress)
+                : this.tempParams.fromAddress,
+            toLocation: simplifiedLocation
+                ? this.createCabHireLocation(this.tempParams.toAddress)
+                : this.tempParams.toAddress,
             infants: 0,
             vehicleType: this.vehicleType,
             vias: this._vias
@@ -5123,7 +5209,7 @@ class CabHireEnterpriseSearch extends BaseEnterpriseSearch {
                 'administrative_area_level_2',
                 'locality'
             ]),
-            PostCode: this.getAddressFromPlaceDetails(location, ['postal_code']),
+            PostCode: this.getAddressFromPlaceDetails(location, ['postcode']),
             Country: this.getAddressFromPlaceDetails(location, ['country']),
             placeDescription
         };
@@ -5191,6 +5277,47 @@ class CabHireEnterpriseSearch extends BaseEnterpriseSearch {
             // TODO flights haven't been done yet.
         }
     }
+    updateSearchFromExpiredBasketItem(basketItem) {
+        var _a, _b, _c, _d;
+        const searchCabHireQuery = basketItem.searchQuery;
+        if (searchCabHireQuery) {
+            this.departs = moment(searchCabHireQuery.departs);
+            this.vehicleType = searchCabHireQuery.vehicleType;
+            this.fromAddress = this.convertAddressLocation(searchCabHireQuery.fromLocation.address, searchCabHireQuery.fromLocation.postcode);
+            this.toAddress = this.convertAddressLocation(searchCabHireQuery.toLocation.address, searchCabHireQuery.toLocation.postcode);
+            if (searchCabHireQuery.vias) {
+                let viasFrom = searchCabHireQuery.vias;
+                if (viasFrom[0]) {
+                    this.viasFrom = this.convertAddressLocation((_a = viasFrom[0]) === null || _a === void 0 ? void 0 : _a.address, (_b = viasFrom[0]) === null || _b === void 0 ? void 0 : _b.postcode);
+                }
+                let viasTo = searchCabHireQuery.vias;
+                if (viasTo[1]) {
+                    this.viasTo = this.convertAddressLocation((_c = viasTo[1]) === null || _c === void 0 ? void 0 : _c.address, (_d = viasTo[1]) === null || _d === void 0 ? void 0 : _d.postcode);
+                }
+            }
+        }
+        // add Travellers
+        if (basketItem.users) {
+            basketItem.users.forEach((user) => {
+                this.searchService.addTraveller(user);
+            });
+        }
+    }
+    convertAddressLocation(address, postcode) {
+        let locationArray = address.split(',');
+        let street = '';
+        let town = locationArray[locationArray.length - 2];
+        for (let index = 1; index < locationArray.length - 2; index++) {
+            street += locationArray[index] + ' ';
+        }
+        return {
+            Country: address.slice(-2),
+            House: locationArray[0],
+            PostCode: postcode,
+            Street: street,
+            Town: town
+        };
+    }
     getTransType() {
         var _a;
         const transTypeIndex = this.tempParams.vehicleType;
@@ -5199,13 +5326,13 @@ class CabHireEnterpriseSearch extends BaseEnterpriseSearch {
     addCabHireToBasket(cabHireQuote, cabHireQuery) {
         return __awaiter(this, void 0, void 0, function* () {
             if (cabHireQuote.unavailable) {
-                return Promise.resolve(false);
+                return Promise.resolve(DifferentInvokdedUserReasons.cancel);
             }
             const intBasket = yield this.basketService.getDefaultBasket();
             const basket = intBasket === null || intBasket === void 0 ? void 0 : intBasket.subject.value;
             const termsAndConditions = this.getTermsAndCond(cabHireQuote);
             if (basket) {
-                return this.basketService.addToBasket({
+                const whatHappened = yield this.basketService.addToBasket({
                     adults: cabHireQuery.adults,
                     basket: basket.id,
                     service: cabHireQuote.sourceId.toString(),
@@ -5238,8 +5365,12 @@ class CabHireEnterpriseSearch extends BaseEnterpriseSearch {
                     co2PerPassenger: cabHireQuote.co2PerPassenger,
                     outboundDate: cabHireQuery.departs.format()
                 }, intBasket, this.searchService, this.travellers, cabHireQuote.requiresReason);
+                if (whatHappened === DifferentInvokdedUserReasons.research) {
+                    this.performSearch();
+                }
+                return whatHappened;
             }
-            return Promise.resolve(false); // TODO should this throw an error?
+            return DifferentInvokdedUserReasons.cancel;
         });
     }
     switchFromAndToLocation() {
@@ -5295,8 +5426,14 @@ class CabHireEnterpriseSearch extends BaseEnterpriseSearch {
             }
             else {
                 this.mode = TaxiFormMode.STATION;
-                this.airportSearchType = fav.fromLocation.Street ? AirportSearchMode.DROPOFF : AirportSearchMode.PICKUP;
-                this.searchService.getAirportsList(!fav.fromLocation.Street ? fav.fromLocation.House : fav.toLocation.House).subscribe(airport => {
+                this.airportSearchType = fav.fromLocation.Street
+                    ? AirportSearchMode.DROPOFF
+                    : AirportSearchMode.PICKUP;
+                this.searchService
+                    .getAirportsList(!fav.fromLocation.Street
+                    ? fav.fromLocation.House
+                    : fav.toLocation.House)
+                    .subscribe((airport) => {
                     this.airport = airport[0];
                 });
             }
@@ -5337,11 +5474,10 @@ var SortTypesCar;
 class CarhireEnterpriseSearch extends BaseEnterpriseSearch {
     // ! - End of getters and setters
     constructor(carhirefetcher, carHireAvailabilityDetailFetcher, helpers, basketService, storageService, searchService) {
-        super(storageService, helpers);
+        super(storageService, helpers, searchService);
         this.carhirefetcher = carhirefetcher;
         this.carHireAvailabilityDetailFetcher = carHireAvailabilityDetailFetcher;
         this.basketService = basketService;
-        this.searchService = searchService;
         // ! - Hardcoded Data
         this._carTypeCodes = [
             ['B', '2-3 Door', CarHireType.TwoToThreeDoor],
@@ -6030,20 +6166,20 @@ class CarhireEnterpriseSearch extends BaseEnterpriseSearch {
         this.dropoff_datetime = moment(recentSearch.searchArgs.dropoffDateTime);
         this.pickup_datetime = moment(recentSearch.searchArgs.pickupDateTime);
         if (recentSearch.searchArgs.city) {
-            this.getParamsForCarbyCity(recentSearch);
+            this.getParamsForCarbyCity(recentSearch.searchArgs.city);
         }
         else if (recentSearch.searchArgs.airport) {
-            this.getParamsForCarbyAirport(recentSearch);
+            this.getParamsForCarbyAirport(recentSearch.searchArgs.airport);
         }
         else if (recentSearch.searchArgs.depot) {
-            this.getParamsForCarbyPostCode(recentSearch);
+            this.getParamsForCarbyPostCode(recentSearch.searchArgs.depot);
         }
     }
-    getParamsForCarbyAirport(recentSearch) {
+    getParamsForCarbyAirport(airport) {
         this.locationType = LocationTypes.Airport;
         combineLatest([
-            this.searchService.getAirportByCode(recentSearch.searchArgs.airport.pickupCode),
-            this.searchService.getAirportByCode(recentSearch.searchArgs.airport.dropoffCode)
+            this.searchService.getAirportByCode(airport.pickupCode),
+            this.searchService.getAirportByCode(airport.dropoffCode)
         ]).subscribe(([departLocation, arriveLocation]) => {
             var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
             if (departLocation && arriveLocation) {
@@ -6069,73 +6205,73 @@ class CarhireEnterpriseSearch extends BaseEnterpriseSearch {
             }
         });
     }
-    getParamsForCarbyCity(recentSearch) {
+    getParamsForCarbyCity(city) {
         this.locationType = LocationTypes.City;
-        this.chosenDistance = recentSearch.searchArgs.city.chosenDistance;
+        this.chosenDistance = city.chosenDistance;
         this.cityPickup = {
-            countryCode: recentSearch.searchArgs.city.pickupCountryCode,
-            id: recentSearch.searchArgs.city.pickupCity,
-            name: recentSearch.searchArgs.city.pickupName,
+            countryCode: city.pickupCountryCode,
+            id: city.pickupCity,
+            name: city.pickupName,
             type: LocationTypes.City,
-            latitude: recentSearch.searchArgs.city.pickupLatitude,
-            longitude: recentSearch.searchArgs.city.pickupLongitude
+            latitude: city.pickupLatitude,
+            longitude: city.pickupLongitude
         };
         this.cityDropoff = {
-            countryCode: recentSearch.searchArgs.city.dropoffCountryCode,
-            id: recentSearch.searchArgs.city.dropoffCity,
-            name: recentSearch.searchArgs.city.dropOffName,
+            countryCode: city.dropoffCountryCode,
+            id: city.dropoffCity,
+            name: city.dropOffName,
             type: LocationTypes.City,
-            latitude: recentSearch.searchArgs.city.dropOffLatitude,
-            longitude: recentSearch.searchArgs.city.dropOffLongitude
+            latitude: city.dropOffLatitude,
+            longitude: city.dropOffLongitude
         };
         this.cityDropoffDepot = {
-            addressLines: [recentSearch.searchArgs.city.dropOffAddressLines],
-            cityName: recentSearch.searchArgs.city.dropOffCityName,
-            extendedLocationCode: recentSearch.searchArgs.city.dropOffExtendedLocationCode,
-            locationCode: recentSearch.searchArgs.city.dropOffLocationCode,
-            vendor: recentSearch.searchArgs.city.dropOffVendor,
-            vendorCode: recentSearch.searchArgs.city.dropOffVendorCode
+            addressLines: [city.dropOffAddressLines],
+            cityName: city.dropOffCityName,
+            extendedLocationCode: city.dropOffExtendedLocationCode,
+            locationCode: city.dropOffLocationCode,
+            vendor: city.dropOffVendor,
+            vendorCode: city.dropOffVendorCode
         };
         this.cityPickupDepot = {
-            addressLines: [recentSearch.searchArgs.city.pickupAddressLines],
-            cityName: recentSearch.searchArgs.city.pickupCityName,
-            extendedLocationCode: recentSearch.searchArgs.city.pickupExtendedLocationCode,
-            locationCode: recentSearch.searchArgs.city.pickupLocationCode,
-            vendor: recentSearch.searchArgs.city.pickupVendor,
-            vendorCode: recentSearch.searchArgs.city.pickupVendorCode
+            addressLines: [city.pickupAddressLines],
+            cityName: city.pickupCityName,
+            extendedLocationCode: city.pickupExtendedLocationCode,
+            locationCode: city.pickupLocationCode,
+            vendor: city.pickupVendor,
+            vendorCode: city.pickupVendorCode
         };
         this.searchService.startSearches();
     }
-    getParamsForCarbyPostCode(recentSearch) {
+    getParamsForCarbyPostCode(depot) {
         this.locationType = LocationTypes.Postcode;
-        this.chosenDistance = recentSearch.searchArgs.depot.chosenDistance;
+        this.chosenDistance = depot.chosenDistance;
         this.postcodeDropoff = {
-            addressLines: [recentSearch.searchArgs.depot.dropoffAddressLines],
-            vendorCode: recentSearch.searchArgs.depot.vendorCode,
-            locationCode: recentSearch.searchArgs.depot.dropOffLocationCode,
-            extendedLocationCode: recentSearch.searchArgs.depot.dropOffExtendedLocationCode,
-            cityName: recentSearch.searchArgs.depot.dropoffCityName,
-            vendor: recentSearch.searchArgs.depot.dropoffVendor
+            addressLines: [depot.dropoffAddressLines],
+            vendorCode: depot.vendorCode,
+            locationCode: depot.dropOffLocationCode,
+            extendedLocationCode: depot.dropOffExtendedLocationCode,
+            cityName: depot.dropoffCityName,
+            vendor: depot.dropoffVendor
         };
         this.postcodeDropoffRaw = {
-            name: recentSearch.searchArgs.depot.dropoffPostCode,
+            name: depot.dropoffPostCode,
             type: LocationTypes.Postcode,
-            latitude: recentSearch.searchArgs.depot.dropoffLatitude,
-            longitude: recentSearch.searchArgs.depot.dropoffLongitude
+            latitude: depot.dropoffLatitude,
+            longitude: depot.dropoffLongitude
         };
         this.postcodePickup = {
-            addressLines: [recentSearch.searchArgs.depot.pickupAddressLines],
-            vendorCode: recentSearch.searchArgs.depot.vendorCode,
-            locationCode: recentSearch.searchArgs.depot.pickupLocationCode,
-            extendedLocationCode: recentSearch.searchArgs.depot.pickupExtendedLocationCode,
-            cityName: recentSearch.searchArgs.depot.pickupCityName,
-            vendor: recentSearch.searchArgs.depot.pickupVendor
+            addressLines: [depot.pickupAddressLines],
+            vendorCode: depot.vendorCode,
+            locationCode: depot.pickupLocationCode,
+            extendedLocationCode: depot.pickupExtendedLocationCode,
+            cityName: depot.pickupCityName,
+            vendor: depot.pickupVendor
         };
         this.postcodePickupRaw = {
-            name: recentSearch.searchArgs.depot.pickupPostCode,
+            name: depot.pickupPostCode,
             type: LocationTypes.Postcode,
-            latitude: recentSearch.searchArgs.depot.pickupLatitude,
-            longitude: recentSearch.searchArgs.depot.pickupLongitude
+            latitude: depot.pickupLatitude,
+            longitude: depot.pickupLongitude
         };
         this.searchService.startSearches();
     }
@@ -6421,6 +6557,46 @@ class CarhireEnterpriseSearch extends BaseEnterpriseSearch {
             return max;
         }, Number.MIN_SAFE_INTEGER);
     }
+    updateSearchFromExpiredBasketItem(basketItem) {
+        const searchCarHireQuery = basketItem.searchQuery;
+        if (searchCarHireQuery) {
+            this.chosenVendor = searchCarHireQuery.vendor;
+            this.carClass = searchCarHireQuery.class;
+            this.carType = searchCarHireQuery.type;
+            this.transmission = searchCarHireQuery.transmission;
+            this.airCon = searchCarHireQuery.aircon;
+            this.estimatedMileage = searchCarHireQuery.estimatedDailyDistance;
+            this.dropoff_datetime = moment(searchCarHireQuery.dropoffDateTime);
+            this.pickup_datetime = moment(searchCarHireQuery.pickupDateTime);
+            if (searchCarHireQuery.city) {
+                this.getParamsForCarbyCity(searchCarHireQuery.city);
+            }
+            else if (searchCarHireQuery.airport) {
+                this.getParamsForCarbyAirport(searchCarHireQuery.airport);
+            }
+            else if (searchCarHireQuery.depot) {
+                this.updateSearchForCarbyPostCode(searchCarHireQuery, basketItem.detail);
+            }
+        }
+        // add Travellers
+        if (basketItem.users) {
+            basketItem.users.forEach((user) => {
+                this.searchService.addTraveller(user);
+            });
+        }
+    }
+    updateSearchForCarbyPostCode(depot, detail) {
+        this.locationType = LocationTypes.Postcode;
+        this.chosenDistance = depot.chosenDistance;
+        this.postcodeDropoffRaw = {
+            name: detail.dropOffLocation.postcode,
+            type: LocationTypes.Postcode
+        };
+        this.postcodePickupRaw = {
+            name: detail.pickUpLocation.postcode,
+            type: LocationTypes.Postcode
+        };
+    }
     updateFromPreviousSearches(previousItems) {
         var _a;
         console.log('PREPOPULATING CARHIRE FORM');
@@ -6529,7 +6705,7 @@ class CarhireEnterpriseSearch extends BaseEnterpriseSearch {
         var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
             if (carHireVehicleAvailibility.unavailable) {
-                return Promise.resolve(false);
+                return Promise.resolve(DifferentInvokdedUserReasons.cancel);
             }
             const intBasket = yield this.basketService.getDefaultBasket();
             const basket = intBasket === null || intBasket === void 0 ? void 0 : intBasket.subject.value;
@@ -6537,7 +6713,7 @@ class CarhireEnterpriseSearch extends BaseEnterpriseSearch {
                 const { co2PerItem, co2PerPassenger, displayRecord, identifiers, sourceId } = carHireVehicleAvailibility;
                 const price = parseFloat((_b = (_a = displayRecord === null || displayRecord === void 0 ? void 0 : displayRecord.charges[0]) === null || _a === void 0 ? void 0 : _a.amount) !== null && _b !== void 0 ? _b : '0');
                 const termsAndConditions = this.getTermsAndCond(carHireVehicleAvailibility, carHireQuery);
-                return this.basketService.addToBasket({
+                const whatHappened = yield this.basketService.addToBasket({
                     adults: this.adults,
                     basket: basket.id,
                     service: sourceId.toString(),
@@ -6581,8 +6757,12 @@ class CarhireEnterpriseSearch extends BaseEnterpriseSearch {
                     co2PerPassenger,
                     outboundDate: new Date(displayRecord.pickup).toISOString()
                 }, intBasket, this.searchService, this.travellers, carHireVehicleAvailibility.requiresReason);
+                if (whatHappened === DifferentInvokdedUserReasons.research) {
+                    this.performSearch();
+                }
+                return whatHappened;
             }
-            return Promise.resolve(false);
+            return Promise.resolve(DifferentInvokdedUserReasons.cancel);
         });
     }
     // TODO waiting for data
@@ -6670,12 +6850,16 @@ class CarhireEnterpriseSearch extends BaseEnterpriseSearch {
             this.chosenVendor = fav.vendor;
             this.carType = fav.type;
             this.return_to_pickup = fav.airport.pickupCode == fav.airport.dropoffCode;
-            this.searchService.getAirportsList(fav.airport.pickupCode).subscribe(results => {
-                this.pickup_location = results.find(a => a.gateway == fav.airport.pickupCode);
+            this.searchService
+                .getAirportsList(fav.airport.pickupCode)
+                .subscribe((results) => {
+                this.pickup_location = results.find((a) => a.gateway == fav.airport.pickupCode);
             });
             if (!this.return_to_pickup)
-                this.searchService.getAirportsList(fav.airport.dropoffCode).subscribe(results => {
-                    this.dropoff_location = results.find(a => a.gateway == fav.airport.dropoffCode);
+                this.searchService
+                    .getAirportsList(fav.airport.dropoffCode)
+                    .subscribe((results) => {
+                    this.dropoff_location = results.find((a) => a.gateway == fav.airport.dropoffCode);
                 });
         });
     }
@@ -6808,11 +6992,10 @@ var FlightSortTypes;
 })(FlightSortTypes || (FlightSortTypes = {}));
 class FlightEnterpriseSearch extends BaseEnterpriseSearch {
     constructor(flightfetcher, helpers, userService, basketService, storageService, searchService, applyFlightRules, modalService) {
-        super(storageService, helpers);
+        super(storageService, helpers, searchService);
         this.flightfetcher = flightfetcher;
         this.userService = userService;
         this.basketService = basketService;
-        this.searchService = searchService;
         this.applyFlightRules = applyFlightRules;
         this.modalService = modalService;
         this.type = ServiceType.Flight;
@@ -7378,6 +7561,7 @@ class FlightEnterpriseSearch extends BaseEnterpriseSearch {
                 inlegsCount: 0,
                 dataSource: '',
                 preferred: false,
+                preferredMessage: '',
                 outboundFlightNumber: '',
                 operator: '',
                 operatorFull: '',
@@ -7398,7 +7582,7 @@ class FlightEnterpriseSearch extends BaseEnterpriseSearch {
                 }
                 // ! using a reduce because not all flights actually exist and we were seeing undefined in the flight list
                 brands[brand].forEach((flightNum) => {
-                    var _a, _b;
+                    var _a, _b, _c, _d, _e, _f;
                     const flight = groupedObject[flightNum];
                     if (flight) {
                         if (isOutBound || treatOutboundsAsOutbounds) {
@@ -7418,7 +7602,13 @@ class FlightEnterpriseSearch extends BaseEnterpriseSearch {
                             returnObject.maxPrice > maxprice
                                 ? returnObject.maxPrice
                                 : maxprice;
-                        if ((_b = (_a = returnObject.classes[correctBrand]) === null || _a === void 0 ? void 0 : _a.flights) === null || _b === void 0 ? void 0 : _b.length) {
+                        returnObject.preferred =
+                            ((_a = this._ruleActionSummary.journeyWhenSelected[flight.journeyHash]) === null || _a === void 0 ? void 0 : _a.companyPreferred) || ((_b = this._ruleActionSummary.whenSelectedAlone[flight.journeyHash]) === null || _b === void 0 ? void 0 : _b.companyPreferred) ||
+                                false;
+                        returnObject.preferredMessage =
+                            ((_c = this._ruleActionSummary.journeyWhenSelected[flight.journeyHash]) === null || _c === void 0 ? void 0 : _c.companyPreferredMessage) || ((_d = this._ruleActionSummary.whenSelectedAlone[flight.journeyHash]) === null || _d === void 0 ? void 0 : _d.companyPreferredMessage) ||
+                                '';
+                        if ((_f = (_e = returnObject.classes[correctBrand]) === null || _e === void 0 ? void 0 : _e.flights) === null || _f === void 0 ? void 0 : _f.length) {
                             returnObject.classes[correctBrand].flights.push(flight);
                             returnObject.classes[correctBrand].minprice = Math.min(returnObject.classes[correctBrand].minprice, minprice);
                             returnObject.classes[correctBrand].maxprice = Math.max(returnObject.classes[correctBrand].maxprice, maxprice);
@@ -7817,6 +8007,101 @@ class FlightEnterpriseSearch extends BaseEnterpriseSearch {
     updateFromPreviousSearches(_previousItems) {
         // Flights can not be search after other products so no defaults can be set.
     }
+    updateSearchFromExpiredBasketItem(basketItem) {
+        const searchFlightsQuery = basketItem.searchQuery;
+        if (searchFlightsQuery.outboundDate) {
+            let outboundTimeWindow = searchFlightsQuery.outboundDepartureTimeWindow
+                ? searchFlightsQuery.outboundDepartureTimeWindow
+                : searchFlightsQuery.outboundArrivalTimeWindow;
+            this.outBoundDate = this.convertRecentSearchDateTime(searchFlightsQuery.outboundDate, outboundTimeWindow);
+        }
+        if (searchFlightsQuery.returnDate) {
+            let returnTimeWindow = searchFlightsQuery.returnDepartureTimeWindow
+                ? searchFlightsQuery.returnDepartureTimeWindow
+                : searchFlightsQuery.returnArrivalTimeWindow;
+            this.inboundDate = this.convertRecentSearchDateTime(searchFlightsQuery.returnDate, returnTimeWindow);
+        }
+        this.fareType = searchFlightsQuery.fareType;
+        this.maxConnections = searchFlightsQuery.maxConnections;
+        if (searchFlightsQuery.outboundCabinClass) {
+            this.cabinClass =
+                searchFlightsQuery.outboundCabinClass;
+        }
+        if (searchFlightsQuery.returnCabinClass) {
+            this.returnCabinClass =
+                searchFlightsQuery.returnCabinClass;
+        }
+        this.includeNearbyAirports = searchFlightsQuery.includeNearbyAirports
+            ? true
+            : false;
+        this.chosenSearchType = searchFlightsQuery.returnTrip
+            ? FlightSearchType.return
+            : FlightSearchType.oneWay;
+        if (searchFlightsQuery.outboundDepartureTimeWindow) {
+            this.outTimeCriteria = TimeWindow.Depart;
+        }
+        else if (searchFlightsQuery.outboundArrivalTimeWindow) {
+            this.outTimeCriteria = TimeWindow.Arrive;
+        }
+        else {
+            this.outTimeCriteria = TimeWindow.Anytime;
+        }
+        if (searchFlightsQuery.returnDepartureTimeWindow) {
+            this.inTimeCriteria = TimeWindow.Depart;
+        }
+        else if (searchFlightsQuery.returnArrivalTimeWindow) {
+            this.inTimeCriteria = TimeWindow.Arrive;
+        }
+        else {
+            this.inTimeCriteria = TimeWindow.Anytime;
+        }
+        combineLatest([
+            this.searchService.getAirportByCode(searchFlightsQuery.originAirport),
+            this.searchService.getAirportByCode(searchFlightsQuery.destinationAirport)
+        ]).subscribe(([departLocation, arriveLocation]) => {
+            var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
+            if (departLocation && arriveLocation) {
+                this.departLocation = {
+                    destination: departLocation.iataMatch.name,
+                    gateway: departLocation.iataMatch.iata,
+                    terminals: this.searchService.processTerminals(departLocation.iataMatch.terminals),
+                    country: (_b = (_a = departLocation.iataMatch) === null || _a === void 0 ? void 0 : _a.locationDetails) === null || _b === void 0 ? void 0 : _b.country,
+                    postcode: (_d = (_c = departLocation.iataMatch) === null || _c === void 0 ? void 0 : _c.locationDetails) === null || _d === void 0 ? void 0 : _d.postcode,
+                    countryCode: (_f = (_e = departLocation.iataMatch) === null || _e === void 0 ? void 0 : _e.locationDetails) === null || _f === void 0 ? void 0 : _f.countryCode
+                };
+                this.arriveLocation = {
+                    destination: arriveLocation.iataMatch.name,
+                    gateway: arriveLocation.iataMatch.iata,
+                    terminals: this.searchService.processTerminals(arriveLocation.iataMatch.terminals),
+                    country: (_h = (_g = arriveLocation.iataMatch) === null || _g === void 0 ? void 0 : _g.locationDetails) === null || _h === void 0 ? void 0 : _h.country,
+                    postcode: (_k = (_j = arriveLocation.iataMatch) === null || _j === void 0 ? void 0 : _j.locationDetails) === null || _k === void 0 ? void 0 : _k.postcode,
+                    countryCode: (_m = (_l = arriveLocation.iataMatch) === null || _l === void 0 ? void 0 : _l.locationDetails) === null || _m === void 0 ? void 0 : _m.countryCode
+                };
+                if (searchFlightsQuery.preferredCarriers) {
+                    let carriers = searchFlightsQuery.preferredCarriers;
+                    const preferredCarriers = [];
+                    carriers.map((preferredCarry) => {
+                        this.searchService
+                            .getAirlinesList(preferredCarry)
+                            .subscribe((items) => {
+                            items.map((item) => {
+                                if (item.code === preferredCarry) {
+                                    preferredCarriers.push(item);
+                                }
+                            });
+                            this.preferredCarriers = preferredCarriers;
+                        });
+                    });
+                }
+            }
+        });
+        // add Travellers
+        if (basketItem.users) {
+            basketItem.users.forEach((user) => {
+                this.searchService.addTraveller(user);
+            });
+        }
+    }
     getTotalBaggage(result) {
         let total = 0;
         const parsedAdditional = JSON.parse(result.additional);
@@ -8054,21 +8339,30 @@ class FlightEnterpriseSearch extends BaseEnterpriseSearch {
                     })));
         };
         const selectedRuleSummary = this._ruleActionSummary.dualSingleWhenSelected[(_b = this.selectedGroupFlight) === null || _b === void 0 ? void 0 : _b.journeyHash] || {};
+        const hasField = (flight, field, def) => {
+            return (this.helpers.fieldFromObject(this._ruleActionSummary, [
+                'journeyWhenSelected',
+                flight.journeyHash,
+                field
+            ]) ||
+                this.helpers.fieldFromObject(this._ruleActionSummary, [
+                    'whenSelectedAlone',
+                    flight.journeyHash,
+                    field
+                ]) ||
+                this.helpers.fieldFromObject(selectedRuleSummary, [
+                    flight.journeyHash,
+                    field
+                ]) ||
+                def);
+        };
         const setSelected = (flight) => {
-            var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
+            var _a;
             flight.selected = flight.uid === ((_a = this.selectedGroupFlight) === null || _a === void 0 ? void 0 : _a.uid);
-            flight.unavailable =
-                ((_b = this._ruleActionSummary.journeyWhenSelected[flight.journeyHash]) === null || _b === void 0 ? void 0 : _b.unavailable) || ((_c = this._ruleActionSummary.whenSelectedAlone[flight.journeyHash]) === null || _c === void 0 ? void 0 : _c.unavailable) || ((_d = selectedRuleSummary[flight.journeyHash]) === null || _d === void 0 ? void 0 : _d.unavailable) ||
-                    false;
-            flight.unavailableMessage =
-                ((_e = this._ruleActionSummary.journeyWhenSelected[flight.journeyHash]) === null || _e === void 0 ? void 0 : _e.unavailableMessage) || ((_f = this._ruleActionSummary.whenSelectedAlone[flight.journeyHash]) === null || _f === void 0 ? void 0 : _f.unavailableMessage) ||
-                    '';
-            flight.requiresReason =
-                ((_g = this._ruleActionSummary.journeyWhenSelected[flight.journeyHash]) === null || _g === void 0 ? void 0 : _g.requiresReason) || ((_h = this._ruleActionSummary.whenSelectedAlone[flight.journeyHash]) === null || _h === void 0 ? void 0 : _h.requiresReason) || ((_j = selectedRuleSummary[flight.journeyHash]) === null || _j === void 0 ? void 0 : _j.requiresReason) ||
-                    false;
-            flight.requiresReasonMessage =
-                ((_k = this._ruleActionSummary.journeyWhenSelected[flight.journeyHash]) === null || _k === void 0 ? void 0 : _k.requiresReasonMessage) || ((_l = this._ruleActionSummary.whenSelectedAlone[flight.journeyHash]) === null || _l === void 0 ? void 0 : _l.requiresReasonMessage) ||
-                    '';
+            flight.unavailable = hasField(flight, 'unavailable', false);
+            flight.unavailableMessage = hasField(flight, 'unavailableMessage', '');
+            flight.requiresReason = hasField(flight, 'requiresReason', false);
+            flight.requiresReasonMessage = hasField(flight, 'requiresReasonMessage', '');
             return flight;
         };
         if (this.isGroupedFlights(this.fullResults)) {
@@ -8261,24 +8555,30 @@ class FlightEnterpriseSearch extends BaseEnterpriseSearch {
         }, selectedFlight.outboundFlights[0].dateTimeDeparting);
     }
     doBooking(intBasket, selectedFlight, schemaDetails, outboundDate, inboundDate) {
-        const { sourceId, co2PerItem, co2PerPassenger, total } = selectedFlight;
-        const booking = {
-            adults: this.adults,
-            basket: intBasket.id,
-            children: this.children,
-            co2PerItem,
-            co2PerPassenger,
-            currency: total.currency,
-            detail: schemaDetails,
-            price: total.price,
-            searchQuery: this.resultQuery,
-            service: sourceId.toString(),
-            outboundDate
-        };
-        if (inboundDate) {
-            booking.inboundDate = inboundDate;
-        }
-        this.basketService.addToBasket(booking, intBasket, this.searchService, this.travellers, selectedFlight.requiresReason);
+        return __awaiter(this, void 0, void 0, function* () {
+            const { sourceId, co2PerItem, co2PerPassenger, total } = selectedFlight;
+            const booking = {
+                adults: this.adults,
+                basket: intBasket.id,
+                children: this.children,
+                co2PerItem,
+                co2PerPassenger,
+                currency: total.currency,
+                detail: schemaDetails,
+                price: total.price,
+                searchQuery: this.resultQuery,
+                service: sourceId.toString(),
+                outboundDate
+            };
+            if (inboundDate) {
+                booking.inboundDate = inboundDate;
+            }
+            const whatHappened = yield this.basketService.addToBasket(booking, intBasket, this.searchService, this.travellers, selectedFlight.requiresReason);
+            if (whatHappened === DifferentInvokdedUserReasons.research) {
+                this.performSearch();
+            }
+            return whatHappened;
+        });
     }
     makeSchemaFlights(selectedFlight, flightGroup, groupIndex, segmentIndex) {
         return Object.assign(Object.assign({}, selectedFlight), { journeyInfo: {
@@ -8290,7 +8590,7 @@ class FlightEnterpriseSearch extends BaseEnterpriseSearch {
     addFlightJourneysToBasket(flightQuote) {
         return __awaiter(this, void 0, void 0, function* () {
             if (flightQuote.unavailable) {
-                return Promise.resolve(false);
+                return Promise.resolve(DifferentInvokdedUserReasons.cancel);
             }
             const intBasket = yield this.basketService.getDefaultBasket();
             const basket = intBasket === null || intBasket === void 0 ? void 0 : intBasket.subject.value;
@@ -8334,7 +8634,7 @@ class FlightEnterpriseSearch extends BaseEnterpriseSearch {
                 }
                 return this.basketService.addToBasket(booking, intBasket, this.searchService, this.travellers, flightQuote.requiresReason);
             }
-            return Promise.resolve(false); // TODO should this throw an error?
+            return Promise.resolve(DifferentInvokdedUserReasons.cancel); // TODO should this throw an error?
         });
     }
     setFlightDisplayType(displayType) {
@@ -8344,26 +8644,28 @@ class FlightEnterpriseSearch extends BaseEnterpriseSearch {
     _applyFilter() {
         this.applyFilters(this.currentFilters, this.currentSort);
     }
-    openFlightFareRules(rules, flights) {
+    openFlightFareRules(rules, flights, options = null, flightDetail = null) {
         // first check if there are rules
         const doCall = !Object.values(rules).find((rule) => rule.length);
         if (doCall) {
             const rulesFromCall = this.searchService.getFlightFareRules(flights[0]);
             rulesFromCall.subscribe((data) => {
-                this.modalService.open(ModalTypes.ModalFlightFareComponent, null, {
+                this.modalService.open(ModalTypes.ModalFlightFareComponent, options, {
                     rules: data.results[0],
                     from: flights[0].originAirport,
-                    to: flights[flights.length - 1].destinationAirport
+                    to: flights[flights.length - 1].destinationAirport,
+                    flight: flightDetail
                 });
             }, (err) => {
                 console.log(err);
             });
         }
         else {
-            this.modalService.open(ModalTypes.ModalFlightFareComponent, null, {
+            this.modalService.open(ModalTypes.ModalFlightFareComponent, options, {
                 rules,
                 from: flights[0].originAirport,
-                to: flights[flights.length - 1].destinationAirport
+                to: flights[flights.length - 1].destinationAirport,
+                flight: flightDetail
             });
         }
     }
@@ -8515,33 +8817,54 @@ class FlightEnterpriseSearch extends BaseEnterpriseSearch {
     }
     applyFavourite(fav) {
         return __awaiter(this, void 0, void 0, function* () {
-            this.chosenSearchType = fav.multiDestination ? FlightSearchType.multiCity : fav.returnTrip ? FlightSearchType.return : FlightSearchType.oneWay;
+            this.chosenSearchType = fav.multiDestination
+                ? FlightSearchType.multiCity
+                : fav.returnTrip
+                    ? FlightSearchType.return
+                    : FlightSearchType.oneWay;
             if (this.chosenSearchType == FlightSearchType.multiCity) {
                 const multi = yield Promise.all(fav.multiDestination.map((a) => __awaiter(this, void 0, void 0, function* () {
-                    let destination = { date: undefined, dest: undefined, orig: undefined };
-                    destination.orig = yield this.searchService.getAirportsList(a.orig).toPromise().then(origResults => {
-                        return origResults.find(b => b.gateway == a.orig);
+                    let destination = {
+                        date: undefined,
+                        dest: undefined,
+                        orig: undefined
+                    };
+                    destination.orig = yield this.searchService
+                        .getAirportsList(a.orig)
+                        .toPromise()
+                        .then((origResults) => {
+                        return origResults.find((b) => b.gateway == a.orig);
                     });
-                    destination.dest = yield this.searchService.getAirportsList(a.dest).toPromise().then(destResults => {
-                        return destResults.find(b => b.gateway == a.dest);
+                    destination.dest = yield this.searchService
+                        .getAirportsList(a.dest)
+                        .toPromise()
+                        .then((destResults) => {
+                        return destResults.find((b) => b.gateway == a.dest);
                     });
                     return destination;
                 })));
                 this.multiDestination = multi;
             }
             else {
-                this.searchService.getAirportsList(fav.originAirport).subscribe(results => {
-                    this.departLocation = results.find(a => a.gateway == fav.originAirport);
+                this.searchService
+                    .getAirportsList(fav.originAirport)
+                    .subscribe((results) => {
+                    this.departLocation = results.find((a) => a.gateway == fav.originAirport);
                 });
-                this.searchService.getAirportsList(fav.destinationAirport).subscribe(results => {
-                    this.arriveLocation = results.find(a => a.gateway == fav.destinationAirport);
+                this.searchService
+                    .getAirportsList(fav.destinationAirport)
+                    .subscribe((results) => {
+                    this.arriveLocation = results.find((a) => a.gateway == fav.destinationAirport);
                 });
             }
             this.cabinClass = fav.outboundCabinClass[0];
-            this.returnCabinClass = this.chosenSearchType != FlightSearchType.return ? null : fav.returnCabinClass[0];
+            this.returnCabinClass =
+                this.chosenSearchType != FlightSearchType.return
+                    ? null
+                    : fav.returnCabinClass[0];
             this.includeNearbyAirports = fav.includeNearbyAirports;
-            this.adults = fav.passengers.filter((a) => a.type == "ADULT").length;
-            this.children = fav.passengers.filter((a) => a.type == "CHILD").length;
+            this.adults = fav.passengers.filter((a) => a.type == 'ADULT').length;
+            this.children = fav.passengers.filter((a) => a.type == 'CHILD').length;
             // this.preferredCarriers = fav.preferredCarriers.map((a: any) => {
             // })
         });
@@ -8574,6 +8897,8 @@ var URLS;
     URLS["CONFIRMA_INFO_URL"] = "/confermainfo/Info.aspx?mode=hotel&key=MICROSSABS&id=";
     URLS["RECOVER_PASSWORD_URL"] = "password/getResetToken";
     URLS["RESET_PASSWORD"] = "password/resetByToken";
+    URLS["BECOME_USER"] = "startUserSupport";
+    URLS["END_BECOME_USER"] = "endUserSupport";
     URLS["ADMIN_USER_PANEL"] = "https://admin-staging.ctmlightning.co.uk/user";
 })(URLS || (URLS = {}));
 
@@ -8587,6 +8912,7 @@ class HotelFilters {
         this.extra = [];
         this.hotelName = '';
         this.breakfastType = [];
+        this.accessibleRoomType = [];
     }
 }
 var HotelView;
@@ -8605,13 +8931,12 @@ const CLIENT_PREFERRED_VALUE = 1;
 const AGENT_PREFERRED_VALUE = 2;
 class HotelEnterpriseSearch extends BaseEnterpriseSearch {
     constructor(hotelFetcher, helpers, userService, environment, avaliabilityService, basketService, storageService, searchService, httpCallService, quickListFetcher, getRailStationFetcher, applyHotelRulesFetcher) {
-        super(storageService, helpers);
+        super(storageService, helpers, searchService);
         this.hotelFetcher = hotelFetcher;
         this.userService = userService;
         this.environment = environment;
         this.avaliabilityService = avaliabilityService;
         this.basketService = basketService;
-        this.searchService = searchService;
         this.httpCallService = httpCallService;
         this.quickListFetcher = quickListFetcher;
         this.getRailStationFetcher = getRailStationFetcher;
@@ -8620,6 +8945,7 @@ class HotelEnterpriseSearch extends BaseEnterpriseSearch {
         this.location_types = new BehaviorSubject([]);
         this.offices = new BehaviorSubject([]);
         this.lastActivePage = new BehaviorSubject(null);
+        this.jitRulesReceived = new BehaviorSubject(false);
         this.galleries = {};
         this.occupied = 0;
         this.results_details = {
@@ -8682,7 +9008,8 @@ class HotelEnterpriseSearch extends BaseEnterpriseSearch {
                     this.hasPreferred(hotel) &&
                     this.breakfastTypeFilter(hotel) &&
                     this.getExtraFilter(hotel) &&
-                    this.getAmenitiesFilter(hotel));
+                    this.getAmenitiesFilter(hotel) &&
+                    this.accessibleRoomTypeFilter(hotel));
             });
             this.results.next(this.resultsFilterMethod(this.fullResults));
         };
@@ -8716,6 +9043,7 @@ class HotelEnterpriseSearch extends BaseEnterpriseSearch {
             this.results_details.chains.add(hotelResult.group);
         });
         this.fullResults = results;
+        this.jitRulesReceived.next(false);
         this.results.next(results);
         this._isValid();
         this.userService.changeUser.subscribe((user) => {
@@ -8975,6 +9303,15 @@ class HotelEnterpriseSearch extends BaseEnterpriseSearch {
                 }
                 return hotel;
             });
+            travleResults.forEach((hotel) => {
+                if (hotel.availableRates) {
+                    hotel.jitRemoveResultRule = false;
+                    this.jitRulesReceived.next(true);
+                }
+                else {
+                    hotel.jitRemoveResultRule = true;
+                }
+            });
             this.results.next(travleResults);
         });
     }
@@ -9079,7 +9416,7 @@ class HotelEnterpriseSearch extends BaseEnterpriseSearch {
         // Calculating Occupancy
         const occupancy = this.no_of_occupants / this.no_of_rooms;
         if (!(occupancy === 1 || occupancy === 2)) {
-            this.validationMessages.push('Occupants per room must be 1 or 2, if you have an odd number of travellers (greater than one), the no of rooms must be equal');
+            this.validationMessages.push('Occupants per room must be 1 or 2; if you have an odd number of travellers (greater than one); the no of rooms must be equal');
         }
         console.log(this.validationMessages);
         this.isValid.next(this.validationMessages.length === 0);
@@ -9087,6 +9424,7 @@ class HotelEnterpriseSearch extends BaseEnterpriseSearch {
     }
     startSearch() {
         this.results.next([]);
+        this.jitRulesReceived.next(false);
         this.avaliabilityService.reset();
         if (this.isValid.value) {
             this._originalUserSearch = Object.freeze(this.helpers.clone(this.tempParams));
@@ -9366,31 +9704,40 @@ class HotelEnterpriseSearch extends BaseEnterpriseSearch {
     breakfastTypeFilter(hotel) {
         if (!this.filters.breakfastType.length)
             return true;
-        const hotelObject = this.avaliabilityService.getAvailabilityForId(this.makeHotelAvalilityObject(hotel), hotel);
-        if (!hotelObject && !hotelObject.value)
+        const hotelObjectValue = this.getHotelObjectValue(hotel);
+        if (!hotelObjectValue || !(hotelObjectValue === null || hotelObjectValue === void 0 ? void 0 : hotelObjectValue.rooms))
             return false;
-        const hotelObjectValue = hotelObject.value;
         const isBreakfastIncluded = this.filters.breakfastType.includes(SearchHandler.BREAKFAST_INCLUDED);
         const isBreakfastExcluded = this.filters.breakfastType.includes(SearchHandler.BREAKFAST_NOT_INCLUDED);
-        if (hotelObjectValue === null || hotelObjectValue === void 0 ? void 0 : hotelObjectValue.rooms) {
-            const breakfastMatches = hotelObjectValue.rooms.filter((rooms) => {
-                if (isBreakfastIncluded && isBreakfastExcluded) {
-                    return rooms;
-                }
-                else if (isBreakfastIncluded) {
-                    return (rooms.rateDescription.match(includedExpression) &&
-                        !rooms.rateDescription.match(excludedExpression));
-                }
-                else if (isBreakfastExcluded) {
-                    return (!rooms.rateDescription.match(includedExpression) ||
-                        rooms.rateDescription.match(excludedExpression));
-                }
-            });
-            return !!breakfastMatches.length;
-        }
-        else {
+        const breakfastMatches = hotelObjectValue.rooms.filter((rooms) => {
+            if (isBreakfastIncluded && isBreakfastExcluded) {
+                return rooms;
+            }
+            else if (isBreakfastIncluded) {
+                return (rooms.rateDescription.match(includedExpression) &&
+                    !rooms.rateDescription.match(excludedExpression));
+            }
+            else if (isBreakfastExcluded) {
+                return (!rooms.rateDescription.match(includedExpression) ||
+                    rooms.rateDescription.match(excludedExpression));
+            }
+        });
+        return !!breakfastMatches.length;
+    }
+    accessibleRoomTypeFilter(hotel) {
+        if (!this.filters.accessibleRoomType.length)
+            return true;
+        const hotelObjectValue = this.getHotelObjectValue(hotel);
+        if (!hotelObjectValue || !(hotelObjectValue === null || hotelObjectValue === void 0 ? void 0 : hotelObjectValue.rooms))
             return false;
-        }
+        const matches = hotelObjectValue.rooms.filter((rooms) => rooms.rateDescription.match(includedAccessibilityExpression) ||
+            rooms.roomDescription.match(includedAccessibilityExpression) ||
+            rooms.roomType.match(includedAccessibilityExpression));
+        return !!matches.length;
+    }
+    getHotelObjectValue(hotel) {
+        const hotelObject = this.avaliabilityService.getAvailabilityForId(this.makeHotelAvalilityObject(hotel), hotel);
+        return !hotelObject && !hotelObject.value ? null : hotelObject.value;
     }
     byMostExpensive() {
         this.sortByPrice(false);
@@ -9499,6 +9846,80 @@ class HotelEnterpriseSearch extends BaseEnterpriseSearch {
         this.localFilters.hotelName = '';
         this.localFilters.breakfastType = [];
     }
+    updateSearchFromExpiredBasketItem(basketItem) {
+        var _a, _b, _c, _d;
+        const searchHotelQuery = basketItem.searchQuery;
+        this.currency = searchHotelQuery.currency;
+        this.distance = searchHotelQuery.distance;
+        this.no_of_rooms = searchHotelQuery.rooms;
+        this.checkin_date = moment(searchHotelQuery.startDate);
+        this.checkout_date = moment(searchHotelQuery.endDate);
+        this.hotel_name = searchHotelQuery.hotelName;
+        if (searchHotelQuery.groupName) {
+            this.hotel_chain = {
+                name: searchHotelQuery.groupName
+            };
+        }
+        if (searchHotelQuery.iata) {
+            this.location_type_select = LocationTypes.Airport;
+            this.searchService
+                .getAirportByCode(searchHotelQuery.iata)
+                .subscribe((iata) => {
+                const airport = {
+                    airport: {
+                        gateway: iata.iataMatch.iata
+                    }
+                };
+                this.location = Object.assign(Object.assign({}, airport), iata.iataMatch);
+            });
+        }
+        else if (searchHotelQuery.latitude && searchHotelQuery.longitude) {
+            this.location_type_select = LocationTypes.City;
+            this.location = {
+                name: ((_b = (_a = basketItem.detail) === null || _a === void 0 ? void 0 : _a.hotelAaddress) === null || _b === void 0 ? void 0 : _b.town) ? (_d = (_c = basketItem.detail) === null || _c === void 0 ? void 0 : _c.hotelAaddress) === null || _d === void 0 ? void 0 : _d.town : '',
+                latitude: searchHotelQuery.latitude,
+                longitude: searchHotelQuery.longitude
+            };
+        }
+        else if (searchHotelQuery.postOrZipCode) {
+            this.location_type_select = LocationTypes.Postcode;
+            this.postcode = {
+                name: searchHotelQuery.postOrZipCode,
+                type: LocationTypes.Postcode
+            };
+        }
+        else if (searchHotelQuery.officeId) {
+            this.location_type_select = LocationTypes.Office;
+            this.searchService
+                .getOffice(searchHotelQuery.officeId)
+                .pipe(take(1))
+                .subscribe((office) => {
+                this.office = {
+                    id: office.id,
+                    name: office.name
+                };
+            });
+        }
+        else if (searchHotelQuery.trainStationCode) {
+            this.location_type_select = LocationTypes.TrainStation;
+            this.getRailStationByCode(searchHotelQuery.trainStationCode).subscribe((trainsStation) => {
+                this.trainsStation = Object.assign(Object.assign({}, trainsStation), { type: LocationTypes.TrainStation });
+            });
+        }
+        else if (searchHotelQuery.countryCode) {
+            this.location_type_select = LocationTypes.Shortlist;
+            this.country = {
+                cCode: searchHotelQuery.countryCode,
+                cName: ''
+            };
+        }
+        // add Travellers
+        if (basketItem.users) {
+            basketItem.users.forEach((user) => {
+                this.searchService.addTraveller(user);
+            });
+        }
+    }
     updateFromPreviousSearches(previousItems) {
         var _a, _b;
         console.log('PREPOPULATING HOTEL FORM');
@@ -9707,7 +10128,7 @@ class HotelEnterpriseSearch extends BaseEnterpriseSearch {
             console.log(hotelRoom);
             console.log(hotelQuery);
             if (hotel.unavailable) {
-                return Promise.resolve(false);
+                return DifferentInvokdedUserReasons.cancel;
             }
             // modify the 'startDate' and 'endDate' properties to have ISO format
             hotelQuery.startDate = new Date(hotelQuery.startDate).toISOString();
@@ -9737,8 +10158,17 @@ class HotelEnterpriseSearch extends BaseEnterpriseSearch {
                 const { address: hotelAaddress } = hotel;
                 const termsAndConditions = this.getTermsAndCond(hotelRoom, hotelQuery);
                 // bookedTravellersChunks.forEach((chunk: Traveller[], index: number) => {
-                roomArray.forEach((chunk, index) => {
-                    this.basketService.addToBasket({
+                return roomArray.reduce((current, chunk, index) => __awaiter(this, void 0, void 0, function* () {
+                    switch (yield current) {
+                        case DifferentInvokdedUserReasons.cancel:
+                            return DifferentInvokdedUserReasons.cancel;
+                        case DifferentInvokdedUserReasons.research:
+                            return DifferentInvokdedUserReasons.research;
+                        case DifferentInvokdedUserReasons.continue:
+                        case DifferentInvokdedUserReasons.newBasket:
+                            break;
+                    }
+                    const wh = yield this.basketService.addToBasket({
                         adults: numberToSplit,
                         basket: basket.id,
                         service: hotel.sourceId.toString(),
@@ -9767,13 +10197,13 @@ class HotelEnterpriseSearch extends BaseEnterpriseSearch {
                     // this is an array of 1 or 2 travellers which go in 1 room
                     // chunk
                     bookedTravellersChunks[index] || [], hotelRoom.requiresReason);
-                    // if (index === bookedTravellersChunks.length - 1) {
-                    if (index === roomArray.length - 1) {
-                        return Promise.resolve(true);
+                    if (wh === DifferentInvokdedUserReasons.research) {
+                        this.performSearch();
                     }
-                });
+                    return wh;
+                }), DifferentInvokdedUserReasons.continue);
             }
-            return Promise.resolve(false);
+            return DifferentInvokdedUserReasons.cancel;
         });
     }
     getTermsAndCond(hotelRoom, hotelQuery) {
@@ -9820,7 +10250,12 @@ class HotelEnterpriseSearch extends BaseEnterpriseSearch {
             this.no_of_rooms = fav.rooms;
             this.distance = fav.distance;
             this.currency = fav.currency;
-            let location = { latitude: fav.latitude, longitude: fav.longitude, countryCode: fav.countryCode, name: fav.cityName };
+            let location = {
+                latitude: fav.latitude,
+                longitude: fav.longitude,
+                countryCode: fav.countryCode,
+                name: fav.cityName
+            };
             if (fav.trainStationCode)
                 location.type = LocationTypes.TrainStation;
             else if (fav.officeId)
@@ -9845,10 +10280,9 @@ HotelEnterpriseSearch.STORAGE_SESSION_RESULTS = 'results_hotel';
 
 class LoungesEnterpriseSearch extends BaseEnterpriseSearch {
     constructor(loungefetcher, helpers, basketService, storageService, searchService) {
-        super(storageService, helpers);
+        super(storageService, helpers, searchService);
         this.loungefetcher = loungefetcher;
         this.basketService = basketService;
-        this.searchService = searchService;
         this.type = ServiceType.Lounge;
         this.terminals = new BehaviorSubject([]);
         this._flightNumber = null;
@@ -10133,17 +10567,45 @@ class LoungesEnterpriseSearch extends BaseEnterpriseSearch {
             }
         }
     }
+    updateSearchFromExpiredBasketItem(basketItem) {
+        const searchLoungesQuery = basketItem.searchQuery;
+        if (searchLoungesQuery) {
+            this.arrivalDatetime = moment(searchLoungesQuery.arrivalDatetime);
+            this.terminal = searchLoungesQuery.terminal;
+            this.searchService
+                .getAirportByCode(searchLoungesQuery.locationCode)
+                .subscribe((airport) => {
+                var _a, _b, _c, _d, _e, _f;
+                if (airport) {
+                    this.locationCode = {
+                        country: (_b = (_a = airport.iataMatch) === null || _a === void 0 ? void 0 : _a.locationDetails) === null || _b === void 0 ? void 0 : _b.country,
+                        countryCode: (_d = (_c = airport.iataMatch) === null || _c === void 0 ? void 0 : _c.locationDetails) === null || _d === void 0 ? void 0 : _d.countryCode,
+                        destination: airport.iataMatch.name,
+                        gateway: airport.iataMatch.iata,
+                        postcode: (_f = (_e = airport.iataMatch) === null || _e === void 0 ? void 0 : _e.locationDetails) === null || _f === void 0 ? void 0 : _f.postcode,
+                        terminals: this.searchService.processTerminals(airport.iataMatch.terminals)
+                    };
+                }
+            });
+        }
+        // add Travellers
+        if (basketItem.users) {
+            basketItem.users.forEach((user) => {
+                this.searchService.addTraveller(user);
+            });
+        }
+    }
     addLoungeToBasket(loungeQuote, loungeQuery) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
             if (loungeQuote.unavailable) {
-                return Promise.resolve(false);
+                return Promise.resolve(DifferentInvokdedUserReasons.cancel);
             }
             const intBasket = yield this.basketService.getDefaultBasket();
             const basket = intBasket === null || intBasket === void 0 ? void 0 : intBasket.subject.value;
             const termsAndConditions = this.getTermsAndCond(loungeQuote);
             if (basket) {
-                return this.basketService.addToBasket({
+                const whatHappened = yield this.basketService.addToBasket({
                     adults: loungeQuery.adults,
                     children: loungeQuery.children,
                     infants: loungeQuery.infants,
@@ -10174,8 +10636,12 @@ class LoungesEnterpriseSearch extends BaseEnterpriseSearch {
                     searchQuery: loungeQuery,
                     outboundDate: loungeQuery.arrivalDatetime.format()
                 }, intBasket, this.searchService, this.travellers, loungeQuote.requiresReason);
+                if (whatHappened === DifferentInvokdedUserReasons.research) {
+                    this.performSearch();
+                }
+                return whatHappened;
             }
-            return Promise.resolve(false); // TODO should this throw an error?
+            return DifferentInvokdedUserReasons.cancel; // TODO should this throw an error?
         });
     }
     getTermsAndCond(loungeQuote) {
@@ -10266,8 +10732,8 @@ class LoungesEnterpriseSearch extends BaseEnterpriseSearch {
     }
     applyFavourite(fav) {
         return __awaiter(this, void 0, void 0, function* () {
-            this.searchService.getAirportsList(fav.locationCode).subscribe(a => {
-                this.locationCode = a.find(a => a.gateway == fav.locationCode);
+            this.searchService.getAirportsList(fav.locationCode).subscribe((a) => {
+                this.locationCode = a.find((a) => a.gateway == fav.locationCode);
                 this.terminal = fav.terminal;
             });
             this.adults = fav.adults;
@@ -10287,10 +10753,9 @@ const defaultValidations = {
 };
 class ParkingEnterpriseSearch extends BaseEnterpriseSearch {
     constructor(parkingfetcher, helpers, basketService, storageService, searchService) {
-        super(storageService, helpers);
+        super(storageService, helpers, searchService);
         this.parkingfetcher = parkingfetcher;
         this.basketService = basketService;
-        this.searchService = searchService;
         this.type = ServiceType.Parking;
         this.terminals = new BehaviorSubject([]);
         this.listViewToggle = new BehaviorSubject(null);
@@ -10624,6 +11089,34 @@ class ParkingEnterpriseSearch extends BaseEnterpriseSearch {
         }
         this.results.next(results);
     }
+    updateSearchFromExpiredBasketItem(basketItem) {
+        const searchParkingQuery = basketItem.searchQuery;
+        this.arrivalDatetime = moment(searchParkingQuery.arrivalDatetime);
+        this.departDatetime = moment(searchParkingQuery.departDatetime);
+        this.outFlightNumber = searchParkingQuery.outFlightNumber;
+        this.terminal = searchParkingQuery.terminal;
+        this.searchService
+            .getAirportByCode(searchParkingQuery.locationCode)
+            .subscribe((airport) => {
+            var _a, _b, _c, _d, _e, _f;
+            if (airport) {
+                this.locationCode = {
+                    country: (_b = (_a = airport.iataMatch) === null || _a === void 0 ? void 0 : _a.locationDetails) === null || _b === void 0 ? void 0 : _b.country,
+                    countryCode: (_d = (_c = airport.iataMatch) === null || _c === void 0 ? void 0 : _c.locationDetails) === null || _d === void 0 ? void 0 : _d.countryCode,
+                    destination: airport.iataMatch.name,
+                    gateway: airport.iataMatch.iata,
+                    postcode: (_f = (_e = airport.iataMatch) === null || _e === void 0 ? void 0 : _e.locationDetails) === null || _f === void 0 ? void 0 : _f.postcode,
+                    terminals: this.searchService.processTerminals(airport.iataMatch.terminals)
+                };
+            }
+        });
+        // add Travellers
+        if (basketItem.users) {
+            basketItem.users.forEach((user) => {
+                this.searchService.addTraveller(user);
+            });
+        }
+    }
     updateFromPreviousSearches(previousItems) {
         var _a;
         console.log('PREPOPULATING PARKING FORM');
@@ -10656,7 +11149,7 @@ class ParkingEnterpriseSearch extends BaseEnterpriseSearch {
             const basket = intBasket === null || intBasket === void 0 ? void 0 : intBasket.subject.value;
             const termsAndConditions = this.getTermsAndCond(parkingQuote);
             if (basket) {
-                return this.basketService.addToBasket({
+                const whatHappened = yield this.basketService.addToBasket({
                     adults: 1,
                     basket: basket.id,
                     service: parkingQuote.sourceId.toString(),
@@ -10675,8 +11168,12 @@ class ParkingEnterpriseSearch extends BaseEnterpriseSearch {
                     outboundDate: parkingQuery.arrivalDatetime.format(),
                     inboundDate: parkingQuery.departDatetime.format()
                 }, intBasket, this.searchService, this.travellers, parkingQuote.requiresReason);
+                if (whatHappened === DifferentInvokdedUserReasons.research) {
+                    this.performSearch();
+                }
+                return whatHappened;
             }
-            return Promise.resolve(false);
+            return DifferentInvokdedUserReasons.cancel;
         });
     }
     getTermsAndCond(parkingQuote) {
@@ -10747,8 +11244,8 @@ class ParkingEnterpriseSearch extends BaseEnterpriseSearch {
     }
     applyFavourite(fav) {
         return __awaiter(this, void 0, void 0, function* () {
-            this.searchService.getAirportsList(fav.locationCode).subscribe(a => {
-                this.locationCode = a.find(a => a.gateway == fav.locationCode);
+            this.searchService.getAirportsList(fav.locationCode).subscribe((a) => {
+                this.locationCode = a.find((a) => a.gateway == fav.locationCode);
                 this.terminal = fav.terminal;
             });
             // this.arrivalDatetime = moment((fav.arrivalDatetime as string).split("T")[0], "YYYY-MM-DD")
@@ -10828,10 +11325,9 @@ var SortMethod;
 })(SortMethod || (SortMethod = {}));
 class EurostarEnterpriseSearch extends BaseEnterpriseSearch {
     constructor(eurostarFetcher, helpers, userService, basketService, storageService, searchService, modalService) {
-        super(storageService, helpers);
+        super(storageService, helpers, searchService);
         this.eurostarFetcher = eurostarFetcher;
         this.basketService = basketService;
-        this.searchService = searchService;
         this.modalService = modalService;
         this.type = ServiceType.Eurostar;
         this.avaliableClasses = new BehaviorSubject([]);
@@ -11434,7 +11930,7 @@ class EurostarEnterpriseSearch extends BaseEnterpriseSearch {
             }
             // this is stuff for matching cabin classes
             if (!this.checkCabinMatchisValid()) {
-                this.validationMessages.push('The types of cabin classes selected are not compatible. Examples of compatible cabin classes; Any - Any, Standard - Standard, Business - Business');
+                this.validationMessages.push('The types of cabin classes selected are not compatible. Examples of compatible cabin classes; Any - Any; Standard - Standard; Business - Business');
             }
         }
         this.isValid.next(this.validationMessages.length === 0);
@@ -11752,6 +12248,73 @@ class EurostarEnterpriseSearch extends BaseEnterpriseSearch {
         };
         return [sortedResults];
     }
+    updateSearchFromExpiredBasketItem(basketItem) {
+        const searchEuroStarQuery = basketItem.searchQuery;
+        if (searchEuroStarQuery.outboundDate) {
+            let outboundTimeWindow = searchEuroStarQuery.outboundDepartureTimeWindow
+                ? searchEuroStarQuery.outboundDepartureTimeWindow
+                : searchEuroStarQuery.outboundArrivalTimeWindow;
+            this.outBoundDate = this.convertRecentSearchDateTime(searchEuroStarQuery.outboundDate, outboundTimeWindow);
+        }
+        if (searchEuroStarQuery.returnDate) {
+            let returnTimeWindow = searchEuroStarQuery.returnDepartureTimeWindow
+                ? searchEuroStarQuery.returnDepartureTimeWindow
+                : searchEuroStarQuery.returnArrivalTimeWindow;
+            this.inboundDate = this.convertRecentSearchDateTime(searchEuroStarQuery.returnDate, returnTimeWindow);
+        }
+        this.fareType = searchEuroStarQuery.fareType;
+        this.maxConnections = searchEuroStarQuery.maxConnections;
+        if (searchEuroStarQuery.outboundCabinClass) {
+            this.cabinClass = searchEuroStarQuery
+                .outboundCabinClass[0];
+        }
+        if (searchEuroStarQuery.returnCabinClass) {
+            this.returnCabinClass = searchEuroStarQuery
+                .returnCabinClass[0];
+        }
+        this.includeNearbyAirports = searchEuroStarQuery.includeNearbyAirports;
+        this.chosenSearchType = searchEuroStarQuery.returnTrip
+            ? EurostarSearchType.return
+            : EurostarSearchType.oneWay;
+        if (searchEuroStarQuery.outboundDepartureTimeWindow) {
+            this.outTimeCriteria = TimeWindow.Depart;
+        }
+        else if (searchEuroStarQuery.outboundArrivalTimeWindow) {
+            this.outTimeCriteria = TimeWindow.Arrive;
+        }
+        else {
+            this.outTimeCriteria = TimeWindow.Anytime;
+        }
+        if (searchEuroStarQuery.returnDepartureTimeWindow) {
+            this.inTimeCriteria = TimeWindow.Depart;
+        }
+        else if (searchEuroStarQuery.returnArrivalTimeWindow) {
+            this.inTimeCriteria = TimeWindow.Arrive;
+        }
+        else {
+            this.inTimeCriteria = TimeWindow.Anytime;
+        }
+        if (searchEuroStarQuery.originAirport) {
+            this.searchService
+                .lookupEurostarStations(searchEuroStarQuery.originAirport)
+                .subscribe((stations) => {
+                this.departLocation = stations[0];
+            });
+        }
+        if (searchEuroStarQuery.destinationAirport) {
+            this.searchService
+                .lookupEurostarStations(searchEuroStarQuery.destinationAirport)
+                .subscribe((stations) => {
+                this.arriveLocation = stations[0];
+            });
+        }
+        // add Travellers
+        if (basketItem.users) {
+            basketItem.users.forEach((user) => {
+                this.searchService.addTraveller(user);
+            });
+        }
+    }
     updateFromPreviousSearches(previousItems) {
         var _a;
         const flightItem = (_a = previousItems[ServiceType.Flight]) === null || _a === void 0 ? void 0 : _a.searchQuery;
@@ -12050,24 +12613,30 @@ class EurostarEnterpriseSearch extends BaseEnterpriseSearch {
         }, { amount: Number.MAX_SAFE_INTEGER, currencyCode: currency });
     }
     doBooking(intBasket, selectedFlight, schemaDetails, outboundDate, inboundDate, price, requiresReason) {
-        const { sourceId, co2PerItem, co2PerPassenger, total } = selectedFlight;
-        const booking = {
-            adults: this.adults,
-            basket: intBasket.id,
-            children: this.children,
-            co2PerItem,
-            co2PerPassenger,
-            currency: total.currency,
-            detail: schemaDetails,
-            price,
-            searchQuery: this.resultQuery,
-            service: sourceId.toString(),
-            outboundDate
-        };
-        if (inboundDate) {
-            booking.inboundDate = inboundDate;
-        }
-        this.basketService.addToBasket(booking, intBasket, this.searchService, this.travellers, requiresReason);
+        return __awaiter(this, void 0, void 0, function* () {
+            const { sourceId, co2PerItem, co2PerPassenger, total } = selectedFlight;
+            const booking = {
+                adults: this.adults,
+                basket: intBasket.id,
+                children: this.children,
+                co2PerItem,
+                co2PerPassenger,
+                currency: total.currency,
+                detail: schemaDetails,
+                price,
+                searchQuery: this.resultQuery,
+                service: sourceId.toString(),
+                outboundDate
+            };
+            if (inboundDate) {
+                booking.inboundDate = inboundDate;
+            }
+            const whatHappened = yield this.basketService.addToBasket(booking, intBasket, this.searchService, this.travellers, requiresReason);
+            if (whatHappened === DifferentInvokdedUserReasons.research) {
+                this.performSearch();
+            }
+            return whatHappened;
+        });
     }
     makeSchemaFlights(selectedFlight, flightGroup, groupIndex, segmentIndex) {
         return Object.assign(Object.assign({}, selectedFlight), { journeyInfo: {
@@ -12144,7 +12713,7 @@ class EurostarEnterpriseSearch extends BaseEnterpriseSearch {
     addEurostarJourneysToBasket(eurostarQuote) {
         return __awaiter(this, void 0, void 0, function* () {
             if (eurostarQuote.unavailable) {
-                return Promise.resolve(false);
+                return Promise.resolve(DifferentInvokdedUserReasons.cancel);
             }
             const intBasket = yield this.basketService.getDefaultBasket();
             const basket = intBasket === null || intBasket === void 0 ? void 0 : intBasket.subject.value;
@@ -12182,9 +12751,13 @@ class EurostarEnterpriseSearch extends BaseEnterpriseSearch {
                     booking.inboundDate = inboundDate.format();
                     schemaDetails.journeyType = 'roundtrip';
                 }
-                return this.basketService.addToBasket(booking, intBasket, this.searchService, this.travellers, eurostarQuote.requiresReason);
+                const whatHappened = yield this.basketService.addToBasket(booking, intBasket, this.searchService, this.travellers, eurostarQuote.requiresReason);
+                if (whatHappened === DifferentInvokdedUserReasons.research) {
+                    this.performSearch();
+                }
+                return whatHappened;
             }
-            return Promise.resolve(false); // TODO should this throw an error?
+            return Promise.resolve(DifferentInvokdedUserReasons.cancel);
         });
     }
     // TODO waiting for data
@@ -12337,16 +12910,22 @@ class EurostarEnterpriseSearch extends BaseEnterpriseSearch {
         return __awaiter(this, void 0, void 0, function* () {
             this.fareType = fav.fareType;
             this.includeNearbyAirports = fav.includeNearbyAirports;
-            this.chosenSearchType = fav.returnTrip ? EurostarSearchType.return : EurostarSearchType.oneWay;
-            this.searchService.getAirportsList(fav.originAirport).subscribe(results => {
-                this.departLocation = results.find(a => a.gateway == fav.originAirport);
+            this.chosenSearchType = fav.returnTrip
+                ? EurostarSearchType.return
+                : EurostarSearchType.oneWay;
+            this.searchService
+                .getAirportsList(fav.originAirport)
+                .subscribe((results) => {
+                this.departLocation = results.find((a) => a.gateway == fav.originAirport);
             });
-            this.searchService.getAirportsList(fav.destinationAirport).subscribe(results => {
-                this.arriveLocation = results.find(a => a.gateway == fav.destinationAirport);
+            this.searchService
+                .getAirportsList(fav.destinationAirport)
+                .subscribe((results) => {
+                this.arriveLocation = results.find((a) => a.gateway == fav.destinationAirport);
             });
             this._passengers = fav.passengers;
-            this.adults = fav.passengers.filter((a) => a.type == "ADULT").length;
-            this.children = fav.passengers.filter((a) => a.type == "CHILD").length;
+            this.adults = fav.passengers.filter((a) => a.type == 'ADULT').length;
+            this.children = fav.passengers.filter((a) => a.type == 'CHILD').length;
         });
     }
     openEurostarFareRules(basketItem) {
@@ -12428,11 +13007,10 @@ var RailJourneyFareType;
 })(RailJourneyFareType || (RailJourneyFareType = {}));
 class RailEnterpriseSearch extends BaseEnterpriseSearch {
     constructor(Railfetcher, getRailStationFetcher, helpers, basketService, storageService, searchService, userService, modalService) {
-        super(storageService, helpers);
+        super(storageService, helpers, searchService);
         this.Railfetcher = Railfetcher;
         this.getRailStationFetcher = getRailStationFetcher;
         this.basketService = basketService;
-        this.searchService = searchService;
         this.userService = userService;
         this.modalService = modalService;
         this.resultsSessionName = RailEnterpriseSearch.STORAGE_SESSION_RESULTS;
@@ -12548,6 +13126,7 @@ class RailEnterpriseSearch extends BaseEnterpriseSearch {
             originalUserSearch: {}
         };
         this.updateTempParams(this.searchService.makeRailQuery(data.tempParams));
+        data.originalUserSearch.transactionIdentifier = null;
         this._originalUserSearch = data.originalUserSearch;
         if (searchService.shouldAddTravellerSubscription()) {
             searchService.travellerInformation.subscribe((travellers) => {
@@ -12592,6 +13171,12 @@ class RailEnterpriseSearch extends BaseEnterpriseSearch {
             });
         }
     }
+    set transactionIdentifier(id) {
+        this.tempParams.transactionIdentifier = id;
+    }
+    get transactionIdentifier() {
+        return this.tempParams.transactionIdentifier;
+    }
     get bookRailFromLive() {
         return this._bookRailFromLive;
     }
@@ -12809,6 +13394,9 @@ class RailEnterpriseSearch extends BaseEnterpriseSearch {
         return this.tempParams.applyRailcards;
     }
     set applyRailcards(apCards) {
+        if (!apCards) {
+            this.railCards = [];
+        }
         this.tempParams.applyRailcards = apCards;
     }
     get railCards() {
@@ -12872,6 +13460,7 @@ class RailEnterpriseSearch extends BaseEnterpriseSearch {
         return null;
     }
     processResults(rawResults) {
+        this.transactionIdentifier = null;
         const setFares = (fare) => {
             var _a;
             return Object.assign(Object.assign({}, fare), { type: (_a = fare === null || fare === void 0 ? void 0 : fare.type) === null || _a === void 0 ? void 0 : _a.toLowerCase(), selected: false, selectable: true });
@@ -13365,7 +13954,7 @@ class RailEnterpriseSearch extends BaseEnterpriseSearch {
                     yield this.addDualSingleToBasket(sourceId, searchQuery, journey, inboundJourney, railFare, inboundRailFare);
                 }
             }
-            return false;
+            return DifferentInvokdedUserReasons.cancel;
         });
     }
     addOpenReturnToBasket(sourceId, searchQuery, journey, railFare) {
@@ -13470,9 +14059,13 @@ class RailEnterpriseSearch extends BaseEnterpriseSearch {
                 if (outTicketExtras) {
                     basketItem.detail.outbound.ticketExtras = outTicketExtras;
                 }
-                return this.basketService.addToBasket(basketItem, intBasket, this.searchService, this.travellers, outboundFare.requiresReason || inboundFare.requiresReason);
+                const whatHappened = yield this.basketService.addToBasket(basketItem, intBasket, this.searchService, this.travellers, outboundFare.requiresReason || inboundFare.requiresReason);
+                if (whatHappened === DifferentInvokdedUserReasons.research) {
+                    this.performSearch();
+                }
+                return whatHappened;
             }
-            return Promise.resolve();
+            return DifferentInvokdedUserReasons.continue;
         });
     }
     findCheapestTicket() {
@@ -13531,6 +14124,7 @@ class RailEnterpriseSearch extends BaseEnterpriseSearch {
         this.results.next([]);
         if (this.isValid.value) {
             const query = this.getSearchQuery(this.tempParams);
+            this.tempParams.transactionIdentifier = null;
             this._originalUserSearch = Object.freeze(this.helpers.clone(this.tempParams));
             this.storageService.setSessionItem(RailEnterpriseSearch.STORAGE_SESSION_PARAMS, {
                 tempParams: this.tempParams,
@@ -13651,8 +14245,9 @@ class RailEnterpriseSearch extends BaseEnterpriseSearch {
             returnDepartureDateTime: this.helpers.formatGraphQLDateTime(tempParams.inBoundDateTime),
             viaLocationId: (_f = (_e = tempParams.viaLocation) === null || _e === void 0 ? void 0 : _e.railstation) === null || _f === void 0 ? void 0 : _f.id,
             railCardQualifiers: (_g = tempParams.railCards) === null || _g === void 0 ? void 0 : _g.map((railCard) => {
-                return railCard.code;
-            })
+                return railCard === null || railCard === void 0 ? void 0 : railCard.code;
+            }),
+            transactionIdentifier: tempParams.transactionIdentifier
         };
         if (tempParams.noOfChildren === 0) {
             query.children = null;
@@ -13705,6 +14300,87 @@ class RailEnterpriseSearch extends BaseEnterpriseSearch {
         }
     }
     updateFromPreviousSearches(previousItems) { }
+    updateSearchFromExpiredBasketItem(basketItem) {
+        const searchRailQuery = basketItem.searchQuery;
+        this.chosenSearchType = searchRailQuery.journeyType;
+        this.chosenSearchClass = searchRailQuery.class;
+        this.extraTime = searchRailQuery.extraTimeToChange;
+        // get outBoundDateTime, inBoundDateTime and outboundCriteria ,returnCriteria
+        this.outBoundDateTime = searchRailQuery.outboundDepartureDateTime
+            ? moment(searchRailQuery.outboundDepartureDateTime)
+            : moment(searchRailQuery.outboundArrivalDateTime);
+        this.outboundCriteria = this.getCriteria(searchRailQuery.outboundDepartureDateTime, searchRailQuery.outboundArrivalDateTime);
+        if (searchRailQuery.journeyType === RailSearchJourneyType.ReturnJourney) {
+            this.inBoundDateTime = searchRailQuery.returnDepartureDateTime
+                ? moment(searchRailQuery.returnDepartureDateTime)
+                : moment(searchRailQuery.returnArrivalDateTime);
+            this.returnCriteria = this.getCriteria(searchRailQuery.returnDepartureDateTime, searchRailQuery.returnArrivalDateTime);
+        }
+        if (searchRailQuery.journeyType === RailSearchJourneyType.OpenReturnJourney) {
+            this.openReturn = true;
+        }
+        if (searchRailQuery.departureLocationId) {
+            this.searchService
+                .getRailStationById(searchRailQuery.departureLocationId)
+                .subscribe((departureStation) => {
+                this.travellingFrom = {
+                    name: departureStation.name,
+                    railstation: {
+                        id: departureStation.id,
+                        name: departureStation.name,
+                        nlcCode: departureStation.nlcCode,
+                        stationCode: departureStation.stationCode,
+                        trainlineCode: departureStation.trainlineCode,
+                        trainlineUniqueCode: departureStation.trainlineUniqueCode
+                    }
+                };
+            });
+        }
+        if (searchRailQuery.arrivalLocationId) {
+            this.searchService
+                .getRailStationById(searchRailQuery.arrivalLocationId)
+                .subscribe((arrivalStation) => {
+                this.travellingTo = {
+                    name: arrivalStation.name,
+                    railstation: {
+                        id: arrivalStation.id,
+                        name: arrivalStation.name,
+                        nlcCode: arrivalStation.nlcCode,
+                        stationCode: arrivalStation.stationCode,
+                        trainlineCode: arrivalStation.trainlineCode,
+                        trainlineUniqueCode: arrivalStation.trainlineUniqueCode
+                    }
+                };
+            });
+        }
+        if (searchRailQuery.viaLocationId) {
+            this.via = true;
+            this.searchService
+                .getRailStationById(searchRailQuery.viaLocationId)
+                .subscribe((viaLocation) => {
+                this.viaLocation = {
+                    name: viaLocation.name,
+                    railstation: {
+                        id: viaLocation.id,
+                        name: viaLocation.name,
+                        nlcCode: viaLocation.nlcCode,
+                        stationCode: viaLocation.stationCode,
+                        trainlineCode: viaLocation.trainlineCode,
+                        trainlineUniqueCode: viaLocation.trainlineUniqueCode
+                    }
+                };
+            });
+        }
+        else {
+            this.viaLocation = null;
+        }
+        // add Travellers
+        if (basketItem.users) {
+            basketItem.users.forEach((user) => {
+                this.searchService.addTraveller(user);
+            });
+        }
+    }
     getRailStation(code, isLoading) {
         if (code.length === 3) {
             isLoading === null || isLoading === void 0 ? void 0 : isLoading.next(true);
@@ -13811,9 +14487,13 @@ class RailEnterpriseSearch extends BaseEnterpriseSearch {
                 if (outTicketExtras) {
                     basketItem.detail.outbound.ticketExtras = outTicketExtras;
                 }
-                return this.basketService.addToBasket(basketItem, intBasket, this.searchService, this.travellers, railFare.requiresReason);
+                const whatHappened = yield this.basketService.addToBasket(basketItem, intBasket, this.searchService, this.travellers, railFare.requiresReason);
+                if (whatHappened === DifferentInvokdedUserReasons.research) {
+                    this.performSearch();
+                }
+                return whatHappened;
             }
-            return Promise.resolve();
+            return DifferentInvokdedUserReasons.cancel;
         });
     }
     addReturnJourneyToBasket(serviceId, tempParams, outbound, inbound, outboundFare, inboundFare) {
@@ -13907,9 +14587,13 @@ class RailEnterpriseSearch extends BaseEnterpriseSearch {
                 if (ticketExtras) {
                     basketItem.detail.outbound.ticketExtras = ticketExtras;
                 }
-                return this.basketService.addToBasket(basketItem, intBasket, this.searchService, this.travellers, outboundFare.requiresReason || inboundFare.requiresReason);
+                const whatHappened = yield this.basketService.addToBasket(basketItem, intBasket, this.searchService, this.travellers, outboundFare.requiresReason || inboundFare.requiresReason);
+                if (whatHappened === DifferentInvokdedUserReasons.research) {
+                    this.performSearch();
+                }
+                return whatHappened;
             }
-            return Promise.resolve(false);
+            return DifferentInvokdedUserReasons.cancel;
         });
     }
     removedScheduledPlatformFromCallingPoints(railLegs) {
@@ -14000,7 +14684,7 @@ class RailEnterpriseSearch extends BaseEnterpriseSearch {
             .clone(this.fullResults)
             .reduce((accum, next) => {
             const temp = Object.assign(Object.assign({}, next), { outbound: (next.outbound || []).map((journey) => {
-                    return Object.assign(Object.assign({}, journey), { dualSingleJourneyFares: this.helpers.map(journey.dualSingleJourneyFares || {}, setRules('dualSingleJourneyFares', journey, RailDirection.Outbound)), returnJourneyFares: this.helpers.map(journey.returnJourneyFares || {}, setRules('returnJourneyFares', journey, RailDirection.Outbound)), openReturnJourneyFares: this.helpers.map(journey.openReturnJourneyFares || {}, setRules('openReturnJourneyFares', journey, RailDirection.Outbound)) });
+                    return Object.assign(Object.assign({}, journey), { dualSingleJourneyFares: this.helpers.map(journey.dualSingleJourneyFares || {}, setRules('dualSingleJourneyFares', journey, RailDirection.Outbound)), singleJourneyFares: this.helpers.map(journey.singleJourneyFares || {}, setRules('singleJourneyFares', journey, RailDirection.Outbound)), returnJourneyFares: this.helpers.map(journey.returnJourneyFares || {}, setRules('returnJourneyFares', journey, RailDirection.Outbound)), openReturnJourneyFares: this.helpers.map(journey.openReturnJourneyFares || {}, setRules('openReturnJourneyFares', journey, RailDirection.Outbound)) });
                 }), return: (next.return || []).map((journey) => {
                     return Object.assign(Object.assign({}, journey), { returnJourneyFares: this.helpers.map(journey.returnJourneyFares || {}, setSelected('returnJourneyFares', journey)), dualSingleJourneyFares: this.helpers.map(journey.dualSingleJourneyFares || {}, setSelected('dualSingleJourneyFares', journey)), singleJourneyFares: this.helpers.map(journey.singleJourneyFares || {}, setRules('singleJourneyFares', journey, 'return')), openReturnJourneyFares: this.helpers.map(journey.openReturnJourneyFares || {}, setRules('openReturnJourneyFares', journey, 'return')) });
                 }) });
@@ -14102,24 +14786,30 @@ class RailEnterpriseSearch extends BaseEnterpriseSearch {
             this.noOfChildren = fav.children;
             this.chosenSearchType = fav.journeyType;
             switch (fav.class) {
-                case "First":
+                case 'First':
                     this.chosenRailClass = RailClass.First;
                     break;
-                case "Any":
+                case 'Any':
                     this.chosenRailClass = RailClass.All;
                     break;
-                case "Standard":
+                case 'Standard':
                     this.chosenRailClass = RailClass.Standard;
                     break;
             }
-            this.getRailStationFetcher.fetchList({ id: fav.departureLocationId }).subscribe(a => {
+            this.getRailStationFetcher
+                .fetchList({ id: fav.departureLocationId })
+                .subscribe((a) => {
                 this.travellingFrom = a;
             });
-            this.getRailStationFetcher.fetchList({ id: fav.arrivalLocationId }).subscribe(a => {
+            this.getRailStationFetcher
+                .fetchList({ id: fav.arrivalLocationId })
+                .subscribe((a) => {
                 this.travellingTo = a;
             });
             if (fav.viaLocationId) {
-                this.getRailStationFetcher.fetchList({ id: fav.viaLocationId }).subscribe(a => {
+                this.getRailStationFetcher
+                    .fetchList({ id: fav.viaLocationId })
+                    .subscribe((a) => {
                     this.viaLocation = a;
                 });
                 this.via = true;
@@ -14198,11 +14888,10 @@ var ClassType;
 })(ClassType || (ClassType = {}));
 class IRLEnterpriseSearch extends BaseEnterpriseSearch {
     constructor(Irlfetcher, irlDiscountCardsFetcher, helpers, basketService, storageService, searchService, getIrlSupplierStationFetcher) {
-        super(storageService, helpers);
+        super(storageService, helpers, searchService);
         this.Irlfetcher = Irlfetcher;
         this.irlDiscountCardsFetcher = irlDiscountCardsFetcher;
         this.basketService = basketService;
-        this.searchService = searchService;
         this.getIrlSupplierStationFetcher = getIrlSupplierStationFetcher;
         this.resultsSessionName = IRLEnterpriseSearch.STORAGE_SESSION_RESULTS;
         this.multiResultsSessionName = IRLEnterpriseSearch.STORAGE_SESSION_RESULTS;
@@ -14749,6 +15438,56 @@ class IRLEnterpriseSearch extends BaseEnterpriseSearch {
         }
         return this.helpers.removeNulls(query);
     }
+    updateSearchFromExpiredBasketItem(basketItem) {
+        const searchIrlQuery = basketItem.searchQuery;
+        this.journeyType = searchIrlQuery.journeyType;
+        this.irlClass = searchIrlQuery.class;
+        // get outBoundDateTime, inBoundDateTime
+        this.outBoundDateTime = moment(searchIrlQuery.outboundDepartureDateTime);
+        if (searchIrlQuery.journeyType === IrlJourneyType.ReturnJourney) {
+            this.inBoundDateTime = moment(searchIrlQuery.returnDepartureDateTime);
+        }
+        if (searchIrlQuery.departureLocationId) {
+            this.searchService
+                .getRailStationById(searchIrlQuery.departureLocationId)
+                .subscribe((departureStation) => {
+                this.travellingFrom = {
+                    name: departureStation.name,
+                    railstation: {
+                        id: departureStation.id,
+                        name: departureStation.name,
+                        nlcCode: departureStation.nlcCode,
+                        stationCode: departureStation.stationCode,
+                        trainlineCode: departureStation.trainlineCode,
+                        trainlineUniqueCode: departureStation.trainlineUniqueCode
+                    }
+                };
+            });
+        }
+        if (searchIrlQuery.arrivalLocationId) {
+            this.searchService
+                .getRailStationById(searchIrlQuery.arrivalLocationId)
+                .subscribe((arrivalStation) => {
+                this.travellingTo = {
+                    name: arrivalStation.name,
+                    railstation: {
+                        id: arrivalStation.id,
+                        name: arrivalStation.name,
+                        nlcCode: arrivalStation.nlcCode,
+                        stationCode: arrivalStation.stationCode,
+                        trainlineCode: arrivalStation.trainlineCode,
+                        trainlineUniqueCode: arrivalStation.trainlineUniqueCode
+                    }
+                };
+            });
+        }
+        // add Travellers
+        if (basketItem.users) {
+            basketItem.users.forEach((user) => {
+                this.searchService.addTraveller(user);
+            });
+        }
+    }
     updateFromPreviousSearches(previousItems) { }
     updateCanCombine(tkt) {
         (tkt.identifiers.allowedWith || []).forEach((allowed) => {
@@ -14834,16 +15573,22 @@ class IRLEnterpriseSearch extends BaseEnterpriseSearch {
                     // co2PerPassenger: irlJourneyOption.co2PerPassenger,
                     outboundDate: irlJourneyOption.departDateTime
                 };
-                return this.basketService.addToBasket(basketItem, intBasket, this.searchService, this.travellers, false // TODO
+                const whatHappened = yield this.basketService.addToBasket(basketItem, intBasket, this.searchService, this.travellers, false // TODO
                 );
+                if (whatHappened === DifferentInvokdedUserReasons.research) {
+                    this.performSearch();
+                }
+                return whatHappened;
             }
-            return Promise.resolve(false);
+            return DifferentInvokdedUserReasons.cancel;
         });
     }
     addReturnJourneyToBasket(serviceId, irlQuery, inbound, inJourneyOption, outboundTicket, outboundJourney) {
         return __awaiter(this, void 0, void 0, function* () {
             const outbound = outboundTicket ? outboundTicket : this.outboundTicket;
-            const outJourneyOption = outboundJourney ? outboundJourney : this.outboundJourneyOptions;
+            const outJourneyOption = outboundJourney
+                ? outboundJourney
+                : this.outboundJourneyOptions;
             const intBasket = yield this.basketService.getDefaultBasket();
             const basket = intBasket === null || intBasket === void 0 ? void 0 : intBasket.subject.value;
             if (basket) {
@@ -14905,11 +15650,14 @@ class IRLEnterpriseSearch extends BaseEnterpriseSearch {
                     // co2PerPassenger: outbound.co2PerPassenger
                 };
                 this.filterSelected();
-                console.log(basketItem);
-                return this.basketService.addToBasket(basketItem, intBasket, this.searchService, this.travellers, false // TODO
+                const whatHappened = yield this.basketService.addToBasket(basketItem, intBasket, this.searchService, this.travellers, false // TODO
                 );
+                if (whatHappened === DifferentInvokdedUserReasons.research) {
+                    this.performSearch();
+                }
+                return whatHappened;
             }
-            return Promise.resolve(false);
+            return DifferentInvokdedUserReasons.cancel;
         });
     }
     updateLowestPrice(results) {
@@ -15082,8 +15830,8 @@ class IRLEnterpriseSearch extends BaseEnterpriseSearch {
         let dateArrMax = null;
         let classObject = {};
         let changesObject = {};
-        results.forEach(result => {
-            result.providers[0].ticketOptions.forEach(ticket => {
+        results.forEach((result) => {
+            result.providers[0].ticketOptions.forEach((ticket) => {
                 if (!priceMax || priceMax < ticket.price) {
                     priceMax = Math.ceil(ticket.price);
                 }
@@ -15091,16 +15839,20 @@ class IRLEnterpriseSearch extends BaseEnterpriseSearch {
             if (!priceMin || priceMin > result.providers[0].cheapestTicket.price) {
                 priceMin = Math.floor(result.providers[0].cheapestTicket.price);
             }
-            if (!dateDepMin || moment(result.departDateTime).isBefore(moment(dateDepMin))) {
+            if (!dateDepMin ||
+                moment(result.departDateTime).isBefore(moment(dateDepMin))) {
                 dateDepMin = Number(moment(result.departDateTime).format('HHmm'));
             }
-            if (!dateDepMax || moment(result.departDateTime).isAfter(moment(dateDepMax))) {
+            if (!dateDepMax ||
+                moment(result.departDateTime).isAfter(moment(dateDepMax))) {
                 dateDepMax = Number(moment(result.departDateTime).format('HHmm'));
             }
-            if (!dateArrMin || moment(result.arriveDateTime).isBefore(moment(dateArrMin))) {
+            if (!dateArrMin ||
+                moment(result.arriveDateTime).isBefore(moment(dateArrMin))) {
                 dateArrMin = Number(moment(result.arriveDateTime).format('HHmm'));
             }
-            if (!dateArrMax || moment(result.arriveDateTime).isAfter(moment(dateArrMax))) {
+            if (!dateArrMax ||
+                moment(result.arriveDateTime).isAfter(moment(dateArrMax))) {
                 dateArrMax = Number(moment(result.arriveDateTime).format('HHmm'));
             }
             changesObject[result.segments.length - 1] = {
@@ -15108,7 +15860,7 @@ class IRLEnterpriseSearch extends BaseEnterpriseSearch {
                 title: `${result.segments.length - 1} changes`,
                 selected: false
             };
-            result.providers[0].ticketOptions.forEach(ticket => {
+            result.providers[0].ticketOptions.forEach((ticket) => {
                 if (ticket.class === '1') {
                     classObject['First'] = {
                         key: ClassType.Class_1,
@@ -15150,35 +15902,35 @@ class IRLEnterpriseSearch extends BaseEnterpriseSearch {
                 break;
         }
         // now first of all - apply the price filters
-        dirResults = dirResults.filter(result => {
-            const tickets = result.providers[0].ticketOptions.filter(ticket => {
-                return ticket.price >= filters.priceMin && ticket.price <= filters.priceMax;
+        dirResults = dirResults.filter((result) => {
+            const tickets = result.providers[0].ticketOptions.filter((ticket) => {
+                return (ticket.price >= filters.priceMin && ticket.price <= filters.priceMax);
             });
             result.providers[0].ticketOptions = tickets;
             return tickets.length;
         });
         // times
         // dep
-        dirResults = dirResults.filter(result => {
+        dirResults = dirResults.filter((result) => {
             const depTime = Number(moment(result.departDateTime).format('HHmm'));
             return depTime >= filters.dateDepMin && depTime <= filters.dateDepMax;
         });
         // arr
-        dirResults = dirResults.filter(result => {
+        dirResults = dirResults.filter((result) => {
             const arrTime = Number(moment(result.arriveDateTime).format('HHmm'));
             return arrTime >= filters.dateArrMin && arrTime <= filters.dateArrMax;
         });
         // classes
         // first of all determine if any are selected
-        const selectedClasses = filters.classes.filter(classF => {
+        const selectedClasses = filters.classes.filter((classF) => {
             return classF.selected;
         });
         if (selectedClasses === null || selectedClasses === void 0 ? void 0 : selectedClasses.length) {
-            dirResults = dirResults.filter(result => {
+            dirResults = dirResults.filter((result) => {
                 const newTickets = [];
                 console.log('og tickets:', result.providers[0].ticketOptions);
-                result.providers[0].ticketOptions.forEach(ticket => {
-                    selectedClasses.forEach(classS => {
+                result.providers[0].ticketOptions.forEach((ticket) => {
+                    selectedClasses.forEach((classS) => {
                         if (ticket.class === classS.key) {
                             newTickets.push(ticket);
                         }
@@ -15191,11 +15943,11 @@ class IRLEnterpriseSearch extends BaseEnterpriseSearch {
         }
         console.log(dirResults);
         // finally stops
-        const selectedStops = filters.changes.filter(change => {
+        const selectedStops = filters.changes.filter((change) => {
             return change.selected;
         });
         if (selectedStops.length) {
-            dirResults = dirResults.filter(result => {
+            dirResults = dirResults.filter((result) => {
                 for (let i = 0; i < selectedStops.length; i++) {
                     if (result.segments.length - 1 === selectedStops[i].key) {
                         return result;
@@ -15215,17 +15967,24 @@ class IRLEnterpriseSearch extends BaseEnterpriseSearch {
     }
     applyFavourite(fav) {
         return __awaiter(this, void 0, void 0, function* () {
-            this.getIrlSupplierStationFetcher.fetchList({ id: fav.departureLocationId }).subscribe(a => {
+            this.getIrlSupplierStationFetcher
+                .fetchList({ id: fav.departureLocationId })
+                .subscribe((a) => {
                 this.travellingFrom = a;
             });
-            this.getIrlSupplierStationFetcher.fetchList({ id: fav.arrivalLocationId }).subscribe(a => {
+            this.getIrlSupplierStationFetcher
+                .fetchList({ id: fav.arrivalLocationId })
+                .subscribe((a) => {
                 this.travellingTo = a;
             });
             this.adults = fav.adults;
             this.children = fav.children;
             this.class = fav.class;
             this.countryCode = fav.countryCode;
-            this.journeyType = fav.journeyType === "ReturnJourney" ? IrlJourneyType.ReturnJourney : IrlJourneyType.SingleJourney;
+            this.journeyType =
+                fav.journeyType === 'ReturnJourney'
+                    ? IrlJourneyType.ReturnJourney
+                    : IrlJourneyType.SingleJourney;
             this.supplier = fav.supplier;
         });
     }
@@ -15345,7 +16104,7 @@ class UserInfoImpl {
         this.userInfo.phoneNumber = new PhoneNumberImpl(this.helpers);
         this.userInfo.supplementaryInfo =
             this.perPassengerSupplementaryBookingInfoSchema;
-        if (this.user.id) {
+        if (this.user.id && this.user.__typename === 'User') {
             this.getUserFetcher
                 .fetchOne({ id: this.user.id })
                 .pipe(take(1))
@@ -15364,6 +16123,7 @@ class SupplementaryBookingInfoImpl {
         this.basketItem = basketItem;
         this.helpers = helpers;
         this.hasDetails = false;
+        this.noCovertSelectSchemas = [SchemaFormat.railSeating, SchemaFormat.passport, SchemaFormat.selectQueue];
         this.basketItem.perPassengerSupplementaryBookingInfoSchema =
             basketItem.perPassengerSupplementaryBookingInfoSchema
                 ? this.processSchema(this.basketItem.perPassengerSupplementaryBookingInfoSchema)
@@ -15371,6 +16131,9 @@ class SupplementaryBookingInfoImpl {
         this.userInfo = this.basketItem.users.map((user) => {
             return new UserInfoImpl(user, getUserFetcher, helpers, this.basketItem.perPassengerPhoneNumber, this.basketItem.perPassengerAddress, this.basketItem.perPassengerSupplementaryBookingInfoSchema);
         });
+        this.guestInfo = this.basketItem.guests.map((guest) => {
+            return new UserInfoImpl(guest, getUserFetcher, helpers, this.basketItem.perPassengerPhoneNumber, this.basketItem.perPassengerAddress, this.basketItem.perPassengerSupplementaryBookingInfoSchema);
+        });
         this.address = new AddressImpl(this.helpers);
         this.phoneNumber = new PhoneNumberImpl(this.helpers);
         this.basketItem.perItemSupplementaryBookingInfoSchema = this.basketItem
@@ -15417,7 +16180,7 @@ class SupplementaryBookingInfoImpl {
                 item.format ||
                     this.schemaWidgetToFormat(item.widget) ||
                     this.schemaTypeToFormat(item.type);
-            if (item.oneOf && item.oneOf.length > 0 && item.format !== 'railSeating' && item.format !== SchemaFormat.selectQueue) {
+            if (item.oneOf && item.oneOf.length > 0 && !this.noCovertSelectSchemas.includes(item.format)) {
                 item.format = SchemaFormat.select;
             }
         });
@@ -15463,7 +16226,8 @@ class SupplementaryBookingInfoImpl {
             basketItem: this.basketItem.id,
             userInfo: [],
             supplementaryInfo: {},
-            paymentMethodDetails: {}
+            paymentMethodDetails: {},
+            guestInfo: []
         };
         if (values.perItemAddress !== undefined) {
             newValue.address = this.helpers.toStrings(values.perItemAddress, AddressSchema);
@@ -15475,6 +16239,7 @@ class SupplementaryBookingInfoImpl {
             newValue.supplementaryInfo = this.helpers.toStrings(values.perItemSupplementarySchema, this.perItemSupplementarySchema);
         }
         newValue.userInfo = this.userInfo.map((userInfo, index) => {
+            var _a, _b;
             const userValue = { id: userInfo.id, supplementaryInfo: {} };
             const thisUserSupplemental = values['user_' + index] || {};
             if (thisUserSupplemental.perPassengerAddress !== undefined) {
@@ -15487,6 +16252,38 @@ class SupplementaryBookingInfoImpl {
                 undefined) {
                 userValue.supplementaryInfo = this.helpers.toStrings(thisUserSupplemental.perPassengerSupplementaryBookingInfoSchema, this.perPassengerSupplementaryBookingInfoSchema);
             }
+            if (userValue.supplementaryInfo.passport) {
+                if ((_a = userValue.supplementaryInfo.passport.dateOfExpiry) === null || _a === void 0 ? void 0 : _a.year) {
+                    userValue.supplementaryInfo.passport.dateOfExpiry = this.helpers.formatIsoDate(this.helpers.ngDateToMoment(userValue.supplementaryInfo.passport.dateOfExpiry));
+                }
+                if ((_b = userValue.supplementaryInfo.passport.dateOfIssue) === null || _b === void 0 ? void 0 : _b.year) {
+                    userValue.supplementaryInfo.passport.dateOfIssue = this.helpers.formatIsoDate(this.helpers.ngDateToMoment(userValue.supplementaryInfo.passport.dateOfIssue));
+                }
+            }
+            return userValue;
+        });
+        newValue.guestInfo = this.guestInfo.map((guestInfo, index) => {
+            var _a, _b;
+            const userValue = { id: guestInfo.id, supplementaryInfo: {} };
+            const thisUserSupplemental = values['guest_' + index] || {};
+            if (thisUserSupplemental.perPassengerAddress !== undefined) {
+                userValue.address = this.helpers.toStrings(thisUserSupplemental.perPassengerAddress, AddressSchema);
+            }
+            if (thisUserSupplemental.perPassengerPhoneNumber !== undefined) {
+                userValue.phoneNumber = this.helpers.toStrings(thisUserSupplemental.perPassengerPhoneNumber, PhoneNumberSchema);
+            }
+            if (thisUserSupplemental.perPassengerSupplementaryBookingInfoSchema !==
+                undefined) {
+                userValue.supplementaryInfo = this.helpers.toStrings(thisUserSupplemental.perPassengerSupplementaryBookingInfoSchema, this.perPassengerSupplementaryBookingInfoSchema);
+            }
+            if (userValue.supplementaryInfo.passport) {
+                if ((_a = userValue.supplementaryInfo.passport.dateOfExpiry) === null || _a === void 0 ? void 0 : _a.year) {
+                    userValue.supplementaryInfo.passport.dateOfExpiry = this.helpers.formatIsoDate(this.helpers.ngDateToMoment(userValue.supplementaryInfo.passport.dateOfExpiry));
+                }
+                if ((_b = userValue.supplementaryInfo.passport.dateOfIssue) === null || _b === void 0 ? void 0 : _b.year) {
+                    userValue.supplementaryInfo.passport.dateOfIssue = this.helpers.formatIsoDate(this.helpers.ngDateToMoment(userValue.supplementaryInfo.passport.dateOfIssue));
+                }
+            }
             return userValue;
         });
         return newValue;
@@ -16041,6 +16838,26 @@ class BaseGetConfermaRoomImagesFetcher extends FetchableList {
     }
 }
 
+class BaseGetCompaniesFetcher extends FetchableList {
+    constructor(getCompaniesGQL, helpers, modalService) {
+        super(getCompaniesGQL, helpers, modalService);
+    }
+    getDataFromResult(results) {
+        var _a;
+        return (_a = results === null || results === void 0 ? void 0 : results.data) === null || _a === void 0 ? void 0 : _a.getCompanies;
+    }
+}
+
+class BaseGetCompanyFetcher extends FetchableObject {
+    constructor(getCompanyGQL, helpers, modalService) {
+        super(getCompanyGQL, modalService, helpers);
+    }
+    getDataFromResult(results) {
+        var _a;
+        return (_a = results === null || results === void 0 ? void 0 : results.data) === null || _a === void 0 ? void 0 : _a.getCompany;
+    }
+}
+
 class BaseEmailBasketFetcher extends FetchableList {
     constructor(gql, helpers, modalService) {
         super(gql, helpers, modalService);
@@ -16120,6 +16937,16 @@ class BaseGetCancellationInfoFetcher extends FetchableObject {
     }
 }
 
+class BaseGetUserGuestsFetcher extends FetchableList {
+    constructor(queryGQL, helpers, modalService) {
+        super(queryGQL, helpers, modalService);
+    }
+    getDataFromResult(results) {
+        var _a;
+        return (_a = results.data) === null || _a === void 0 ? void 0 : _a.getUserGuests;
+    }
+}
+
 // | 'fareTypes';
 
 ;
@@ -16235,20 +17062,24 @@ class BaseRequiresReasonService {
                 };
                 const results = yield this.modalService.open(ModalTypes.RequiresReasonDialogComponent, { backdrop: 'static' }, this.workingOn);
                 if (results) {
-                    this.workingOn.basket.basketItems.forEach((bi) => {
-                        (bi.managementInfo || []).forEach((mi) => {
+                    yield Promise.all(this.workingOn.basket.basketItems.map((bi) => {
+                        return Promise.all((bi.managementInfo || []).map((mi) => {
                             if (results[mi.id]) {
-                                this.basketService.setMiSelectedValue(this.workingOn.basket.id, mi, results[mi.id], null);
+                                return this.basketService.setMiSelectedValue(this.workingOn.basket.id, mi, results[mi.id], null);
                             }
-                        });
-                    });
+                            else {
+                                return Promise.resolve();
+                            }
+                        }));
+                    }));
+                    this.workingOn = null;
                 }
                 else {
-                    Object.entries(this.workingOn.required).forEach(([biId, mis]) => {
-                        this.basketService.removeBasketItem(this.workingOn.basket.id, this.workingOn.basket.basketItems.find((bi) => bi.id === biId));
-                    });
+                    yield Promise.all(Object.entries(this.workingOn.required).map(([biId, mis]) => {
+                        return this.basketService.removeBasketItem(this.workingOn.basket.id, this.workingOn.basket.basketItems.find((bi) => bi.id === biId));
+                    }));
+                    this.workingOn = null;
                 }
-                this.workingOn = null;
             }
         });
     }
@@ -16298,7 +17129,7 @@ class InternalBasket {
         this.id = basket.id;
         this.title = basket.title;
         const toSend = Object.assign(Object.assign({}, basket), (basket.basketItems || []).reduce((accum, item, index) => {
-            var _a, _b;
+            var _a, _b, _c;
             if (!accum.prices[item.currency]) {
                 accum.prices[item.currency] = 0;
             }
@@ -16312,7 +17143,8 @@ class InternalBasket {
                     value: item.miGroupSelected || ''
                 });
             }
-            if (((_a = item.managementInfo) === null || _a === void 0 ? void 0 : _a.length) > 0 && ((_b = item.users) === null || _b === void 0 ? void 0 : _b.length) > 0) {
+            if (((_a = item.managementInfo) === null || _a === void 0 ? void 0 : _a.length) > 0 &&
+                (((_b = item.users) === null || _b === void 0 ? void 0 : _b.length) > 0 || ((_c = item.guests) === null || _c === void 0 ? void 0 : _c.length))) {
                 accum.basketInfoMiDetails.push(new BasketInfoMiDetailsImpl(item, this.basketService, this.helpers));
             }
             return accum;
@@ -16330,7 +17162,7 @@ class InternalBasket {
     }
 }
 class BaseEnterpriseBasketService {
-    constructor(acceptNewPriceUpdater, addItemToBasketUpdater, addUserToBasketItem, basketCreator, basketFetcher, bookBasketUpdater, deleteBasketUpdater, getMiAutoSugestionFetcher, helpers, removeItemFromBasketUpdater, revalidateBasketUpdater, setBasketItemMiGroupUpdater, setBasketItemMiValueUpdater, validateMiFreeValue, sendBasketForApprovalUpdater, getUserFetcher, getUserBasketsFetcher, SetBasketItemLeadPassenger, moveItemToADifferentBasket, updateBasketNotesUpdater, updateBasketTitleUpdater, setPaymentMethodUpdater, getCancellationInfoFetcher, userService, modalService) {
+    constructor(acceptNewPriceUpdater, addItemToBasketUpdater, addUserToBasketItem, basketCreator, basketFetcher, bookBasketUpdater, deleteBasketUpdater, getMiAutoSugestionFetcher, helpers, removeItemFromBasketUpdater, revalidateBasketUpdater, setBasketItemMiGroupUpdater, setBasketItemMiValueUpdater, validateMiFreeValue, sendBasketForApprovalUpdater, getUserFetcher, getUserBasketsFetcher, SetBasketItemLeadPassenger, moveItemToADifferentBasket, updateBasketNotesUpdater, updateBasketTitleUpdater, setPaymentMethodUpdater, getCancellationInfoFetcher, userService, modalService, webTokenService) {
         this.acceptNewPriceUpdater = acceptNewPriceUpdater;
         this.addItemToBasketUpdater = addItemToBasketUpdater;
         this.addUserToBasketItem = addUserToBasketItem;
@@ -16356,6 +17188,7 @@ class BaseEnterpriseBasketService {
         this.getCancellationInfoFetcher = getCancellationInfoFetcher;
         this.userService = userService;
         this.modalService = modalService;
+        this.webTokenService = webTokenService;
         this.currentBaskets = [];
         this.highlightBasketItemsEmitter = new Subject();
         this.basketChangeEmitter = new BehaviorSubject('');
@@ -16417,7 +17250,10 @@ class BaseEnterpriseBasketService {
                 price: 0
             }
         ];
-        this.basketPrices = new BehaviorSubject({ total: null, list: this.basketList });
+        this.basketPrices = new BehaviorSubject({
+            total: null,
+            list: this.basketList
+        });
         this.menuState = MenuSlideEnum.OUT;
         this.requiresService = new BaseRequiresReasonService(modalService, this);
         this.userService.changeUser.subscribe({
@@ -16466,7 +17302,6 @@ class BaseEnterpriseBasketService {
                 else {
                     this.currentBasketID = null;
                 }
-                this.basketChangeEmitter.next(this.currentBasketID);
             }, (error) => {
                 console.error(error);
             });
@@ -16476,7 +17311,6 @@ class BaseEnterpriseBasketService {
             this.currentBaskets = [];
             this.currentBasketID = null;
             this.baskets.next(this.currentBaskets);
-            this.basketChangeEmitter.next(this.currentBasketID);
         }
     }
     getAllOpenBaskets(user_id) {
@@ -16499,10 +17333,28 @@ class BaseEnterpriseBasketService {
     }
     addToBasket(item, intBasket, searchService, travellers = [], requiresReason) {
         return __awaiter(this, void 0, void 0, function* () {
+            switch (yield this.checkBasketForInvoked(intBasket, this.webTokenService.bobo)) {
+                case DifferentInvokdedUserReasons.continue:
+                    break;
+                case DifferentInvokdedUserReasons.cancel:
+                    return DifferentInvokdedUserReasons.cancel;
+                case DifferentInvokdedUserReasons.newBasket:
+                    intBasket = yield this.createBasket();
+                    this.currentBasketID = intBasket.id;
+                    break;
+                case DifferentInvokdedUserReasons.research:
+                    this.webTokenService.bobo = intBasket.subject.value.invokedUser;
+                    return DifferentInvokdedUserReasons.research;
+            }
+            item.basket = intBasket.id;
             item.convertCurrencyTo = 'GBP';
             if ((travellers === null || travellers === void 0 ? void 0 : travellers.length) > 0) {
-                item.users = this.helpers.makeUsers(travellers);
-                item.leadPassenger = item.users[0].id;
+                item.users = this.helpers.makeUsers(travellers.filter((trav) => !trav.guest));
+                item.guests = this.helpers.makeUsers(travellers.filter((trav) => trav.guest));
+                item.leadPassenger = travellers[0].id;
+                item.leadPassengerType = travellers[0].guest
+                    ? LeadPassengerType.Guest
+                    : LeadPassengerType.User;
             }
             item.outboundDate = item.outboundDate
                 ? new Date(this.helpers.formatIsoDateTime(item.outboundDate))
@@ -16512,6 +17364,7 @@ class BaseEnterpriseBasketService {
                 : item.inboundDate;
             item.requiresReason = requiresReason;
             item = this.checkDetails(item);
+            this.removeBookedBasket();
             if (item && intBasket) {
                 this.addItemToBasketUpdater
                     .updateOne(item)
@@ -16523,15 +17376,24 @@ class BaseEnterpriseBasketService {
                     searchService.search_objects[service].chosen = false;
                     const bi = newBasket.basketItems;
                     this.highlightBasketItemsEmitter.next(bi);
-                    this.basketChangeEmitter.next(this.currentBasketID);
                 }, (error) => {
                     console.error(error);
                     intBasket.subject.next(intBasket.subject.value);
                 });
             }
-            return false;
+            return DifferentInvokdedUserReasons.continue;
         });
     }
+    checkBasketForInvoked(intBasket, bobo) {
+        var _a;
+        if (((_a = intBasket.subject.value.invokedUser) === null || _a === void 0 ? void 0 : _a.id) !== (bobo === null || bobo === void 0 ? void 0 : bobo.id)) {
+            return this.modalService.open(ModalTypes.DifferentInvokdedUserComponent, {}, {
+                basketBobo: intBasket.subject.value.invokedUser,
+                currentBobo: bobo
+            });
+        }
+        return Promise.resolve(DifferentInvokdedUserReasons.continue);
+    }
     loadBasket(id) {
         let intBasket = this.findBasket(id);
         if (!intBasket) {
@@ -16676,9 +17538,12 @@ class BaseEnterpriseBasketService {
         });
     }
     createBasketOnDB(intBasket) {
+        var _a, _b;
+        const mutation = ((_a = this.webTokenService.bobo) === null || _a === void 0 ? void 0 : _a.id) ? { invokedUser: (_b = this.webTokenService.bobo) === null || _b === void 0 ? void 0 : _b.id }
+            : {};
         return new Promise((resolve, reject) => {
             this.basketCreator
-                .updateOne({})
+                .updateOne(mutation)
                 .pipe(take(1))
                 .subscribe((basket) => {
                 intBasket.id = basket.id;
@@ -16768,7 +17633,6 @@ class BaseEnterpriseBasketService {
                 this.baskets.next(this.currentBaskets);
                 if (basketid === this.currentBasketID) {
                     this.currentBasketID = ((_b = this.currentBaskets[0]) === null || _b === void 0 ? void 0 : _b.id) || null;
-                    this.basketChangeEmitter.next(this.currentBasketID);
                 }
                 return of(data);
             }));
@@ -16820,14 +17684,15 @@ class BaseEnterpriseBasketService {
             });
         }
     }
-    setLeadPassenger(basketid, basketItem, travellers, index = 0) {
+    setLeadPassenger(basketid, basketItem, travellers, index = 0, leadPassengerType = LeadPassengerType.User) {
         const basket = this.findBasket(basketid);
         if (index < 1) {
             this.SetBasketItemLeadPassenger.updateOne({
                 convertCurrencyTo: 'GBP',
                 id: basketItem.id,
-                user: travellers.id,
-                withSupplemental: false
+                userOrGuest: travellers.id,
+                withSupplemental: false,
+                leadPassengerType: leadPassengerType
             }).subscribe(() => { }, () => { }, () => {
                 this.setLeadPassenger(basket.id, basketItem, travellers, index + 1);
             });
@@ -16882,7 +17747,7 @@ class BaseEnterpriseBasketService {
                 .subscribe(resolve, reject);
         });
     }
-    setMiFreeValue(basketid, miItem, freeValue, userId = null) {
+    setMiFreeValue(basketid, miItem, freeValue, userId = null, guest) {
         const intBasket = this.findBasket(basketid);
         const args = {
             convertCurrencyTo: 'GBP',
@@ -16890,27 +17755,42 @@ class BaseEnterpriseBasketService {
             miFreeValue: freeValue
         };
         if (!!userId) {
-            args.user = userId;
+            if (guest) {
+                args.guest = userId;
+            }
+            else {
+                args.user = userId;
+            }
         }
-        this.setBasketItemMiValueUpdater
-            .updateOne(args)
-            .pipe(take(1))
-            .subscribe((basket) => {
-            intBasket.next(basket);
-        }, (_) => { }, () => {
-            intBasket.next(intBasket.subject.value);
+        return new Promise((resolve, reject) => {
+            this.setBasketItemMiValueUpdater
+                .updateOne(args)
+                .pipe(take(1))
+                .subscribe((basket) => {
+                intBasket.next(basket);
+            }, (error) => {
+                reject(error);
+            }, () => {
+                intBasket.next(intBasket.subject.value);
+                resolve();
+            });
         });
     }
-    setMiSelectedValue(basketid, miItem, selectedValue, userId = null) {
+    setMiSelectedValue(basketid, miItem, selectedValue, userId = null, guest) {
         const args = {
             convertCurrencyTo: 'GBP',
             mi: miItem.id,
             miValue: selectedValue
         };
         if (!!userId) {
-            args.user = userId;
+            if (guest) {
+                args.guest = userId;
+            }
+            else {
+                args.user = userId;
+            }
         }
-        this.updateBasket(basketid, this.setBasketItemMiValueUpdater.updateOne(args));
+        return this.updateBasket(basketid, this.setBasketItemMiValueUpdater.updateOne(args));
     }
     getMiAutoSugestions(miId, partialLabel, isLoading) {
         isLoading === null || isLoading === void 0 ? void 0 : isLoading.next(true);
@@ -16930,6 +17810,11 @@ class BaseEnterpriseBasketService {
                     item.save(basketId, user);
                 });
             });
+            bmi.guests.forEach((user) => {
+                bmi.miPerGuest[user].managementInfo.forEach((item) => {
+                    item.save(basketId, user, true);
+                });
+            });
         });
     }
     sendBasketForApproval(basketid) {
@@ -17007,6 +17892,15 @@ class BaseEnterpriseBasketService {
             basketItem: basketItem.id
         });
     }
+    removeBookedBasket() {
+        this.currentBaskets = this.currentBaskets.reduce((acc, basket) => {
+            if (basket.subject.value.status !== BasketStatus.Booked) {
+                acc.push(basket);
+            }
+            return acc;
+        }, []);
+        this.baskets.next(this.currentBaskets);
+    }
 }
 
 const SESSION_NAME = 'results_hotel_avallibility';
@@ -17234,14 +18128,18 @@ class AbstractHttpCallService {
 const USER_SIGNEDOUT = 'USER_SIGNEDOUT';
 const USER_SIGNEDIN = 'USER_SIGNEDIN';
 class BaseUserService {
-    constructor(getUserFetcher, userUiConfigsFetcher, userProductsFetcher, userMessagesFetcher, baseConfirmMessagesUpdater, setUserLanguageUpdater, editUserUpdater, storageService, helpers) {
+    constructor(getUserFetcher, userUiConfigsFetcher, userProductsFetcher, userMessagesFetcher, baseConfirmMessagesUpdater, getCompaniesFetcher, getCompanyFetcher, setUserLanguageUpdater, editUserUpdater, createGuestUpdater, getUserGuestsFetcher, storageService, helpers) {
         this.getUserFetcher = getUserFetcher;
         this.userUiConfigsFetcher = userUiConfigsFetcher;
         this.userProductsFetcher = userProductsFetcher;
         this.userMessagesFetcher = userMessagesFetcher;
         this.baseConfirmMessagesUpdater = baseConfirmMessagesUpdater;
+        this.getCompaniesFetcher = getCompaniesFetcher;
+        this.getCompanyFetcher = getCompanyFetcher;
         this.setUserLanguageUpdater = setUserLanguageUpdater;
         this.editUserUpdater = editUserUpdater;
+        this.createGuestUpdater = createGuestUpdater;
+        this.getUserGuestsFetcher = getUserGuestsFetcher;
         this.storageService = storageService;
         this.helpers = helpers;
         this.fullUserDetails = {
@@ -17258,9 +18156,10 @@ class BaseUserService {
     setUser(user_data) {
         const userdata = this.fullUserDetails.userData.value;
         if (!userdata || userdata.username !== user_data.username) {
-            if (userdata === null || userdata === void 0 ? void 0 : userdata.user_id) {
-                this.getUserFetcher.fetchOne({
-                    id: userdata.user_id.toString()
+            if (user_data === null || user_data === void 0 ? void 0 : user_data.user_id) {
+                this.getUserFetcher
+                    .fetchOne({
+                    id: user_data.user_id.toString()
                 })
                     .pipe(take(1))
                     .subscribe((user) => {
@@ -17289,7 +18188,8 @@ class BaseUserService {
             this.fullUserDetails.travllerObject.next(TravellerObject.makeTravellerObjectFromUser(user_data));
         }
         if (user_data === null || user_data === void 0 ? void 0 : user_data.user_id) {
-            this.getUserFetcher.fetchOne({
+            this.getUserFetcher
+                .fetchOne({
                 id: user_data === null || user_data === void 0 ? void 0 : user_data.user_id.toString()
             })
                 .pipe(take(1))
@@ -17301,6 +18201,9 @@ class BaseUserService {
         this.fullUserDetails.userData.next(user_data);
         this.storageService.setSessionItem('lightning_user_data', user_data);
     }
+    canBookGuest() {
+        return this.fullUserDetails.allDetails.value.canBookGuest;
+    }
     checkEmitUser() {
         if (!!this.fullUserDetails.userConfigs.value &&
             !!this.fullUserDetails.userData.value &&
@@ -17494,29 +18397,54 @@ class BaseUserService {
     confirmMessages(id) {
         return this.baseConfirmMessagesUpdater.updateOne({ messages: id });
     }
-    getUser() {
+    userIsRoot() {
+        return this.fullUserDetails.userData.value.booker_type === BookerType.Root;
+    }
+    userIsSupportAgent() {
+        return !!this.fullUserDetails.userData.value.support_agent;
+    }
+    getUserCompanies(query = null) {
+        return query
+            ? this.getCompaniesFetcher.fetchList({ query }).pipe(take(1))
+            : this.getCompaniesFetcher.fetchList().pipe(take(1));
+    }
+    getCompanyById(id, withUsers = false) {
+        return this.getCompanyFetcher.fetchOne({ id }).pipe(take(1));
+    }
+    getUser(userId) {
         const user = this.getfullUserDetails();
         return this.getUserFetcher.fetchOne({
-            id: user.userData.value.user_id.toString()
+            id: userId ? userId : user.userData.value.user_id.toString()
         });
     }
     setUserLanguage(id) {
         return this.setUserLanguageUpdater.updateOne({ language: id });
     }
-    getDocuments(type) {
-        return this.getUser().pipe(map((user) => user.documents || []), map((docs) => {
+    getDocuments(type, userId) {
+        return this.getUser(userId).pipe(map((user) => user.documents || []), map((docs) => {
             return type
                 ? docs.filter((doc) => doc.docType === type)
                 : docs;
         }));
     }
     editUser(user) {
-        return this.editUserUpdater.updateOne(user).pipe(tap((user) => this.fullUserDetails.allDetails.next(user)));
+        return this.editUserUpdater
+            .updateOne(user)
+            .pipe(tap((user) => this.fullUserDetails.allDetails.next(user)));
+    }
+    createGuest(newGuest) {
+        return this.createGuestUpdater.updateOne(newGuest).pipe(take(1));
+    }
+    getUserGuests() {
+        return this.getUserGuestsFetcher.fetchList();
+    }
+    canInvokeUser() {
+        return this.fullUserDetails.allDetails.value.canInvokeUser;
     }
 }
 
 class BaseLogonService {
-    constructor(userService, modalService, http, router, eventMessenager, storageService, environment) {
+    constructor(userService, modalService, http, router, eventMessenager, storageService, environment, webTokenService) {
         this.userService = userService;
         this.modalService = modalService;
         this.http = http;
@@ -17524,6 +18452,7 @@ class BaseLogonService {
         this.eventMessenager = eventMessenager;
         this.storageService = storageService;
         this.environment = environment;
+        this.webTokenService = webTokenService;
         this.loading = false;
         this.isLoggedIn = false;
         this.redirectUrl = '';
@@ -17590,6 +18519,37 @@ class BaseLogonService {
     setRefresh() {
         this.timeoutSubscription = window.setTimeout(this.refreshToken.bind(this), this.environment.authRefreshTimeout * 1000);
     }
+    becomeUser(username) {
+        return new Promise((resolve, reject) => {
+            this.clearRefresh();
+            this.http
+                .post(URLS.BECOME_USER, { username })
+                .pipe(take(1))
+                .subscribe((data) => {
+                console.log(data);
+                this.userService.setUser(data.jwtObject);
+                this.router.navigate(['main']);
+                resolve(true);
+            }, (error) => {
+                reject(error);
+            });
+        });
+    }
+    endBecomeUserSession() {
+        return new Promise((resolve, reject) => {
+            this.clearRefresh();
+            this.http
+                .post(URLS.END_BECOME_USER, {})
+                .pipe(take(1))
+                .subscribe((data) => {
+                console.log(data);
+                this.userService.setUser(data.jwtObject);
+                resolve(true);
+            }, (error) => {
+                reject(error);
+            });
+        });
+    }
     login(username, password, again) {
         this.userService.emptyUserData();
         this.storageService.clearSessionData();
@@ -17600,6 +18560,7 @@ class BaseLogonService {
             password
         })
             .pipe(take(1), map((value, index) => {
+            this.webTokenService.bobo = null;
             this.setRefresh();
             return this.handleResponse(value);
         }));
@@ -17629,6 +18590,7 @@ class BaseLogonService {
         const isSSO = this.userService.isUserFavoriteSet(UserFavorurite.SSO_no_password);
         this.clearRefresh();
         this.isLoggedIn = false;
+        this.webTokenService.bobo = null;
         this.userService.emptyUserData();
         this.storageService.clearSessionData();
         this.http.post(URLS.LOGOUT_URL).subscribe((data) => {
@@ -17671,7 +18633,7 @@ class BaseLogonService {
       **/
     recoverPassword(username) {
         return this.http.formEncodedPost(URLS.RECOVER_PASSWORD_URL, {
-            username: `${username}`,
+            username: `${username}`
         }, 'text');
     }
     /*
@@ -19084,10 +20046,9 @@ var EuroStations = [
 
 class FastTrackEnterpriseSearch extends BaseEnterpriseSearch {
     constructor(fasttrackFetcher, helpers, basketService, storageService, searchService) {
-        super(storageService, helpers);
+        super(storageService, helpers, searchService);
         this.fasttrackFetcher = fasttrackFetcher;
         this.basketService = basketService;
-        this.searchService = searchService;
         this.type = ServiceType.FastTrack;
         this._date = null;
         this._time = null;
@@ -19221,7 +20182,7 @@ class FastTrackEnterpriseSearch extends BaseEnterpriseSearch {
     getSearchQuery() {
         const query = {
             adults: this.tempParams.adults,
-            children: this.tempParams.children,
+            children: this.tempParams.children ? this.tempParams.children : null,
             locationCode: this._locationCode,
             arrivalDatetime: this.tempParams.arrivalDatetime
         };
@@ -19255,6 +20216,25 @@ class FastTrackEnterpriseSearch extends BaseEnterpriseSearch {
         });
         this.searchService.startSearches();
     }
+    updateSearchFromExpiredBasketItem(basketItem) {
+        const searchFastTrackQuery = basketItem.searchQuery;
+        this.arrivalDatetime = moment(searchFastTrackQuery.arrivalDatetime);
+        this.searchService
+            .getAirportByCode(searchFastTrackQuery.locationCode)
+            .subscribe((airport) => {
+            var _a, _b, _c, _d, _e, _f;
+            if (airport) {
+                this.locationCode = {
+                    country: (_b = (_a = airport.iataMatch) === null || _a === void 0 ? void 0 : _a.locationDetails) === null || _b === void 0 ? void 0 : _b.country,
+                    countryCode: (_d = (_c = airport.iataMatch) === null || _c === void 0 ? void 0 : _c.locationDetails) === null || _d === void 0 ? void 0 : _d.countryCode,
+                    destination: airport.iataMatch.name,
+                    gateway: airport.iataMatch.iata,
+                    postcode: (_f = (_e = airport.iataMatch) === null || _e === void 0 ? void 0 : _e.locationDetails) === null || _f === void 0 ? void 0 : _f.postcode,
+                    terminals: this.searchService.processTerminals(airport.iataMatch.terminals)
+                };
+            }
+        });
+    }
     updateFromPreviousSearches(previousItems) {
         var _a;
         console.log('PREPOPULATING LOUNGE FORM');
@@ -19290,13 +20270,13 @@ class FastTrackEnterpriseSearch extends BaseEnterpriseSearch {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
             if (fasttrackQuote.unavailable) {
-                return Promise.resolve(false);
+                return Promise.resolve(DifferentInvokdedUserReasons.cancel);
             }
             const intBasket = yield this.basketService.getDefaultBasket();
             const basket = intBasket === null || intBasket === void 0 ? void 0 : intBasket.subject.value;
             const termsAndConditions = this.getTermsAndCond(fasttrackQuote);
             if (basket) {
-                return this.basketService.addToBasket({
+                const whatHappened = yield this.basketService.addToBasket({
                     adults: fasttrackQuery.adults,
                     children: fasttrackQuery.children,
                     basket: basket.id,
@@ -19306,17 +20286,19 @@ class FastTrackEnterpriseSearch extends BaseEnterpriseSearch {
                         locationCode: fasttrackQuote.code,
                         name: fasttrackQuote.name,
                         airportIata: fasttrackQuery === null || fasttrackQuery === void 0 ? void 0 : fasttrackQuery.locationCode,
-                        logo: fasttrackQuote.logo,
-                        terminal: (_a = fasttrackQuote.terminal) === null || _a === void 0 ? void 0 : _a.toString(),
-                        termsAndCond: termsAndConditions
+                        terminal: (_a = fasttrackQuote.terminal) === null || _a === void 0 ? void 0 : _a.toString()
                     },
                     price: fasttrackQuote.price,
                     currency: fasttrackQuote.currency,
                     searchQuery: fasttrackQuery,
                     outboundDate: fasttrackQuery.arrivalDatetime.format()
                 }, intBasket, this.searchService, this.travellers, fasttrackQuote.requiresReason);
+                if (whatHappened === DifferentInvokdedUserReasons.research) {
+                    this.performSearch();
+                }
+                return whatHappened;
             }
-            return Promise.resolve(false); // TODO should this throw an error?
+            return DifferentInvokdedUserReasons.cancel;
         });
     }
     getTermsAndCond(fasttrackQuote) {
@@ -19412,6 +20394,7 @@ class BaseEnterpriseSearchService {
         this.baseSaveFavouriteSearchUpdater = baseSaveFavouriteSearchUpdater;
         this.getRailStationFetcher = getRailStationFetcher;
         this.getIrlSupplierStationFetcher = getIrlSupplierStationFetcher;
+        this.baseWebTokenService = baseWebTokenService;
         this.riskAlertsFetcher = riskAlertsFetcher;
         this.getUserRecentSearchesFetcher = getUserRecentSearchesFetcher;
         this.getRailCardsFetcher = getRailCardsFetcher;
@@ -19790,6 +20773,14 @@ class BaseEnterpriseSearchService {
             return of([]);
         }
     }
+    getRailStationById(id) {
+        if (id) {
+            return this.getRailStationFetcher.fetchList({ id }).pipe(take(1));
+        }
+        else {
+            return of();
+        }
+    }
     /**
      * @description - get irl station locations
      * @param term - the term to search
@@ -19947,6 +20938,9 @@ class BaseEnterpriseSearchService {
     updateTravellerInformation() {
         this.storageService.setSessionItem(BaseEnterpriseSearchService.SESSION_TRAVELLER, this.selectedTravellers);
         this.travellerInformation.next([...this.selectedTravellers]);
+        if (this.searches[ServiceType.Rail]) {
+            this.searches[ServiceType.Rail].railCards = new Array(this.selectedTravellers.length).fill({ name: '', code: '' }, 0, this.selectedTravellers.length);
+        }
     }
     /*
      *  @desc - determine and return the highest priority value,
@@ -19975,7 +20969,8 @@ class BaseEnterpriseSearchService {
     }
     getSelectedOptions() {
         return Object.keys(this.search_objects).reduce((cv, itemIndex) => {
-            if (this.search_objects[itemIndex].chosen) {
+            var _a;
+            if ((_a = this.search_objects[itemIndex]) === null || _a === void 0 ? void 0 : _a.chosen) {
                 cv.push(itemIndex);
             }
             return cv;
@@ -20007,13 +21002,14 @@ class BaseEnterpriseSearchService {
     }
     canSearch(type) {
         // check that the selected type is chosen, has highest priority and has not already had a booking chosen
+        var _a, _b;
         this.determineHighestSearchPriority();
         // firstly check that the type of search exists
         if (this.search_objects[type]) {
             console.log('can search here');
             // now check that the type is chosen has highest priority
-            if (this.search_objects[type].chosen &&
-                this.hasHighestSearchPriority(this.search_objects[type].priority)) {
+            if (((_a = this.search_objects[type]) === null || _a === void 0 ? void 0 : _a.chosen) &&
+                this.hasHighestSearchPriority((_b = this.search_objects[type]) === null || _b === void 0 ? void 0 : _b.priority)) {
                 console.log(type + ' can be searched');
                 return true;
             }
@@ -20029,61 +21025,13 @@ class BaseEnterpriseSearchService {
      *   travellers (or will do when it's complete) TODO - add Flight, Rail Car
      **/
     getAllErrorMessages() {
-        const concattedErrors = this.travellerValidationMessages;
-        if (this.search_objects[ServiceType.Lounge].chosen &&
-            this.canSearch(ServiceType.Lounge)) {
-            concattedErrors.push(...this.searches[ServiceType.Lounge].validationMessages);
-        }
-        if (this.search_objects[ServiceType.Car].chosen &&
-            this.canSearch(ServiceType.Car)) {
-            concattedErrors.push(...this.searches[ServiceType.Car].validationMessages);
-        }
-        if (this.search_objects[ServiceType.Rail].chosen &&
-            this.canSearch(ServiceType.Rail)) {
-            concattedErrors.push(...this.searches[ServiceType.Rail].validationMessages);
-        }
-        if (this.search_objects[ServiceType.Parking].chosen &&
-            this.canSearch(ServiceType.Parking)) {
-            concattedErrors.push(...this.searches[ServiceType.Parking].validationMessages);
-        }
-        if (this.search_objects[ServiceType.Cab].chosen &&
-            this.canSearch(ServiceType.Cab)) {
-            concattedErrors.push(...this.searches[ServiceType.Cab].validationMessages);
-        }
-        if (this.search_objects[ServiceType.Hotel].chosen &&
-            this.canSearch(ServiceType.Hotel)) {
-            concattedErrors.push(...this.searches[ServiceType.Hotel].validationMessages);
-        }
-        if (this.search_objects[ServiceType.FastTrack].chosen &&
-            this.canSearch(ServiceType.FastTrack)) {
-            concattedErrors.push(...this.searches[ServiceType.FastTrack].validationMessages);
-        }
-        /*
-        if (this.search_objects.hotel.chosen && this.canSearch(TravelTypeEnum.HOTEL)) {
-          concattedErrors = concattedErrors.concat(this.hotel.validationMessages);
-        }
-    
-    
-    
-        if (this.search_objects.flight.chosen && this.canSearch(TravelTypeEnum.FLIGHT)) {
-          concattedErrors = concattedErrors.concat(this.flight.validationMessages);
-        }
-    
-        if (this.search_objects.parking.chosen && this.canSearch(TravelTypeEnum.AIR_PARKING)) {
-          concattedErrors.push(...this.parking.validationMessages);
-        }
-    
-        if (this.search_objects.taxi.chosen && this.canSearch(TravelTypeEnum.TAXI)) {
-          concattedErrors.push(...this.taxi.validationMessages);
-        }
-    
-        if (this.search_objects.eurostar.chosen && this.canSearch(TravelTypeEnum.EUROSTAR)) {
-          concattedErrors.push(...this.eurostar.validationMessages);
-        }
-    
-        if (this.search_objects.coach.chosen && this.canSearch(TravelTypeEnum.COACH)) {
-          concattedErrors.push(...this.coach.validationMessages);
-        }*/
+        const concattedErrors = Object.entries(this.search_objects).reduce((accum, [type, searchObject]) => {
+            if ((searchObject === null || searchObject === void 0 ? void 0 : searchObject.chosen) && this.canSearch(type)) {
+                accum.push(...this.searches[type]
+                    .validationMessages);
+            }
+            return accum;
+        }, this.travellerValidationMessages);
         this.errors.next(concattedErrors);
         return concattedErrors;
     }
@@ -20177,9 +21125,9 @@ class BaseEnterpriseSearchService {
         // }, this.environment.searchTimeout);
         try {
             Promise.all(Object.values(this.searches).map((search) => {
+                var _a;
                 return !!search &&
-                    this.search_objects[search.type] &&
-                    this.search_objects[search.type].chosen
+                    this.search_objects[search.type] && ((_a = this.search_objects[search.type]) === null || _a === void 0 ? void 0 : _a.chosen)
                     ? search.startSearch()
                     : Promise.resolve(false);
             })).finally(() => {
@@ -20620,7 +21568,8 @@ class BaseEnterpriseSearchService {
             travellingTo: null,
             via: false,
             viaLocation: null,
-            railCards: null
+            railCards: [],
+            transactionIdentifier: null
         };
         return this.helpers.sanatizeReturns(defaultVal, Object.assign({}, ...args), ['inBoundDateTime', 'outBoundDateTime']);
     }
@@ -20754,7 +21703,9 @@ class BaseEnterpriseSearchService {
         return this.deleteFavouriteSearchUpdater.updateOne({ id: id });
     }
     saveRecentSearch(query) {
-        if (query) {
+        if (query &&
+            !this.selectedTravellers.find((traveller) => traveller.guest)) {
+            // prevent it saving recent searches with guests - atm it's erroring
             this.baseSaveRecentSearchUpdater
                 .updateOne(query)
                 .pipe(take(1))
@@ -20843,7 +21794,7 @@ class BaseEnterpriseSearchService {
     }
     submitIrlForm() {
         const currentUserEmail = this.userService.getUserEmail();
-        let searchParams = this.searches[ServiceType.InternationalRail];
+        const searchParams = this.searches[ServiceType.InternationalRail];
         let onBehalfOf;
         let passengers;
         // get passengers
@@ -20851,8 +21802,8 @@ class BaseEnterpriseSearchService {
             passengers = travellers.map((traveller, index) => {
                 let age;
                 if (traveller.dob) {
-                    let timeDiff = Math.abs(new Date().getTime() - new Date(traveller.dob).getTime());
-                    age = Math.floor((timeDiff / (1000 * 3600 * 24)) / 365);
+                    const timeDiff = Math.abs(new Date().getTime() - new Date(traveller.dob).getTime());
+                    age = Math.floor(timeDiff / (1000 * 3600 * 24) / 365);
                 }
                 return {
                     name: traveller.name,
@@ -20861,7 +21812,9 @@ class BaseEnterpriseSearchService {
                     loyaltyCard: `Loyalty Card ${index + 1}`
                 };
             });
-            onBehalfOf = travellers[0].email ? travellers[0].email : currentUserEmail;
+            onBehalfOf = travellers[0].email
+                ? travellers[0].email
+                : currentUserEmail;
         }));
         // get jrfreference
         this.allSubscription.add(searchParams.results.subscribe((irlJourney) => {
@@ -20881,8 +21834,8 @@ class BaseEnterpriseSearchService {
                 serviceClass: searchParams.irlClass || 'Any',
                 offlineReference: this.jrfReference,
                 notifyEmail: currentUserEmail,
-                onBehalfOf: onBehalfOf,
-                passengers: passengers
+                onBehalfOf,
+                passengers
             };
             console.log(payload);
             this.sendOfflineNotification(payload).subscribe((result) => {
@@ -20898,6 +21851,9 @@ class BaseEnterpriseSearchService {
     sendOfflineNotification(jrfReference) {
         return this.sendOfflineNotificationFetcher.fetchOne(jrfReference);
     }
+    getCountries() {
+        return this.countries;
+    }
 }
 BaseEnterpriseSearchService.SESSION_TRAVELLER = 'search_travellers';
 
@@ -20912,6 +21868,7 @@ class BaseWebTokenService {
         this.timer = null;
         this.timeoutDuration = 60 * 60;
         this.autoLogoutConfig = {};
+        this._bobo = null;
         this.timeOutDuration = environment.autoLogoutTime;
     }
     /**
@@ -20928,6 +21885,12 @@ class BaseWebTokenService {
     get jwtToken() {
         return this._jwtToken || null;
     }
+    set bobo(value) {
+        this._bobo = value || null;
+    }
+    get bobo() {
+        return this._bobo;
+    }
     _updateTimer() {
         window.clearTimeout(this.timer);
         this.timer = null;
@@ -21438,9 +22401,19 @@ class BaseEditUserUpdater extends UpdateableObject {
     }
 }
 
+class BaseCreateGuestUpdater extends UpdateableObject {
+    constructor(createBasketGQL, modalService) {
+        super(createBasketGQL, modalService);
+    }
+    getDataFromResult(results) {
+        var _a;
+        return (_a = results === null || results === void 0 ? void 0 : results.data) === null || _a === void 0 ? void 0 : _a.createGuest;
+    }
+}
+
 /**
  * Generated bundle index. Do not edit.
  */
 
-export { AbstractHttpCallService, ActionType, AddressImpl, Airlines, AirportSearchMode, AuthInfo, BaseAcceptNewPriceUpdater, BaseAddItemToBasketUpdater, BaseAddUserToBasketItemUpdater, BaseApplyJitFlightRulesFetcher, BaseBookBasketUpdater, BaseCabhireQuoteFetcher, BaseCancelBookingUpdater, BaseCarHireAvailabilityDetailFetcher, BaseCarhireQuoteFetcher, BaseConfermaOfficeFetcher, BaseConfermaOfficeNamesFetcher, BaseConfirmMessagesUpdater, BaseCreateBasketUpdater, BaseDeleteBasketUpdater, BaseDeleteFavouriteSearchUpdater, BaseDeleteRecentSearchUpdater, BaseDeleteUserAddressUpdater, BaseEditUserUpdater, BaseEmailBasketFetcher, BaseEnterpriseBasketService, BaseEnterpriseMyBookingsService, BaseEnterpriseSearch, BaseEnterpriseSearchService, BaseEnvironment, BaseEurostarQuoteFetcher, BaseEventMessenager, BaseFastTrackQuoteFetcher, BaseFlightQuoteFetcher, BaseGetAllAirlinesFetcher, BaseGetBasketFetcher, BaseGetCancellationInfoFetcher, BaseGetCarHireProvidersFetcher, BaseGetConfermaRoomImagesFetcher, BaseGetCovidMicrositeTokenFetcher, BaseGetFlightFareRulesFetcher, BaseGetFlightSeatMapFetcher, BaseGetHotelChainsFetcher, BaseGetIrlSupplierStationFetcher, BaseGetMiAutoSugestionFetcher, BaseGetRailLiveDeparturesFetcher, BaseGetRailProvidersFetcher, BaseGetRailStationFetcher, BaseGetRailcardsFetcher, BaseGetRiskAlertsFetcher, BaseGetUserBasketsFetcher, BaseGetUserCompanyOfficesFetcher, BaseGetUserCurrentCarbonAllowanceFetcher, BaseGetUserFavouriteSearchesFetcher, BaseGetUserFetcher, BaseGetUserRecentSearchesFetcher, BaseHelperRoutines, BaseHotelAvalibilityQuoteFetcher, BaseHotelAvalibilityService, BaseHotelQuoteFetcher, BaseHotelRulesFetcher, BaseIrlDiscountCardFetcher, BaseIrlQuoteFetcher, BaseLogonService, BaseLoungeQuoteFetcher, BaseModalOpenerService, BaseNetworkCall, BaseParkingQuoteFetcher, BaseRailQuoteFetcher, BaseRemoveItemFromBasketUpdater, BaseRequiresReasonService, BaseRevalidateBasketUpdater, BaseRouteHappyService, BaseSaveFavouriteSearchUpdater, BaseSaveRecentSearchUpdater, BaseSaveUserAddressUpdater, BaseSearchAirlinesFetcher, BaseSearchAirportsFetcher, BaseSearchCityFetcher, BaseSearchConfermaCityFetcher, BaseSearchConfermaQuicklistFetcher, BaseSearchDepotFetcher, BaseSearchHotelChainsFetcher, BaseSearchIrlStationsFetcher, BaseSearchPostcodeFetcher, BaseSearchRailStationsFetcher, BaseSearchUsersCanBookForFetcher, BaseSendBasketForApprovalUpdater, BaseSendOfflineNotificationFetcher, BaseSetBasketItemLeadPassengerUpdater, BaseSetBasketItemMiGroupUpdater, BaseSetBasketItemMiValueUpdater, BaseSetPaymentOptionUpdater, BaseSetUserLanguageUpdater, BaseStorageService, BaseUpdateBasketNoteUpdater, BaseUpdateBasketTitleUpdater, BaseUserAddressesFetcher, BaseUserMessagesFetcher, BaseUserProductsFetcher, BaseUserService, BaseUserUiConfigsFetcher, BaseValidateIsPostcodeValidTester, BaseValidateMiFreeValueTester, BaseWebTokenService, BasemoveBasketItemToBasket, BasketInfoMiDetailsImpl, BookableBasket, BookingStatus, BreatfastTypes, CabHireEnterpriseSearch, CarCompanies, CarhireEnterpriseSearch, ClassType, DEFAULT_FLIGHT_FILTERS, DistanceType, DocTypes, EurostarClassEnum, EurostarEnterpriseSearch, EurostarSearchType, FlightDirectionEnum, FlightDisplayTypes, FlightEnterpriseSearch, FlightSearchType, FlightSortTypes, Genders, HotelChains, HotelEnterpriseSearch, HotelFilters, HotelPolicyEnum, HotelView, IRLEnterpriseSearch, IncludedType, InternalBasket, IrlDirection, LimitedCache, LocationTypes, LoginError, LoginErrorReason, LogoutEnum, LoungesEnterpriseSearch, MAX_TRAVELLERS, ManagementInfoAndIsValid, Memorise, MenuSlideEnum, ModalTypes, OBTFlightCabinClass, PREFERENCE_VALUES, ParkingEnterpriseSearch, PersonTitles, PhoneNumberImpl, PreferredFlags, RailCompanies, RailDirection, RailEnterpriseSearch, RailJourneyFareType, RailSearchCriteria, RegExps, RiskLevelRanking, SchemaFormat, SearchHandler, ServiceProvider, SortMethod, SortTypesCar, SortTypesEurostar, SortTypesHotel, SortTypesIrl, SupplementaryBookingInfoImpl, Suppliers, TaxiFormMode, TimeWindow, TravellerObject, TravellerSearchTypes, URLS, USER_SIGNEDIN, USER_SIGNEDOUT, UserFavorurite, UserInfoImpl, ValidatorChecker, WellbeingEnum, Widgets, ages, defaultValidations, excludedExpression, filtersKeys, includedExpression, makeManagamentInfo, maxTravellerWellbeing, ɵ0, DistanceTypes as ɵb, DocGender as ɵc, DocType as ɵd, PreferenceKey as ɵf, FetchableList as ɵh, FetchableObject as ɵi, UpdateableObject as ɵj, BaseTester as ɵk };
+export { AbstractHttpCallService, ActionType, AddressImpl, Airlines, AirportSearchMode, AuthInfo, BaseAcceptNewPriceUpdater, BaseAddItemToBasketUpdater, BaseAddUserToBasketItemUpdater, BaseApplyJitFlightRulesFetcher, BaseBookBasketUpdater, BaseCabhireQuoteFetcher, BaseCancelBookingUpdater, BaseCarHireAvailabilityDetailFetcher, BaseCarhireQuoteFetcher, BaseConfermaOfficeFetcher, BaseConfermaOfficeNamesFetcher, BaseConfirmMessagesUpdater, BaseCreateBasketUpdater, BaseCreateGuestUpdater, BaseDeleteBasketUpdater, BaseDeleteFavouriteSearchUpdater, BaseDeleteRecentSearchUpdater, BaseDeleteUserAddressUpdater, BaseEditUserUpdater, BaseEmailBasketFetcher, BaseEnterpriseBasketService, BaseEnterpriseMyBookingsService, BaseEnterpriseSearch, BaseEnterpriseSearchService, BaseEnvironment, BaseEurostarQuoteFetcher, BaseEventMessenager, BaseFastTrackQuoteFetcher, BaseFlightQuoteFetcher, BaseGetAllAirlinesFetcher, BaseGetBasketFetcher, BaseGetCancellationInfoFetcher, BaseGetCarHireProvidersFetcher, BaseGetCompaniesFetcher, BaseGetCompanyFetcher, BaseGetConfermaRoomImagesFetcher, BaseGetCovidMicrositeTokenFetcher, BaseGetFlightFareRulesFetcher, BaseGetFlightSeatMapFetcher, BaseGetHotelChainsFetcher, BaseGetIrlSupplierStationFetcher, BaseGetMiAutoSugestionFetcher, BaseGetRailLiveDeparturesFetcher, BaseGetRailProvidersFetcher, BaseGetRailStationFetcher, BaseGetRailcardsFetcher, BaseGetRiskAlertsFetcher, BaseGetUserBasketsFetcher, BaseGetUserCompanyOfficesFetcher, BaseGetUserCurrentCarbonAllowanceFetcher, BaseGetUserFavouriteSearchesFetcher, BaseGetUserFetcher, BaseGetUserGuestsFetcher, BaseGetUserRecentSearchesFetcher, BaseHelperRoutines, BaseHotelAvalibilityQuoteFetcher, BaseHotelAvalibilityService, BaseHotelQuoteFetcher, BaseHotelRulesFetcher, BaseIrlDiscountCardFetcher, BaseIrlQuoteFetcher, BaseLogonService, BaseLoungeQuoteFetcher, BaseModalOpenerService, BaseNetworkCall, BaseParkingQuoteFetcher, BaseRailQuoteFetcher, BaseRemoveItemFromBasketUpdater, BaseRequiresReasonService, BaseRevalidateBasketUpdater, BaseRouteHappyService, BaseSaveFavouriteSearchUpdater, BaseSaveRecentSearchUpdater, BaseSaveUserAddressUpdater, BaseSearchAirlinesFetcher, BaseSearchAirportsFetcher, BaseSearchCityFetcher, BaseSearchConfermaCityFetcher, BaseSearchConfermaQuicklistFetcher, BaseSearchDepotFetcher, BaseSearchHotelChainsFetcher, BaseSearchIrlStationsFetcher, BaseSearchPostcodeFetcher, BaseSearchRailStationsFetcher, BaseSearchUsersCanBookForFetcher, BaseSendBasketForApprovalUpdater, BaseSendOfflineNotificationFetcher, BaseSetBasketItemLeadPassengerUpdater, BaseSetBasketItemMiGroupUpdater, BaseSetBasketItemMiValueUpdater, BaseSetPaymentOptionUpdater, BaseSetUserLanguageUpdater, BaseStorageService, BaseUpdateBasketNoteUpdater, BaseUpdateBasketTitleUpdater, BaseUserAddressesFetcher, BaseUserMessagesFetcher, BaseUserProductsFetcher, BaseUserService, BaseUserUiConfigsFetcher, BaseValidateIsPostcodeValidTester, BaseValidateMiFreeValueTester, BaseWebTokenService, BasemoveBasketItemToBasket, BasketInfoMiDetailsImpl, BookableBasket, BookingStatus, BreatfastTypes, CabHireEnterpriseSearch, CarCompanies, CarhireEnterpriseSearch, ClassType, DEFAULT_FLIGHT_FILTERS, DifferentInvokdedUserReasons, DistanceType, DocTypes, EurostarClassEnum, EurostarEnterpriseSearch, EurostarSearchType, FlightDirectionEnum, FlightDisplayTypes, FlightEnterpriseSearch, FlightSearchType, FlightSortTypes, Genders, HotelChains, HotelEnterpriseSearch, HotelFilters, HotelPolicyEnum, HotelView, IRLEnterpriseSearch, IncludedType, InternalBasket, IrlDirection, LimitedCache, LocationTypes, LoginError, LoginErrorReason, LogoutEnum, LoungesEnterpriseSearch, MAX_TRAVELLERS, ManagementInfoAndIsValid, Memorise, MenuSlideEnum, ModalTypes, OBTFlightCabinClass, PREFERENCE_VALUES, ParkingEnterpriseSearch, PersonTitles, PhoneNumberImpl, PreferredFlags, RailCompanies, RailDirection, RailEnterpriseSearch, RailJourneyFareType, RailSearchCriteria, RegExps, RiskLevelRanking, SchemaFormat, SearchHandler, ServiceProvider, SortMethod, SortTypesCar, SortTypesEurostar, SortTypesHotel, SortTypesIrl, SupplementaryBookingInfoImpl, Suppliers, TaxiFormMode, TimeWindow, TravellerObject, TravellerSearchTypes, URLS, USER_SIGNEDIN, USER_SIGNEDOUT, UserFavorurite, UserInfoImpl, ValidatorChecker, WellbeingEnum, Widgets, ages, defaultValidations, excludedExpression, filtersKeys, includedAccessibilityExpression, includedExpression, makeManagamentInfo, maxTravellerWellbeing, ɵ0, DistanceTypes as ɵb, DocGender as ɵc, DocType as ɵd, PreferenceKey as ɵf, FetchableList as ɵh, FetchableObject as ɵi, UpdateableObject as ɵj, BaseTester as ɵk };
 //# sourceMappingURL=sabstravtech-obtservices-base.js.map