@sabstravtech/obtservices 0.0.26051001 → 0.1.6161600

package/fesm2015/sabstravtech-obtservices-base.js

@@ -1,4 +1,4 @@
-import { BehaviorSubject, of, Subject, combineLatest, Subscription, forkJoin } from 'rxjs';
+import { BehaviorSubject, of, Subject, combineLatest, forkJoin, Subscription } from 'rxjs';
 import { take, map, catchError, debounceTime, distinctUntilChanged, switchMap, tap } from 'rxjs/operators';
 import _, { cloneDeep } from 'lodash';
 import { __awaiter, __decorate, __metadata, __rest } from 'tslib';
@@ -6,7 +6,7 @@ import moment from 'moment';
 import Ajv from 'ajv';
 
 class BaseEnterpriseSearch {
-    constructor(storageService, helpers, searchService) {
+    constructor(storageService, helpers, searchService, userService) {
         this.storageService = storageService;
         this.helpers = helpers;
         this.searchService = searchService;
@@ -54,6 +54,8 @@ class BaseEnterpriseSearch {
             try {
                 results.pipe(take(1)).subscribe((results1) => {
                     console.log('Got results', cloneDeep(results1));
+                    this.rawResults = Object.freeze(results1);
+                    this.storageService.setSessionItem(this.resultsSessionName + '_raw', this.rawResults);
                     this.fullResults = Object.freeze(this.processResults(results1));
                     this._cheapestResultPrice = this.updateLowestPrice(this.fullResults);
                     this.storageService.setSessionItem(this.resultsSessionName, this.makeSessionResults(this.fullResults));
@@ -63,8 +65,9 @@ class BaseEnterpriseSearch {
                     resolve(false);
                     this.isLoading.next(false);
                 }, () => {
+                    var _a;
                     this.isLoading.next(false);
-                    resolve(this.fullResults.length !== 0);
+                    resolve(((_a = this.fullResults) === null || _a === void 0 ? void 0 : _a.length) !== 0);
                 });
             }
             catch (err) {
@@ -254,6 +257,7 @@ var CabHireVehicleType;
     CabHireVehicleType["StandardCar"] = "StandardCar";
     CabHireVehicleType["Suv"] = "SUV";
     CabHireVehicleType["BlackCab"] = "BlackCab";
+    CabHireVehicleType["HackneyCarriage"] = "HackneyCarriage";
     CabHireVehicleType["TaxiSuv"] = "TaxiSUV";
 })(CabHireVehicleType || (CabHireVehicleType = {}));
 var CarHireClass;
@@ -491,6 +495,12 @@ var CurrencyCode;
     CurrencyCode["Zmw"] = "ZMW";
     CurrencyCode["Zwl"] = "ZWL";
 })(CurrencyCode || (CurrencyCode = {}));
+var DepartTimeType;
+(function (DepartTimeType) {
+    DepartTimeType["Anytime"] = "Anytime";
+    DepartTimeType["DepartAfter"] = "DepartAfter";
+    DepartTimeType["ArriveBefore"] = "ArriveBefore";
+})(DepartTimeType || (DepartTimeType = {}));
 var DistanceTypes;
 (function (DistanceTypes) {
     DistanceTypes["K"] = "K";
@@ -661,6 +671,7 @@ var ServiceType;
     ServiceType["Flight"] = "FLIGHT";
     ServiceType["Eurostar"] = "EUROSTAR";
     ServiceType["InternationalRail"] = "INTERNATIONAL_RAIL";
+    ServiceType["Ferry"] = "FERRY";
     ServiceType["Rail"] = "RAIL";
     ServiceType["Hotel"] = "HOTEL";
     ServiceType["Car"] = "CAR";
@@ -670,6 +681,12 @@ var ServiceType;
     ServiceType["Cab"] = "CAB";
     ServiceType["Coach"] = "COACH";
 })(ServiceType || (ServiceType = {}));
+var TicketType;
+(function (TicketType) {
+    TicketType["None"] = "None";
+    TicketType["Fixed"] = "Fixed";
+    TicketType["Flexible"] = "Flexible";
+})(TicketType || (TicketType = {}));
 var UiConfigTarget;
 (function (UiConfigTarget) {
     UiConfigTarget["All"] = "ALL";
@@ -728,9 +745,13 @@ class FreeTextManagementInfo extends ManagementInfoAndIsValid {
         this.tempValue = this.selectedValues
             ? ((_a = this.selectedValues[0]) === null || _a === void 0 ? void 0 : _a.freeValue) || ''
             : '';
+        if (this.defaultValue && !this.selectedValues.length) {
+            this.value = this.defaultValue.value;
+            this.selectedValues[0].freeValue = this.defaultValue.value;
+        }
     }
     getValue() {
-        return this.tempValue;
+        return this.selectedValues[0] ? this.selectedValues[0].freeValue : '';
     }
     setValue(val) {
         if (this.tempValue === val) {
@@ -749,27 +770,32 @@ class FreeTextManagementInfo extends ManagementInfoAndIsValid {
         this.basketService.setMiFreeValue(basketid, this, this.selectedValues[0] ? this.selectedValues[0].freeValue : '', userId, guest);
     }
     hasErrors(value) {
-        return new Promise((resolve, reject) => {
-            if (this.mandatory && (!value || value.length === 0)) {
-                resolve({ hasErrors: true });
-            }
-            if (this.valueMask && !!value) {
-                return this.basketService
-                    .validateFreeValeMi(this, value)
-                    .then((result) => {
-                    resolve(result ? null : { hasErrors: true });
-                });
-            }
-            else if (this.values.length > 0) {
-                resolve(!!this.values.find((miv) => {
-                    return miv.value === value;
-                })
-                    ? null
-                    : { hasErrors: true });
-            }
-            else {
-                resolve(super.hasErrors(value));
-            }
+        const _super = Object.create(null, {
+            hasErrors: { get: () => super.hasErrors }
+        });
+        return __awaiter(this, void 0, void 0, function* () {
+            return new Promise((resolve, reject) => {
+                if (this.mandatory && (!value || value.length === 0)) {
+                    resolve({ hasErrors: true });
+                }
+                if (this.valueMask && !!value) {
+                    return this.basketService
+                        .validateFreeValeMi(this, value)
+                        .then((result) => {
+                        resolve(result ? null : { hasErrors: true });
+                    });
+                }
+                else if (this.values.length > 0) {
+                    resolve(!!this.values.find((miv) => {
+                        return miv.value === value;
+                    })
+                        ? null
+                        : { hasErrors: true });
+                }
+                else {
+                    resolve(_super.hasErrors.call(this, value));
+                }
+            });
         });
     }
 }
@@ -794,21 +820,28 @@ class AutoSugestManagementInfo extends ManagementInfoAndIsValid {
         else {
             console.error('No values for AutoSugest field');
         }
+        if (this.defaultValue && !this.selectedValues.length) {
+            this.value = this.defaultValue.value;
+            this.selectedValues[0].value = {
+                id: this.defaultValue.valueId,
+                label: this.defaultValue.label,
+                value: this.defaultValue.value,
+                default: true,
+                fixed: false,
+                agentOnly: false
+            };
+        }
     }
     getValue() {
         return this.selectedValues[0] ? this.selectedValues[0].value.id : '__NONE';
     }
     hasErrors(value) {
         return __awaiter(this, void 0, void 0, function* () {
-            try {
-                return !this.avaliableItems.find((value1) => {
-                    return value1.id === value.id;
-                })
-                    ? { hasErrors: true }
-                    : null;
+            if (!value || value.length === 0) {
+                return ({ hasErrors: true });
             }
-            catch (error) {
-                return null;
+            if (this.value.length > 0) {
+                return (this.avaliableItems.find((value1) => { return value1.id === value.id; }) ? null : { hasErrors: true });
             }
         });
     }
@@ -868,8 +901,15 @@ class DropdownManagementInfo extends ManagementInfoAndIsValid {
             console.error('No values for Dropdown MI field  ');
         }
         if (this.defaultValue && !this.selectedValues.length) {
-            this.value = this.defaultValue.id;
-            this.selectedValues[0].value = this.defaultValue;
+            this.value = this.defaultValue.valueId;
+            this.selectedValues[0].value = {
+                id: this.defaultValue.valueId,
+                label: this.defaultValue.label,
+                value: this.defaultValue.value,
+                default: true,
+                fixed: false,
+                agentOnly: false
+            };
         }
     }
     getValue() {
@@ -1051,6 +1091,7 @@ var SchemaFormat;
     SchemaFormat["apis"] = "apis";
     SchemaFormat["mandatoryIfEticket"] = "mandatory-if-eticket";
     SchemaFormat["mandatoryIfTod"] = "mandatory-if-tod";
+    SchemaFormat["countryIsoCode"] = "countryIsoCode";
 })(SchemaFormat || (SchemaFormat = {}));
 var Widgets;
 (function (Widgets) {
@@ -1126,8 +1167,8 @@ const BreakBastExcluded = [
 const AccessibleIncluded = [
     'Accessibility',
     'Accessible and Disabled',
-    'Accessible',
-    'Disabled'
+    'Disabled',
+    'Mobility Access'
 ];
 const excludedPattern = '(' + BreakBastExcluded.join(')|(') + ')';
 const includedPattern = '(' + BreakFastIncluded.join(')|(') + ')';
@@ -3003,9 +3044,7 @@ class BookableBasket {
         })) {
             return this.workoutState(basket, BookingStatus.ApprovedPaymentOption);
         }
-        console.log(basket.suppInfo);
         const haveSuppDetails = basket.suppInfo.find((supp) => supp.hasDetails);
-        console.log(haveSuppDetails);
         if (haveSuppDetails) {
             status = BookingStatus.ApprovedSupplemtal;
         }
@@ -3232,7 +3271,18 @@ const COACH_MAX_INFANT_AGE_YEARS = 0;
 const LOUNGES_MAX_INFANT_AGE_YEARS = 0;
 const METRES_TO_MILES_CONVERSION = 1609;
 const TIME_BASE = 60;
-const GROUP_TICKET_CODES = ['GS', 'AIG', 'GRP', 'GU3', 'GU4', 'GUC', 'MPG', '2TR', 'SGU'];
+const GROUP_TICKET_CODES = [
+    'GS',
+    'AIG',
+    'GRP',
+    'GU3',
+    'GU4',
+    'GUC',
+    'MPG',
+    '2TR',
+    'SGU',
+    'GSU'
+];
 class BaseHelperRoutines {
     isGroupTicket(code) {
         return GROUP_TICKET_CODES.includes(code.toUpperCase().trim());
@@ -3935,6 +3985,8 @@ class BaseHelperRoutines {
                 }
                 return value;
                 break;
+            case 'passport':
+                return value ? this.toStrings(value, schema) : isRequired ? {} : null;
             default:
                 console.warn(`+++ unknown schema type ${schema.type} | returning value as is +++`);
                 return value;
@@ -4636,11 +4688,12 @@ var ActionType;
 })(ActionType || (ActionType = {}));
 
 class CabHireEnterpriseSearch extends BaseEnterpriseSearch {
-    constructor(cabfetcher, helpers, storageService, searchService, basketService) {
-        super(storageService, helpers, searchService);
+    constructor(cabfetcher, helpers, storageService, searchService, basketService, userService) {
+        super(storageService, helpers, searchService, userService);
         this.cabfetcher = cabfetcher;
         this.basketService = basketService;
         this.type = ServiceType.Cab;
+        this.travellers = [];
         this.airportChange = new Subject();
         this.transTypes = [
             { key: CabHireVehicleType.Any, value: 'Any (1-8 Passengers)', id: 8 },
@@ -4718,6 +4771,10 @@ class CabHireEnterpriseSearch extends BaseEnterpriseSearch {
          * flightNumber
          */
         this._flightNumber = '';
+        /*
+         * flightNumber
+         */
+        this._returnFlightNumber = '';
         /*
          * terminal
          */
@@ -4850,6 +4907,12 @@ class CabHireEnterpriseSearch extends BaseEnterpriseSearch {
     set flightNumber(value) {
         this._flightNumber = value;
     }
+    get returnFlightNumber() {
+        return this._returnFlightNumber;
+    }
+    set returnFlightNumber(value) {
+        this._returnFlightNumber = value;
+    }
     /*
      * airport
      */
@@ -5044,6 +5107,13 @@ class CabHireEnterpriseSearch extends BaseEnterpriseSearch {
             this.returnDateTime.isSameOrBefore(this.departs)) {
             this.validationMessages.push('Return Date/Time must be after outbound date/time');
         }
+        if (this.travellers.length > 4) {
+            // use id from travel type to see if
+            if (this.transTypes.find((type) => type.key === this.tempParams.vehicleType)
+                .id < this.travellers.length) {
+                this.validationMessages.push(`The number of passengers exceeds the available vehicle capacity for the ${this.tempParams.vehicleType} taxi`);
+            }
+        }
         this.isValid.next(this.validationMessages.length === 0);
         this.messages.next(this.validationMessages);
     }
@@ -5186,7 +5256,7 @@ class CabHireEnterpriseSearch extends BaseEnterpriseSearch {
                 results = results.sort((a, b) => b.price - a.price);
             }
             else {
-                results = results.sort((a, b) => a.price - b.price);
+                results = results === null || results === void 0 ? void 0 : results.sort((a, b) => a.price - b.price);
             }
             this.results.next(results);
         }
@@ -5271,10 +5341,134 @@ class CabHireEnterpriseSearch extends BaseEnterpriseSearch {
         return this.inboundVisibility;
     }
     updateFromPreviousSearches(previousItems) {
-        var _a;
+        var _a, _b, _c, _d, _e, _f, _g, _h;
         const flightItem = (_a = previousItems[ServiceType.Flight]) === null || _a === void 0 ? void 0 : _a.searchQuery;
+        const railItem = (_b = previousItems[ServiceType.Rail]) === null || _b === void 0 ? void 0 : _b.searchQuery;
+        const irlItem = (_c = previousItems[ServiceType.InternationalRail]) === null || _c === void 0 ? void 0 : _c.searchQuery;
+        const hotelItem = (_d = previousItems[ServiceType.Rail]) === null || _d === void 0 ? void 0 : _d.searchQuery;
+        const carItem = (_e = previousItems[ServiceType.Car]) === null || _e === void 0 ? void 0 : _e.searchQuery;
+        const loungeItem = (_f = previousItems[ServiceType.Lounge]) === null || _f === void 0 ? void 0 : _f.searchQuery;
+        const parkingItem = (_g = previousItems[ServiceType.Parking]) === null || _g === void 0 ? void 0 : _g.searchQuery;
+        const eurostarItem = (_h = previousItems[ServiceType.Eurostar]) === null || _h === void 0 ? void 0 : _h.searchQuery;
         if (flightItem) {
-            // TODO flights haven't been done yet.
+            try {
+                if (previousItems.FLIGHT.inboundDate) {
+                    const dateArray = previousItems.FLIGHT.inboundDate.split("-");
+                    this.date = this.helpers.yyyymmddTimeToNgDate(`${dateArray[0]}${dateArray[1]}${dateArray[2].substring(0, 2)}`, "");
+                }
+                else if (previousItems.FLIGHT.outboundDate) {
+                    const dateArray = previousItems.FLIGHT.outboundDate.split("-");
+                    this.date = this.helpers.yyyymmddTimeToNgDate(`${dateArray[0]}${dateArray[1]}${dateArray[2].substring(0, 2)}`, "");
+                }
+            }
+            catch (_j) {
+                console.error('Error trying to prepopulate cabhire from flight item');
+            }
+        }
+        else if (railItem) {
+            try {
+                if (previousItems.RAIL.inboundDate) {
+                    const dateArray = previousItems.RAIL.inboundDate.split("-");
+                    this.date = this.helpers.yyyymmddTimeToNgDate(`${dateArray[0]}${dateArray[1]}${dateArray[2].substring(0, 2)}`, "");
+                }
+                else if (previousItems.RAIL.outboundDate) {
+                    const dateArray = previousItems.RAIL.outboundDate.split("-");
+                    this.date = this.helpers.yyyymmddTimeToNgDate(`${dateArray[0]}${dateArray[1]}${dateArray[2].substring(0, 2)}`, "");
+                }
+            }
+            catch (_k) {
+                console.error('Error trying to prepopulate cabhire from rail item');
+            }
+        }
+        else if (irlItem) {
+            try {
+                if (previousItems.INTERNATIONAL_RAIL.inboundDate) {
+                    const dateArray = previousItems.INTERNATIONAL_RAIL.inboundDate.split("-");
+                    this.date = this.helpers.yyyymmddTimeToNgDate(`${dateArray[0]}${dateArray[1]}${dateArray[2].substring(0, 2)}`, "");
+                }
+                else if (previousItems.INTERNATIONAL_RAIL.outboundDate) {
+                    const dateArray = previousItems.INTERNATIONAL_RAIL.outboundDate.split("-");
+                    this.date = this.helpers.yyyymmddTimeToNgDate(`${dateArray[0]}${dateArray[1]}${dateArray[2].substring(0, 2)}`, "");
+                }
+            }
+            catch (_l) {
+                console.error('Error trying to prepopulate cabhire from international rail item');
+            }
+        }
+        else if (hotelItem) {
+            try {
+                if (previousItems.HOTEL.inboundDate) {
+                    const dateArray = previousItems.HOTEL.inboundDate.split("-");
+                    this.date = this.helpers.yyyymmddTimeToNgDate(`${dateArray[0]}${dateArray[1]}${dateArray[2].substring(0, 2)}`, "");
+                }
+                else if (previousItems.HOTEL.outboundDate) {
+                    const dateArray = previousItems.HOTEL.outboundDate.split("-");
+                    this.date = this.helpers.yyyymmddTimeToNgDate(`${dateArray[0]}${dateArray[1]}${dateArray[2].substring(0, 2)}`, "");
+                }
+            }
+            catch (_m) {
+                console.error('Error trying to prepopulate cabhire from hotel item');
+            }
+        }
+        else if (carItem) {
+            try {
+                if (previousItems.CAR.inboundDate) {
+                    const dateArray = previousItems.CAR.inboundDate.split("-");
+                    this.date = this.helpers.yyyymmddTimeToNgDate(`${dateArray[0]}${dateArray[1]}${dateArray[2].substring(0, 2)}`, "");
+                }
+                else if (previousItems.CAR.outboundDate) {
+                    const dateArray = previousItems.CAR.outboundDate.split("-");
+                    this.date = this.helpers.yyyymmddTimeToNgDate(`${dateArray[0]}${dateArray[1]}${dateArray[2].substring(0, 2)}`, "");
+                }
+            }
+            catch (_o) {
+                console.error('Error trying to prepopulate cabhire from car item');
+            }
+        }
+        else if (loungeItem) {
+            try {
+                if (previousItems.LOUNGE.inboundDate) {
+                    const dateArray = previousItems.LOUNGE.inboundDate.split("-");
+                    this.date = this.helpers.yyyymmddTimeToNgDate(`${dateArray[0]}${dateArray[1]}${dateArray[2].substring(0, 2)}`, "");
+                }
+                else if (previousItems.LOUNGE.outboundDate) {
+                    const dateArray = previousItems.LOUNGE.outboundDate.split("-");
+                    this.date = this.helpers.yyyymmddTimeToNgDate(`${dateArray[0]}${dateArray[1]}${dateArray[2].substring(0, 2)}`, "");
+                }
+            }
+            catch (_p) {
+                console.error('Error trying to prepopulate cabhire from lounge item');
+            }
+        }
+        else if (parkingItem) {
+            try {
+                if (previousItems.PARKING.inboundDate) {
+                    const dateArray = previousItems.PARKING.inboundDate.split("-");
+                    this.date = this.helpers.yyyymmddTimeToNgDate(`${dateArray[0]}${dateArray[1]}${dateArray[2].substring(0, 2)}`, "");
+                }
+                else if (previousItems.PARKING.outboundDate) {
+                    const dateArray = previousItems.PARKING.outboundDate.split("-");
+                    this.date = this.helpers.yyyymmddTimeToNgDate(`${dateArray[0]}${dateArray[1]}${dateArray[2].substring(0, 2)}`, "");
+                }
+            }
+            catch (_q) {
+                console.error('Error trying to prepopulate cabhire from parking item');
+            }
+        }
+        else if (eurostarItem) {
+            try {
+                if (previousItems.EUROSTAR.inboundDate) {
+                    const dateArray = previousItems.EUROSTAR.inboundDate.split("-");
+                    this.date = this.helpers.yyyymmddTimeToNgDate(`${dateArray[0]}${dateArray[1]}${dateArray[2].substring(0, 2)}`, "");
+                }
+                else if (previousItems.EUROSTAR.outboundDate) {
+                    const dateArray = previousItems.EUROSTAR.outboundDate.split("-");
+                    this.date = this.helpers.yyyymmddTimeToNgDate(`${dateArray[0]}${dateArray[1]}${dateArray[2].substring(0, 2)}`, "");
+                }
+            }
+            catch (_r) {
+                console.error('Error trying to prepopulate cabhire from eurostar item');
+            }
         }
     }
     updateSearchFromExpiredBasketItem(basketItem) {
@@ -5324,6 +5518,7 @@ class CabHireEnterpriseSearch extends BaseEnterpriseSearch {
         return ((_a = this.transTypes.find((x) => x.key === transTypeIndex)) === null || _a === void 0 ? void 0 : _a.value) || '';
     }
     addCabHireToBasket(cabHireQuote, cabHireQuery) {
+        var _a, _b, _c, _d, _e, _f;
         return __awaiter(this, void 0, void 0, function* () {
             if (cabHireQuote.unavailable) {
                 return Promise.resolve(DifferentInvokdedUserReasons.cancel);
@@ -5353,7 +5548,7 @@ class CabHireEnterpriseSearch extends BaseEnterpriseSearch {
                             latitude: cabHireQuote.toLocation.latitude,
                             longitude: cabHireQuote.toLocation.longitude
                         },
-                        vehicleType: cabHireQuery.vehicleType,
+                        vehicleType: cabHireQuote.vehicleType,
                         tripDistanceMetres: cabHireQuote.tripDistanceMetres,
                         tripDurationSeconds: cabHireQuote.tripDurationSeconds,
                         termsAndCond: termsAndConditions
@@ -5363,7 +5558,10 @@ class CabHireEnterpriseSearch extends BaseEnterpriseSearch {
                     searchQuery: cabHireQuery,
                     co2PerItem: cabHireQuote.co2PerItem,
                     co2PerPassenger: cabHireQuote.co2PerPassenger,
-                    outboundDate: cabHireQuery.departs.format()
+                    outboundDate: cabHireQuery.departs.format(),
+                    lowestPrice: ((_a = this.cheapestPrice) === null || _a === void 0 ? void 0 : _a.amount) != cabHireQuote.price || ((_b = this.cheapestPrice) === null || _b === void 0 ? void 0 : _b.currencyCode) != cabHireQuote.currency ? (_c = this.cheapestPrice) === null || _c === void 0 ? void 0 : _c.amount : null,
+                    lowestPriceCurrency: ((_d = this.cheapestPrice) === null || _d === void 0 ? void 0 : _d.amount) != cabHireQuote.price || ((_e = this.cheapestPrice) === null || _e === void 0 ? void 0 : _e.currencyCode) != cabHireQuote.currency ?
+                        (_f = this.cheapestPrice) === null || _f === void 0 ? void 0 : _f.currencyCode : null
                 }, intBasket, this.searchService, this.travellers, cabHireQuote.requiresReason);
                 if (whatHappened === DifferentInvokdedUserReasons.research) {
                     this.performSearch();
@@ -5380,7 +5578,7 @@ class CabHireEnterpriseSearch extends BaseEnterpriseSearch {
         this.toAddress = newToAddress;
     }
     updateLowestPrice(results) {
-        if (!results.length)
+        if (!(results === null || results === void 0 ? void 0 : results.length))
             return null;
         const currency = results[0].currency;
         return results.reduce((cheapestPrice, result) => {
@@ -5473,8 +5671,8 @@ var SortTypesCar;
 })(SortTypesCar || (SortTypesCar = {}));
 class CarhireEnterpriseSearch extends BaseEnterpriseSearch {
     // ! - End of getters and setters
-    constructor(carhirefetcher, carHireAvailabilityDetailFetcher, helpers, basketService, storageService, searchService) {
-        super(storageService, helpers, searchService);
+    constructor(carhirefetcher, carHireAvailabilityDetailFetcher, helpers, basketService, storageService, searchService, userService) {
+        super(storageService, helpers, searchService, userService);
         this.carhirefetcher = carhirefetcher;
         this.carHireAvailabilityDetailFetcher = carHireAvailabilityDetailFetcher;
         this.basketService = basketService;
@@ -5684,6 +5882,20 @@ class CarhireEnterpriseSearch extends BaseEnterpriseSearch {
             tempParams: {}
         };
         this.updateTempParams(searchService.makeCarHireQuery(data.tempParams));
+        // if (this.userConfig?.carhire_defaults) {
+        //   this.updateTempParams(searchService.makeCarHireQuery(this.userConfig.carhire_defaults));
+        // }
+        userService.fullUserDetails.userConfigs.subscribe(data => {
+            var _a;
+            // this.userConfig.next(data);
+            console.log(data);
+            if (data && (data === null || data === void 0 ? void 0 : data.carhire_defaults)) {
+                this.updateTempParams(searchService.makeCarHireQuery((_a = data === null || data === void 0 ? void 0 : data.carhire_defaults) === null || _a === void 0 ? void 0 : _a.config));
+            }
+        });
+        // userService.subscribe(data=>{
+        // this.updateTempParams(searchService.makeCarHireQuery(data.carhire_defaults));
+        // })
         if (searchService.shouldAddTravellerSubscription()) {
             searchService.travellerInformation.subscribe((travellers) => {
                 this.adults = 1;
@@ -6439,6 +6651,7 @@ class CarhireEnterpriseSearch extends BaseEnterpriseSearch {
                 fullResults = fullResults.sort((a, b) => this.getPrice(b) - this.getPrice(a));
                 break;
             case 2: // preferred TODO
+                fullResults = this.sortByPreferred(fullResults);
                 break;
             case 3: // brand
                 fullResults = this.sortByBrand(fullResults);
@@ -6529,6 +6742,28 @@ class CarhireEnterpriseSearch extends BaseEnterpriseSearch {
         this.results.next(sortedResults);
         return sortedResults;
     }
+    /**
+   * @description - sort the results
+   * @param results - full results from sort results function
+   */
+    sortByPreferred(results) {
+        const fullResults = this.helpers.clone(results ? results : this.results.value);
+        const sortedResults = fullResults.sort((a, b) => {
+            const aPref = a.tmcPreferred || a.companyPreferred || a.officePreferred ? 1 : 0;
+            const bPref = b.tmcPreferred || b.companyPreferred || b.officePreferred ? 1 : 0;
+            if (aPref > bPref) {
+                return -1;
+            }
+            else if (aPref < bPref) {
+                return 1;
+            }
+            else {
+                return 0;
+            }
+        });
+        this.results.next(sortedResults);
+        return sortedResults;
+    }
     /**
      * @description - get the price of a individual car
      */
@@ -6598,9 +6833,12 @@ class CarhireEnterpriseSearch extends BaseEnterpriseSearch {
         };
     }
     updateFromPreviousSearches(previousItems) {
-        var _a;
+        var _a, _b, _c, _d;
         console.log('PREPOPULATING CARHIRE FORM');
         const flightItem = (_a = previousItems[ServiceType.Flight]) === null || _a === void 0 ? void 0 : _a.searchQuery;
+        const railItem = (_b = previousItems[ServiceType.Rail]) === null || _b === void 0 ? void 0 : _b.searchQuery;
+        const hotelItem = (_c = previousItems[ServiceType.Rail]) === null || _c === void 0 ? void 0 : _c.searchQuery;
+        const irlItem = (_d = previousItems[ServiceType.InternationalRail]) === null || _d === void 0 ? void 0 : _d.searchQuery;
         if (flightItem) {
             try {
                 let startDate = this.searchService.searches[ServiceType.Flight].outBoundDate.toDate();
@@ -6629,10 +6867,80 @@ class CarhireEnterpriseSearch extends BaseEnterpriseSearch {
                 this.dropoff_country = this.searchService.searches[ServiceType.Flight]
                     .arriveLocation.countryCode;
             }
-            catch (_b) {
+            catch (_e) {
                 console.error('Error trying to prepopulate carhire from flight item');
             }
         }
+        else if (railItem) {
+            try {
+                let startDate = this.searchService.searches[ServiceType.Rail].outBoundDateTime.toDate();
+                let endDate = this.searchService.searches[ServiceType.Rail].inBoundDateTime.toDate();
+                this.pickup_datetime =
+                    this.searchService.searches[ServiceType.Rail].outBoundDateTime;
+                this.dropoff_datetime =
+                    this.searchService.searches[ServiceType.Rail].inBoundDateTime;
+                this.pickup_date = {
+                    day: startDate.getUTCDate(),
+                    month: startDate.getUTCMonth() + 1,
+                    year: startDate.getUTCFullYear()
+                };
+                this.dropoff_date = {
+                    day: endDate.getUTCDate(),
+                    month: endDate.getUTCMonth() + 1,
+                    year: endDate.getUTCFullYear()
+                };
+            }
+            catch (_f) {
+                console.error('Error trying to prepopulate carhire from rail item');
+            }
+        }
+        else if (irlItem) {
+            try {
+                let startDate = this.searchService.searches[ServiceType.InternationalRail].outBoundDateTime.toDate();
+                let endDate = this.searchService.searches[ServiceType.InternationalRail].returnDepartureDateTime.toDate();
+                this.pickup_datetime =
+                    this.searchService.searches[ServiceType.InternationalRail].outBoundDateTime;
+                this.dropoff_datetime =
+                    this.searchService.searches[ServiceType.InternationalRail].returnDepartureDateTime;
+                this.pickup_date = {
+                    day: startDate.getUTCDate(),
+                    month: startDate.getUTCMonth() + 1,
+                    year: startDate.getUTCFullYear()
+                };
+                this.dropoff_date = {
+                    day: endDate.getUTCDate(),
+                    month: endDate.getUTCMonth() + 1,
+                    year: endDate.getUTCFullYear()
+                };
+            }
+            catch (_g) {
+                console.error('Error trying to prepopulate carhire from international rail item');
+            }
+        }
+        else if (hotelItem) {
+            try {
+                let startDate = this.searchService.searches[ServiceType.Hotel].checkin_date.toDate();
+                let endDate = this.searchService.searches[ServiceType.Hotel].checkout_date.toDate();
+                // this.locationType = LocationTypes.;
+                this.pickup_datetime =
+                    this.searchService.searches[ServiceType.Hotel].checkin_date;
+                this.dropoff_datetime =
+                    this.searchService.searches[ServiceType.Hotel].checkout_date;
+                this.pickup_date = {
+                    day: startDate.getUTCDate(),
+                    month: startDate.getUTCMonth() + 1,
+                    year: startDate.getUTCFullYear()
+                };
+                this.dropoff_date = {
+                    day: endDate.getUTCDate(),
+                    month: endDate.getUTCMonth() + 1,
+                    year: endDate.getUTCFullYear()
+                };
+            }
+            catch (_h) {
+                console.error('Error trying to prepopulate carhire from hotel item');
+            }
+        }
     }
     // !date and time is handled differently for LU
     _updatePickupDateTime() {
@@ -6702,7 +7010,7 @@ class CarhireEnterpriseSearch extends BaseEnterpriseSearch {
      * @description - add car hire to basket
      */
     addCarHireToBasket(carHireVehicleAvailibility, carHireQuery) {
-        var _a, _b;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
         return __awaiter(this, void 0, void 0, function* () {
             if (carHireVehicleAvailibility.unavailable) {
                 return Promise.resolve(DifferentInvokdedUserReasons.cancel);
@@ -6740,6 +7048,12 @@ class CarhireEnterpriseSearch extends BaseEnterpriseSearch {
                             type: displayRecord.vehicle.type,
                             manualTransmission: displayRecord.vehicle.transmission.includes(CarHireTransmission.Manual)
                         },
+                        fareInfo: {
+                            title: (_c = carHireVehicleAvailibility === null || carHireVehicleAvailibility === void 0 ? void 0 : carHireVehicleAvailibility.fareInfo) === null || _c === void 0 ? void 0 : _c.title,
+                            type: (_d = carHireVehicleAvailibility === null || carHireVehicleAvailibility === void 0 ? void 0 : carHireVehicleAvailibility.fareInfo) === null || _d === void 0 ? void 0 : _d.type,
+                            code: (_e = carHireVehicleAvailibility === null || carHireVehicleAvailibility === void 0 ? void 0 : carHireVehicleAvailibility.fareInfo) === null || _e === void 0 ? void 0 : _e.code,
+                            supplierCode: (_f = carHireVehicleAvailibility === null || carHireVehicleAvailibility === void 0 ? void 0 : carHireVehicleAvailibility.fareInfo) === null || _f === void 0 ? void 0 : _f.supplierCode
+                        },
                         vendorName: displayRecord.vendor.name,
                         identifiers: {
                             dropOffLocation: identifiers.dropOffLocation,
@@ -6751,11 +7065,13 @@ class CarhireEnterpriseSearch extends BaseEnterpriseSearch {
                         termsAndCond: termsAndConditions
                     },
                     price,
-                    currency: 'GBP',
+                    currency: displayRecord.charges[0].currencyCode,
                     searchQuery: carHireQuery,
                     co2PerItem,
                     co2PerPassenger,
-                    outboundDate: new Date(displayRecord.pickup).toISOString()
+                    outboundDate: new Date(displayRecord.pickup).toISOString(),
+                    lowestPrice: ((_g = this.cheapestPrice) === null || _g === void 0 ? void 0 : _g.amount) != price ? (_h = this.cheapestPrice) === null || _h === void 0 ? void 0 : _h.amount : null,
+                    lowestPriceCurrency: ((_j = this.cheapestPrice) === null || _j === void 0 ? void 0 : _j.amount) != price ? (_k = this.cheapestPrice) === null || _k === void 0 ? void 0 : _k.currencyCode : null
                 }, intBasket, this.searchService, this.travellers, carHireVehicleAvailibility.requiresReason);
                 if (whatHappened === DifferentInvokdedUserReasons.research) {
                     this.performSearch();
@@ -6863,6 +7179,9 @@ class CarhireEnterpriseSearch extends BaseEnterpriseSearch {
                 });
         });
     }
+    checkForPreferred() {
+        return !!this.results.value.find(result => result.officePreferred || result.tmcPreferred || result.companyPreferred);
+    }
 }
 CarhireEnterpriseSearch.STORAGE_SESSION_PARAMS = 'carhire_params';
 CarhireEnterpriseSearch.STORAGE_SESSION_RESULTS = 'carhire_results';
@@ -6963,6 +7282,7 @@ UserFavorurite.HideFlightCabinClasses = new UserFavorurite('hideFlightCabinClass
 UserFavorurite.AlternativeRailItineraryEnabled = new UserFavorurite('alternativeRailItineraryEnabled');
 UserFavorurite.riskMinimumLevel = new UserFavorurite('riskMinimumLevel');
 UserFavorurite.ENABLE_CHATBOT = new UserFavorurite('enableChatbot');
+UserFavorurite.LocalCurrency = new UserFavorurite('local_currency');
 class Suppliers {
     constructor(value) {
         this.value = value;
@@ -6992,7 +7312,7 @@ var FlightSortTypes;
 })(FlightSortTypes || (FlightSortTypes = {}));
 class FlightEnterpriseSearch extends BaseEnterpriseSearch {
     constructor(flightfetcher, helpers, userService, basketService, storageService, searchService, applyFlightRules, modalService) {
-        super(storageService, helpers, searchService);
+        super(storageService, helpers, searchService, userService);
         this.flightfetcher = flightfetcher;
         this.userService = userService;
         this.basketService = basketService;
@@ -7090,7 +7410,7 @@ class FlightEnterpriseSearch extends BaseEnterpriseSearch {
                 if (a.direction !== b.direction) {
                     return a.direction - b.direction;
                 }
-                return (a.preferred ? 1 : 0) - (b.preferred ? 1 : 0);
+                return (b.preferred ? 1 : 0) - (a.preferred ? 1 : 0);
             },
             [FlightSortTypes.LowestEmissions]: (a, b) => {
                 if (a.direction !== b.direction) {
@@ -7166,6 +7486,20 @@ class FlightEnterpriseSearch extends BaseEnterpriseSearch {
         this.filters = new BehaviorSubject(DEFAULT_FLIGHT_FILTERS);
         this.duralSingleFilter = new BehaviorSubject(DEFAULT_FLIGHT_FILTERS);
         this.choosenDisplayType = new BehaviorSubject(FlightDisplayTypes.returns);
+        this._cheapestPriceObject = {
+            dualOutbound: {
+                amount: Number.MAX_SAFE_INTEGER,
+                currencyCode: 'GBP'
+            },
+            dualInbound: {
+                amount: Number.MAX_SAFE_INTEGER,
+                currencyCode: 'GBP'
+            },
+            returns: {
+                amount: Number.MAX_SAFE_INTEGER,
+                currencyCode: 'GBP'
+            }
+        };
         this._multiDestination = [];
         const data = storageService.getSessionItem(FlightEnterpriseSearch.STORAGE_SESSION_PARAMS) || {
             tempParams: {},
@@ -7198,6 +7532,9 @@ class FlightEnterpriseSearch extends BaseEnterpriseSearch {
         this.negotiated =
             this.tempParams.fareType === FareType.Negotiated ? true : false;
     }
+    get cheapestPriceObject() {
+        return this._cheapestPriceObject;
+    }
     get timeArray() {
         this._timeArray =
             this._timeArray ||
@@ -7477,13 +7814,13 @@ class FlightEnterpriseSearch extends BaseEnterpriseSearch {
             journeyWhenSelected: {},
             dualSingleWhenSelected: {},
             whenSelectedAlone: {}
-        }, results.ruleActionSummary);
+        }, results.ruleActionSummary || {});
         this.resultQuery = this.getSearchQuery();
         this.multi = results.multi;
         this.setFlightDisplayType(FlightDisplayTypes.returns);
         this.currentFilters = this.helpers.createFlightFilters(results.journeys, DEFAULT_FLIGHT_FILTERS);
         this.filters.next(this.currentFilters);
-        delete this.resultQuery.withGrouped;
+        // delete this.resultQuery['withGrouped'];
         const dualSingles = results.multi.reduce((previousItems, nextItem) => {
             previousItems[nextItem.order === OUTBOUND ? 'outbound' : 'inbound'] =
                 nextItem.results.reduce((accum, flight) => {
@@ -7497,7 +7834,7 @@ class FlightEnterpriseSearch extends BaseEnterpriseSearch {
         }, { outbound: {}, inbound: {} });
         // console.log(dualSingles);
         const dualInboundFilters = this.helpers.createFlightFilters(Object.values(dualSingles.inbound), DEFAULT_FLIGHT_FILTERS);
-        this.duralSingleFilter.next(this.helpers.createFlightFilters(Object.values(dualSingles.outbound), Object.assign(Object.assign({}, DEFAULT_FLIGHT_FILTERS), { arrivalReturnAirport: dualInboundFilters.arrivalAirport, depatureReturnAirport: dualInboundFilters.depatureAirport, returnArrivalTime: dualInboundFilters.arrivalTime, returnDuration: dualInboundFilters.duration, returnDepartureTime: dualInboundFilters.departureTime })));
+        this.duralSingleFilter.next(this.helpers.createFlightFilters(Object.values(dualSingles.outbound), Object.assign(Object.assign({}, DEFAULT_FLIGHT_FILTERS), { price: dualInboundFilters.price, arrivalReturnAirport: dualInboundFilters.arrivalAirport, depatureReturnAirport: dualInboundFilters.depatureAirport, returnArrivalTime: dualInboundFilters.arrivalTime, returnDuration: dualInboundFilters.duration, returnDepartureTime: dualInboundFilters.departureTime })));
         if (results && this.searchService.isFlightsGrouped()) {
             const returns = (results.journeys || []).reduce((accum, flight) => {
                 accum[flight.uid] = Object.assign({
@@ -7519,6 +7856,28 @@ class FlightEnterpriseSearch extends BaseEnterpriseSearch {
                 result1.direction = FlightDirectionEnum.DualSingleInbound;
                 return result1;
             });
+            // gonna grab cheapest flights here
+            this._cheapestPriceObject.returns = returnData.reduce((cheapestPrice, result) => {
+                const price = result.minPrice;
+                if (cheapestPrice.amount > price) {
+                    cheapestPrice.amount = price;
+                }
+                return cheapestPrice;
+            }, { amount: Number.MAX_SAFE_INTEGER, currencyCode: 'GBP' });
+            this._cheapestPriceObject.dualOutbound = dualDataOutbound.reduce((cheapestPrice, result) => {
+                const price = result.minPrice;
+                if (cheapestPrice.amount > price) {
+                    cheapestPrice.amount = price;
+                }
+                return cheapestPrice;
+            }, { amount: Number.MAX_SAFE_INTEGER, currencyCode: 'GBP' });
+            this._cheapestPriceObject.dualInbound = dualDataInbound.reduce((cheapestPrice, result) => {
+                const price = result.minPrice;
+                if (cheapestPrice.amount > price) {
+                    cheapestPrice.amount = price;
+                }
+                return cheapestPrice;
+            }, { amount: Number.MAX_SAFE_INTEGER, currencyCode: 'GBP' });
             const data2 = [...returnData, ...dualDataOutbound, ...dualDataInbound];
             console.log('Processed Grouped data', data2);
             return data2;
@@ -7561,7 +7920,12 @@ class FlightEnterpriseSearch extends BaseEnterpriseSearch {
                 inlegsCount: 0,
                 dataSource: '',
                 preferred: false,
-                preferredMessage: '',
+                companyPreferred: false,
+                companyPreferredMessage: '',
+                officePreferred: false,
+                officePreferredMessage: '',
+                tmcPreferred: false,
+                tmcPreferredMessage: '',
                 outboundFlightNumber: '',
                 operator: '',
                 operatorFull: '',
@@ -7582,7 +7946,7 @@ class FlightEnterpriseSearch extends BaseEnterpriseSearch {
                 }
                 // ! using a reduce because not all flights actually exist and we were seeing undefined in the flight list
                 brands[brand].forEach((flightNum) => {
-                    var _a, _b, _c, _d, _e, _f;
+                    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v;
                     const flight = groupedObject[flightNum];
                     if (flight) {
                         if (isOutBound || treatOutboundsAsOutbounds) {
@@ -7602,13 +7966,28 @@ class FlightEnterpriseSearch extends BaseEnterpriseSearch {
                             returnObject.maxPrice > maxprice
                                 ? returnObject.maxPrice
                                 : maxprice;
-                        returnObject.preferred =
+                        returnObject.companyPreferred =
                             ((_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 =
+                        returnObject.companyPreferredMessage =
                             ((_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.officePreferred =
+                            ((_e = this._ruleActionSummary.journeyWhenSelected[flight.journeyHash]) === null || _e === void 0 ? void 0 : _e.officePreferred) || ((_f = this._ruleActionSummary.whenSelectedAlone[flight.journeyHash]) === null || _f === void 0 ? void 0 : _f.officePreferred) ||
+                                false;
+                        returnObject.officePreferredMessage =
+                            ((_g = this._ruleActionSummary.journeyWhenSelected[flight.journeyHash]) === null || _g === void 0 ? void 0 : _g.officePreferredMessage) || ((_h = this._ruleActionSummary.whenSelectedAlone[flight.journeyHash]) === null || _h === void 0 ? void 0 : _h.officePreferredMessage) ||
+                                '';
+                        returnObject.tmcPreferred =
+                            ((_j = this._ruleActionSummary.journeyWhenSelected[flight.journeyHash]) === null || _j === void 0 ? void 0 : _j.tmcPreferred) || ((_k = this._ruleActionSummary.whenSelectedAlone[flight.journeyHash]) === null || _k === void 0 ? void 0 : _k.tmcPreferred) ||
+                                false;
+                        returnObject.tmcPreferredMessage =
+                            ((_l = this._ruleActionSummary.journeyWhenSelected[flight.journeyHash]) === null || _l === void 0 ? void 0 : _l.tmcPreferredMessage) || ((_m = this._ruleActionSummary.whenSelectedAlone[flight.journeyHash]) === null || _m === void 0 ? void 0 : _m.tmcPreferredMessage) ||
+                                '';
+                        returnObject.preferred =
+                            ((_o = this._ruleActionSummary.journeyWhenSelected[flight.journeyHash]) === null || _o === void 0 ? void 0 : _o.companyPreferred) || ((_p = this._ruleActionSummary.whenSelectedAlone[flight.journeyHash]) === null || _p === void 0 ? void 0 : _p.companyPreferred) || ((_q = this._ruleActionSummary.journeyWhenSelected[flight.journeyHash]) === null || _q === void 0 ? void 0 : _q.officePreferred) || ((_r = this._ruleActionSummary.whenSelectedAlone[flight.journeyHash]) === null || _r === void 0 ? void 0 : _r.officePreferred) || ((_s = this._ruleActionSummary.journeyWhenSelected[flight.journeyHash]) === null || _s === void 0 ? void 0 : _s.tmcPreferred) || ((_t = this._ruleActionSummary.whenSelectedAlone[flight.journeyHash]) === null || _t === void 0 ? void 0 : _t.tmcPreferred);
+                        false;
+                        if ((_v = (_u = returnObject.classes[correctBrand]) === null || _u === void 0 ? void 0 : _u.flights) === null || _v === void 0 ? void 0 : _v.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);
@@ -7938,7 +8317,6 @@ class FlightEnterpriseSearch extends BaseEnterpriseSearch {
             includeNearbyAirports: this.tempParams.includeNearbyAirports,
             preferredCarriers: this.tempParams.preferredCarriers.map((carrier) => (carrier === null || carrier === void 0 ? void 0 : carrier.code) ? carrier.code : null),
             fareType: this.tempParams.fareType,
-            withGrouped: isFlightsGrouped
         }, this.isReturn
             ? {
                 returnDate: this.helpers.formatIsoDate(this.tempParams.inboundDate),
@@ -8531,10 +8909,15 @@ class FlightEnterpriseSearch extends BaseEnterpriseSearch {
             return acc;
         }, []);
         if (multiInbounds.length > 0) {
+            if (!this.rawResults) {
+                this.rawResults = this.storageService.getSessionItem(this.resultsSessionName + '_raw');
+            }
+            console.log(this.rawResults);
             this.applyFlightRules
                 .fetchOne({
                 selectedOutboundFlight: this.selectedGroupFlight,
-                availableInboundFlights: multiInbounds
+                availableInboundFlights: multiInbounds,
+                searchId: this.rawResults.searchId
             })
                 .pipe(take(1))
                 .subscribe((rules) => {
@@ -8568,7 +8951,11 @@ class FlightEnterpriseSearch extends BaseEnterpriseSearch {
                 price: total.price,
                 searchQuery: this.resultQuery,
                 service: sourceId.toString(),
-                outboundDate
+                outboundDate,
+                lowestPrice: (this.absoluteCheapestPrice.amount != Math.floor(total.price) || this.absoluteCheapestPrice.currencyCode != total.currency) ?
+                    this.absoluteCheapestPrice.amount : null,
+                lowestPriceCurrency: (this.absoluteCheapestPrice.amount != Math.floor(total.price) || this.absoluteCheapestPrice.currencyCode != total.currency) ?
+                    this.absoluteCheapestPrice.currencyCode : null
             };
             if (inboundDate) {
                 booking.inboundDate = inboundDate;
@@ -8580,6 +8967,19 @@ class FlightEnterpriseSearch extends BaseEnterpriseSearch {
             return whatHappened;
         });
     }
+    get absoluteCheapestPrice() {
+        if (this.cheapestPrice)
+            return this.cheapestPrice;
+        let price = { amount: null, currencyCode: null };
+        if (this.cheapestPriceObject.dualInbound.amount + this.cheapestPriceObject.dualOutbound.amount <
+            this.cheapestPriceObject.returns.amount && this.cheapestPriceObject.dualInbound.currencyCode == this.cheapestPriceObject.dualOutbound.currencyCode) {
+            price.amount = this.cheapestPriceObject.dualInbound.amount + this.cheapestPriceObject.dualOutbound.amount;
+            price.currencyCode = this.cheapestPriceObject.dualInbound.currencyCode;
+        }
+        else
+            price = this.cheapestPriceObject.returns;
+        return price;
+    }
     makeSchemaFlights(selectedFlight, flightGroup, groupIndex, segmentIndex) {
         return Object.assign(Object.assign({}, selectedFlight), { journeyInfo: {
                 flightGroup,
@@ -8927,11 +9327,11 @@ var SortTypesHotel;
     SortTypesHotel["name"] = "name";
     SortTypesHotel["price"] = "price";
 })(SortTypesHotel || (SortTypesHotel = {}));
-const CLIENT_PREFERRED_VALUE = 1;
-const AGENT_PREFERRED_VALUE = 2;
+const CLIENT_PREFERRED_VALUE = 2;
+const AGENT_PREFERRED_VALUE = 1;
 class HotelEnterpriseSearch extends BaseEnterpriseSearch {
     constructor(hotelFetcher, helpers, userService, environment, avaliabilityService, basketService, storageService, searchService, httpCallService, quickListFetcher, getRailStationFetcher, applyHotelRulesFetcher) {
-        super(storageService, helpers, searchService);
+        super(storageService, helpers, searchService, userService);
         this.hotelFetcher = hotelFetcher;
         this.userService = userService;
         this.environment = environment;
@@ -8946,6 +9346,7 @@ class HotelEnterpriseSearch extends BaseEnterpriseSearch {
         this.offices = new BehaviorSubject([]);
         this.lastActivePage = new BehaviorSubject(null);
         this.jitRulesReceived = new BehaviorSubject(false);
+        this.reapplySorting = new BehaviorSubject(false);
         this.galleries = {};
         this.occupied = 0;
         this.results_details = {
@@ -8997,6 +9398,7 @@ class HotelEnterpriseSearch extends BaseEnterpriseSearch {
                     this.hasChain(hotel) &&
                     this.breakfastTypeFilter(hotel));
             });
+            console.log('nortmal sort results');
             this.results.next(this.resultsFilterMethod(this.fullResults));
         };
         // Lightening Filters
@@ -9011,7 +9413,9 @@ class HotelEnterpriseSearch extends BaseEnterpriseSearch {
                     this.getAmenitiesFilter(hotel) &&
                     this.accessibleRoomTypeFilter(hotel));
             });
+            console.log('lightning sort results');
             this.results.next(this.resultsFilterMethod(this.fullResults));
+            this.reapplySorting.next(true);
         };
         this.results_details.chains = new Set();
         const data = storageService.getSessionItem(HotelEnterpriseSearch.STORAGE_SESSION_PARAMS) || {
@@ -9021,6 +9425,14 @@ class HotelEnterpriseSearch extends BaseEnterpriseSearch {
             ? this.tempParams.currency
             : this._default_currency;
         this.updateTempParams(searchService.makeHotelQuery(data.tempParams));
+        userService.fullUserDetails.userConfigs.subscribe(data => {
+            var _a;
+            // this.userConfig.next(data);
+            console.log(data);
+            if (data && (data === null || data === void 0 ? void 0 : data.hotel_defaults)) {
+                this.updateTempParams(searchService.makeHotelQuery((_a = data === null || data === void 0 ? void 0 : data.hotel_defaults) === null || _a === void 0 ? void 0 : _a.config));
+            }
+        });
         if (searchService.shouldAddTravellerSubscription()) {
             searchService.travellerInformation.subscribe((travellers) => {
                 this.travellers = travellers;
@@ -9071,6 +9483,7 @@ class HotelEnterpriseSearch extends BaseEnterpriseSearch {
                 if (this.searchService.canBook(ServiceType.Hotel)) {
                     // need this check because on refresh we are getting errors - theory that user hasn't fully loaded in yet
                     this._applyTravelRules();
+                    this.reapplySorting.next(true);
                 }
             }
         });
@@ -9296,7 +9709,7 @@ class HotelEnterpriseSearch extends BaseEnterpriseSearch {
         })
             .pipe(take(1))
             .subscribe((data1) => {
-            const filterResults = this.resultsFilterMethod(this.fullResults);
+            const filterResults = this.resultsFilterMethod ? this.resultsFilterMethod(this.fullResults) : [];
             const travleResults = filterResults.map((hotel) => {
                 if (data1[hotel.id]) {
                     return this.avaliabilityService.setHotelAvalability(data1[hotel.id]);
@@ -9306,13 +9719,14 @@ class HotelEnterpriseSearch extends BaseEnterpriseSearch {
             travleResults.forEach((hotel) => {
                 if (hotel.availableRates) {
                     hotel.jitRemoveResultRule = false;
-                    this.jitRulesReceived.next(true);
                 }
                 else {
                     hotel.jitRemoveResultRule = true;
                 }
             });
+            this.jitRulesReceived.next(true);
             this.results.next(travleResults);
+            this.reapplySorting.next(true);
         });
     }
     makeLocations(location) {
@@ -9563,14 +9977,16 @@ class HotelEnterpriseSearch extends BaseEnterpriseSearch {
         return this.helpers.removeNulls(this.query);
     }
     buildQuery(ogSearch = false) {
-        var _a, _b, _c, _d, _e, _f;
+        var _a, _b, _c, _d, _e, _f, _g;
         const tempParams = ogSearch ? this.originalUserSearch : this.tempParams;
+        if (!this.userCurrency)
+            this.userCurrency = (_a = this.userService.getUserFavoriteObject(UserFavorurite.LocalCurrency)) === null || _a === void 0 ? void 0 : _a.currency;
         const query = {
             startDate: tempParams.checkin_date.format('YYYY-MM-DD'),
             endDate: tempParams.checkout_date.format('YYYY-MM-DD'),
             rooms: tempParams.no_of_rooms,
             adults: tempParams.no_of_occupants,
-            currency: tempParams.currency ? tempParams.currency : null,
+            currency: this.userCurrency || tempParams.currency || null,
             distance: tempParams.distance,
             distanceType: DistanceTypes.M,
             maxResults: 100
@@ -9592,18 +10008,18 @@ class HotelEnterpriseSearch extends BaseEnterpriseSearch {
                 }
                 break;
             case LocationTypes.TrainStation:
-                if ((_b = (_a = tempParams.location) === null || _a === void 0 ? void 0 : _a.railstation) === null || _b === void 0 ? void 0 : _b.stationCode) {
+                if ((_c = (_b = tempParams.location) === null || _b === void 0 ? void 0 : _b.railstation) === null || _c === void 0 ? void 0 : _c.stationCode) {
                     query.trainStationCode = tempParams.location.railstation.stationCode;
                 }
-                else if ((_c = tempParams.trainsStation) === null || _c === void 0 ? void 0 : _c.stationCode) {
+                else if ((_d = tempParams.trainsStation) === null || _d === void 0 ? void 0 : _d.stationCode) {
                     query.trainStationCode = tempParams.trainsStation.stationCode;
                 }
                 break;
             case LocationTypes.Office: // Needs to fix in next PR
-                if ((_d = tempParams.location) === null || _d === void 0 ? void 0 : _d.id) {
+                if ((_e = tempParams.location) === null || _e === void 0 ? void 0 : _e.id) {
                     query.officeId = +tempParams.location.id;
                 }
-                else if ((_e = tempParams.office) === null || _e === void 0 ? void 0 : _e.id) {
+                else if ((_f = tempParams.office) === null || _f === void 0 ? void 0 : _f.id) {
                     query.officeId = +tempParams.office.id;
                 }
                 break;
@@ -9621,18 +10037,21 @@ class HotelEnterpriseSearch extends BaseEnterpriseSearch {
         }
         // add chain or group name int he query
         if (tempParams.hotel_chain) {
-            query.groupName = (_f = tempParams.hotel_chain) === null || _f === void 0 ? void 0 : _f.name;
+            query.groupName = (_g = tempParams.hotel_chain) === null || _g === void 0 ? void 0 : _g.name;
         }
         this.query = query;
     }
     makeHotelAvalilityObject(hotel) {
+        var _a;
+        if (!this.userCurrency)
+            this.userCurrency = (_a = this.userService.getUserFavoriteObject(UserFavorurite.LocalCurrency)) === null || _a === void 0 ? void 0 : _a.currency;
         return {
             hotel: hotel.id,
             startDate: this.helpers.formatIsoDate(this.checkin_date),
             endDate: this.helpers.formatIsoDate(this.checkout_date),
             rooms: this.no_of_rooms,
             occupants: this.no_of_occupants,
-            currency: 'GBP'
+            currency: this.userCurrency || 'GBP'
         };
     }
     resultsHaveTag(searchTag) {
@@ -9798,9 +10217,16 @@ class HotelEnterpriseSearch extends BaseEnterpriseSearch {
         }));
     }
     sortByDistance() {
-        this.results.next(this.helpers.clone(this.fullResults).sort((a, b) => {
-            return Number(a.location.distance) - Number(b.location.distance);
-        }));
+        let results = this.results.value || [];
+        try {
+            results = results.sort((a, b) => {
+                return Number(a.location.distance) - Number(b.location.distance);
+            });
+        }
+        catch (error) {
+            console.error('+++ Error sorting by preferred: ', error, ' +++');
+        }
+        this.results.next(results);
     }
     byPreferred() {
         let results = this.results.value || [];
@@ -9921,10 +10347,11 @@ class HotelEnterpriseSearch extends BaseEnterpriseSearch {
         }
     }
     updateFromPreviousSearches(previousItems) {
-        var _a, _b;
+        var _a, _b, _c;
         console.log('PREPOPULATING HOTEL FORM');
         const flightItem = (_a = previousItems[ServiceType.Flight]) === null || _a === void 0 ? void 0 : _a.searchQuery;
         const railItem = (_b = previousItems[ServiceType.Rail]) === null || _b === void 0 ? void 0 : _b.searchQuery;
+        const irlItem = (_c = previousItems[ServiceType.InternationalRail]) === null || _c === void 0 ? void 0 : _c.searchQuery;
         if (flightItem) {
             try {
                 this.location_type_select = LocationTypes.Airport;
@@ -9939,7 +10366,7 @@ class HotelEnterpriseSearch extends BaseEnterpriseSearch {
                     airport: this.searchService.searches[ServiceType.Flight].arriveLocation
                 };
             }
-            catch (_c) {
+            catch (_d) {
                 console.error('Error trying to prepopulate hotel from flight item');
             }
         }
@@ -9955,10 +10382,25 @@ class HotelEnterpriseSearch extends BaseEnterpriseSearch {
                 this.location = this.searchService.searches[ServiceType.Rail]
                     .travellingTo;
             }
-            catch (_d) {
+            catch (_e) {
                 console.error('Error trying to prepopulate hotel from rail item');
             }
         }
+        else if (irlItem) {
+            try {
+                this.location_type_select = LocationTypes.TrainStation;
+                this.checkin_date = this.searchService.searches[ServiceType.InternationalRail].outBoundDateTime;
+                this.checkout_date =
+                    this.searchService.searches[ServiceType.InternationalRail].returnDepartureDateTime;
+                this.trainsStation = this.searchService.searches[ServiceType.InternationalRail]
+                    .travellingTo;
+                this.location = this.searchService.searches[ServiceType.InternationalRail]
+                    .travellingTo;
+            }
+            catch (_f) {
+                console.error('Error trying to prepopulate hotel from international rail item');
+            }
+        }
     }
     hasPreferred(hotel) {
         const preferredFilters = this.filters.preferred;
@@ -9981,6 +10423,24 @@ class HotelEnterpriseSearch extends BaseEnterpriseSearch {
             return hotel.preferred.client === true;
         }
     }
+    atLeastOnePreferredAgentHotel() {
+        let atLeastOne = false;
+        for (let i = 0; i < this.results.value.length; i++) {
+            if (this.results.value[i].preferred.consumer) {
+                return true;
+            }
+        }
+        return false;
+    }
+    atLeastOnePreferredClientHotel() {
+        let atLeastOne = false;
+        for (let i = 0; i < this.results.value.length; i++) {
+            if (this.results.value[i].preferred.client) {
+                return true;
+            }
+        }
+        return false;
+    }
     getmaxPriceForCurrency(currency) {
         return this.avaliabilityService.maxPriceForCurrency(currency);
     }
@@ -10159,6 +10619,7 @@ class HotelEnterpriseSearch extends BaseEnterpriseSearch {
                 const termsAndConditions = this.getTermsAndCond(hotelRoom, hotelQuery);
                 // bookedTravellersChunks.forEach((chunk: Traveller[], index: number) => {
                 return roomArray.reduce((current, chunk, index) => __awaiter(this, void 0, void 0, function* () {
+                    var _a, _b, _c, _d, _e, _f;
                     switch (yield current) {
                         case DifferentInvokdedUserReasons.cancel:
                             return DifferentInvokdedUserReasons.cancel;
@@ -10192,7 +10653,10 @@ class HotelEnterpriseSearch extends BaseEnterpriseSearch {
                         price: hotelRoom.total,
                         currency: hotelRoom.currencyCode,
                         searchQuery,
-                        outboundDate: hotelQuery.startDate
+                        outboundDate: hotelQuery.startDate,
+                        lowestPrice: ((_a = this.cheapestPrice) === null || _a === void 0 ? void 0 : _a.amount) != hotelRoom.total || ((_b = this.cheapestPrice) === null || _b === void 0 ? void 0 : _b.currencyCode) != hotelRoom.currencyCode ? (_c = this.cheapestPrice) === null || _c === void 0 ? void 0 : _c.amount : null,
+                        lowestPriceCurrency: ((_d = this.cheapestPrice) === null || _d === void 0 ? void 0 : _d.amount) != hotelRoom.total || ((_e = this.cheapestPrice) === null || _e === void 0 ? void 0 : _e.currencyCode) != hotelRoom.currencyCode ?
+                            (_f = this.cheapestPrice) === null || _f === void 0 ? void 0 : _f.currencyCode : null
                     }, intBasket, this.searchService, 
                     // this is an array of 1 or 2 travellers which go in 1 room
                     // chunk
@@ -10279,8 +10743,8 @@ HotelEnterpriseSearch.STORAGE_SESSION_PARAMS = 'search_hotel';
 HotelEnterpriseSearch.STORAGE_SESSION_RESULTS = 'results_hotel';
 
 class LoungesEnterpriseSearch extends BaseEnterpriseSearch {
-    constructor(loungefetcher, helpers, basketService, storageService, searchService) {
-        super(storageService, helpers, searchService);
+    constructor(loungefetcher, helpers, basketService, storageService, searchService, userService) {
+        super(storageService, helpers, searchService, userService);
         this.loungefetcher = loungefetcher;
         this.basketService = basketService;
         this.type = ServiceType.Lounge;
@@ -10548,9 +11012,13 @@ class LoungesEnterpriseSearch extends BaseEnterpriseSearch {
         this.results.next(results.sort(terminalSorter));
     }
     updateFromPreviousSearches(previousItems) {
-        var _a;
+        var _a, _b, _c, _d, _e;
         console.log('PREPOPULATING LOUNGE FORM');
         const flightItem = (_a = previousItems[ServiceType.Flight]) === null || _a === void 0 ? void 0 : _a.searchQuery;
+        const irlItem = (_b = previousItems[ServiceType.InternationalRail]) === null || _b === void 0 ? void 0 : _b.searchQuery;
+        const railItem = (_c = previousItems[ServiceType.Rail]) === null || _c === void 0 ? void 0 : _c.searchQuery;
+        const hotelItem = (_d = previousItems[ServiceType.Rail]) === null || _d === void 0 ? void 0 : _d.searchQuery;
+        const carItem = (_e = previousItems[ServiceType.Car]) === null || _e === void 0 ? void 0 : _e.searchQuery;
         if (flightItem) {
             try {
                 let date = this.searchService.searches[ServiceType.Flight].outBoundDate.toDate();
@@ -10562,41 +11030,89 @@ class LoungesEnterpriseSearch extends BaseEnterpriseSearch {
                 this.locationCode = this.searchService.searches[ServiceType.Flight]
                     .arriveLocation;
             }
-            catch (_b) {
-                console.error('Error trying to prepopulate parking from lounge item');
+            catch (_f) {
+                console.error('Error trying to prepopulate lounge from flight item');
             }
         }
-    }
-    updateSearchFromExpiredBasketItem(basketItem) {
-        const searchLoungesQuery = basketItem.searchQuery;
-        if (searchLoungesQuery) {
-            this.arrivalDatetime = moment(searchLoungesQuery.arrivalDatetime);
-            this.terminal = searchLoungesQuery.terminal;
-            this.searchService
-                .getAirportByCode(searchLoungesQuery.locationCode)
-                .subscribe((airport) => {
-                var _a, _b, _c, _d, _e, _f;
-                if (airport) {
-                    this.locationCode = {
-                        country: (_b = (_a = airport.iataMatch) === null || _a === void 0 ? void 0 : _a.locationDetails) === null || _b === void 0 ? void 0 : _b.country,
-                        countryCode: (_d = (_c = airport.iataMatch) === null || _c === void 0 ? void 0 : _c.locationDetails) === null || _d === void 0 ? void 0 : _d.countryCode,
-                        destination: airport.iataMatch.name,
-                        gateway: airport.iataMatch.iata,
-                        postcode: (_f = (_e = airport.iataMatch) === null || _e === void 0 ? void 0 : _e.locationDetails) === null || _f === void 0 ? void 0 : _f.postcode,
-                        terminals: this.searchService.processTerminals(airport.iataMatch.terminals)
-                    };
-                }
-            });
-        }
-        // add Travellers
-        if (basketItem.users) {
-            basketItem.users.forEach((user) => {
-                this.searchService.addTraveller(user);
+        else if (railItem) {
+            try {
+                let date = this.searchService.searches[ServiceType.Rail].outBoundDateTime.toDate();
+                this.date = {
+                    day: date.getUTCDate(),
+                    month: date.getUTCMonth() + 1,
+                    year: date.getUTCFullYear()
+                };
+            }
+            catch (_g) {
+                console.error('Error trying to prepopulate lounge from rail item');
+            }
+        }
+        else if (irlItem) {
+            try {
+                let date = this.searchService.searches[ServiceType.InternationalRail].outBoundDateTime.toDate();
+                this.date = {
+                    day: date.getUTCDate(),
+                    month: date.getUTCMonth() + 1,
+                    year: date.getUTCFullYear()
+                };
+            }
+            catch (_h) {
+                console.error('Error trying to prepopulate lounge from international rail item');
+            }
+        }
+        else if (hotelItem) {
+            try {
+                let date = this.searchService.searches[ServiceType.Hotel].checkin_date.toDate();
+                this.date = {
+                    day: date.getUTCDate(),
+                    month: date.getUTCMonth() + 1,
+                    year: date.getUTCFullYear()
+                };
+            }
+            catch (_j) {
+                console.error('Error trying to prepopulate lounge from hotel item');
+            }
+        }
+        else if (carItem) {
+            try {
+                let date = this.searchService.searches[ServiceType.Car].pickup_date;
+                this.date = date;
+            }
+            catch (_k) {
+                console.error('Error trying to prepopulate lounge from car item');
+            }
+        }
+    }
+    updateSearchFromExpiredBasketItem(basketItem) {
+        const searchLoungesQuery = basketItem.searchQuery;
+        if (searchLoungesQuery) {
+            this.arrivalDatetime = moment(searchLoungesQuery.arrivalDatetime);
+            this.terminal = searchLoungesQuery.terminal;
+            this.searchService
+                .getAirportByCode(searchLoungesQuery.locationCode)
+                .subscribe((airport) => {
+                var _a, _b, _c, _d, _e, _f;
+                if (airport) {
+                    this.locationCode = {
+                        country: (_b = (_a = airport.iataMatch) === null || _a === void 0 ? void 0 : _a.locationDetails) === null || _b === void 0 ? void 0 : _b.country,
+                        countryCode: (_d = (_c = airport.iataMatch) === null || _c === void 0 ? void 0 : _c.locationDetails) === null || _d === void 0 ? void 0 : _d.countryCode,
+                        destination: airport.iataMatch.name,
+                        gateway: airport.iataMatch.iata,
+                        postcode: (_f = (_e = airport.iataMatch) === null || _e === void 0 ? void 0 : _e.locationDetails) === null || _f === void 0 ? void 0 : _f.postcode,
+                        terminals: this.searchService.processTerminals(airport.iataMatch.terminals)
+                    };
+                }
+            });
+        }
+        // add Travellers
+        if (basketItem.users) {
+            basketItem.users.forEach((user) => {
+                this.searchService.addTraveller(user);
             });
         }
     }
     addLoungeToBasket(loungeQuote, loungeQuery) {
-        var _a;
+        var _a, _b, _c, _d, _e, _f, _g;
         return __awaiter(this, void 0, void 0, function* () {
             if (loungeQuote.unavailable) {
                 return Promise.resolve(DifferentInvokdedUserReasons.cancel);
@@ -10634,7 +11150,10 @@ class LoungesEnterpriseSearch extends BaseEnterpriseSearch {
                     price: loungeQuote.price,
                     currency: loungeQuote.currency,
                     searchQuery: loungeQuery,
-                    outboundDate: loungeQuery.arrivalDatetime.format()
+                    outboundDate: loungeQuery.arrivalDatetime.format(),
+                    lowestPrice: ((_b = this.cheapestPrice) === null || _b === void 0 ? void 0 : _b.amount) != loungeQuote.price || ((_c = this.cheapestPrice) === null || _c === void 0 ? void 0 : _c.currencyCode) != loungeQuote.currency ? (_d = this.cheapestPrice) === null || _d === void 0 ? void 0 : _d.amount : null,
+                    lowestPriceCurrency: ((_e = this.cheapestPrice) === null || _e === void 0 ? void 0 : _e.amount) != loungeQuote.price || ((_f = this.cheapestPrice) === null || _f === void 0 ? void 0 : _f.currencyCode) != loungeQuote.currency ?
+                        (_g = this.cheapestPrice) === null || _g === void 0 ? void 0 : _g.currencyCode : null
                 }, intBasket, this.searchService, this.travellers, loungeQuote.requiresReason);
                 if (whatHappened === DifferentInvokdedUserReasons.research) {
                     this.performSearch();
@@ -10752,8 +11271,8 @@ const defaultValidations = {
     DateOverlapped: `Inward Journey can not be before outward journey`
 };
 class ParkingEnterpriseSearch extends BaseEnterpriseSearch {
-    constructor(parkingfetcher, helpers, basketService, storageService, searchService) {
-        super(storageService, helpers, searchService);
+    constructor(parkingfetcher, helpers, basketService, storageService, searchService, userService) {
+        super(storageService, helpers, searchService, userService);
         this.parkingfetcher = parkingfetcher;
         this.basketService = basketService;
         this.type = ServiceType.Parking;
@@ -11118,9 +11637,14 @@ class ParkingEnterpriseSearch extends BaseEnterpriseSearch {
         }
     }
     updateFromPreviousSearches(previousItems) {
-        var _a;
+        var _a, _b, _c, _d, _e, _f;
         console.log('PREPOPULATING PARKING FORM');
         const flightItem = (_a = previousItems[ServiceType.Flight]) === null || _a === void 0 ? void 0 : _a.searchQuery;
+        const railItem = (_b = previousItems[ServiceType.Rail]) === null || _b === void 0 ? void 0 : _b.searchQuery;
+        const irlItem = (_c = previousItems[ServiceType.InternationalRail]) === null || _c === void 0 ? void 0 : _c.searchQuery;
+        const hotelItem = (_d = previousItems[ServiceType.Rail]) === null || _d === void 0 ? void 0 : _d.searchQuery;
+        const carItem = (_e = previousItems[ServiceType.Car]) === null || _e === void 0 ? void 0 : _e.searchQuery;
+        const loungeItem = (_f = previousItems[ServiceType.Lounge]) === null || _f === void 0 ? void 0 : _f.searchQuery;
         if (flightItem) {
             try {
                 let startDate = this.searchService.searches[ServiceType.Flight].outBoundDate.toDate();
@@ -11138,12 +11662,106 @@ class ParkingEnterpriseSearch extends BaseEnterpriseSearch {
                 this.locationCode = this.searchService.searches[ServiceType.Flight]
                     .arriveLocation;
             }
-            catch (_b) {
+            catch (_g) {
                 console.error('Error trying to prepopulate parking from flight item');
             }
         }
+        else if (railItem) {
+            try {
+                let startDate = this.searchService.searches[ServiceType.Rail].outBoundDateTime.toDate();
+                let endDate = this.searchService.searches[ServiceType.Rail].inBoundDateTime.toDate();
+                this.outdate = {
+                    day: startDate.getUTCDate(),
+                    month: startDate.getUTCMonth() + 1,
+                    year: startDate.getUTCFullYear()
+                };
+                this.indate = {
+                    day: endDate.getUTCDate(),
+                    month: endDate.getUTCMonth() + 1,
+                    year: endDate.getUTCFullYear()
+                };
+            }
+            catch (_h) {
+                console.error('Error trying to prepopulate parking from rail item');
+            }
+        }
+        else if (irlItem) {
+            try {
+                let startDate = this.searchService.searches[ServiceType.InternationalRail].outBoundDateTime.toDate();
+                let endDate = this.searchService.searches[ServiceType.InternationalRail].returnDepartureDateTime.toDate();
+                this.outdate = {
+                    day: startDate.getUTCDate(),
+                    month: startDate.getUTCMonth() + 1,
+                    year: startDate.getUTCFullYear()
+                };
+                this.indate = {
+                    day: endDate.getUTCDate(),
+                    month: endDate.getUTCMonth() + 1,
+                    year: endDate.getUTCFullYear()
+                };
+            }
+            catch (_j) {
+                console.error('Error trying to prepopulate parking from international rail item');
+            }
+        }
+        else if (hotelItem) {
+            try {
+                let startDate = this.searchService.searches[ServiceType.Hotel].checkin_date.toDate();
+                let endDate = this.searchService.searches[ServiceType.Hotel].checkout_date.toDate();
+                this.outdate = {
+                    day: startDate.getUTCDate(),
+                    month: startDate.getUTCMonth() + 1,
+                    year: startDate.getUTCFullYear()
+                };
+                this.indate = {
+                    day: endDate.getUTCDate(),
+                    month: endDate.getUTCMonth() + 1,
+                    year: endDate.getUTCFullYear()
+                };
+            }
+            catch (_k) {
+                console.error('Error trying to prepopulate parking from hotel item');
+            }
+        }
+        else if (carItem) {
+            try {
+                let startDate = this.searchService.searches[ServiceType.Car].pickup_datetime.toDate();
+                let endDate = this.searchService.searches[ServiceType.Car].dropoff_datetime.toDate();
+                this.outdate = {
+                    day: startDate.getUTCDate(),
+                    month: startDate.getUTCMonth() + 1,
+                    year: startDate.getUTCFullYear()
+                };
+                this.indate = {
+                    day: endDate.getUTCDate(),
+                    month: endDate.getUTCMonth() + 1,
+                    year: endDate.getUTCFullYear()
+                };
+                this.locationCode = this.searchService.searches[ServiceType.Car]
+                    .pickup_location;
+            }
+            catch (_l) {
+                console.error('Error trying to prepopulate parking from car item');
+            }
+        }
+        else if (loungeItem) {
+            try {
+                let startDate = this.searchService.searches[ServiceType.Lounge].arrivalDatetime.toDate();
+                this.outdate = {
+                    day: startDate.getUTCDate(),
+                    month: startDate.getUTCMonth() + 1,
+                    year: startDate.getUTCFullYear()
+                };
+                this.locationCode = this.searchService.searches[ServiceType.Lounge]
+                    .locationCode;
+            }
+            catch (_m) {
+                console.error('Error trying to prepopulate parking from lounge item');
+            }
+        }
     }
     addParkingToBasket(parkingQuote, parkingQuery) {
+        var _a, _b, _c, _d, _e, _f;
         return __awaiter(this, void 0, void 0, function* () {
             const intBasket = yield this.basketService.getDefaultBasket();
             const basket = intBasket === null || intBasket === void 0 ? void 0 : intBasket.subject.value;
@@ -11166,7 +11784,11 @@ class ParkingEnterpriseSearch extends BaseEnterpriseSearch {
                     currency: parkingQuote.currency,
                     searchQuery: parkingQuery,
                     outboundDate: parkingQuery.arrivalDatetime.format(),
-                    inboundDate: parkingQuery.departDatetime.format()
+                    inboundDate: parkingQuery.departDatetime.format(),
+                    lowestPrice: ((_a = this.cheapestPrice) === null || _a === void 0 ? void 0 : _a.amount) != parkingQuote.price || ((_b = this.cheapestPrice) === null || _b === void 0 ? void 0 : _b.currencyCode) != parkingQuote.currency
+                        ? (_c = this.cheapestPrice) === null || _c === void 0 ? void 0 : _c.amount : null,
+                    lowestPriceCurrency: ((_d = this.cheapestPrice) === null || _d === void 0 ? void 0 : _d.amount) != parkingQuote.price || ((_e = this.cheapestPrice) === null || _e === void 0 ? void 0 : _e.currencyCode) != parkingQuote.currency
+                        ? (_f = this.cheapestPrice) === null || _f === void 0 ? void 0 : _f.currencyCode : null
                 }, intBasket, this.searchService, this.travellers, parkingQuote.requiresReason);
                 if (whatHappened === DifferentInvokdedUserReasons.research) {
                     this.performSearch();
@@ -11324,11 +11946,12 @@ var SortMethod;
     SortMethod["sortByDate"] = "sortByDate";
 })(SortMethod || (SortMethod = {}));
 class EurostarEnterpriseSearch extends BaseEnterpriseSearch {
-    constructor(eurostarFetcher, helpers, userService, basketService, storageService, searchService, modalService) {
-        super(storageService, helpers, searchService);
+    constructor(eurostarFetcher, helpers, userService, basketService, storageService, searchService, modalService, applyFlightRules) {
+        super(storageService, helpers, searchService, userService);
         this.eurostarFetcher = eurostarFetcher;
         this.basketService = basketService;
         this.modalService = modalService;
+        this.applyFlightRules = applyFlightRules;
         this.type = ServiceType.Eurostar;
         this.avaliableClasses = new BehaviorSubject([]);
         this.timeCriteriaOptions = new BehaviorSubject([]);
@@ -11738,12 +12361,18 @@ class EurostarEnterpriseSearch extends BaseEnterpriseSearch {
     }
     processResults(results1) {
         this.resultQuery = this.getSearchQuery();
-        delete this.resultQuery.withGrouped;
+        this.multi = results1.multi;
+        // delete this.resultQuery['withGrouped'];
         this.filters.next(this.helpers.createFlightFilters(results1.journeys, DEFAULT_FILTERS));
         if (results1 && this.searchService.isFlightsGrouped()) {
+            this._ruleActionSummary = Object.assign({}, {
+                journeyWhenSelected: {},
+                dualSingleWhenSelected: {},
+                whenSelectedAlone: {}
+            }, results1.ruleActionSummary || {});
             const returndata = (results1.journeys || []).reduce((acc, result, index) => {
                 if (result.outboundFlights.length) {
-                    const euroResult = this.formatEurostarResults(result.outboundFlights, result.total, index);
+                    const euroResult = this.formatEurostarResults(result.outboundFlights, result.total, result.journeyHash, index);
                     euroResult.co2PerPassenger = result.co2PerPassenger;
                     euroResult.co2PerItem = result.co2PerItem;
                     euroResult.sourceId = result.sourceId;
@@ -11756,7 +12385,7 @@ class EurostarEnterpriseSearch extends BaseEnterpriseSearch {
                     }
                 }
                 if (result.inboundFlights.length) {
-                    const euroResult = this.formatEurostarResults(result.inboundFlights, result.total, index);
+                    const euroResult = this.formatEurostarResults(result.inboundFlights, result.total, result.journeyHash, index);
                     euroResult.co2PerPassenger = result.co2PerPassenger;
                     euroResult.co2PerItem = result.co2PerItem;
                     euroResult.sourceId = result.sourceId;
@@ -11804,8 +12433,8 @@ class EurostarEnterpriseSearch extends BaseEnterpriseSearch {
         }
         return acc;
     }
-    formatEurostarResults(results, total, index) {
-        const returnObject = {
+    formatEurostarResults(results, total, journeyHash, index) {
+        let returnObject = {
             dateArrival: null,
             dateDeparture: null,
             duration: null,
@@ -11823,7 +12452,21 @@ class EurostarEnterpriseSearch extends BaseEnterpriseSearch {
                 isDisabled: true,
                 price: NaN,
                 currency: 'GBP',
-                selected: false
+                selected: false,
+                requiresReason: false,
+                preferred: false,
+                preferredMessages: '',
+                companyPreferred: false,
+                companyPreferredMessage: '',
+                officePreferred: false,
+                officePreferredMessage: '',
+                tmcPreferred: false,
+                tmcPreferredMessage: '',
+                unavailable: false,
+                unavailableMessage: '',
+                requiresReasonMessage: '',
+                canSelect: false,
+                journeyHash: ''
             },
             standardFare: {
                 class: null,
@@ -11831,7 +12474,21 @@ class EurostarEnterpriseSearch extends BaseEnterpriseSearch {
                 isDisabled: true,
                 price: NaN,
                 currency: 'GBP',
-                selected: false
+                selected: false,
+                requiresReason: false,
+                preferred: false,
+                preferredMessages: '',
+                companyPreferred: false,
+                companyPreferredMessage: '',
+                officePreferred: false,
+                officePreferredMessage: '',
+                tmcPreferred: false,
+                tmcPreferredMessage: '',
+                unavailable: false,
+                unavailableMessage: '',
+                requiresReasonMessage: '',
+                canSelect: false,
+                journeyHash: ''
             },
             standardPremierFare: {
                 class: null,
@@ -11839,9 +12496,22 @@ class EurostarEnterpriseSearch extends BaseEnterpriseSearch {
                 isDisabled: true,
                 price: NaN,
                 currency: 'GBP',
-                selected: false
-            },
-            requiresReason: false
+                selected: false,
+                requiresReason: false,
+                preferred: false,
+                preferredMessages: '',
+                companyPreferred: false,
+                companyPreferredMessage: '',
+                officePreferred: false,
+                officePreferredMessage: '',
+                tmcPreferred: false,
+                tmcPreferredMessage: '',
+                unavailable: false,
+                unavailableMessage: '',
+                requiresReasonMessage: '',
+                canSelect: false,
+                journeyHash: ''
+            }
         };
         // returnObject.duration = results.outboundTotalDuration;
         results.forEach((flight) => {
@@ -11867,6 +12537,8 @@ class EurostarEnterpriseSearch extends BaseEnterpriseSearch {
                     returnObject.standardFare.currency = total.currency;
                     returnObject.standardFare.class = flight.cabinClass;
                     returnObject.standardFare.selected = false;
+                    returnObject.standardFare.journeyHash = journeyHash;
+                    returnObject = this.updateRules(returnObject, journeyHash, 'standardFare');
                     break;
                 case 'Premium':
                     returnObject.standardPremierFare.isDisabled = false;
@@ -11875,6 +12547,8 @@ class EurostarEnterpriseSearch extends BaseEnterpriseSearch {
                     returnObject.standardPremierFare.currency = total.currency;
                     returnObject.standardPremierFare.class = flight.cabinClass;
                     returnObject.standardPremierFare.selected = false;
+                    returnObject.standardPremierFare.journeyHash = journeyHash;
+                    returnObject = this.updateRules(returnObject, journeyHash, 'standardPremierFare');
                     break;
                 case FlightCabinClass.Business:
                     returnObject.businessPremierFare.isDisabled = false;
@@ -11883,6 +12557,8 @@ class EurostarEnterpriseSearch extends BaseEnterpriseSearch {
                     returnObject.businessPremierFare.currency = total.currency;
                     returnObject.businessPremierFare.class = flight.cabinClass;
                     returnObject.businessPremierFare.selected = false;
+                    returnObject.businessPremierFare.journeyHash = journeyHash;
+                    returnObject = this.updateRules(returnObject, journeyHash, 'businessPremierFare');
                     break;
                 default:
                     console.warn('new class to be implemented: ', flight.cabinClass);
@@ -11890,6 +12566,108 @@ class EurostarEnterpriseSearch extends BaseEnterpriseSearch {
         });
         return returnObject;
     }
+    updateRules(returnObject, journeyHash, fareType) {
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, _28, _29, _30, _31, _32, _33;
+        const selectedRuleSummary = this._ruleActionSummary.dualSingleWhenSelected[(_a = this.selectedGroupFlight) === null || _a === void 0 ? void 0 : _a.journeyHash] || {};
+        const hasField = (journeyHash, field, def) => {
+            return (this.helpers.fieldFromObject(this._ruleActionSummary, [
+                'journeyWhenSelected',
+                journeyHash,
+                field
+            ]) ||
+                this.helpers.fieldFromObject(this._ruleActionSummary, [
+                    'whenSelectedAlone',
+                    journeyHash,
+                    field
+                ]) ||
+                this.helpers.fieldFromObject(selectedRuleSummary, [
+                    journeyHash,
+                    field
+                ]) ||
+                def);
+        };
+        switch (fareType) {
+            case 'standardFare':
+                returnObject.standardFare.companyPreferred =
+                    ((_b = this._ruleActionSummary.journeyWhenSelected[journeyHash]) === null || _b === void 0 ? void 0 : _b.companyPreferred) || ((_c = this._ruleActionSummary.whenSelectedAlone[journeyHash]) === null || _c === void 0 ? void 0 : _c.companyPreferred) ||
+                        false;
+                returnObject.standardFare.companyPreferredMessage =
+                    ((_d = this._ruleActionSummary.journeyWhenSelected[journeyHash]) === null || _d === void 0 ? void 0 : _d.companyPreferredMessage) || ((_e = this._ruleActionSummary.whenSelectedAlone[journeyHash]) === null || _e === void 0 ? void 0 : _e.companyPreferredMessage) ||
+                        '';
+                returnObject.standardFare.officePreferred =
+                    ((_f = this._ruleActionSummary.journeyWhenSelected[journeyHash]) === null || _f === void 0 ? void 0 : _f.officePreferred) || ((_g = this._ruleActionSummary.whenSelectedAlone[journeyHash]) === null || _g === void 0 ? void 0 : _g.officePreferred) ||
+                        false;
+                returnObject.standardFare.officePreferredMessage =
+                    ((_h = this._ruleActionSummary.journeyWhenSelected[journeyHash]) === null || _h === void 0 ? void 0 : _h.officePreferredMessage) || ((_j = this._ruleActionSummary.whenSelectedAlone[journeyHash]) === null || _j === void 0 ? void 0 : _j.officePreferredMessage) ||
+                        '';
+                returnObject.standardFare.tmcPreferred =
+                    ((_k = this._ruleActionSummary.journeyWhenSelected[journeyHash]) === null || _k === void 0 ? void 0 : _k.tmcPreferred) || ((_l = this._ruleActionSummary.whenSelectedAlone[journeyHash]) === null || _l === void 0 ? void 0 : _l.tmcPreferred) ||
+                        false;
+                returnObject.standardFare.tmcPreferredMessage =
+                    ((_m = this._ruleActionSummary.journeyWhenSelected[journeyHash]) === null || _m === void 0 ? void 0 : _m.tmcPreferredMessage) || ((_o = this._ruleActionSummary.whenSelectedAlone[journeyHash]) === null || _o === void 0 ? void 0 : _o.tmcPreferredMessage) ||
+                        '';
+                returnObject.standardFare.preferred =
+                    ((_p = this._ruleActionSummary.journeyWhenSelected[journeyHash]) === null || _p === void 0 ? void 0 : _p.companyPreferred) || ((_q = this._ruleActionSummary.whenSelectedAlone[journeyHash]) === null || _q === void 0 ? void 0 : _q.companyPreferred) || ((_r = this._ruleActionSummary.journeyWhenSelected[journeyHash]) === null || _r === void 0 ? void 0 : _r.officePreferred) || ((_s = this._ruleActionSummary.whenSelectedAlone[journeyHash]) === null || _s === void 0 ? void 0 : _s.officePreferred) || ((_t = this._ruleActionSummary.journeyWhenSelected[journeyHash]) === null || _t === void 0 ? void 0 : _t.tmcPreferred) || ((_u = this._ruleActionSummary.whenSelectedAlone[journeyHash]) === null || _u === void 0 ? void 0 : _u.tmcPreferred);
+                returnObject.standardFare.selected = returnObject.uid === ((_v = this.selectedGroupFlight) === null || _v === void 0 ? void 0 : _v.uid);
+                returnObject.standardFare.unavailable = hasField(journeyHash, 'unavailable', false);
+                returnObject.standardFare.unavailableMessage = hasField(journeyHash, 'unavailableMessage', '');
+                returnObject.standardFare.requiresReason = hasField(journeyHash, 'requiresReason', false);
+                returnObject.standardFare.requiresReasonMessage = hasField(journeyHash, 'requiresReasonMessage', '');
+            case 'standardPremierFare':
+                returnObject.standardPremierFare.companyPreferred =
+                    ((_w = this._ruleActionSummary.journeyWhenSelected[journeyHash]) === null || _w === void 0 ? void 0 : _w.companyPreferred) || ((_x = this._ruleActionSummary.whenSelectedAlone[journeyHash]) === null || _x === void 0 ? void 0 : _x.companyPreferred) ||
+                        false;
+                returnObject.standardPremierFare.companyPreferredMessage =
+                    ((_y = this._ruleActionSummary.journeyWhenSelected[journeyHash]) === null || _y === void 0 ? void 0 : _y.companyPreferredMessage) || ((_z = this._ruleActionSummary.whenSelectedAlone[journeyHash]) === null || _z === void 0 ? void 0 : _z.companyPreferredMessage) ||
+                        '';
+                returnObject.standardPremierFare.officePreferred =
+                    ((_0 = this._ruleActionSummary.journeyWhenSelected[journeyHash]) === null || _0 === void 0 ? void 0 : _0.officePreferred) || ((_1 = this._ruleActionSummary.whenSelectedAlone[journeyHash]) === null || _1 === void 0 ? void 0 : _1.officePreferred) ||
+                        false;
+                returnObject.standardPremierFare.officePreferredMessage =
+                    ((_2 = this._ruleActionSummary.journeyWhenSelected[journeyHash]) === null || _2 === void 0 ? void 0 : _2.officePreferredMessage) || ((_3 = this._ruleActionSummary.whenSelectedAlone[journeyHash]) === null || _3 === void 0 ? void 0 : _3.officePreferredMessage) ||
+                        '';
+                returnObject.standardPremierFare.tmcPreferred =
+                    ((_4 = this._ruleActionSummary.journeyWhenSelected[journeyHash]) === null || _4 === void 0 ? void 0 : _4.tmcPreferred) || ((_5 = this._ruleActionSummary.whenSelectedAlone[journeyHash]) === null || _5 === void 0 ? void 0 : _5.tmcPreferred) ||
+                        false;
+                returnObject.standardPremierFare.tmcPreferredMessage =
+                    ((_6 = this._ruleActionSummary.journeyWhenSelected[journeyHash]) === null || _6 === void 0 ? void 0 : _6.tmcPreferredMessage) || ((_7 = this._ruleActionSummary.whenSelectedAlone[journeyHash]) === null || _7 === void 0 ? void 0 : _7.tmcPreferredMessage) ||
+                        '';
+                returnObject.standardPremierFare.preferred =
+                    ((_8 = this._ruleActionSummary.journeyWhenSelected[journeyHash]) === null || _8 === void 0 ? void 0 : _8.companyPreferred) || ((_9 = this._ruleActionSummary.whenSelectedAlone[journeyHash]) === null || _9 === void 0 ? void 0 : _9.companyPreferred) || ((_10 = this._ruleActionSummary.journeyWhenSelected[journeyHash]) === null || _10 === void 0 ? void 0 : _10.officePreferred) || ((_11 = this._ruleActionSummary.whenSelectedAlone[journeyHash]) === null || _11 === void 0 ? void 0 : _11.officePreferred) || ((_12 = this._ruleActionSummary.journeyWhenSelected[journeyHash]) === null || _12 === void 0 ? void 0 : _12.tmcPreferred) || ((_13 = this._ruleActionSummary.whenSelectedAlone[journeyHash]) === null || _13 === void 0 ? void 0 : _13.tmcPreferred);
+                returnObject.standardPremierFare.selected = returnObject.uid === ((_14 = this.selectedGroupFlight) === null || _14 === void 0 ? void 0 : _14.uid);
+                returnObject.standardPremierFare.unavailable = hasField(journeyHash, 'unavailable', false);
+                returnObject.standardPremierFare.unavailableMessage = hasField(journeyHash, 'unavailableMessage', '');
+                returnObject.standardPremierFare.requiresReason = hasField(journeyHash, 'requiresReason', false);
+                returnObject.standardPremierFare.requiresReasonMessage = hasField(journeyHash, 'requiresReasonMessage', '');
+            case 'businessPremierFare':
+                returnObject.businessPremierFare.companyPreferred =
+                    ((_15 = this._ruleActionSummary.journeyWhenSelected[journeyHash]) === null || _15 === void 0 ? void 0 : _15.companyPreferred) || ((_16 = this._ruleActionSummary.whenSelectedAlone[journeyHash]) === null || _16 === void 0 ? void 0 : _16.companyPreferred) ||
+                        false;
+                returnObject.businessPremierFare.companyPreferredMessage =
+                    ((_17 = this._ruleActionSummary.journeyWhenSelected[journeyHash]) === null || _17 === void 0 ? void 0 : _17.companyPreferredMessage) || ((_18 = this._ruleActionSummary.whenSelectedAlone[journeyHash]) === null || _18 === void 0 ? void 0 : _18.companyPreferredMessage) ||
+                        '';
+                returnObject.businessPremierFare.officePreferred =
+                    ((_19 = this._ruleActionSummary.journeyWhenSelected[journeyHash]) === null || _19 === void 0 ? void 0 : _19.officePreferred) || ((_20 = this._ruleActionSummary.whenSelectedAlone[journeyHash]) === null || _20 === void 0 ? void 0 : _20.officePreferred) ||
+                        false;
+                returnObject.businessPremierFare.officePreferredMessage =
+                    ((_21 = this._ruleActionSummary.journeyWhenSelected[journeyHash]) === null || _21 === void 0 ? void 0 : _21.officePreferredMessage) || ((_22 = this._ruleActionSummary.whenSelectedAlone[journeyHash]) === null || _22 === void 0 ? void 0 : _22.officePreferredMessage) ||
+                        '';
+                returnObject.businessPremierFare.tmcPreferred =
+                    ((_23 = this._ruleActionSummary.journeyWhenSelected[journeyHash]) === null || _23 === void 0 ? void 0 : _23.tmcPreferred) || ((_24 = this._ruleActionSummary.whenSelectedAlone[journeyHash]) === null || _24 === void 0 ? void 0 : _24.tmcPreferred) ||
+                        false;
+                returnObject.businessPremierFare.tmcPreferredMessage =
+                    ((_25 = this._ruleActionSummary.journeyWhenSelected[journeyHash]) === null || _25 === void 0 ? void 0 : _25.tmcPreferredMessage) || ((_26 = this._ruleActionSummary.whenSelectedAlone[journeyHash]) === null || _26 === void 0 ? void 0 : _26.tmcPreferredMessage) ||
+                        '';
+                returnObject.businessPremierFare.preferred =
+                    ((_27 = this._ruleActionSummary.journeyWhenSelected[journeyHash]) === null || _27 === void 0 ? void 0 : _27.companyPreferred) || ((_28 = this._ruleActionSummary.whenSelectedAlone[journeyHash]) === null || _28 === void 0 ? void 0 : _28.companyPreferred) || ((_29 = this._ruleActionSummary.journeyWhenSelected[journeyHash]) === null || _29 === void 0 ? void 0 : _29.officePreferred) || ((_30 = this._ruleActionSummary.whenSelectedAlone[journeyHash]) === null || _30 === void 0 ? void 0 : _30.officePreferred) || ((_31 = this._ruleActionSummary.journeyWhenSelected[journeyHash]) === null || _31 === void 0 ? void 0 : _31.tmcPreferred) || ((_32 = this._ruleActionSummary.whenSelectedAlone[journeyHash]) === null || _32 === void 0 ? void 0 : _32.tmcPreferred);
+                returnObject.businessPremierFare.selected = returnObject.uid === ((_33 = this.selectedGroupFlight) === null || _33 === void 0 ? void 0 : _33.uid);
+                returnObject.businessPremierFare.unavailable = hasField(journeyHash, 'unavailable', false);
+                returnObject.businessPremierFare.unavailableMessage = hasField(journeyHash, 'unavailableMessage', '');
+                returnObject.businessPremierFare.requiresReason = hasField(journeyHash, 'requiresReason', false);
+                returnObject.businessPremierFare.requiresReasonMessage = hasField(journeyHash, 'requiresReasonMessage', '');
+        }
+        return returnObject;
+    }
     resetQuery(checkIsValid = true) {
         this.updateTempParams(this.searchService.makeEurostarQuery());
         if (checkIsValid) {
@@ -12316,10 +13094,118 @@ class EurostarEnterpriseSearch extends BaseEnterpriseSearch {
         }
     }
     updateFromPreviousSearches(previousItems) {
-        var _a;
+        var _a, _b, _c, _d, _e, _f, _g;
         const flightItem = (_a = previousItems[ServiceType.Flight]) === null || _a === void 0 ? void 0 : _a.searchQuery;
+        const railItem = (_b = previousItems[ServiceType.Rail]) === null || _b === void 0 ? void 0 : _b.searchQuery;
+        const irlItem = (_c = previousItems[ServiceType.InternationalRail]) === null || _c === void 0 ? void 0 : _c.searchQuery;
+        const hotelItem = (_d = previousItems[ServiceType.Rail]) === null || _d === void 0 ? void 0 : _d.searchQuery;
+        const carItem = (_e = previousItems[ServiceType.Car]) === null || _e === void 0 ? void 0 : _e.searchQuery;
+        const loungeItem = (_f = previousItems[ServiceType.Lounge]) === null || _f === void 0 ? void 0 : _f.searchQuery;
+        const parkingItem = (_g = previousItems[ServiceType.Parking]) === null || _g === void 0 ? void 0 : _g.searchQuery;
         if (flightItem) {
-            // TODO flights haven't been done yet.
+            try {
+                this.outBoundDate = moment(previousItems.FLIGHT.outboundDate.replace("T", "").split(".")[0], "YYYY-MM-DDhh:mm:ss");
+                if (this.outBoundDate.minutes() % 30)
+                    this.outBoundDate = this.outBoundDate.subtract(this.outBoundDate.minutes() % 30, "minutes");
+                if (previousItems.FLIGHT.inboundDate) {
+                    this.inboundDate = moment(previousItems.FLIGHT.inboundDate.replace("T", "").split(".")[0], "YYYY-MM-DDhh:mm:ss");
+                    if (this.inboundDate.minutes() % 30)
+                        this.inboundDate = this.inboundDate.subtract(this.inboundDate.minutes() % 30, "minutes");
+                }
+            }
+            catch (_h) {
+                console.error('Error trying to prepopulate eurostar from flight item');
+            }
+        }
+        else if (railItem) {
+            try {
+                this.outBoundDate = moment(previousItems.RAIL.outboundDate.replace("T", "").split(".")[0], "YYYY-MM-DDhh:mm:ss");
+                if (this.outBoundDate.minutes() % 30)
+                    this.outBoundDate = this.outBoundDate.subtract(this.outBoundDate.minutes() % 30, "minutes");
+                if (previousItems.RAIL.inboundDate) {
+                    this.inboundDate = moment(previousItems.RAIL.inboundDate.replace("T", "").split(".")[0], "YYYY-MM-DDhh:mm:ss");
+                    if (this.inboundDate.minutes() % 30)
+                        this.inboundDate = this.inboundDate.subtract(this.inboundDate.minutes() % 30, "minutes");
+                }
+            }
+            catch (_j) {
+                console.error('Error trying to prepopulate eurostar from rail item');
+            }
+        }
+        else if (irlItem) {
+            try {
+                this.outBoundDate = moment(previousItems.INTERNATIONAL_RAIL.outboundDate.replace("T", "").split(".")[0], "YYYY-MM-DDhh:mm:ss");
+                if (this.outBoundDate.minutes() % 30)
+                    this.outBoundDate = this.outBoundDate.subtract(this.outBoundDate.minutes() % 30, "minutes");
+                if (previousItems.INTERNATIONAL_RAIL.inboundDate) {
+                    this.inboundDate = moment(previousItems.INTERNATIONAL_RAIL.inboundDate.replace("T", "").split(".")[0], "YYYY-MM-DDhh:mm:ss");
+                    if (this.inboundDate.minutes() % 30)
+                        this.inboundDate = this.inboundDate.subtract(this.inboundDate.minutes() % 30, "minutes");
+                }
+            }
+            catch (_k) {
+                console.error('Error trying to prepopulate eurostar from international rail item');
+            }
+        }
+        else if (hotelItem) {
+            try {
+                this.outBoundDate = moment(previousItems.HOTEL.outboundDate.replace("T", "").split(".")[0], "YYYY-MM-DDhh:mm:ss");
+                if (this.outBoundDate.minutes() % 30)
+                    this.outBoundDate = this.outBoundDate.subtract(this.outBoundDate.minutes() % 30, "minutes");
+                if (previousItems.HOTEL.inboundDate) {
+                    this.inboundDate = moment(previousItems.HOTEL.inboundDate.replace("T", "").split(".")[0], "YYYY-MM-DDhh:mm:ss");
+                    if (this.inboundDate.minutes() % 30)
+                        this.inboundDate = this.inboundDate.subtract(this.inboundDate.minutes() % 30, "minutes");
+                }
+            }
+            catch (_l) {
+                console.error('Error trying to prepopulate eurostar from hotel item');
+            }
+        }
+        else if (carItem) {
+            try {
+                this.outBoundDate = moment(previousItems.CAR.outboundDate.replace("T", "").split(".")[0], "YYYY-MM-DDhh:mm:ss");
+                if (this.outBoundDate.minutes() % 30)
+                    this.outBoundDate = this.outBoundDate.subtract(this.outBoundDate.minutes() % 30, "minutes");
+                if (previousItems.CAR.inboundDate) {
+                    this.inboundDate = moment(previousItems.CAR.inboundDate.replace("T", "").split(".")[0], "YYYY-MM-DDhh:mm:ss");
+                    if (this.inboundDate.minutes() % 30)
+                        this.inboundDate = this.inboundDate.subtract(this.inboundDate.minutes() % 30, "minutes");
+                }
+            }
+            catch (_m) {
+                console.error('Error trying to prepopulate eurostar from car item');
+            }
+        }
+        else if (loungeItem) {
+            try {
+                this.outBoundDate = moment(previousItems.LOUNGE.outboundDate.replace("T", "").split(".")[0], "YYYY-MM-DDhh:mm:ss");
+                if (this.outBoundDate.minutes() % 30)
+                    this.outBoundDate = this.outBoundDate.subtract(this.outBoundDate.minutes() % 30, "minutes");
+                if (previousItems.LOUNGE.inboundDate) {
+                    this.inboundDate = moment(previousItems.LOUNGE.inboundDate.replace("T", "").split(".")[0], "YYYY-MM-DDhh:mm:ss");
+                    if (this.inboundDate.minutes() % 30)
+                        this.inboundDate = this.inboundDate.subtract(this.inboundDate.minutes() % 30, "minutes");
+                }
+            }
+            catch (_o) {
+                console.error('Error trying to prepopulate eurostar from lounge item');
+            }
+        }
+        else if (parkingItem) {
+            try {
+                this.outBoundDate = moment(previousItems.PARKING.outboundDate.replace("T", "").split(".")[0], "YYYY-MM-DDhh:mm:ss");
+                if (this.outBoundDate.minutes() % 30)
+                    this.outBoundDate = this.outBoundDate.subtract(this.outBoundDate.minutes() % 30, "minutes");
+                if (previousItems.PARKING.inboundDate) {
+                    this.inboundDate = moment(previousItems.PARKING.inboundDate.replace("T", "").split(".")[0], "YYYY-MM-DDhh:mm:ss");
+                    if (this.inboundDate.minutes() % 30)
+                        this.inboundDate = this.inboundDate.subtract(this.inboundDate.minutes() % 30, "minutes");
+                }
+            }
+            catch (_p) {
+                console.error('Error trying to prepopulate eurostar from parking item');
+            }
         }
     }
     getTotalBaggage(result) {
@@ -12481,7 +13367,7 @@ class EurostarEnterpriseSearch extends BaseEnterpriseSearch {
                     outboundFlights: [this.makeSchemaFlights(fare.fare, 'outbound', 0)],
                     inboundFlights: [],
                     journeyType: 'single'
-                }, selectedEurostar.dateDeparture, null, fare.price, selectedEurostar.requiresReason);
+                }, selectedEurostar.dateDeparture, null, fare.price, fare.requiresReason);
                 return;
             }
             // return logic needs updating - either accept outbound or return and somehow distiguish them
@@ -12503,7 +13389,7 @@ class EurostarEnterpriseSearch extends BaseEnterpriseSearch {
                                 this.makeSchemaFlights(fare.fare, 'outbound', 0)
                             ],
                             journeyType: 'roundtrip'
-                        }, selectedEurostar.dateDeparture, this.selectedGroupEurostar.item.dateArrival, price, selectedEurostar.requiresReason);
+                        }, selectedEurostar.dateDeparture, this.selectedGroupEurostar.item.dateArrival, price, fare.requiresReason);
                         this.resetSelectedFares();
                         this.basketService.toggleMenu();
                         this.results.next(this.fullResults.map(this.removeSelectedFlags));
@@ -12543,7 +13429,7 @@ class EurostarEnterpriseSearch extends BaseEnterpriseSearch {
                             ],
                             inboundFlights: [this.makeSchemaFlights(fare.fare, 'inbound', 0)],
                             journeyType: 'roundtrip'
-                        }, selectedEurostar.dateDeparture, this.selectedGroupEurostar.item.dateArrival, price, selectedEurostar.requiresReason);
+                        }, selectedEurostar.dateDeparture, this.selectedGroupEurostar.item.dateArrival, price, fare.requiresReason);
                         this.resetSelectedFares();
                         this.basketService.toggleMenu();
                         this.results.next(this.fullResults.map(this.removeSelectedFlags));
@@ -12567,11 +13453,44 @@ class EurostarEnterpriseSearch extends BaseEnterpriseSearch {
                             const inbound = result.inbound.filter((item) => index === item.uid);
                             return { inbound, outbound: result.outbound };
                         }));
+                        this._updateTravelPolicies();
                     }
                 }
             }
         });
     }
+    _updateTravelPolicies() {
+        if (!this.selectedGroupEurostar ||
+            this._ruleActionSummary.dualSingleWhenSelected[this._selectedEurostarFare.item.journeyHash] ||
+            !this.multi ||
+            this.multi.length === 0) {
+            return;
+        }
+        const multiInbounds = (this.multi || []).reduce((acc, item) => {
+            if (item.order === 1 && item.results && item.results.length > 0) {
+                acc = acc.concat(item.results);
+            }
+            return acc;
+        }, []);
+        if (multiInbounds.length > 0) {
+            if (!this.rawResults) {
+                this.rawResults = this.storageService.getSessionItem(this.resultsSessionName + '_raw');
+            }
+            console.log(this.rawResults);
+            this.applyFlightRules
+                .fetchOne({
+                selectedOutboundFlight: this.selectedGroupFlight,
+                availableInboundFlights: multiInbounds,
+                searchId: this.rawResults.searchId
+            })
+                .pipe(take(1))
+                .subscribe((rules) => {
+                if (rules) {
+                    this._ruleActionSummary = this.helpers.mergeObjects(this._ruleActionSummary, rules);
+                }
+            });
+        }
+    }
     resetSelectedFares() {
         this.selectedGroupEurostar = {
             direction: null,
@@ -12599,7 +13518,7 @@ class EurostarEnterpriseSearch extends BaseEnterpriseSearch {
     }
     updateLowestPrice(results) {
         if (!results.length || this.searchService.isFlightsGrouped())
-            return;
+            return; //
         const result = results[0];
         const journeys = result.journeys;
         if (!journeys.length)
@@ -12613,6 +13532,7 @@ class EurostarEnterpriseSearch extends BaseEnterpriseSearch {
         }, { amount: Number.MAX_SAFE_INTEGER, currencyCode: currency });
     }
     doBooking(intBasket, selectedFlight, schemaDetails, outboundDate, inboundDate, price, requiresReason) {
+        var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
             const { sourceId, co2PerItem, co2PerPassenger, total } = selectedFlight;
             const booking = {
@@ -12626,7 +13546,9 @@ class EurostarEnterpriseSearch extends BaseEnterpriseSearch {
                 price,
                 searchQuery: this.resultQuery,
                 service: sourceId.toString(),
-                outboundDate
+                outboundDate,
+                lowestPrice: (_a = this.lowestPrice) === null || _a === void 0 ? void 0 : _a.amount,
+                lowestPriceCurrency: (_b = this.lowestPrice) === null || _b === void 0 ? void 0 : _b.currencyCode
             };
             if (inboundDate) {
                 booking.inboundDate = inboundDate;
@@ -12638,6 +13560,36 @@ class EurostarEnterpriseSearch extends BaseEnterpriseSearch {
             return whatHappened;
         });
     }
+    get lowestPrice() {
+        if (this.cheapestPrice)
+            return this.cheapestPrice;
+        const outbound = this.fullResults[0].outbound;
+        const currency = outbound[0].standardFare.currency;
+        let cheapestOutbound;
+        outbound.forEach(a => {
+            if (!cheapestOutbound || a.standardFare.price < cheapestOutbound)
+                cheapestOutbound = a.standardFare.price;
+            if (a.standardPremierFare.price < cheapestOutbound)
+                cheapestOutbound = a.standardPremierFare.price;
+            if (a.businessPremierFare.price < cheapestOutbound)
+                cheapestOutbound = a.businessPremierFare.price;
+        });
+        const inbound = this.fullResults[0].inbound;
+        let cheapestinbound;
+        if (inbound) {
+            inbound.forEach(a => {
+                if (!cheapestinbound || a.standardFare.price < cheapestinbound)
+                    cheapestinbound = a.standardFare.price;
+                if (a.standardPremierFare.price < cheapestinbound)
+                    cheapestinbound = a.standardPremierFare.price;
+                if (a.businessPremierFare.price < cheapestinbound)
+                    cheapestinbound = a.businessPremierFare.price;
+            });
+        }
+        else
+            cheapestinbound = 0;
+        return { amount: cheapestOutbound + cheapestinbound, currencyCode: currency };
+    }
     makeSchemaFlights(selectedFlight, flightGroup, groupIndex, segmentIndex) {
         return Object.assign(Object.assign({}, selectedFlight), { journeyInfo: {
                 flightGroup,
@@ -13007,7 +13959,7 @@ var RailJourneyFareType;
 })(RailJourneyFareType || (RailJourneyFareType = {}));
 class RailEnterpriseSearch extends BaseEnterpriseSearch {
     constructor(Railfetcher, getRailStationFetcher, helpers, basketService, storageService, searchService, userService, modalService) {
-        super(storageService, helpers, searchService);
+        super(storageService, helpers, searchService, userService);
         this.Railfetcher = Railfetcher;
         this.getRailStationFetcher = getRailStationFetcher;
         this.basketService = basketService;
@@ -13981,6 +14933,7 @@ class RailEnterpriseSearch extends BaseEnterpriseSearch {
             if (basket) {
                 const outboundLegs = this.getLegsFromRailJourneyOption(outbound);
                 const inboundLegs = this.getLegsFromRailJourneyOption(inbound);
+                const lowestTicket = this.findCheapestTicket();
                 const basketItem = {
                     basket: basket.id,
                     service: serviceId,
@@ -14050,7 +15003,11 @@ class RailEnterpriseSearch extends BaseEnterpriseSearch {
                     co2PerItem: outbound.co2PerItem,
                     co2PerPassenger: outbound.co2PerPassenger,
                     outboundDate: outbound.arriveDateTime,
-                    inboundDate: inbound.arriveDateTime
+                    inboundDate: inbound.arriveDateTime,
+                    lowestPrice: lowestTicket.amount != Number(outboundFare.price + inboundFare.price) || lowestTicket.currencyCode != outboundFare.currency ?
+                        lowestTicket.amount : null,
+                    lowestPriceCurrency: (lowestTicket.amount != Number(outboundFare.price + inboundFare.price) || lowestTicket.currencyCode != outboundFare.currency) ?
+                        lowestTicket.currencyCode : null
                 };
                 // if inTicketExtras or outTicketExtras exists add the object to basketItem
                 if (inTicketExtras) {
@@ -14069,7 +15026,49 @@ class RailEnterpriseSearch extends BaseEnterpriseSearch {
         });
     }
     findCheapestTicket() {
-        return 0;
+        if (this.cheapestPrice)
+            return this.cheapestPrice;
+        let cheapestOutboundTicket;
+        let cheapestOpenReturnTicket;
+        this.fullResults[0].outbound.forEach(element => {
+            Object.keys(element.dualSingleJourneyFares).forEach(key => {
+                const cheapestOnJourney = element.dualSingleJourneyFares[key].filter(a => a != null).sort(a => a.price)[0];
+                if (cheapestOnJourney && (!cheapestOutboundTicket || cheapestOutboundTicket.price > cheapestOnJourney.price))
+                    cheapestOutboundTicket = cheapestOnJourney;
+            });
+            Object.keys(element.returnJourneyFares).forEach(key => {
+                const cheapestOnJourney = element.returnJourneyFares[key].filter(a => a != null).sort(a => a.price)[0];
+                if (cheapestOnJourney && (!cheapestOpenReturnTicket || cheapestOpenReturnTicket.price > cheapestOnJourney.price))
+                    cheapestOpenReturnTicket = cheapestOnJourney;
+            });
+        });
+        let cheapestReturnTicket;
+        if (this.fullResults[0].return) {
+            this.fullResults[0].return.forEach(element => {
+                Object.keys(element.dualSingleJourneyFares).forEach(key => {
+                    const cheapestOnJourney = element.dualSingleJourneyFares[key].filter(a => a != null).sort(a => a.price)[0];
+                    if (cheapestOnJourney && (!cheapestReturnTicket || cheapestReturnTicket.price > cheapestOnJourney.price))
+                        cheapestReturnTicket = cheapestOnJourney;
+                });
+                Object.keys(element.returnJourneyFares).forEach(key => {
+                    const cheapestOnJourney = element.returnJourneyFares[key].filter(a => a != null).sort(a => a.price)[0];
+                    if (cheapestOnJourney && (!cheapestOpenReturnTicket || cheapestOpenReturnTicket.price > cheapestOnJourney.price))
+                        cheapestOpenReturnTicket = cheapestOnJourney;
+                });
+            });
+        }
+        if (cheapestOpenReturnTicket) {
+            if (cheapestReturnTicket) {
+                if (cheapestOutboundTicket.price + cheapestReturnTicket.price < cheapestOpenReturnTicket.price && cheapestOutboundTicket.currency == cheapestReturnTicket.currency)
+                    return { amount: cheapestOutboundTicket.price + cheapestReturnTicket.price, currencyCode: cheapestOutboundTicket.currency };
+            }
+            else if (cheapestOutboundTicket.price < cheapestOpenReturnTicket.price)
+                return { amount: cheapestOutboundTicket.price, currencyCode: cheapestOutboundTicket.currency };
+            return { amount: cheapestOpenReturnTicket.price, currencyCode: cheapestOpenReturnTicket.currency };
+        }
+        else if (cheapestReturnTicket)
+            return { amount: cheapestOutboundTicket.price + cheapestReturnTicket.price, currencyCode: cheapestOutboundTicket.currency };
+        return { amount: cheapestOutboundTicket.price, currencyCode: cheapestOutboundTicket.currency };
     }
     resetQuery() {
         this.updateTempParams(this.searchService.makeRailQuery());
@@ -14299,7 +15298,24 @@ class RailEnterpriseSearch extends BaseEnterpriseSearch {
             return null;
         }
     }
-    updateFromPreviousSearches(previousItems) { }
+    updateFromPreviousSearches(previousItems) {
+        console.log(previousItems);
+        if (previousItems.FLIGHT) {
+            try {
+                this.outBoundDateTime = moment(previousItems.FLIGHT.outboundDate.replace("T", "").split(".")[0], "YYYY-MM-DDhh:mm:ss");
+                if (this.outBoundDateTime.minutes() % 30)
+                    this.outBoundDateTime = this.outBoundDateTime.subtract(this.outBoundDateTime.minutes() % 30, "minutes");
+                if (previousItems.FLIGHT.inboundDate) {
+                    this.inBoundDateTime = moment(previousItems.FLIGHT.inboundDate.replace("T", "").split(".")[0], "YYYY-MM-DDhh:mm:ss");
+                    if (this.inBoundDateTime.minutes() % 30)
+                        this.inBoundDateTime = this.inBoundDateTime.subtract(this.inBoundDateTime.minutes() % 30, "minutes");
+                }
+            }
+            catch (_a) {
+                console.error('Error trying to prepopulate Rail from flight item');
+            }
+        }
+    }
     updateSearchFromExpiredBasketItem(basketItem) {
         const searchRailQuery = basketItem.searchQuery;
         this.chosenSearchType = searchRailQuery.journeyType;
@@ -14434,6 +15450,7 @@ class RailEnterpriseSearch extends BaseEnterpriseSearch {
                 //     };
                 //   }
                 // );
+                const lowestTicket = this.findCheapestTicket();
                 const basketItem = {
                     basket: basket.id,
                     service: serviceId.toString(),
@@ -14481,7 +15498,11 @@ class RailEnterpriseSearch extends BaseEnterpriseSearch {
                     searchQuery: railQuery,
                     co2PerItem: railJourneyOption.co2PerItem,
                     co2PerPassenger: railJourneyOption.co2PerPassenger,
-                    outboundDate: railJourneyOption.departDateTime
+                    outboundDate: railJourneyOption.departDateTime,
+                    lowestPrice: lowestTicket.amount != Number(railFare.price) || lowestTicket.currencyCode != railFare.currency ?
+                        lowestTicket.amount : null,
+                    lowestPriceCurrency: (lowestTicket.amount != Number(railFare.price) || lowestTicket.currencyCode != railFare.currency) ?
+                        lowestTicket.currencyCode : null
                 };
                 // if ticketExtras exists add the object to basketItem
                 if (outTicketExtras) {
@@ -14514,6 +15535,7 @@ class RailEnterpriseSearch extends BaseEnterpriseSearch {
             if (basket) {
                 const outboundLegs = this.getLegsFromRailJourneyOption(outbound);
                 const inboundLegs = this.getLegsFromRailJourneyOption(inbound);
+                const lowestTicket = this.findCheapestTicket();
                 const basketItem = {
                     basket: basket.id,
                     service: serviceId,
@@ -14581,7 +15603,11 @@ class RailEnterpriseSearch extends BaseEnterpriseSearch {
                     co2PerItem: outbound.co2PerItem,
                     co2PerPassenger: outbound.co2PerPassenger,
                     outboundDate: outbound.arriveDateTime,
-                    inboundDate: inbound.arriveDateTime
+                    inboundDate: inbound.arriveDateTime,
+                    lowestPrice: lowestTicket.amount != Number(outboundFare.price) || lowestTicket.currencyCode != outboundFare.currency ?
+                        lowestTicket.amount : null,
+                    lowestPriceCurrency: (lowestTicket.amount != Number(outboundFare.price) || lowestTicket.currencyCode != outboundFare.currency) ?
+                        lowestTicket.currencyCode : null
                 };
                 // if ticketExtras exists add the object to basketItem
                 if (ticketExtras) {
@@ -14839,9 +15865,11 @@ class TravellerObject {
         return !!item;
     }
     static fullname(traveller) {
-        return [traveller.title, traveller.forename, traveller.surname].filter(this.hasItem).join(' ');
+        return [traveller.title, traveller.forename, traveller.surname]
+            .filter(this.hasItem)
+            .join(' ');
     }
-    static makeTravellerObjectFromUser(user) {
+    static makeTravellerObjectFromUserData(user) {
         return {
             id: user.user_id.toString(),
             forename: user.forename,
@@ -14856,6 +15884,22 @@ class TravellerObject {
             dob: user.dob
         };
     }
+    static makeTravellerObjectFromUser(user) {
+        return {
+            id: user.id.toString(),
+            forename: user.forename,
+            surname: user.surname,
+            email: user.email,
+            username: user.username,
+            title: user.title,
+            isChild: false,
+            isInfant: false,
+            childDOB: null,
+            guest: false,
+            name: user.surname + ' ' + user.forename,
+            dob: user.dob
+        };
+    }
     static equals(first, second) {
         return first.email === second.email;
     }
@@ -14887,8 +15931,8 @@ var ClassType;
     ClassType["First_Class"] = "1st Class";
 })(ClassType || (ClassType = {}));
 class IRLEnterpriseSearch extends BaseEnterpriseSearch {
-    constructor(Irlfetcher, irlDiscountCardsFetcher, helpers, basketService, storageService, searchService, getIrlSupplierStationFetcher) {
-        super(storageService, helpers, searchService);
+    constructor(Irlfetcher, irlDiscountCardsFetcher, helpers, basketService, storageService, searchService, getIrlSupplierStationFetcher, userService) {
+        super(storageService, helpers, searchService, userService);
         this.Irlfetcher = Irlfetcher;
         this.irlDiscountCardsFetcher = irlDiscountCardsFetcher;
         this.basketService = basketService;
@@ -14956,6 +16000,7 @@ class IRLEnterpriseSearch extends BaseEnterpriseSearch {
         this._ageRange = null;
         this._priceDir = true;
         this._dateDir = true;
+        this._discountCard = [];
         this._irlDiscountCardsArray = [];
         // !date and time is handled differently for LU
         this._outbound_date = null;
@@ -15023,23 +16068,26 @@ class IRLEnterpriseSearch extends BaseEnterpriseSearch {
         this._isValid();
     }
     get travellingTo() {
-        return this.tempParams.arrivalLocationId;
+        return this.tempParams.travellingTo;
     }
     set travellingTo(tt) {
         var _a;
-        this.tempParams.arrivalLocationId = tt;
+        this.tempParams.travellingTo = tt;
         this._travellingTo = '';
         if ((_a = tt === null || tt === void 0 ? void 0 : tt.railstation) === null || _a === void 0 ? void 0 : _a.id) {
             this._travellingTo = tt.railstation.id;
         }
+        else if (tt === null || tt === void 0 ? void 0 : tt.id) {
+            this._travellingTo = tt.id;
+        }
         this._isValid();
     }
     get travellingFrom() {
-        return this.tempParams.departureLocationId;
+        return this.tempParams.travellingFrom;
     }
     set travellingFrom(tt) {
         var _a;
-        this.tempParams.departureLocationId = tt;
+        this.tempParams.travellingFrom = tt;
         this._travellingFrom = '';
         if ((_a = tt === null || tt === void 0 ? void 0 : tt.railstation) === null || _a === void 0 ? void 0 : _a.id) {
             this._travellingFrom = tt.railstation.id;
@@ -15048,6 +16096,9 @@ class IRLEnterpriseSearch extends BaseEnterpriseSearch {
                 this.irlDiscountCardsArray = data;
             });
         }
+        else if (tt === null || tt === void 0 ? void 0 : tt.id) {
+            this._travellingFrom = tt.id;
+        }
         this._isValid();
     }
     get supplier() {
@@ -15086,12 +16137,14 @@ class IRLEnterpriseSearch extends BaseEnterpriseSearch {
         return this._departureLocationId;
     }
     set departureLocationId(data) {
+        this.travellingFrom = data;
         this._departureLocationId = data;
     }
     get arrivalLocationId() {
         return this._arrivalLocationId;
     }
     set arrivalLocationId(data) {
+        this.travellingTo = data;
         this._arrivalLocationId = data;
     }
     get adults() {
@@ -15152,12 +16205,17 @@ class IRLEnterpriseSearch extends BaseEnterpriseSearch {
         this._isValid();
     }
     get discountCard() {
-        return this.tempParams.irlDiscountCards;
+        return this._discountCard;
     }
     set discountCard(data) {
-        this.tempParams.irlDiscountCards = data;
+        this._discountCard = data;
         this._isValid();
     }
+    get discountCardsList() {
+        var _a;
+        return ((_a = this._discountCard) === null || _a === void 0 ? void 0 : _a.length) ? this._discountCard.map(card => card.id).join(',') : null;
+    }
+    ;
     get irlDiscountCardsArray() {
         return this._irlDiscountCardsArray;
     }
@@ -15296,8 +16354,21 @@ class IRLEnterpriseSearch extends BaseEnterpriseSearch {
     }
     resetQuery() {
         this.updateTempParams(this.searchService.makeIrlQuery());
+        this.resetIrlForm();
         this._isValid();
     }
+    resetIrlForm() {
+        const time = this.helpers.momentRoundMinutes(moment(), 30);
+        this.additionalInstructions = '';
+        this.trainNumber = '';
+        this.travellingTo = '';
+        this.travellingFrom = '';
+        this.discountCard = [];
+        this.class = IrlClass.All;
+        this.outboundDepartureDateTime = time;
+        this.journeyType = IrlJourneyType.SingleJourney;
+        this.offline = false;
+    }
     _isValid() {
         var _a;
         this.storageService.setSessionItem(IRLEnterpriseSearch.STORAGE_SESSION_PARAMS, {
@@ -15418,14 +16489,14 @@ class IRLEnterpriseSearch extends BaseEnterpriseSearch {
         const query = {
             supplier: this.supplier,
             countryCode: 'GB',
-            irlDiscountCards: this.discountCard ? this.discountCard.id : null,
+            irlDiscountCards: this.discountCardsList,
             class: this.class,
-            outboundDepartureDateTime: this.tempParams.outboundDepartureDateTime,
+            outboundDepartureDateTime: this.helpers.formatGraphQLDateTime(this.tempParams.outboundDepartureDateTime),
             departureLocationId: this._travellingFrom,
             arrivalLocationId: this._travellingTo,
             adults: this.tempParams.adults,
             children: this.tempParams.children,
-            returnDepartureDateTime: this.tempParams.returnDepartureDateTime,
+            returnDepartureDateTime: this.helpers.formatGraphQLDateTime(this.tempParams.returnDepartureDateTime),
             journeyType: this.journeyType
         };
         if (this.tempParams.children === 0) {
@@ -15488,7 +16559,39 @@ class IRLEnterpriseSearch extends BaseEnterpriseSearch {
             });
         }
     }
-    updateFromPreviousSearches(previousItems) { }
+    updateFromPreviousSearches(previousItems) {
+        console.log(previousItems);
+        if (previousItems.FLIGHT) {
+            try {
+                this.outBoundDateTime = moment(previousItems.FLIGHT.outboundDate.replace("T", "").split(".")[0], "YYYY-MM-DDhh:mm:ss");
+                if (this.outBoundDateTime.minutes() % 30)
+                    this.outBoundDateTime = this.outBoundDateTime.subtract(this.outBoundDateTime.minutes() % 30, "minutes");
+                if (previousItems.FLIGHT.inboundDate) {
+                    this.inBoundDateTime = moment(previousItems.FLIGHT.inboundDate.replace("T", "").split(".")[0], "YYYY-MM-DDhh:mm:ss");
+                    if (this.inBoundDateTime.minutes() % 30)
+                        this.inBoundDateTime = this.inBoundDateTime.subtract(this.inBoundDateTime.minutes() % 30, "minutes");
+                }
+            }
+            catch (_a) {
+                console.error('Error trying to prepopulate international rail from flight item');
+            }
+        }
+        else if (previousItems.RAIL) {
+            try {
+                this.outBoundDateTime = moment(previousItems.RAIL.outboundDate.replace("T", "").split(".")[0], "YYYY-MM-DDhh:mm:ss");
+                if (this.outBoundDateTime.minutes() % 30)
+                    this.outBoundDateTime = this.outBoundDateTime.subtract(this.outBoundDateTime.minutes() % 30, "minutes");
+                if (previousItems.RAIL.inboundDate) {
+                    this.inBoundDateTime = moment(previousItems.RAIL.inboundDate.replace("T", "").split(".")[0], "YYYY-MM-DDhh:mm:ss");
+                    if (this.inBoundDateTime.minutes() % 30)
+                        this.inBoundDateTime = this.inBoundDateTime.subtract(this.inBoundDateTime.minutes() % 30, "minutes");
+                }
+            }
+            catch (_b) {
+                console.error('Error trying to prepopulate international rail from rail item');
+            }
+        }
+    }
     updateCanCombine(tkt) {
         (tkt.identifiers.allowedWith || []).forEach((allowed) => {
             if (!this._canCombine[tkt.type][allowed.journeyIdentifier]) {
@@ -15535,6 +16638,7 @@ class IRLEnterpriseSearch extends BaseEnterpriseSearch {
                 const legs = this.getLegsFromIrlJourneyOption(irlJourneyOption);
                 const termsAndConditions = this.getTermsAndCond(irlJourneyOption);
                 // selectedIrlTicketOption.identifiers.provider;
+                const cheapestPrice = this.findCheapestTotal(this.fullResults);
                 const basketItem = {
                     basket: basket.id,
                     service: serviceId,
@@ -15563,7 +16667,8 @@ class IRLEnterpriseSearch extends BaseEnterpriseSearch {
                             journeyIdentifier: selectedIrlTicketOption.identifiers.journeyIdentifier
                         },
                         supplier: irlJourneyOption.providers[0].providerId,
-                        termsAndCond: termsAndConditions
+                        termsAndCond: termsAndConditions,
+                        railcardsDetail: irlQuery.irlDiscountCards ? irlQuery.irlDiscountCards.split(',') : []
                     },
                     adults: irlQuery.adults,
                     price: selectedIrlTicketOption.price,
@@ -15571,7 +16676,9 @@ class IRLEnterpriseSearch extends BaseEnterpriseSearch {
                     searchQuery: irlQuery,
                     // co2PerItem: irlJourneyOption.co2PerItem,
                     // co2PerPassenger: irlJourneyOption.co2PerPassenger,
-                    outboundDate: irlJourneyOption.departDateTime
+                    outboundDate: irlJourneyOption.departDateTime,
+                    lowestPrice: cheapestPrice.amount != selectedIrlTicketOption.price ? cheapestPrice.amount : null,
+                    lowestPriceCurrency: cheapestPrice.amount != selectedIrlTicketOption.price ? cheapestPrice.currencyCode : null
                 };
                 const whatHappened = yield this.basketService.addToBasket(basketItem, intBasket, this.searchService, this.travellers, false // TODO
                 );
@@ -15593,9 +16700,12 @@ class IRLEnterpriseSearch extends BaseEnterpriseSearch {
             const basket = intBasket === null || intBasket === void 0 ? void 0 : intBasket.subject.value;
             if (basket) {
                 const selectedIrlTicketOption = this.getSelectedIrlTicketOption(outJourneyOption, outbound, 0);
+                const selectedIrlTicketOptionInbound = this.getSelectedIrlTicketOption(inJourneyOption, inbound, 0);
                 const outboundLegs = this.getLegsFromIrlJourneyOption(outJourneyOption);
                 const inboundLegs = this.getLegsFromIrlJourneyOption(inJourneyOption);
                 const termsAndConditions = this.getTermsAndCond(outJourneyOption);
+                const cheapestPrice = this.findCheapestTotal(this.fullResults);
+                const price = Number((Number(selectedIrlTicketOption.price) + Number(inbound.price)).toFixed(2));
                 const basketItem = {
                     basket: basket.id,
                     service: serviceId,
@@ -15638,14 +16748,23 @@ class IRLEnterpriseSearch extends BaseEnterpriseSearch {
                             ],
                             journeyIdentifier: selectedIrlTicketOption.identifiers.journeyIdentifier
                         },
+                        return: {
+                            fareIdentifiers: [
+                                selectedIrlTicketOptionInbound.identifiers.fareIdentifier
+                            ],
+                            journeyIdentifier: selectedIrlTicketOptionInbound.identifiers.journeyIdentifier
+                        },
                         supplier: outJourneyOption.providers[0].providerId,
-                        termsAndCond: termsAndConditions
+                        termsAndCond: termsAndConditions,
+                        railcardsDetail: irlQuery.irlDiscountCards ? irlQuery.irlDiscountCards.split(',') : []
                     },
                     adults: irlQuery.adults,
-                    price: Number((Number(selectedIrlTicketOption.price) + Number(inbound.price)).toFixed(2)),
+                    price: price,
                     currency: selectedIrlTicketOption.currency,
                     searchQuery: irlQuery,
-                    outboundDate: outJourneyOption.departDateTime
+                    outboundDate: outJourneyOption.departDateTime,
+                    lowestPrice: cheapestPrice.amount != price ? cheapestPrice.amount : null,
+                    lowestPriceCurrency: cheapestPrice.amount != price ? cheapestPrice.currencyCode : null
                     // co2PerItem: outbound.co2PerItem,
                     // co2PerPassenger: outbound.co2PerPassenger
                 };
@@ -15671,6 +16790,36 @@ class IRLEnterpriseSearch extends BaseEnterpriseSearch {
             currencyCode: currency
         };
     }
+    findCheapestTotal(results) {
+        const cheapestOutbound = this.findCheapestTicket(results);
+        const cheapestArr = [];
+        results.map((result) => {
+            result.outbound.map((out) => {
+                out.providers.map((tkt) => {
+                    const cheapestTicket = tkt.cheapestTicket.price;
+                    tkt.ticketOptions.map((tktOption) => {
+                        var _a, _b;
+                        const tktPrice = tktOption.price;
+                        const tktClass = tktOption.class;
+                        if (tktClass === 'First' &&
+                            (((_a = this._cheapestFirst) === null || _a === void 0 ? void 0 : _a.price) > tktPrice || !this._cheapestFirst)) {
+                            this._cheapestFirst = tktOption;
+                        }
+                        else if (tktClass === 'Standard' &&
+                            (((_b = this._cheapestStandard) === null || _b === void 0 ? void 0 : _b.price) > tktPrice ||
+                                !this._cheapestStandard)) {
+                            this._cheapestStandard = tktOption;
+                        }
+                        if (tktPrice === cheapestTicket) {
+                            cheapestArr.push(cheapestTicket);
+                        }
+                    });
+                });
+            });
+        });
+        const cheapestInbound = Math.min(...cheapestArr);
+        return { amount: cheapestOutbound + cheapestInbound, currencyCode: results[0].outbound[0].providers[0].ticketOptions[0].currency };
+    }
     findCheapestTicket(results) {
         this._cheapestFirst = null;
         this._cheapestStandard = null;
@@ -16259,6 +17408,14 @@ class SupplementaryBookingInfoImpl {
                 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));
                 }
+                if (!userValue.supplementaryInfo.passport.documentId && (!userValue.supplementaryInfo.passport.number ||
+                    !userValue.supplementaryInfo.passport.dateOfExpiry ||
+                    !userValue.supplementaryInfo.passport.dateOfIssue ||
+                    !userValue.supplementaryInfo.passport.codeOfIssuingState ||
+                    !userValue.supplementaryInfo.passport.gender ||
+                    !userValue.supplementaryInfo.passport.nationality)) {
+                    delete userValue.supplementaryInfo.passport;
+                }
             }
             return userValue;
         });
@@ -16283,6 +17440,14 @@ class SupplementaryBookingInfoImpl {
                 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));
                 }
+                if (!userValue.supplementaryInfo.passport.documentId && (!userValue.supplementaryInfo.passport.number ||
+                    !userValue.supplementaryInfo.passport.dateOfExpiry ||
+                    !userValue.supplementaryInfo.passport.dateOfIssue ||
+                    !userValue.supplementaryInfo.passport.codeOfIssuingState ||
+                    !userValue.supplementaryInfo.passport.gender ||
+                    !userValue.supplementaryInfo.passport.nationality)) {
+                    delete userValue.supplementaryInfo.passport;
+                }
             }
             return userValue;
         });
@@ -16444,8 +17609,8 @@ class BaseEurostarQuoteFetcher extends FetchableList {
         super(gql, helpers, modalService);
     }
     getDataFromResult(results) {
-        var _a, _b;
-        return (_b = (_a = results === null || results === void 0 ? void 0 : results.data) === null || _a === void 0 ? void 0 : _a.searchEurostar) === null || _b === void 0 ? void 0 : _b.results;
+        var _a, _b, _c, _d, _e, _f;
+        return Object.assign(Object.assign({}, (_b = (_a = results === null || results === void 0 ? void 0 : results.data) === null || _a === void 0 ? void 0 : _a.searchEurostar) === null || _b === void 0 ? void 0 : _b.results), { ruleActionSummary: (_d = (_c = results === null || results === void 0 ? void 0 : results.data) === null || _c === void 0 ? void 0 : _c.searchEurostar) === null || _d === void 0 ? void 0 : _d.ruleActionSummary, searchId: (_f = (_e = results === null || results === void 0 ? void 0 : results.data) === null || _e === void 0 ? void 0 : _e.searchEurostar) === null || _f === void 0 ? void 0 : _f.searchId });
     }
 }
 
@@ -16472,8 +17637,8 @@ class BaseFlightQuoteFetcher extends FetchableList {
         return super.fetchList(queryArgs);
     }
     getDataFromResult(results) {
-        var _a, _b, _c, _d;
-        return Object.assign(Object.assign({}, (_b = (_a = results === null || results === void 0 ? void 0 : results.data) === null || _a === void 0 ? void 0 : _a.searchFlightsV2) === null || _b === void 0 ? void 0 : _b.results), { ruleActionSummary: (_d = (_c = results === null || results === void 0 ? void 0 : results.data) === null || _c === void 0 ? void 0 : _c.searchFlightsV2) === null || _d === void 0 ? void 0 : _d.ruleActionSummary });
+        var _a, _b, _c, _d, _e, _f;
+        return Object.assign(Object.assign({}, (_b = (_a = results === null || results === void 0 ? void 0 : results.data) === null || _a === void 0 ? void 0 : _a.searchFlightsV2) === null || _b === void 0 ? void 0 : _b.results), { ruleActionSummary: (_d = (_c = results === null || results === void 0 ? void 0 : results.data) === null || _c === void 0 ? void 0 : _c.searchFlightsV2) === null || _d === void 0 ? void 0 : _d.ruleActionSummary, searchId: (_f = (_e = results === null || results === void 0 ? void 0 : results.data) === null || _e === void 0 ? void 0 : _e.searchFlightsV2) === null || _f === void 0 ? void 0 : _f.searchId });
     }
 }
 
@@ -16947,6 +18112,25 @@ class BaseGetUserGuestsFetcher extends FetchableList {
     }
 }
 
+class BaseGetOfficeFetcher extends FetchableList {
+    constructor(queryGQL, helpers, modalService) {
+        super(queryGQL, helpers, modalService);
+    }
+    getDataFromResult(results) {
+        var _a;
+        return (_a = results.data) === null || _a === void 0 ? void 0 : _a.getOffice;
+    }
+}
+
+class BaseGetUserDefaultMIValueFetcher extends FetchableObject {
+    constructor(query, helpers, modalService) {
+        super(query, modalService, helpers);
+    }
+    getDataFromResult(results) {
+        return results.data.getUserDefaultMIValue;
+    }
+}
+
 // | 'fareTypes';
 
 ;
@@ -17128,7 +18312,7 @@ class InternalBasket {
         }
         this.id = basket.id;
         this.title = basket.title;
-        const toSend = Object.assign(Object.assign({}, basket), (basket.basketItems || []).reduce((accum, item, index) => {
+        const toSend = Object.assign(Object.assign({}, basket), (basket.basketItems || []).reduce((accum, item) => {
             var _a, _b, _c;
             if (!accum.prices[item.currency]) {
                 accum.prices[item.currency] = 0;
@@ -17162,7 +18346,7 @@ class InternalBasket {
     }
 }
 class BaseEnterpriseBasketService {
-    constructor(acceptNewPriceUpdater, addItemToBasketUpdater, addUserToBasketItem, basketCreator, basketFetcher, bookBasketUpdater, deleteBasketUpdater, getMiAutoSugestionFetcher, helpers, removeItemFromBasketUpdater, revalidateBasketUpdater, setBasketItemMiGroupUpdater, setBasketItemMiValueUpdater, validateMiFreeValue, sendBasketForApprovalUpdater, getUserFetcher, getUserBasketsFetcher, SetBasketItemLeadPassenger, moveItemToADifferentBasket, updateBasketNotesUpdater, updateBasketTitleUpdater, setPaymentMethodUpdater, getCancellationInfoFetcher, userService, modalService, webTokenService) {
+    constructor(acceptNewPriceUpdater, addItemToBasketUpdater, addUserToBasketItem, basketCreator, basketFetcher, bookBasketUpdater, deleteBasketUpdater, getMiAutoSugestionFetcher, getUserDefaultMIValueFetcher, helpers, removeItemFromBasketUpdater, revalidateBasketUpdater, setBasketItemMiGroupUpdater, setBasketItemMiValueUpdater, validateMiFreeValue, sendBasketForApprovalUpdater, getUserFetcher, getUserBasketsFetcher, SetBasketItemLeadPassenger, moveItemToADifferentBasket, updateBasketNotesUpdater, updateBasketTitleUpdater, setPaymentMethodUpdater, getCancellationInfoFetcher, userService, modalService) {
         this.acceptNewPriceUpdater = acceptNewPriceUpdater;
         this.addItemToBasketUpdater = addItemToBasketUpdater;
         this.addUserToBasketItem = addUserToBasketItem;
@@ -17171,6 +18355,7 @@ class BaseEnterpriseBasketService {
         this.bookBasketUpdater = bookBasketUpdater;
         this.deleteBasketUpdater = deleteBasketUpdater;
         this.getMiAutoSugestionFetcher = getMiAutoSugestionFetcher;
+        this.getUserDefaultMIValueFetcher = getUserDefaultMIValueFetcher;
         this.helpers = helpers;
         this.removeItemFromBasketUpdater = removeItemFromBasketUpdater;
         this.revalidateBasketUpdater = revalidateBasketUpdater;
@@ -17188,7 +18373,6 @@ class BaseEnterpriseBasketService {
         this.getCancellationInfoFetcher = getCancellationInfoFetcher;
         this.userService = userService;
         this.modalService = modalService;
-        this.webTokenService = webTokenService;
         this.currentBaskets = [];
         this.highlightBasketItemsEmitter = new Subject();
         this.basketChangeEmitter = new BehaviorSubject('');
@@ -17257,7 +18441,7 @@ class BaseEnterpriseBasketService {
         this.menuState = MenuSlideEnum.OUT;
         this.requiresService = new BaseRequiresReasonService(modalService, this);
         this.userService.changeUser.subscribe({
-            next: (userDetails) => {
+            next: () => {
                 this.reset();
             }
         });
@@ -17333,7 +18517,7 @@ class BaseEnterpriseBasketService {
     }
     addToBasket(item, intBasket, searchService, travellers = [], requiresReason) {
         return __awaiter(this, void 0, void 0, function* () {
-            switch (yield this.checkBasketForInvoked(intBasket, this.webTokenService.bobo)) {
+            switch (yield this.checkBasketForInvoked(intBasket, this.userService.bobo)) {
                 case DifferentInvokdedUserReasons.continue:
                     break;
                 case DifferentInvokdedUserReasons.cancel:
@@ -17343,7 +18527,7 @@ class BaseEnterpriseBasketService {
                     this.currentBasketID = intBasket.id;
                     break;
                 case DifferentInvokdedUserReasons.research:
-                    this.webTokenService.bobo = intBasket.subject.value.invokedUser;
+                    this.userService.setBobo(TravellerObject.makeTravellerObjectFromUser(intBasket.subject.value.invokedUser));
                     return DifferentInvokdedUserReasons.research;
             }
             item.basket = intBasket.id;
@@ -17364,6 +18548,21 @@ class BaseEnterpriseBasketService {
                 : item.inboundDate;
             item.requiresReason = requiresReason;
             item = this.checkDetails(item);
+            const service = this.userService.findService(item.service).type;
+            // let cheapestPrice: number
+            // if (searchService.searches[service].cheapestPrice) cheapestPrice = searchService.searches[service].cheapestPrice.amount
+            // else if (service == ServiceType.Flight) {
+            //   const cheapestPriceObject = searchService.searches[service].cheapestPriceObject
+            //   cheapestPrice = cheapestPriceObject.dualInbound.amount + cheapestPriceObject.dualOutbound.amount < cheapestPriceObject.returns.amount 
+            //     ? cheapestPriceObject.dualInbound.amount + cheapestPriceObject.dualOutbound.amount : cheapestPriceObject.returns.amount
+            // }
+            // else if (service == ServiceType.Rail) {
+            //   searchService.searches[service].cheapest.subscribe(a =>{
+            //     console.log(a)
+            //   })
+            //   // cheapestPrice = cheapestPriceObject.dualInbound.amount + cheapestPriceObject.dualOutbound.amount < cheapestPriceObject.returns.amount 
+            //   //   ? cheapestPriceObject.dualInbound.amount + cheapestPriceObject.dualOutbound.amount : cheapestPriceObject.returns.amount
+            // }
             this.removeBookedBasket();
             if (item && intBasket) {
                 this.addItemToBasketUpdater
@@ -17371,7 +18570,6 @@ class BaseEnterpriseBasketService {
                     .pipe(take(1))
                     .subscribe((newBasket) => {
                     intBasket.next(Object.assign(Object.assign({}, intBasket.subject.value), newBasket));
-                    const service = this.userService.findService(item.service).type;
                     searchService.search_objects[service].booking_chosen = true;
                     searchService.search_objects[service].chosen = false;
                     const bi = newBasket.basketItems;
@@ -17471,7 +18669,6 @@ class BaseEnterpriseBasketService {
     }
     getDefaultBasket(getBookedBasket = false) {
         return __awaiter(this, void 0, void 0, function* () {
-            const internalBasket = null;
             // console.log(this.currentBasketID);
             return yield this.findOrCreateBasket(this.currentBasketID, getBookedBasket).then((data) => {
                 return data;
@@ -17539,7 +18736,7 @@ class BaseEnterpriseBasketService {
     }
     createBasketOnDB(intBasket) {
         var _a, _b;
-        const mutation = ((_a = this.webTokenService.bobo) === null || _a === void 0 ? void 0 : _a.id) ? { invokedUser: (_b = this.webTokenService.bobo) === null || _b === void 0 ? void 0 : _b.id }
+        const mutation = ((_a = this.userService.bobo) === null || _a === void 0 ? void 0 : _a.id) ? { invokedUser: (_b = this.userService.bobo) === null || _b === void 0 ? void 0 : _b.id }
             : {};
         return new Promise((resolve, reject) => {
             this.basketCreator
@@ -17588,13 +18785,13 @@ class BaseEnterpriseBasketService {
             }
             return !isNaN(Date.parse(dateTimeString)); // any test that returns true/false
         });
-        ajv.addFormat('railSeating', (railseating) => {
+        ajv.addFormat('railSeating', () => {
             return true;
         });
-        ajv.addFormat('passport', (passport) => {
+        ajv.addFormat('passport', () => {
             return true;
         });
-        ajv.addFormat('specialRequest', (passport) => {
+        ajv.addFormat('specialRequest', () => {
             return true;
         });
         const validateDetailSchema = ajv.compile(serviceToCheck.detailSchema);
@@ -17792,14 +18989,23 @@ class BaseEnterpriseBasketService {
         }
         return this.updateBasket(basketid, this.setBasketItemMiValueUpdater.updateOne(args));
     }
-    getMiAutoSugestions(miId, partialLabel, isLoading) {
+    getMiAutoSugestions(miId, term, isLoading) {
         isLoading === null || isLoading === void 0 ? void 0 : isLoading.next(true);
-        return this.getMiAutoSugestionFetcher
-            .fetchList({ mi: miId, partialLabel })
-            .pipe(tap((_) => {
+        const getMiAutoByValue = this.getMiAutoSugestionFetcher.fetchList({ mi: miId, partialValue: term });
+        const getMiAutoByLabel = this.getMiAutoSugestionFetcher.fetchList({ mi: miId, partialLabel: term });
+        return forkJoin([getMiAutoByValue, getMiAutoByLabel]).pipe(map(([miByValue, miByLabel]) => {
+            let miByValueLabel = [...miByValue, ...miByLabel];
+            miByValueLabel = miByValueLabel.filter((miItem, index) => miByValueLabel.findIndex(item => item.id == miItem.id) === index);
+            console.log(miByValueLabel);
             isLoading === null || isLoading === void 0 ? void 0 : isLoading.next(false);
+            return miByValueLabel;
         }));
     }
+    getUserDefaultMIValue(mi, user, isLoading) {
+        isLoading === null || isLoading === void 0 ? void 0 : isLoading.next(true);
+        return this.getUserDefaultMIValueFetcher
+            .fetchOne({ mi: mi, user: user }).pipe(take(1));
+    }
     saveMiData(basketId, bmiArray) {
         bmiArray.forEach((bmi) => {
             bmi.miPerItem.forEach((item) => {
@@ -18128,7 +19334,7 @@ class AbstractHttpCallService {
 const USER_SIGNEDOUT = 'USER_SIGNEDOUT';
 const USER_SIGNEDIN = 'USER_SIGNEDIN';
 class BaseUserService {
-    constructor(getUserFetcher, userUiConfigsFetcher, userProductsFetcher, userMessagesFetcher, baseConfirmMessagesUpdater, getCompaniesFetcher, getCompanyFetcher, setUserLanguageUpdater, editUserUpdater, createGuestUpdater, getUserGuestsFetcher, storageService, helpers) {
+    constructor(getUserFetcher, userUiConfigsFetcher, userProductsFetcher, userMessagesFetcher, baseConfirmMessagesUpdater, getCompaniesFetcher, getCompanyFetcher, setUserLanguageUpdater, editUserUpdater, createGuestUpdater, getUserGuestsFetcher, getOfficeFetcher, storageService, helpers, webTokenService) {
         this.getUserFetcher = getUserFetcher;
         this.userUiConfigsFetcher = userUiConfigsFetcher;
         this.userProductsFetcher = userProductsFetcher;
@@ -18140,8 +19346,10 @@ class BaseUserService {
         this.editUserUpdater = editUserUpdater;
         this.createGuestUpdater = createGuestUpdater;
         this.getUserGuestsFetcher = getUserGuestsFetcher;
+        this.getOfficeFetcher = getOfficeFetcher;
         this.storageService = storageService;
         this.helpers = helpers;
+        this.webTokenService = webTokenService;
         this.fullUserDetails = {
             bookingAllowedFor: '',
             messages: new BehaviorSubject(null),
@@ -18152,6 +19360,35 @@ class BaseUserService {
             allDetails: new BehaviorSubject(null)
         };
         this.changeUser = new BehaviorSubject(null);
+        this._bobo = null;
+        this.invokedUserUpdater = webTokenService.getInvokedUserObservable();
+    }
+    setBobo(value) {
+        var _a;
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!value || value.id) {
+                if (value === this._bobo || ((value === null || value === void 0 ? void 0 : value.id) && (value === null || value === void 0 ? void 0 : value.id) === ((_a = this._bobo) === null || _a === void 0 ? void 0 : _a.id))) {
+                    return true;
+                }
+                this._bobo = value;
+                this.invokedUserUpdater.next(value || null);
+                return this.updateServices();
+            }
+            return false;
+        });
+    }
+    get bobo() {
+        return this._bobo;
+    }
+    updateServices() {
+        return new Promise((resolve, reject) => {
+            this.userProductsFetcher.fetchKeyedObjectArray('type').subscribe((result2) => {
+                this.fullUserDetails.userServices.next(result2);
+                this.checkEmitUser();
+            }, (err) => {
+                resolve(false);
+            }, () => resolve(true));
+        });
     }
     setUser(user_data) {
         const userdata = this.fullUserDetails.userData.value;
@@ -18185,7 +19422,7 @@ class BaseUserService {
             }, (error) => {
                 console.error(error);
             });
-            this.fullUserDetails.travllerObject.next(TravellerObject.makeTravellerObjectFromUser(user_data));
+            this.fullUserDetails.travllerObject.next(TravellerObject.makeTravellerObjectFromUserData(user_data));
         }
         if (user_data === null || user_data === void 0 ? void 0 : user_data.user_id) {
             this.getUserFetcher
@@ -18366,6 +19603,12 @@ class BaseUserService {
     userIsCompanyAdmin() {
         return this.fullUserDetails.userData.value.company_admin;
     }
+    userIsTmcAdmin() {
+        return this.fullUserDetails.userData.value.tmc_admin;
+    }
+    userTmcId() {
+        return this.fullUserDetails.userData.value.tmc_id;
+    }
     isSelfBook() {
         return (this.fullUserDetails.userData.value.booker_type === BookerType.SelfBook);
     }
@@ -18411,6 +19654,9 @@ class BaseUserService {
     getCompanyById(id, withUsers = false) {
         return this.getCompanyFetcher.fetchOne({ id }).pipe(take(1));
     }
+    getUserCompany() {
+        return this.getCompanyById(this.fullUserDetails.userData.value.company_id.toString());
+    }
     getUser(userId) {
         const user = this.getfullUserDetails();
         return this.getUserFetcher.fetchOne({
@@ -18441,10 +19687,13 @@ class BaseUserService {
     canInvokeUser() {
         return this.fullUserDetails.allDetails.value.canInvokeUser;
     }
+    getOffice() {
+        return this.getOfficeFetcher.fetchList();
+    }
 }
 
 class BaseLogonService {
-    constructor(userService, modalService, http, router, eventMessenager, storageService, environment, webTokenService) {
+    constructor(userService, modalService, http, router, eventMessenager, storageService, environment, searchService) {
         this.userService = userService;
         this.modalService = modalService;
         this.http = http;
@@ -18452,7 +19701,7 @@ class BaseLogonService {
         this.eventMessenager = eventMessenager;
         this.storageService = storageService;
         this.environment = environment;
-        this.webTokenService = webTokenService;
+        this.searchService = searchService;
         this.loading = false;
         this.isLoggedIn = false;
         this.redirectUrl = '';
@@ -18522,6 +19771,7 @@ class BaseLogonService {
     becomeUser(username) {
         return new Promise((resolve, reject) => {
             this.clearRefresh();
+            this.storageService.clearSessionData();
             this.http
                 .post(URLS.BECOME_USER, { username })
                 .pipe(take(1))
@@ -18538,6 +19788,7 @@ class BaseLogonService {
     endBecomeUserSession() {
         return new Promise((resolve, reject) => {
             this.clearRefresh();
+            this.storageService.clearSessionData();
             this.http
                 .post(URLS.END_BECOME_USER, {})
                 .pipe(take(1))
@@ -18554,13 +19805,13 @@ class BaseLogonService {
         this.userService.emptyUserData();
         this.storageService.clearSessionData();
         this.clearRefresh();
+        this.userService.setBobo(null);
         return this.http
             .formEncodedPostNoErrorHandling(URLS.AccessToken, {
             username,
             password
         })
             .pipe(take(1), map((value, index) => {
-            this.webTokenService.bobo = null;
             this.setRefresh();
             return this.handleResponse(value);
         }));
@@ -18590,7 +19841,8 @@ class BaseLogonService {
         const isSSO = this.userService.isUserFavoriteSet(UserFavorurite.SSO_no_password);
         this.clearRefresh();
         this.isLoggedIn = false;
-        this.webTokenService.bobo = null;
+        this.userService.setBobo(null);
+        this.searchService.removeAllTravellers();
         this.userService.emptyUserData();
         this.storageService.clearSessionData();
         this.http.post(URLS.LOGOUT_URL).subscribe((data) => {
@@ -18693,7 +19945,8 @@ class BaseEnterpriseMyBookingsService {
             [ServiceType.Lounge]: 'ico-material ico-lounge',
             [ServiceType.Parking]: 'ico-material ico-parking',
             [ServiceType.Rail]: 'ico-rail',
-            [ServiceType.Eurostar]: 'ico-rail'
+            [ServiceType.Eurostar]: 'ico-rail',
+            [ServiceType.Ferry]: 'ico-rail'
         };
     }
     getUserBaskets(query, isLoading) {
@@ -18796,1212 +20049,1454 @@ var Countries = [
 	{
 		cName: "Afghanistan",
 		dCode: "93",
-		cCode: "AF"
+		cCode: "AF",
+		tCode: "AFG"
 	},
 	{
 		cName: "Aland Islands",
 		dCode: "358",
-		cCode: "AX"
+		cCode: "AX",
+		tCode: "ALA"
 	},
 	{
 		cName: "Albania",
 		dCode: "355",
-		cCode: "AL"
+		cCode: "AL",
+		tCode: "ALB"
 	},
 	{
 		cName: "Algeria",
 		dCode: "213",
-		cCode: "DZ"
+		cCode: "DZ",
+		tCode: "DZA"
 	},
 	{
 		cName: "AmericanSamoa",
 		dCode: "1684",
-		cCode: "AS"
+		cCode: "AS",
+		tCode: "ASM"
 	},
 	{
 		cName: "Andorra",
 		dCode: "376",
-		cCode: "AD"
+		cCode: "AD",
+		tCode: "AND"
 	},
 	{
 		cName: "Angola",
 		dCode: "244",
-		cCode: "AO"
+		cCode: "AO",
+		tCode: "AGO"
 	},
 	{
 		cName: "Anguilla",
 		dCode: "1264",
-		cCode: "AI"
+		cCode: "AI",
+		tCode: "AIA"
 	},
 	{
 		cName: "Antarctica",
 		dCode: "672",
-		cCode: "AQ"
+		cCode: "AQ",
+		tCode: "ATA"
 	},
 	{
 		cName: "Antigua and Barbuda",
 		dCode: "1268",
-		cCode: "AG"
+		cCode: "AG",
+		tCode: "ATG"
 	},
 	{
 		cName: "Argentina",
 		dCode: "54",
-		cCode: "AR"
+		cCode: "AR",
+		tCode: "ARG"
 	},
 	{
 		cName: "Armenia",
 		dCode: "374",
-		cCode: "AM"
+		cCode: "AM",
+		tCode: "ARM"
 	},
 	{
 		cName: "Aruba",
 		dCode: "297",
-		cCode: "AW"
+		cCode: "AW",
+		tCode: "ABW"
 	},
 	{
 		cName: "Australia",
 		dCode: "61",
-		cCode: "AU"
+		cCode: "AU",
+		tCode: "AUS"
 	},
 	{
 		cName: "Austria",
 		dCode: "43",
-		cCode: "AT"
+		cCode: "AT",
+		tCode: "AUT"
 	},
 	{
 		cName: "Azerbaijan",
 		dCode: "994",
-		cCode: "AZ"
+		cCode: "AZ",
+		tCode: "AZE"
 	},
 	{
 		cName: "Bahamas",
 		dCode: "1242",
-		cCode: "BS"
+		cCode: "BS",
+		tCode: "BHS"
 	},
 	{
 		cName: "Bahrain",
 		dCode: "973",
-		cCode: "BH"
+		cCode: "BH",
+		tCode: "BHR"
 	},
 	{
 		cName: "Bangladesh",
 		dCode: "880",
-		cCode: "BD"
+		cCode: "BD",
+		tCode: "BGD"
 	},
 	{
 		cName: "Barbados",
 		dCode: "1246",
-		cCode: "BB"
+		cCode: "BB",
+		tCode: "BRB"
 	},
 	{
 		cName: "Belarus",
 		dCode: "375",
-		cCode: "BY"
+		cCode: "BY",
+		tCode: "BLR"
 	},
 	{
 		cName: "Belgium",
 		dCode: "32",
-		cCode: "BE"
+		cCode: "BE",
+		tCode: "BEL"
 	},
 	{
 		cName: "Belize",
 		dCode: "501",
-		cCode: "BZ"
+		cCode: "BZ",
+		tCode: "BLZ"
 	},
 	{
 		cName: "Benin",
 		dCode: "229",
-		cCode: "BJ"
+		cCode: "BJ",
+		tCode: "BEN"
 	},
 	{
 		cName: "Bermuda",
 		dCode: "1441",
-		cCode: "BM"
+		cCode: "BM",
+		tCode: "BMU"
 	},
 	{
 		cName: "Bhutan",
 		dCode: "975",
-		cCode: "BT"
+		cCode: "BT",
+		tCode: "BTN"
 	},
 	{
 		cName: "Bolivia, Plurinational State of",
 		dCode: "591",
-		cCode: "BO"
+		cCode: "BO",
+		tCode: "BOL"
 	},
 	{
 		cName: "Bosnia and Herzegovina",
 		dCode: "387",
-		cCode: "BA"
+		cCode: "BA",
+		tCode: "BIH"
 	},
 	{
 		cName: "Botswana",
 		dCode: "267",
-		cCode: "BW"
+		cCode: "BW",
+		tCode: "BWA"
 	},
 	{
 		cName: "Brazil",
 		dCode: "55",
-		cCode: "BR"
+		cCode: "BR",
+		tCode: "BRA"
 	},
 	{
 		cName: "British Indian Ocean Territory",
 		dCode: "246",
-		cCode: "IO"
+		cCode: "IO",
+		tCode: "IOT"
 	},
 	{
 		cName: "Brunei Darussalam",
 		dCode: "673",
-		cCode: "BN"
+		cCode: "BN",
+		tCode: "BRN"
 	},
 	{
 		cName: "Bulgaria",
 		dCode: "359",
-		cCode: "BG"
+		cCode: "BG",
+		tCode: "BGR"
 	},
 	{
 		cName: "Burkina Faso",
 		dCode: "226",
-		cCode: "BF"
+		cCode: "BF",
+		tCode: "BFA"
 	},
 	{
 		cName: "Burundi",
 		dCode: "257",
-		cCode: "BI"
+		cCode: "BI",
+		tCode: "BDI"
 	},
 	{
 		cName: "Cambodia",
 		dCode: "855",
-		cCode: "KH"
+		cCode: "KH",
+		tCode: "KHM"
 	},
 	{
 		cName: "Cameroon",
 		dCode: "237",
-		cCode: "CM"
+		cCode: "CM",
+		tCode: "CMR"
 	},
 	{
 		cName: "Canada",
 		dCode: "1",
-		cCode: "CA"
+		cCode: "CA",
+		tCode: "CAN"
 	},
 	{
 		cName: "Cape Verde",
 		dCode: "238",
-		cCode: "CV"
+		cCode: "CV",
+		tCode: "CPV"
 	},
 	{
 		cName: "Cayman Islands",
 		dCode: " 345",
-		cCode: "KY"
+		cCode: "KY",
+		tCode: "CYM"
 	},
 	{
 		cName: "Central African Republic",
 		dCode: "236",
-		cCode: "CF"
+		cCode: "CF",
+		tCode: "CAF"
 	},
 	{
 		cName: "Chad",
 		dCode: "235",
-		cCode: "TD"
+		cCode: "TD",
+		tCode: "TCD"
 	},
 	{
 		cName: "Chile",
 		dCode: "56",
-		cCode: "CL"
+		cCode: "CL",
+		tCode: "CHL"
 	},
 	{
 		cName: "China",
 		dCode: "86",
-		cCode: "CN"
+		cCode: "CN",
+		tCode: "CHN"
 	},
 	{
 		cName: "Christmas Island",
 		dCode: "61",
-		cCode: "CX"
+		cCode: "CX",
+		tCode: "CXR"
 	},
 	{
 		cName: "Cocos (Keeling) Islands",
 		dCode: "61",
-		cCode: "CC"
+		cCode: "CC",
+		tCode: "CCK"
 	},
 	{
 		cName: "Colombia",
 		dCode: "57",
-		cCode: "CO"
+		cCode: "CO",
+		tCode: "COL"
 	},
 	{
 		cName: "Comoros",
 		dCode: "269",
-		cCode: "KM"
+		cCode: "KM",
+		tCode: "COM"
 	},
 	{
 		cName: "Congo",
 		dCode: "242",
-		cCode: "CG"
+		cCode: "CG",
+		tCode: "COG"
 	},
 	{
 		cName: "Congo, The Democratic Republic of the Congo",
 		dCode: "243",
-		cCode: "CD"
+		cCode: "CD",
+		tCode: "COD"
 	},
 	{
 		cName: "Cook Islands",
 		dCode: "682",
-		cCode: "CK"
+		cCode: "CK",
+		tCode: "COK"
 	},
 	{
 		cName: "Costa Rica",
 		dCode: "506",
-		cCode: "CR"
+		cCode: "CR",
+		tCode: "CRI"
 	},
 	{
 		cName: "Cote d'Ivoire",
 		dCode: "225",
-		cCode: "CI"
+		cCode: "CI",
+		tCode: "CIV"
 	},
 	{
 		cName: "Croatia",
 		dCode: "385",
-		cCode: "HR"
+		cCode: "HR",
+		tCode: "HRV"
 	},
 	{
 		cName: "Cuba",
 		dCode: "53",
-		cCode: "CU"
+		cCode: "CU",
+		tCode: "CUB"
 	},
 	{
 		cName: "Cyprus",
 		dCode: "357",
-		cCode: "CY"
+		cCode: "CY",
+		tCode: "CYP"
 	},
 	{
 		cName: "Czech Republic",
 		dCode: "420",
-		cCode: "CZ"
+		cCode: "CZ",
+		tCode: "CZE"
 	},
 	{
 		cName: "Denmark",
 		dCode: "45",
-		cCode: "DK"
+		cCode: "DK",
+		tCode: "DNK"
 	},
 	{
 		cName: "Djibouti",
 		dCode: "253",
-		cCode: "DJ"
+		cCode: "DJ",
+		tCode: "DJI"
 	},
 	{
 		cName: "Dominica",
 		dCode: "1767",
-		cCode: "DM"
+		cCode: "DM",
+		tCode: "DMA"
 	},
 	{
 		cName: "Dominican Republic",
 		dCode: "1849",
-		cCode: "DO"
+		cCode: "DO",
+		tCode: "DOM"
 	},
 	{
 		cName: "Ecuador",
 		dCode: "593",
-		cCode: "EC"
+		cCode: "EC",
+		tCode: "ECU"
 	},
 	{
 		cName: "Egypt",
 		dCode: "20",
-		cCode: "EG"
+		cCode: "EG",
+		tCode: "EGY"
 	},
 	{
 		cName: "El Salvador",
 		dCode: "503",
-		cCode: "SV"
+		cCode: "SV",
+		tCode: "SLV"
 	},
 	{
 		cName: "Equatorial Guinea",
 		dCode: "240",
-		cCode: "GQ"
+		cCode: "GQ",
+		tCode: "GNQ"
 	},
 	{
 		cName: "Eritrea",
 		dCode: "291",
-		cCode: "ER"
+		cCode: "ER",
+		tCode: "ERI"
 	},
 	{
 		cName: "Estonia",
 		dCode: "372",
-		cCode: "EE"
+		cCode: "EE",
+		tCode: "EST"
 	},
 	{
 		cName: "Ethiopia",
 		dCode: "251",
-		cCode: "ET"
+		cCode: "ET",
+		tCode: "ETH"
 	},
 	{
 		cName: "Falkland Islands (Malvinas)",
 		dCode: "500",
-		cCode: "FK"
+		cCode: "FK",
+		tCode: "FLK"
 	},
 	{
 		cName: "Faroe Islands",
 		dCode: "298",
-		cCode: "FO"
+		cCode: "FO",
+		tCode: "FRO"
 	},
 	{
 		cName: "Fiji",
 		dCode: "679",
-		cCode: "FJ"
+		cCode: "FJ",
+		tCode: "FJI"
 	},
 	{
 		cName: "Finland",
 		dCode: "358",
-		cCode: "FI"
+		cCode: "FI",
+		tCode: "FIN"
 	},
 	{
 		cName: "France",
 		dCode: "33",
-		cCode: "FR"
+		cCode: "FR",
+		tCode: "FRA"
 	},
 	{
 		cName: "French Guiana",
 		dCode: "594",
-		cCode: "GF"
+		cCode: "GF",
+		tCode: "GUF"
 	},
 	{
 		cName: "French Polynesia",
 		dCode: "689",
-		cCode: "PF"
+		cCode: "PF",
+		tCode: "PYF"
 	},
 	{
 		cName: "Gabon",
 		dCode: "241",
-		cCode: "GA"
+		cCode: "GA",
+		tCode: "GAB"
 	},
 	{
 		cName: "Gambia",
 		dCode: "220",
-		cCode: "GM"
+		cCode: "GM",
+		tCode: "GMB"
 	},
 	{
 		cName: "Georgia",
 		dCode: "995",
-		cCode: "GE"
+		cCode: "GE",
+		tCode: "GEO"
 	},
 	{
 		cName: "Germany",
 		dCode: "49",
-		cCode: "DE"
+		cCode: "DE",
+		tCode: "DEU"
 	},
 	{
 		cName: "Ghana",
 		dCode: "233",
-		cCode: "GH"
+		cCode: "GH",
+		tCode: "GHA"
 	},
 	{
 		cName: "Gibraltar",
 		dCode: "350",
-		cCode: "GI"
+		cCode: "GI",
+		tCode: "GIB"
 	},
 	{
 		cName: "Greece",
 		dCode: "30",
-		cCode: "GR"
+		cCode: "GR",
+		tCode: "GRC"
 	},
 	{
 		cName: "Greenland",
 		dCode: "299",
-		cCode: "GL"
+		cCode: "GL",
+		tCode: "GRL"
 	},
 	{
 		cName: "Grenada",
 		dCode: "1473",
-		cCode: "GD"
+		cCode: "GD",
+		tCode: "GRD"
 	},
 	{
 		cName: "Guadeloupe",
 		dCode: "590",
-		cCode: "GP"
+		cCode: "GP",
+		tCode: "GLP"
 	},
 	{
 		cName: "Guam",
 		dCode: "1671",
-		cCode: "GU"
+		cCode: "GU",
+		tCode: "GUM"
 	},
 	{
 		cName: "Guatemala",
 		dCode: "502",
-		cCode: "GT"
+		cCode: "GT",
+		tCode: "GTM"
 	},
 	{
 		cName: "Guernsey",
 		dCode: "44",
-		cCode: "GG"
+		cCode: "GG",
+		tCode: "GGY"
 	},
 	{
 		cName: "Guinea",
 		dCode: "224",
-		cCode: "GN"
+		cCode: "GN",
+		tCode: "GIN"
 	},
 	{
 		cName: "Guinea-Bissau",
 		dCode: "245",
-		cCode: "GW"
+		cCode: "GW",
+		tCode: "GNB"
 	},
 	{
 		cName: "Guyana",
 		dCode: "595",
-		cCode: "GY"
+		cCode: "GY",
+		tCode: "GUY"
 	},
 	{
 		cName: "Haiti",
 		dCode: "509",
-		cCode: "HT"
+		cCode: "HT",
+		tCode: "HTI"
 	},
 	{
 		cName: "Holy See (Vatican City State)",
 		dCode: "379",
-		cCode: "VA"
+		cCode: "VA",
+		tCode: "VAT"
 	},
 	{
 		cName: "Honduras",
 		dCode: "504",
-		cCode: "HN"
+		cCode: "HN",
+		tCode: "HND"
 	},
 	{
 		cName: "Hong Kong",
 		dCode: "852",
-		cCode: "HK"
+		cCode: "HK",
+		tCode: "HKG"
 	},
 	{
 		cName: "Hungary",
 		dCode: "36",
-		cCode: "HU"
+		cCode: "HU",
+		tCode: "HUN"
 	},
 	{
 		cName: "Iceland",
 		dCode: "354",
-		cCode: "IS"
+		cCode: "IS",
+		tCode: "ISL"
 	},
 	{
 		cName: "India",
 		dCode: "91",
-		cCode: "IN"
+		cCode: "IN",
+		tCode: "IND"
 	},
 	{
 		cName: "Indonesia",
 		dCode: "62",
-		cCode: "ID"
+		cCode: "ID",
+		tCode: "IDN"
 	},
 	{
 		cName: "Iran, Islamic Republic of Persian Gulf",
 		dCode: "98",
-		cCode: "IR"
+		cCode: "IR",
+		tCode: "IRN"
 	},
 	{
 		cName: "Iraq",
 		dCode: "964",
-		cCode: "IQ"
+		cCode: "IQ",
+		tCode: "IRQ"
 	},
 	{
 		cName: "Ireland",
 		dCode: "353",
-		cCode: "IE"
+		cCode: "IE",
+		tCode: "IRL"
 	},
 	{
 		cName: "Isle of Man",
 		dCode: "44",
-		cCode: "IM"
+		cCode: "IM",
+		tCode: "IMN"
 	},
 	{
 		cName: "Israel",
 		dCode: "972",
-		cCode: "IL"
+		cCode: "IL",
+		tCode: "ISR"
 	},
 	{
 		cName: "Italy",
 		dCode: "39",
-		cCode: "IT"
+		cCode: "IT",
+		tCode: "ITA"
 	},
 	{
 		cName: "Jamaica",
 		dCode: "1876",
-		cCode: "JM"
+		cCode: "JM",
+		tCode: "JAM"
 	},
 	{
 		cName: "Japan",
 		dCode: "81",
-		cCode: "JP"
+		cCode: "JP",
+		tCode: "JPN"
 	},
 	{
 		cName: "Jersey",
 		dCode: "44",
-		cCode: "JE"
+		cCode: "JE",
+		tCode: "JEY"
 	},
 	{
 		cName: "Jordan",
 		dCode: "962",
-		cCode: "JO"
+		cCode: "JO",
+		tCode: "JOR"
 	},
 	{
 		cName: "Kazakhstan",
 		dCode: "77",
-		cCode: "KZ"
+		cCode: "KZ",
+		tCode: "KAZ"
 	},
 	{
 		cName: "Kenya",
 		dCode: "254",
-		cCode: "KE"
+		cCode: "KE",
+		tCode: "KEN"
 	},
 	{
 		cName: "Kiribati",
 		dCode: "686",
-		cCode: "KI"
+		cCode: "KI",
+		tCode: "KIR"
 	},
 	{
 		cName: "Korea, Democratic People's Republic of Korea",
 		dCode: "850",
-		cCode: "KP"
+		cCode: "KP",
+		tCode: "PRK"
 	},
 	{
 		cName: "Korea, Republic of South Korea",
 		dCode: "82",
-		cCode: "KR"
+		cCode: "KR",
+		tCode: "KOR"
 	},
 	{
 		cName: "Kuwait",
 		dCode: "965",
-		cCode: "KW"
+		cCode: "KW",
+		tCode: "KWT"
 	},
 	{
 		cName: "Kyrgyzstan",
 		dCode: "996",
-		cCode: "KG"
+		cCode: "KG",
+		tCode: "KGZ"
 	},
 	{
 		cName: "Laos",
 		dCode: "856",
-		cCode: "LA"
+		cCode: "LA",
+		tCode: "LAO"
 	},
 	{
 		cName: "Latvia",
 		dCode: "371",
-		cCode: "LV"
+		cCode: "LV",
+		tCode: "LVA"
 	},
 	{
 		cName: "Lebanon",
 		dCode: "961",
-		cCode: "LB"
+		cCode: "LB",
+		tCode: "LBN"
 	},
 	{
 		cName: "Lesotho",
 		dCode: "266",
-		cCode: "LS"
+		cCode: "LS",
+		tCode: "LSO"
 	},
 	{
 		cName: "Liberia",
 		dCode: "231",
-		cCode: "LR"
+		cCode: "LR",
+		tCode: "LBR"
 	},
 	{
 		cName: "Libyan Arab Jamahiriya",
 		dCode: "218",
-		cCode: "LY"
+		cCode: "LY",
+		tCode: "LBY"
 	},
 	{
 		cName: "Liechtenstein",
 		dCode: "423",
-		cCode: "LI"
+		cCode: "LI",
+		tCode: "LIE"
 	},
 	{
 		cName: "Lithuania",
 		dCode: "370",
-		cCode: "LT"
+		cCode: "LT",
+		tCode: "LTU"
 	},
 	{
 		cName: "Luxembourg",
 		dCode: "352",
-		cCode: "LU"
+		cCode: "LU",
+		tCode: "LUX"
 	},
 	{
 		cName: "Macao",
 		dCode: "853",
-		cCode: "MO"
+		cCode: "MO",
+		tCode: "MAC"
 	},
 	{
 		cName: "Macedonia",
 		dCode: "389",
-		cCode: "MK"
+		cCode: "MK",
+		tCode: "MKD"
 	},
 	{
 		cName: "Madagascar",
 		dCode: "261",
-		cCode: "MG"
+		cCode: "MG",
+		tCode: "MDG"
 	},
 	{
 		cName: "Malawi",
 		dCode: "265",
-		cCode: "MW"
+		cCode: "MW",
+		tCode: "MWI"
 	},
 	{
 		cName: "Malaysia",
 		dCode: "60",
-		cCode: "MY"
+		cCode: "MY",
+		tCode: "MYS"
 	},
 	{
 		cName: "Maldives",
 		dCode: "960",
-		cCode: "MV"
+		cCode: "MV",
+		tCode: "MDV"
 	},
 	{
 		cName: "Mali",
 		dCode: "223",
-		cCode: "ML"
+		cCode: "ML",
+		tCode: "MLI"
 	},
 	{
 		cName: "Malta",
 		dCode: "356",
-		cCode: "MT"
+		cCode: "MT",
+		tCode: "MLT"
 	},
 	{
 		cName: "Marshall Islands",
 		dCode: "692",
-		cCode: "MH"
+		cCode: "MH",
+		tCode: "MHL"
 	},
 	{
 		cName: "Martinique",
 		dCode: "596",
-		cCode: "MQ"
+		cCode: "MQ",
+		tCode: "MTQ"
 	},
 	{
 		cName: "Mauritania",
 		dCode: "222",
-		cCode: "MR"
+		cCode: "MR",
+		tCode: "MRT"
 	},
 	{
 		cName: "Mauritius",
 		dCode: "230",
-		cCode: "MU"
+		cCode: "MU",
+		tCode: "MUS"
 	},
 	{
 		cName: "Mayotte",
 		dCode: "262",
-		cCode: "YT"
+		cCode: "YT",
+		tCode: "MYT"
 	},
 	{
 		cName: "Mexico",
 		dCode: "52",
-		cCode: "MX"
+		cCode: "MX",
+		tCode: "MEX"
 	},
 	{
 		cName: "Micronesia, Federated States of Micronesia",
 		dCode: "691",
-		cCode: "FM"
+		cCode: "FM",
+		tCode: "FSM"
 	},
 	{
 		cName: "Moldova",
 		dCode: "373",
-		cCode: "MD"
+		cCode: "MD",
+		tCode: "MDA"
 	},
 	{
 		cName: "Monaco",
 		dCode: "377",
-		cCode: "MC"
+		cCode: "MC",
+		tCode: "MCO"
 	},
 	{
 		cName: "Mongolia",
 		dCode: "976",
-		cCode: "MN"
+		cCode: "MN",
+		tCode: "MNG"
 	},
 	{
 		cName: "Montenegro",
 		dCode: "382",
-		cCode: "ME"
+		cCode: "ME",
+		tCode: "MNE"
 	},
 	{
 		cName: "Montserrat",
 		dCode: "1664",
-		cCode: "MS"
+		cCode: "MS",
+		tCode: "MSR"
 	},
 	{
 		cName: "Morocco",
 		dCode: "212",
-		cCode: "MA"
+		cCode: "MA",
+		tCode: "MAR"
 	},
 	{
 		cName: "Mozambique",
 		dCode: "258",
-		cCode: "MZ"
+		cCode: "MZ",
+		tCode: "MOZ"
 	},
 	{
 		cName: "Myanmar",
 		dCode: "95",
-		cCode: "MM"
+		cCode: "MM",
+		tCode: "MMR"
 	},
 	{
 		cName: "Namibia",
 		dCode: "264",
-		cCode: "NA"
+		cCode: "NA",
+		tCode: "NAM"
 	},
 	{
 		cName: "Nauru",
 		dCode: "674",
-		cCode: "NR"
+		cCode: "NR",
+		tCode: "NRU"
 	},
 	{
 		cName: "Nepal",
 		dCode: "977",
-		cCode: "NP"
+		cCode: "NP",
+		tCode: "NPL"
 	},
 	{
 		cName: "Netherlands",
 		dCode: "31",
-		cCode: "NL"
+		cCode: "NL",
+		tCode: "NLD"
 	},
 	{
 		cName: "Netherlands Antilles",
 		dCode: "599",
-		cCode: "AN"
+		cCode: "AN",
+		tCode: "ANT"
 	},
 	{
 		cName: "New Caledonia",
 		dCode: "687",
-		cCode: "NC"
+		cCode: "NC",
+		tCode: "NCL"
 	},
 	{
 		cName: "New Zealand",
 		dCode: "64",
-		cCode: "NZ"
+		cCode: "NZ",
+		tCode: "NZL"
 	},
 	{
 		cName: "Nicaragua",
 		dCode: "505",
-		cCode: "NI"
+		cCode: "NI",
+		tCode: "NIC"
 	},
 	{
 		cName: "Niger",
 		dCode: "227",
-		cCode: "NE"
+		cCode: "NE",
+		tCode: "NER"
 	},
 	{
 		cName: "Nigeria",
 		dCode: "234",
-		cCode: "NG"
+		cCode: "NG",
+		tCode: "NGA"
 	},
 	{
 		cName: "Niue",
 		dCode: "683",
-		cCode: "NU"
+		cCode: "NU",
+		tCode: "NIU"
 	},
 	{
 		cName: "Norfolk Island",
 		dCode: "672",
-		cCode: "NF"
+		cCode: "NF",
+		tCode: "NFK"
 	},
 	{
 		cName: "Northern Mariana Islands",
 		dCode: "1670",
-		cCode: "MP"
+		cCode: "MP",
+		tCode: "MNP"
 	},
 	{
 		cName: "Norway",
 		dCode: "47",
-		cCode: "NO"
+		cCode: "NO",
+		tCode: "NOR"
 	},
 	{
 		cName: "Oman",
 		dCode: "968",
-		cCode: "OM"
+		cCode: "OM",
+		tCode: "OMN"
 	},
 	{
 		cName: "Pakistan",
 		dCode: "92",
-		cCode: "PK"
+		cCode: "PK",
+		tCode: "PAK"
 	},
 	{
 		cName: "Palau",
 		dCode: "680",
-		cCode: "PW"
+		cCode: "PW",
+		tCode: "PLW"
 	},
 	{
 		cName: "Palestinian Territory, Occupied",
 		dCode: "970",
-		cCode: "PS"
+		cCode: "PS",
+		tCode: "PSE"
 	},
 	{
 		cName: "Panama",
 		dCode: "507",
-		cCode: "PA"
+		cCode: "PA",
+		tCode: "PAN"
 	},
 	{
 		cName: "Papua New Guinea",
 		dCode: "675",
-		cCode: "PG"
+		cCode: "PG",
+		tCode: "PNG"
 	},
 	{
 		cName: "Paraguay",
 		dCode: "595",
-		cCode: "PY"
+		cCode: "PY",
+		tCode: "PRY"
 	},
 	{
 		cName: "Peru",
 		dCode: "51",
-		cCode: "PE"
+		cCode: "PE",
+		tCode: "PER"
 	},
 	{
 		cName: "Philippines",
 		dCode: "63",
-		cCode: "PH"
+		cCode: "PH",
+		tCode: "PHL"
 	},
 	{
 		cName: "Pitcairn",
 		dCode: "872",
-		cCode: "PN"
+		cCode: "PN",
+		tCode: "PCN"
 	},
 	{
 		cName: "Poland",
 		dCode: "48",
-		cCode: "PL"
+		cCode: "PL",
+		tCode: "POL"
 	},
 	{
 		cName: "Portugal",
 		dCode: "351",
-		cCode: "PT"
+		cCode: "PT",
+		tCode: "PRT"
 	},
 	{
 		cName: "Puerto Rico",
 		dCode: "1939",
-		cCode: "PR"
+		cCode: "PR",
+		tCode: "PRI"
 	},
 	{
 		cName: "Qatar",
 		dCode: "974",
-		cCode: "QA"
+		cCode: "QA",
+		tCode: "QAT"
 	},
 	{
 		cName: "Romania",
 		dCode: "40",
-		cCode: "RO"
+		cCode: "RO",
+		tCode: "ROU"
 	},
 	{
 		cName: "Russia",
 		dCode: "7",
-		cCode: "RU"
+		cCode: "RU",
+		tCode: "RUS"
 	},
 	{
 		cName: "Rwanda",
 		dCode: "250",
-		cCode: "RW"
+		cCode: "RW",
+		tCode: "RWA"
 	},
 	{
 		cName: "Reunion",
 		dCode: "262",
-		cCode: "RE"
+		cCode: "RE",
+		tCode: "REU"
 	},
 	{
 		cName: "Saint Barthelemy",
 		dCode: "590",
-		cCode: "BL"
+		cCode: "BL",
+		tCode: "BLM"
 	},
 	{
 		cName: "Saint Helena, Ascension and Tristan Da Cunha",
 		dCode: "290",
-		cCode: "SH"
+		cCode: "SH",
+		tCode: "SHN"
 	},
 	{
 		cName: "Saint Kitts and Nevis",
 		dCode: "1869",
-		cCode: "KN"
+		cCode: "KN",
+		tCode: "KNA"
 	},
 	{
 		cName: "Saint Lucia",
 		dCode: "1758",
-		cCode: "LC"
+		cCode: "LC",
+		tCode: "LCA"
 	},
 	{
 		cName: "Saint Martin",
 		dCode: "590",
-		cCode: "MF"
+		cCode: "MF",
+		tCode: "MAF"
 	},
 	{
 		cName: "Saint Pierre and Miquelon",
 		dCode: "508",
-		cCode: "PM"
+		cCode: "PM",
+		tCode: "SPM"
 	},
 	{
 		cName: "Saint Vincent and the Grenadines",
 		dCode: "1784",
-		cCode: "VC"
+		cCode: "VC",
+		tCode: "VCT"
 	},
 	{
 		cName: "Samoa",
 		dCode: "685",
-		cCode: "WS"
+		cCode: "WS",
+		tCode: "WSM"
 	},
 	{
 		cName: "San Marino",
 		dCode: "378",
-		cCode: "SM"
+		cCode: "SM",
+		tCode: "SMR"
 	},
 	{
 		cName: "Sao Tome and Principe",
 		dCode: "239",
-		cCode: "ST"
+		cCode: "ST",
+		tCode: "STP"
 	},
 	{
 		cName: "Saudi Arabia",
 		dCode: "966",
-		cCode: "SA"
+		cCode: "SA",
+		tCode: "SAU"
 	},
 	{
 		cName: "Senegal",
 		dCode: "221",
-		cCode: "SN"
+		cCode: "SN",
+		tCode: "SEN"
 	},
 	{
 		cName: "Serbia",
 		dCode: "381",
-		cCode: "RS"
+		cCode: "RS",
+		tCode: "SRB"
 	},
 	{
 		cName: "Seychelles",
 		dCode: "248",
-		cCode: "SC"
+		cCode: "SC",
+		tCode: "SYC"
 	},
 	{
 		cName: "Sierra Leone",
 		dCode: "232",
-		cCode: "SL"
+		cCode: "SL",
+		tCode: "SLE"
 	},
 	{
 		cName: "Singapore",
 		dCode: "65",
-		cCode: "SG"
+		cCode: "SG",
+		tCode: "SGP"
 	},
 	{
 		cName: "Slovakia",
 		dCode: "421",
-		cCode: "SK"
+		cCode: "SK",
+		tCode: "SVK"
 	},
 	{
 		cName: "Slovenia",
 		dCode: "386",
-		cCode: "SI"
+		cCode: "SI",
+		tCode: "SVN"
 	},
 	{
 		cName: "Solomon Islands",
 		dCode: "677",
-		cCode: "SB"
+		cCode: "SB",
+		tCode: "SLB"
 	},
 	{
 		cName: "Somalia",
 		dCode: "252",
-		cCode: "SO"
+		cCode: "SO",
+		tCode: "SOM"
 	},
 	{
 		cName: "South Africa",
 		dCode: "27",
-		cCode: "ZA"
+		cCode: "ZA",
+		tCode: "ZAF"
 	},
 	{
 		cName: "South Sudan",
 		dCode: "211",
-		cCode: "SS"
+		cCode: "SS",
+		tCode: "SSD"
 	},
 	{
 		cName: "South Georgia and the South Sandwich Islands",
 		dCode: "500",
-		cCode: "GS"
+		cCode: "GS",
+		tCode: "SGS"
 	},
 	{
 		cName: "Spain",
 		dCode: "34",
-		cCode: "ES"
+		cCode: "ES",
+		tCode: "ESP"
 	},
 	{
 		cName: "Sri Lanka",
 		dCode: "94",
-		cCode: "LK"
+		cCode: "LK",
+		tCode: "LKA"
 	},
 	{
 		cName: "Sudan",
 		dCode: "249",
-		cCode: "SD"
+		cCode: "SD",
+		tCode: "SSD"
 	},
 	{
 		cName: "SuricName",
 		dCode: "597",
-		cCode: "SR"
+		cCode: "SR",
+		tCode: "SUR"
 	},
 	{
 		cName: "Svalbard and Jan Mayen",
 		dCode: "47",
-		cCode: "SJ"
+		cCode: "SJ",
+		tCode: "SJM"
 	},
 	{
 		cName: "Swaziland",
 		dCode: "268",
-		cCode: "SZ"
+		cCode: "SZ",
+		tCode: "SWZ"
 	},
 	{
 		cName: "Sweden",
 		dCode: "46",
-		cCode: "SE"
+		cCode: "SE",
+		tCode: "SWE"
 	},
 	{
 		cName: "Switzerland",
 		dCode: "41",
-		cCode: "CH"
+		cCode: "CH",
+		tCode: "CHE"
 	},
 	{
 		cName: "Syrian Arab Republic",
 		dCode: "963",
-		cCode: "SY"
+		cCode: "SY",
+		tCode: "SYR"
 	},
 	{
 		cName: "Taiwan",
 		dCode: "886",
-		cCode: "TW"
+		cCode: "TW",
+		tCode: "TWN"
 	},
 	{
 		cName: "Tajikistan",
 		dCode: "992",
-		cCode: "TJ"
+		cCode: "TJ",
+		tCode: "TJK"
 	},
 	{
 		cName: "Tanzania, United Republic of Tanzania",
 		dCode: "255",
-		cCode: "TZ"
+		cCode: "TZ",
+		tCode: "TZA"
 	},
 	{
 		cName: "Thailand",
 		dCode: "66",
-		cCode: "TH"
+		cCode: "TH",
+		tCode: "THA"
 	},
 	{
 		cName: "Timor-Leste",
 		dCode: "670",
-		cCode: "TL"
+		cCode: "TL",
+		tCode: "TLS"
 	},
 	{
 		cName: "Togo",
 		dCode: "228",
-		cCode: "TG"
+		cCode: "TG",
+		tCode: "TGO"
 	},
 	{
 		cName: "Tokelau",
 		dCode: "690",
-		cCode: "TK"
+		cCode: "TK",
+		tCode: "TKL"
 	},
 	{
 		cName: "Tonga",
 		dCode: "676",
-		cCode: "TO"
+		cCode: "TO",
+		tCode: "TON"
 	},
 	{
 		cName: "Trinidad and Tobago",
 		dCode: "1868",
-		cCode: "TT"
+		cCode: "TT",
+		tCode: "TTO"
 	},
 	{
 		cName: "Tunisia",
 		dCode: "216",
-		cCode: "TN"
+		cCode: "TN",
+		tCode: "TUN"
 	},
 	{
 		cName: "Turkey",
 		dCode: "90",
-		cCode: "TR"
+		cCode: "TR",
+		tCode: "TUR"
 	},
 	{
 		cName: "Turkmenistan",
 		dCode: "993",
-		cCode: "TM"
+		cCode: "TM",
+		tCode: "TKM"
 	},
 	{
 		cName: "Turks and Caicos Islands",
 		dCode: "1649",
-		cCode: "TC"
+		cCode: "TC",
+		tCode: "TCA"
 	},
 	{
 		cName: "Tuvalu",
 		dCode: "688",
-		cCode: "TV"
+		cCode: "TV",
+		tCode: "TUV"
 	},
 	{
 		cName: "Uganda",
 		dCode: "256",
-		cCode: "UG"
+		cCode: "UG",
+		tCode: "UGA"
 	},
 	{
 		cName: "Ukraine",
 		dCode: "380",
-		cCode: "UA"
+		cCode: "UA",
+		tCode: "UKR"
 	},
 	{
 		cName: "United Arab Emirates",
 		dCode: "971",
-		cCode: "AE"
+		cCode: "AE",
+		tCode: "ARE"
 	},
 	{
 		cName: "United Kingdom",
 		dCode: "44",
-		cCode: "GB"
+		cCode: "GB",
+		tCode: "GBR"
 	},
 	{
 		cName: "United States",
 		dCode: "1",
-		cCode: "US"
+		cCode: "US",
+		tCode: "USA"
 	},
 	{
 		cName: "Uruguay",
 		dCode: "598",
-		cCode: "UY"
+		cCode: "UY",
+		tCode: "URY"
 	},
 	{
 		cName: "Uzbekistan",
 		dCode: "998",
-		cCode: "UZ"
+		cCode: "UZ",
+		tCode: "UZB"
 	},
 	{
 		cName: "Vanuatu",
 		dCode: "678",
-		cCode: "VU"
+		cCode: "VU",
+		tCode: "VUT"
 	},
 	{
 		cName: "Venezuela, Bolivarian Republic of Venezuela",
 		dCode: "58",
-		cCode: "VE"
+		cCode: "VE",
+		tCode: "VEN"
 	},
 	{
 		cName: "Vietnam",
 		dCode: "84",
-		cCode: "VN"
+		cCode: "VN",
+		tCode: "VNM"
 	},
 	{
 		cName: "Virgin Islands, British",
 		dCode: "1284",
-		cCode: "VG"
+		cCode: "VG",
+		tCode: "VGB"
 	},
 	{
 		cName: "Virgin Islands, U.S.",
 		dCode: "1340",
-		cCode: "VI"
+		cCode: "VI",
+		tCode: "VIR"
 	},
 	{
 		cName: "Wallis and Futuna",
 		dCode: "681",
-		cCode: "WF"
+		cCode: "WF",
+		tCode: "WLF"
 	},
 	{
 		cName: "Yemen",
 		dCode: "967",
-		cCode: "YE"
+		cCode: "YE",
+		tCode: "YEM"
 	},
 	{
 		cName: "Zambia",
 		dCode: "260",
-		cCode: "ZM"
+		cCode: "ZM",
+		tCode: "ZMB"
 	},
 	{
 		cName: "Zimbabwe",
 		dCode: "263",
-		cCode: "ZW"
+		cCode: "ZW",
+		tCode: "ZWE"
 	}
 ];
 
@@ -20045,8 +21540,8 @@ var EuroStations = [
 ];
 
 class FastTrackEnterpriseSearch extends BaseEnterpriseSearch {
-    constructor(fasttrackFetcher, helpers, basketService, storageService, searchService) {
-        super(storageService, helpers, searchService);
+    constructor(fasttrackFetcher, helpers, basketService, storageService, searchService, userService) {
+        super(storageService, helpers, searchService, userService);
         this.fasttrackFetcher = fasttrackFetcher;
         this.basketService = basketService;
         this.type = ServiceType.FastTrack;
@@ -20267,7 +21762,7 @@ class FastTrackEnterpriseSearch extends BaseEnterpriseSearch {
         }, { amount: Number.MAX_SAFE_INTEGER, currencyCode: currency });
     }
     addFastTrackToBasket(fasttrackQuote, fasttrackQuery) {
-        var _a;
+        var _a, _b, _c, _d, _e, _f, _g;
         return __awaiter(this, void 0, void 0, function* () {
             if (fasttrackQuote.unavailable) {
                 return Promise.resolve(DifferentInvokdedUserReasons.cancel);
@@ -20291,7 +21786,10 @@ class FastTrackEnterpriseSearch extends BaseEnterpriseSearch {
                     price: fasttrackQuote.price,
                     currency: fasttrackQuote.currency,
                     searchQuery: fasttrackQuery,
-                    outboundDate: fasttrackQuery.arrivalDatetime.format()
+                    outboundDate: fasttrackQuery.arrivalDatetime.format(),
+                    lowestPrice: ((_b = this.cheapestPrice) === null || _b === void 0 ? void 0 : _b.amount) != fasttrackQuote.price || ((_c = this.cheapestPrice) === null || _c === void 0 ? void 0 : _c.currencyCode) != fasttrackQuote.currency ? (_d = this.cheapestPrice) === null || _d === void 0 ? void 0 : _d.amount : null,
+                    lowestPriceCurrency: ((_e = this.cheapestPrice) === null || _e === void 0 ? void 0 : _e.amount) != fasttrackQuote.price || ((_f = this.cheapestPrice) === null || _f === void 0 ? void 0 : _f.currencyCode) != fasttrackQuote.currency ?
+                        (_g = this.cheapestPrice) === null || _g === void 0 ? void 0 : _g.currencyCode : null
                 }, intBasket, this.searchService, this.travellers, fasttrackQuote.requiresReason);
                 if (whatHappened === DifferentInvokdedUserReasons.research) {
                     this.performSearch();
@@ -20364,7 +21862,7 @@ var TravellerSearchTypes;
     TravellerSearchTypes["employeeNumber"] = "employeeNumber";
 })(TravellerSearchTypes || (TravellerSearchTypes = {}));
 class BaseEnterpriseSearchService {
-    constructor(searchAirportsFetcher, searchAirlinesFetcher, storageService, userService, modalService, router, helpers, hotelAvalibilityService, citiesFetcher, confermaCitiesFetcher, postcodeFetcher, railStationFetcher, saveUserAddressUpdater, userAddressesFetcher, basketService, getUserCompanyOfficesFetcher, searchHotelChainsFetcher, getConfermaRoomImagesFetcher, baseValidateIsPostcodeValidTester, depotFetcher, confermaOfficeNamesFetcher, confermaOfficeFetcher, baseDeleteUserAddressUpdater, baseDeleteRecentSearchUpdater, baseSaveRecentSearchUpdater, getUserCurrentCarbonAllowanceFetcher, baseSaveFavouriteSearchUpdater, environment, loungeFetcher, parkingFetcher, httpCallService, flightFetcher, hotelFetcher, carhireFetcher, carHireAvailabilityDetailFetcher, cabhireFetcher, railFetcher, irlFetcher, getRailStationFetcher, getIrlSupplierStationFetcher, baseWebTokenService, riskAlertsFetcher, quicklistFetcher, getUserRecentSearchesFetcher, getRailCardsFetcher, getCovidMicrositeTokenFetcher, eurostarFetcher, searchUsersCanBookForFetcher, searchIrlStationsFetcher, irlDiscountCardsFetcher, getFlightFareRulesFetcher, getFlightSeatMapFetcher, getRailLiveDeparturesFetcher, applyHotelRulesFetcher, applyFlightRules, getUserFavouriteSearchesFetcher, deleteFavouriteSearchUpdater, emailBasketFetcher, fasttrackFetcher, sendOfflineNotificationFetcher, getHotelChainsFetcher, getRailProvidersFetcher, getAllAirlinesFetcher, getCarHireProvidersFetcher) {
+    constructor(searchAirportsFetcher, searchAirlinesFetcher, storageService, userService, modalService, router, helpers, hotelAvalibilityService, citiesFetcher, confermaCitiesFetcher, postcodeFetcher, railStationFetcher, saveUserAddressUpdater, userAddressesFetcher, basketService, getUserCompanyOfficesFetcher, searchHotelChainsFetcher, getConfermaRoomImagesFetcher, baseValidateIsPostcodeValidTester, depotFetcher, confermaOfficeNamesFetcher, confermaOfficeFetcher, baseDeleteUserAddressUpdater, baseDeleteRecentSearchUpdater, baseSaveRecentSearchUpdater, getUserCurrentCarbonAllowanceFetcher, baseSaveFavouriteSearchUpdater, environment, loungeFetcher, parkingFetcher, httpCallService, flightFetcher, hotelFetcher, carhireFetcher, carHireAvailabilityDetailFetcher, cabhireFetcher, railFetcher, irlFetcher, getRailStationFetcher, getIrlSupplierStationFetcher, webTokenService, riskAlertsFetcher, quicklistFetcher, getUserRecentSearchesFetcher, getRailCardsFetcher, getCovidMicrositeTokenFetcher, eurostarFetcher, searchUsersCanBookForFetcher, searchIrlStationsFetcher, irlDiscountCardsFetcher, getFlightFareRulesFetcher, getFlightSeatMapFetcher, getRailLiveDeparturesFetcher, applyHotelRulesFetcher, applyFlightRules, getUserFavouriteSearchesFetcher, deleteFavouriteSearchUpdater, emailBasketFetcher, fasttrackFetcher, sendOfflineNotificationFetcher, getHotelChainsFetcher, getRailProvidersFetcher, getAllAirlinesFetcher, getCarHireProvidersFetcher) {
         this.searchAirportsFetcher = searchAirportsFetcher;
         this.searchAirlinesFetcher = searchAirlinesFetcher;
         this.storageService = storageService;
@@ -20394,7 +21892,7 @@ class BaseEnterpriseSearchService {
         this.baseSaveFavouriteSearchUpdater = baseSaveFavouriteSearchUpdater;
         this.getRailStationFetcher = getRailStationFetcher;
         this.getIrlSupplierStationFetcher = getIrlSupplierStationFetcher;
-        this.baseWebTokenService = baseWebTokenService;
+        this.webTokenService = webTokenService;
         this.riskAlertsFetcher = riskAlertsFetcher;
         this.getUserRecentSearchesFetcher = getUserRecentSearchesFetcher;
         this.getRailCardsFetcher = getRailCardsFetcher;
@@ -20433,17 +21931,18 @@ class BaseEnterpriseSearchService {
         this.eurostations = _.toArray(EuroStations);
         console.log('Enterpise search service being inited');
         this.searches = {
-            [ServiceType.Lounge]: new LoungesEnterpriseSearch(loungeFetcher, helpers, basketService, storageService, this),
-            [ServiceType.Parking]: new ParkingEnterpriseSearch(parkingFetcher, helpers, basketService, storageService, this),
+            [ServiceType.Lounge]: new LoungesEnterpriseSearch(loungeFetcher, helpers, basketService, storageService, this, userService),
+            [ServiceType.Parking]: new ParkingEnterpriseSearch(parkingFetcher, helpers, basketService, storageService, this, userService),
             [ServiceType.Flight]: new FlightEnterpriseSearch(flightFetcher, helpers, userService, basketService, storageService, this, applyFlightRules, modalService),
             [ServiceType.Hotel]: new HotelEnterpriseSearch(hotelFetcher, helpers, userService, environment, hotelAvalibilityService, basketService, storageService, this, httpCallService, quicklistFetcher, getRailStationFetcher, applyHotelRulesFetcher),
-            [ServiceType.Car]: new CarhireEnterpriseSearch(carhireFetcher, carHireAvailabilityDetailFetcher, helpers, basketService, storageService, this),
-            [ServiceType.Cab]: new CabHireEnterpriseSearch(cabhireFetcher, helpers, storageService, this, basketService),
-            [ServiceType.InternationalRail]: new IRLEnterpriseSearch(irlFetcher, irlDiscountCardsFetcher, helpers, basketService, storageService, this, getIrlSupplierStationFetcher),
-            [ServiceType.FastTrack]: new FastTrackEnterpriseSearch(fasttrackFetcher, helpers, basketService, storageService, this),
+            [ServiceType.Car]: new CarhireEnterpriseSearch(carhireFetcher, carHireAvailabilityDetailFetcher, helpers, basketService, storageService, this, userService),
+            [ServiceType.Cab]: new CabHireEnterpriseSearch(cabhireFetcher, helpers, storageService, this, basketService, userService),
+            [ServiceType.InternationalRail]: new IRLEnterpriseSearch(irlFetcher, irlDiscountCardsFetcher, helpers, basketService, storageService, this, getIrlSupplierStationFetcher, userService),
+            [ServiceType.FastTrack]: new FastTrackEnterpriseSearch(fasttrackFetcher, helpers, basketService, storageService, this, userService),
             [ServiceType.Coach]: null,
+            [ServiceType.Ferry]: null,
             [ServiceType.Rail]: new RailEnterpriseSearch(railFetcher, getRailStationFetcher, helpers, basketService, storageService, this, userService, modalService),
-            [ServiceType.Eurostar]: new EurostarEnterpriseSearch(eurostarFetcher, helpers, userService, basketService, storageService, this, modalService)
+            [ServiceType.Eurostar]: new EurostarEnterpriseSearch(eurostarFetcher, helpers, userService, basketService, storageService, this, modalService, applyFlightRules)
         };
         console.log('Newly created search objects: ', this.searches);
         this.search_objects = this.helpers.clone(this.init_search_objects());
@@ -20454,9 +21953,14 @@ class BaseEnterpriseSearchService {
                 this.search_objects = Object.keys(this.search_objects).reduce((objects, key) => {
                     objects[key].enabled =
                         !!services && !!services[key];
+                    if (!(!!services && !!services[key])) {
+                        objects[key].chosen = false;
+                        objects[key].originalChosen = false;
+                    }
                     return objects;
                 }, this.search_objects);
             }
+            this.determineHighestSearchPriority();
         });
         if (Array.isArray(this.countries)) {
             this.countries = this.countries.sort((a, b) => {
@@ -20469,7 +21973,7 @@ class BaseEnterpriseSearchService {
                 return 0;
             });
         }
-        baseWebTokenService.autoLogoutConfig = this.getAutoLogoutConfig();
+        webTokenService.autoLogoutConfig = this.getAutoLogoutConfig();
     }
     ngOnDestroy() {
         if (this.allSubscription) {
@@ -20877,6 +22381,9 @@ class BaseEnterpriseSearchService {
         this.updateTravellerInformation();
     }
     _removeTraveller(traveller) {
+        if (this.userService.bobo && this.userService.bobo.id === traveller.id) {
+            return;
+        }
         this.selectedTravellers = this.selectedTravellers.filter((travellerToTest) => {
             return !TravellerObject.equals(travellerToTest, traveller);
         });
@@ -21050,7 +22557,7 @@ class BaseEnterpriseSearchService {
                 }
                 break;
             case BookerType.BookerWithSelf:
-                if (!(this.selectedTravellers.length < 1) ||
+                if (this.selectedTravellers.length < 1 ||
                     !this.travellersContainUser()) {
                     this.travellerValidationMessages.push('Please add your self.');
                     this.traveller_error = true;
@@ -21104,14 +22611,7 @@ class BaseEnterpriseSearchService {
         if (searchObject) {
             searchObject.chosen = true;
         }
-        if (url) {
-            this.router.navigate([url]);
-            if (this.searches.INTERNATIONAL_RAIL) {
-                this.submitIrlForm();
-            }
-        }
-        else if (searchObject &&
-            !this.router.url.includes(searchObject.resultUrl)) {
+        if (searchObject && !this.router.url.includes(searchObject.resultUrl)) {
             this.router.navigate([searchObject.resultUrl]);
         }
         /*If the search exceeds the timeout time, cancel search and tell OBT that it's timed out*/
@@ -21133,6 +22633,12 @@ class BaseEnterpriseSearchService {
             })).finally(() => {
                 this.search_loading = false;
                 this.searchLoadingDone.next(true);
+                if (url) {
+                    this.router.navigate([url]);
+                    if (this.searches.INTERNATIONAL_RAIL) {
+                        this.submitIrlForm();
+                    }
+                }
             });
         }
         catch (error) {
@@ -21586,8 +23092,8 @@ class BaseEnterpriseSearchService {
             journeyType: IrlJourneyType.ReturnJourney,
             class: null,
             outboundDepartureDateTime: time,
-            departureLocationId: null,
-            arrivalLocationId: null,
+            travellingFrom: null,
+            travellingTo: null,
             adults: 0,
             children: 0,
             returnDepartureDateTime: time,
@@ -21774,7 +23280,7 @@ class BaseEnterpriseSearchService {
         });
     }
     getFlightSeatMap(flight) {
-        return this.getFlightSeatMapFetcher.fetchList({ flight: flight }).pipe(map((data) => {
+        return this.getFlightSeatMapFetcher.fetchList({ flight }).pipe(map((data) => {
             if (data) {
                 return data.results;
             }
@@ -21833,7 +23339,6 @@ class BaseEnterpriseSearchService {
                 additionalInfo: searchParams.additionalInstructions || 'No additional instructions',
                 serviceClass: searchParams.irlClass || 'Any',
                 offlineReference: this.jrfReference,
-                notifyEmail: currentUserEmail,
                 onBehalfOf,
                 passengers
             };
@@ -21846,6 +23351,7 @@ class BaseEnterpriseSearchService {
                     this.modalService.open(ModalTypes.ModalErrorComponent, { centered: true }, { error: 'Unable to send offline notification' });
                 }
             });
+            this.resetSearchParams();
         }
     }
     sendOfflineNotification(jrfReference) {
@@ -21869,6 +23375,7 @@ class BaseWebTokenService {
         this.timeoutDuration = 60 * 60;
         this.autoLogoutConfig = {};
         this._bobo = null;
+        this._boboFetched = false;
         this.timeOutDuration = environment.autoLogoutTime;
     }
     /**
@@ -21885,11 +23392,16 @@ class BaseWebTokenService {
     get jwtToken() {
         return this._jwtToken || null;
     }
-    set bobo(value) {
-        this._bobo = value || null;
-    }
-    get bobo() {
-        return this._bobo;
+    getInvokedUserObservable() {
+        if (this._boboFetched) {
+            throw new Error('Only one service can access the service which should be the searchService');
+        }
+        this._boboFetched = true;
+        return Object.freeze({
+            next: (traveller) => {
+                this._bobo = !traveller || traveller.id ? traveller : null;
+            }
+        });
     }
     _updateTimer() {
         window.clearTimeout(this.timer);
@@ -22415,5 +23927,5 @@ class BaseCreateGuestUpdater extends UpdateableObject {
  * Generated bundle index. Do not edit.
  */
 
-export { AbstractHttpCallService, ActionType, AddressImpl, Airlines, AirportSearchMode, AuthInfo, BaseAcceptNewPriceUpdater, BaseAddItemToBasketUpdater, BaseAddUserToBasketItemUpdater, BaseApplyJitFlightRulesFetcher, BaseBookBasketUpdater, BaseCabhireQuoteFetcher, BaseCancelBookingUpdater, BaseCarHireAvailabilityDetailFetcher, BaseCarhireQuoteFetcher, BaseConfermaOfficeFetcher, BaseConfermaOfficeNamesFetcher, BaseConfirmMessagesUpdater, BaseCreateBasketUpdater, BaseCreateGuestUpdater, BaseDeleteBasketUpdater, BaseDeleteFavouriteSearchUpdater, BaseDeleteRecentSearchUpdater, BaseDeleteUserAddressUpdater, BaseEditUserUpdater, BaseEmailBasketFetcher, BaseEnterpriseBasketService, BaseEnterpriseMyBookingsService, BaseEnterpriseSearch, BaseEnterpriseSearchService, BaseEnvironment, BaseEurostarQuoteFetcher, BaseEventMessenager, BaseFastTrackQuoteFetcher, BaseFlightQuoteFetcher, BaseGetAllAirlinesFetcher, BaseGetBasketFetcher, BaseGetCancellationInfoFetcher, BaseGetCarHireProvidersFetcher, BaseGetCompaniesFetcher, BaseGetCompanyFetcher, BaseGetConfermaRoomImagesFetcher, BaseGetCovidMicrositeTokenFetcher, BaseGetFlightFareRulesFetcher, BaseGetFlightSeatMapFetcher, BaseGetHotelChainsFetcher, BaseGetIrlSupplierStationFetcher, BaseGetMiAutoSugestionFetcher, BaseGetRailLiveDeparturesFetcher, BaseGetRailProvidersFetcher, BaseGetRailStationFetcher, BaseGetRailcardsFetcher, BaseGetRiskAlertsFetcher, BaseGetUserBasketsFetcher, BaseGetUserCompanyOfficesFetcher, BaseGetUserCurrentCarbonAllowanceFetcher, BaseGetUserFavouriteSearchesFetcher, BaseGetUserFetcher, BaseGetUserGuestsFetcher, BaseGetUserRecentSearchesFetcher, BaseHelperRoutines, BaseHotelAvalibilityQuoteFetcher, BaseHotelAvalibilityService, BaseHotelQuoteFetcher, BaseHotelRulesFetcher, BaseIrlDiscountCardFetcher, BaseIrlQuoteFetcher, BaseLogonService, BaseLoungeQuoteFetcher, BaseModalOpenerService, BaseNetworkCall, BaseParkingQuoteFetcher, BaseRailQuoteFetcher, BaseRemoveItemFromBasketUpdater, BaseRequiresReasonService, BaseRevalidateBasketUpdater, BaseRouteHappyService, BaseSaveFavouriteSearchUpdater, BaseSaveRecentSearchUpdater, BaseSaveUserAddressUpdater, BaseSearchAirlinesFetcher, BaseSearchAirportsFetcher, BaseSearchCityFetcher, BaseSearchConfermaCityFetcher, BaseSearchConfermaQuicklistFetcher, BaseSearchDepotFetcher, BaseSearchHotelChainsFetcher, BaseSearchIrlStationsFetcher, BaseSearchPostcodeFetcher, BaseSearchRailStationsFetcher, BaseSearchUsersCanBookForFetcher, BaseSendBasketForApprovalUpdater, BaseSendOfflineNotificationFetcher, BaseSetBasketItemLeadPassengerUpdater, BaseSetBasketItemMiGroupUpdater, BaseSetBasketItemMiValueUpdater, BaseSetPaymentOptionUpdater, BaseSetUserLanguageUpdater, BaseStorageService, BaseUpdateBasketNoteUpdater, BaseUpdateBasketTitleUpdater, BaseUserAddressesFetcher, BaseUserMessagesFetcher, BaseUserProductsFetcher, BaseUserService, BaseUserUiConfigsFetcher, BaseValidateIsPostcodeValidTester, BaseValidateMiFreeValueTester, BaseWebTokenService, BasemoveBasketItemToBasket, BasketInfoMiDetailsImpl, BookableBasket, BookingStatus, BreatfastTypes, CabHireEnterpriseSearch, CarCompanies, CarhireEnterpriseSearch, ClassType, DEFAULT_FLIGHT_FILTERS, DifferentInvokdedUserReasons, DistanceType, DocTypes, EurostarClassEnum, EurostarEnterpriseSearch, EurostarSearchType, FlightDirectionEnum, FlightDisplayTypes, FlightEnterpriseSearch, FlightSearchType, FlightSortTypes, Genders, HotelChains, HotelEnterpriseSearch, HotelFilters, HotelPolicyEnum, HotelView, IRLEnterpriseSearch, IncludedType, InternalBasket, IrlDirection, LimitedCache, LocationTypes, LoginError, LoginErrorReason, LogoutEnum, LoungesEnterpriseSearch, MAX_TRAVELLERS, ManagementInfoAndIsValid, Memorise, MenuSlideEnum, ModalTypes, OBTFlightCabinClass, PREFERENCE_VALUES, ParkingEnterpriseSearch, PersonTitles, PhoneNumberImpl, PreferredFlags, RailCompanies, RailDirection, RailEnterpriseSearch, RailJourneyFareType, RailSearchCriteria, RegExps, RiskLevelRanking, SchemaFormat, SearchHandler, ServiceProvider, SortMethod, SortTypesCar, SortTypesEurostar, SortTypesHotel, SortTypesIrl, SupplementaryBookingInfoImpl, Suppliers, TaxiFormMode, TimeWindow, TravellerObject, TravellerSearchTypes, URLS, USER_SIGNEDIN, USER_SIGNEDOUT, UserFavorurite, UserInfoImpl, ValidatorChecker, WellbeingEnum, Widgets, ages, defaultValidations, excludedExpression, filtersKeys, includedAccessibilityExpression, includedExpression, makeManagamentInfo, maxTravellerWellbeing, ɵ0, DistanceTypes as ɵb, DocGender as ɵc, DocType as ɵd, PreferenceKey as ɵf, FetchableList as ɵh, FetchableObject as ɵi, UpdateableObject as ɵj, BaseTester as ɵk };
+export { AbstractHttpCallService, ActionType, AddressImpl, Airlines, AirportSearchMode, AuthInfo, BaseAcceptNewPriceUpdater, BaseAddItemToBasketUpdater, BaseAddUserToBasketItemUpdater, BaseApplyJitFlightRulesFetcher, BaseBookBasketUpdater, BaseCabhireQuoteFetcher, BaseCancelBookingUpdater, BaseCarHireAvailabilityDetailFetcher, BaseCarhireQuoteFetcher, BaseConfermaOfficeFetcher, BaseConfermaOfficeNamesFetcher, BaseConfirmMessagesUpdater, BaseCreateBasketUpdater, BaseCreateGuestUpdater, BaseDeleteBasketUpdater, BaseDeleteFavouriteSearchUpdater, BaseDeleteRecentSearchUpdater, BaseDeleteUserAddressUpdater, BaseEditUserUpdater, BaseEmailBasketFetcher, BaseEnterpriseBasketService, BaseEnterpriseMyBookingsService, BaseEnterpriseSearch, BaseEnterpriseSearchService, BaseEnvironment, BaseEurostarQuoteFetcher, BaseEventMessenager, BaseFastTrackQuoteFetcher, BaseFlightQuoteFetcher, BaseGetAllAirlinesFetcher, BaseGetBasketFetcher, BaseGetCancellationInfoFetcher, BaseGetCarHireProvidersFetcher, BaseGetCompaniesFetcher, BaseGetCompanyFetcher, BaseGetConfermaRoomImagesFetcher, BaseGetCovidMicrositeTokenFetcher, BaseGetFlightFareRulesFetcher, BaseGetFlightSeatMapFetcher, BaseGetHotelChainsFetcher, BaseGetIrlSupplierStationFetcher, BaseGetMiAutoSugestionFetcher, BaseGetOfficeFetcher, BaseGetRailLiveDeparturesFetcher, BaseGetRailProvidersFetcher, BaseGetRailStationFetcher, BaseGetRailcardsFetcher, BaseGetRiskAlertsFetcher, BaseGetUserBasketsFetcher, BaseGetUserCompanyOfficesFetcher, BaseGetUserCurrentCarbonAllowanceFetcher, BaseGetUserDefaultMIValueFetcher, BaseGetUserFavouriteSearchesFetcher, BaseGetUserFetcher, BaseGetUserGuestsFetcher, BaseGetUserRecentSearchesFetcher, BaseHelperRoutines, BaseHotelAvalibilityQuoteFetcher, BaseHotelAvalibilityService, BaseHotelQuoteFetcher, BaseHotelRulesFetcher, BaseIrlDiscountCardFetcher, BaseIrlQuoteFetcher, BaseLogonService, BaseLoungeQuoteFetcher, BaseModalOpenerService, BaseNetworkCall, BaseParkingQuoteFetcher, BaseRailQuoteFetcher, BaseRemoveItemFromBasketUpdater, BaseRequiresReasonService, BaseRevalidateBasketUpdater, BaseRouteHappyService, BaseSaveFavouriteSearchUpdater, BaseSaveRecentSearchUpdater, BaseSaveUserAddressUpdater, BaseSearchAirlinesFetcher, BaseSearchAirportsFetcher, BaseSearchCityFetcher, BaseSearchConfermaCityFetcher, BaseSearchConfermaQuicklistFetcher, BaseSearchDepotFetcher, BaseSearchHotelChainsFetcher, BaseSearchIrlStationsFetcher, BaseSearchPostcodeFetcher, BaseSearchRailStationsFetcher, BaseSearchUsersCanBookForFetcher, BaseSendBasketForApprovalUpdater, BaseSendOfflineNotificationFetcher, BaseSetBasketItemLeadPassengerUpdater, BaseSetBasketItemMiGroupUpdater, BaseSetBasketItemMiValueUpdater, BaseSetPaymentOptionUpdater, BaseSetUserLanguageUpdater, BaseStorageService, BaseUpdateBasketNoteUpdater, BaseUpdateBasketTitleUpdater, BaseUserAddressesFetcher, BaseUserMessagesFetcher, BaseUserProductsFetcher, BaseUserService, BaseUserUiConfigsFetcher, BaseValidateIsPostcodeValidTester, BaseValidateMiFreeValueTester, BaseWebTokenService, BasemoveBasketItemToBasket, BasketInfoMiDetailsImpl, BookableBasket, BookingStatus, BreatfastTypes, CabHireEnterpriseSearch, CarCompanies, CarhireEnterpriseSearch, ClassType, DEFAULT_FLIGHT_FILTERS, DifferentInvokdedUserReasons, DistanceType, DocTypes, EurostarClassEnum, EurostarEnterpriseSearch, EurostarSearchType, FlightDirectionEnum, FlightDisplayTypes, FlightEnterpriseSearch, FlightSearchType, FlightSortTypes, Genders, HotelChains, HotelEnterpriseSearch, HotelFilters, HotelPolicyEnum, HotelView, IRLEnterpriseSearch, IncludedType, InternalBasket, IrlDirection, LimitedCache, LocationTypes, LoginError, LoginErrorReason, LogoutEnum, LoungesEnterpriseSearch, MAX_TRAVELLERS, ManagementInfoAndIsValid, Memorise, MenuSlideEnum, ModalTypes, OBTFlightCabinClass, PREFERENCE_VALUES, ParkingEnterpriseSearch, PersonTitles, PhoneNumberImpl, PreferredFlags, RailCompanies, RailDirection, RailEnterpriseSearch, RailJourneyFareType, RailSearchCriteria, RegExps, RiskLevelRanking, SchemaFormat, SearchHandler, ServiceProvider, SortMethod, SortTypesCar, SortTypesEurostar, SortTypesHotel, SortTypesIrl, SupplementaryBookingInfoImpl, Suppliers, TaxiFormMode, TimeWindow, TravellerObject, TravellerSearchTypes, URLS, USER_SIGNEDIN, USER_SIGNEDOUT, UserFavorurite, UserInfoImpl, ValidatorChecker, WellbeingEnum, Widgets, ages, defaultValidations, excludedExpression, filtersKeys, includedAccessibilityExpression, includedExpression, makeManagamentInfo, maxTravellerWellbeing, ɵ0, DistanceTypes as ɵb, DocGender as ɵc, DocType as ɵd, PreferenceKey as ɵf, FetchableList as ɵh, FetchableObject as ɵi, UpdateableObject as ɵj, BaseTester as ɵk };
 //# sourceMappingURL=sabstravtech-obtservices-base.js.map