@sabstravtech/obtservices 0.0.22051001 → 0.0.26051001

package/bundles/sabstravtech-obtservices-base.umd.js

@@ -11,9 +11,10 @@
     var Ajv__default = /*#__PURE__*/_interopDefaultLegacy(Ajv);
 
     var BaseEnterpriseSearch = /** @class */ (function () {
-        function BaseEnterpriseSearch(storageService, helpers) {
+        function BaseEnterpriseSearch(storageService, helpers, searchService) {
             this.storageService = storageService;
             this.helpers = helpers;
+            this.searchService = searchService;
             this._cheapestResultPrice = {
                 amount: null,
                 currencyCode: null
@@ -45,6 +46,11 @@
             enumerable: false,
             configurable: true
         });
+        BaseEnterpriseSearch.prototype.performSearch = function () {
+            this.searchService.search_objects[this.type].chosen = true;
+            this.searchService.determineHighestSearchPriority();
+            this.searchService.startSearches();
+        };
         BaseEnterpriseSearch.prototype.processResults = function (results) {
             return results;
         };
@@ -175,7 +181,8 @@
     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');
 
     var BaseNetworkCall = /** @class */ (function () {
         function BaseNetworkCall(modelService) {
@@ -900,6 +907,11 @@
         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";
@@ -935,7 +947,7 @@
     (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";
@@ -1087,8 +1099,8 @@
                 }
             ];
         };
-        FreeTextManagementInfo.prototype.save = function (basketid, userId) {
-            this.basketService.setMiFreeValue(basketid, this, this.selectedValues[0] ? this.selectedValues[0].freeValue : '', userId);
+        FreeTextManagementInfo.prototype.save = function (basketid, userId, guest) {
+            this.basketService.setMiFreeValue(basketid, this, this.selectedValues[0] ? this.selectedValues[0].freeValue : '', userId, guest);
         };
         FreeTextManagementInfo.prototype.hasErrors = function (value) {
             var _this = this;
@@ -1137,17 +1149,20 @@
             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');
+            }
             return _this;
         }
         AutoSugestManagementInfo.prototype.getValue = function () {
             return this.selectedValues[0] ? this.selectedValues[0].value.id : '__NONE';
         };
-        AutoSugestManagementInfo.prototype.hasErrors = function (id) {
+        AutoSugestManagementInfo.prototype.hasErrors = function (value) {
             return __awaiter(this, void 0, void 0, function () {
-                return __generator(this, function (_b) {
+                return __generator(this, function (_c) {
                     try {
                         return [2 /*return*/, !this.avaliableItems.find(function (value1) {
-                                return value1.id === id;
+                                return value1.id === value.id;
                             })
                                 ? { hasErrors: true }
                                 : null];
@@ -1188,8 +1203,9 @@
                 this.selectedValues = [];
             }
         };
-        AutoSugestManagementInfo.prototype.save = function (basketid, userid) {
-            this.basketService.setMiSelectedValue(basketid, this, this.selectedValues[0].value.id, userid);
+        AutoSugestManagementInfo.prototype.save = function (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);
         };
         return AutoSugestManagementInfo;
     }(ManagementInfoAndIsValid));
@@ -1229,7 +1245,7 @@
         };
         DropdownManagementInfo.prototype.hasErrors = function (id) {
             return __awaiter(this, void 0, void 0, function () {
-                return __generator(this, function (_b) {
+                return __generator(this, function (_c) {
                     try {
                         return [2 /*return*/, !this.avaliableItems.find(function (value1) {
                                 return value1.id === id;
@@ -1268,8 +1284,8 @@
                 this.selectedValues = [];
             }
         };
-        DropdownManagementInfo.prototype.save = function (basketid, userid) {
-            this.basketService.setMiSelectedValue(basketid, this, this.selectedValues[0].value.id, userid);
+        DropdownManagementInfo.prototype.save = function (basketid, userid, guest) {
+            this.basketService.setMiSelectedValue(basketid, this, this.selectedValues[0].value.id || '', userid, guest);
         };
         return DropdownManagementInfo;
     }(ManagementInfoAndIsValid));
@@ -1324,7 +1340,20 @@
                 };
                 return userAccum;
             }, {});
+            this.miPerGuest = item.guests.reduce(function (userAccum, user) {
+                userAccum[user.id] = {
+                    managementInfo: _this.helpers
+                        .clone(perUser)
+                        .map(function (miItem) {
+                        var 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);
         }
         return BasketInfoMiDetailsImpl;
     }());
@@ -1370,6 +1399,7 @@
         BookingStatus[BookingStatus["ApprovedBook"] = 13] = "ApprovedBook";
         BookingStatus[BookingStatus["PartiallyBooked"] = 14] = "PartiallyBooked";
         BookingStatus[BookingStatus["Complete"] = 15] = "Complete";
+        BookingStatus[BookingStatus["Expired"] = 16] = "Expired";
     })(exports.BookingStatus || (exports.BookingStatus = {}));
     (function (SchemaFormat) {
         SchemaFormat["array"] = "array";
@@ -1450,10 +1480,18 @@
         'Breakfast Costs',
         'no breakfast'
     ];
+    var AccessibleIncluded = [
+        'Accessibility',
+        'Accessible and Disabled',
+        'Accessible',
+        'Disabled'
+    ];
     var excludedPattern = '(' + BreakBastExcluded.join(')|(') + ')';
     var includedPattern = '(' + BreakFastIncluded.join(')|(') + ')';
+    var includedAccessibilityPattern = '(' + AccessibleIncluded.join(')|(') + ')';
     var includedExpression = new RegExp(includedPattern, 'i');
     var excludedExpression = new RegExp(excludedPattern, 'i');
+    var includedAccessibilityExpression = new RegExp(includedAccessibilityPattern, 'i');
     (function (SearchHandler) {
         SearchHandler["AVAILABILITY"] = "Availability";
         SearchHandler["FEMALE_FRIENDLY"] = "SOLO Female Friendly";
@@ -1487,7 +1525,8 @@
         extra: 'extra',
         hotelName: 'hotelName',
         priceRange: 'priceRange',
-        breakfastType: 'breakfastType'
+        breakfastType: 'breakfastType',
+        accessibleRoomType: 'accessibleRoomType'
     };
     (function (ServiceProvider) {
         ServiceProvider["Confirma"] = "Conferma";
@@ -1529,20 +1568,20 @@
         { label: 'Raw Vegeterian', type: exports.ɵf.MealRequest },
         { label: 'Seafood', type: exports.ɵf.MealRequest },
         { label: 'Vegan Vegeterian', type: exports.ɵf.MealRequest },
-        { label: 'Vegeterain Lacto-Ovo', type: exports.ɵf.MealRequest },
+        { label: 'Vegeterian Lacto-Ovo', type: exports.ɵf.MealRequest },
         { label: 'Aisle', type: exports.ɵf.SeatingPreference },
         { label: 'Window', type: exports.ɵf.SeatingPreference },
-        { label: 'Bassinet', type: exports.ɵf.SpeacialNeed },
-        { label: 'Bicycle', type: exports.ɵf.SpeacialNeed },
-        { label: 'Blind passenger', type: exports.ɵf.SpeacialNeed },
-        { label: 'Deaf passenger', type: exports.ɵf.SpeacialNeed },
-        { label: 'Meet and assist', type: exports.ɵf.SpeacialNeed },
-        { label: 'Wheelchair, can ascend steps', type: exports.ɵf.SpeacialNeed },
-        { label: 'Wheelchair, can walk to seat', type: exports.ɵf.SpeacialNeed },
-        { label: 'Wheelchair, manual', type: exports.ɵf.SpeacialNeed },
-        { label: 'Wheelchair, must be carried', type: exports.ɵf.SpeacialNeed },
-        { label: 'Wheelchair, with dry battery', type: exports.ɵf.SpeacialNeed },
-        { label: 'Wheelchair, with wet battery', type: exports.ɵf.SpeacialNeed },
+        { label: 'Bassinet', type: exports.ɵf.SpecialNeed },
+        { label: 'Bicycle', type: exports.ɵf.SpecialNeed },
+        { label: 'Blind passenger', type: exports.ɵf.SpecialNeed },
+        { label: 'Deaf passenger', type: exports.ɵf.SpecialNeed },
+        { label: 'Meet and assist', type: exports.ɵf.SpecialNeed },
+        { label: 'Wheelchair, can ascend steps', type: exports.ɵf.SpecialNeed },
+        { label: 'Wheelchair, can walk to seat', type: exports.ɵf.SpecialNeed },
+        { label: 'Wheelchair, manual', type: exports.ɵf.SpecialNeed },
+        { label: 'Wheelchair, must be carried', type: exports.ɵf.SpecialNeed },
+        { label: 'Wheelchair, with dry battery', type: exports.ɵf.SpecialNeed },
+        { label: 'Wheelchair, with wet battery', type: exports.ɵf.SpecialNeed },
         { label: 'Quiet', type: exports.ɵf.SeatLocation },
         { label: 'Business', type: exports.ɵf.SeatLocation },
         { label: 'Family', type: exports.ɵf.SeatLocation },
@@ -3201,7 +3240,13 @@
         { label: 'Zimex Aviation', value: 'C4' },
         { label: 'Zoom Airlines', value: 'Z4' },
         { label: 'Zuliana De Aviacion', value: 'OD' }
-    ];
+    ];
+    (function (DifferentInvokdedUserReasons) {
+        DifferentInvokdedUserReasons[DifferentInvokdedUserReasons["continue"] = 0] = "continue";
+        DifferentInvokdedUserReasons[DifferentInvokdedUserReasons["newBasket"] = 1] = "newBasket";
+        DifferentInvokdedUserReasons[DifferentInvokdedUserReasons["cancel"] = 2] = "cancel";
+        DifferentInvokdedUserReasons[DifferentInvokdedUserReasons["research"] = 3] = "research";
+    })(exports.DifferentInvokdedUserReasons || (exports.DifferentInvokdedUserReasons = {}));
 
     var BookableBasket = /** @class */ (function () {
         function BookableBasket(basketService, helpers) {
@@ -3243,7 +3288,13 @@
             this.basketService.subsribeToBasket(id, {
                 next: function (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(exports.BookingStatus.Expired);
+                    }
+                    else {
+                        _this.updateBasket(basket);
+                    }
                 },
                 error: function (error) {
                     _this.basket.error(error);
@@ -3255,6 +3306,14 @@
                 }
             });
         };
+        BookableBasket.prototype.expiredItemInTheBasket = function () {
+            this.isUpdating.next(false);
+            var expiredItemInTheBasket;
+            this.basket.subscribe(function (basket) {
+                expiredItemInTheBasket = basket.basketItems.some(function (item) { return item.expired; });
+            });
+            return expiredItemInTheBasket;
+        };
         BookableBasket.prototype.updateBasket = function (basket) {
             this.isUpdating.next(false);
             switch (basket.status) {
@@ -3423,16 +3482,18 @@
         };
         BookableBasket.prototype._splitTravellers = function (basketItem) {
             var _this = this;
-            return (basketItem.userPassengerTypes || []).reduce(function (accum, user, index) {
+            return (basketItem.userPassengerTypes.concat(basketItem.guestPassengerTypes) || []).reduce(function (accum, user, index) {
+                var userPassenger = _this._findUser(basketItem.users, Number(user.id));
+                var 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;
@@ -3443,6 +3504,11 @@
                 return Number(user.id) === id;
             });
         };
+        BookableBasket.prototype._findGuest = function (users, id) {
+            return users.find(function (user) {
+                return Number(user.id) === id;
+            });
+        };
         BookableBasket.prototype.getId = function () {
             return this.id;
         };
@@ -3531,9 +3597,13 @@
     var LOUNGES_MAX_INFANT_AGE_YEARS = 0;
     var METRES_TO_MILES_CONVERSION = 1609;
     var TIME_BASE = 60;
+    var GROUP_TICKET_CODES = ['GS', 'AIG', 'GRP', 'GU3', 'GU4', 'GUC', 'MPG', '2TR', 'SGU'];
     var BaseHelperRoutines = /** @class */ (function () {
         function BaseHelperRoutines() {
         }
+        BaseHelperRoutines.prototype.isGroupTicket = function (code) {
+            return GROUP_TICKET_CODES.includes(code.toUpperCase().trim());
+        };
         BaseHelperRoutines.prototype.minToHour = function (dur) {
             return Math.floor(dur / 60) + "h " + dur % 60 + "m";
         };
@@ -4259,7 +4329,14 @@
                     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;
             }
         };
@@ -4314,13 +4391,18 @@
                     return miItem.isValid();
                 }));
         };
-        BaseHelperRoutines.prototype.isMiValid = function (miPerItem, miPerUser) {
+        BaseHelperRoutines.prototype.isMiValid = function (miPerItem, miPerUser, miPerGuest) {
             var _this = this;
             var userMis = Object.values(miPerUser || {});
+            var guestMis = Object.values(miPerGuest || {});
             return (this.miIsValid(miPerItem) &&
                 (userMis.length === 0 ||
                     !!userMis.find(function (userMis1) {
                         return _this.miIsValid(userMis1.managementInfo);
+                    })) &&
+                (guestMis.length === 0 ||
+                    !!guestMis.find(function (userMis1) {
+                        return _this.miIsValid(userMis1.managementInfo);
                     })));
         };
         BaseHelperRoutines.prototype.needsMi = function (basket, needsToViewMi) {
@@ -4328,7 +4410,7 @@
             return (basket.basketInfoMiDetails.length > 0 &&
                 (needsToViewMi ||
                     !basket.basketInfoMiDetails.find(function (miDetail) {
-                        return _this.isMiValid(miDetail.miPerItem, miDetail.miPerUser);
+                        return _this.isMiValid(miDetail.miPerItem, miDetail.miPerUser, miDetail.miPerGuest);
                     })));
         };
         BaseHelperRoutines.prototype.findService = function (services, id) {
@@ -4967,9 +5049,8 @@
     var CabHireEnterpriseSearch = /** @class */ (function (_super) {
         __extends(CabHireEnterpriseSearch, _super);
         function CabHireEnterpriseSearch(cabfetcher, helpers, storageService, searchService, basketService) {
-            var _this = _super.call(this, storageService, helpers) || this;
+            var _this = _super.call(this, storageService, helpers, searchService) || this;
             _this.cabfetcher = cabfetcher;
-            _this.searchService = searchService;
             _this.basketService = basketService;
             _this.type = ServiceType.Cab;
             _this.airportChange = new rxjs.Subject();
@@ -5558,8 +5639,12 @@
                 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
@@ -5646,13 +5731,13 @@
                     'administrative_area_level_2',
                     'locality'
                 ]),
-                PostCode: this.getAddressFromPlaceDetails(location, ['postal_code']),
+                PostCode: this.getAddressFromPlaceDetails(location, ['postcode']),
                 Country: this.getAddressFromPlaceDetails(location, ['country']),
                 placeDescription: placeDescription
             };
         };
         CabHireEnterpriseSearch.prototype.getAddressFromPlaceDetails = function (placeDetails, types) {
-            var e_1, _b;
+            var e_1, _e;
             var addressProp = null;
             if (placeDetails && Array.isArray(placeDetails)) {
                 var _loop_1 = function (type) {
@@ -5675,7 +5760,7 @@
                 catch (e_1_1) { e_1 = { error: e_1_1 }; }
                 finally {
                     try {
-                        if (types_1_1 && !types_1_1.done && (_b = types_1.return)) _b.call(types_1);
+                        if (types_1_1 && !types_1_1.done && (_e = types_1.return)) _e.call(types_1);
                     }
                     finally { if (e_1) throw e_1.error; }
                 }
@@ -5730,6 +5815,48 @@
                 // TODO flights haven't been done yet.
             }
         };
+        CabHireEnterpriseSearch.prototype.updateSearchFromExpiredBasketItem = function (basketItem) {
+            var _this = this;
+            var _a, _b, _c, _d;
+            var searchCabHireQuery = basketItem.searchQuery;
+            if (searchCabHireQuery) {
+                this.departs = moment__default['default'](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) {
+                    var 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);
+                    }
+                    var 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(function (user) {
+                    _this.searchService.addTraveller(user);
+                });
+            }
+        };
+        CabHireEnterpriseSearch.prototype.convertAddressLocation = function (address, postcode) {
+            var locationArray = address.split(',');
+            var street = '';
+            var town = locationArray[locationArray.length - 2];
+            for (var index = 1; index < locationArray.length - 2; index++) {
+                street += locationArray[index] + ' ';
+            }
+            return {
+                Country: address.slice(-2),
+                House: locationArray[0],
+                PostCode: postcode,
+                Street: street,
+                Town: town
+            };
+        };
         CabHireEnterpriseSearch.prototype.getTransType = function () {
             var _a;
             var transTypeIndex = this.tempParams.vehicleType;
@@ -5737,54 +5864,59 @@
         };
         CabHireEnterpriseSearch.prototype.addCabHireToBasket = function (cabHireQuote, cabHireQuery) {
             return __awaiter(this, void 0, void 0, function () {
-                var intBasket, basket, termsAndConditions;
-                return __generator(this, function (_b) {
-                    switch (_b.label) {
+                var intBasket, basket, termsAndConditions, whatHappened;
+                return __generator(this, function (_e) {
+                    switch (_e.label) {
                         case 0:
                             if (cabHireQuote.unavailable) {
-                                return [2 /*return*/, Promise.resolve(false)];
+                                return [2 /*return*/, Promise.resolve(exports.DifferentInvokdedUserReasons.cancel)];
                             }
                             return [4 /*yield*/, this.basketService.getDefaultBasket()];
                         case 1:
-                            intBasket = _b.sent();
+                            intBasket = _e.sent();
                             basket = intBasket === null || intBasket === void 0 ? void 0 : intBasket.subject.value;
                             termsAndConditions = this.getTermsAndCond(cabHireQuote);
-                            if (basket) {
-                                return [2 /*return*/, this.basketService.addToBasket({
-                                        adults: cabHireQuery.adults,
-                                        basket: basket.id,
-                                        service: cabHireQuote.sourceId.toString(),
-                                        detail: {
-                                            id: cabHireQuote.id,
-                                            departs: cabHireQuote.departs,
-                                            supplierName: cabHireQuote.supplierName,
-                                            estimatedCO2: cabHireQuote.estimatedCO2,
-                                            fromLocation: {
-                                                address: cabHireQuery.fromLocation.address,
-                                                postcode: cabHireQuery.fromLocation.postcode,
-                                                latitude: cabHireQuote.fromLocation.latitude,
-                                                longitude: cabHireQuote.fromLocation.longitude
-                                            },
-                                            toLocation: {
-                                                address: cabHireQuery.toLocation.address,
-                                                postcode: cabHireQuery.toLocation.postcode,
-                                                latitude: cabHireQuote.toLocation.latitude,
-                                                longitude: cabHireQuote.toLocation.longitude
-                                            },
-                                            vehicleType: cabHireQuery.vehicleType,
-                                            tripDistanceMetres: cabHireQuote.tripDistanceMetres,
-                                            tripDurationSeconds: cabHireQuote.tripDurationSeconds,
-                                            termsAndCond: termsAndConditions
+                            if (!basket) return [3 /*break*/, 3];
+                            return [4 /*yield*/, this.basketService.addToBasket({
+                                    adults: cabHireQuery.adults,
+                                    basket: basket.id,
+                                    service: cabHireQuote.sourceId.toString(),
+                                    detail: {
+                                        id: cabHireQuote.id,
+                                        departs: cabHireQuote.departs,
+                                        supplierName: cabHireQuote.supplierName,
+                                        estimatedCO2: cabHireQuote.estimatedCO2,
+                                        fromLocation: {
+                                            address: cabHireQuery.fromLocation.address,
+                                            postcode: cabHireQuery.fromLocation.postcode,
+                                            latitude: cabHireQuote.fromLocation.latitude,
+                                            longitude: cabHireQuote.fromLocation.longitude
+                                        },
+                                        toLocation: {
+                                            address: cabHireQuery.toLocation.address,
+                                            postcode: cabHireQuery.toLocation.postcode,
+                                            latitude: cabHireQuote.toLocation.latitude,
+                                            longitude: cabHireQuote.toLocation.longitude
                                         },
-                                        price: cabHireQuote.price,
-                                        currency: cabHireQuote.currency,
-                                        searchQuery: cabHireQuery,
-                                        co2PerItem: cabHireQuote.co2PerItem,
-                                        co2PerPassenger: cabHireQuote.co2PerPassenger,
-                                        outboundDate: cabHireQuery.departs.format()
-                                    }, intBasket, this.searchService, this.travellers, cabHireQuote.requiresReason)];
+                                        vehicleType: cabHireQuery.vehicleType,
+                                        tripDistanceMetres: cabHireQuote.tripDistanceMetres,
+                                        tripDurationSeconds: cabHireQuote.tripDurationSeconds,
+                                        termsAndCond: termsAndConditions
+                                    },
+                                    price: cabHireQuote.price,
+                                    currency: cabHireQuote.currency,
+                                    searchQuery: cabHireQuery,
+                                    co2PerItem: cabHireQuote.co2PerItem,
+                                    co2PerPassenger: cabHireQuote.co2PerPassenger,
+                                    outboundDate: cabHireQuery.departs.format()
+                                }, intBasket, this.searchService, this.travellers, cabHireQuote.requiresReason)];
+                        case 2:
+                            whatHappened = _e.sent();
+                            if (whatHappened === exports.DifferentInvokdedUserReasons.research) {
+                                this.performSearch();
                             }
-                            return [2 /*return*/, Promise.resolve(false)]; // TODO should this throw an error?
+                            return [2 /*return*/, whatHappened];
+                        case 3: return [2 /*return*/, exports.DifferentInvokdedUserReasons.cancel];
                     }
                 });
             });
@@ -5838,14 +5970,20 @@
         CabHireEnterpriseSearch.prototype.applyFavourite = function (fav) {
             return __awaiter(this, void 0, void 0, function () {
                 var _this = this;
-                return __generator(this, function (_b) {
+                return __generator(this, function (_e) {
                     if (fav.fromLocation.Street && fav.toLocation.Street) {
                         this.mode = exports.TaxiFormMode.ADDRESS;
                     }
                     else {
                         this.mode = exports.TaxiFormMode.STATION;
-                        this.airportSearchType = fav.fromLocation.Street ? exports.AirportSearchMode.DROPOFF : exports.AirportSearchMode.PICKUP;
-                        this.searchService.getAirportsList(!fav.fromLocation.Street ? fav.fromLocation.House : fav.toLocation.House).subscribe(function (airport) {
+                        this.airportSearchType = fav.fromLocation.Street
+                            ? exports.AirportSearchMode.DROPOFF
+                            : exports.AirportSearchMode.PICKUP;
+                        this.searchService
+                            .getAirportsList(!fav.fromLocation.Street
+                            ? fav.fromLocation.House
+                            : fav.toLocation.House)
+                            .subscribe(function (airport) {
                             _this.airport = airport[0];
                         });
                     }
@@ -5889,11 +6027,10 @@
         __extends(CarhireEnterpriseSearch, _super);
         // ! - End of getters and setters
         function CarhireEnterpriseSearch(carhirefetcher, carHireAvailabilityDetailFetcher, helpers, basketService, storageService, searchService) {
-            var _this = _super.call(this, storageService, helpers) || this;
+            var _this = _super.call(this, storageService, helpers, searchService) || this;
             _this.carhirefetcher = carhirefetcher;
             _this.carHireAvailabilityDetailFetcher = carHireAvailabilityDetailFetcher;
             _this.basketService = basketService;
-            _this.searchService = searchService;
             // ! - Hardcoded Data
             _this._carTypeCodes = [
                 ['B', '2-3 Door', CarHireType.TwoToThreeDoor],
@@ -6751,21 +6888,21 @@
             this.dropoff_datetime = moment__default['default'](recentSearch.searchArgs.dropoffDateTime);
             this.pickup_datetime = moment__default['default'](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);
             }
         };
-        CarhireEnterpriseSearch.prototype.getParamsForCarbyAirport = function (recentSearch) {
+        CarhireEnterpriseSearch.prototype.getParamsForCarbyAirport = function (airport) {
             var _this = this;
             this.locationType = exports.LocationTypes.Airport;
             rxjs.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(function (_o) {
                 var _p = __read(_o, 2), departLocation = _p[0], arriveLocation = _p[1];
                 var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
@@ -6792,73 +6929,73 @@
                 }
             });
         };
-        CarhireEnterpriseSearch.prototype.getParamsForCarbyCity = function (recentSearch) {
+        CarhireEnterpriseSearch.prototype.getParamsForCarbyCity = function (city) {
             this.locationType = exports.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: exports.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: exports.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();
         };
-        CarhireEnterpriseSearch.prototype.getParamsForCarbyPostCode = function (recentSearch) {
+        CarhireEnterpriseSearch.prototype.getParamsForCarbyPostCode = function (depot) {
             this.locationType = exports.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: exports.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: exports.LocationTypes.Postcode,
-                latitude: recentSearch.searchArgs.depot.pickupLatitude,
-                longitude: recentSearch.searchArgs.depot.pickupLongitude
+                latitude: depot.pickupLatitude,
+                longitude: depot.pickupLongitude
             };
             this.searchService.startSearches();
         };
@@ -7151,6 +7288,47 @@
                 return max;
             }, Number.MIN_SAFE_INTEGER);
         };
+        CarhireEnterpriseSearch.prototype.updateSearchFromExpiredBasketItem = function (basketItem) {
+            var _this = this;
+            var 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__default['default'](searchCarHireQuery.dropoffDateTime);
+                this.pickup_datetime = moment__default['default'](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(function (user) {
+                    _this.searchService.addTraveller(user);
+                });
+            }
+        };
+        CarhireEnterpriseSearch.prototype.updateSearchForCarbyPostCode = function (depot, detail) {
+            this.locationType = exports.LocationTypes.Postcode;
+            this.chosenDistance = depot.chosenDistance;
+            this.postcodeDropoffRaw = {
+                name: detail.dropOffLocation.postcode,
+                type: exports.LocationTypes.Postcode
+            };
+            this.postcodePickupRaw = {
+                name: detail.pickUpLocation.postcode,
+                type: exports.LocationTypes.Postcode
+            };
+        };
         CarhireEnterpriseSearch.prototype.updateFromPreviousSearches = function (previousItems) {
             var _a;
             console.log('PREPOPULATING CARHIRE FORM');
@@ -7258,67 +7436,72 @@
         CarhireEnterpriseSearch.prototype.addCarHireToBasket = function (carHireVehicleAvailibility, carHireQuery) {
             var _a, _b;
             return __awaiter(this, void 0, void 0, function () {
-                var intBasket, basket, co2PerItem, co2PerPassenger, displayRecord, identifiers, sourceId, price, termsAndConditions;
+                var intBasket, basket, co2PerItem, co2PerPassenger, displayRecord, identifiers, sourceId, price, termsAndConditions, whatHappened;
                 return __generator(this, function (_o) {
                     switch (_o.label) {
                         case 0:
                             if (carHireVehicleAvailibility.unavailable) {
-                                return [2 /*return*/, Promise.resolve(false)];
+                                return [2 /*return*/, Promise.resolve(exports.DifferentInvokdedUserReasons.cancel)];
                             }
                             return [4 /*yield*/, this.basketService.getDefaultBasket()];
                         case 1:
                             intBasket = _o.sent();
                             basket = intBasket === null || intBasket === void 0 ? void 0 : intBasket.subject.value;
-                            if (basket) {
-                                co2PerItem = carHireVehicleAvailibility.co2PerItem, co2PerPassenger = carHireVehicleAvailibility.co2PerPassenger, displayRecord = carHireVehicleAvailibility.displayRecord, identifiers = carHireVehicleAvailibility.identifiers, sourceId = carHireVehicleAvailibility.sourceId;
-                                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');
-                                termsAndConditions = this.getTermsAndCond(carHireVehicleAvailibility, carHireQuery);
-                                return [2 /*return*/, this.basketService.addToBasket({
-                                        adults: this.adults,
-                                        basket: basket.id,
-                                        service: sourceId.toString(),
-                                        detail: {
-                                            pickUpDatetime: displayRecord.pickup,
-                                            dropOffDatetime: displayRecord.dropoff,
-                                            pickUpLocation: {
-                                                iata: this.locationType === exports.LocationTypes.Airport
-                                                    ? identifiers.locationCode
-                                                    : '',
-                                                name: displayRecord.pickupLocation.name,
-                                                address: displayRecord.pickupLocation.topLine + ", " + displayRecord.pickupLocation.city,
-                                                postcode: displayRecord.pickupLocation.postCode
-                                            },
-                                            dropOffLocation: {
-                                                iata: this.locationType === exports.LocationTypes.Airport
-                                                    ? identifiers.dropOffLocation
-                                                    : '',
-                                                name: displayRecord.returnLocation.name,
-                                                address: displayRecord.returnLocation.topLine + ", " + displayRecord.returnLocation.city,
-                                                postcode: displayRecord.returnLocation.postCode
-                                            },
-                                            car: {
-                                                type: displayRecord.vehicle.type,
-                                                manualTransmission: displayRecord.vehicle.transmission.includes(CarHireTransmission.Manual)
-                                            },
-                                            vendorName: displayRecord.vendor.name,
-                                            identifiers: {
-                                                dropOffLocation: identifiers.dropOffLocation,
-                                                locationCode: identifiers.locationCode,
-                                                locationName: identifiers.locationName,
-                                                vehType: identifiers.vehType,
-                                                vendor: identifiers.vendor
-                                            },
-                                            termsAndCond: termsAndConditions
+                            if (!basket) return [3 /*break*/, 3];
+                            co2PerItem = carHireVehicleAvailibility.co2PerItem, co2PerPassenger = carHireVehicleAvailibility.co2PerPassenger, displayRecord = carHireVehicleAvailibility.displayRecord, identifiers = carHireVehicleAvailibility.identifiers, sourceId = carHireVehicleAvailibility.sourceId;
+                            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');
+                            termsAndConditions = this.getTermsAndCond(carHireVehicleAvailibility, carHireQuery);
+                            return [4 /*yield*/, this.basketService.addToBasket({
+                                    adults: this.adults,
+                                    basket: basket.id,
+                                    service: sourceId.toString(),
+                                    detail: {
+                                        pickUpDatetime: displayRecord.pickup,
+                                        dropOffDatetime: displayRecord.dropoff,
+                                        pickUpLocation: {
+                                            iata: this.locationType === exports.LocationTypes.Airport
+                                                ? identifiers.locationCode
+                                                : '',
+                                            name: displayRecord.pickupLocation.name,
+                                            address: displayRecord.pickupLocation.topLine + ", " + displayRecord.pickupLocation.city,
+                                            postcode: displayRecord.pickupLocation.postCode
+                                        },
+                                        dropOffLocation: {
+                                            iata: this.locationType === exports.LocationTypes.Airport
+                                                ? identifiers.dropOffLocation
+                                                : '',
+                                            name: displayRecord.returnLocation.name,
+                                            address: displayRecord.returnLocation.topLine + ", " + displayRecord.returnLocation.city,
+                                            postcode: displayRecord.returnLocation.postCode
                                         },
-                                        price: price,
-                                        currency: 'GBP',
-                                        searchQuery: carHireQuery,
-                                        co2PerItem: co2PerItem,
-                                        co2PerPassenger: co2PerPassenger,
-                                        outboundDate: new Date(displayRecord.pickup).toISOString()
-                                    }, intBasket, this.searchService, this.travellers, carHireVehicleAvailibility.requiresReason)];
+                                        car: {
+                                            type: displayRecord.vehicle.type,
+                                            manualTransmission: displayRecord.vehicle.transmission.includes(CarHireTransmission.Manual)
+                                        },
+                                        vendorName: displayRecord.vendor.name,
+                                        identifiers: {
+                                            dropOffLocation: identifiers.dropOffLocation,
+                                            locationCode: identifiers.locationCode,
+                                            locationName: identifiers.locationName,
+                                            vehType: identifiers.vehType,
+                                            vendor: identifiers.vendor
+                                        },
+                                        termsAndCond: termsAndConditions
+                                    },
+                                    price: price,
+                                    currency: 'GBP',
+                                    searchQuery: carHireQuery,
+                                    co2PerItem: co2PerItem,
+                                    co2PerPassenger: co2PerPassenger,
+                                    outboundDate: new Date(displayRecord.pickup).toISOString()
+                                }, intBasket, this.searchService, this.travellers, carHireVehicleAvailibility.requiresReason)];
+                        case 2:
+                            whatHappened = _o.sent();
+                            if (whatHappened === exports.DifferentInvokdedUserReasons.research) {
+                                this.performSearch();
                             }
-                            return [2 /*return*/, Promise.resolve(false)];
+                            return [2 /*return*/, whatHappened];
+                        case 3: return [2 /*return*/, Promise.resolve(exports.DifferentInvokdedUserReasons.cancel)];
                     }
                 });
             });
@@ -7410,11 +7593,15 @@
                     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(function (results) {
+                    this.searchService
+                        .getAirportsList(fav.airport.pickupCode)
+                        .subscribe(function (results) {
                         _this.pickup_location = results.find(function (a) { return a.gateway == fav.airport.pickupCode; });
                     });
                     if (!this.return_to_pickup)
-                        this.searchService.getAirportsList(fav.airport.dropoffCode).subscribe(function (results) {
+                        this.searchService
+                            .getAirportsList(fav.airport.dropoffCode)
+                            .subscribe(function (results) {
                             _this.dropoff_location = results.find(function (a) { return a.gateway == fav.airport.dropoffCode; });
                         });
                     return [2 /*return*/];
@@ -7553,11 +7740,10 @@
         __extends(FlightEnterpriseSearch, _super);
         function FlightEnterpriseSearch(flightfetcher, helpers, userService, basketService, storageService, searchService, applyFlightRules, modalService) {
             var _o, _p;
-            var _this = _super.call(this, storageService, helpers) || this;
+            var _this = _super.call(this, storageService, helpers, searchService) || this;
             _this.flightfetcher = flightfetcher;
             _this.userService = userService;
             _this.basketService = basketService;
-            _this.searchService = searchService;
             _this.applyFlightRules = applyFlightRules;
             _this.modalService = modalService;
             _this.type = ServiceType.Flight;
@@ -8264,6 +8450,7 @@
                     inlegsCount: 0,
                     dataSource: '',
                     preferred: false,
+                    preferredMessage: '',
                     outboundFlightNumber: '',
                     operator: '',
                     operatorFull: '',
@@ -8284,7 +8471,7 @@
                     }
                     // ! using a reduce because not all flights actually exist and we were seeing undefined in the flight list
                     brands[brand].forEach(function (flightNum) {
-                        var _a, _b;
+                        var _a, _b, _c, _d, _e, _f;
                         var flight = groupedObject[flightNum];
                         if (flight) {
                             if (isOutBound || treatOutboundsAsOutbounds) {
@@ -8304,7 +8491,13 @@
                                 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);
@@ -8706,6 +8899,103 @@
         FlightEnterpriseSearch.prototype.updateFromPreviousSearches = function (_previousItems) {
             // Flights can not be search after other products so no defaults can be set.
         };
+        FlightEnterpriseSearch.prototype.updateSearchFromExpiredBasketItem = function (basketItem) {
+            var _this = this;
+            var searchFlightsQuery = basketItem.searchQuery;
+            if (searchFlightsQuery.outboundDate) {
+                var outboundTimeWindow = searchFlightsQuery.outboundDepartureTimeWindow
+                    ? searchFlightsQuery.outboundDepartureTimeWindow
+                    : searchFlightsQuery.outboundArrivalTimeWindow;
+                this.outBoundDate = this.convertRecentSearchDateTime(searchFlightsQuery.outboundDate, outboundTimeWindow);
+            }
+            if (searchFlightsQuery.returnDate) {
+                var 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
+                ? exports.FlightSearchType.return
+                : exports.FlightSearchType.oneWay;
+            if (searchFlightsQuery.outboundDepartureTimeWindow) {
+                this.outTimeCriteria = exports.TimeWindow.Depart;
+            }
+            else if (searchFlightsQuery.outboundArrivalTimeWindow) {
+                this.outTimeCriteria = exports.TimeWindow.Arrive;
+            }
+            else {
+                this.outTimeCriteria = exports.TimeWindow.Anytime;
+            }
+            if (searchFlightsQuery.returnDepartureTimeWindow) {
+                this.inTimeCriteria = exports.TimeWindow.Depart;
+            }
+            else if (searchFlightsQuery.returnArrivalTimeWindow) {
+                this.inTimeCriteria = exports.TimeWindow.Arrive;
+            }
+            else {
+                this.inTimeCriteria = exports.TimeWindow.Anytime;
+            }
+            rxjs.combineLatest([
+                this.searchService.getAirportByCode(searchFlightsQuery.originAirport),
+                this.searchService.getAirportByCode(searchFlightsQuery.destinationAirport)
+            ]).subscribe(function (_o) {
+                var _p = __read(_o, 2), departLocation = _p[0], arriveLocation = _p[1];
+                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) {
+                        var carriers = searchFlightsQuery.preferredCarriers;
+                        var preferredCarriers_2 = [];
+                        carriers.map(function (preferredCarry) {
+                            _this.searchService
+                                .getAirlinesList(preferredCarry)
+                                .subscribe(function (items) {
+                                items.map(function (item) {
+                                    if (item.code === preferredCarry) {
+                                        preferredCarriers_2.push(item);
+                                    }
+                                });
+                                _this.preferredCarriers = preferredCarriers_2;
+                            });
+                        });
+                    }
+                }
+            });
+            // add Travellers
+            if (basketItem.users) {
+                basketItem.users.forEach(function (user) {
+                    _this.searchService.addTraveller(user);
+                });
+            }
+        };
         FlightEnterpriseSearch.prototype.getTotalBaggage = function (result) {
             var total = 0;
             var parsedAdditional = JSON.parse(result.additional);
@@ -8945,21 +9235,30 @@
                         })));
             };
             var selectedRuleSummary = this._ruleActionSummary.dualSingleWhenSelected[(_b = this.selectedGroupFlight) === null || _b === void 0 ? void 0 : _b.journeyHash] || {};
+            var hasField = function (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);
+            };
             var setSelected = function (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)) {
@@ -9160,24 +9459,38 @@
             }, selectedFlight.outboundFlights[0].dateTimeDeparting);
         };
         FlightEnterpriseSearch.prototype.doBooking = function (intBasket, selectedFlight, schemaDetails, outboundDate, inboundDate) {
-            var sourceId = selectedFlight.sourceId, co2PerItem = selectedFlight.co2PerItem, co2PerPassenger = selectedFlight.co2PerPassenger, total = selectedFlight.total;
-            var booking = {
-                adults: this.adults,
-                basket: intBasket.id,
-                children: this.children,
-                co2PerItem: co2PerItem,
-                co2PerPassenger: co2PerPassenger,
-                currency: total.currency,
-                detail: schemaDetails,
-                price: total.price,
-                searchQuery: this.resultQuery,
-                service: sourceId.toString(),
-                outboundDate: 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 () {
+                var sourceId, co2PerItem, co2PerPassenger, total, booking, whatHappened;
+                return __generator(this, function (_o) {
+                    switch (_o.label) {
+                        case 0:
+                            sourceId = selectedFlight.sourceId, co2PerItem = selectedFlight.co2PerItem, co2PerPassenger = selectedFlight.co2PerPassenger, total = selectedFlight.total;
+                            booking = {
+                                adults: this.adults,
+                                basket: intBasket.id,
+                                children: this.children,
+                                co2PerItem: co2PerItem,
+                                co2PerPassenger: co2PerPassenger,
+                                currency: total.currency,
+                                detail: schemaDetails,
+                                price: total.price,
+                                searchQuery: this.resultQuery,
+                                service: sourceId.toString(),
+                                outboundDate: outboundDate
+                            };
+                            if (inboundDate) {
+                                booking.inboundDate = inboundDate;
+                            }
+                            return [4 /*yield*/, this.basketService.addToBasket(booking, intBasket, this.searchService, this.travellers, selectedFlight.requiresReason)];
+                        case 1:
+                            whatHappened = _o.sent();
+                            if (whatHappened === exports.DifferentInvokdedUserReasons.research) {
+                                this.performSearch();
+                            }
+                            return [2 /*return*/, whatHappened];
+                    }
+                });
+            });
         };
         FlightEnterpriseSearch.prototype.makeSchemaFlights = function (selectedFlight, flightGroup, groupIndex, segmentIndex) {
             return Object.assign(Object.assign({}, selectedFlight), { journeyInfo: {
@@ -9193,7 +9506,7 @@
                     switch (_o.label) {
                         case 0:
                             if (flightQuote.unavailable) {
-                                return [2 /*return*/, Promise.resolve(false)];
+                                return [2 /*return*/, Promise.resolve(exports.DifferentInvokdedUserReasons.cancel)];
                             }
                             return [4 /*yield*/, this.basketService.getDefaultBasket()];
                         case 1:
@@ -9235,7 +9548,7 @@
                                 }
                                 return [2 /*return*/, this.basketService.addToBasket(booking, intBasket, this.searchService, this.travellers, flightQuote.requiresReason)];
                             }
-                            return [2 /*return*/, Promise.resolve(false)]; // TODO should this throw an error?
+                            return [2 /*return*/, Promise.resolve(exports.DifferentInvokdedUserReasons.cancel)]; // TODO should this throw an error?
                     }
                 });
             });
@@ -9247,27 +9560,31 @@
         FlightEnterpriseSearch.prototype._applyFilter = function () {
             this.applyFilters(this.currentFilters, this.currentSort);
         };
-        FlightEnterpriseSearch.prototype.openFlightFareRules = function (rules, flights) {
+        FlightEnterpriseSearch.prototype.openFlightFareRules = function (rules, flights, options, flightDetail) {
             var _this = this;
+            if (options === void 0) { options = null; }
+            if (flightDetail === void 0) { flightDetail = null; }
             // first check if there are rules
             var doCall = !Object.values(rules).find(function (rule) { return rule.length; });
             if (doCall) {
                 var rulesFromCall = this.searchService.getFlightFareRules(flights[0]);
                 rulesFromCall.subscribe(function (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
                     });
                 }, function (err) {
                     console.log(err);
                 });
             }
             else {
-                this.modalService.open(ModalTypes.ModalFlightFareComponent, null, {
+                this.modalService.open(ModalTypes.ModalFlightFareComponent, options, {
                     rules: rules,
                     from: flights[0].originAirport,
-                    to: flights[flights.length - 1].destinationAirport
+                    to: flights[flights.length - 1].destinationAirport,
+                    flight: flightDetail
                 });
             }
         };
@@ -9424,22 +9741,36 @@
                 return __generator(this, function (_o) {
                     switch (_o.label) {
                         case 0:
-                            this.chosenSearchType = fav.multiDestination ? exports.FlightSearchType.multiCity : fav.returnTrip ? exports.FlightSearchType.return : exports.FlightSearchType.oneWay;
+                            this.chosenSearchType = fav.multiDestination
+                                ? exports.FlightSearchType.multiCity
+                                : fav.returnTrip
+                                    ? exports.FlightSearchType.return
+                                    : exports.FlightSearchType.oneWay;
                             if (!(this.chosenSearchType == exports.FlightSearchType.multiCity)) return [3 /*break*/, 2];
                             return [4 /*yield*/, Promise.all(fav.multiDestination.map(function (a) { return __awaiter(_this, void 0, void 0, function () {
                                     var destination, _o, _p;
                                     return __generator(this, function (_q) {
                                         switch (_q.label) {
                                             case 0:
-                                                destination = { date: undefined, dest: undefined, orig: undefined };
+                                                destination = {
+                                                    date: undefined,
+                                                    dest: undefined,
+                                                    orig: undefined
+                                                };
                                                 _o = destination;
-                                                return [4 /*yield*/, this.searchService.getAirportsList(a.orig).toPromise().then(function (origResults) {
+                                                return [4 /*yield*/, this.searchService
+                                                        .getAirportsList(a.orig)
+                                                        .toPromise()
+                                                        .then(function (origResults) {
                                                         return origResults.find(function (b) { return b.gateway == a.orig; });
                                                     })];
                                             case 1:
                                                 _o.orig = _q.sent();
                                                 _p = destination;
-                                                return [4 /*yield*/, this.searchService.getAirportsList(a.dest).toPromise().then(function (destResults) {
+                                                return [4 /*yield*/, this.searchService
+                                                        .getAirportsList(a.dest)
+                                                        .toPromise()
+                                                        .then(function (destResults) {
                                                         return destResults.find(function (b) { return b.gateway == a.dest; });
                                                     })];
                                             case 2:
@@ -9453,19 +9784,26 @@
                             this.multiDestination = multi;
                             return [3 /*break*/, 3];
                         case 2:
-                            this.searchService.getAirportsList(fav.originAirport).subscribe(function (results) {
+                            this.searchService
+                                .getAirportsList(fav.originAirport)
+                                .subscribe(function (results) {
                                 _this.departLocation = results.find(function (a) { return a.gateway == fav.originAirport; });
                             });
-                            this.searchService.getAirportsList(fav.destinationAirport).subscribe(function (results) {
+                            this.searchService
+                                .getAirportsList(fav.destinationAirport)
+                                .subscribe(function (results) {
                                 _this.arriveLocation = results.find(function (a) { return a.gateway == fav.destinationAirport; });
                             });
                             _o.label = 3;
                         case 3:
                             this.cabinClass = fav.outboundCabinClass[0];
-                            this.returnCabinClass = this.chosenSearchType != exports.FlightSearchType.return ? null : fav.returnCabinClass[0];
+                            this.returnCabinClass =
+                                this.chosenSearchType != exports.FlightSearchType.return
+                                    ? null
+                                    : fav.returnCabinClass[0];
                             this.includeNearbyAirports = fav.includeNearbyAirports;
-                            this.adults = fav.passengers.filter(function (a) { return a.type == "ADULT"; }).length;
-                            this.children = fav.passengers.filter(function (a) { return a.type == "CHILD"; }).length;
+                            this.adults = fav.passengers.filter(function (a) { return a.type == 'ADULT'; }).length;
+                            this.children = fav.passengers.filter(function (a) { return a.type == 'CHILD'; }).length;
                             return [2 /*return*/];
                     }
                 });
@@ -9499,6 +9837,8 @@
         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";
     })(exports.URLS || (exports.URLS = {}));
 
@@ -9512,6 +9852,7 @@
             this.extra = [];
             this.hotelName = '';
             this.breakfastType = [];
+            this.accessibleRoomType = [];
         }
         return HotelFilters;
     }());
@@ -9530,13 +9871,12 @@
     var HotelEnterpriseSearch = /** @class */ (function (_super) {
         __extends(HotelEnterpriseSearch, _super);
         function HotelEnterpriseSearch(hotelFetcher, helpers, userService, environment, avaliabilityService, basketService, storageService, searchService, httpCallService, quickListFetcher, getRailStationFetcher, applyHotelRulesFetcher) {
-            var _this = _super.call(this, storageService, helpers) || this;
+            var _this = _super.call(this, storageService, helpers, searchService) || this;
             _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;
@@ -9545,6 +9885,7 @@
             _this.location_types = new rxjs.BehaviorSubject([]);
             _this.offices = new rxjs.BehaviorSubject([]);
             _this.lastActivePage = new rxjs.BehaviorSubject(null);
+            _this.jitRulesReceived = new rxjs.BehaviorSubject(false);
             _this.galleries = {};
             _this.occupied = 0;
             _this.results_details = {
@@ -9607,7 +9948,8 @@
                         _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));
             };
@@ -9641,6 +9983,7 @@
                 _this.results_details.chains.add(hotelResult.group);
             });
             _this.fullResults = results;
+            _this.jitRulesReceived.next(false);
             _this.results.next(results);
             _this._isValid();
             _this.userService.changeUser.subscribe(function (user) {
@@ -10015,6 +10358,15 @@
                     }
                     return hotel;
                 });
+                travleResults.forEach(function (hotel) {
+                    if (hotel.availableRates) {
+                        hotel.jitRemoveResultRule = false;
+                        _this.jitRulesReceived.next(true);
+                    }
+                    else {
+                        hotel.jitRemoveResultRule = true;
+                    }
+                });
                 _this.results.next(travleResults);
             });
         };
@@ -10119,7 +10471,7 @@
             // Calculating Occupancy
             var 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);
@@ -10127,6 +10479,7 @@
         };
         HotelEnterpriseSearch.prototype.startSearch = function () {
             this.results.next([]);
+            this.jitRulesReceived.next(false);
             this.avaliabilityService.reset();
             if (this.isValid.value) {
                 this._originalUserSearch = Object.freeze(this.helpers.clone(this.tempParams));
@@ -10410,31 +10763,40 @@
         HotelEnterpriseSearch.prototype.breakfastTypeFilter = function (hotel) {
             if (!this.filters.breakfastType.length)
                 return true;
-            var hotelObject = this.avaliabilityService.getAvailabilityForId(this.makeHotelAvalilityObject(hotel), hotel);
-            if (!hotelObject && !hotelObject.value)
+            var hotelObjectValue = this.getHotelObjectValue(hotel);
+            if (!hotelObjectValue || !(hotelObjectValue === null || hotelObjectValue === void 0 ? void 0 : hotelObjectValue.rooms))
                 return false;
-            var hotelObjectValue = hotelObject.value;
             var isBreakfastIncluded = this.filters.breakfastType.includes(exports.SearchHandler.BREAKFAST_INCLUDED);
             var isBreakfastExcluded = this.filters.breakfastType.includes(exports.SearchHandler.BREAKFAST_NOT_INCLUDED);
-            if (hotelObjectValue === null || hotelObjectValue === void 0 ? void 0 : hotelObjectValue.rooms) {
-                var breakfastMatches = hotelObjectValue.rooms.filter(function (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 {
+            var breakfastMatches = hotelObjectValue.rooms.filter(function (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;
+        };
+        HotelEnterpriseSearch.prototype.accessibleRoomTypeFilter = function (hotel) {
+            if (!this.filters.accessibleRoomType.length)
+                return true;
+            var hotelObjectValue = this.getHotelObjectValue(hotel);
+            if (!hotelObjectValue || !(hotelObjectValue === null || hotelObjectValue === void 0 ? void 0 : hotelObjectValue.rooms))
                 return false;
-            }
+            var matches = hotelObjectValue.rooms.filter(function (rooms) { return rooms.rateDescription.match(includedAccessibilityExpression) ||
+                rooms.roomDescription.match(includedAccessibilityExpression) ||
+                rooms.roomType.match(includedAccessibilityExpression); });
+            return !!matches.length;
+        };
+        HotelEnterpriseSearch.prototype.getHotelObjectValue = function (hotel) {
+            var hotelObject = this.avaliabilityService.getAvailabilityForId(this.makeHotelAvalilityObject(hotel), hotel);
+            return !hotelObject && !hotelObject.value ? null : hotelObject.value;
         };
         HotelEnterpriseSearch.prototype.byMostExpensive = function () {
             this.sortByPrice(false);
@@ -10547,6 +10909,81 @@
             this.localFilters.hotelName = '';
             this.localFilters.breakfastType = [];
         };
+        HotelEnterpriseSearch.prototype.updateSearchFromExpiredBasketItem = function (basketItem) {
+            var _this = this;
+            var _a, _b, _c, _d;
+            var searchHotelQuery = basketItem.searchQuery;
+            this.currency = searchHotelQuery.currency;
+            this.distance = searchHotelQuery.distance;
+            this.no_of_rooms = searchHotelQuery.rooms;
+            this.checkin_date = moment__default['default'](searchHotelQuery.startDate);
+            this.checkout_date = moment__default['default'](searchHotelQuery.endDate);
+            this.hotel_name = searchHotelQuery.hotelName;
+            if (searchHotelQuery.groupName) {
+                this.hotel_chain = {
+                    name: searchHotelQuery.groupName
+                };
+            }
+            if (searchHotelQuery.iata) {
+                this.location_type_select = exports.LocationTypes.Airport;
+                this.searchService
+                    .getAirportByCode(searchHotelQuery.iata)
+                    .subscribe(function (iata) {
+                    var 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 = exports.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 = exports.LocationTypes.Postcode;
+                this.postcode = {
+                    name: searchHotelQuery.postOrZipCode,
+                    type: exports.LocationTypes.Postcode
+                };
+            }
+            else if (searchHotelQuery.officeId) {
+                this.location_type_select = exports.LocationTypes.Office;
+                this.searchService
+                    .getOffice(searchHotelQuery.officeId)
+                    .pipe(operators.take(1))
+                    .subscribe(function (office) {
+                    _this.office = {
+                        id: office.id,
+                        name: office.name
+                    };
+                });
+            }
+            else if (searchHotelQuery.trainStationCode) {
+                this.location_type_select = exports.LocationTypes.TrainStation;
+                this.getRailStationByCode(searchHotelQuery.trainStationCode).subscribe(function (trainsStation) {
+                    _this.trainsStation = Object.assign(Object.assign({}, trainsStation), { type: exports.LocationTypes.TrainStation });
+                });
+            }
+            else if (searchHotelQuery.countryCode) {
+                this.location_type_select = exports.LocationTypes.Shortlist;
+                this.country = {
+                    cCode: searchHotelQuery.countryCode,
+                    cName: ''
+                };
+            }
+            // add Travellers
+            if (basketItem.users) {
+                basketItem.users.forEach(function (user) {
+                    _this.searchService.addTraveller(user);
+                });
+            }
+        };
         HotelEnterpriseSearch.prototype.updateFromPreviousSearches = function (previousItems) {
             var _a, _b;
             console.log('PREPOPULATING HOTEL FORM');
@@ -10754,7 +11191,7 @@
         };
         HotelEnterpriseSearch.prototype.addHotelRoomToBasket = function (hotel, hotelRoom, hotelQuery, travellers) {
             return __awaiter(this, void 0, void 0, function () {
-                var searchQuery, detailRooms, intBasket, basket, paxPerRoom, roomArray_1, numberToSplit_1, bookedTravellersChunks_1, hotelAaddress_1, termsAndConditions_1;
+                var searchQuery, detailRooms, intBasket, basket, paxPerRoom, roomArray, numberToSplit_1, bookedTravellersChunks_1, hotelAaddress_1, termsAndConditions_1;
                 var _this = this;
                 return __generator(this, function (_g) {
                     switch (_g.label) {
@@ -10763,7 +11200,7 @@
                             console.log(hotelRoom);
                             console.log(hotelQuery);
                             if (hotel.unavailable) {
-                                return [2 /*return*/, Promise.resolve(false)];
+                                return [2 /*return*/, exports.DifferentInvokdedUserReasons.cancel];
                             }
                             // modify the 'startDate' and 'endDate' properties to have ISO format
                             hotelQuery.startDate = new Date(hotelQuery.startDate).toISOString();
@@ -10786,49 +11223,67 @@
                             basket = intBasket === null || intBasket === void 0 ? void 0 : intBasket.subject.value;
                             if (basket) {
                                 paxPerRoom = this.tempParams.no_of_occupants;
-                                roomArray_1 = new Array(this.tempParams.no_of_rooms).fill('TEST');
+                                roomArray = new Array(this.tempParams.no_of_rooms).fill('TEST');
                                 numberToSplit_1 = this.tempParams.no_of_rooms === paxPerRoom ? 1 : 2;
                                 bookedTravellersChunks_1 = ___default['default'].chunk(this.travellers, numberToSplit_1);
                                 hotelAaddress_1 = hotel.address;
                                 termsAndConditions_1 = this.getTermsAndCond(hotelRoom, hotelQuery);
                                 // bookedTravellersChunks.forEach((chunk: Traveller[], index: number) => {
-                                roomArray_1.forEach(function (chunk, index) {
-                                    _this.basketService.addToBasket({
-                                        adults: numberToSplit_1,
-                                        basket: basket.id,
-                                        service: hotel.sourceId.toString(),
-                                        detail: {
-                                            hotelAddress: {
-                                                streetName: hotelAaddress_1.addressLine1,
-                                                town: hotelAaddress_1.addressLine2,
-                                                county: hotelAaddress_1.addressLine3,
-                                                postcode: hotelAaddress_1.postOrZipCode,
-                                                countryCode: hotelAaddress_1.countryCode
-                                            },
-                                            hotelDescription: hotel.group,
-                                            hotelId: hotel.id,
-                                            hotelName: hotel.name,
-                                            // this should always be 1 as we book 1 room as a time
-                                            numberOfRooms: 1,
-                                            rooms: detailRooms,
-                                            termsAndCond: termsAndConditions_1
-                                        },
-                                        // no longer * no of rooms as each room is added 1 by 1
-                                        price: hotelRoom.total,
-                                        currency: hotelRoom.currencyCode,
-                                        searchQuery: searchQuery,
-                                        outboundDate: hotelQuery.startDate
-                                    }, intBasket, _this.searchService, 
-                                    // this is an array of 1 or 2 travellers which go in 1 room
-                                    // chunk
-                                    bookedTravellersChunks_1[index] || [], hotelRoom.requiresReason);
-                                    // if (index === bookedTravellersChunks.length - 1) {
-                                    if (index === roomArray_1.length - 1) {
-                                        return Promise.resolve(true);
-                                    }
-                                });
+                                return [2 /*return*/, roomArray.reduce(function (current, chunk, index) { return __awaiter(_this, void 0, void 0, function () {
+                                        var wh;
+                                        return __generator(this, function (_g) {
+                                            switch (_g.label) {
+                                                case 0: return [4 /*yield*/, current];
+                                                case 1:
+                                                    switch (_g.sent()) {
+                                                        case exports.DifferentInvokdedUserReasons.cancel:
+                                                            return [2 /*return*/, exports.DifferentInvokdedUserReasons.cancel];
+                                                        case exports.DifferentInvokdedUserReasons.research:
+                                                            return [2 /*return*/, exports.DifferentInvokdedUserReasons.research];
+                                                        case exports.DifferentInvokdedUserReasons.continue:
+                                                        case exports.DifferentInvokdedUserReasons.newBasket:
+                                                            break;
+                                                    }
+                                                    return [4 /*yield*/, this.basketService.addToBasket({
+                                                            adults: numberToSplit_1,
+                                                            basket: basket.id,
+                                                            service: hotel.sourceId.toString(),
+                                                            detail: {
+                                                                hotelAddress: {
+                                                                    streetName: hotelAaddress_1.addressLine1,
+                                                                    town: hotelAaddress_1.addressLine2,
+                                                                    county: hotelAaddress_1.addressLine3,
+                                                                    postcode: hotelAaddress_1.postOrZipCode,
+                                                                    countryCode: hotelAaddress_1.countryCode
+                                                                },
+                                                                hotelDescription: hotel.group,
+                                                                hotelId: hotel.id,
+                                                                hotelName: hotel.name,
+                                                                // this should always be 1 as we book 1 room as a time
+                                                                numberOfRooms: 1,
+                                                                rooms: detailRooms,
+                                                                termsAndCond: termsAndConditions_1
+                                                            },
+                                                            // no longer * no of rooms as each room is added 1 by 1
+                                                            price: hotelRoom.total,
+                                                            currency: hotelRoom.currencyCode,
+                                                            searchQuery: searchQuery,
+                                                            outboundDate: hotelQuery.startDate
+                                                        }, intBasket, this.searchService, 
+                                                        // this is an array of 1 or 2 travellers which go in 1 room
+                                                        // chunk
+                                                        bookedTravellersChunks_1[index] || [], hotelRoom.requiresReason)];
+                                                case 2:
+                                                    wh = _g.sent();
+                                                    if (wh === exports.DifferentInvokdedUserReasons.research) {
+                                                        this.performSearch();
+                                                    }
+                                                    return [2 /*return*/, wh];
+                                            }
+                                        });
+                                    }); }, exports.DifferentInvokdedUserReasons.continue)];
                             }
-                            return [2 /*return*/, Promise.resolve(false)];
+                            return [2 /*return*/, exports.DifferentInvokdedUserReasons.cancel];
                     }
                 });
             });
@@ -10880,7 +11335,12 @@
                     this.no_of_rooms = fav.rooms;
                     this.distance = fav.distance;
                     this.currency = fav.currency;
-                    location = { latitude: fav.latitude, longitude: fav.longitude, countryCode: fav.countryCode, name: fav.cityName };
+                    location = {
+                        latitude: fav.latitude,
+                        longitude: fav.longitude,
+                        countryCode: fav.countryCode,
+                        name: fav.cityName
+                    };
                     if (fav.trainStationCode)
                         location.type = exports.LocationTypes.TrainStation;
                     else if (fav.officeId)
@@ -10909,10 +11369,9 @@
     var LoungesEnterpriseSearch = /** @class */ (function (_super) {
         __extends(LoungesEnterpriseSearch, _super);
         function LoungesEnterpriseSearch(loungefetcher, helpers, basketService, storageService, searchService) {
-            var _this = _super.call(this, storageService, helpers) || this;
+            var _this = _super.call(this, storageService, helpers, searchService) || this;
             _this.loungefetcher = loungefetcher;
             _this.basketService = basketService;
-            _this.searchService = searchService;
             _this.type = ServiceType.Lounge;
             _this.terminals = new rxjs.BehaviorSubject([]);
             _this._flightNumber = null;
@@ -11241,55 +11700,89 @@
                 }
             }
         };
+        LoungesEnterpriseSearch.prototype.updateSearchFromExpiredBasketItem = function (basketItem) {
+            var _this = this;
+            var searchLoungesQuery = basketItem.searchQuery;
+            if (searchLoungesQuery) {
+                this.arrivalDatetime = moment__default['default'](searchLoungesQuery.arrivalDatetime);
+                this.terminal = searchLoungesQuery.terminal;
+                this.searchService
+                    .getAirportByCode(searchLoungesQuery.locationCode)
+                    .subscribe(function (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(function (user) {
+                    _this.searchService.addTraveller(user);
+                });
+            }
+        };
         LoungesEnterpriseSearch.prototype.addLoungeToBasket = function (loungeQuote, loungeQuery) {
             var _a;
             return __awaiter(this, void 0, void 0, function () {
-                var intBasket, basket, termsAndConditions;
+                var intBasket, basket, termsAndConditions, whatHappened;
                 return __generator(this, function (_g) {
                     switch (_g.label) {
                         case 0:
                             if (loungeQuote.unavailable) {
-                                return [2 /*return*/, Promise.resolve(false)];
+                                return [2 /*return*/, Promise.resolve(exports.DifferentInvokdedUserReasons.cancel)];
                             }
                             return [4 /*yield*/, this.basketService.getDefaultBasket()];
                         case 1:
                             intBasket = _g.sent();
                             basket = intBasket === null || intBasket === void 0 ? void 0 : intBasket.subject.value;
                             termsAndConditions = this.getTermsAndCond(loungeQuote);
-                            if (basket) {
-                                return [2 /*return*/, this.basketService.addToBasket({
-                                        adults: loungeQuery.adults,
-                                        children: loungeQuery.children,
-                                        infants: loungeQuery.infants,
-                                        basket: basket.id,
-                                        service: loungeQuote.sourceId.toString(),
-                                        detail: {
-                                            arrivalDatetime: loungeQuery.arrivalDatetime.format(),
-                                            locationCode: loungeQuote.code,
-                                            name: loungeQuote.name,
-                                            airportIata: loungeQuery === null || loungeQuery === void 0 ? void 0 : loungeQuery.locationCode,
-                                            logo: loungeQuote.lounge.logo,
-                                            introduction: loungeQuote.lounge.introduction,
-                                            covidCopy: loungeQuote.lounge.misc.covidCopy,
-                                            cancellationInfo: loungeQuote.lounge.cancellationInfo,
-                                            admendmentsInfo: loungeQuote.lounge.amendmentsInfo,
-                                            checkInInfo: loungeQuote.lounge.checkInInfo,
-                                            dressCode: loungeQuote.lounge.dressCode,
-                                            foodAndBeverage: loungeQuote.lounge.foodAndBeverage,
-                                            whatsIncludedFood: loungeQuote.lounge.whatsIncludedFood,
-                                            whatsIncludedDrinks: loungeQuote.lounge.whatsIncludedDrinks,
-                                            whatsIncludedExtras: loungeQuote.lounge.whatsIncludedExtras,
-                                            groupInfo: loungeQuote.lounge.groupInfo,
-                                            terminal: (_a = loungeQuote.lounge.terminal) === null || _a === void 0 ? void 0 : _a.toString(),
-                                            termsAndCond: termsAndConditions
-                                        },
-                                        price: loungeQuote.price,
-                                        currency: loungeQuote.currency,
-                                        searchQuery: loungeQuery,
-                                        outboundDate: loungeQuery.arrivalDatetime.format()
-                                    }, intBasket, this.searchService, this.travellers, loungeQuote.requiresReason)];
+                            if (!basket) return [3 /*break*/, 3];
+                            return [4 /*yield*/, this.basketService.addToBasket({
+                                    adults: loungeQuery.adults,
+                                    children: loungeQuery.children,
+                                    infants: loungeQuery.infants,
+                                    basket: basket.id,
+                                    service: loungeQuote.sourceId.toString(),
+                                    detail: {
+                                        arrivalDatetime: loungeQuery.arrivalDatetime.format(),
+                                        locationCode: loungeQuote.code,
+                                        name: loungeQuote.name,
+                                        airportIata: loungeQuery === null || loungeQuery === void 0 ? void 0 : loungeQuery.locationCode,
+                                        logo: loungeQuote.lounge.logo,
+                                        introduction: loungeQuote.lounge.introduction,
+                                        covidCopy: loungeQuote.lounge.misc.covidCopy,
+                                        cancellationInfo: loungeQuote.lounge.cancellationInfo,
+                                        admendmentsInfo: loungeQuote.lounge.amendmentsInfo,
+                                        checkInInfo: loungeQuote.lounge.checkInInfo,
+                                        dressCode: loungeQuote.lounge.dressCode,
+                                        foodAndBeverage: loungeQuote.lounge.foodAndBeverage,
+                                        whatsIncludedFood: loungeQuote.lounge.whatsIncludedFood,
+                                        whatsIncludedDrinks: loungeQuote.lounge.whatsIncludedDrinks,
+                                        whatsIncludedExtras: loungeQuote.lounge.whatsIncludedExtras,
+                                        groupInfo: loungeQuote.lounge.groupInfo,
+                                        terminal: (_a = loungeQuote.lounge.terminal) === null || _a === void 0 ? void 0 : _a.toString(),
+                                        termsAndCond: termsAndConditions
+                                    },
+                                    price: loungeQuote.price,
+                                    currency: loungeQuote.currency,
+                                    searchQuery: loungeQuery,
+                                    outboundDate: loungeQuery.arrivalDatetime.format()
+                                }, intBasket, this.searchService, this.travellers, loungeQuote.requiresReason)];
+                        case 2:
+                            whatHappened = _g.sent();
+                            if (whatHappened === exports.DifferentInvokdedUserReasons.research) {
+                                this.performSearch();
                             }
-                            return [2 /*return*/, Promise.resolve(false)]; // TODO should this throw an error?
+                            return [2 /*return*/, whatHappened];
+                        case 3: return [2 /*return*/, exports.DifferentInvokdedUserReasons.cancel]; // TODO should this throw an error?
                     }
                 });
             });
@@ -11409,10 +11902,9 @@
     var ParkingEnterpriseSearch = /** @class */ (function (_super) {
         __extends(ParkingEnterpriseSearch, _super);
         function ParkingEnterpriseSearch(parkingfetcher, helpers, basketService, storageService, searchService) {
-            var _this = _super.call(this, storageService, helpers) || this;
+            var _this = _super.call(this, storageService, helpers, searchService) || this;
             _this.parkingfetcher = parkingfetcher;
             _this.basketService = basketService;
-            _this.searchService = searchService;
             _this.type = ServiceType.Parking;
             _this.terminals = new rxjs.BehaviorSubject([]);
             _this.listViewToggle = new rxjs.BehaviorSubject(null);
@@ -11812,6 +12304,35 @@
             }
             this.results.next(results);
         };
+        ParkingEnterpriseSearch.prototype.updateSearchFromExpiredBasketItem = function (basketItem) {
+            var _this = this;
+            var searchParkingQuery = basketItem.searchQuery;
+            this.arrivalDatetime = moment__default['default'](searchParkingQuery.arrivalDatetime);
+            this.departDatetime = moment__default['default'](searchParkingQuery.departDatetime);
+            this.outFlightNumber = searchParkingQuery.outFlightNumber;
+            this.terminal = searchParkingQuery.terminal;
+            this.searchService
+                .getAirportByCode(searchParkingQuery.locationCode)
+                .subscribe(function (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(function (user) {
+                    _this.searchService.addTraveller(user);
+                });
+            }
+        };
         ParkingEnterpriseSearch.prototype.updateFromPreviousSearches = function (previousItems) {
             var _a;
             console.log('PREPOPULATING PARKING FORM');
@@ -11840,7 +12361,7 @@
         };
         ParkingEnterpriseSearch.prototype.addParkingToBasket = function (parkingQuote, parkingQuery) {
             return __awaiter(this, void 0, void 0, function () {
-                var intBasket, basket, termsAndConditions;
+                var intBasket, basket, termsAndConditions, whatHappened;
                 return __generator(this, function (_g) {
                     switch (_g.label) {
                         case 0: return [4 /*yield*/, this.basketService.getDefaultBasket()];
@@ -11848,28 +12369,33 @@
                             intBasket = _g.sent();
                             basket = intBasket === null || intBasket === void 0 ? void 0 : intBasket.subject.value;
                             termsAndConditions = this.getTermsAndCond(parkingQuote);
-                            if (basket) {
-                                return [2 /*return*/, this.basketService.addToBasket({
-                                        adults: 1,
-                                        basket: basket.id,
-                                        service: parkingQuote.sourceId.toString(),
-                                        detail: {
-                                            arrivalDatetime: parkingQuery.arrivalDatetime.format(),
-                                            departDatetime: parkingQuery.departDatetime.format(),
-                                            locationCode: parkingQuote.carPark.code,
-                                            name: parkingQuote.carPark.name,
-                                            requiredInfo: parkingQuote.requiredInfo,
-                                            airportIata: parkingQuery.locationCode,
-                                            termsAndCond: termsAndConditions
-                                        },
-                                        price: parkingQuote.price,
-                                        currency: parkingQuote.currency,
-                                        searchQuery: parkingQuery,
-                                        outboundDate: parkingQuery.arrivalDatetime.format(),
-                                        inboundDate: parkingQuery.departDatetime.format()
-                                    }, intBasket, this.searchService, this.travellers, parkingQuote.requiresReason)];
+                            if (!basket) return [3 /*break*/, 3];
+                            return [4 /*yield*/, this.basketService.addToBasket({
+                                    adults: 1,
+                                    basket: basket.id,
+                                    service: parkingQuote.sourceId.toString(),
+                                    detail: {
+                                        arrivalDatetime: parkingQuery.arrivalDatetime.format(),
+                                        departDatetime: parkingQuery.departDatetime.format(),
+                                        locationCode: parkingQuote.carPark.code,
+                                        name: parkingQuote.carPark.name,
+                                        requiredInfo: parkingQuote.requiredInfo,
+                                        airportIata: parkingQuery.locationCode,
+                                        termsAndCond: termsAndConditions
+                                    },
+                                    price: parkingQuote.price,
+                                    currency: parkingQuote.currency,
+                                    searchQuery: parkingQuery,
+                                    outboundDate: parkingQuery.arrivalDatetime.format(),
+                                    inboundDate: parkingQuery.departDatetime.format()
+                                }, intBasket, this.searchService, this.travellers, parkingQuote.requiresReason)];
+                        case 2:
+                            whatHappened = _g.sent();
+                            if (whatHappened === exports.DifferentInvokdedUserReasons.research) {
+                                this.performSearch();
                             }
-                            return [2 /*return*/, Promise.resolve(false)];
+                            return [2 /*return*/, whatHappened];
+                        case 3: return [2 /*return*/, exports.DifferentInvokdedUserReasons.cancel];
                     }
                 });
             });
@@ -12022,10 +12548,9 @@
     var EurostarEnterpriseSearch = /** @class */ (function (_super) {
         __extends(EurostarEnterpriseSearch, _super);
         function EurostarEnterpriseSearch(eurostarFetcher, helpers, userService, basketService, storageService, searchService, modalService) {
-            var _this = _super.call(this, storageService, helpers) || this;
+            var _this = _super.call(this, storageService, helpers, searchService) || this;
             _this.eurostarFetcher = eurostarFetcher;
             _this.basketService = basketService;
-            _this.searchService = searchService;
             _this.modalService = modalService;
             _this.type = ServiceType.Eurostar;
             _this.avaliableClasses = new rxjs.BehaviorSubject([]);
@@ -12777,7 +13302,7 @@
                 }
                 // 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);
@@ -13096,15 +13621,83 @@
             };
             return [sortedResults];
         };
-        EurostarEnterpriseSearch.prototype.updateFromPreviousSearches = function (previousItems) {
-            var _a;
-            var flightItem = (_a = previousItems[ServiceType.Flight]) === null || _a === void 0 ? void 0 : _a.searchQuery;
-            if (flightItem) {
-                // TODO flights haven't been done yet.
+        EurostarEnterpriseSearch.prototype.updateSearchFromExpiredBasketItem = function (basketItem) {
+            var _this = this;
+            var searchEuroStarQuery = basketItem.searchQuery;
+            if (searchEuroStarQuery.outboundDate) {
+                var outboundTimeWindow = searchEuroStarQuery.outboundDepartureTimeWindow
+                    ? searchEuroStarQuery.outboundDepartureTimeWindow
+                    : searchEuroStarQuery.outboundArrivalTimeWindow;
+                this.outBoundDate = this.convertRecentSearchDateTime(searchEuroStarQuery.outboundDate, outboundTimeWindow);
+            }
+            if (searchEuroStarQuery.returnDate) {
+                var 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
+                ? exports.EurostarSearchType.return
+                : exports.EurostarSearchType.oneWay;
+            if (searchEuroStarQuery.outboundDepartureTimeWindow) {
+                this.outTimeCriteria = exports.TimeWindow.Depart;
             }
-        };
-        EurostarEnterpriseSearch.prototype.getTotalBaggage = function (result) {
-            var total = 0;
+            else if (searchEuroStarQuery.outboundArrivalTimeWindow) {
+                this.outTimeCriteria = exports.TimeWindow.Arrive;
+            }
+            else {
+                this.outTimeCriteria = exports.TimeWindow.Anytime;
+            }
+            if (searchEuroStarQuery.returnDepartureTimeWindow) {
+                this.inTimeCriteria = exports.TimeWindow.Depart;
+            }
+            else if (searchEuroStarQuery.returnArrivalTimeWindow) {
+                this.inTimeCriteria = exports.TimeWindow.Arrive;
+            }
+            else {
+                this.inTimeCriteria = exports.TimeWindow.Anytime;
+            }
+            if (searchEuroStarQuery.originAirport) {
+                this.searchService
+                    .lookupEurostarStations(searchEuroStarQuery.originAirport)
+                    .subscribe(function (stations) {
+                    _this.departLocation = stations[0];
+                });
+            }
+            if (searchEuroStarQuery.destinationAirport) {
+                this.searchService
+                    .lookupEurostarStations(searchEuroStarQuery.destinationAirport)
+                    .subscribe(function (stations) {
+                    _this.arriveLocation = stations[0];
+                });
+            }
+            // add Travellers
+            if (basketItem.users) {
+                basketItem.users.forEach(function (user) {
+                    _this.searchService.addTraveller(user);
+                });
+            }
+        };
+        EurostarEnterpriseSearch.prototype.updateFromPreviousSearches = function (previousItems) {
+            var _a;
+            var flightItem = (_a = previousItems[ServiceType.Flight]) === null || _a === void 0 ? void 0 : _a.searchQuery;
+            if (flightItem) {
+                // TODO flights haven't been done yet.
+            }
+        };
+        EurostarEnterpriseSearch.prototype.getTotalBaggage = function (result) {
+            var total = 0;
             var parsedAdditional = JSON.parse(result.additional);
             if (parsedAdditional && parsedAdditional.outboundFlights) {
                 parsedAdditional.outboundFlights.forEach(function (flight) {
@@ -13403,24 +13996,38 @@
             }, { amount: Number.MAX_SAFE_INTEGER, currencyCode: currency });
         };
         EurostarEnterpriseSearch.prototype.doBooking = function (intBasket, selectedFlight, schemaDetails, outboundDate, inboundDate, price, requiresReason) {
-            var sourceId = selectedFlight.sourceId, co2PerItem = selectedFlight.co2PerItem, co2PerPassenger = selectedFlight.co2PerPassenger, total = selectedFlight.total;
-            var booking = {
-                adults: this.adults,
-                basket: intBasket.id,
-                children: this.children,
-                co2PerItem: co2PerItem,
-                co2PerPassenger: co2PerPassenger,
-                currency: total.currency,
-                detail: schemaDetails,
-                price: price,
-                searchQuery: this.resultQuery,
-                service: sourceId.toString(),
-                outboundDate: outboundDate
-            };
-            if (inboundDate) {
-                booking.inboundDate = inboundDate;
-            }
-            this.basketService.addToBasket(booking, intBasket, this.searchService, this.travellers, requiresReason);
+            return __awaiter(this, void 0, void 0, function () {
+                var sourceId, co2PerItem, co2PerPassenger, total, booking, whatHappened;
+                return __generator(this, function (_e) {
+                    switch (_e.label) {
+                        case 0:
+                            sourceId = selectedFlight.sourceId, co2PerItem = selectedFlight.co2PerItem, co2PerPassenger = selectedFlight.co2PerPassenger, total = selectedFlight.total;
+                            booking = {
+                                adults: this.adults,
+                                basket: intBasket.id,
+                                children: this.children,
+                                co2PerItem: co2PerItem,
+                                co2PerPassenger: co2PerPassenger,
+                                currency: total.currency,
+                                detail: schemaDetails,
+                                price: price,
+                                searchQuery: this.resultQuery,
+                                service: sourceId.toString(),
+                                outboundDate: outboundDate
+                            };
+                            if (inboundDate) {
+                                booking.inboundDate = inboundDate;
+                            }
+                            return [4 /*yield*/, this.basketService.addToBasket(booking, intBasket, this.searchService, this.travellers, requiresReason)];
+                        case 1:
+                            whatHappened = _e.sent();
+                            if (whatHappened === exports.DifferentInvokdedUserReasons.research) {
+                                this.performSearch();
+                            }
+                            return [2 /*return*/, whatHappened];
+                    }
+                });
+            });
         };
         EurostarEnterpriseSearch.prototype.makeSchemaFlights = function (selectedFlight, flightGroup, groupIndex, segmentIndex) {
             return Object.assign(Object.assign({}, selectedFlight), { journeyInfo: {
@@ -13496,51 +14103,56 @@
         };
         EurostarEnterpriseSearch.prototype.addEurostarJourneysToBasket = function (eurostarQuote) {
             return __awaiter(this, void 0, void 0, function () {
-                var intBasket, basket, sourceId, co2PerItem, co2PerPassenger, total, outboundDate, inboundDate, termsAndConditions, schemaDetails, booking;
+                var intBasket, basket, sourceId, co2PerItem, co2PerPassenger, total, outboundDate, inboundDate, termsAndConditions, schemaDetails, booking, whatHappened;
                 var _this = this;
                 return __generator(this, function (_e) {
                     switch (_e.label) {
                         case 0:
                             if (eurostarQuote.unavailable) {
-                                return [2 /*return*/, Promise.resolve(false)];
+                                return [2 /*return*/, Promise.resolve(exports.DifferentInvokdedUserReasons.cancel)];
                             }
                             return [4 /*yield*/, this.basketService.getDefaultBasket()];
                         case 1:
                             intBasket = _e.sent();
                             basket = intBasket === null || intBasket === void 0 ? void 0 : intBasket.subject.value;
-                            if (basket) {
-                                sourceId = eurostarQuote.sourceId, co2PerItem = eurostarQuote.co2PerItem, co2PerPassenger = eurostarQuote.co2PerPassenger, total = eurostarQuote.total;
-                                outboundDate = moment__default['default'](eurostarQuote.outboundFlights[0].dateTimeDeparting);
-                                inboundDate = eurostarQuote.inboundFlights.length
-                                    ? moment__default['default'](eurostarQuote.inboundFlights[0].dateTimeDeparting)
-                                    : null;
-                                termsAndConditions = this.getTermsAndCond(eurostarQuote);
-                                schemaDetails = {
-                                    outboundFlights: __spread(eurostarQuote.outboundFlights.map(function (flight, segmentIndex) { return _this.makeSchemaFlights(flight, 'outbound', 0, segmentIndex); })),
-                                    inboundFlights: __spread(eurostarQuote.inboundFlights.map(function (flight, segmentIndex) { return _this.makeSchemaFlights(flight, 'inbound', 0, segmentIndex); })),
-                                    termsAndCond: termsAndConditions,
-                                    journeyType: 'single'
-                                };
-                                booking = {
-                                    adults: this.adults,
-                                    basket: intBasket.id,
-                                    children: this.children,
-                                    co2PerItem: co2PerItem,
-                                    co2PerPassenger: co2PerPassenger,
-                                    currency: total.currency,
-                                    detail: schemaDetails,
-                                    price: total.price,
-                                    searchQuery: this.resultQuery,
-                                    service: sourceId.toString(),
-                                    outboundDate: outboundDate.format()
-                                };
-                                if (inboundDate) {
-                                    booking.inboundDate = inboundDate.format();
-                                    schemaDetails.journeyType = 'roundtrip';
-                                }
-                                return [2 /*return*/, this.basketService.addToBasket(booking, intBasket, this.searchService, this.travellers, eurostarQuote.requiresReason)];
+                            if (!basket) return [3 /*break*/, 3];
+                            sourceId = eurostarQuote.sourceId, co2PerItem = eurostarQuote.co2PerItem, co2PerPassenger = eurostarQuote.co2PerPassenger, total = eurostarQuote.total;
+                            outboundDate = moment__default['default'](eurostarQuote.outboundFlights[0].dateTimeDeparting);
+                            inboundDate = eurostarQuote.inboundFlights.length
+                                ? moment__default['default'](eurostarQuote.inboundFlights[0].dateTimeDeparting)
+                                : null;
+                            termsAndConditions = this.getTermsAndCond(eurostarQuote);
+                            schemaDetails = {
+                                outboundFlights: __spread(eurostarQuote.outboundFlights.map(function (flight, segmentIndex) { return _this.makeSchemaFlights(flight, 'outbound', 0, segmentIndex); })),
+                                inboundFlights: __spread(eurostarQuote.inboundFlights.map(function (flight, segmentIndex) { return _this.makeSchemaFlights(flight, 'inbound', 0, segmentIndex); })),
+                                termsAndCond: termsAndConditions,
+                                journeyType: 'single'
+                            };
+                            booking = {
+                                adults: this.adults,
+                                basket: intBasket.id,
+                                children: this.children,
+                                co2PerItem: co2PerItem,
+                                co2PerPassenger: co2PerPassenger,
+                                currency: total.currency,
+                                detail: schemaDetails,
+                                price: total.price,
+                                searchQuery: this.resultQuery,
+                                service: sourceId.toString(),
+                                outboundDate: outboundDate.format()
+                            };
+                            if (inboundDate) {
+                                booking.inboundDate = inboundDate.format();
+                                schemaDetails.journeyType = 'roundtrip';
+                            }
+                            return [4 /*yield*/, this.basketService.addToBasket(booking, intBasket, this.searchService, this.travellers, eurostarQuote.requiresReason)];
+                        case 2:
+                            whatHappened = _e.sent();
+                            if (whatHappened === exports.DifferentInvokdedUserReasons.research) {
+                                this.performSearch();
                             }
-                            return [2 /*return*/, Promise.resolve(false)]; // TODO should this throw an error?
+                            return [2 /*return*/, whatHappened];
+                        case 3: return [2 /*return*/, Promise.resolve(exports.DifferentInvokdedUserReasons.cancel)];
                     }
                 });
             });
@@ -13697,16 +14309,22 @@
                 return __generator(this, function (_e) {
                     this.fareType = fav.fareType;
                     this.includeNearbyAirports = fav.includeNearbyAirports;
-                    this.chosenSearchType = fav.returnTrip ? exports.EurostarSearchType.return : exports.EurostarSearchType.oneWay;
-                    this.searchService.getAirportsList(fav.originAirport).subscribe(function (results) {
+                    this.chosenSearchType = fav.returnTrip
+                        ? exports.EurostarSearchType.return
+                        : exports.EurostarSearchType.oneWay;
+                    this.searchService
+                        .getAirportsList(fav.originAirport)
+                        .subscribe(function (results) {
                         _this.departLocation = results.find(function (a) { return a.gateway == fav.originAirport; });
                     });
-                    this.searchService.getAirportsList(fav.destinationAirport).subscribe(function (results) {
+                    this.searchService
+                        .getAirportsList(fav.destinationAirport)
+                        .subscribe(function (results) {
                         _this.arriveLocation = results.find(function (a) { return a.gateway == fav.destinationAirport; });
                     });
                     this._passengers = fav.passengers;
-                    this.adults = fav.passengers.filter(function (a) { return a.type == "ADULT"; }).length;
-                    this.children = fav.passengers.filter(function (a) { return a.type == "CHILD"; }).length;
+                    this.adults = fav.passengers.filter(function (a) { return a.type == 'ADULT'; }).length;
+                    this.children = fav.passengers.filter(function (a) { return a.type == 'CHILD'; }).length;
                     return [2 /*return*/];
                 });
             });
@@ -13798,11 +14416,10 @@
     var RailEnterpriseSearch = /** @class */ (function (_super) {
         __extends(RailEnterpriseSearch, _super);
         function RailEnterpriseSearch(Railfetcher, getRailStationFetcher, helpers, basketService, storageService, searchService, userService, modalService) {
-            var _this = _super.call(this, storageService, helpers) || this;
+            var _this = _super.call(this, storageService, helpers, searchService) || this;
             _this.Railfetcher = Railfetcher;
             _this.getRailStationFetcher = getRailStationFetcher;
             _this.basketService = basketService;
-            _this.searchService = searchService;
             _this.userService = userService;
             _this.modalService = modalService;
             _this.resultsSessionName = RailEnterpriseSearch.STORAGE_SESSION_RESULTS;
@@ -13918,6 +14535,7 @@
                 originalUserSearch: {}
             };
             _this.updateTempParams(_this.searchService.makeRailQuery(data.tempParams));
+            data.originalUserSearch.transactionIdentifier = null;
             _this._originalUserSearch = data.originalUserSearch;
             if (searchService.shouldAddTravellerSubscription()) {
                 searchService.travellerInformation.subscribe(function (travellers) {
@@ -13976,6 +14594,16 @@
             enumerable: false,
             configurable: true
         });
+        Object.defineProperty(RailEnterpriseSearch.prototype, "transactionIdentifier", {
+            get: function () {
+                return this.tempParams.transactionIdentifier;
+            },
+            set: function (id) {
+                this.tempParams.transactionIdentifier = id;
+            },
+            enumerable: false,
+            configurable: true
+        });
         Object.defineProperty(RailEnterpriseSearch.prototype, "bookRailFromLive", {
             get: function () {
                 return this._bookRailFromLive;
@@ -14286,6 +14914,9 @@
                 return this.tempParams.applyRailcards;
             },
             set: function (apCards) {
+                if (!apCards) {
+                    this.railCards = [];
+                }
                 this.tempParams.applyRailcards = apCards;
             },
             enumerable: false,
@@ -14369,6 +15000,7 @@
         };
         RailEnterpriseSearch.prototype.processResults = function (rawResults) {
             var _this = this;
+            this.transactionIdentifier = null;
             var setFares = function (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 });
@@ -14906,7 +15538,7 @@
                             // ! - Dual Singles
                             _h.sent();
                             _h.label = 7;
-                        case 7: return [2 /*return*/, false];
+                        case 7: return [2 /*return*/, exports.DifferentInvokdedUserReasons.cancel];
                     }
                 });
             });
@@ -14921,7 +15553,7 @@
         RailEnterpriseSearch.prototype.addDualSingleToBasket = function (serviceId, searchQuery, outbound, inbound, outboundFare, inboundFare) {
             var _a, _b;
             return __awaiter(this, void 0, void 0, function () {
-                var railQuery, inTicketExtras, outTicketExtras, intBasket, basket, termsAndConditions, outboundLegs, inboundLegs, basketItem;
+                var railQuery, inTicketExtras, outTicketExtras, intBasket, basket, termsAndConditions, outboundLegs, inboundLegs, basketItem, whatHappened;
                 return __generator(this, function (_h) {
                     switch (_h.label) {
                         case 0:
@@ -14938,90 +15570,95 @@
                             intBasket = _h.sent();
                             basket = intBasket === null || intBasket === void 0 ? void 0 : intBasket.subject.value;
                             termsAndConditions = this.getTermsAndCond(outboundFare, outbound, inbound);
-                            if (basket) {
-                                outboundLegs = this.getLegsFromRailJourneyOption(outbound);
-                                inboundLegs = this.getLegsFromRailJourneyOption(inbound);
-                                basketItem = {
-                                    basket: basket.id,
-                                    service: serviceId,
-                                    detail: {
-                                        ticketQueueList: (outbound.ticketQueueList || []).map(function (item) {
-                                            return {
-                                                id: item.id,
-                                                name: item.name,
-                                                type: item.type
-                                            };
-                                        }),
-                                        accountsList: (outbound.accountsList || []).map(function (item) {
-                                            return {
-                                                id: item.id,
-                                                description: item.description
-                                            };
-                                        }),
-                                        outwardDetail: {
-                                            arrivalDateTime: outbound.arriveDateTime,
-                                            arrivalStationName: outbound.to,
-                                            departureDateTime: outbound.departDateTime,
-                                            departureStationName: outbound.from,
-                                            supplierTickets: [
-                                                {
-                                                    supplierName: outboundFare.providerName,
-                                                    ticketDescription: outboundFare.type,
-                                                    price: outboundFare.price,
-                                                    legs: outboundLegs
-                                                }
-                                            ]
-                                        },
-                                        inwardDetail: {
-                                            arrivalDateTime: inbound.arriveDateTime,
-                                            arrivalStationName: inbound.to,
-                                            departureDateTime: inbound.departDateTime,
-                                            departureStationName: inbound.from,
-                                            supplierTickets: [
-                                                {
-                                                    supplierName: inboundFare.providerName,
-                                                    ticketDescription: inboundFare.type,
-                                                    legs: inboundLegs
-                                                }
-                                            ]
-                                        },
-                                        transactionIdentifier: outboundFare.identifiers.transactionIdentifier,
-                                        outbound: {
-                                            fareIdentifiers: [outboundFare.identifiers.fareIdentifier],
-                                            journeyIdentifier: outboundFare.identifiers.journeyIdentifier,
-                                            isDualSingleReturn: true,
-                                            journeyLegs: this.removedScheduledPlatformFromCallingPoints(outbound.journeyLegs),
-                                            eTicket: !!outboundFare.eTicketAvailable
-                                        },
-                                        // ticketQueueList,
-                                        return: {
-                                            fareIdentifiers: [inboundFare.identifiers.fareIdentifier],
-                                            journeyIdentifier: inboundFare.identifiers.journeyIdentifier,
-                                            isDualSingleReturn: true,
-                                            journeyLegs: this.removedScheduledPlatformFromCallingPoints(inbound.journeyLegs),
-                                            eTicket: !!inboundFare.eTicketAvailable
-                                        },
-                                        termsAndCond: termsAndConditions
+                            if (!basket) return [3 /*break*/, 3];
+                            outboundLegs = this.getLegsFromRailJourneyOption(outbound);
+                            inboundLegs = this.getLegsFromRailJourneyOption(inbound);
+                            basketItem = {
+                                basket: basket.id,
+                                service: serviceId,
+                                detail: {
+                                    ticketQueueList: (outbound.ticketQueueList || []).map(function (item) {
+                                        return {
+                                            id: item.id,
+                                            name: item.name,
+                                            type: item.type
+                                        };
+                                    }),
+                                    accountsList: (outbound.accountsList || []).map(function (item) {
+                                        return {
+                                            id: item.id,
+                                            description: item.description
+                                        };
+                                    }),
+                                    outwardDetail: {
+                                        arrivalDateTime: outbound.arriveDateTime,
+                                        arrivalStationName: outbound.to,
+                                        departureDateTime: outbound.departDateTime,
+                                        departureStationName: outbound.from,
+                                        supplierTickets: [
+                                            {
+                                                supplierName: outboundFare.providerName,
+                                                ticketDescription: outboundFare.type,
+                                                price: outboundFare.price,
+                                                legs: outboundLegs
+                                            }
+                                        ]
                                     },
-                                    adults: railQuery.adults,
-                                    price: Number(Number(outboundFare.price + inboundFare.price).toFixed(2)),
-                                    currency: outboundFare.currency,
-                                    searchQuery: railQuery,
-                                    co2PerItem: outbound.co2PerItem,
-                                    co2PerPassenger: outbound.co2PerPassenger,
-                                    outboundDate: outbound.arriveDateTime,
-                                    inboundDate: inbound.arriveDateTime
-                                };
-                                // if inTicketExtras or outTicketExtras exists add the object to basketItem
-                                if (inTicketExtras) {
-                                    basketItem.detail.return.ticketExtras = inTicketExtras;
-                                }
-                                if (outTicketExtras) {
-                                    basketItem.detail.outbound.ticketExtras = outTicketExtras;
-                                }
-                                return [2 /*return*/, this.basketService.addToBasket(basketItem, intBasket, this.searchService, this.travellers, outboundFare.requiresReason || inboundFare.requiresReason)];
+                                    inwardDetail: {
+                                        arrivalDateTime: inbound.arriveDateTime,
+                                        arrivalStationName: inbound.to,
+                                        departureDateTime: inbound.departDateTime,
+                                        departureStationName: inbound.from,
+                                        supplierTickets: [
+                                            {
+                                                supplierName: inboundFare.providerName,
+                                                ticketDescription: inboundFare.type,
+                                                legs: inboundLegs
+                                            }
+                                        ]
+                                    },
+                                    transactionIdentifier: outboundFare.identifiers.transactionIdentifier,
+                                    outbound: {
+                                        fareIdentifiers: [outboundFare.identifiers.fareIdentifier],
+                                        journeyIdentifier: outboundFare.identifiers.journeyIdentifier,
+                                        isDualSingleReturn: true,
+                                        journeyLegs: this.removedScheduledPlatformFromCallingPoints(outbound.journeyLegs),
+                                        eTicket: !!outboundFare.eTicketAvailable
+                                    },
+                                    // ticketQueueList,
+                                    return: {
+                                        fareIdentifiers: [inboundFare.identifiers.fareIdentifier],
+                                        journeyIdentifier: inboundFare.identifiers.journeyIdentifier,
+                                        isDualSingleReturn: true,
+                                        journeyLegs: this.removedScheduledPlatformFromCallingPoints(inbound.journeyLegs),
+                                        eTicket: !!inboundFare.eTicketAvailable
+                                    },
+                                    termsAndCond: termsAndConditions
+                                },
+                                adults: railQuery.adults,
+                                price: Number(Number(outboundFare.price + inboundFare.price).toFixed(2)),
+                                currency: outboundFare.currency,
+                                searchQuery: railQuery,
+                                co2PerItem: outbound.co2PerItem,
+                                co2PerPassenger: outbound.co2PerPassenger,
+                                outboundDate: outbound.arriveDateTime,
+                                inboundDate: inbound.arriveDateTime
+                            };
+                            // if inTicketExtras or outTicketExtras exists add the object to basketItem
+                            if (inTicketExtras) {
+                                basketItem.detail.return.ticketExtras = inTicketExtras;
+                            }
+                            if (outTicketExtras) {
+                                basketItem.detail.outbound.ticketExtras = outTicketExtras;
+                            }
+                            return [4 /*yield*/, this.basketService.addToBasket(basketItem, intBasket, this.searchService, this.travellers, outboundFare.requiresReason || inboundFare.requiresReason)];
+                        case 2:
+                            whatHappened = _h.sent();
+                            if (whatHappened === exports.DifferentInvokdedUserReasons.research) {
+                                this.performSearch();
                             }
-                            return [2 /*return*/, Promise.resolve()];
+                            return [2 /*return*/, whatHappened];
+                        case 3: return [2 /*return*/, exports.DifferentInvokdedUserReasons.continue];
                     }
                 });
             });
@@ -15082,6 +15719,7 @@
             this.results.next([]);
             if (this.isValid.value) {
                 var 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,
@@ -15202,8 +15840,9 @@
                 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(function (railCard) {
-                    return railCard.code;
-                })
+                    return railCard === null || railCard === void 0 ? void 0 : railCard.code;
+                }),
+                transactionIdentifier: tempParams.transactionIdentifier
             };
             if (tempParams.noOfChildren === 0) {
                 query.children = null;
@@ -15256,6 +15895,88 @@
             }
         };
         RailEnterpriseSearch.prototype.updateFromPreviousSearches = function (previousItems) { };
+        RailEnterpriseSearch.prototype.updateSearchFromExpiredBasketItem = function (basketItem) {
+            var _this = this;
+            var 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__default['default'](searchRailQuery.outboundDepartureDateTime)
+                : moment__default['default'](searchRailQuery.outboundArrivalDateTime);
+            this.outboundCriteria = this.getCriteria(searchRailQuery.outboundDepartureDateTime, searchRailQuery.outboundArrivalDateTime);
+            if (searchRailQuery.journeyType === RailSearchJourneyType.ReturnJourney) {
+                this.inBoundDateTime = searchRailQuery.returnDepartureDateTime
+                    ? moment__default['default'](searchRailQuery.returnDepartureDateTime)
+                    : moment__default['default'](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(function (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(function (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(function (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(function (user) {
+                    _this.searchService.addTraveller(user);
+                });
+            }
+        };
         RailEnterpriseSearch.prototype.getRailStation = function (code, isLoading) {
             if (code.length === 3) {
                 isLoading === null || isLoading === void 0 ? void 0 : isLoading.next(true);
@@ -15286,7 +16007,7 @@
         RailEnterpriseSearch.prototype.addSingleJourneyToBasket = function (serviceId, tempParams, railJourneyOption, railFare) {
             var _a;
             return __awaiter(this, void 0, void 0, function () {
-                var railQuery, outTicketExtras, intBasket, basket, termsAndConditions, legs, basketItem;
+                var railQuery, outTicketExtras, intBasket, basket, termsAndConditions, legs, basketItem, whatHappened;
                 return __generator(this, function (_h) {
                     switch (_h.label) {
                         case 0:
@@ -15300,64 +16021,69 @@
                             intBasket = _h.sent();
                             basket = intBasket === null || intBasket === void 0 ? void 0 : intBasket.subject.value;
                             termsAndConditions = this.getTermsAndCond(railFare, railJourneyOption);
-                            if (basket) {
-                                legs = this.getLegsFromRailJourneyOption(railJourneyOption);
-                                basketItem = {
-                                    basket: basket.id,
-                                    service: serviceId.toString(),
-                                    detail: {
-                                        ticketQueueList: (railJourneyOption.ticketQueueList || []).map(function (item) {
-                                            return {
-                                                id: item.id,
-                                                name: item.name,
-                                                type: item.type
-                                            };
-                                        }),
-                                        accountsList: (railJourneyOption.accountsList || []).map(function (item) {
-                                            return {
-                                                id: item.id,
-                                                description: item.description
-                                            };
-                                        }),
-                                        outwardDetail: {
-                                            arrivalDateTime: railJourneyOption.arriveDateTime,
-                                            arrivalStationName: railJourneyOption.to,
-                                            departureDateTime: railJourneyOption.departDateTime,
-                                            departureStationName: railJourneyOption.from,
-                                            supplierTickets: [
-                                                {
-                                                    supplierName: railFare.providerName,
-                                                    ticketDescription: railFare.type,
-                                                    price: railFare.price,
-                                                    legs: legs
-                                                }
-                                            ]
-                                        },
-                                        transactionIdentifier: railFare.identifiers.transactionIdentifier,
-                                        outbound: {
-                                            eTicket: !!railFare.eTicketAvailable,
-                                            fareIdentifiers: [railFare.identifiers.fareIdentifier],
-                                            journeyIdentifier: railFare.identifiers.journeyIdentifier,
-                                            journeyLegs: this.removedScheduledPlatformFromCallingPoints(railJourneyOption.journeyLegs)
-                                        },
-                                        termsAndCond: termsAndConditions
-                                        // ticketQueueList
+                            if (!basket) return [3 /*break*/, 3];
+                            legs = this.getLegsFromRailJourneyOption(railJourneyOption);
+                            basketItem = {
+                                basket: basket.id,
+                                service: serviceId.toString(),
+                                detail: {
+                                    ticketQueueList: (railJourneyOption.ticketQueueList || []).map(function (item) {
+                                        return {
+                                            id: item.id,
+                                            name: item.name,
+                                            type: item.type
+                                        };
+                                    }),
+                                    accountsList: (railJourneyOption.accountsList || []).map(function (item) {
+                                        return {
+                                            id: item.id,
+                                            description: item.description
+                                        };
+                                    }),
+                                    outwardDetail: {
+                                        arrivalDateTime: railJourneyOption.arriveDateTime,
+                                        arrivalStationName: railJourneyOption.to,
+                                        departureDateTime: railJourneyOption.departDateTime,
+                                        departureStationName: railJourneyOption.from,
+                                        supplierTickets: [
+                                            {
+                                                supplierName: railFare.providerName,
+                                                ticketDescription: railFare.type,
+                                                price: railFare.price,
+                                                legs: legs
+                                            }
+                                        ]
                                     },
-                                    adults: railQuery.adults,
-                                    price: railFare.price,
-                                    currency: railFare.currency,
-                                    searchQuery: railQuery,
-                                    co2PerItem: railJourneyOption.co2PerItem,
-                                    co2PerPassenger: railJourneyOption.co2PerPassenger,
-                                    outboundDate: railJourneyOption.departDateTime
-                                };
-                                // if ticketExtras exists add the object to basketItem
-                                if (outTicketExtras) {
-                                    basketItem.detail.outbound.ticketExtras = outTicketExtras;
-                                }
-                                return [2 /*return*/, this.basketService.addToBasket(basketItem, intBasket, this.searchService, this.travellers, railFare.requiresReason)];
+                                    transactionIdentifier: railFare.identifiers.transactionIdentifier,
+                                    outbound: {
+                                        eTicket: !!railFare.eTicketAvailable,
+                                        fareIdentifiers: [railFare.identifiers.fareIdentifier],
+                                        journeyIdentifier: railFare.identifiers.journeyIdentifier,
+                                        journeyLegs: this.removedScheduledPlatformFromCallingPoints(railJourneyOption.journeyLegs)
+                                    },
+                                    termsAndCond: termsAndConditions
+                                    // ticketQueueList
+                                },
+                                adults: railQuery.adults,
+                                price: railFare.price,
+                                currency: railFare.currency,
+                                searchQuery: railQuery,
+                                co2PerItem: railJourneyOption.co2PerItem,
+                                co2PerPassenger: railJourneyOption.co2PerPassenger,
+                                outboundDate: railJourneyOption.departDateTime
+                            };
+                            // if ticketExtras exists add the object to basketItem
+                            if (outTicketExtras) {
+                                basketItem.detail.outbound.ticketExtras = outTicketExtras;
+                            }
+                            return [4 /*yield*/, this.basketService.addToBasket(basketItem, intBasket, this.searchService, this.travellers, railFare.requiresReason)];
+                        case 2:
+                            whatHappened = _h.sent();
+                            if (whatHappened === exports.DifferentInvokdedUserReasons.research) {
+                                this.performSearch();
                             }
-                            return [2 /*return*/, Promise.resolve()];
+                            return [2 /*return*/, whatHappened];
+                        case 3: return [2 /*return*/, exports.DifferentInvokdedUserReasons.cancel];
                     }
                 });
             });
@@ -15365,7 +16091,7 @@
         RailEnterpriseSearch.prototype.addReturnJourneyToBasket = function (serviceId, tempParams, outbound, inbound, outboundFare, inboundFare) {
             var _a;
             return __awaiter(this, void 0, void 0, function () {
-                var railQuery, ticketExtras, intBasket, basket, termsAndConditions, outboundLegs, inboundLegs, basketItem;
+                var railQuery, ticketExtras, intBasket, basket, termsAndConditions, outboundLegs, inboundLegs, basketItem, whatHappened;
                 return __generator(this, function (_h) {
                     switch (_h.label) {
                         case 0:
@@ -15379,85 +16105,90 @@
                             intBasket = _h.sent();
                             basket = intBasket === null || intBasket === void 0 ? void 0 : intBasket.subject.value;
                             termsAndConditions = this.getTermsAndCond(outboundFare, outbound, inbound);
-                            if (basket) {
-                                outboundLegs = this.getLegsFromRailJourneyOption(outbound);
-                                inboundLegs = this.getLegsFromRailJourneyOption(inbound);
-                                basketItem = {
-                                    basket: basket.id,
-                                    service: serviceId,
-                                    detail: {
-                                        ticketQueueList: (outbound.ticketQueueList || []).map(function (item) {
-                                            return {
-                                                id: item.id,
-                                                name: item.name,
-                                                type: item.type
-                                            };
-                                        }),
-                                        accountsList: (outbound.accountsList || []).map(function (item) {
-                                            return {
-                                                id: item.id,
-                                                description: item.description
-                                            };
-                                        }),
-                                        outwardDetail: {
-                                            arrivalDateTime: outbound.arriveDateTime,
-                                            arrivalStationName: outbound.to,
-                                            departureDateTime: outbound.departDateTime,
-                                            departureStationName: outbound.from,
-                                            supplierTickets: [
-                                                {
-                                                    supplierName: outboundFare.providerName,
-                                                    ticketDescription: outboundFare.type,
-                                                    price: outboundFare.price,
-                                                    legs: outboundLegs
-                                                }
-                                            ]
-                                        },
-                                        inwardDetail: {
-                                            arrivalDateTime: inbound.arriveDateTime,
-                                            arrivalStationName: inbound.to,
-                                            departureDateTime: inbound.departDateTime,
-                                            departureStationName: inbound.from,
-                                            supplierTickets: [
-                                                {
-                                                    supplierName: inboundFare.providerName,
-                                                    ticketDescription: inboundFare.type,
-                                                    legs: inboundLegs
-                                                }
-                                            ]
-                                        },
-                                        transactionIdentifier: outboundFare.identifiers.transactionIdentifier,
-                                        outbound: {
-                                            eTicket: !!outboundFare.eTicketAvailable,
-                                            fareIdentifiers: [outboundFare.identifiers.fareIdentifier],
-                                            journeyIdentifier: outboundFare.identifiers.journeyIdentifier,
-                                            journeyLegs: this.removedScheduledPlatformFromCallingPoints(outbound.journeyLegs)
-                                        },
-                                        // ticketQueueList,
-                                        return: {
-                                            eTicket: !!inboundFare.eTicketAvailable,
-                                            fareIdentifiers: [inboundFare.identifiers.fareIdentifier],
-                                            journeyIdentifier: inboundFare.identifiers.journeyIdentifier,
-                                            journeyLegs: this.removedScheduledPlatformFromCallingPoints(inbound.journeyLegs)
-                                        },
-                                        termsAndCond: termsAndConditions
+                            if (!basket) return [3 /*break*/, 3];
+                            outboundLegs = this.getLegsFromRailJourneyOption(outbound);
+                            inboundLegs = this.getLegsFromRailJourneyOption(inbound);
+                            basketItem = {
+                                basket: basket.id,
+                                service: serviceId,
+                                detail: {
+                                    ticketQueueList: (outbound.ticketQueueList || []).map(function (item) {
+                                        return {
+                                            id: item.id,
+                                            name: item.name,
+                                            type: item.type
+                                        };
+                                    }),
+                                    accountsList: (outbound.accountsList || []).map(function (item) {
+                                        return {
+                                            id: item.id,
+                                            description: item.description
+                                        };
+                                    }),
+                                    outwardDetail: {
+                                        arrivalDateTime: outbound.arriveDateTime,
+                                        arrivalStationName: outbound.to,
+                                        departureDateTime: outbound.departDateTime,
+                                        departureStationName: outbound.from,
+                                        supplierTickets: [
+                                            {
+                                                supplierName: outboundFare.providerName,
+                                                ticketDescription: outboundFare.type,
+                                                price: outboundFare.price,
+                                                legs: outboundLegs
+                                            }
+                                        ]
                                     },
-                                    adults: railQuery.adults,
-                                    price: outboundFare.price,
-                                    currency: outboundFare.currency,
-                                    searchQuery: railQuery,
-                                    co2PerItem: outbound.co2PerItem,
-                                    co2PerPassenger: outbound.co2PerPassenger,
-                                    outboundDate: outbound.arriveDateTime,
-                                    inboundDate: inbound.arriveDateTime
-                                };
-                                // if ticketExtras exists add the object to basketItem
-                                if (ticketExtras) {
-                                    basketItem.detail.outbound.ticketExtras = ticketExtras;
-                                }
-                                return [2 /*return*/, this.basketService.addToBasket(basketItem, intBasket, this.searchService, this.travellers, outboundFare.requiresReason || inboundFare.requiresReason)];
+                                    inwardDetail: {
+                                        arrivalDateTime: inbound.arriveDateTime,
+                                        arrivalStationName: inbound.to,
+                                        departureDateTime: inbound.departDateTime,
+                                        departureStationName: inbound.from,
+                                        supplierTickets: [
+                                            {
+                                                supplierName: inboundFare.providerName,
+                                                ticketDescription: inboundFare.type,
+                                                legs: inboundLegs
+                                            }
+                                        ]
+                                    },
+                                    transactionIdentifier: outboundFare.identifiers.transactionIdentifier,
+                                    outbound: {
+                                        eTicket: !!outboundFare.eTicketAvailable,
+                                        fareIdentifiers: [outboundFare.identifiers.fareIdentifier],
+                                        journeyIdentifier: outboundFare.identifiers.journeyIdentifier,
+                                        journeyLegs: this.removedScheduledPlatformFromCallingPoints(outbound.journeyLegs)
+                                    },
+                                    // ticketQueueList,
+                                    return: {
+                                        eTicket: !!inboundFare.eTicketAvailable,
+                                        fareIdentifiers: [inboundFare.identifiers.fareIdentifier],
+                                        journeyIdentifier: inboundFare.identifiers.journeyIdentifier,
+                                        journeyLegs: this.removedScheduledPlatformFromCallingPoints(inbound.journeyLegs)
+                                    },
+                                    termsAndCond: termsAndConditions
+                                },
+                                adults: railQuery.adults,
+                                price: outboundFare.price,
+                                currency: outboundFare.currency,
+                                searchQuery: railQuery,
+                                co2PerItem: outbound.co2PerItem,
+                                co2PerPassenger: outbound.co2PerPassenger,
+                                outboundDate: outbound.arriveDateTime,
+                                inboundDate: inbound.arriveDateTime
+                            };
+                            // if ticketExtras exists add the object to basketItem
+                            if (ticketExtras) {
+                                basketItem.detail.outbound.ticketExtras = ticketExtras;
+                            }
+                            return [4 /*yield*/, this.basketService.addToBasket(basketItem, intBasket, this.searchService, this.travellers, outboundFare.requiresReason || inboundFare.requiresReason)];
+                        case 2:
+                            whatHappened = _h.sent();
+                            if (whatHappened === exports.DifferentInvokdedUserReasons.research) {
+                                this.performSearch();
                             }
-                            return [2 /*return*/, Promise.resolve(false)];
+                            return [2 /*return*/, whatHappened];
+                        case 3: return [2 /*return*/, exports.DifferentInvokdedUserReasons.cancel];
                     }
                 });
             });
@@ -15551,7 +16282,7 @@
                 .clone(this.fullResults)
                 .reduce(function (accum, next) {
                 var temp = Object.assign(Object.assign({}, next), { outbound: (next.outbound || []).map(function (journey) {
-                        return Object.assign(Object.assign({}, journey), { dualSingleJourneyFares: _this.helpers.map(journey.dualSingleJourneyFares || {}, setRules('dualSingleJourneyFares', journey, exports.RailDirection.Outbound)), returnJourneyFares: _this.helpers.map(journey.returnJourneyFares || {}, setRules('returnJourneyFares', journey, exports.RailDirection.Outbound)), openReturnJourneyFares: _this.helpers.map(journey.openReturnJourneyFares || {}, setRules('openReturnJourneyFares', journey, exports.RailDirection.Outbound)) });
+                        return Object.assign(Object.assign({}, journey), { dualSingleJourneyFares: _this.helpers.map(journey.dualSingleJourneyFares || {}, setRules('dualSingleJourneyFares', journey, exports.RailDirection.Outbound)), singleJourneyFares: _this.helpers.map(journey.singleJourneyFares || {}, setRules('singleJourneyFares', journey, exports.RailDirection.Outbound)), returnJourneyFares: _this.helpers.map(journey.returnJourneyFares || {}, setRules('returnJourneyFares', journey, exports.RailDirection.Outbound)), openReturnJourneyFares: _this.helpers.map(journey.openReturnJourneyFares || {}, setRules('openReturnJourneyFares', journey, exports.RailDirection.Outbound)) });
                     }), return: (next.return || []).map(function (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')) });
                     }) });
@@ -15655,24 +16386,30 @@
                     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(function (a) {
+                    this.getRailStationFetcher
+                        .fetchList({ id: fav.departureLocationId })
+                        .subscribe(function (a) {
                         _this.travellingFrom = a;
                     });
-                    this.getRailStationFetcher.fetchList({ id: fav.arrivalLocationId }).subscribe(function (a) {
+                    this.getRailStationFetcher
+                        .fetchList({ id: fav.arrivalLocationId })
+                        .subscribe(function (a) {
                         _this.travellingTo = a;
                     });
                     if (fav.viaLocationId) {
-                        this.getRailStationFetcher.fetchList({ id: fav.viaLocationId }).subscribe(function (a) {
+                        this.getRailStationFetcher
+                            .fetchList({ id: fav.viaLocationId })
+                            .subscribe(function (a) {
                             _this.viaLocation = a;
                         });
                         this.via = true;
@@ -15754,11 +16491,10 @@
     var IRLEnterpriseSearch = /** @class */ (function (_super) {
         __extends(IRLEnterpriseSearch, _super);
         function IRLEnterpriseSearch(Irlfetcher, irlDiscountCardsFetcher, helpers, basketService, storageService, searchService, getIrlSupplierStationFetcher) {
-            var _this = _super.call(this, storageService, helpers) || this;
+            var _this = _super.call(this, storageService, helpers, searchService) || this;
             _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;
@@ -16452,6 +17188,57 @@
             }
             return this.helpers.removeNulls(query);
         };
+        IRLEnterpriseSearch.prototype.updateSearchFromExpiredBasketItem = function (basketItem) {
+            var _this = this;
+            var searchIrlQuery = basketItem.searchQuery;
+            this.journeyType = searchIrlQuery.journeyType;
+            this.irlClass = searchIrlQuery.class;
+            // get outBoundDateTime, inBoundDateTime
+            this.outBoundDateTime = moment__default['default'](searchIrlQuery.outboundDepartureDateTime);
+            if (searchIrlQuery.journeyType === IrlJourneyType.ReturnJourney) {
+                this.inBoundDateTime = moment__default['default'](searchIrlQuery.returnDepartureDateTime);
+            }
+            if (searchIrlQuery.departureLocationId) {
+                this.searchService
+                    .getRailStationById(searchIrlQuery.departureLocationId)
+                    .subscribe(function (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(function (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(function (user) {
+                    _this.searchService.addTraveller(user);
+                });
+            }
+        };
         IRLEnterpriseSearch.prototype.updateFromPreviousSearches = function (previousItems) { };
         IRLEnterpriseSearch.prototype.updateCanCombine = function (tkt) {
             var _this = this;
@@ -16489,139 +17276,150 @@
         };
         IRLEnterpriseSearch.prototype.addSingleJourneyToBasket = function (serviceId, irlQuery, outbound, irlJourneyOption) {
             return __awaiter(this, void 0, void 0, function () {
-                var intBasket, basket, selectedIrlTicketOption, legs, termsAndConditions, basketItem;
+                var intBasket, basket, selectedIrlTicketOption, legs, termsAndConditions, basketItem, whatHappened;
                 return __generator(this, function (_e) {
                     switch (_e.label) {
                         case 0: return [4 /*yield*/, this.basketService.getDefaultBasket()];
                         case 1:
                             intBasket = _e.sent();
                             basket = intBasket === null || intBasket === void 0 ? void 0 : intBasket.subject.value;
-                            if (basket) {
-                                selectedIrlTicketOption = this.getSelectedIrlTicketOption(irlJourneyOption, outbound, 0);
-                                legs = this.getLegsFromIrlJourneyOption(irlJourneyOption);
-                                termsAndConditions = this.getTermsAndCond(irlJourneyOption);
-                                basketItem = {
-                                    basket: basket.id,
-                                    service: serviceId,
-                                    detail: {
-                                        outwardDetail: {
-                                            arrivalDateTime: irlJourneyOption.arriveDateTime,
-                                            arrivalStationName: irlJourneyOption.to,
-                                            arrivalStationCode: irlJourneyOption.toCode,
-                                            departureDateTime: irlJourneyOption.departDateTime,
-                                            departureStationName: irlJourneyOption.from,
-                                            departureStationCode: irlJourneyOption.fromCode,
-                                            supplierTickets: [
-                                                {
-                                                    supplierName: irlJourneyOption.providers[0].name,
-                                                    ticketDescription: selectedIrlTicketOption.type,
-                                                    price: selectedIrlTicketOption.price,
-                                                    legs: legs
-                                                }
-                                            ]
-                                        },
-                                        transactionIdentifier: irlJourneyOption.identifiers.transactionIdentifier,
-                                        outbound: {
-                                            fareIdentifiers: [
-                                                selectedIrlTicketOption.identifiers.fareIdentifier
-                                            ],
-                                            journeyIdentifier: selectedIrlTicketOption.identifiers.journeyIdentifier
-                                        },
-                                        supplier: irlJourneyOption.providers[0].providerId,
-                                        termsAndCond: termsAndConditions
+                            if (!basket) return [3 /*break*/, 3];
+                            selectedIrlTicketOption = this.getSelectedIrlTicketOption(irlJourneyOption, outbound, 0);
+                            legs = this.getLegsFromIrlJourneyOption(irlJourneyOption);
+                            termsAndConditions = this.getTermsAndCond(irlJourneyOption);
+                            basketItem = {
+                                basket: basket.id,
+                                service: serviceId,
+                                detail: {
+                                    outwardDetail: {
+                                        arrivalDateTime: irlJourneyOption.arriveDateTime,
+                                        arrivalStationName: irlJourneyOption.to,
+                                        arrivalStationCode: irlJourneyOption.toCode,
+                                        departureDateTime: irlJourneyOption.departDateTime,
+                                        departureStationName: irlJourneyOption.from,
+                                        departureStationCode: irlJourneyOption.fromCode,
+                                        supplierTickets: [
+                                            {
+                                                supplierName: irlJourneyOption.providers[0].name,
+                                                ticketDescription: selectedIrlTicketOption.type,
+                                                price: selectedIrlTicketOption.price,
+                                                legs: legs
+                                            }
+                                        ]
                                     },
-                                    adults: irlQuery.adults,
-                                    price: selectedIrlTicketOption.price,
-                                    currency: selectedIrlTicketOption.currency,
-                                    searchQuery: irlQuery,
-                                    // co2PerItem: irlJourneyOption.co2PerItem,
-                                    // co2PerPassenger: irlJourneyOption.co2PerPassenger,
-                                    outboundDate: irlJourneyOption.departDateTime
-                                };
-                                return [2 /*return*/, this.basketService.addToBasket(basketItem, intBasket, this.searchService, this.travellers, false // TODO
-                                    )];
+                                    transactionIdentifier: irlJourneyOption.identifiers.transactionIdentifier,
+                                    outbound: {
+                                        fareIdentifiers: [
+                                            selectedIrlTicketOption.identifiers.fareIdentifier
+                                        ],
+                                        journeyIdentifier: selectedIrlTicketOption.identifiers.journeyIdentifier
+                                    },
+                                    supplier: irlJourneyOption.providers[0].providerId,
+                                    termsAndCond: termsAndConditions
+                                },
+                                adults: irlQuery.adults,
+                                price: selectedIrlTicketOption.price,
+                                currency: selectedIrlTicketOption.currency,
+                                searchQuery: irlQuery,
+                                // co2PerItem: irlJourneyOption.co2PerItem,
+                                // co2PerPassenger: irlJourneyOption.co2PerPassenger,
+                                outboundDate: irlJourneyOption.departDateTime
+                            };
+                            return [4 /*yield*/, this.basketService.addToBasket(basketItem, intBasket, this.searchService, this.travellers, false // TODO
+                                )];
+                        case 2:
+                            whatHappened = _e.sent();
+                            if (whatHappened === exports.DifferentInvokdedUserReasons.research) {
+                                this.performSearch();
                             }
-                            return [2 /*return*/, Promise.resolve(false)];
+                            return [2 /*return*/, whatHappened];
+                        case 3: return [2 /*return*/, exports.DifferentInvokdedUserReasons.cancel];
                     }
                 });
             });
         };
         IRLEnterpriseSearch.prototype.addReturnJourneyToBasket = function (serviceId, irlQuery, inbound, inJourneyOption, outboundTicket, outboundJourney) {
             return __awaiter(this, void 0, void 0, function () {
-                var outbound, outJourneyOption, intBasket, basket, selectedIrlTicketOption, outboundLegs, inboundLegs, termsAndConditions, basketItem;
+                var outbound, outJourneyOption, intBasket, basket, selectedIrlTicketOption, outboundLegs, inboundLegs, termsAndConditions, basketItem, whatHappened;
                 return __generator(this, function (_e) {
                     switch (_e.label) {
                         case 0:
                             outbound = outboundTicket ? outboundTicket : this.outboundTicket;
-                            outJourneyOption = outboundJourney ? outboundJourney : this.outboundJourneyOptions;
+                            outJourneyOption = outboundJourney
+                                ? outboundJourney
+                                : this.outboundJourneyOptions;
                             return [4 /*yield*/, this.basketService.getDefaultBasket()];
                         case 1:
                             intBasket = _e.sent();
                             basket = intBasket === null || intBasket === void 0 ? void 0 : intBasket.subject.value;
-                            if (basket) {
-                                selectedIrlTicketOption = this.getSelectedIrlTicketOption(outJourneyOption, outbound, 0);
-                                outboundLegs = this.getLegsFromIrlJourneyOption(outJourneyOption);
-                                inboundLegs = this.getLegsFromIrlJourneyOption(inJourneyOption);
-                                termsAndConditions = this.getTermsAndCond(outJourneyOption);
-                                basketItem = {
-                                    basket: basket.id,
-                                    service: serviceId,
-                                    detail: {
-                                        outwardDetail: {
-                                            arrivalDateTime: outJourneyOption.arriveDateTime,
-                                            arrivalStationName: outJourneyOption.to,
-                                            arrivalStationCode: outJourneyOption.toCode,
-                                            departureStationCode: outJourneyOption.fromCode,
-                                            departureDateTime: outJourneyOption.departDateTime,
-                                            departureStationName: outJourneyOption.from,
-                                            supplierTickets: [
-                                                {
-                                                    supplierName: outJourneyOption.providers[0].name,
-                                                    ticketDescription: selectedIrlTicketOption.type,
-                                                    price: selectedIrlTicketOption.price,
-                                                    legs: outboundLegs
-                                                }
-                                            ]
-                                        },
-                                        inwardDetail: {
-                                            arrivalDateTime: inJourneyOption.arriveDateTime,
-                                            arrivalStationName: inJourneyOption.to,
-                                            arrivalStationCode: inJourneyOption.toCode,
-                                            departureStationCode: inJourneyOption.fromCode,
-                                            departureDateTime: inJourneyOption.departDateTime,
-                                            departureStationName: inJourneyOption.from,
-                                            supplierTickets: [
-                                                {
-                                                    supplierName: inJourneyOption.providers[0].name,
-                                                    ticketDescription: inbound.type,
-                                                    legs: inboundLegs
-                                                }
-                                            ]
-                                        },
-                                        transactionIdentifier: outbound.identifiers.transactionIdentifier,
-                                        outbound: {
-                                            fareIdentifiers: [
-                                                selectedIrlTicketOption.identifiers.fareIdentifier
-                                            ],
-                                            journeyIdentifier: selectedIrlTicketOption.identifiers.journeyIdentifier
-                                        },
-                                        supplier: outJourneyOption.providers[0].providerId,
-                                        termsAndCond: termsAndConditions
+                            if (!basket) return [3 /*break*/, 3];
+                            selectedIrlTicketOption = this.getSelectedIrlTicketOption(outJourneyOption, outbound, 0);
+                            outboundLegs = this.getLegsFromIrlJourneyOption(outJourneyOption);
+                            inboundLegs = this.getLegsFromIrlJourneyOption(inJourneyOption);
+                            termsAndConditions = this.getTermsAndCond(outJourneyOption);
+                            basketItem = {
+                                basket: basket.id,
+                                service: serviceId,
+                                detail: {
+                                    outwardDetail: {
+                                        arrivalDateTime: outJourneyOption.arriveDateTime,
+                                        arrivalStationName: outJourneyOption.to,
+                                        arrivalStationCode: outJourneyOption.toCode,
+                                        departureStationCode: outJourneyOption.fromCode,
+                                        departureDateTime: outJourneyOption.departDateTime,
+                                        departureStationName: outJourneyOption.from,
+                                        supplierTickets: [
+                                            {
+                                                supplierName: outJourneyOption.providers[0].name,
+                                                ticketDescription: selectedIrlTicketOption.type,
+                                                price: selectedIrlTicketOption.price,
+                                                legs: outboundLegs
+                                            }
+                                        ]
                                     },
-                                    adults: irlQuery.adults,
-                                    price: Number((Number(selectedIrlTicketOption.price) + Number(inbound.price)).toFixed(2)),
-                                    currency: selectedIrlTicketOption.currency,
-                                    searchQuery: irlQuery,
-                                    outboundDate: outJourneyOption.departDateTime
-                                    // co2PerItem: outbound.co2PerItem,
-                                    // co2PerPassenger: outbound.co2PerPassenger
-                                };
-                                this.filterSelected();
-                                console.log(basketItem);
-                                return [2 /*return*/, this.basketService.addToBasket(basketItem, intBasket, this.searchService, this.travellers, false // TODO
-                                    )];
+                                    inwardDetail: {
+                                        arrivalDateTime: inJourneyOption.arriveDateTime,
+                                        arrivalStationName: inJourneyOption.to,
+                                        arrivalStationCode: inJourneyOption.toCode,
+                                        departureStationCode: inJourneyOption.fromCode,
+                                        departureDateTime: inJourneyOption.departDateTime,
+                                        departureStationName: inJourneyOption.from,
+                                        supplierTickets: [
+                                            {
+                                                supplierName: inJourneyOption.providers[0].name,
+                                                ticketDescription: inbound.type,
+                                                legs: inboundLegs
+                                            }
+                                        ]
+                                    },
+                                    transactionIdentifier: outbound.identifiers.transactionIdentifier,
+                                    outbound: {
+                                        fareIdentifiers: [
+                                            selectedIrlTicketOption.identifiers.fareIdentifier
+                                        ],
+                                        journeyIdentifier: selectedIrlTicketOption.identifiers.journeyIdentifier
+                                    },
+                                    supplier: outJourneyOption.providers[0].providerId,
+                                    termsAndCond: termsAndConditions
+                                },
+                                adults: irlQuery.adults,
+                                price: Number((Number(selectedIrlTicketOption.price) + Number(inbound.price)).toFixed(2)),
+                                currency: selectedIrlTicketOption.currency,
+                                searchQuery: irlQuery,
+                                outboundDate: outJourneyOption.departDateTime
+                                // co2PerItem: outbound.co2PerItem,
+                                // co2PerPassenger: outbound.co2PerPassenger
+                            };
+                            this.filterSelected();
+                            return [4 /*yield*/, this.basketService.addToBasket(basketItem, intBasket, this.searchService, this.travellers, false // TODO
+                                )];
+                        case 2:
+                            whatHappened = _e.sent();
+                            if (whatHappened === exports.DifferentInvokdedUserReasons.research) {
+                                this.performSearch();
                             }
-                            return [2 /*return*/, Promise.resolve(false)];
+                            return [2 /*return*/, whatHappened];
+                        case 3: return [2 /*return*/, exports.DifferentInvokdedUserReasons.cancel];
                     }
                 });
             });
@@ -16812,16 +17610,20 @@
                 if (!priceMin || priceMin > result.providers[0].cheapestTicket.price) {
                     priceMin = Math.floor(result.providers[0].cheapestTicket.price);
                 }
-                if (!dateDepMin || moment__default['default'](result.departDateTime).isBefore(moment__default['default'](dateDepMin))) {
+                if (!dateDepMin ||
+                    moment__default['default'](result.departDateTime).isBefore(moment__default['default'](dateDepMin))) {
                     dateDepMin = Number(moment__default['default'](result.departDateTime).format('HHmm'));
                 }
-                if (!dateDepMax || moment__default['default'](result.departDateTime).isAfter(moment__default['default'](dateDepMax))) {
+                if (!dateDepMax ||
+                    moment__default['default'](result.departDateTime).isAfter(moment__default['default'](dateDepMax))) {
                     dateDepMax = Number(moment__default['default'](result.departDateTime).format('HHmm'));
                 }
-                if (!dateArrMin || moment__default['default'](result.arriveDateTime).isBefore(moment__default['default'](dateArrMin))) {
+                if (!dateArrMin ||
+                    moment__default['default'](result.arriveDateTime).isBefore(moment__default['default'](dateArrMin))) {
                     dateArrMin = Number(moment__default['default'](result.arriveDateTime).format('HHmm'));
                 }
-                if (!dateArrMax || moment__default['default'](result.arriveDateTime).isAfter(moment__default['default'](dateArrMax))) {
+                if (!dateArrMax ||
+                    moment__default['default'](result.arriveDateTime).isAfter(moment__default['default'](dateArrMax))) {
                     dateArrMax = Number(moment__default['default'](result.arriveDateTime).format('HHmm'));
                 }
                 changesObject[result.segments.length - 1] = {
@@ -16874,7 +17676,7 @@
             // now first of all - apply the price filters
             dirResults = dirResults.filter(function (result) {
                 var tickets = result.providers[0].ticketOptions.filter(function (ticket) {
-                    return ticket.price >= filters.priceMin && ticket.price <= filters.priceMax;
+                    return (ticket.price >= filters.priceMin && ticket.price <= filters.priceMax);
                 });
                 result.providers[0].ticketOptions = tickets;
                 return tickets.length;
@@ -16939,17 +17741,24 @@
             return __awaiter(this, void 0, void 0, function () {
                 var _this = this;
                 return __generator(this, function (_e) {
-                    this.getIrlSupplierStationFetcher.fetchList({ id: fav.departureLocationId }).subscribe(function (a) {
+                    this.getIrlSupplierStationFetcher
+                        .fetchList({ id: fav.departureLocationId })
+                        .subscribe(function (a) {
                         _this.travellingFrom = a;
                     });
-                    this.getIrlSupplierStationFetcher.fetchList({ id: fav.arrivalLocationId }).subscribe(function (a) {
+                    this.getIrlSupplierStationFetcher
+                        .fetchList({ id: fav.arrivalLocationId })
+                        .subscribe(function (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;
                     return [2 /*return*/];
                 });
@@ -17093,7 +17902,7 @@
             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(operators.take(1))
@@ -17114,6 +17923,7 @@
             this.basketItem = basketItem;
             this.helpers = helpers;
             this.hasDetails = false;
+            this.noCovertSelectSchemas = [exports.SchemaFormat.railSeating, exports.SchemaFormat.passport, exports.SchemaFormat.selectQueue];
             this.basketItem.perPassengerSupplementaryBookingInfoSchema =
                 basketItem.perPassengerSupplementaryBookingInfoSchema
                     ? this.processSchema(this.basketItem.perPassengerSupplementaryBookingInfoSchema)
@@ -17121,6 +17931,9 @@
             this.userInfo = this.basketItem.users.map(function (user) {
                 return new UserInfoImpl(user, getUserFetcher, helpers, _this.basketItem.perPassengerPhoneNumber, _this.basketItem.perPassengerAddress, _this.basketItem.perPassengerSupplementaryBookingInfoSchema);
             });
+            this.guestInfo = this.basketItem.guests.map(function (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
@@ -17192,7 +18005,7 @@
                     item.format ||
                         _this.schemaWidgetToFormat(item.widget) ||
                         _this.schemaTypeToFormat(item.type);
-                if (item.oneOf && item.oneOf.length > 0 && item.format !== 'railSeating' && item.format !== exports.SchemaFormat.selectQueue) {
+                if (item.oneOf && item.oneOf.length > 0 && !_this.noCovertSelectSchemas.includes(item.format)) {
                     item.format = exports.SchemaFormat.select;
                 }
             });
@@ -17239,7 +18052,8 @@
                 basketItem: this.basketItem.id,
                 userInfo: [],
                 supplementaryInfo: {},
-                paymentMethodDetails: {}
+                paymentMethodDetails: {},
+                guestInfo: []
             };
             if (values.perItemAddress !== undefined) {
                 newValue.address = this.helpers.toStrings(values.perItemAddress, AddressSchema);
@@ -17251,6 +18065,7 @@
                 newValue.supplementaryInfo = this.helpers.toStrings(values.perItemSupplementarySchema, this.perItemSupplementarySchema);
             }
             newValue.userInfo = this.userInfo.map(function (userInfo, index) {
+                var _a, _b;
                 var userValue = { id: userInfo.id, supplementaryInfo: {} };
                 var thisUserSupplemental = values['user_' + index] || {};
                 if (thisUserSupplemental.perPassengerAddress !== undefined) {
@@ -17263,6 +18078,38 @@
                     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(function (guestInfo, index) {
+                var _a, _b;
+                var userValue = { id: guestInfo.id, supplementaryInfo: {} };
+                var 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;
@@ -17923,6 +18770,30 @@
         return BaseGetConfermaRoomImagesFetcher;
     }(FetchableList));
 
+    var BaseGetCompaniesFetcher = /** @class */ (function (_super) {
+        __extends(BaseGetCompaniesFetcher, _super);
+        function BaseGetCompaniesFetcher(getCompaniesGQL, helpers, modalService) {
+            return _super.call(this, getCompaniesGQL, helpers, modalService) || this;
+        }
+        BaseGetCompaniesFetcher.prototype.getDataFromResult = function (results) {
+            var _a;
+            return (_a = results === null || results === void 0 ? void 0 : results.data) === null || _a === void 0 ? void 0 : _a.getCompanies;
+        };
+        return BaseGetCompaniesFetcher;
+    }(FetchableList));
+
+    var BaseGetCompanyFetcher = /** @class */ (function (_super) {
+        __extends(BaseGetCompanyFetcher, _super);
+        function BaseGetCompanyFetcher(getCompanyGQL, helpers, modalService) {
+            return _super.call(this, getCompanyGQL, modalService, helpers) || this;
+        }
+        BaseGetCompanyFetcher.prototype.getDataFromResult = function (results) {
+            var _a;
+            return (_a = results === null || results === void 0 ? void 0 : results.data) === null || _a === void 0 ? void 0 : _a.getCompany;
+        };
+        return BaseGetCompanyFetcher;
+    }(FetchableObject));
+
     var BaseEmailBasketFetcher = /** @class */ (function (_super) {
         __extends(BaseEmailBasketFetcher, _super);
         function BaseEmailBasketFetcher(gql, helpers, modalService) {
@@ -18018,6 +18889,18 @@
         return BaseGetCancellationInfoFetcher;
     }(FetchableObject));
 
+    var BaseGetUserGuestsFetcher = /** @class */ (function (_super) {
+        __extends(BaseGetUserGuestsFetcher, _super);
+        function BaseGetUserGuestsFetcher(queryGQL, helpers, modalService) {
+            return _super.call(this, queryGQL, helpers, modalService) || this;
+        }
+        BaseGetUserGuestsFetcher.prototype.getDataFromResult = function (results) {
+            var _a;
+            return (_a = results.data) === null || _a === void 0 ? void 0 : _a.getUserGuests;
+        };
+        return BaseGetUserGuestsFetcher;
+    }(FetchableList));
+
     // | 'fareTypes';
 
     ;
@@ -18125,7 +19008,7 @@
                                         return mi.reason && mi.selectedValues.length === 0;
                                     }).length !== 0);
                             });
-                            if (!(basketItems.length > 0)) return [3 /*break*/, 2];
+                            if (!(basketItems.length > 0)) return [3 /*break*/, 5];
                             this.workingOn = {
                                 basket: basket,
                                 required: basketItems.reduce(function (required, bi) {
@@ -18138,24 +19021,30 @@
                             return [4 /*yield*/, this.modalService.open(ModalTypes.RequiresReasonDialogComponent, { backdrop: 'static' }, this.workingOn)];
                         case 1:
                             results_1 = _a.sent();
-                            if (results_1) {
-                                this.workingOn.basket.basketItems.forEach(function (bi) {
-                                    (bi.managementInfo || []).forEach(function (mi) {
+                            if (!results_1) return [3 /*break*/, 3];
+                            return [4 /*yield*/, Promise.all(this.workingOn.basket.basketItems.map(function (bi) {
+                                    return Promise.all((bi.managementInfo || []).map(function (mi) {
                                         if (results_1[mi.id]) {
-                                            _this.basketService.setMiSelectedValue(_this.workingOn.basket.id, mi, results_1[mi.id], null);
+                                            return _this.basketService.setMiSelectedValue(_this.workingOn.basket.id, mi, results_1[mi.id], null);
                                         }
-                                    });
-                                });
-                            }
-                            else {
-                                Object.entries(this.workingOn.required).forEach(function (_a) {
-                                    var _b = __read(_a, 2), biId = _b[0], mis = _b[1];
-                                    _this.basketService.removeBasketItem(_this.workingOn.basket.id, _this.workingOn.basket.basketItems.find(function (bi) { return bi.id === biId; }));
-                                });
-                            }
+                                        else {
+                                            return Promise.resolve();
+                                        }
+                                    }));
+                                }))];
+                        case 2:
+                            _a.sent();
                             this.workingOn = null;
-                            _a.label = 2;
-                        case 2: return [2 /*return*/];
+                            return [3 /*break*/, 5];
+                        case 3: return [4 /*yield*/, Promise.all(Object.entries(this.workingOn.required).map(function (_a) {
+                                var _b = __read(_a, 2), biId = _b[0], mis = _b[1];
+                                return _this.basketService.removeBasketItem(_this.workingOn.basket.id, _this.workingOn.basket.basketItems.find(function (bi) { return bi.id === biId; }));
+                            }))];
+                        case 4:
+                            _a.sent();
+                            this.workingOn = null;
+                            _a.label = 5;
+                        case 5: return [2 /*return*/];
                     }
                 });
             });
@@ -18208,7 +19097,7 @@
             this.id = basket.id;
             this.title = basket.title;
             var toSend = Object.assign(Object.assign({}, basket), (basket.basketItems || []).reduce(function (accum, item, index) {
-                var _a, _b;
+                var _a, _b, _c;
                 if (!accum.prices[item.currency]) {
                     accum.prices[item.currency] = 0;
                 }
@@ -18222,7 +19111,8 @@
                         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;
@@ -18241,7 +19131,7 @@
         return InternalBasket;
     }());
     var BaseEnterpriseBasketService = /** @class */ (function () {
-        function BaseEnterpriseBasketService(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) {
+        function BaseEnterpriseBasketService(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) {
             var _this = this;
             this.acceptNewPriceUpdater = acceptNewPriceUpdater;
             this.addItemToBasketUpdater = addItemToBasketUpdater;
@@ -18268,6 +19158,7 @@
             this.getCancellationInfoFetcher = getCancellationInfoFetcher;
             this.userService = userService;
             this.modalService = modalService;
+            this.webTokenService = webTokenService;
             this.currentBaskets = [];
             this.highlightBasketItemsEmitter = new rxjs.Subject();
             this.basketChangeEmitter = new rxjs.BehaviorSubject('');
@@ -18329,7 +19220,10 @@
                     price: 0
                 }
             ];
-            this.basketPrices = new rxjs.BehaviorSubject({ total: null, list: this.basketList });
+            this.basketPrices = new rxjs.BehaviorSubject({
+                total: null,
+                list: this.basketList
+            });
             this.menuState = exports.MenuSlideEnum.OUT;
             this.requiresService = new BaseRequiresReasonService(modalService, this);
             this.userService.changeUser.subscribe({
@@ -18383,7 +19277,6 @@
                     else {
                         _this.currentBasketID = null;
                     }
-                    _this.basketChangeEmitter.next(_this.currentBasketID);
                 }, function (error) {
                     console.error(error);
                 });
@@ -18393,7 +19286,6 @@
                 this.currentBaskets = [];
                 this.currentBasketID = null;
                 this.baskets.next(this.currentBaskets);
-                this.basketChangeEmitter.next(this.currentBasketID);
             }
         };
         BaseEnterpriseBasketService.prototype.getAllOpenBaskets = function (user_id) {
@@ -18420,42 +19312,81 @@
         BaseEnterpriseBasketService.prototype.addToBasket = function (item, intBasket, searchService, travellers, requiresReason) {
             if (travellers === void 0) { travellers = []; }
             return __awaiter(this, void 0, void 0, function () {
+                var _d;
                 var _this = this;
-                return __generator(this, function (_d) {
-                    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.outboundDate = item.outboundDate
-                        ? new Date(this.helpers.formatIsoDateTime(item.outboundDate))
-                        : item.outboundDate;
-                    item.inboundDate = item.inboundDate
-                        ? new Date(this.helpers.formatIsoDateTime(item.inboundDate))
-                        : item.inboundDate;
-                    item.requiresReason = requiresReason;
-                    item = this.checkDetails(item);
-                    if (item && intBasket) {
-                        this.addItemToBasketUpdater
-                            .updateOne(item)
-                            .pipe(operators.take(1))
-                            .subscribe(function (newBasket) {
-                            intBasket.next(Object.assign(Object.assign({}, intBasket.subject.value), newBasket));
-                            var service = _this.userService.findService(item.service).type;
-                            searchService.search_objects[service].booking_chosen = true;
-                            searchService.search_objects[service].chosen = false;
-                            var bi = newBasket.basketItems;
-                            _this.highlightBasketItemsEmitter.next(bi);
-                            _this.basketChangeEmitter.next(_this.currentBasketID);
-                        }, function (error) {
-                            console.error(error);
-                            intBasket.subject.next(intBasket.subject.value);
-                        });
+                return __generator(this, function (_e) {
+                    switch (_e.label) {
+                        case 0: return [4 /*yield*/, this.checkBasketForInvoked(intBasket, this.webTokenService.bobo)];
+                        case 1:
+                            _d = _e.sent();
+                            switch (_d) {
+                                case exports.DifferentInvokdedUserReasons.continue: return [3 /*break*/, 2];
+                                case exports.DifferentInvokdedUserReasons.cancel: return [3 /*break*/, 3];
+                                case exports.DifferentInvokdedUserReasons.newBasket: return [3 /*break*/, 4];
+                                case exports.DifferentInvokdedUserReasons.research: return [3 /*break*/, 6];
+                            }
+                            return [3 /*break*/, 7];
+                        case 2: return [3 /*break*/, 7];
+                        case 3: return [2 /*return*/, exports.DifferentInvokdedUserReasons.cancel];
+                        case 4: return [4 /*yield*/, this.createBasket()];
+                        case 5:
+                            intBasket = _e.sent();
+                            this.currentBasketID = intBasket.id;
+                            return [3 /*break*/, 7];
+                        case 6:
+                            this.webTokenService.bobo = intBasket.subject.value.invokedUser;
+                            return [2 /*return*/, exports.DifferentInvokdedUserReasons.research];
+                        case 7:
+                            item.basket = intBasket.id;
+                            item.convertCurrencyTo = 'GBP';
+                            if ((travellers === null || travellers === void 0 ? void 0 : travellers.length) > 0) {
+                                item.users = this.helpers.makeUsers(travellers.filter(function (trav) { return !trav.guest; }));
+                                item.guests = this.helpers.makeUsers(travellers.filter(function (trav) { return 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))
+                                : item.outboundDate;
+                            item.inboundDate = item.inboundDate
+                                ? new Date(this.helpers.formatIsoDateTime(item.inboundDate))
+                                : item.inboundDate;
+                            item.requiresReason = requiresReason;
+                            item = this.checkDetails(item);
+                            this.removeBookedBasket();
+                            if (item && intBasket) {
+                                this.addItemToBasketUpdater
+                                    .updateOne(item)
+                                    .pipe(operators.take(1))
+                                    .subscribe(function (newBasket) {
+                                    intBasket.next(Object.assign(Object.assign({}, intBasket.subject.value), newBasket));
+                                    var service = _this.userService.findService(item.service).type;
+                                    searchService.search_objects[service].booking_chosen = true;
+                                    searchService.search_objects[service].chosen = false;
+                                    var bi = newBasket.basketItems;
+                                    _this.highlightBasketItemsEmitter.next(bi);
+                                }, function (error) {
+                                    console.error(error);
+                                    intBasket.subject.next(intBasket.subject.value);
+                                });
+                            }
+                            return [2 /*return*/, exports.DifferentInvokdedUserReasons.continue];
                     }
-                    return [2 /*return*/, false];
                 });
             });
         };
+        BaseEnterpriseBasketService.prototype.checkBasketForInvoked = function (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(exports.DifferentInvokdedUserReasons.continue);
+        };
         BaseEnterpriseBasketService.prototype.loadBasket = function (id) {
             var intBasket = this.findBasket(id);
             if (!intBasket) {
@@ -18639,9 +19570,12 @@
         };
         BaseEnterpriseBasketService.prototype.createBasketOnDB = function (intBasket) {
             var _this = this;
+            var _a, _b;
+            var 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(function (resolve, reject) {
                 _this.basketCreator
-                    .updateOne({})
+                    .updateOne(mutation)
                     .pipe(operators.take(1))
                     .subscribe(function (basket) {
                     intBasket.id = basket.id;
@@ -18733,7 +19667,6 @@
                     _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 rxjs.of(data);
                 }));
@@ -18787,16 +19720,18 @@
                 });
             }
         };
-        BaseEnterpriseBasketService.prototype.setLeadPassenger = function (basketid, basketItem, travellers, index) {
+        BaseEnterpriseBasketService.prototype.setLeadPassenger = function (basketid, basketItem, travellers, index, leadPassengerType) {
             var _this = this;
             if (index === void 0) { index = 0; }
+            if (leadPassengerType === void 0) { leadPassengerType = LeadPassengerType.User; }
             var 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(function () { }, function () { }, function () {
                     _this.setLeadPassenger(basket.id, basketItem, travellers, index + 1);
                 });
@@ -18853,7 +19788,8 @@
                     .subscribe(resolve, reject);
             });
         };
-        BaseEnterpriseBasketService.prototype.setMiFreeValue = function (basketid, miItem, freeValue, userId) {
+        BaseEnterpriseBasketService.prototype.setMiFreeValue = function (basketid, miItem, freeValue, userId, guest) {
+            var _this = this;
             if (userId === void 0) { userId = null; }
             var intBasket = this.findBasket(basketid);
             var args = {
@@ -18862,18 +19798,28 @@
                 miFreeValue: freeValue
             };
             if (!!userId) {
-                args.user = userId;
+                if (guest) {
+                    args.guest = userId;
+                }
+                else {
+                    args.user = userId;
+                }
             }
-            this.setBasketItemMiValueUpdater
-                .updateOne(args)
-                .pipe(operators.take(1))
-                .subscribe(function (basket) {
-                intBasket.next(basket);
-            }, function (_) { }, function () {
-                intBasket.next(intBasket.subject.value);
+            return new Promise(function (resolve, reject) {
+                _this.setBasketItemMiValueUpdater
+                    .updateOne(args)
+                    .pipe(operators.take(1))
+                    .subscribe(function (basket) {
+                    intBasket.next(basket);
+                }, function (error) {
+                    reject(error);
+                }, function () {
+                    intBasket.next(intBasket.subject.value);
+                    resolve();
+                });
             });
         };
-        BaseEnterpriseBasketService.prototype.setMiSelectedValue = function (basketid, miItem, selectedValue, userId) {
+        BaseEnterpriseBasketService.prototype.setMiSelectedValue = function (basketid, miItem, selectedValue, userId, guest) {
             if (userId === void 0) { userId = null; }
             var args = {
                 convertCurrencyTo: 'GBP',
@@ -18881,9 +19827,14 @@
                 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));
         };
         BaseEnterpriseBasketService.prototype.getMiAutoSugestions = function (miId, partialLabel, isLoading) {
             isLoading === null || isLoading === void 0 ? void 0 : isLoading.next(true);
@@ -18903,6 +19854,11 @@
                         item.save(basketId, user);
                     });
                 });
+                bmi.guests.forEach(function (user) {
+                    bmi.miPerGuest[user].managementInfo.forEach(function (item) {
+                        item.save(basketId, user, true);
+                    });
+                });
             });
         };
         BaseEnterpriseBasketService.prototype.sendBasketForApproval = function (basketid) {
@@ -18982,6 +19938,15 @@
                 basketItem: basketItem.id
             });
         };
+        BaseEnterpriseBasketService.prototype.removeBookedBasket = function () {
+            this.currentBaskets = this.currentBaskets.reduce(function (acc, basket) {
+                if (basket.subject.value.status !== BasketStatus.Booked) {
+                    acc.push(basket);
+                }
+                return acc;
+            }, []);
+            this.baskets.next(this.currentBaskets);
+        };
         return BaseEnterpriseBasketService;
     }());
 
@@ -19228,14 +20193,18 @@
     var USER_SIGNEDOUT = 'USER_SIGNEDOUT';
     var USER_SIGNEDIN = 'USER_SIGNEDIN';
     var BaseUserService = /** @class */ (function () {
-        function BaseUserService(getUserFetcher, userUiConfigsFetcher, userProductsFetcher, userMessagesFetcher, baseConfirmMessagesUpdater, setUserLanguageUpdater, editUserUpdater, storageService, helpers) {
+        function BaseUserService(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 = {
@@ -19253,9 +20222,10 @@
             var _this = this;
             var 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(operators.take(1))
                         .subscribe(function (user) {
@@ -19284,7 +20254,8 @@
                 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(operators.take(1))
@@ -19296,6 +20267,9 @@
             this.fullUserDetails.userData.next(user_data);
             this.storageService.setSessionItem('lightning_user_data', user_data);
         };
+        BaseUserService.prototype.canBookGuest = function () {
+            return this.fullUserDetails.allDetails.value.canBookGuest;
+        };
         BaseUserService.prototype.checkEmitUser = function () {
             if (!!this.fullUserDetails.userConfigs.value &&
                 !!this.fullUserDetails.userData.value &&
@@ -19492,17 +20466,33 @@
         BaseUserService.prototype.confirmMessages = function (id) {
             return this.baseConfirmMessagesUpdater.updateOne({ messages: id });
         };
-        BaseUserService.prototype.getUser = function () {
+        BaseUserService.prototype.userIsRoot = function () {
+            return this.fullUserDetails.userData.value.booker_type === BookerType.Root;
+        };
+        BaseUserService.prototype.userIsSupportAgent = function () {
+            return !!this.fullUserDetails.userData.value.support_agent;
+        };
+        BaseUserService.prototype.getUserCompanies = function (query) {
+            if (query === void 0) { query = null; }
+            return query
+                ? this.getCompaniesFetcher.fetchList({ query: query }).pipe(operators.take(1))
+                : this.getCompaniesFetcher.fetchList().pipe(operators.take(1));
+        };
+        BaseUserService.prototype.getCompanyById = function (id, withUsers) {
+            if (withUsers === void 0) { withUsers = false; }
+            return this.getCompanyFetcher.fetchOne({ id: id }).pipe(operators.take(1));
+        };
+        BaseUserService.prototype.getUser = function (userId) {
             var user = this.getfullUserDetails();
             return this.getUserFetcher.fetchOne({
-                id: user.userData.value.user_id.toString()
+                id: userId ? userId : user.userData.value.user_id.toString()
             });
         };
         BaseUserService.prototype.setUserLanguage = function (id) {
             return this.setUserLanguageUpdater.updateOne({ language: id });
         };
-        BaseUserService.prototype.getDocuments = function (type) {
-            return this.getUser().pipe(operators.map(function (user) { return user.documents || []; }), operators.map(function (docs) {
+        BaseUserService.prototype.getDocuments = function (type, userId) {
+            return this.getUser(userId).pipe(operators.map(function (user) { return user.documents || []; }), operators.map(function (docs) {
                 return type
                     ? docs.filter(function (doc) { return doc.docType === type; })
                     : docs;
@@ -19510,13 +20500,24 @@
         };
         BaseUserService.prototype.editUser = function (user) {
             var _this = this;
-            return this.editUserUpdater.updateOne(user).pipe(operators.tap(function (user) { return _this.fullUserDetails.allDetails.next(user); }));
+            return this.editUserUpdater
+                .updateOne(user)
+                .pipe(operators.tap(function (user) { return _this.fullUserDetails.allDetails.next(user); }));
+        };
+        BaseUserService.prototype.createGuest = function (newGuest) {
+            return this.createGuestUpdater.updateOne(newGuest).pipe(operators.take(1));
+        };
+        BaseUserService.prototype.getUserGuests = function () {
+            return this.getUserGuestsFetcher.fetchList();
+        };
+        BaseUserService.prototype.canInvokeUser = function () {
+            return this.fullUserDetails.allDetails.value.canInvokeUser;
         };
         return BaseUserService;
     }());
 
     var BaseLogonService = /** @class */ (function () {
-        function BaseLogonService(userService, modalService, http, router, eventMessenager, storageService, environment) {
+        function BaseLogonService(userService, modalService, http, router, eventMessenager, storageService, environment, webTokenService) {
             this.userService = userService;
             this.modalService = modalService;
             this.http = http;
@@ -19524,6 +20525,7 @@
             this.eventMessenager = eventMessenager;
             this.storageService = storageService;
             this.environment = environment;
+            this.webTokenService = webTokenService;
             this.loading = false;
             this.isLoggedIn = false;
             this.redirectUrl = '';
@@ -19591,6 +20593,39 @@
         BaseLogonService.prototype.setRefresh = function () {
             this.timeoutSubscription = window.setTimeout(this.refreshToken.bind(this), this.environment.authRefreshTimeout * 1000);
         };
+        BaseLogonService.prototype.becomeUser = function (username) {
+            var _this = this;
+            return new Promise(function (resolve, reject) {
+                _this.clearRefresh();
+                _this.http
+                    .post(exports.URLS.BECOME_USER, { username: username })
+                    .pipe(operators.take(1))
+                    .subscribe(function (data) {
+                    console.log(data);
+                    _this.userService.setUser(data.jwtObject);
+                    _this.router.navigate(['main']);
+                    resolve(true);
+                }, function (error) {
+                    reject(error);
+                });
+            });
+        };
+        BaseLogonService.prototype.endBecomeUserSession = function () {
+            var _this = this;
+            return new Promise(function (resolve, reject) {
+                _this.clearRefresh();
+                _this.http
+                    .post(exports.URLS.END_BECOME_USER, {})
+                    .pipe(operators.take(1))
+                    .subscribe(function (data) {
+                    console.log(data);
+                    _this.userService.setUser(data.jwtObject);
+                    resolve(true);
+                }, function (error) {
+                    reject(error);
+                });
+            });
+        };
         BaseLogonService.prototype.login = function (username, password, again) {
             var _this = this;
             this.userService.emptyUserData();
@@ -19602,6 +20637,7 @@
                 password: password
             })
                 .pipe(operators.take(1), operators.map(function (value, index) {
+                _this.webTokenService.bobo = null;
                 _this.setRefresh();
                 return _this.handleResponse(value);
             }));
@@ -19632,6 +20668,7 @@
             var 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(exports.URLS.LOGOUT_URL).subscribe(function (data) {
@@ -19674,7 +20711,7 @@
           **/
         BaseLogonService.prototype.recoverPassword = function (username) {
             return this.http.formEncodedPost(exports.URLS.RECOVER_PASSWORD_URL, {
-                username: "" + username,
+                username: "" + username
             }, 'text');
         };
         /*
@@ -21107,10 +22144,9 @@
     var FastTrackEnterpriseSearch = /** @class */ (function (_super) {
         __extends(FastTrackEnterpriseSearch, _super);
         function FastTrackEnterpriseSearch(fasttrackFetcher, helpers, basketService, storageService, searchService) {
-            var _this = _super.call(this, storageService, helpers) || this;
+            var _this = _super.call(this, storageService, helpers, searchService) || this;
             _this.fasttrackFetcher = fasttrackFetcher;
             _this.basketService = basketService;
-            _this.searchService = searchService;
             _this.type = ServiceType.FastTrack;
             _this._date = null;
             _this._time = null;
@@ -21269,7 +22305,7 @@
         FastTrackEnterpriseSearch.prototype.getSearchQuery = function () {
             var query = {
                 adults: this.tempParams.adults,
-                children: this.tempParams.children,
+                children: this.tempParams.children ? this.tempParams.children : null,
                 locationCode: this._locationCode,
                 arrivalDatetime: this.tempParams.arrivalDatetime
             };
@@ -21304,6 +22340,26 @@
             });
             this.searchService.startSearches();
         };
+        FastTrackEnterpriseSearch.prototype.updateSearchFromExpiredBasketItem = function (basketItem) {
+            var _this = this;
+            var searchFastTrackQuery = basketItem.searchQuery;
+            this.arrivalDatetime = moment__default['default'](searchFastTrackQuery.arrivalDatetime);
+            this.searchService
+                .getAirportByCode(searchFastTrackQuery.locationCode)
+                .subscribe(function (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)
+                    };
+                }
+            });
+        };
         FastTrackEnterpriseSearch.prototype.updateFromPreviousSearches = function (previousItems) {
             var _a;
             console.log('PREPOPULATING LOUNGE FORM');
@@ -21338,40 +22394,43 @@
         FastTrackEnterpriseSearch.prototype.addFastTrackToBasket = function (fasttrackQuote, fasttrackQuery) {
             var _a;
             return __awaiter(this, void 0, void 0, function () {
-                var intBasket, basket, termsAndConditions;
+                var intBasket, basket, termsAndConditions, whatHappened;
                 return __generator(this, function (_g) {
                     switch (_g.label) {
                         case 0:
                             if (fasttrackQuote.unavailable) {
-                                return [2 /*return*/, Promise.resolve(false)];
+                                return [2 /*return*/, Promise.resolve(exports.DifferentInvokdedUserReasons.cancel)];
                             }
                             return [4 /*yield*/, this.basketService.getDefaultBasket()];
                         case 1:
                             intBasket = _g.sent();
                             basket = intBasket === null || intBasket === void 0 ? void 0 : intBasket.subject.value;
                             termsAndConditions = this.getTermsAndCond(fasttrackQuote);
-                            if (basket) {
-                                return [2 /*return*/, this.basketService.addToBasket({
-                                        adults: fasttrackQuery.adults,
-                                        children: fasttrackQuery.children,
-                                        basket: basket.id,
-                                        service: fasttrackQuote.sourceId.toString(),
-                                        detail: {
-                                            arrivalDatetime: fasttrackQuery.arrivalDatetime.format(),
-                                            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
-                                        },
-                                        price: fasttrackQuote.price,
-                                        currency: fasttrackQuote.currency,
-                                        searchQuery: fasttrackQuery,
-                                        outboundDate: fasttrackQuery.arrivalDatetime.format()
-                                    }, intBasket, this.searchService, this.travellers, fasttrackQuote.requiresReason)];
+                            if (!basket) return [3 /*break*/, 3];
+                            return [4 /*yield*/, this.basketService.addToBasket({
+                                    adults: fasttrackQuery.adults,
+                                    children: fasttrackQuery.children,
+                                    basket: basket.id,
+                                    service: fasttrackQuote.sourceId.toString(),
+                                    detail: {
+                                        arrivalDatetime: fasttrackQuery.arrivalDatetime.format(),
+                                        locationCode: fasttrackQuote.code,
+                                        name: fasttrackQuote.name,
+                                        airportIata: fasttrackQuery === null || fasttrackQuery === void 0 ? void 0 : fasttrackQuery.locationCode,
+                                        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)];
+                        case 2:
+                            whatHappened = _g.sent();
+                            if (whatHappened === exports.DifferentInvokdedUserReasons.research) {
+                                this.performSearch();
                             }
-                            return [2 /*return*/, Promise.resolve(false)]; // TODO should this throw an error?
+                            return [2 /*return*/, whatHappened];
+                        case 3: return [2 /*return*/, exports.DifferentInvokdedUserReasons.cancel];
                     }
                 });
             });
@@ -21471,6 +22530,7 @@
             this.baseSaveFavouriteSearchUpdater = baseSaveFavouriteSearchUpdater;
             this.getRailStationFetcher = getRailStationFetcher;
             this.getIrlSupplierStationFetcher = getIrlSupplierStationFetcher;
+            this.baseWebTokenService = baseWebTokenService;
             this.riskAlertsFetcher = riskAlertsFetcher;
             this.getUserRecentSearchesFetcher = getUserRecentSearchesFetcher;
             this.getRailCardsFetcher = getRailCardsFetcher;
@@ -21852,6 +22912,14 @@
                 return rxjs.of([]);
             }
         };
+        BaseEnterpriseSearchService.prototype.getRailStationById = function (id) {
+            if (id) {
+                return this.getRailStationFetcher.fetchList({ id: id }).pipe(operators.take(1));
+            }
+            else {
+                return rxjs.of();
+            }
+        };
         /**
          * @description - get irl station locations
          * @param term - the term to search
@@ -22010,6 +23078,9 @@
         BaseEnterpriseSearchService.prototype.updateTravellerInformation = function () {
             this.storageService.setSessionItem(BaseEnterpriseSearchService.SESSION_TRAVELLER, this.selectedTravellers);
             this.travellerInformation.next(__spread(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,
@@ -22041,7 +23112,8 @@
         BaseEnterpriseSearchService.prototype.getSelectedOptions = function () {
             var _this = this;
             return Object.keys(this.search_objects).reduce(function (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;
@@ -22073,13 +23145,14 @@
         };
         BaseEnterpriseSearchService.prototype.canSearch = function (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;
                 }
@@ -22095,61 +23168,15 @@
          *   travellers (or will do when it's complete) TODO - add Flight, Rail Car
          **/
         BaseEnterpriseSearchService.prototype.getAllErrorMessages = function () {
-            var concattedErrors = this.travellerValidationMessages;
-            if (this.search_objects[ServiceType.Lounge].chosen &&
-                this.canSearch(ServiceType.Lounge)) {
-                concattedErrors.push.apply(concattedErrors, __spread(this.searches[ServiceType.Lounge].validationMessages));
-            }
-            if (this.search_objects[ServiceType.Car].chosen &&
-                this.canSearch(ServiceType.Car)) {
-                concattedErrors.push.apply(concattedErrors, __spread(this.searches[ServiceType.Car].validationMessages));
-            }
-            if (this.search_objects[ServiceType.Rail].chosen &&
-                this.canSearch(ServiceType.Rail)) {
-                concattedErrors.push.apply(concattedErrors, __spread(this.searches[ServiceType.Rail].validationMessages));
-            }
-            if (this.search_objects[ServiceType.Parking].chosen &&
-                this.canSearch(ServiceType.Parking)) {
-                concattedErrors.push.apply(concattedErrors, __spread(this.searches[ServiceType.Parking].validationMessages));
-            }
-            if (this.search_objects[ServiceType.Cab].chosen &&
-                this.canSearch(ServiceType.Cab)) {
-                concattedErrors.push.apply(concattedErrors, __spread(this.searches[ServiceType.Cab].validationMessages));
-            }
-            if (this.search_objects[ServiceType.Hotel].chosen &&
-                this.canSearch(ServiceType.Hotel)) {
-                concattedErrors.push.apply(concattedErrors, __spread(this.searches[ServiceType.Hotel].validationMessages));
-            }
-            if (this.search_objects[ServiceType.FastTrack].chosen &&
-                this.canSearch(ServiceType.FastTrack)) {
-                concattedErrors.push.apply(concattedErrors, __spread(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);
-            }*/
+            var _this = this;
+            var concattedErrors = Object.entries(this.search_objects).reduce(function (accum, _d) {
+                var _e = __read(_d, 2), type = _e[0], searchObject = _e[1];
+                if ((searchObject === null || searchObject === void 0 ? void 0 : searchObject.chosen) && _this.canSearch(type)) {
+                    accum.push.apply(accum, __spread(_this.searches[type]
+                        .validationMessages));
+                }
+                return accum;
+            }, this.travellerValidationMessages);
             this.errors.next(concattedErrors);
             return concattedErrors;
         };
@@ -22246,9 +23273,9 @@
             // }, this.environment.searchTimeout);
             try {
                 Promise.all(Object.values(this.searches).map(function (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(function () {
@@ -22725,7 +23752,8 @@
                 travellingTo: null,
                 via: false,
                 viaLocation: null,
-                railCards: null
+                railCards: [],
+                transactionIdentifier: null
             };
             return this.helpers.sanatizeReturns(defaultVal, Object.assign.apply(Object, __spread([{}], args)), ['inBoundDateTime', 'outBoundDateTime']);
         };
@@ -22871,7 +23899,9 @@
             return this.deleteFavouriteSearchUpdater.updateOne({ id: id });
         };
         BaseEnterpriseSearchService.prototype.saveRecentSearch = function (query) {
-            if (query) {
+            if (query &&
+                !this.selectedTravellers.find(function (traveller) { return traveller.guest; })) {
+                // prevent it saving recent searches with guests - atm it's erroring
                 this.baseSaveRecentSearchUpdater
                     .updateOne(query)
                     .pipe(operators.take(1))
@@ -22971,7 +24001,7 @@
                     var age;
                     if (traveller.dob) {
                         var timeDiff = Math.abs(new Date().getTime() - new Date(traveller.dob).getTime());
-                        age = Math.floor((timeDiff / (1000 * 3600 * 24)) / 365);
+                        age = Math.floor(timeDiff / (1000 * 3600 * 24) / 365);
                     }
                     return {
                         name: traveller.name,
@@ -22980,7 +24010,9 @@
                         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(function (irlJourney) {
@@ -23017,6 +24049,9 @@
         BaseEnterpriseSearchService.prototype.sendOfflineNotification = function (jrfReference) {
             return this.sendOfflineNotificationFetcher.fetchOne(jrfReference);
         };
+        BaseEnterpriseSearchService.prototype.getCountries = function () {
+            return this.countries;
+        };
         return BaseEnterpriseSearchService;
     }());
     BaseEnterpriseSearchService.SESSION_TRAVELLER = 'search_travellers';
@@ -23035,6 +24070,7 @@
             this.timer = null;
             this.timeoutDuration = 60 * 60;
             this.autoLogoutConfig = {};
+            this._bobo = null;
             this.timeOutDuration = environment.autoLogoutTime;
         }
         Object.defineProperty(BaseWebTokenService.prototype, "timeOutDuration", {
@@ -23059,6 +24095,16 @@
             enumerable: false,
             configurable: true
         });
+        Object.defineProperty(BaseWebTokenService.prototype, "bobo", {
+            get: function () {
+                return this._bobo;
+            },
+            set: function (value) {
+                this._bobo = value || null;
+            },
+            enumerable: false,
+            configurable: true
+        });
         BaseWebTokenService.prototype._updateTimer = function () {
             var _this = this;
             window.clearTimeout(this.timer);
@@ -23640,6 +24686,18 @@
         return BaseEditUserUpdater;
     }(UpdateableObject));
 
+    var BaseCreateGuestUpdater = /** @class */ (function (_super) {
+        __extends(BaseCreateGuestUpdater, _super);
+        function BaseCreateGuestUpdater(createBasketGQL, modalService) {
+            return _super.call(this, createBasketGQL, modalService) || this;
+        }
+        BaseCreateGuestUpdater.prototype.getDataFromResult = function (results) {
+            var _a;
+            return (_a = results === null || results === void 0 ? void 0 : results.data) === null || _a === void 0 ? void 0 : _a.createGuest;
+        };
+        return BaseCreateGuestUpdater;
+    }(UpdateableObject));
+
     /**
      * Generated bundle index. Do not edit.
      */
@@ -23661,6 +24719,7 @@
     exports.BaseConfermaOfficeNamesFetcher = BaseConfermaOfficeNamesFetcher;
     exports.BaseConfirmMessagesUpdater = BaseConfirmMessagesUpdater;
     exports.BaseCreateBasketUpdater = BaseCreateBasketUpdater;
+    exports.BaseCreateGuestUpdater = BaseCreateGuestUpdater;
     exports.BaseDeleteBasketUpdater = BaseDeleteBasketUpdater;
     exports.BaseDeleteFavouriteSearchUpdater = BaseDeleteFavouriteSearchUpdater;
     exports.BaseDeleteRecentSearchUpdater = BaseDeleteRecentSearchUpdater;
@@ -23680,6 +24739,8 @@
     exports.BaseGetBasketFetcher = BaseGetBasketFetcher;
     exports.BaseGetCancellationInfoFetcher = BaseGetCancellationInfoFetcher;
     exports.BaseGetCarHireProvidersFetcher = BaseGetCarHireProvidersFetcher;
+    exports.BaseGetCompaniesFetcher = BaseGetCompaniesFetcher;
+    exports.BaseGetCompanyFetcher = BaseGetCompanyFetcher;
     exports.BaseGetConfermaRoomImagesFetcher = BaseGetConfermaRoomImagesFetcher;
     exports.BaseGetCovidMicrositeTokenFetcher = BaseGetCovidMicrositeTokenFetcher;
     exports.BaseGetFlightFareRulesFetcher = BaseGetFlightFareRulesFetcher;
@@ -23697,6 +24758,7 @@
     exports.BaseGetUserCurrentCarbonAllowanceFetcher = BaseGetUserCurrentCarbonAllowanceFetcher;
     exports.BaseGetUserFavouriteSearchesFetcher = BaseGetUserFavouriteSearchesFetcher;
     exports.BaseGetUserFetcher = BaseGetUserFetcher;
+    exports.BaseGetUserGuestsFetcher = BaseGetUserGuestsFetcher;
     exports.BaseGetUserRecentSearchesFetcher = BaseGetUserRecentSearchesFetcher;
     exports.BaseHelperRoutines = BaseHelperRoutines;
     exports.BaseHotelAvalibilityQuoteFetcher = BaseHotelAvalibilityQuoteFetcher;
@@ -23789,6 +24851,7 @@
     exports.defaultValidations = defaultValidations;
     exports.excludedExpression = excludedExpression;
     exports.filtersKeys = filtersKeys;
+    exports.includedAccessibilityExpression = includedAccessibilityExpression;
     exports.includedExpression = includedExpression;
     exports.makeManagamentInfo = makeManagamentInfo;
     exports.maxTravellerWellbeing = maxTravellerWellbeing;