@sabstravtech/obtservices 0.0.3 → 0.0.19020100

package/fesm2015/sabstravtech-obtservices-base.js

@@ -14,6 +14,7 @@ class BaseEnterpriseSearch {
         };
         this.isValid = new BehaviorSubject(false);
         this.results = new BehaviorSubject([]);
+        this.multiResults = new BehaviorSubject([]);
         this.messages = new BehaviorSubject([]);
         this.messagesInfo = new BehaviorSubject([]);
         this.validationMessages = [];
@@ -22,6 +23,7 @@ class BaseEnterpriseSearch {
         this.tempParams = {};
         this.doChecks = true;
         this.fullResults = []; // should be an array of type specified by O
+        this.fullMultiResults = []; // an array of arrays of type specified by O
         this.mapper = (results) => {
             return results;
         };
@@ -48,7 +50,7 @@ class BaseEnterpriseSearch {
             try {
                 results.pipe(take(1)).subscribe((results1) => {
                     console.log('Got results', cloneDeep(results1));
-                    this.fullResults = this.mapper(results1);
+                    this.fullResults = Object.freeze(this.mapper(results1));
                     this._cheapestResultPrice = this.updateLowestPrice(this.fullResults);
                     this.storageService.setSessionItem(this.resultsSessionName, this.makeSessionResults(this.fullResults));
                     this.results.next(this.fullResults);
@@ -69,10 +71,55 @@ class BaseEnterpriseSearch {
             }
         });
     }
+    _startMultiSearch(resultsArray) {
+        this.isLoading.next(true);
+        this.fullMultiResults = [];
+        const allQueries = [];
+        resultsArray.forEach((results, index) => {
+            allQueries.push(new Promise((resolve, reject) => {
+                try {
+                    results.pipe(take(1)).subscribe((results1) => {
+                        console.log('Got results', cloneDeep(results1));
+                        const mappedResults = this.mapper(results1);
+                        this.fullMultiResults[index] = mappedResults;
+                        // this._cheapestResultPrice = this.updateLowestPrice(  // perform these after all searches complete
+                        //   this.fullResults
+                        // );
+                        // this.results.next(this.fullResults);
+                        resolve(mappedResults.length !== 0);
+                    }, (error) => {
+                        this.multiResults.next([]);
+                        resolve(false);
+                    });
+                }
+                catch (err) {
+                    this.storageService.setSessionItem(this.resultsSessionName, []);
+                    this.multiResults.next([]);
+                    reject(err);
+                }
+            }));
+        });
+        return Promise.all(allQueries).then((value) => {
+            this.isLoading.next(false);
+            console.log('+++ Multiloading Complete +++');
+            console.log('+++ Multi Results: ', this.fullMultiResults, ' +++');
+            // store the full results
+            this.storageService.setSessionItem(this.multiResultsSessionName, this.fullMultiResults);
+            this.multiResults.next(this.fullMultiResults);
+            return true;
+        });
+    }
     reset() {
         this.storageService.removeSessionItem(this.resultsSessionName);
+        try {
+            this.storageService.removeSessionItem(this.multiResultsSessionName);
+        }
+        catch (error) {
+        }
         this.fullResults = [];
+        this.fullMultiResults = [];
         this.results.next([]);
+        this.multiResults.next([]);
         this.resetQuery();
     }
     makeSessionResults(data) {
@@ -457,9 +504,10 @@ var FlightCabinClass;
 (function (FlightCabinClass) {
     FlightCabinClass["Any"] = "Any";
     FlightCabinClass["LiteEconomy"] = "LiteEconomy";
+    FlightCabinClass["Economy"] = "Economy";
     FlightCabinClass["EconomyRestricted"] = "EconomyRestricted";
     FlightCabinClass["EconomyNoBags"] = "EconomyNoBags";
-    FlightCabinClass["Economy"] = "Economy";
+    FlightCabinClass["EconomyFlexi"] = "EconomyFlexi";
     FlightCabinClass["PremiumEconomy"] = "PremiumEconomy";
     FlightCabinClass["Business"] = "Business";
     FlightCabinClass["PremiumBusiness"] = "PremiumBusiness";
@@ -495,6 +543,15 @@ var IrlTravellerStatus;
     IrlTravellerStatus["Placeholder"] = "placeholder";
     IrlTravellerStatus["Complete"] = "complete";
 })(IrlTravellerStatus || (IrlTravellerStatus = {}));
+var MessageTarget;
+(function (MessageTarget) {
+    MessageTarget["Login"] = "LOGIN";
+    MessageTarget["SearchForm"] = "SEARCH_FORM";
+    MessageTarget["Results"] = "RESULTS";
+    MessageTarget["MiForm"] = "MI_FORM";
+    MessageTarget["BasketBeforeConfirm"] = "BASKET_BEFORE_CONFIRM";
+    MessageTarget["Dashboard"] = "DASHBOARD";
+})(MessageTarget || (MessageTarget = {}));
 var PassengerType;
 (function (PassengerType) {
     PassengerType["Adult"] = "ADULT";
@@ -580,6 +637,7 @@ var UiPresentation;
 (function (UiPresentation) {
     UiPresentation["FreeText"] = "FREE_TEXT";
     UiPresentation["AutoSuggest"] = "AUTO_SUGGEST";
+    UiPresentation["Dropdown"] = "DROPDOWN";
     UiPresentation["Hidden"] = "HIDDEN";
 })(UiPresentation || (UiPresentation = {}));
 
@@ -740,6 +798,58 @@ class HiddenManagementInfo extends ManagementInfoAndIsValid {
     setValue(val) { }
     save(basketid, userId) { }
 }
+class DropdownManagementInfo extends ManagementInfoAndIsValid {
+    constructor(managementInfo, basketService) {
+        var _a;
+        super(managementInfo);
+        this.basketService = basketService;
+        if (((_a = this.values) === null || _a === void 0 ? void 0 : _a.length) > 0) {
+            this.avaliableItems = this.values;
+        }
+        else {
+            console.error('No values for Dropdown MI field  ');
+        }
+    }
+    getValue() {
+        return this.selectedValues[0] ? this.selectedValues[0].value.id : '__NONE';
+    }
+    hasErrors(id) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return !this.avaliableItems.find((value1) => {
+                return value1.id === id;
+            })
+                ? { hasErrors: true }
+                : null;
+        });
+    }
+    setValue(id) {
+        const value = this.avaliableItems.find((value1) => {
+            return value1.id === id;
+        });
+        if (!!value) {
+            this.selectedValues = [
+                {
+                    value: {
+                        id: value.id,
+                        label: value.label,
+                        value: value.value,
+                        default: value.default,
+                        fixed: value.fixed,
+                        agentOnly: value.agentOnly
+                    },
+                    basketLevelValue: this.perBooking,
+                    userLevelValue: this.perPassenger
+                }
+            ];
+        }
+        else {
+            this.selectedValues = [];
+        }
+    }
+    save(basketid, userid) {
+        this.basketService.setMiSelectedValue(basketid, this, this.selectedValues[0].value.id, userid);
+    }
+}
 const makeManagamentInfo = (managementInfo, basketService) => {
     switch (managementInfo.uiPresentation) {
         case UiPresentation.FreeText:
@@ -748,6 +858,11 @@ const makeManagamentInfo = (managementInfo, basketService) => {
             return new AutoSugestManagementInfo(managementInfo, basketService);
         case UiPresentation.Hidden:
             return new HiddenManagementInfo(managementInfo);
+        case UiPresentation.Dropdown:
+            return new DropdownManagementInfo(managementInfo, basketService);
+        default:
+            const tmp = managementInfo.uiPresentation;
+            console.log(tmp);
     }
     return null;
 };
@@ -1027,7 +1142,7 @@ class BookableBasket {
         }
     }
     sendBasketForApproval() {
-        this.basketService.sendBasketForApproval(this.id);
+        return this.basketService.sendBasketForApproval(this.id);
     }
     workoutApprovedState(basket) {
         let status = BookingStatus.ApprovedBook;
@@ -1245,13 +1360,17 @@ class CabHireEnterpriseSearch extends BaseEnterpriseSearch {
             { enabled: false, key: 'wait_and_return', value: 'Wait And Return' }
         ];
         this.searchTypes = [
-            'One-way'
-            // , 'Return'
+            'One-way', 'Return'
         ];
         this.airportSearchTypes = ['Airport drop off', 'Airport Pick Up'];
         this.criteria = ['Pick Up Time'];
         this.mode = TaxiFormMode.ADDRESS;
         this.minSelectDate = moment();
+        this.minReturnSelectDate = {
+            day: moment().date(),
+            month: moment().month() + 1,
+            year: moment().year()
+        };
         // getters and setters
         this._date = null;
         this.selectedPlaces = [];
@@ -1286,6 +1405,7 @@ class CabHireEnterpriseSearch extends BaseEnterpriseSearch {
         this._terminal = null;
         this._time = null;
         this.resultsSessionName = CabHireEnterpriseSearch.STORAGE_SESSION_RESULTS;
+        this.multiResultsSessionName = CabHireEnterpriseSearch.MULTI_STORAGE_SESSION_RESULTS;
         this.getPassengers = () => {
             const adults = this.adults;
             const children = this.children;
@@ -1305,10 +1425,17 @@ class CabHireEnterpriseSearch extends BaseEnterpriseSearch {
         const data = storageService.getSessionItem(CabHireEnterpriseSearch.STORAGE_SESSION_PARAMS) || {
             tempParams: {}
         };
-        // const momentDateTime = data.query.departs
-        //   ? moment(data.query.departs)
-        //   : moment();
         this.updateTempParams(searchService.makeCabHireQuery(data.tempParams));
+        try {
+            const returnData = storageService.getSessionItem(CabHireEnterpriseSearch.SECONDARY_STORAGE_SESSION_PARAMS);
+            if (returnData) {
+                this.returnDateTime = moment(returnData.tempParams.departs);
+                this.searchType = this.searchTypes[1];
+            }
+        }
+        catch (error) {
+            console.error('+++ Error recovering return data: ', error, ' +++');
+        }
         if (data.tempParams.fromAddress) {
             this.fromAddress = data.tempParams.fromAddress;
         }
@@ -1328,6 +1455,9 @@ class CabHireEnterpriseSearch extends BaseEnterpriseSearch {
         this.fullResults = results;
         this._cheapestResultPrice = this.updateLowestPrice(results);
         this.results.next(results || []);
+        const secondaryResults = storageService.getSessionItemAsList(this.multiResultsSessionName) || [];
+        this.fullMultiResults = secondaryResults;
+        this.multiResults.next(secondaryResults);
         this._isValid();
         this.outboundVisibility = new BehaviorSubject(false);
         this.inboundVisibility = new BehaviorSubject(false);
@@ -1350,6 +1480,7 @@ class CabHireEnterpriseSearch extends BaseEnterpriseSearch {
     }
     set searchType(value) {
         this._searchType = value;
+        this._isValid();
     }
     get airportSearchType() {
         return this._airportSearchType;
@@ -1392,6 +1523,7 @@ class CabHireEnterpriseSearch extends BaseEnterpriseSearch {
     }
     set returnDateTime(value) {
         this._returnDateTime = value;
+        this._isValid();
     }
     get flightNumber() {
         return this._flightNumber;
@@ -1430,6 +1562,14 @@ class CabHireEnterpriseSearch extends BaseEnterpriseSearch {
             this._date = this.helpers.momentToNgDate(value);
             this._time = this.helpers.formatTimeColon(value);
         }
+        this.minReturnSelectDate = {
+            day: moment(value).date(),
+            month: moment(value).month() + 1,
+            year: moment(value).year(),
+        };
+        if (value.isAfter(this.returnDateTime)) {
+            this.returnDateTime.set('date', value.date());
+        }
         this._isValid();
     }
     // get fromLocation(): CabHireLocation {
@@ -1548,12 +1688,19 @@ class CabHireEnterpriseSearch extends BaseEnterpriseSearch {
     }
     resetQuery() {
         this.updateTempParams(this.searchService.makeCabHireQuery());
+        try {
+            this.storageService.removeSessionItem(CabHireEnterpriseSearch.SECONDARY_STORAGE_SESSION_PARAMS);
+        }
+        catch (error) {
+        }
+        this._searchType = this.searchTypes[0]; // reset to one-way
         this._isValid();
     }
     resetParams() {
         this.reset();
         this.resetQuery();
         this.results.next([]);
+        this.multiResults.next([]);
     }
     _isValid() {
         if (!this.doChecks) {
@@ -1575,6 +1722,9 @@ class CabHireEnterpriseSearch extends BaseEnterpriseSearch {
         if (this.tempParams.adults + this.tempParams.children < 1) {
             this.validationMessages.push('There must be at least 1 traveller');
         }
+        if (this.searchType === this.searchTypes[1] && this.returnDateTime.isSameOrBefore(this.departs)) {
+            this.validationMessages.push('Return Date/Time must be after outbound date/time');
+        }
         this.isValid.next(this.validationMessages.length === 0);
         this.messages.next(this.validationMessages);
     }
@@ -1585,10 +1735,26 @@ class CabHireEnterpriseSearch extends BaseEnterpriseSearch {
     }
     startSearch() {
         this.results.next([]);
+        this.multiResults.next([]);
         if (this.isValid.value) {
-            const query = this.getSearchQuery();
-            this.searchService.saveRecentSearch(this.getRecentSearchQuery(query));
-            return this._startSearch(this.cabfetcher.fetchList(this.helpers.removeNulls(query)));
+            if (this.searchType === this.searchTypes[1]) { // return - kick off two searches
+                const query = this.getSearchQuery();
+                const returnQuery = this.getReturnSearchQuery();
+                console.log('+++ Search Query: ', query, ' +++');
+                console.log('+++ Search Return Query: ', returnQuery, ' +++');
+                this.storageService.setSessionItem(CabHireEnterpriseSearch.SECONDARY_STORAGE_SESSION_PARAMS, {
+                    tempParams: returnQuery
+                });
+                return this._startMultiSearch([
+                    this.cabfetcher.fetchList(this.helpers.removeNulls(query)),
+                    this.cabfetcher.fetchList(this.helpers.removeNulls(returnQuery))
+                ]);
+            }
+            else {
+                const query = this.getSearchQuery();
+                this.searchService.saveRecentSearch(this.getRecentSearchQuery(query));
+                return this._startSearch(this.cabfetcher.fetchList(this.helpers.removeNulls(query)));
+            }
         }
         else {
             return Promise.resolve(false);
@@ -1661,6 +1827,19 @@ class CabHireEnterpriseSearch extends BaseEnterpriseSearch {
         };
         return this.helpers.removeNulls(query);
     }
+    getReturnSearchQuery() {
+        const query = {
+            adults: this.tempParams.adults,
+            children: this.tempParams.children,
+            departs: this._returnDateTime,
+            fromLocation: this.createCabHireLocation(this.tempParams.toAddress),
+            toLocation: this.createCabHireLocation(this.tempParams.fromAddress),
+            infants: 0,
+            vehicleType: this.vehicleType,
+            vias: this._vias,
+        };
+        return this.helpers.removeNulls(query);
+    }
     updateOutboundAddress(location, placeDescription) {
         this.tempParams.fromAddress = this.getAddressFormat(location, placeDescription);
     }
@@ -1686,15 +1865,29 @@ class CabHireEnterpriseSearch extends BaseEnterpriseSearch {
         this._fromLocation = this.createCabHireLocation(this.tempParams.fromAddress);
         this._isValid();
     }
-    sortBy(asc) {
-        let results = this.helpers.clone(this.fullResults);
-        if (asc) {
-            results = results.sort((a, b) => b.price - a.price);
+    sortBy(asc, returnIndex) {
+        if (returnIndex >= 0) {
+            console.log('here');
+            let results = this.helpers.clone(this.fullMultiResults[returnIndex]);
+            if (asc) {
+                results = results.sort((a, b) => b.price - a.price);
+            }
+            else {
+                results = results.sort((a, b) => a.price - b.price);
+            }
+            this.fullMultiResults[returnIndex] = results;
+            this.multiResults.next(this.fullMultiResults);
         }
         else {
-            results = results.sort((a, b) => a.price - b.price);
+            let results = this.helpers.clone(this.fullResults);
+            if (asc) {
+                results = results.sort((a, b) => b.price - a.price);
+            }
+            else {
+                results = results.sort((a, b) => a.price - b.price);
+            }
+            this.results.next(results);
         }
-        this.results.next(results);
     }
     // ! stuff to go in a postcode servie
     getAddressFormat(location, placeDescription) {
@@ -1883,7 +2076,9 @@ class CabHireEnterpriseSearch extends BaseEnterpriseSearch {
     }
 }
 CabHireEnterpriseSearch.STORAGE_SESSION_PARAMS = 'search_cab';
-CabHireEnterpriseSearch.STORAGE_SESSION_RESULTS = 'results_cab';
+CabHireEnterpriseSearch.SECONDARY_STORAGE_SESSION_PARAMS = 'secondary_search_cab';
+CabHireEnterpriseSearch.STORAGE_SESSION_RESULTS = 'results_cab';
+CabHireEnterpriseSearch.MULTI_STORAGE_SESSION_RESULTS = 'multi_results_cab';
 
 var SortTypesCar;
 (function (SortTypesCar) {
@@ -2096,6 +2291,7 @@ class CarhireEnterpriseSearch extends BaseEnterpriseSearch {
         this._dropoff_date = null;
         this._dropoff_time = null;
         this.resultsSessionName = CarhireEnterpriseSearch.STORAGE_SESSION_RESULTS;
+        this.multiResultsSessionName = CarhireEnterpriseSearch.STORAGE_SESSION_RESULTS;
         const data = storageService.getSessionItem(CarhireEnterpriseSearch.STORAGE_SESSION_PARAMS) || {
             tempParams: {}
         };
@@ -3109,6 +3305,49 @@ class BaseEventMessenager {
     }
 }
 
+const DEFAULT_FLIGHT_FILTERS = Object.freeze({
+    stops: {},
+    mustInclude: {},
+    classes: {},
+    airlines: {},
+    travelPolicy: {},
+    depatureAirport: {},
+    depatureReturnAirport: {},
+    arrivalAirport: {},
+    arrivalReturnAirport: {},
+    baggage: {},
+    fareTypes: {},
+    price: {
+        min: Number.MAX_SAFE_INTEGER,
+        max: Number.MIN_SAFE_INTEGER
+    },
+    duration: {
+        min: Number.MAX_SAFE_INTEGER,
+        max: Number.MIN_SAFE_INTEGER
+    },
+    returnDuration: {
+        min: Number.MAX_SAFE_INTEGER,
+        max: Number.MIN_SAFE_INTEGER
+    },
+    departureTime: {
+        min: 0,
+        max: 24
+    },
+    arrivalTime: {
+        min: 0,
+        max: 24
+    },
+    returnDepartureTime: {
+        min: 0,
+        max: 24
+    },
+    returnArrivalTime: {
+        min: 0,
+        max: 24
+    },
+    flightNumber: ''
+});
+
 var FlightSearchType;
 (function (FlightSearchType) {
     FlightSearchType["return"] = "return";
@@ -3122,23 +3361,28 @@ var TimeWindow;
     TimeWindow["Depart"] = "Depart By";
     TimeWindow["Arrive"] = "Arrive By";
 })(TimeWindow || (TimeWindow = {}));
-var SortTypes;
-(function (SortTypes) {
-    SortTypes["CheapestFirst"] = "C";
-    SortTypes["MostExpensiveFirst"] = "M";
-    SortTypes["FastestFirst"] = "F";
-    SortTypes["PreferredFirst"] = "P";
-    SortTypes["LowestEmissions"] = "L";
-})(SortTypes || (SortTypes = {}));
+var FlightSortTypes;
+(function (FlightSortTypes) {
+    FlightSortTypes["Cheapest"] = "Cheapest";
+    FlightSortTypes["MostExpensive"] = "Most Expensive";
+    FlightSortTypes["Fastest"] = "Fastest";
+    FlightSortTypes["Preferred"] = "Preferred";
+    FlightSortTypes["LowestEmissions"] = "Lowest Emissions";
+    FlightSortTypes["DepartureTime"] = "Departure Time";
+    FlightSortTypes["ArrivalTime"] = "Arrival Time";
+    FlightSortTypes["Quickest"] = "Quickest";
+    FlightSortTypes["MostDirect"] = "Most Direct";
+})(FlightSortTypes || (FlightSortTypes = {}));
 class FlightEnterpriseSearch extends BaseEnterpriseSearch {
     constructor(flightfetcher, helpers, userService, basketService, storageService, searchService) {
         super(storageService, (results) => {
             this.flightsToGroup = {};
             this.grouped = results.grouped || [];
             this.resultQuery = this.getSearchQuery();
+            this.filters.next(this.helpers.createFlightFilters(results.journeys, DEFAULT_FLIGHT_FILTERS));
             delete this.resultQuery.withGrouped;
             if (results && this.searchService.isFlightsGrouped()) {
-                this.groupedObject = (results.multi || [])
+                this.groupedObject = []
                     .reduce((previousItems, nextItem) => {
                     return previousItems.concat(nextItem.results);
                 }, results.journeys)
@@ -3148,11 +3392,12 @@ class FlightEnterpriseSearch extends BaseEnterpriseSearch {
                 const returnData = (results.grouped || []).reduce((acc, item, groupNumber) => {
                     const isOutBound = item.boundIndicator === FlightDirectionEnum.Outbound;
                     const returnObject = {
+                        type: 'FlightGroupedQuoteResult',
                         direction: item.boundIndicator,
                         classes: {
                             [FlightCabinClass.EconomyNoBags]: null,
                             [FlightCabinClass.EconomyRestricted]: null,
-                            [FlightCabinClass.Economy]: null,
+                            [FlightCabinClass.EconomyFlexi]: null,
                             [FlightCabinClass.Business]: null,
                             [FlightCabinClass.First]: null,
                             [FlightCabinClass.PremiumEconomy]: null
@@ -3175,7 +3420,11 @@ class FlightEnterpriseSearch extends BaseEnterpriseSearch {
                         operator: '',
                         operatorFull: '',
                         inboundFlightNumber: '',
-                        isReturn: false
+                        isReturn: false,
+                        minPrice: Number.MAX_SAFE_INTEGER,
+                        maxPrice: Number.MAX_SAFE_INTEGER,
+                        co2PerItem: 0,
+                        co2PerPassenger: 0
                     };
                     const brands = item.flights;
                     Object.keys(brands)
@@ -3190,62 +3439,78 @@ class FlightEnterpriseSearch extends BaseEnterpriseSearch {
                             (this.flightsToGroup[flightNum] =
                                 this.flightsToGroup[flightNum] || []).push(groupNumber);
                             const flight = this.groupedObject[flightNum];
-                            if (isOutBound) {
-                                this.createGroupedItem(returnObject, flight.source, flight.outboundFlights, flight.outboundTotalDuration, flight.inboundFlights, flight.inboundTotalDuration);
-                            }
-                            else {
-                                this.createGroupedItem(returnObject, flight.source, flight.inboundFlights, flight.inboundTotalDuration, flight.outboundFlights, flight.outboundTotalDuration);
-                            }
                             if (flight) {
+                                if (isOutBound) {
+                                    this.createGroupedItem(returnObject, flight.source, flight.outboundFlights, flight.outboundTotalDuration, flight.inboundFlights, flight.inboundTotalDuration, flight.co2PerItem, flight.co2PerPassenger);
+                                }
+                                else {
+                                    this.createGroupedItem(returnObject, flight.source, flight.inboundFlights, flight.inboundTotalDuration, flight.outboundFlights, flight.outboundTotalDuration, flight.co2PerItem, flight.co2PerPassenger);
+                                }
                                 acc1.push(flight);
                             }
+                            else {
+                                // console.error(
+                                //   'Unable to find flight with uid ' + flightNum
+                                // );
+                            }
                             return acc1;
                         }, []);
-                        let correctBrand;
-                        switch (brand) {
-                            case FlightCabinClass.LiteEconomy:
-                            case FlightCabinClass.Economy:
-                                correctBrand = FlightCabinClass.Economy;
-                                break;
-                            case FlightCabinClass.EconomyNoBags:
-                                correctBrand = FlightCabinClass.EconomyNoBags;
-                                break;
-                            case FlightCabinClass.EconomyRestricted:
-                                correctBrand = FlightCabinClass.EconomyRestricted;
-                                break;
-                            case FlightCabinClass.PremiumBusiness:
-                            case FlightCabinClass.Business:
-                                correctBrand = FlightCabinClass.Business;
-                                break;
-                            case FlightCabinClass.PremiumFirst:
-                            case FlightCabinClass.First:
-                                correctBrand = FlightCabinClass.First;
-                                break;
-                            case FlightCabinClass.PremiumEconomy:
-                                correctBrand = FlightCabinClass.PremiumEconomy;
-                                break;
-                            default:
-                                console.log('something went wrong');
-                                break;
-                        }
-                        const minprice = this.getMinFlightPriceForBrand(matchingBrandFlights);
-                        const maxprice = this.getMaxFlightPriceForBrand(matchingBrandFlights);
-                        if ((_b = (_a = returnObject.classes[correctBrand]) === null || _a === void 0 ? void 0 : _a.flights) === null || _b === void 0 ? void 0 : _b.length) {
-                            returnObject.classes[correctBrand].flights.concat(matchingBrandFlights);
-                            returnObject.classes[correctBrand].minprice = Math.min(returnObject.classes[correctBrand].minprice, minprice);
-                            returnObject.classes[correctBrand].maxprice = Math.max(returnObject.classes[correctBrand].maxprice, maxprice);
-                        }
-                        else {
-                            returnObject.classes[correctBrand] = {
-                                flights: matchingBrandFlights,
-                                minprice,
-                                maxprice,
-                                currency: matchingBrandFlights[0].total.currency
-                            };
+                        if (matchingBrandFlights.length > 0) {
+                            let correctBrand;
+                            switch (brand) {
+                                case FlightCabinClass.EconomyNoBags:
+                                    correctBrand = FlightCabinClass.EconomyNoBags;
+                                    break;
+                                case FlightCabinClass.EconomyRestricted:
+                                    correctBrand = FlightCabinClass.EconomyRestricted;
+                                    break;
+                                case FlightCabinClass.EconomyFlexi:
+                                    correctBrand = FlightCabinClass.EconomyFlexi;
+                                    break;
+                                case FlightCabinClass.Business:
+                                    correctBrand = FlightCabinClass.Business;
+                                    break;
+                                case FlightCabinClass.First:
+                                    correctBrand = FlightCabinClass.First;
+                                    break;
+                                case FlightCabinClass.PremiumEconomy:
+                                    correctBrand = FlightCabinClass.PremiumEconomy;
+                                    break;
+                                default:
+                                    console.log('something went wrong');
+                                    break;
+                            }
+                            const minprice = this.getMinFlightPriceForBrand(matchingBrandFlights);
+                            const maxprice = this.getMaxFlightPriceForBrand(matchingBrandFlights);
+                            returnObject.minPrice =
+                                returnObject.minPrice < minprice
+                                    ? returnObject.minPrice
+                                    : minprice;
+                            returnObject.maxPrice =
+                                returnObject.maxPrice < maxprice
+                                    ? returnObject.maxPrice
+                                    : maxprice;
+                            if ((_b = (_a = returnObject.classes[correctBrand]) === null || _a === void 0 ? void 0 : _a.flights) === null || _b === void 0 ? void 0 : _b.length) {
+                                returnObject.classes[correctBrand].flights.concat(matchingBrandFlights);
+                                returnObject.classes[correctBrand].minprice = Math.min(returnObject.classes[correctBrand].minprice, minprice);
+                                returnObject.classes[correctBrand].maxprice = Math.max(returnObject.classes[correctBrand].maxprice, maxprice);
+                            }
+                            else {
+                                returnObject.classes[correctBrand] = {
+                                    flights: matchingBrandFlights,
+                                    minprice,
+                                    maxprice,
+                                    currency: matchingBrandFlights[0].total.currency
+                                };
+                            }
                         }
                     });
-                    if (returnObject) {
-                        acc.push(returnObject);
+                    if (returnObject &&
+                        !!Object.values(returnObject.classes).find((clas) => {
+                            var _a;
+                            return ((_a = clas === null || clas === void 0 ? void 0 : clas.flights) === null || _a === void 0 ? void 0 : _a.length) > 0;
+                        })) {
+                        acc[groupNumber] = returnObject;
                     }
                     return acc;
                 }, []);
@@ -3267,12 +3532,139 @@ class FlightEnterpriseSearch extends BaseEnterpriseSearch {
         this._negotiated = false;
         this._nearby_airports = false;
         this._sortArray = [
-            { display: 'Cheapest First', value: SortTypes.CheapestFirst },
-            { display: 'Most Expensive First', value: SortTypes.MostExpensiveFirst },
-            { display: 'Fastest First', value: SortTypes.FastestFirst },
-            { display: 'Preferred Fares First', value: SortTypes.PreferredFirst },
-            { display: 'Lowest Co2 Emissions First', value: SortTypes.LowestEmissions }
+            { display: 'Cheapest First', value: FlightSortTypes.Cheapest },
+            {
+                display: 'Most Expensive First',
+                value: FlightSortTypes.MostExpensive
+            },
+            { display: 'Fastest First', value: FlightSortTypes.Fastest },
+            { display: 'Preferred Fares First', value: FlightSortTypes.Preferred },
+            {
+                display: 'Lowest Co2 Emissions First',
+                value: FlightSortTypes.LowestEmissions
+            }
         ];
+        this._sortItinaryRoutines = {
+            [FlightSortTypes.Cheapest]: (a, b) => {
+                return a.total.price - b.total.price;
+            },
+            [FlightSortTypes.MostExpensive]: (a, b) => {
+                return b.total.price - a.total.price;
+            },
+            [FlightSortTypes.Fastest]: (a, b) => {
+                return (a.outboundTotalDuration +
+                    (a.inboundTotalDuration ? a.inboundTotalDuration : 0) -
+                    (b.outboundTotalDuration +
+                        (b.inboundTotalDuration ? b.inboundTotalDuration : 0)));
+            },
+            [FlightSortTypes.Preferred]: (a, b) => {
+                return (a.tmcPreferred ? 1 : 0) - (b.tmcPreferred ? 1 : 0);
+            },
+            [FlightSortTypes.LowestEmissions]: (a, b) => {
+                return a.co2PerItem - b.co2PerItem;
+            },
+            [FlightSortTypes.DepartureTime]: (a, b) => {
+                const aTime = moment(a.outboundFlights[0].dateTimeDeparting);
+                const bTime = moment(b.outboundFlights[0].dateTimeDeparting);
+                if (aTime.isBefore(bTime)) {
+                    return -1;
+                }
+                return aTime.isSame(bTime) ? 0 : 1;
+            },
+            [FlightSortTypes.ArrivalTime]: (a, b) => {
+                const aTime = moment(a.outboundFlights[0].dateTimeArriving);
+                const bTime = moment(b.outboundFlights[0].dateTimeArriving);
+                if (aTime.isBefore(bTime)) {
+                    return -1;
+                }
+                return aTime.isSame(bTime) ? 0 : 1;
+            },
+            [FlightSortTypes.Quickest]: (a, b) => {
+                return (a.outboundTotalDuration +
+                    (a.inboundTotalDuration ? a.inboundTotalDuration : 0) -
+                    (b.outboundTotalDuration +
+                        (b.inboundTotalDuration ? b.inboundTotalDuration : 0)));
+            },
+            [FlightSortTypes.MostDirect]: (a, b) => {
+                return (a.outboundFlights.length +
+                    (a.outboundFlights ? a.outboundFlights.length : 0) -
+                    (b.outboundFlights.length +
+                        (b.outboundFlights ? b.outboundFlights.length : 0)));
+            }
+        };
+        this._sortGroupedRoutines = {
+            [FlightSortTypes.Cheapest]: (a, b) => {
+                if (a.direction !== b.direction) {
+                    return a.direction - b.direction;
+                }
+                return a.minPrice - b.minPrice;
+            },
+            [FlightSortTypes.MostExpensive]: (a, b) => {
+                if (a.direction !== b.direction) {
+                    return a.direction - b.direction;
+                }
+                return b.minPrice - a.maxPrice;
+            },
+            [FlightSortTypes.Fastest]: (a, b) => {
+                if (a.direction !== b.direction) {
+                    return a.direction - b.direction;
+                }
+                return a.direction === FlightDirectionEnum.Outbound
+                    ? a.outboundTotalDuration - b.outboundTotalDuration
+                    : a.inboundTotalDuration - b.inboundTotalDuration;
+            },
+            [FlightSortTypes.Preferred]: (a, b) => {
+                if (a.direction !== b.direction) {
+                    return a.direction - b.direction;
+                }
+                return (a.preferred ? 1 : 0) - (b.preferred ? 1 : 0);
+            },
+            [FlightSortTypes.LowestEmissions]: (a, b) => {
+                if (a.direction !== b.direction) {
+                    return a.direction - b.direction;
+                }
+                return a.co2PerItem - b.co2PerItem;
+            },
+            [FlightSortTypes.DepartureTime]: (a, b) => {
+                if (a.direction !== b.direction) {
+                    return a.direction - b.direction;
+                }
+                const aTime = moment(a.departDateTime);
+                const bTime = moment(b.departDateTime);
+                if (aTime.isBefore(bTime)) {
+                    return -1;
+                }
+                return aTime.isSame(bTime) ? 0 : 1;
+            },
+            [FlightSortTypes.ArrivalTime]: (a, b) => {
+                if (a.direction !== b.direction) {
+                    return a.direction - b.direction;
+                }
+                const aTime = moment(a.arrivalDateTime);
+                const bTime = moment(b.arrivalDateTime);
+                if (aTime.isBefore(bTime)) {
+                    return -1;
+                }
+                return aTime.isSame(bTime) ? 0 : 1;
+            },
+            [FlightSortTypes.Quickest]: (a, b) => {
+                if (a.direction !== b.direction) {
+                    return a.direction - b.direction;
+                }
+                return a.direction === FlightDirectionEnum.Outbound
+                    ? a.outboundTotalDuration - b.outboundTotalDuration
+                    : (a.inboundTotalDuration ? a.inboundTotalDuration : 0) -
+                        (b.inboundTotalDuration ? b.inboundTotalDuration : 0);
+            },
+            [FlightSortTypes.MostDirect]: (a, b) => {
+                if (a.direction !== b.direction) {
+                    return a.direction - b.direction;
+                }
+                return a.direction === FlightDirectionEnum.Outbound
+                    ? a.outlegs.length - b.outlegs.length
+                    : (a.inlegs || []).length - (b.inlegs || []).length;
+            }
+        };
         this._fareTypeArray = [
             { value: FareType.Flexible, display: 'Flexible' },
             { value: FareType.Leisure, display: 'Leisure' },
@@ -3296,8 +3688,10 @@ class FlightEnterpriseSearch extends BaseEnterpriseSearch {
         this.grouped = null;
         this.travellers = null;
         this.resultsSessionName = FlightEnterpriseSearch.STORAGE_SESSION_RESULTS;
+        this.multiResultsSessionName = FlightEnterpriseSearch.STORAGE_SESSION_RESULTS;
         this._showHotelForm = false;
         this._hotelSearchRequested = false;
+        this.filters = new BehaviorSubject(DEFAULT_FLIGHT_FILTERS);
         this._multiDestination = [];
         const data = storageService.getSessionItem(FlightEnterpriseSearch.STORAGE_SESSION_PARAMS) || {
             tempParams: {},
@@ -3329,22 +3723,28 @@ class FlightEnterpriseSearch extends BaseEnterpriseSearch {
             this.updateAvaliableClasses();
         });
         this.updateTravellers();
-        if (this.isValid.value) {
-            const results = storageService.getSessionItem(this.resultsSessionName) || {
-                results: [],
-                groupData: {},
-                grouped: [],
-                query: {}
-            };
-            this.fullResults = this.helpers.clone(results.results);
-            this.flightsToGroup = results.groupData || {};
-            this.resultQuery = results.query;
-            // if (results == null && this.isValid) {
-            //   searchService.startSearches();
-            // }
-            // this._cheapestResultPrice = this.updateLowestPrice(results);
-            this.results.next(results.results || []);
-        }
+        // Removing results from storage, as the results are nearly always too big to be stored.
+        // if (this.isValid.value) {
+        //   const results: FlightSessionType = storageService.getSessionItem(
+        //     this.resultsSessionName
+        //   ) || {
+        //     results: [],
+        //     groupData: {},
+        //     grouped: [],
+        //     query: {} as SearchFlightsV2QueryVariables
+        //   };
+        //   this.fullResults = this.helpers.clone(results.results);
+        //   this.flightsToGroup = results.groupData || {};
+        //   this.resultQuery = results.query;
+        //   // if (results == null && this.isValid) {
+        //   //   searchService.startSearches();
+        //   // }
+        //   const isFlightsGrouped = this.searchService.isFlightsGrouped();
+        //   if (!isFlightsGrouped) {
+        //     this._cheapestResultPrice = this.updateLowestPrice(results.results);
+        //   }
+        //   this.results.next(results.results || ([] as FlightQuoteResultArray));
+        // }
         this.negotiated =
             this.tempParams.fareType === FareType.Negotiated ? true : false;
     }
@@ -3615,7 +4015,7 @@ class FlightEnterpriseSearch extends BaseEnterpriseSearch {
     set includeNearbyAirports(value) {
         this.tempParams.includeNearbyAirports = value;
     }
-    createGroupedItem(returnObject, source, outboundFlights, outboundTotalDuration, inboundFlights, inboundTotalDuration) {
+    createGroupedItem(returnObject, source, outboundFlights, outboundTotalDuration, inboundFlights, inboundTotalDuration, co2PerItem, co2PerPassenger) {
         if ((outboundFlights === null || outboundFlights === void 0 ? void 0 : outboundFlights.length) && !returnObject.departDateTime) {
             const first = outboundFlights[0];
             const last = outboundFlights[outboundFlights.length - 1];
@@ -3634,6 +4034,8 @@ class FlightEnterpriseSearch extends BaseEnterpriseSearch {
             returnObject.outboundFlightNumber =
                 this.helpers.joinFromAttribute('-', 'marketingFlightNumber', outboundFlights);
             returnObject.isReturn = false;
+            returnObject.co2PerItem = co2PerItem;
+            returnObject.co2PerPassenger = co2PerPassenger;
         }
         if ((inboundFlights === null || inboundFlights === void 0 ? void 0 : inboundFlights.length) && !returnObject.inboundTotalDuration) {
             returnObject.inboundTotalDuration = inboundTotalDuration;
@@ -3830,7 +4232,7 @@ class FlightEnterpriseSearch extends BaseEnterpriseSearch {
                     countryCode: (_m = (_l = arriveLocation.iataMatch) === null || _l === void 0 ? void 0 : _l.locationDetails) === null || _m === void 0 ? void 0 : _m.countryCode
                 };
                 if (recentSearch.searchArgs.preferredCarriers) {
-                    let preferredCarriers = [];
+                    const preferredCarriers = [];
                     recentSearch.searchArgs.preferredCarriers.map((preferredCarry) => {
                         this.searchService
                             .getAirlinesList(preferredCarry)
@@ -3867,7 +4269,7 @@ class FlightEnterpriseSearch extends BaseEnterpriseSearch {
     convertRecentSearchDateTime(date, timeWindow) {
         if (timeWindow) {
             const flightTime = timeWindow.split('-');
-            let timeAndDate = moment(date).add(moment.duration(this.helpers.hhmmToTime(flightTime[0])));
+            const timeAndDate = moment(date).add(moment.duration(this.helpers.hhmmToTime(flightTime[0])));
             // add 2 hour
             return timeAndDate.clone().add(2, 'hour');
         }
@@ -3938,43 +4340,6 @@ class FlightEnterpriseSearch extends BaseEnterpriseSearch {
             { name: 'First', type: FlightCabinClass.First }
         ]);
     }
-    /**
-     * @description - sort the flight results
-     * @todo - Fill out Preferred and Co2 sorting when we have that data
-     */
-    sortResults(sortMethodValue, givenResults) {
-        let results = this.helpers.clone(givenResults
-            ? givenResults
-            : this.fullResults);
-        switch (sortMethodValue) {
-            case SortTypes.CheapestFirst:
-                results = results.sort((a, b) => {
-                    return a.total.price - b.total.price;
-                });
-                break;
-            case SortTypes.MostExpensiveFirst:
-                results = results.sort((a, b) => {
-                    return b.total.price - a.total.price;
-                });
-                break;
-            case SortTypes.FastestFirst:
-                results = results.sort((a, b) => {
-                    return (a.outboundTotalDuration +
-                        (a.inboundTotalDuration ? a.inboundTotalDuration : 0) -
-                        (b.outboundTotalDuration +
-                            (b.inboundTotalDuration ? b.inboundTotalDuration : 0)));
-                });
-                break;
-            case SortTypes.LowestEmissions:
-                results = results.sort((a, b) => {
-                    return a.co2PerItem - b.co2PerItem;
-                });
-                break;
-            default:
-                console.error(`+++ Unknown sorting method: ${sortMethodValue} +++`);
-        }
-        return results;
-    }
     updateFromPreviousSearches(previousItems) {
         // Flights can not be search after other products so no defaults can be set.
     }
@@ -4000,613 +4365,210 @@ class FlightEnterpriseSearch extends BaseEnterpriseSearch {
         }
         return total;
     }
+    isGroupedFlights(toTest) {
+        var _a;
+        return ((_a = toTest[0]) === null || _a === void 0 ? void 0 : _a.type) === 'FlightGroupedQuoteResult';
+    }
     /**
      * @description - filter the results, then sort the remainder
      * @todo - Add filters for travel policy, fare types and ancilliaries
      */
-    filterResults(filters, sortValue, givenResults) {
-        console.log('+++ Applying Filters to flights: ', filters, ' +++');
-        let results = this.helpers.clone(givenResults);
-        if (this.isReturn) {
-            results = results.filter((result) => result.inboundFlights && result.inboundFlights.length);
-        }
-        // Add In Filters Here
-        // filter stops
-        results = this.filterResultsByStops(filters.stops, results);
-        results = this.filterResultsByAirline(filters.airlines, results);
-        results = this.filterResultsByClass(filters.classes, results);
-        results = this.filterByDepartureAirport(filters.depatureAirport, results);
-        results = this.filterByDepartureReturnAirport(filters.depatureReturnAirport, results);
-        results = this.filterByArrivalAirport(filters.arrivalAirport, results);
-        results = this.filterByArrivalReturnAirport(filters.arrivalReturnAirport, results);
-        results = this.filterByPrice(filters.minPrice, filters.maxPrice, results);
-        results = this.filterByFlightNumber(filters.flightNumber, results);
-        results = this.filterByBaggage(filters.baggage, results);
-        results = this.filterByDepartureTime(filters.minDepartureTime, filters.maxDepartureTime, results);
-        results = this.filterByReturnDepartureTime(filters.minReturnDepartureTime, filters.maxReturnDepartureTime, results);
-        results = this.filterByArrivalTime(filters.minArrivalTime, filters.maxArrivalTime, results);
-        results = this.filterByReturnArrivalTime(filters.minReturnArrivalTime, filters.maxReturnArrivalTime, results);
-        results = this.filterByDuration(filters.minDuration, filters.maxDuration, results);
-        results = this.filterByDuration(filters.minReturnDuration, filters.maxReturnDuration, results, true); // return duration
-        results = this.sortResults(sortValue, results);
-        return results;
-    }
-    /**
-     * @description - give the correct format for transfering minuetes on the sliders
-     * @param min - the min in 100th's to transform onto 60th's
-     */
-    transformMin(min) {
-        let num = (Number(min) * 60) / 100;
-        // console.log('+++ Num Copy: ', _.clone(num), ' +++');
-        if (num % 1 < 0.5) {
-            num = Math.floor(num);
-        }
-        else {
-            num = Math.ceil(num);
-        }
-        return num.toString().padStart(2, '0');
-    }
-    filterByDuration(minDuration, maxDuration, results, isReturn = false) {
-        results = results.filter((result) => {
-            var _a;
-            let dur = 0;
-            if (!isReturn) {
-                result.outboundFlights.forEach((out) => {
-                    dur += out.totalDuration;
-                });
+    applyFilters(filters, sortValue) {
+        // console.log('+++ Applying Filters to flights: ', filters, ' +++');
+        if (this.fullResults.length === 0) {
+            this.results.next([]);
+        }
+        const tester = (filtersTotest, testFunction) => {
+            const selected = Object.values(filtersTotest).filter((filter) => filter.selected);
+            if (selected.length) {
+                return (flightItinerary) => {
+                    return !!selected.find((filter) => {
+                        return testFunction(flightItinerary, filter.value);
+                    });
+                };
             }
-            if (((_a = result.inboundFlights) === null || _a === void 0 ? void 0 : _a.length) && isReturn) {
-                result.inboundFlights.forEach((inb) => {
-                    dur += inb.totalDuration;
-                });
+            else {
+                return (flightItinerary) => {
+                    return true;
+                };
             }
-            return dur >= minDuration && dur <= maxDuration;
-        });
-        return results;
-    }
-    filterByDepartureTime(minDep, maxDep, results) {
-        results = results.filter((result) => {
-            const departureTime = Number(moment(result.outboundFlights[0].dateTimeDeparting).format('HHmm'));
-            const newNumString1 = Number(Math.floor(Number(minDep / 100)).toString() +
-                this.transformMin(Math.ceil(Number(minDep % 100))));
-            const newNumString2 = Number(Math.floor(Number(maxDep / 100)).toString() +
-                this.transformMin(Math.ceil(Number(maxDep % 100))));
-            return departureTime >= newNumString1 && departureTime <= newNumString2;
-        });
-        return results;
-    }
-    filterByReturnDepartureTime(minDep, maxDep, results) {
-        if (!minDep && !maxDep) {
-            return results;
-        }
-        const newNumString1 = Number(Math.floor(Number(minDep / 100)).toString() +
-            this.transformMin(Math.ceil(Number(minDep % 100))));
-        const newNumString2 = Number(Math.floor(Number(maxDep / 100)).toString() +
-            this.transformMin(Math.ceil(Number(maxDep % 100))));
-        results = results.filter((result) => {
-            if (!result.inboundFlights || !result.inboundFlights[0]) {
-                return true;
-            }
-            const departureTime = Number(moment(result.inboundFlights[0].dateTimeDeparting).format('HHmm'));
-            return departureTime >= newNumString1 && departureTime <= newNumString2;
-        });
-        return results;
-    }
-    filterByReturnArrivalTime(minArr, maxArr, results) {
-        if (!minArr && !maxArr) {
-            return results;
-        }
-        const newNumString1 = Number(Math.floor(Number(minArr / 100)).toString() +
-            this.transformMin(Math.ceil(Number(minArr % 100))));
-        const newNumString2 = Number(Math.floor(Number(maxArr / 100)).toString() +
-            this.transformMin(Math.ceil(Number(maxArr % 100))));
-        results = results.filter((result) => {
-            if (!result.inboundFlights || !result.inboundFlights[0]) {
-                return true;
-            }
-            const arrivalTime = Number(moment(result.inboundFlights[result.inboundFlights.length - 1]
-                .dateTimeArriving).format('HHmm'));
-            const retVal = arrivalTime >= newNumString1 && arrivalTime <= newNumString2;
-            // for debugging
-            // if (!retVal) {
-            //   console.warn(`+++ Filtering Out: ${arrivalTime} +++`);
-            // }
-            return retVal;
-        });
-        return results;
-    }
-    filterByArrivalTime(minArr, maxArr, results) {
-        const newNumString1 = Number(Math.floor(Number(minArr / 100)).toString() +
-            this.transformMin(Math.ceil(Number(minArr % 100))));
-        const newNumString2 = Number(Math.floor(Number(maxArr / 100)).toString() +
-            this.transformMin(Math.ceil(Number(maxArr % 100))));
-        results = results.filter((result) => {
-            const arrivalTime = Number(moment(result.outboundFlights[result.outboundFlights.length - 1]
-                .dateTimeArriving).format('HHmm'));
-            return arrivalTime >= newNumString1 && arrivalTime <= newNumString2;
-        });
-        return results;
-    }
-    filterByBaggage(baggageFilters, results) {
-        const selected = baggageFilters.filter((x) => x.selected);
-        if ((selected === null || selected === void 0 ? void 0 : selected.length) >= 1 && selected.length !== baggageFilters.length) {
-            results = results.filter((result) => {
-                try {
-                    const totalBags = this.getTotalBaggage(result);
-                    return selected.find((x) => x.value === totalBags);
-                }
-                catch (error) {
-                    console.error('+++ Error determening baggage: ${error} +++');
-                    return false;
-                }
-            });
-        }
-        return results;
-    }
-    filterByPrice(minPrice, maxPrice, results) {
-        results = results.filter((result) => {
-            // console.log(`+++ Price: ${result.total.price} is between: ${minPrice} and ${maxPrice}: ${result.total.price >= minPrice && result.total.price <= maxPrice} +++`)
-            return result.total.price >= minPrice && result.total.price <= maxPrice;
-        });
-        return results;
-    }
-    /**
-     * @description - filter the results by the number of stops
-     * @param stopFilters - the selected stops
-     * @param fullResults - all of our results so far
-     */
-    filterResultsByStops(stopFilters, fullResults) {
-        const selected = stopFilters.filter((x) => x.selected);
-        if ((selected === null || selected === void 0 ? void 0 : selected.length) >= 1 && selected.length !== stopFilters.length) {
-            fullResults = fullResults.filter((result) => {
-                const totalStops = result.outboundFlights.length - 1;
-                const haveStop = selected.find((selected1) => selected1.value === totalStops);
-                return haveStop;
-            });
-        }
-        return fullResults;
-    }
-    filterResultsByAirline(airlineFilters, results) {
-        const selected = airlineFilters.filter((x) => x.selected);
-        if ((selected === null || selected === void 0 ? void 0 : selected.length) >= 1 && selected.length !== airlineFilters.length) {
-            results = results.filter((result) => {
-                return selected.find((x) => x.value === result.outboundFlights[0].operatingCarrier);
-            });
-        }
-        return results;
-    }
-    filterResultsByClass(classFilters, results) {
-        const selected = classFilters.filter((x) => x.selected);
-        if ((selected === null || selected === void 0 ? void 0 : selected.length) >= 1 && selected.length !== classFilters.length) {
-            results = results.filter((result) => {
-                return selected.find((x) => x.value === result.outboundFlights[0].cabinClass);
-            });
-        }
-        return results;
-    }
-    filterByDepartureAirport(departureAirports, results) {
-        const selected = departureAirports.filter((x) => x.selected);
-        if ((selected === null || selected === void 0 ? void 0 : selected.length) >= 1 && selected.length !== departureAirports.length) {
-            results = results.filter((result) => {
-                return selected.find((x) => x.value === result.outboundFlights[0].originAirport);
-            });
-        }
-        return results;
-    }
-    filterByArrivalAirport(arrivalAirports, results) {
-        const selected = arrivalAirports.filter((x) => x.selected);
-        if ((selected === null || selected === void 0 ? void 0 : selected.length) >= 1 && selected.length !== arrivalAirports.length) {
-            results = results.filter((result) => {
-                const destinationAirport = result.outboundFlights[result.outboundFlights.length - 1]
-                    .destinationAirport;
-                return selected.find((x) => x.value === destinationAirport);
-            });
-        }
-        return results;
-    }
-    filterByDepartureReturnAirport(departureAirports, results) {
-        const selected = departureAirports.filter((x) => x.selected);
-        if ((selected === null || selected === void 0 ? void 0 : selected.length) >= 1 && selected.length !== departureAirports.length) {
-            results = results.filter((result) => {
-                var _a;
-                if (!((_a = result.inboundFlights) === null || _a === void 0 ? void 0 : _a.length)) {
-                    return true;
-                }
-                return selected.find((x) => x.value === result.inboundFlights[0].originAirport);
-            });
-        }
-        return results;
-    }
-    filterByArrivalReturnAirport(arrivalAirports, results) {
-        const selected = arrivalAirports.filter((x) => x.selected);
-        if ((selected === null || selected === void 0 ? void 0 : selected.length) >= 1 && selected.length !== arrivalAirports.length) {
-            results = results.filter((result) => {
-                var _a;
-                if (!((_a = result.inboundFlights) === null || _a === void 0 ? void 0 : _a.length)) {
-                    return true;
-                }
-                const destinationAirport = result.inboundFlights[result.inboundFlights.length - 1]
-                    .destinationAirport;
-                return selected.find((x) => x.value === destinationAirport);
-            });
-        }
-        return results;
-    }
-    filterByFlightNumber(flightNumber, results) {
-        if (flightNumber) {
-            // make sure to check both outbound and inbound
-            results = results.filter((result) => {
-                var _a;
-                const inOutbound = result.outboundFlights.find((out) => {
-                    return out.operatingFlightNumber
-                        .toUpperCase()
-                        .includes(flightNumber.toUpperCase());
-                });
-                let inInbound;
-                if ((_a = result.inboundFlights) === null || _a === void 0 ? void 0 : _a.length) {
-                    inInbound = result.inboundFlights.find((inB) => {
-                        return inB.operatingFlightNumber
-                            .toUpperCase()
-                            .includes(flightNumber.toUpperCase());
-                    });
-                }
-                return inOutbound || inInbound;
-            });
-        }
-        return results;
-    }
-    createFilters(results = []) {
-        const minPrice = this.getMinPrice(results);
-        const maxPrice = this.getMaxPrice(results);
-        const newFilters = {
-            stops: this.getAllStops(results),
-            mustInclude: [],
-            classes: this.getAllClasses(results),
-            airlines: this.getAllAirlines(results),
-            travelPolicy: [],
-            depatureAirport: this.getAllDepartureAirports(results),
-            arrivalAirport: this.getAllArrivalAirports(results),
-            minPrice,
-            maxPrice,
-            depatureReturnAirport: this.getAllDepartureAirports(results, true),
-            arrivalReturnAirport: this.getAllArrivalAirports(results, true),
-            baggage: this.getBaggage(results),
-            fareTypes: [],
-            minDuration: this.getMinDuration(results),
-            maxDuration: this.getMaxDuration(results),
-            minReturnDuration: this.getMinDuration(results, true),
-            maxReturnDuration: this.getMaxDuration(results, true),
-            minDepartureTime: this.getMinDepartureTime(results),
-            maxDepartureTime: this.getMaxDepartureTime(results),
-            minArrivalTime: this.getMinArrivalTime(results),
-            maxArrivalTime: this.getMaxArrivalTime(results),
-            minReturnDepartureTime: this.getMinReturnDepartureTime(results),
-            maxReturnDepartureTime: this.getMaxReturnDepartureTime(results),
-            maxReturnArrivalTime: this.getMaxReturnArrivalTime(results),
-            minReturnArrivalTime: this.getMinReturnArrivalTime(results),
-            flightNumber: ''
         };
-        return newFilters;
-    }
-    getMinDuration(results, isReturn = false) {
-        let min = 0;
-        results.forEach((result) => {
+        const replaceFields = (field, flightItinerary) => {
+            return field
+                .replace('OUTBOUND_DEPARTURE', 'outboundFlights.0')
+                .replace('OUTBOUND_ARRIVAL', 'outboundFlights.' + (flightItinerary.outboundFlights.length - 1))
+                .replace('INBOUND_DEPARTURE', 'inboundFlights.0')
+                .replace('INBOUND_ARRIVAL', 'inboundFlights.' +
+                ((flightItinerary.inboundFlights || []).length - 1));
+        };
+        const isBetween = (minmax, field) => {
+            return (flightItinerary) => {
+                const val = this.helpers.fromObject(flightItinerary, ...replaceFields(field, flightItinerary).split('.'));
+                return val >= minmax.min && val <= minmax.max;
+            };
+        };
+        const isHourBetween = (minmax, field) => {
+            return (flightItinerary) => {
+                const val = moment(this.helpers.fromObject(flightItinerary, ...replaceFields(field, flightItinerary).split('.'))).get('hour');
+                return val >= minmax.min && val <= minmax.max;
+            };
+        };
+        const hasValue = (field) => {
+            return (flightItinerary, toTest) => {
+                const val = this.helpers.fromObject(flightItinerary, ...replaceFields(field, flightItinerary).split('.'));
+                return val === toTest;
+            };
+        };
+        const fieldHasValue = (field) => {
+            return (flight, value) => {
+                return flight[field] === value;
+            };
+        };
+        const outItineraryTesters = [];
+        const inItineraryTesters = [];
+        outItineraryTesters.push(isHourBetween(filters.arrivalTime, 'OUTBOUND_ARRIVAL.dateTimeArriving'));
+        outItineraryTesters.push(isHourBetween(filters.departureTime, 'OUTBOUND_ARRIVAL.dateTimeDeparting'));
+        outItineraryTesters.push(isBetween(filters.duration, 'outboundTotalDuration'));
+        outItineraryTesters.push(isBetween(filters.price, 'total.price'));
+        outItineraryTesters.push(tester(filters.stops, (flightItinerary, value) => {
+            return (flightItinerary.outboundFlights.length === value ||
+                (flightItinerary.inboundFlights || []).length === value);
+        }));
+        outItineraryTesters.push(isHourBetween(filters.arrivalTime, 'OUTBOUND_ARRIVAL.dateTimeArriving'));
+        outItineraryTesters.push(tester(filters.depatureAirport, (flightItinerary, value) => {
             var _a;
-            let dur = 0;
-            if (!isReturn) {
-                result.outboundFlights.forEach((out) => {
-                    dur += out.totalDuration;
-                });
-            }
-            if (((_a = result.inboundFlights) === null || _a === void 0 ? void 0 : _a.length) && isReturn) {
-                result.inboundFlights.forEach((inb) => {
-                    dur += inb.totalDuration;
-                });
-            }
-            if (!min || dur < min) {
-                min = dur;
-            }
-        });
-        return min;
-    }
-    getMaxDuration(results, isReturn = false) {
-        let max = 0;
-        results.forEach((result) => {
+            return ((_a = flightItinerary.outboundFlights[0]) === null || _a === void 0 ? void 0 : _a.originAirport) === value;
+        }));
+        outItineraryTesters.push(tester(filters.arrivalAirport, (flightItinerary, value) => {
             var _a;
-            let dur = 0;
-            if (!isReturn) {
-                result.outboundFlights.forEach((out) => {
-                    dur += out.totalDuration;
-                });
-            }
-            if (((_a = result.inboundFlights) === null || _a === void 0 ? void 0 : _a.length) && isReturn) {
-                result.inboundFlights.forEach((inb) => {
-                    dur += inb.totalDuration;
-                });
-            }
-            if (!max || dur > max) {
-                max = dur;
-            }
-        });
-        return max;
-    }
-    getMinArrivalTime(results) {
-        let min;
-        results.forEach((result) => {
-            let minDepTime = Number(moment(result.outboundFlights[result.outboundFlights.length - 1]
-                .dateTimeArriving).format('HHmm'));
-            minDepTime = Math.floor(minDepTime / 100) * 100;
-            if (!min || minDepTime < min) {
-                min = minDepTime;
-            }
-        });
-        return min;
-    }
-    getMinReturnArrivalTime(results) {
-        let min;
-        results.forEach((result) => {
-            if (result.inboundFlights && result.inboundFlights.length) {
-                let minDepTime = Number(moment(result.inboundFlights[result.inboundFlights.length - 1]
-                    .dateTimeArriving).format('HHmm'));
-                minDepTime = Math.floor(minDepTime / 100) * 100;
-                if (!min || minDepTime < min) {
-                    min = minDepTime;
-                }
-            }
-        });
-        return min;
-    }
-    getMaxReturnArrivalTime(results) {
-        let max;
-        results.forEach((result) => {
-            if (result.inboundFlights && result.inboundFlights.length) {
-                let maxDepTime = Number(moment(result.inboundFlights[result.inboundFlights.length - 1]
-                    .dateTimeArriving).format('HHmm'));
-                maxDepTime = Math.ceil(maxDepTime / 100) * 100;
-                if (!max || maxDepTime > max) {
-                    max = maxDepTime;
+            return (((_a = flightItinerary.outboundFlights[flightItinerary.outboundFlights.length - 1]) === null || _a === void 0 ? void 0 : _a.destinationAirport) === value);
+        }));
+        inItineraryTesters.push(isBetween(filters.duration, 'outboundTotalDuration'));
+        inItineraryTesters.push(isBetween(filters.price, 'total.price'));
+        inItineraryTesters.push(isHourBetween(filters.arrivalTime, 'INBOUND_ARRIVAL.dateTimeArriving'));
+        inItineraryTesters.push(isHourBetween(filters.departureTime, 'INBOUND_ARRIVAL.dateTimeDeparting'));
+        inItineraryTesters.push(isBetween(filters.returnDuration, 'inboundTotalDuration'));
+        inItineraryTesters.push(tester(filters.stops, (flightItinerary, value) => {
+            return (flightItinerary.outboundFlights.length === value ||
+                (flightItinerary.inboundFlights || []).length === value);
+        }));
+        inItineraryTesters.push(isHourBetween(filters.arrivalTime, 'INBOUND_ARRIVAL.dateTimeArriving'));
+        inItineraryTesters.push(tester(filters.depatureReturnAirport, (flightItinerary, value) => {
+            var _a;
+            return ((_a = flightItinerary.inboundFlights[0]) === null || _a === void 0 ? void 0 : _a.originAirport) === value;
+        }));
+        inItineraryTesters.push(tester(filters.arrivalReturnAirport, (flightItinerary, value) => {
+            var _a;
+            return (((_a = flightItinerary.inboundFlights[flightItinerary.inboundFlights.length - 1]) === null || _a === void 0 ? void 0 : _a.destinationAirport) === value);
+        }));
+        const outJourneyTesters = [];
+        outJourneyTesters.push(tester(filters.classes, fieldHasValue('cabinClass')));
+        outJourneyTesters.push(tester(filters.airlines, fieldHasValue('marketingCarrier')));
+        const inJourneyTesters = [];
+        inJourneyTesters.push(tester(filters.classes, fieldHasValue('cabinClass')));
+        inJourneyTesters.push(tester(filters.airlines, fieldHasValue('marketingCarrier')));
+        const outFilterItineraries = (flightItinerary) => {
+            return (outItineraryTesters.reduce((acc, tester1) => {
+                acc = acc && tester1(flightItinerary);
+                return acc;
+            }, true) &&
+                (!flightItinerary.outboundFlights ||
+                    !!(flightItinerary.outboundFlights || []).find((flightJourney) => {
+                        return !!outJourneyTesters.reduce((acc, tester2) => {
+                            return acc && tester2(flightJourney);
+                        }, true);
+                    })));
+        };
+        const inFilterItineraries = (flightItinerary) => {
+            return (inItineraryTesters.reduce((acc, tester1) => {
+                return acc && tester1(flightItinerary);
+            }, true) &&
+                (!flightItinerary.inboundFlights ||
+                    !!(flightItinerary.inboundFlights || []).find((flightJourney) => {
+                        return !!inJourneyTesters.reduce((acc, tester2) => {
+                            return acc && tester2(flightJourney);
+                        }, true);
+                    })));
+        };
+        if (this.isGroupedFlights(this.fullResults)) {
+            this.results.next(this.helpers
+                .clone(this.fullResults)
+                .filter((result) => {
+                return !!result;
+            })
+                .map((result) => {
+                var _a, _b, _c, _d, _e, _f;
+                const filterItineraries = result.direction === FlightDirectionEnum.Outbound
+                    ? outFilterItineraries
+                    : inFilterItineraries;
+                if (result.classes.EconomyNoBags) {
+                    result.classes.EconomyNoBags.flights = (((_a = result.classes.EconomyNoBags) === null || _a === void 0 ? void 0 : _a.flights) || [])
+                        .filter((flightItinerary) => !!flightItinerary)
+                        .filter(filterItineraries);
                 }
-            }
-        });
-        return max;
-    }
-    getMaxArrivalTime(results) {
-        let max;
-        results.forEach((result) => {
-            let maxDepTime = Number(moment(result.outboundFlights[result.outboundFlights.length - 1]
-                .dateTimeArriving).format('HHmm'));
-            maxDepTime = Math.ceil(maxDepTime / 100) * 100;
-            if (!max || maxDepTime > max) {
-                max = maxDepTime;
-            }
-        });
-        return max;
-    }
-    getMinDepartureTime(results) {
-        let min;
-        results.forEach((result) => {
-            let minDepTime = Number(moment(result.outboundFlights[0].dateTimeDeparting).format('HHmm'));
-            minDepTime = Math.floor(minDepTime / 100) * 100;
-            if (!min || minDepTime < min) {
-                min = minDepTime;
-            }
-        });
-        return min;
-    }
-    getMinReturnDepartureTime(results) {
-        let min;
-        results.forEach((result) => {
-            if (result.inboundFlights && result.inboundFlights[0]) {
-                let minDepTime = Number(moment(result.inboundFlights[0].dateTimeDeparting).format('HHmm'));
-                minDepTime = Math.floor(minDepTime / 100) * 100;
-                if (!min || minDepTime < min) {
-                    min = minDepTime;
+                if (result.classes.EconomyRestricted) {
+                    result.classes.EconomyRestricted.flights = (((_b = result.classes.EconomyRestricted) === null || _b === void 0 ? void 0 : _b.flights) || [])
+                        .filter((flightItinerary) => !!flightItinerary)
+                        .filter(filterItineraries);
                 }
-            }
-        });
-        return min;
-    }
-    getMaxReturnDepartureTime(results) {
-        let max;
-        results.forEach((result) => {
-            if (result.inboundFlights && result.inboundFlights[0]) {
-                let maxDepTime = Number(moment(result.inboundFlights[0].dateTimeDeparting).format('HHmm'));
-                maxDepTime = Math.ceil(maxDepTime / 100) * 100;
-                if (!max || maxDepTime > max) {
-                    max = maxDepTime;
+                if (result.classes.EconomyFlexi) {
+                    result.classes.EconomyFlexi.flights = (((_c = result.classes.EconomyFlexi) === null || _c === void 0 ? void 0 : _c.flights) || [])
+                        .filter((flightItinerary) => !!flightItinerary)
+                        .filter(filterItineraries);
                 }
-            }
-        });
-        return max;
-    }
-    getMaxDepartureTime(results) {
-        let max;
-        results.forEach((result) => {
-            let maxDepTime = Number(moment(result.outboundFlights[0].dateTimeDeparting).format('HHmm'));
-            maxDepTime = Math.ceil(maxDepTime / 100) * 100;
-            if (!max || maxDepTime > max) {
-                max = maxDepTime;
-            }
-        });
-        return max;
-    }
-    getBaggage(results) {
-        const baggage = {};
-        results.forEach((result) => {
-            var _a, _b, _c, _d, _e, _f;
-            try {
-                if (result.baggageAllowance.length) {
-                    let total = +((_a = result.baggageAllowance[0]) === null || _a === void 0 ? void 0 : _a.qty);
-                    if (result.inboundFlights.length) {
-                        // ! assuming second item is inbound if the airlines are different, steven said he would sort this out
-                        if (result.baggageAllowance[1] &&
-                            +result.baggageAllowance[1].qty > total) {
-                            total = +((_b = result.baggageAllowance[1]) === null || _b === void 0 ? void 0 : _b.qty);
-                        }
-                        else if (+((_c = result.baggageAllowance[0]) === null || _c === void 0 ? void 0 : _c.qty) > total) {
-                            total = +((_d = result.baggageAllowance[0]) === null || _d === void 0 ? void 0 : _d.qty);
-                        }
-                    }
-                    if (+((_e = result.baggageAllowance[0]) === null || _e === void 0 ? void 0 : _e.qty) > total) {
-                        total = +((_f = result.baggageAllowance[0]) === null || _f === void 0 ? void 0 : _f.qty);
-                    }
-                    baggage[total] = {
-                        selected: false,
-                        value: total,
-                        display: `${total} bag${total !== 1 ? 's' : ''}`
-                    };
+                if (result.classes.PremiumEconomy) {
+                    result.classes.PremiumEconomy.flights = (((_d = result.classes.PremiumEconomy) === null || _d === void 0 ? void 0 : _d.flights) || [])
+                        .filter((flightItinerary) => !!flightItinerary)
+                        .filter(filterItineraries);
                 }
-            }
-            catch (error) {
-                console.error(`+++ Error parsing additional flight data: ${error} +++`);
-            }
-        });
-        return Object.values(baggage);
-    }
-    getMinPrice(results) {
-        let minPrice;
-        results.forEach((result) => {
-            if (!minPrice || result.total.price < minPrice) {
-                minPrice = result.total.price;
-            }
-        });
-        return minPrice;
-    }
-    getMaxPrice(results) {
-        let maxPrice;
-        results.forEach((result) => {
-            if (!maxPrice || result.total.price > maxPrice) {
-                maxPrice = result.total.price;
-            }
-        });
-        return maxPrice;
-    }
-    getAllStops(results) {
-        const allStops = {};
-        results.forEach((result) => {
-            const totalStops = result.outboundFlights.length - 1; // might have to recalculate this
-            allStops[totalStops] = {
-                value: totalStops,
-                display: `${totalStops} stop` + (totalStops !== 1 ? 's' : ''),
-                selected: false
-            };
-        });
-        return Object.values(allStops);
-    }
-    getAllClasses(results) {
-        const allClasses = [];
-        results.forEach((result) => {
-            result.outboundFlights.forEach((outFlight) => {
-                allClasses[outFlight.cabinClass] = {
-                    value: outFlight.cabinClass,
-                    display: outFlight.cabinClass,
-                    selected: false
-                };
-            });
-            if (result.inboundFlights) {
-                result.inboundFlights.forEach((inFlight) => {
-                    allClasses[inFlight.cabinClass] = {
-                        value: inFlight.cabinClass,
-                        display: inFlight.cabinClass,
-                        selected: false
-                    };
-                });
-            }
-        });
-        return Object.values(allClasses);
-    }
-    /**
-     * @description - create select filters for all unique departure airports returned in the search
-     * @param results - the flight results
-     */
-    getAllDepartureAirports(results, inbound = false) {
-        const allAirports = {};
-        results.forEach((result) => {
-            var _a;
-            if (result.outboundFlights.length && !inbound) {
-                allAirports[result.outboundFlights[0].originAirport] = {
-                    value: result.outboundFlights[0].originAirport,
-                    display: result.outboundFlights[0].originAirportName,
-                    selected: false
-                };
-            }
-            if (((_a = result.inboundFlights) === null || _a === void 0 ? void 0 : _a.length) && inbound) {
-                allAirports[result.inboundFlights[0].originAirport] = {
-                    value: result.inboundFlights[0].originAirport,
-                    display: result.inboundFlights[0].originAirportName,
-                    selected: false
-                };
-            }
-        });
-        return Object.values(allAirports);
-    }
-    /**
-     * @description - create select filters for all unique departure airports returned in the search
-     * @param results - the flight results
-     */
-    getAllArrivalAirports(results, inbound = false) {
-        const allAirports = {};
-        results.forEach((result) => {
-            var _a;
-            if (result.outboundFlights.length && !inbound) {
-                allAirports[result.outboundFlights[result.outboundFlights.length - 1].destinationAirport] = {
-                    value: result.outboundFlights[result.outboundFlights.length - 1]
-                        .destinationAirport,
-                    display: result.outboundFlights[result.outboundFlights.length - 1]
-                        .destinationAirportName,
-                    selected: false
-                };
-            }
-            if (((_a = result.inboundFlights) === null || _a === void 0 ? void 0 : _a.length) && inbound) {
-                allAirports[result.inboundFlights[result.inboundFlights.length - 1].destinationAirport] = {
-                    value: result.inboundFlights[result.inboundFlights.length - 1]
-                        .destinationAirport,
-                    display: result.inboundFlights[result.inboundFlights.length - 1]
-                        .destinationAirportName,
-                    selected: false
-                };
-            }
-        });
-        return Object.values(allAirports);
-    }
-    /**
-     * @description - create select filters for all unique airlines returned in the search
-     * @param results - the flight results
-     */
-    getAllAirlines(results) {
-        const allAirlines = {};
-        results.forEach((result) => {
-            result.outboundFlights.forEach((outFlight) => {
-                allAirlines[outFlight.operatingCarrier] = {
-                    value: outFlight.operatingCarrier,
-                    display: outFlight.operatingCarrierName,
-                    selected: false
-                };
-            });
-            if (result.inboundFlights) {
-                result.inboundFlights.forEach((inFlight) => {
-                    allAirlines[inFlight.operatingCarrier] = {
-                        value: inFlight.operatingCarrier,
-                        display: inFlight.operatingCarrierName,
-                        selected: false
-                    };
-                });
-            }
-        });
-        return Object.values(allAirlines);
+                if (result.classes.Business) {
+                    result.classes.Business.flights = (((_e = result.classes.Business) === null || _e === void 0 ? void 0 : _e.flights) || [])
+                        .filter((flightItinerary) => !!flightItinerary)
+                        .filter(filterItineraries);
+                }
+                if (result.classes.First) {
+                    result.classes.First.flights = (((_f = result.classes.First) === null || _f === void 0 ? void 0 : _f.flights) || [])
+                        .filter((flightItinerary) => !!flightItinerary)
+                        .filter(filterItineraries);
+                }
+                return result;
+            })
+                .filter((result) => {
+                var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
+                return ((((_b = (_a = result.classes) === null || _a === void 0 ? void 0 : _a.EconomyNoBags) === null || _b === void 0 ? void 0 : _b.flights.length) || 0) +
+                    (((_d = (_c = result.classes) === null || _c === void 0 ? void 0 : _c.EconomyRestricted) === null || _d === void 0 ? void 0 : _d.flights.length) || 0) +
+                    (((_f = (_e = result.classes) === null || _e === void 0 ? void 0 : _e.EconomyFlexi) === null || _f === void 0 ? void 0 : _f.flights.length) || 0) +
+                    (((_h = (_g = result.classes) === null || _g === void 0 ? void 0 : _g.PremiumEconomy) === null || _h === void 0 ? void 0 : _h.flights.length) || 0) +
+                    (((_k = (_j = result.classes) === null || _j === void 0 ? void 0 : _j.Business) === null || _k === void 0 ? void 0 : _k.flights.length) || 0) +
+                    (((_m = (_l = result.classes) === null || _l === void 0 ? void 0 : _l.First) === null || _m === void 0 ? void 0 : _m.flights.length) || 0) >
+                    0);
+            })
+                .sort(this._sortGroupedRoutines[sortValue]));
+        }
+        else {
+            this.results.next(Object.freeze(this.helpers
+                .clone(this.fullResults)
+                .map((result) => {
+                // return {
+                //   type: 'FlightAllQuoteResult',
+                //   journeys: result.journeys.filter(filterItineraries)
+                // };
+                return result;
+            })));
+        }
     }
     updateLowestPrice(results) {
-        return null;
-        // add in once filght result is updated///
-        // const results = this.storageService.getSessionItemAsList<FlightQuoteResultArray>(this.resultsSessionName) || [] as FlightQuoteResultArray;
-        // if(!results.length) return;
-        // this._cheapestResultPrice.currencyCode = results[0].total.currency;
-        // results.map(result => {
-        //   const price = result.total.price;
-        //   if( this._cheapestResultPrice.amount > price ||  this._cheapestResultPrice.amount === null){
-        //     this._cheapestResultPrice.amount = price;
-        //   }
-        // })
+        if (!results.length || this.searchService.isFlightsGrouped()) {
+            return;
+        }
+        const journeys = results[0].journeys;
+        const currency = journeys[0].total.currency;
+        return journeys.reduce((cheapestPrice, result) => {
+            const price = result.total.price;
+            if (cheapestPrice.amount > price)
+                cheapestPrice.amount = price;
+            return cheapestPrice;
+        }, { amount: Number.MAX_SAFE_INTEGER, currencyCode: currency });
     }
     selectGroupedFlight(selectedFlight, direction) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -4698,7 +4660,9 @@ class FlightEnterpriseSearch extends BaseEnterpriseSearch {
             operatingCarrier: selectedFlight.operatingCarrier,
             operatingFlightNumber: selectedFlight.operatingFlightNumber,
             originAirport: selectedFlight.originAirport,
-            totalDuration: selectedFlight.totalDuration
+            totalDuration: selectedFlight.totalDuration,
+            originTerminal: selectedFlight.originTerminal,
+            destinationTerminal: selectedFlight.destinationTerminal
         };
     }
     addFlightJourneysToBasket(flightQuote) {
@@ -5443,22 +5407,42 @@ class BaseHelperRoutines {
         };
     }
     removeNulls(query) {
-        return Object.keys(query).reduce((accum, key) => {
-            const value = query[key];
-            const data = Array.isArray(value)
-                ? value.filter((item) => !!item) || null
-                : value;
-            if ((data !== null && data !== undefined && data !== 'null') ||
-                (Array.isArray(data) && data.length > 0)) {
-                accum[key] = data;
-            }
-            return accum;
-        }, {});
+        if (!query) {
+            return query;
+        }
+        if (moment.isMoment(query)) {
+            return query;
+        }
+        else if (Array.isArray(query)) {
+            return (query
+                .map((item) => {
+                return this.removeNulls(item);
+            })
+                .filter((item1) => {
+                return !!item1;
+            }) || null);
+        }
+        else if (typeof query === 'object') {
+            return Object.keys(query).reduce((accum, key) => {
+                const value = query[key];
+                const data = this.removeNulls(value);
+                if ((data !== null && data !== undefined && data !== 'null') ||
+                    (Array.isArray(data) && data.length > 0)) {
+                    accum[key] = data;
+                }
+                return accum;
+            }, {});
+        }
+        else {
+            return query;
+        }
     }
     getTravellersId(travellers) {
         if (travellers) {
             return travellers.reduce((previousValue, currentValue, idx) => {
-                return idx === 0 ? [currentValue.id] : [...previousValue, currentValue.id];
+                return idx === 0
+                    ? [currentValue.id]
+                    : [...previousValue, currentValue.id];
             }, []);
         }
     }
@@ -5657,7 +5641,6 @@ class BaseHelperRoutines {
      * @desc - generates ics file body content based on the provided basketItems param
      */
     generateIcsFileBodyContent(basketItems) {
-        // TODO: currently only basket items with ServiceType.Lounge are handled. See below to TODOs for remaining tasks
         const bodyContent = [];
         // generate calendar data for each basket item
         basketItems.map((basketItem, index) => {
@@ -5671,11 +5654,12 @@ class BaseHelperRoutines {
                 serviceType: '',
                 summary: ''
             };
+            const dateFormat = 'DD MMMM YYYY HH:mm';
             const { type } = basketItem.service;
+            const { adults, children, bookingThirdPartyReference, detail, service } = basketItem;
             // populate data object depending on the service type in the basket
             switch (type) {
                 case ServiceType.Lounge:
-                    const { adults, children, bookingThirdPartyReference, detail, service } = basketItem;
                     data.basketId = basketItem.id;
                     data.dStart = detail === null || detail === void 0 ? void 0 : detail.arrivalDatetime;
                     data.dEnd = '';
@@ -5683,31 +5667,113 @@ class BaseHelperRoutines {
                     data.serviceType = service.type.toLowerCase();
                     data.description = [
                         `Lounge: ${detail.name}\r\n`,
-                        `Starts: ${detail.arrivalDatetime}\r\n`,
+                        `Starts: ${moment(detail.arrivalDatetime).format(dateFormat)}\r\n`,
                         `Adults: ${adults}\r\n`,
                         `Children: ${children}\r\n`,
                         `Booking Ref: ${bookingThirdPartyReference}`
                     ].join('');
                     break;
-                case ServiceType.Cab:
-                // TODO: handle this case
-                // hint: see logic in icalendar.component.ts  file on lighting current version
-                case ServiceType.Car:
-                // TODO: handle this case
+                case ServiceType.Cab:
+                    data.basketId = basketItem.id;
+                    data.serviceType = service.type.toLowerCase();
+                    data.dStart = detail === null || detail === void 0 ? void 0 : detail.departs;
+                    data.dEnd = '';
+                    data.summary = `Taxi booking - from ${detail.fromLocation.address} to ${detail.toLocation.address}`;
+                    data.description = [
+                        `Pickup Point: ${detail.fromLocation.address}\r\n`,
+                        `Time: ${moment(detail.departs).format(dateFormat)}\r\n`,
+                        `Booking Ref: ${bookingThirdPartyReference}`
+                    ].join('');
+                    break;
+                case ServiceType.Car:
+                    data.basketId = basketItem.id;
+                    data.serviceType = service.type.toLowerCase();
+                    data.dStart = detail === null || detail === void 0 ? void 0 : detail.pickUpDatetime;
+                    data.dEnd = detail === null || detail === void 0 ? void 0 : detail.dropOffDatetime;
+                    data.summary = `Car booking - from ${detail.pickUpLocation.address} to ${detail.dropOffLocation.address}`;
+                    data.description = [
+                        `Pickup Point: ${detail.pickUpLocation.address}\r\n`,
+                        `Time: ${moment(detail.pickUpDatetime).format(dateFormat)}\r\n`,
+                        `Arrival Point: ${detail.dropOffLocation.address}\r\n`,
+                        `Booking Ref: ${bookingThirdPartyReference}`
+                    ].join('');
+                    (data.locationFrom = detail.pickUpLocation.address),
+                        (data.locationTo = detail.dropOffLocation.address);
+                    break;
                 case ServiceType.Coach:
                 // TODO: handle this case
                 case ServiceType.FastTrack:
                 // TODO: handle this case
                 case ServiceType.Flight:
-                // TODO: handle this case
+                    data.basketId = basketItem.id;
+                    data.serviceType = service.type.toLowerCase();
+                    data.dStart = detail === null || detail === void 0 ? void 0 : detail.outboundFlights[0].dateTimeDeparting;
+                    data.dEnd = detail === null || detail === void 0 ? void 0 : detail.outboundFlights[0].dateTimeArriving;
+                    data.summary = `Flight Booking - From ${detail.outboundFlights[0].originAirport} to ${detail.outboundFlights[0].destinationAirport}`;
+                    data.description = [
+                        `From: ${detail.outboundFlights[0].originAirport}\r\n`,
+                        `Depart: ${moment(detail.outboundFlights[0].dateTimeDeparting).format(dateFormat)}\r\n`,
+                        `To: ${detail.outboundFlights[0].destinationAirport}\r\n`,
+                        `Arrive: ${moment(detail.outboundFlights[0].dateTimeArriving).format(dateFormat)}\r\n`,
+                        `Booking Ref: ${bookingThirdPartyReference}`
+                    ].join('');
+                    break;
                 case ServiceType.Hotel:
-                // TODO: handle this case
+                    data.basketId = basketItem.id;
+                    data.serviceType = service.type.toLowerCase();
+                    data.dStart = detail === null || detail === void 0 ? void 0 : detail.checkIn;
+                    data.dEnd = detail === null || detail === void 0 ? void 0 : detail.checkOut;
+                    data.summary = `Hotel booking -  ${detail.hotelName}`;
+                    data.description = [
+                        `Hotel: ${detail.hotelName}\r\n`,
+                        `Arrival: ${moment(detail.checkIn).format(dateFormat)}\r\n`,
+                        `Departure: ${moment(detail.checkOut).format(dateFormat)}\r\n`,
+                        `Booking Ref: ${bookingThirdPartyReference}`
+                    ].join('');
+                    break;
                 case ServiceType.InternationalRail:
-                // TODO: handle this case
+                    data.basketId = basketItem.id;
+                    data.serviceType = service.type.toLowerCase();
+                    data.dStart = detail === null || detail === void 0 ? void 0 : detail.outwardDetail.departureDateTime;
+                    data.dEnd = detail === null || detail === void 0 ? void 0 : detail.outwardDetail.arrivalDateTime;
+                    data.locationFrom = detail.outwardDetail.departureStationName;
+                    data.locationTo = detail.outwardDetail.arrivalDateTime;
+                    data.summary = `Train Booking - From ${detail.outwardDetail.departureStationName} to ${detail.outwardDetail.arrivalStationName}`;
+                    data.description = [
+                        `From ${detail.outwardDetail.departureStationName}\r\n`,
+                        `To ${detail.outwardDetail.arrivalStationName}\r\n`,
+                        `Departure ${moment(detail.outwardDetail.departureDateTime).format(dateFormat)}\r\n`,
+                        `Arrival ${moment(detail.outwardDetail.arrivalDateTime).format(dateFormat)}\r\n`,
+                        `Booking Ref: ${bookingThirdPartyReference}`
+                    ].join('');
+                    break;
                 case ServiceType.Parking:
-                // TODO: handle this case
+                    data.basketId = basketItem.id;
+                    data.serviceType = service.type.toLowerCase();
+                    data.dStart = detail === null || detail === void 0 ? void 0 : detail.arrivalDatetime;
+                    data.dEnd = detail === null || detail === void 0 ? void 0 : detail.departDatetime;
+                    data.summary = `Airport parking - ${detail.name}`;
+                    data.description = [
+                        `Airport Parking: ${detail.name}\r\n`,
+                        `Booking Ref: ${bookingThirdPartyReference}`
+                    ].join('');
+                    break;
                 case ServiceType.Rail:
-                // TODO: handle this case
+                    data.basketId = basketItem.id;
+                    data.serviceType = service.type.toLowerCase();
+                    data.dStart = detail === null || detail === void 0 ? void 0 : detail.outwardDetail.departureDateTime;
+                    data.dEnd = detail === null || detail === void 0 ? void 0 : detail.outwardDetail.arrivalDateTime;
+                    data.locationFrom = detail.outwardDetail.departureStationName;
+                    data.locationTo = detail.outwardDetail.arrivalDateTime;
+                    data.summary = `Train Booking - From ${detail.outwardDetail.departureStationName} to ${detail.outwardDetail.arrivalStationName}`;
+                    data.description = [
+                        `From ${detail.outwardDetail.departureStationName}\r\n`,
+                        `To ${detail.outwardDetail.arrivalStationName}\r\n`,
+                        `Departure ${moment(detail.outwardDetail.departureDateTime).format(dateFormat)}\r\n`,
+                        `Arrival ${moment(detail.outwardDetail.arrivalDateTime).format(dateFormat)}\r\n`,
+                        `Booking Ref: ${bookingThirdPartyReference}`
+                    ].join('');
+                    break;
             }
             bodyContent.push([
                 'BEGIN:VEVENT\r\n',
@@ -5756,6 +5822,119 @@ class BaseHelperRoutines {
         }
         return splitString;
     }
+    createFlightFilters(journeys, defaultFilters) {
+        return journeys.reduce((filters, result1) => {
+            const totalStops = result1.outboundFlights.length - 1;
+            filters.stops[totalStops] = filters.stops[totalStops] || {
+                display: `${totalStops} stop` + (totalStops !== 1 ? 's' : ''),
+                selected: false,
+                value: totalStops + 1
+            };
+            const updateFlightItems = (flight) => {
+                filters.classes[flight.cabinClass] = filters.classes[flight.cabinClass] || {
+                    display: flight.cabinClass,
+                    selected: false,
+                    value: flight.cabinClass
+                };
+                filters.airlines[flight.marketingCarrier] = filters.airlines[flight.marketingCarrier] || {
+                    display: flight.marketingCarrierName,
+                    selected: false,
+                    value: flight.marketingCarrier
+                };
+            };
+            result1.outboundFlights.forEach(updateFlightItems);
+            const baggage = Math.min(...result1.baggageAllowance.map((baggageAllowance) => baggageAllowance.qty));
+            filters.baggage[baggage] = filters.baggage[baggage] || {
+                selected: false,
+                display: `${baggage} bag${baggage !== 1 ? 's' : ''}`,
+                value: baggage
+            };
+            const indexedFlight = (flights, filterAttribute, flightAttribute, flightAttributeName, index) => {
+                const temp = flights[index][flightAttribute];
+                filters[filterAttribute][temp] = filters[filterAttribute][temp] || {
+                    value: flights[index][flightAttribute],
+                    display: flights[index][flightAttributeName],
+                    selected: false
+                };
+            };
+            indexedFlight(result1.outboundFlights, 'depatureAirport', 'originAirport', 'originAirportName', 0);
+            indexedFlight(result1.outboundFlights, 'arrivalAirport', 'destinationAirport', 'destinationAirportName', result1.outboundFlights.length - 1);
+            filters.price.min =
+                filters.price.min < result1.total.price
+                    ? filters.price.min
+                    : result1.total.price;
+            filters.price.max =
+                filters.price.max > result1.total.price
+                    ? filters.price.max
+                    : result1.total.price;
+            filters.duration.min =
+                filters.duration.min < result1.outboundTotalDuration
+                    ? filters.duration.min
+                    : result1.outboundTotalDuration;
+            filters.duration.max =
+                filters.duration.max > result1.outboundTotalDuration
+                    ? filters.duration.max
+                    : result1.outboundTotalDuration;
+            const departTime = moment(result1.outboundFlights[0].dateTimeDeparting).get('hour');
+            filters.departureTime.min =
+                filters.departureTime.min < departTime
+                    ? filters.departureTime.min
+                    : departTime;
+            filters.departureTime.max =
+                filters.departureTime.max > departTime
+                    ? filters.departureTime.max
+                    : departTime;
+            const arrivalTime = moment(result1.outboundFlights[result1.outboundFlights.length - 1]
+                .dateTimeArriving).get('hour');
+            filters.arrivalTime.min =
+                filters.arrivalTime.min < arrivalTime
+                    ? filters.arrivalTime.min
+                    : arrivalTime;
+            filters.arrivalTime.max =
+                filters.arrivalTime.max > arrivalTime
+                    ? filters.arrivalTime.max
+                    : arrivalTime;
+            if (result1.inboundFlights && result1.outboundFlights.length > 0) {
+                filters.returnDuration.min =
+                    filters.returnDuration.min < result1.inboundTotalDuration
+                        ? filters.returnDuration.min
+                        : result1.inboundTotalDuration;
+                filters.returnDuration.max =
+                    filters.returnDuration.max > result1.inboundTotalDuration
+                        ? filters.returnDuration.max
+                        : result1.inboundTotalDuration;
+                const departTimeReturn = moment(result1.inboundFlights[0].dateTimeDeparting).get('hour');
+                filters.returnDepartureTime.min =
+                    filters.returnDepartureTime.min < departTimeReturn
+                        ? filters.returnDepartureTime.min
+                        : departTimeReturn;
+                filters.returnDepartureTime.max =
+                    filters.returnDepartureTime.max > departTimeReturn
+                        ? filters.returnDepartureTime.max
+                        : departTimeReturn;
+                const arrivalTimeReturn = moment(result1.outboundFlights[result1.outboundFlights.length - 1]
+                    .dateTimeArriving).get('hour');
+                filters.returnArrivalTime.min =
+                    filters.returnArrivalTime.min < arrivalTimeReturn
+                        ? filters.returnArrivalTime.min
+                        : arrivalTimeReturn;
+                filters.returnArrivalTime.max =
+                    filters.returnArrivalTime.max > arrivalTimeReturn
+                        ? filters.returnArrivalTime.max
+                        : arrivalTimeReturn;
+                (result1.inboundFlights || []).forEach(updateFlightItems);
+                indexedFlight(result1.inboundFlights, 'depatureReturnAirport', 'originAirport', 'originAirportName', 0);
+                indexedFlight(result1.inboundFlights, 'arrivalReturnAirport', 'destinationAirport', 'destinationAirportName', result1.outboundFlights.length - 1);
+            }
+            return filters;
+        }, this.clone(defaultFilters));
+    }
+    mapOverObject(items, callback) {
+        return Object.entries(items).reduce((accum, entries) => {
+            accum[entries[0]] = callback(entries[1], entries[0]);
+            return accum;
+        }, {});
+    }
 }
 BaseHelperRoutines.READ_DATE_FORMAT = 'dd, D MMM YYYY';
 BaseHelperRoutines.READ_TIME_FORMAT = 'HH:mm';
@@ -5900,6 +6079,7 @@ class HotelEnterpriseSearch extends BaseEnterpriseSearch {
         this._distance_list = [1, 2, 5, 10, 20, 25]; // copied from old frontend for now
         this._default_currency = null;
         this.resultsSessionName = HotelEnterpriseSearch.STORAGE_SESSION_RESULTS;
+        this.multiResultsSessionName = HotelEnterpriseSearch.STORAGE_SESSION_RESULTS;
         this.query = {};
         this.filterResults = () => {
             this.results.next(this.fullResults.filter((hotel) => {
@@ -6189,7 +6369,7 @@ class HotelEnterpriseSearch extends BaseEnterpriseSearch {
         this._isValid();
     }
     _isValid() {
-        var _a, _b, _c, _d, _e;
+        var _a, _b, _c, _d, _e, _f;
         if (!this.doChecks) {
             return;
         }
@@ -6211,7 +6391,7 @@ class HotelEnterpriseSearch extends BaseEnterpriseSearch {
                 }
                 break;
             case LocationTypes.Office:
-                if (!((_a = this.tempParams.location) === null || _a === void 0 ? void 0 : _a.office)) {
+                if (((_a = this.tempParams.location) === null || _a === void 0 ? void 0 : _a.type) !== 'Office' && !this.office) {
                     this.validationMessages.push('Please select an office.');
                 }
                 break;
@@ -6227,13 +6407,7 @@ class HotelEnterpriseSearch extends BaseEnterpriseSearch {
                 }
                 break;
             case LocationTypes.TrainStation:
-                if ((_d = this.tempParams) === null || _d === void 0 ? void 0 : _d.location) {
-                    if (!((_e = this.tempParams.location.railstation) === null || _e === void 0 ? void 0 : _e.stationCode)) {
-                        this.validationMessages.push('Please select a train station.');
-                    }
-                    break;
-                }
-                else {
+                if (!((_e = (_d = this.tempParams.location) === null || _d === void 0 ? void 0 : _d.railstation) === null || _e === void 0 ? void 0 : _e.stationCode) && !((_f = this.trainsStation) === null || _f === void 0 ? void 0 : _f.stationCode)) {
                     this.validationMessages.push('Please select a train station.');
                 }
                 break;
@@ -6285,17 +6459,20 @@ class HotelEnterpriseSearch extends BaseEnterpriseSearch {
     }
     getRecentSearchQuery(query) {
         var _a;
+        const recentSearchQuery = query;
+        recentSearchQuery.location_type_select = this.location_type_select;
         if ((_a = this.location) === null || _a === void 0 ? void 0 : _a.name) {
-            query.cityName = this.location.name;
+            recentSearchQuery.cityName = this.location.name;
         }
         return {
             serviceType: ServiceType.Hotel,
-            searchArgs: query,
+            searchArgs: recentSearchQuery,
             travelDate: this.checkin_date.format(),
             travellers: this.helpers.getTravellersId(this.travellers)
         };
     }
     startRecentSearch(recentSearch) {
+        this.location_type_select = recentSearch.searchArgs.location_type_select;
         this.currency = recentSearch.searchArgs.currency;
         this.distance = recentSearch.searchArgs.distance;
         this.no_of_rooms = recentSearch.searchArgs.rooms;
@@ -6308,67 +6485,63 @@ class HotelEnterpriseSearch extends BaseEnterpriseSearch {
             };
         }
         // get location_type_select
-        if (recentSearch.searchArgs.iata) {
-            this.location_type_select = LocationTypes.Airport;
-            this.searchService.getAirportByCode(recentSearch.searchArgs.iata).subscribe((iata) => {
-                let airport = {
-                    airport: {
-                        gateway: iata.iataMatch.iata
-                    }
+        switch (this.location_type_select) {
+            case LocationTypes.Airport:
+                this.searchService.getAirportByCode(recentSearch.searchArgs.iata).subscribe((iata) => {
+                    let airport = {
+                        airport: {
+                            gateway: iata.iataMatch.iata
+                        }
+                    };
+                    this.location = Object.assign(Object.assign({}, airport), iata.iataMatch);
+                    this.searchService.startSearches();
+                });
+                break;
+            case LocationTypes.City:
+                this.country = {
+                    cCode: recentSearch.searchArgs.countryCode,
+                    cName: ''
                 };
-                this.location = Object.assign(Object.assign({}, airport), iata.iataMatch);
+                // should be one search metod for the city search: location or postcode
+                if (recentSearch.searchArgs.latitude && recentSearch.searchArgs.longitude) {
+                    this.location = {
+                        name: recentSearch.searchArgs.cityName,
+                        latitude: recentSearch.searchArgs.latitude,
+                        longitude: recentSearch.searchArgs.longitude
+                    };
+                }
+                else if (recentSearch.searchArgs.postOrZipCode) {
+                    this.postcode = {
+                        name: recentSearch.searchArgs.postOrZipCode,
+                        type: LocationTypes.Postcode
+                    };
+                }
                 this.searchService.startSearches();
-            });
-        }
-        else if ((recentSearch.searchArgs.latitude && recentSearch.searchArgs.longitude) || recentSearch.searchArgs.postOrZipCode) {
-            this.location_type_select = LocationTypes.City;
-            this.country = {
-                cCode: recentSearch.searchArgs.countryCode,
-                cName: ''
-            };
-            // should be one search metod for the city search: location or postcode
-            if (recentSearch.searchArgs.latitude && recentSearch.searchArgs.longitude) {
-                this.location = {
-                    name: recentSearch.searchArgs.cityName,
-                    latitude: recentSearch.searchArgs.latitude,
-                    longitude: recentSearch.searchArgs.longitude
-                };
-            }
-            else if (recentSearch.searchArgs.postOrZipCode) {
-                this.postcode = {
-                    name: recentSearch.searchArgs.postOrZipCode,
-                    type: LocationTypes.Postcode
-                };
-            }
-            this.searchService.startSearches();
-        }
-        else if (recentSearch.searchArgs.officeId) {
-            this.location_type_select = LocationTypes.Office;
-            this.searchService.getOfficeNames(this.isLoading).pipe(take(1)).subscribe((offices) => {
-                if (offices) {
-                    let office = offices.find((office) => office.id === recentSearch.searchArgs.officeId);
+                break;
+            case LocationTypes.Office:
+                this.searchService.getOffice(recentSearch.searchArgs.officeId).pipe(take(1)).subscribe((office) => {
                     this.office = {
-                        id: recentSearch.searchArgs.officeId,
+                        id: office.id,
                         name: office.name
                     };
                     this.searchService.startSearches();
-                }
-            });
-        }
-        else if (recentSearch.searchArgs.trainStationCode) {
-            this.location_type_select = LocationTypes.TrainStation;
-            this.getRailStationByCode(recentSearch.searchArgs.trainStationCode).subscribe((trainsStation) => {
-                this.trainsStation = trainsStation;
+                });
+                break;
+            case LocationTypes.TrainStation:
+                this.getRailStationByCode(recentSearch.searchArgs.trainStationCode).subscribe((trainsStation) => {
+                    this.trainsStation = trainsStation;
+                    this.searchService.startSearches();
+                });
+                break;
+            case LocationTypes.Shortlist:
+                this.country = {
+                    cCode: recentSearch.searchArgs.countryCode,
+                    cName: ''
+                };
                 this.searchService.startSearches();
-            });
-        }
-        else {
-            this.location_type_select = LocationTypes.Shortlist;
-            this.country = {
-                cCode: recentSearch.searchArgs.countryCode,
-                cName: ''
-            };
-            this.searchService.startSearches();
+                break;
+            default:
+                break;
         }
     }
     getRailStationByCode(code) {
@@ -6384,7 +6557,7 @@ class HotelEnterpriseSearch extends BaseEnterpriseSearch {
         return this.helpers.removeNulls(this.query);
     }
     buildQuery() {
-        var _a, _b;
+        var _a, _b, _c, _d, _e, _f;
         const query = {
             startDate: this.tempParams.checkin_date.format('YYYY-MM-DD'),
             endDate: this.tempParams.checkout_date.format('YYYY-MM-DD'),
@@ -6413,10 +6586,20 @@ class HotelEnterpriseSearch extends BaseEnterpriseSearch {
                 }
                 break;
             case LocationTypes.TrainStation:
-                query.trainStationCode = this.location.railstation.stationCode;
+                if ((_b = (_a = this.location) === null || _a === void 0 ? void 0 : _a.railstation) === null || _b === void 0 ? void 0 : _b.stationCode) {
+                    query.trainStationCode = this.location.railstation.stationCode;
+                }
+                else if ((_c = this.trainsStation) === null || _c === void 0 ? void 0 : _c.stationCode) {
+                    query.trainStationCode = this.trainsStation.stationCode;
+                }
                 break;
             case LocationTypes.Office: // Needs to fix in next PR
-                query.officeId = +((_a = this.location.office) === null || _a === void 0 ? void 0 : _a.id);
+                if ((_d = this.location) === null || _d === void 0 ? void 0 : _d.id) {
+                    query.officeId = +this.location.id;
+                }
+                else if ((_e = this.office) === null || _e === void 0 ? void 0 : _e.id) {
+                    query.officeId = +this.office.id;
+                }
                 break;
             case LocationTypes.Shortlist:
                 query.countryCode = this.country.cCode;
@@ -6428,7 +6611,7 @@ class HotelEnterpriseSearch extends BaseEnterpriseSearch {
         }
         // add chain or group name int he query
         if (this.hotel_chain) {
-            query.groupName = (_b = this.tempParams.hotel_chain) === null || _b === void 0 ? void 0 : _b.name;
+            query.groupName = (_f = this.tempParams.hotel_chain) === null || _f === void 0 ? void 0 : _f.name;
         }
         this.query = query;
     }
@@ -6848,6 +7031,7 @@ class LoungesEnterpriseSearch extends BaseEnterpriseSearch {
         this._date = null;
         this._time = null;
         this.resultsSessionName = LoungesEnterpriseSearch.STORAGE_SESSION_RESULTS;
+        this.multiResultsSessionName = LoungesEnterpriseSearch.STORAGE_SESSION_RESULTS;
         const data = storageService.getSessionItem(LoungesEnterpriseSearch.STORAGE_SESSION_PARAMS) || {
             tempParams: {}
         };
@@ -7182,6 +7366,7 @@ class ParkingEnterpriseSearch extends BaseEnterpriseSearch {
             day: moment().date() + 1 // min 1 night stay
         };
         this.resultsSessionName = ParkingEnterpriseSearch.STORAGE_SESSION_RESULTS;
+        this.multiResultsSessionName = ParkingEnterpriseSearch.STORAGE_SESSION_RESULTS;
         this._outdate = null;
         this._outtime = null;
         this._indate = null;
@@ -7447,7 +7632,9 @@ class ParkingEnterpriseSearch extends BaseEnterpriseSearch {
         this.departDatetime = moment(recentSearch.searchArgs.departDatetime);
         this.outFlightNumber = recentSearch.searchArgs.outFlightNumber;
         this.terminal = recentSearch.searchArgs.terminal;
-        this.searchService.getAirportByCode(recentSearch.searchArgs.locationCode).subscribe((airport) => {
+        this.searchService
+            .getAirportByCode(recentSearch.searchArgs.locationCode)
+            .subscribe((airport) => {
             var _a, _b, _c, _d, _e, _f;
             if (airport) {
                 this.locationCode = {
@@ -7456,7 +7643,7 @@ class ParkingEnterpriseSearch extends BaseEnterpriseSearch {
                     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),
+                    terminals: this.searchService.processTerminals(airport.iataMatch.terminals)
                 };
                 this.searchService.startSearches();
             }
@@ -7550,10 +7737,53 @@ var EurostarSearchType;
     EurostarSearchType["oneWay"] = "oneWay";
 })(EurostarSearchType || (EurostarSearchType = {}));
 
+const DEFAULT_FILTERS = Object.freeze({
+    stops: {},
+    mustInclude: {},
+    classes: {},
+    airlines: {},
+    travelPolicy: {},
+    depatureAirport: {},
+    depatureReturnAirport: {},
+    arrivalAirport: {},
+    arrivalReturnAirport: {},
+    baggage: {},
+    fareTypes: {},
+    price: {
+        min: Number.MAX_SAFE_INTEGER,
+        max: Number.MIN_SAFE_INTEGER
+    },
+    duration: {
+        min: Number.MAX_SAFE_INTEGER,
+        max: Number.MIN_SAFE_INTEGER
+    },
+    returnDuration: {
+        min: Number.MAX_SAFE_INTEGER,
+        max: Number.MIN_SAFE_INTEGER
+    },
+    departureTime: {
+        min: 0,
+        max: 2359
+    },
+    arrivalTime: {
+        min: 0,
+        max: 2359
+    },
+    returnDepartureTime: {
+        min: 0,
+        max: 2359
+    },
+    returnArrivalTime: {
+        min: 0,
+        max: 2359
+    },
+    flightNumber: ''
+});
 var SortTypesEurostar;
 (function (SortTypesEurostar) {
     SortTypesEurostar["CheapestFirst"] = "C";
     SortTypesEurostar["EarliestFirst"] = "E";
+    SortTypesEurostar["LatestFirst"] = "L";
 })(SortTypesEurostar || (SortTypesEurostar = {}));
 var SortMethod;
 (function (SortMethod) {
@@ -7565,6 +7795,7 @@ class EurostarEnterpriseSearch extends BaseEnterpriseSearch {
         super(storageService, (results1) => {
             this.resultQuery = this.getSearchQuery();
             delete this.resultQuery.withGrouped;
+            this.filters.next(this.helpers.createFlightFilters(results1.journeys, DEFAULT_FILTERS));
             if (results1 && this.searchService.isFlightsGrouped()) {
                 const returndata = (results1.journeys || []).reduce((acc, result) => {
                     if (result.outboundFlights.length) {
@@ -7621,6 +7852,13 @@ class EurostarEnterpriseSearch extends BaseEnterpriseSearch {
                 icon: 'ico-calendar',
                 dir: true,
                 code: SortTypesEurostar.EarliestFirst
+            },
+            {
+                title: 'Time (Descending)',
+                method: SortMethod.sortByDate,
+                icon: 'ico-calendar',
+                dir: true,
+                code: SortTypesEurostar.LatestFirst
             }
         ];
         this._fareTypeArray = [
@@ -7644,13 +7882,15 @@ class EurostarEnterpriseSearch extends BaseEnterpriseSearch {
         };
         this.searchTypes = [
             { value: EurostarSearchType.return, display: 'Return' },
-            { value: EurostarSearchType.oneWay, display: 'One-way' },
+            { value: EurostarSearchType.oneWay, display: 'One-way' }
         ];
         this.flightsToGroup = {};
         this.grouped = null;
         this.travellers = null;
         this.resultsSessionName = EurostarEnterpriseSearch.STORAGE_SESSION_RESULTS;
+        this.multiResultsSessionName = EurostarEnterpriseSearch.STORAGE_SESSION_RESULTS;
         this._displayAddHotel = false;
+        this.filters = new BehaviorSubject(DEFAULT_FILTERS);
         this._multiDestination = [];
         this.minToHour = (dur) => `${Math.floor(dur / 60)}h ${dur % 60}m`;
         const data = storageService.getSessionItem(EurostarEnterpriseSearch.STORAGE_SESSION_PARAMS) || {
@@ -7691,6 +7931,10 @@ class EurostarEnterpriseSearch extends BaseEnterpriseSearch {
         this.fullResults = this.helpers.clone(results.results);
         this.flightsToGroup = results.groupData || {};
         this.resultQuery = results.query;
+        const isFlightsGrouped = this.searchService.isFlightsGrouped();
+        if (!isFlightsGrouped) {
+            this._cheapestResultPrice = this.updateLowestPrice(results.results);
+        }
         this.results.next(results.results || []);
         this._isValid();
         this.negotiated =
@@ -8081,13 +8325,102 @@ class EurostarEnterpriseSearch extends BaseEnterpriseSearch {
                 tempParams: this.tempParams,
                 originalUserSearch: this.originalUserSearch
             });
+            const query = this.getSearchQuery();
+            this.searchService.saveRecentSearch(this.getRecentSearchQuery(query));
             return this._startSearch(this.eurostarFetcher.fetchList(this.getSearchQuery()));
         }
         else {
             return Promise.resolve(false);
         }
     }
-    startRecentSearch(recentSearch) { }
+    getRecentSearchQuery(query) {
+        return {
+            serviceType: ServiceType.Eurostar,
+            searchArgs: query,
+            travelDate: this.outBoundDate.format(),
+            travellers: this.helpers.getTravellersId(this.travellers)
+        };
+    }
+    startRecentSearch(recentSearch) {
+        if (recentSearch.searchArgs.outboundDate) {
+            this.outBoundDate = this.convertRecentSearchDateTime(recentSearch.searchArgs.outboundDate, recentSearch.searchArgs.outboundDepartureTimeWindow);
+        }
+        if (recentSearch.searchArgs.returnDate) {
+            this.inboundDate = this.convertRecentSearchDateTime(recentSearch.searchArgs.returnDate, recentSearch.searchArgs.returnDepartureTimeWindow);
+        }
+        this.fareType = recentSearch.searchArgs.fareType;
+        this.maxConnections = recentSearch.searchArgs.maxConnections;
+        if (recentSearch.searchArgs.outboundCabinClass) {
+            this.cabinClass = recentSearch.searchArgs.outboundCabinClass[0];
+        }
+        if (recentSearch.searchArgs.returnCabinClass) {
+            this.returnCabinClass = recentSearch.searchArgs.returnCabinClass[0];
+        }
+        this.includeNearbyAirports = recentSearch.searchArgs.includeNearbyAirports;
+        this.chosenSearchType = recentSearch.searchArgs.returnTrip
+            ? EurostarSearchType.return
+            : EurostarSearchType.oneWay;
+        if (recentSearch.searchArgs.outboundDepartureTimeWindow) {
+            this.outTimeCriteria = TimeWindow.Depart;
+        }
+        else if (recentSearch.searchArgs.outboundArrivalTimeWindow) {
+            this.outTimeCriteria = TimeWindow.Arrive;
+        }
+        else {
+            this.outTimeCriteria = TimeWindow.Anytime;
+        }
+        if (recentSearch.searchArgs.returnDepartureTimeWindow) {
+            this.inTimeCriteria = TimeWindow.Depart;
+        }
+        else if (recentSearch.searchArgs.returnArrivalTimeWindow) {
+            this.inTimeCriteria = TimeWindow.Arrive;
+        }
+        else {
+            this.inTimeCriteria = TimeWindow.Anytime;
+        }
+        combineLatest([
+            this.searchService.getAirportByCode(recentSearch.searchArgs.originAirport),
+            this.searchService.getAirportByCode(recentSearch.searchArgs.destinationAirport)
+        ]).subscribe(([departLocation, arriveLocation]) => {
+            var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
+            if (departLocation && arriveLocation) {
+                this.departLocation = {
+                    destination: departLocation.iataMatch.name,
+                    gateway: departLocation.iataMatch.iata,
+                    terminals: this.searchService.processTerminals(departLocation.iataMatch.terminals),
+                    country: (_b = (_a = departLocation.iataMatch) === null || _a === void 0 ? void 0 : _a.locationDetails) === null || _b === void 0 ? void 0 : _b.country,
+                    postcode: (_d = (_c = departLocation.iataMatch) === null || _c === void 0 ? void 0 : _c.locationDetails) === null || _d === void 0 ? void 0 : _d.postcode,
+                    countryCode: (_f = (_e = departLocation.iataMatch) === null || _e === void 0 ? void 0 : _e.locationDetails) === null || _f === void 0 ? void 0 : _f.countryCode
+                };
+                this.arriveLocation = {
+                    destination: arriveLocation.iataMatch.name,
+                    gateway: arriveLocation.iataMatch.iata,
+                    terminals: this.searchService.processTerminals(arriveLocation.iataMatch.terminals),
+                    country: (_h = (_g = arriveLocation.iataMatch) === null || _g === void 0 ? void 0 : _g.locationDetails) === null || _h === void 0 ? void 0 : _h.country,
+                    postcode: (_k = (_j = arriveLocation.iataMatch) === null || _j === void 0 ? void 0 : _j.locationDetails) === null || _k === void 0 ? void 0 : _k.postcode,
+                    countryCode: (_m = (_l = arriveLocation.iataMatch) === null || _l === void 0 ? void 0 : _l.locationDetails) === null || _m === void 0 ? void 0 : _m.countryCode
+                };
+                if (recentSearch.searchArgs.preferredCarriers) {
+                    let preferredCarriers = [];
+                    recentSearch.searchArgs.preferredCarriers.map((preferredCarry) => {
+                        this.searchService
+                            .getAirlinesList(preferredCarry)
+                            .subscribe((items) => {
+                            items.map((item) => {
+                                if (item.code === preferredCarry) {
+                                    preferredCarriers.push(item);
+                                }
+                            });
+                            this.preferredCarriers = preferredCarriers;
+                            this.searchService.startSearches();
+                        });
+                    });
+                }
+                this.searchService.startSearches();
+            }
+        });
+        this.searchService.startSearches();
+    }
     makeDepartureTimeWindow(dateTime, window) {
         return window === TimeWindow.Depart
             ? this.helpers.makeTimeWindow(dateTime, -2, 2)
@@ -8099,6 +8432,17 @@ class EurostarEnterpriseSearch extends BaseEnterpriseSearch {
         }
         return this.helpers.makeTimeWindow(dateTime, -2, 2);
     }
+    convertRecentSearchDateTime(date, timeWindow) {
+        if (timeWindow) {
+            const flightTime = timeWindow.split('-');
+            let timeAndDate = moment(date).add(moment.duration(this.helpers.hhmmToTime(flightTime[0])));
+            // add 2 hour
+            return timeAndDate.clone().add(2, 'hour');
+        }
+        else {
+            return moment(date);
+        }
+    }
     getSearchQuery() {
         return this.helpers.removeNulls(Object.assign({}, {
             originAirport: this._originAirport,
@@ -8180,6 +8524,52 @@ class EurostarEnterpriseSearch extends BaseEnterpriseSearch {
         }
         this.results.next(results);
     }
+    sortResultsFlightJourneys(sortMethodValue, inbound = false, givenResults) {
+        let results = this.helpers.clone(givenResults);
+        switch (sortMethodValue) {
+            case SortTypesEurostar.CheapestFirst:
+                results = this.sortByPriceFlight(results);
+                break;
+            case SortTypesEurostar.EarliestFirst:
+                results = this.sortByDateFlight(results, inbound);
+                break;
+            case SortTypesEurostar.LatestFirst:
+                results = this.sortByDateFlightDecending(results, inbound);
+                break;
+            default:
+                console.error(`+++ Unknown sorting method: ${sortMethodValue} +++`);
+        }
+        return results;
+    }
+    sortByPriceFlight(results) {
+        return results.sort((a, b) => {
+            return Number(a.total.price) - Number(b.total.price);
+        });
+    }
+    sortByDateFlight(results, inbound) {
+        return results.sort((a, b) => {
+            if (inbound) {
+                return (moment(a.inboundFlights[0].dateTimeDeparting).unix() -
+                    moment(b.inboundFlights[0].dateTimeDeparting).unix());
+            }
+            else {
+                return (moment(a.outboundFlights[0].dateTimeDeparting).unix() -
+                    moment(b.outboundFlights[0].dateTimeDeparting).unix());
+            }
+        });
+    }
+    sortByDateFlightDecending(results, inbound) {
+        return results.sort((a, b) => {
+            if (inbound) {
+                return (moment(b.inboundFlights[0].dateTimeDeparting).unix() -
+                    moment(a.inboundFlights[0].dateTimeDeparting).unix());
+            }
+            else {
+                return (moment(b.outboundFlights[0].dateTimeDeparting).unix() -
+                    moment(a.outboundFlights[0].dateTimeDeparting).unix());
+            }
+        });
+    }
     /**
      * Sort results by departure time
      *
@@ -8268,6 +8658,46 @@ class EurostarEnterpriseSearch extends BaseEnterpriseSearch {
         }
         return num.toString().padStart(2, '0');
     }
+    /**
+     * @description - apply all filters to results
+     * @param filters
+     * @param inbound
+     * @param results
+     * @returns
+     */
+    applyFilters(filters, inbound = false) {
+        // let newResults = this.helpers.clone(results);
+        // if (inbound) {
+        //   newResults = this.filterByReturnDepartureTime(
+        //     filters.minReturnDepartureTime,
+        //     filters.maxReturnDepartureTime,
+        //     newResults
+        //   );
+        //   newResults = this.filterByReturnArrivalTime(
+        //     filters.minReturnArrivalTime,
+        //     filters.maxReturnArrivalTime,
+        //     newResults
+        //   );
+        // }
+        // // Global (apply to both inbound and outbound results) filters
+        // newResults = this.filterByDepartureTime(
+        //   filters.minDepartureTime,
+        //   filters.maxDepartureTime,
+        //   newResults
+        // );
+        // newResults = this.filterByArrivalTime(
+        //   filters.minArrivalTime,
+        //   filters.maxArrivalTime,
+        //   newResults
+        // );
+        // newResults = this.filterResultsByStops(filters.stops, newResults);
+        // newResults = this.filterByPrice(
+        //   filters.minPrice,
+        //   filters.maxPrice,
+        //   newResults
+        // );
+        // return newResults;
+    }
     filterByDuration(minDuration, maxDuration, results, isReturn = false) {
         results = results.filter((result) => {
             var _a;
@@ -8454,39 +8884,6 @@ class EurostarEnterpriseSearch extends BaseEnterpriseSearch {
         }
         return results;
     }
-    createFilters(results = []) {
-        const minPrice = this.getMinPrice(results);
-        const maxPrice = this.getMaxPrice(results);
-        const newFilters = {
-            stops: this.getAllStops(results),
-            mustInclude: [],
-            classes: this.getAllClasses(results),
-            airlines: this.getAllAirlines(results),
-            travelPolicy: [],
-            depatureAirport: this.getAllDepartureAirports(results),
-            arrivalAirport: this.getAllArrivalAirports(results),
-            minPrice,
-            maxPrice,
-            depatureReturnAirport: this.getAllDepartureAirports(results, true),
-            arrivalReturnAirport: this.getAllArrivalAirports(results, true),
-            baggage: this.getBaggage(results),
-            fareTypes: [],
-            minDuration: this.getMinDuration(results),
-            maxDuration: this.getMaxDuration(results),
-            minReturnDuration: this.getMinDuration(results, true),
-            maxReturnDuration: this.getMaxDuration(results, true),
-            minDepartureTime: this.getMinDepartureTime(results),
-            maxDepartureTime: this.getMaxDepartureTime(results),
-            minArrivalTime: this.getMinArrivalTime(results),
-            maxArrivalTime: this.getMaxArrivalTime(results),
-            minReturnDepartureTime: this.getMinReturnDepartureTime(results),
-            maxReturnDepartureTime: this.getMaxReturnDepartureTime(results),
-            maxReturnArrivalTime: this.getMaxReturnArrivalTime(results),
-            minReturnArrivalTime: this.getMinReturnArrivalTime(results),
-            flightNumber: ''
-        };
-        return newFilters;
-    }
     getMinDuration(results, isReturn = false) {
         let min = 0;
         results.forEach((result) => {
@@ -8829,9 +9226,7 @@ class EurostarEnterpriseSearch extends BaseEnterpriseSearch {
                     outboundFlights: [
                         this.makeSchemaFlights(this.selectedEurostarFare.fare, 'outbound', 0)
                     ],
-                    inboundFlights: [
-                        this.makeSchemaFlights(fare.fare, 'inbound', 0)
-                    ],
+                    inboundFlights: [this.makeSchemaFlights(fare.fare, 'inbound', 0)],
                     journeyType: 'roundtrip'
                 }, selectedEurostar.dateDeparture, this.selectedGroupEurostar.dateArrival);
                 this.results.next(this.fullResults);
@@ -8839,17 +9234,17 @@ class EurostarEnterpriseSearch extends BaseEnterpriseSearch {
         });
     }
     updateLowestPrice(results) {
-        return null;
-        // add in once filght result is updated///
-        // const results = this.storageService.getSessionItemAsList<FlightQuoteResultArray>(this.resultsSessionName) || [] as FlightQuoteResultArray;
-        // if(!results.length) return;
-        // this._cheapestResultPrice.currencyCode = results[0].total.currency;
-        // results.map(result => {
-        //   const price = result.total.price;
-        //   if( this._cheapestResultPrice.amount > price ||  this._cheapestResultPrice.amount === null){
-        //     this._cheapestResultPrice.amount = price;
-        //   }
-        // })
+        if (!results.length)
+            return;
+        const result = results[0];
+        const journeys = result.journeys;
+        const currency = journeys[0].total.currency;
+        return journeys.reduce((cheapestPrice, result) => {
+            const price = result.total.price;
+            if (cheapestPrice.amount > price)
+                cheapestPrice.amount = price;
+            return cheapestPrice;
+        }, { amount: Number.MAX_SAFE_INTEGER, currencyCode: currency });
     }
     doBooking(intBasket, selectedFlight, schemaDetails, outboundDate, inboundDate) {
         const { sourceId, co2PerItem, co2PerPassenger, total } = selectedFlight;
@@ -8968,7 +9363,9 @@ class EurostarEnterpriseSearch extends BaseEnterpriseSearch {
             if (basket) {
                 const { sourceId, co2PerItem, co2PerPassenger, total } = eurostarQuote;
                 const outboundDate = moment(eurostarQuote.outboundFlights[0].dateTimeDeparting);
-                const inboundDate = eurostarQuote.inboundFlights.length ? moment(eurostarQuote.inboundFlights[0].dateTimeDeparting) : null;
+                const inboundDate = eurostarQuote.inboundFlights.length
+                    ? moment(eurostarQuote.inboundFlights[0].dateTimeDeparting)
+                    : null;
                 const schemaDetails = {
                     outboundFlights: [
                         ...eurostarQuote.outboundFlights.map((flight, segmentIndex) => this.makeSchemaFlights(flight, 'outbound', 0, segmentIndex))
@@ -9023,6 +9420,7 @@ class RailEnterpriseSearch extends BaseEnterpriseSearch {
         this.basketService = basketService;
         this.searchService = searchService;
         this.resultsSessionName = RailEnterpriseSearch.STORAGE_SESSION_RESULTS;
+        this.multiResultsSessionName = RailEnterpriseSearch.STORAGE_SESSION_RESULTS;
         this.searchTypes = [
             { display: 'Return', value: RailJourneyType.ReturnJourney },
             { display: 'One-Way', value: RailJourneyType.SingleJourney }
@@ -10321,21 +10719,66 @@ RailEnterpriseSearch.STORAGE_SESSION_PARAMS = 'search_rail';
 RailEnterpriseSearch.STORAGE_SESSION_RESULTS = 'rail_results';
 RailEnterpriseSearch.PASSING_POINT = 'Passing';
 
+var ages;
+(function (ages) {
+    ages["Child"] = "Child";
+    ages["Youth"] = "Youth";
+    ages["Adult"] = "Adult";
+    ages["Senior"] = "Senior";
+})(ages || (ages = {}));
+// @dynamic
+class TravellerObject {
+    static hasItem(item) {
+        return !!item;
+    }
+    static fullname(traveller) {
+        return [traveller.title, traveller.forename, traveller.surname].filter(this.hasItem).join(' ');
+    }
+    static makeTravellerObjectFromUser(user) {
+        return {
+            id: user.user_id.toString(),
+            forename: user.forename,
+            surname: user.surname,
+            email: user.username,
+            title: user.title,
+            isChild: false,
+            isInfant: false,
+            childDOB: null,
+            guest: false,
+            name: user.surname + ' ' + user.forename
+        };
+    }
+    static equals(first, second) {
+        return first.email === second.email;
+    }
+    static compare(first, second) {
+        const name1 = TravellerObject.fullname(first);
+        const name2 = TravellerObject.fullname(second);
+        if (name1 === name2) {
+            return 0;
+        }
+        if (name1 < name2) {
+            return -1;
+        }
+        return 1;
+    }
+}
+
 var IrlSearchCriteria;
 (function (IrlSearchCriteria) {
     IrlSearchCriteria["Depart"] = "Depart After";
     IrlSearchCriteria["Arrive"] = "Arrive Before";
 })(IrlSearchCriteria || (IrlSearchCriteria = {}));
 class IRLEnterpriseSearch extends BaseEnterpriseSearch {
-    constructor(Irlfetcher, 
-    // private getRailStationFetcher: BaseGetRailStationFetcher<GRS_Q>, // doesnt exist yet
-    helpers, basketService, storageService, searchService) {
+    constructor(Irlfetcher, searchIrlStationsFetcher, helpers, basketService, storageService, searchService) {
         super(storageService);
         this.Irlfetcher = Irlfetcher;
+        this.searchIrlStationsFetcher = searchIrlStationsFetcher;
         this.helpers = helpers;
         this.basketService = basketService;
         this.searchService = searchService;
         this.resultsSessionName = IRLEnterpriseSearch.STORAGE_SESSION_RESULTS;
+        this.multiResultsSessionName = IRLEnterpriseSearch.STORAGE_SESSION_RESULTS;
         this.searchTypes = [
             { display: 'Return', value: IrlJourneyType.ReturnJourney },
             { display: 'One-Way', value: IrlJourneyType.SingleJourney }
@@ -10347,8 +10790,8 @@ class IRLEnterpriseSearch extends BaseEnterpriseSearch {
             { display: 'Standard', value: IrlClass.Standard },
             { display: 'First', value: IrlClass.First }
         ];
-        this.ageRanges = [{ key: 'child', value: 'Child (0-3)' }, { key: 'child', value: 'Child (4-5)' }, { key: 'child', value: 'Child (6-11)' }, { key: 'youth', value: 'Youth (12-14)' }, { key: 'youth', value: 'Youth (15-25)' }, { key: 'adult', value: 'Adult (26-59)' }, { key: 'senior', value: 'Senior (60+)' }];
-        this.railCriteria = [IrlSearchCriteria.Depart, IrlSearchCriteria.Arrive];
+        this.ageRanges = [{ key: ages.Child, value: 'Child (0-3)' }, { key: ages.Child, value: 'Child (4-5)' }, { key: ages.Child, value: 'Child (6-11)' }, { key: ages.Youth, value: 'Youth (12-14)' }, { key: ages.Youth, value: 'Youth (15-25)' }, { key: ages.Adult, value: 'Adult (26-59)' }, { key: ages.Youth, value: 'Senior (60+)' }];
+        this.irlCriteria = [IrlSearchCriteria.Depart, IrlSearchCriteria.Arrive];
         this.travelCards = [
             { display: 'Young persons railcard', value: 'YNG' },
             { display: 'Disability railcard', value: 'DIS' },
@@ -10377,22 +10820,6 @@ class IRLEnterpriseSearch extends BaseEnterpriseSearch {
         this._children = 0;
         this._returnDepartureDateTime = null;
         this._ageRange = null;
-        // get outboundCriteria(): IrlSearchCriteria {
-        //   return this.tempParams.outboundCriteria;
-        // }
-        // set outboundCriteria(newCrit: IrlSearchCriteria) {
-        //   // console.warn(`+++ Setting New Criteria: ${newCrit} +++`);
-        //   this.tempParams.outboundCriteria = newCrit;
-        //   this._isValid();
-        // }
-        // ! might not need this?
-        // get inBoundDateTime(): moment.Moment {
-        //   return this.tempParams.inBoundDateTime;
-        // }
-        // set inBoundDateTime(newDateTime: moment.Moment) {
-        //   this.tempParams.inBoundDateTime = moment(newDateTime);
-        //   this._isValid();
-        // }
         // !date and time is handled differently for LU
         this._outbound_date = null;
         this._outbound_time = null;
@@ -10401,7 +10828,7 @@ class IRLEnterpriseSearch extends BaseEnterpriseSearch {
         this._cheapestStandard = null;
         this._cheapestFirst = null;
         this._irlClass = null;
-        this._journeytype = null;
+        this._journeytype = IrlJourneyType.SingleJourney;
         const data = storageService.getSessionItem(IRLEnterpriseSearch.STORAGE_SESSION_PARAMS) || {
             query: {},
             tempParams: {},
@@ -10412,7 +10839,10 @@ class IRLEnterpriseSearch extends BaseEnterpriseSearch {
         if (searchService.shouldAddTravellerSubscription()) {
             searchService.travellerInformation.subscribe((travellers) => {
                 this.travellers = travellers;
-                const splitTravellers = this.helpers.selectedTravellers(travellers, ServiceType.Rail);
+                if (this.travellers[0] && !this.travellers[0].ageType) {
+                    this.travellers[0].ageType = ages.Adult;
+                }
+                const splitTravellers = this.helpers.selectedTravellers(travellers, ServiceType.InternationalRail);
                 this.tempParams.adults = splitTravellers.adults.length;
                 this.tempParams.children = splitTravellers.children.length;
                 this.travellers = travellers;
@@ -10510,6 +10940,7 @@ class IRLEnterpriseSearch extends BaseEnterpriseSearch {
         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;
+            this.supplier = tt.railstation.supplier;
         }
         this._isValid();
     }
@@ -10534,8 +10965,13 @@ class IRLEnterpriseSearch extends BaseEnterpriseSearch {
     get outboundDepartureDateTime() {
         return this._outboundDepartureDateTime;
     }
-    set outboundDepartureDateTime(data) {
-        this._outboundDepartureDateTime = data;
+    set outboundDepartureDateTime(newDateTime) {
+        this._outboundDepartureDateTime = newDateTime;
+        this._outbound_date = this.helpers.momentToNgDate(newDateTime);
+        this._outbound_time = moment(newDateTime).format('HHmm')
+            ? moment(newDateTime).format('HHmm')
+            : '0700';
+        this._updateOutboundDateTime();
     }
     get departureLocationId() {
         return this._departureLocationId;
@@ -10564,8 +11000,13 @@ class IRLEnterpriseSearch extends BaseEnterpriseSearch {
     get returnDepartureDateTime() {
         return this._returnDepartureDateTime;
     }
-    set returnDepartureDateTime(data) {
-        this._returnDepartureDateTime = data;
+    set returnDepartureDateTime(newDateTime) {
+        this._returnDepartureDateTime = newDateTime;
+        this._return_date = this.helpers.momentToNgDate(newDateTime);
+        this._return_time = moment(newDateTime).format('HHmm')
+            ? moment(newDateTime).format('HHmm')
+            : '0700';
+        this._updateReturnDateTime();
     }
     get ageRange() {
         return this._ageRange;
@@ -10593,13 +11034,38 @@ class IRLEnterpriseSearch extends BaseEnterpriseSearch {
             month: newDateTime.month() + 1,
             day: newDateTime.date()
         };
-        // if (
-        //   this.outBoundDateTime &&
-        //   // this.inBoundDateTime &&
-        //   this.outBoundDateTime.isAfter(this.inBoundDateTime)
-        // ) {
-        //   this.inBoundDateTime = this.outBoundDateTime.clone().add(1, 'day');
-        // }
+        if (newDateTime && newDateTime.isValid()) {
+            this._outbound_date = this.helpers.momentToNgDate(newDateTime);
+            this._outbound_time = moment(newDateTime).format('HHmm')
+                ? moment(newDateTime).format('HHmm')
+                : '0700';
+        }
+        if (this.outBoundDateTime &&
+            this.inBoundDateTime &&
+            this.outBoundDateTime.isAfter(this.inBoundDateTime)) {
+            this.inBoundDateTime = this.outBoundDateTime.clone().add(1, 'day');
+        }
+        this._isValid();
+    }
+    get outboundCriteria() {
+        return this.tempParams.outboundCriteria;
+    }
+    set outboundCriteria(newCrit) {
+        // console.warn(`+++ Setting New Criteria: ${newCrit} +++`);
+        this.tempParams.outboundCriteria = newCrit;
+        this._isValid();
+    }
+    get inBoundDateTime() {
+        return this.tempParams.returnDepartureDateTime;
+    }
+    set inBoundDateTime(newDateTime) {
+        this.tempParams.returnDepartureDateTime = newDateTime;
+        if (newDateTime && newDateTime.isValid()) {
+            this._return_date = this.helpers.momentToNgDate(newDateTime);
+            this._return_time = moment(newDateTime).format('HHmm')
+                ? moment(newDateTime).format('HHmm')
+                : '1600';
+        }
         this._isValid();
     }
     get outbound_date() {
@@ -10630,13 +11096,13 @@ class IRLEnterpriseSearch extends BaseEnterpriseSearch {
         this._return_time = value;
         this._updateReturnDateTime();
     }
-    // get returnCriteria(): IrlSearchCriteria {
-    //   return this.tempParams.returnCriteria;
-    // }
-    // set returnCriteria(newCrit: IrlSearchCriteria) {
-    //   this.tempParams.returnCriteria = newCrit;
-    //   this._isValid();
-    // }
+    get returnCriteria() {
+        return this.tempParams.returnCriteria;
+    }
+    set returnCriteria(newCrit) {
+        this.tempParams.returnCriteria = newCrit;
+        this._isValid();
+    }
     // set railCards(newRailCards: string[]) {
     //   this.tempParams.railCards = newRailCards;
     //   this._isValid();
@@ -10769,11 +11235,14 @@ class IRLEnterpriseSearch extends BaseEnterpriseSearch {
     _updateReturnDateTime() {
         if (this._return_date && this._return_time) {
             const time = this.helpers.ngDateToMoment(this._return_date, this._return_time);
-            // this.inBoundDateTime = time.isValid() ? time : null;
+            this.inBoundDateTime = time.isValid() ? time : null;
             this._isValid();
         }
     }
     getSearchQuery() {
+        // this.travellers = travellers;
+        this.noOfAdults = this.travellers.filter((traveller) => traveller.ageType === ages.Adult || traveller.ageType === ages.Youth || traveller.ageType === ages.Senior).length;
+        this.noOfChildren = this.travellers.filter((traveller) => traveller.ageType === ages.Child).length;
         const query = {
             supplier: this.supplier,
             countryCode: 'GB',
@@ -10785,14 +11254,14 @@ class IRLEnterpriseSearch extends BaseEnterpriseSearch {
             adults: this.tempParams.adults,
             children: this.tempParams.children,
             returnDepartureDateTime: this.tempParams.returnDepartureDateTime,
-            journeyType: this.tempParams.journeyType,
+            journeyType: this.journeyType,
         };
         if (this.tempParams.children === 0) {
             query.children = null;
         }
         // switch (this.tempParams.outboundCriteria) {
         //   case IrlSearchCriteria.Depart:
-        //     query.outboundArrivalDateTime = null;
+        //     query.outboundDepartureDateTime = null;
         //     break;
         //   case IrlSearchCriteria.Arrive:
         //     query.outboundDepartureDateTime = null;
@@ -10804,7 +11273,7 @@ class IRLEnterpriseSearch extends BaseEnterpriseSearch {
         // }
         // switch (this.tempParams.returnCriteria) {
         //   case IrlSearchCriteria.Depart:
-        //     query.returnArrivalDateTime = null;
+        //     query.returnDepartureDateTime = null;
         //     break;
         //   case IrlSearchCriteria.Arrive:
         //     query.returnDepartureDateTime = null;
@@ -11205,78 +11674,85 @@ class IRLEnterpriseSearch extends BaseEnterpriseSearch {
         }
         return legs;
     }
-    // async addSingleJourneyToBasket(
-    //   serviceId: string,
-    //   railQuery: SearchRailQueryVariables,
-    //   railJourneyOption: RailJourneyOption,
-    //   railTicketGroup: RailTicketGroup
-    // ): Promise<boolean> {
-    //   if (railJourneyOption.unsellable) {
-    //     return Promise.resolve(false);
-    //   }
-    //   const intBasket: InternalBasketInterface =
-    //     await this.basketService.getDefaultBasket();
-    //   const basket = intBasket?.subject.value;
-    //   if (basket) {
-    //     const selectedRailTicketOption = this.getSelectedRailTicketOption(
-    //       railJourneyOption,
-    //       railTicketGroup,
-    //       0
-    //     );
-    //     const legs = this.getLegsFromRailJourneyOption(railJourneyOption);
-    //     const ticketQueueList = selectedRailTicketOption.ticketQueueList.map(
-    //       (ticketQueueList) => {
-    //         return {
-    //           id: ticketQueueList.id,
-    //           name: ticketQueueList.name,
-    //           type: ticketQueueList.type
-    //         };
-    //       }
-    //     );
-    //     return this.basketService.addToBasket(
-    //       {
-    //         basket: basket.id,
-    //         service: serviceId,
-    //         detail: {
-    //           outwardDetail: {
-    //             arrivalDateTime: railJourneyOption.arriveDateTime,
-    //             arrivalStationName: railJourneyOption.to,
-    //             departureDateTime: railJourneyOption.departDateTime,
-    //             departureStationName: railJourneyOption.from,
-    //             supplierTickets: [
-    //               {
-    //                 supplierName: railJourneyOption.providers[0].name,
-    //                 ticketDescription: selectedRailTicketOption.type,
-    //                 price: selectedRailTicketOption.price,
-    //                 legs
-    //               }
-    //             ]
-    //           },
-    //           transactionIdentifier:
-    //             railJourneyOption.identifiers.transactionIdentifier,
-    //           outbound: {
-    //             fareIdentifiers: [
-    //               selectedRailTicketOption.identifiers.fareIdentifier
-    //             ],
-    //             journeyIdentifier:
-    //               selectedRailTicketOption.identifiers.journeyIdentifier
-    //           },
-    //           ticketQueueList
-    //         },
-    //         adults: railQuery.adults,
-    //         price: selectedRailTicketOption.price,
-    //         currency: selectedRailTicketOption.currency as CurrencyCode,
-    //         searchQuery: railQuery,
-    //         co2PerItem: railJourneyOption.co2PerItem,
-    //         co2PerPassenger: railJourneyOption.co2PerPassenger
-    //       },
-    //       intBasket,
-    //       this.searchService,
-    //       this.travellers
-    //     );
-    //   }
-    //   return Promise.resolve(false);
-    // }
+    addSingleJourneyToBasket(serviceId, railQuery, irlJourneyOption) {
+        return __awaiter(this, void 0, void 0, function* () {
+            console.log(serviceId, railQuery, irlJourneyOption);
+            // if (irlJourneyOption.unsellable) {
+            //   return Promise.resolve(false);
+            // }
+            const intBasket = yield this.basketService.getDefaultBasket();
+            const basket = intBasket === null || intBasket === void 0 ? void 0 : intBasket.subject.value;
+            if (basket) {
+                // const selectedIrlTicketOption = this.getSelectedIrlTicketOption(
+                //   irlJourneyOption,
+                //   railTicketGroup,
+                //   0
+                // );
+                // const legs = this.getLegsFromRailJourneyOption(railJourneyOption);
+                // const ticketQueueList = selectedIrlTicketOption.ticketQueueList.map(
+                //   (ticketQueueList) => {
+                //     return {
+                //       id: ticketQueueList.id,
+                //       name: ticketQueueList.name,
+                //       type: ticketQueueList.type
+                //     };
+                //   }
+                // );
+                //   const basketItem = {
+                //     basket: basket.id,
+                //     service: serviceId,
+                //     detail: {
+                //       // accountsList: irlJourneyOption.accountsList.map(
+                //       //   (account: RailAccount) => {
+                //       //     return { id: account.id, description: account.description };
+                //       //   }
+                //       // ),
+                //       outwardDetail: {
+                //         arrivalDateTime: railJourneyOption.arriveDateTime,
+                //         arrivalStationName: railJourneyOption.to,
+                //         departureDateTime: railJourneyOption.departDateTime,
+                //         departureStationName: railJourneyOption.from,
+                //         supplierTickets: [
+                //           {
+                //             supplierName: railJourneyOption.providers[0].name,
+                //             ticketDescription: selectedRailTicketOption.type,
+                //             price: selectedRailTicketOption.price,
+                //             legs
+                //           }
+                //         ]
+                //       },
+                //       transactionIdentifier:
+                //         railJourneyOption.identifiers.transactionIdentifier,
+                //       outbound: {
+                //         fareIdentifiers: [
+                //           selectedRailTicketOption.identifiers.fareIdentifier
+                //         ],
+                //         journeyIdentifier: selectedRailTicketOption.identifiers.journeyIdentifier
+                //       },
+                //       ticketQueueList
+                //     },
+                //     adults: railQuery.adults,
+                //     price: selectedRailTicketOption.price,
+                //     currency: selectedRailTicketOption.currency as CurrencyCode,
+                //     searchQuery: railQuery,
+                //     // co2PerItem: irlJourneyOption.co2PerItem,
+                //     // co2PerPassenger: irlJourneyOption.co2PerPassenger,
+                //     outboundDate: irlJourneyOption.
+                //   }
+                //   // if outTicketExtras exists add the object to basketItem
+                //   if (outTicketExtras) {
+                //     basketItem.detail.outbound.ticketExtras = outTicketExtras;
+                //   }
+                //   return this.basketService.addToBasket(
+                //     basketItem,
+                //     intBasket,
+                //     this.searchService,
+                //     this.travellers
+                //   );
+            }
+            return Promise.resolve(false);
+        });
+    }
     // async addReturnJourneyToBasket(
     //   serviceId: string,
     //   railQuery: SearchRailQueryVariables,
@@ -11890,7 +12366,7 @@ class BaseIrlQuoteFetcher extends FetchableList {
     }
     getDataFromResult(results) {
         var _a, _b;
-        return (_b = (_a = results === null || results === void 0 ? void 0 : results.data) === null || _a === void 0 ? void 0 : _a.searchIrl) === null || _b === void 0 ? void 0 : _b.results;
+        return (_b = (_a = results === null || results === void 0 ? void 0 : results.data) === null || _a === void 0 ? void 0 : _a.searchIRL) === null || _b === void 0 ? void 0 : _b.results;
     }
 }
 
@@ -12051,6 +12527,16 @@ class BaseConfermaOfficeNamesFetcher extends FetchableList {
     }
 }
 
+class BaseConfermaOfficeFetcher extends FetchableObject {
+    constructor(getUserAddressGQL, modalService) {
+        super(getUserAddressGQL, modalService);
+    }
+    getDataFromResult(results) {
+        var _a;
+        return (_a = results === null || results === void 0 ? void 0 : results.data) === null || _a === void 0 ? void 0 : _a.getConfermaOffice;
+    }
+}
+
 class BaseGetUserCurrentCarbonAllowanceFetcher extends FetchableList {
     constructor(getUserBasketsGQL, helpers, modalService) {
         super(getUserBasketsGQL, helpers, modalService);
@@ -12100,6 +12586,18 @@ class BaseEurostarQuoteFetcher extends FetchableList {
     }
 }
 
+class BaseSearchIrlStationsFetcher extends FetchableList {
+    constructor(gql, helpers, modalService) {
+        super(gql, helpers, modalService);
+    }
+    getDataFromResult(results) {
+        var _a;
+        return (_a = results === null || results === void 0 ? void 0 : results.data) === null || _a === void 0 ? void 0 : _a.searchIRLSupplierStations;
+    }
+}
+
+// | 'fareTypes';
+
 /**
  * @desc Known reg expresions
  */
@@ -12183,44 +12681,6 @@ class AuthInfo {
     }
 }
 
-// @dynamic
-class TravellerObject {
-    static hasItem(item) {
-        return !!item;
-    }
-    static fullname(traveller) {
-        return [traveller.title, traveller.forename, traveller.surname].filter(this.hasItem).join(' ');
-    }
-    static makeTravellerObjectFromUser(user) {
-        return {
-            id: user.user_id.toString(),
-            forename: user.forename,
-            surname: user.surname,
-            email: user.username,
-            title: user.title,
-            isChild: false,
-            isInfant: false,
-            childDOB: null,
-            guest: false,
-            name: user.surname + ' ' + user.forename
-        };
-    }
-    static equals(first, second) {
-        return first.email === second.email;
-    }
-    static compare(first, second) {
-        const name1 = TravellerObject.fullname(first);
-        const name2 = TravellerObject.fullname(second);
-        if (name1 === name2) {
-            return 0;
-        }
-        if (name1 < name2) {
-            return -1;
-        }
-        return 1;
-    }
-}
-
 const TEMPID = 'TEMPID_';
 class InternalBasket {
     constructor(basket, helpers, basketService, getUserFetcher) {
@@ -12635,6 +13095,7 @@ class BaseEnterpriseBasketService {
         const validateSearchSchema = ajv.compile(serviceToCheck.searchQuerySchema);
         // if there are any moment date objects in the searchQuery object convert these to date-time strings
         item.searchQuery = this.helpers.sanitizeMomentDates(item.searchQuery);
+        item.detail = this.helpers.removeNulls(item.detail);
         if (!validateSearchSchema(item.searchQuery)) {
             const error = `Item searchQuery is not valid for ${serviceToCheck.name} search schema.`;
             console.warn('searchSchema', serviceToCheck.searchQuerySchema);
@@ -12823,7 +13284,7 @@ class BaseEnterpriseBasketService {
         });
     }
     sendBasketForApproval(basketid) {
-        this.updateBasket(basketid, this.sendBasketForApprovalUpdater
+        return this.updateBasket(basketid, this.sendBasketForApprovalUpdater
             .updateOne({ basket: basketid })
             .pipe(take(1)));
     }
@@ -14841,7 +15302,7 @@ var TravellerSearchTypes;
     TravellerSearchTypes["employeeNumber"] = "employeeNumber";
 })(TravellerSearchTypes || (TravellerSearchTypes = {}));
 class BaseEnterpriseSearchService {
-    constructor(searchAirportsFetcher, searchAirlinesFetcher, storageService, userService, router, helpers, hotelAvalibilityService, citiesFetcher, confermaCitiesFetcher, postcodeFetcher, railStationFetcher, saveUserAddressUpdater, userAddressesFetcher, basketService, getUserCompanyOfficesFetcher, searchHotelChainsFetcher, baseValidateIsPostcodeValidTester, depotFetcher, confermaOfficeNamesFetcher, baseDeleteUserAddressUpdater, baseDeleteRecentSearchUpdater, baseSaveRecentSearchUpdater, getUserCurrentCarbonAllowanceFetcher, environment, loungeFetcher, parkingFetcher, httpCallService, flightFetcher, hotelFetcher, carhireFetcher, carHireAvailabilityDetailFetcher, cabhireFetcher, railFetcher, irlFetcher, getRailStationFetcher, baseWebTokenService, riskAlertsFetcher, quicklistFetcher, getUserRecentSearchesFetcher, getRailCardsFetcher, eurostarFetcher, searchUsersCanBookForFetcher) {
+    constructor(searchAirportsFetcher, searchAirlinesFetcher, storageService, userService, router, helpers, hotelAvalibilityService, citiesFetcher, confermaCitiesFetcher, postcodeFetcher, railStationFetcher, saveUserAddressUpdater, userAddressesFetcher, basketService, getUserCompanyOfficesFetcher, searchHotelChainsFetcher, baseValidateIsPostcodeValidTester, depotFetcher, confermaOfficeNamesFetcher, confermaOfficeFetcher, baseDeleteUserAddressUpdater, baseDeleteRecentSearchUpdater, baseSaveRecentSearchUpdater, getUserCurrentCarbonAllowanceFetcher, environment, loungeFetcher, parkingFetcher, httpCallService, flightFetcher, hotelFetcher, carhireFetcher, carHireAvailabilityDetailFetcher, cabhireFetcher, railFetcher, irlFetcher, getRailStationFetcher, baseWebTokenService, riskAlertsFetcher, quicklistFetcher, getUserRecentSearchesFetcher, getRailCardsFetcher, eurostarFetcher, searchUsersCanBookForFetcher, searchIrlStationsFetcher) {
         this.searchAirportsFetcher = searchAirportsFetcher;
         this.searchAirlinesFetcher = searchAirlinesFetcher;
         this.storageService = storageService;
@@ -14861,6 +15322,7 @@ class BaseEnterpriseSearchService {
         this.baseValidateIsPostcodeValidTester = baseValidateIsPostcodeValidTester;
         this.depotFetcher = depotFetcher;
         this.confermaOfficeNamesFetcher = confermaOfficeNamesFetcher;
+        this.confermaOfficeFetcher = confermaOfficeFetcher;
         this.baseDeleteUserAddressUpdater = baseDeleteUserAddressUpdater;
         this.baseDeleteRecentSearchUpdater = baseDeleteRecentSearchUpdater;
         this.baseSaveRecentSearchUpdater = baseSaveRecentSearchUpdater;
@@ -14871,6 +15333,7 @@ class BaseEnterpriseSearchService {
         this.getUserRecentSearchesFetcher = getUserRecentSearchesFetcher;
         this.getRailCardsFetcher = getRailCardsFetcher;
         this.searchUsersCanBookForFetcher = searchUsersCanBookForFetcher;
+        this.searchIrlStationsFetcher = searchIrlStationsFetcher;
         this.traveller_error = false;
         this.travellerInformation = new BehaviorSubject([]);
         this.errors = new BehaviorSubject([]);
@@ -14895,9 +15358,7 @@ class BaseEnterpriseSearchService {
             [ServiceType.Hotel]: new HotelEnterpriseSearch(hotelFetcher, helpers, userService, environment, hotelAvalibilityService, basketService, storageService, this, httpCallService, quicklistFetcher, getRailStationFetcher),
             [ServiceType.Car]: new CarhireEnterpriseSearch(carhireFetcher, carHireAvailabilityDetailFetcher, helpers, basketService, storageService, this),
             [ServiceType.Cab]: new CabHireEnterpriseSearch(cabhireFetcher, helpers, storageService, this, basketService),
-            [ServiceType.InternationalRail]: new IRLEnterpriseSearch(irlFetcher, 
-            // getRailStationFetcher,
-            helpers, basketService, storageService, this),
+            [ServiceType.InternationalRail]: new IRLEnterpriseSearch(irlFetcher, searchIrlStationsFetcher, helpers, basketService, storageService, this),
             [ServiceType.FastTrack]: null,
             [ServiceType.Coach]: null,
             [ServiceType.Rail]: new RailEnterpriseSearch(railFetcher, getRailStationFetcher, helpers, basketService, storageService, this),
@@ -15153,6 +15614,23 @@ class BaseEnterpriseSearchService {
     getSelectedPlaceById(placeId) {
         return this.selectedPlaces.find((place) => place.place_id === placeId);
     }
+    getConfirmaOffices(term) {
+        if ((term === null || term === void 0 ? void 0 : term.length) > 2) {
+            const obs = this.confermaOfficeNamesFetcher.fetchList();
+            const func = (results) => {
+                const data = results.results.map((result) => {
+                    return {
+                        name: result.name,
+                        type: LocationTypes.Office,
+                        id: result.id
+                    };
+                });
+                return data;
+            };
+            return obs.pipe(take(1), map(func));
+        }
+        return of([]);
+    }
     /*
      * @description - get the list of Office locations based on search term given
      * @todo - fill this out so that it actually performs a http call
@@ -15200,6 +15678,31 @@ class BaseEnterpriseSearchService {
             return of([]);
         }
     }
+    searchIrlStationsLocations(term, isLoading) {
+        if (term.length > 2) {
+            isLoading === null || isLoading === void 0 ? void 0 : isLoading.next(true);
+            return this.searchIrlStationsFetcher
+                .fetchList({
+                query: term
+            })
+                .pipe(take(1), map((results) => {
+                if (isLoading) {
+                    isLoading.next(false);
+                }
+                return results
+                    .map((result) => {
+                    return {
+                        type: LocationTypes.TrainStation,
+                        name: `${result.name} (${result.supplier})`,
+                        railstation: result
+                    };
+                });
+            }));
+        }
+        else {
+            return of([]);
+        }
+    }
     /**
      * @description - get hotel locations, these should be city, office, airport, railstation
      * @todo - fill this out for the other location types, may need to mergeMap them or some other rxjs magic
@@ -15218,7 +15721,7 @@ class BaseEnterpriseSearchService {
                     this.getAirportLocations(term, countryCode, isLoading),
                     this.getCityLocations(term, countryCode, isLoading),
                     this.getStationLocations(term, isLoading),
-                    this.getOfficeLocations(term)
+                    this.getConfirmaOffices(term)
                 ]).pipe(map((results) => {
                     if (isLoading === null || isLoading === void 0 ? void 0 : isLoading.value) {
                         isLoading.next(false);
@@ -15649,6 +16152,18 @@ class BaseEnterpriseSearchService {
         }));
         isLoading === null || isLoading === void 0 ? void 0 : isLoading.next(false);
     }
+    getOffice(officeId) {
+        if (officeId) {
+            return this.confermaOfficeFetcher.fetchOne({ officeId }).pipe(take(1), map((results) => {
+                if (results) {
+                    return results.results;
+                }
+            }));
+        }
+        else {
+            return of();
+        }
+    }
     getRailCards() {
         return this.getRailCardsFetcher.fetchList().pipe(take(1), map((results) => {
             if (results) {
@@ -15934,23 +16449,24 @@ class BaseEnterpriseSearchService {
     }
     /*
      * Creates a Rail search query with supplied params, auto fills with defaults if fields are empty.
-     * @param  {any}                    ...args Example - searchService.makeRailQuery(data.query, { override: "property" })
+     * @param  {any}                    ...args Example - searchService.makeIrlQuery(data.query, { override: "property" })
      * @return {QuerySearchRailArgs}         Returns QuerySearchRailArgs type
      */
     makeIrlQuery(...args) {
         const time = this.helpers.momentRoundMinutes(moment(), 30);
         const defaultVal = {
+            returnCriteria: IrlSearchCriteria.Depart,
+            outboundCriteria: IrlSearchCriteria.Depart,
             supplier: null,
             countryCode: '',
-            // journeyType: this.journeyType, // IRLJourneyType!
+            journeyType: IrlJourneyType.ReturnJourney,
             class: null,
             outboundDepartureDateTime: time,
             departureLocationId: null,
             arrivalLocationId: null,
             adults: 0,
             children: 0,
-            returnDepartureDateTime: time,
-            journeyType: null
+            returnDepartureDateTime: time
         };
         return this.helpers.sanatizeReturns(defaultVal, Object.assign({}, ...args), ['returnDepartureDateTime', 'outboundDepartureDateTime']);
     }
@@ -16569,5 +17085,5 @@ class BaseSetPaymentOptionUpdater extends UpdateableObject {
  * Generated bundle index. Do not edit.
  */
 
-export { AbstractHttpCallService, ActionType, AddressImpl, AirportSearchMode, AuthInfo, BaseAcceptNewPriceUpdater, BaseAddItemToBasketUpdater, BaseAddUserToBasketItemUpdater, BaseBookBasketUpdater, BaseCabhireQuoteFetcher, BaseCarHireAvailabilityDetailFetcher, BaseCarhireQuoteFetcher, BaseConfermaOfficeNamesFetcher, BaseCreateBasketUpdater, BaseDeleteBasketUpdater, BaseDeleteRecentSearchUpdater, BaseDeleteUserAddressUpdater, BaseEnterpriseBasketService, BaseEnterpriseMyBookingsService, BaseEnterpriseSearch, BaseEnterpriseSearchService, BaseEnvironment, BaseEurostarQuoteFetcher, BaseEventMessenager, BaseFlightQuoteFetcher, BaseGetBasketFetcher, BaseGetMiAutoSugestionFetcher, BaseGetRailStationFetcher, BaseGetRailcardsFetcher, BaseGetRiskAlertsFetcher, BaseGetUserBasketsFetcher, BaseGetUserCompanyOfficesFetcher, BaseGetUserCurrentCarbonAllowanceFetcher, BaseGetUserFetcher, BaseGetUserRecentSearchesFetcher, BaseHelperRoutines, BaseHotelAvalibilityQuoteFetcher, BaseHotelAvalibilityService, BaseHotelQuoteFetcher, BaseIrlQuoteFetcher, BaseLogonService, BaseLoungeQuoteFetcher, BaseModalOpenerService, BaseNetworkCall, BaseParkingQuoteFetcher, BaseRailQuoteFetcher, BaseRemoveItemFromBasketUpdater, BaseRevalidateBasketUpdater, BaseRouteHappyService, BaseSaveRecentSearchUpdater, BaseSaveUserAddressUpdater, BaseSearchAirlinesFetcher, BaseSearchAirportsFetcher, BaseSearchCityFetcher, BaseSearchConfermaCityFetcher, BaseSearchConfermaQuicklistFetcher, BaseSearchDepotFetcher, BaseSearchHotelChainsFetcher, BaseSearchPostcodeFetcher, BaseSearchRailStationsFetcher, BaseSearchUsersCanBookForFetcher, BaseSendBasketForApprovalUpdater, BaseSetBasketItemLeadPassengerUpdater, BaseSetBasketItemMiGroupUpdater, BaseSetBasketItemMiValueUpdater, BaseSetPaymentOptionUpdater, BaseStorageService, BaseUpdateBasketNoteUpdater, BaseUpdateBasketTitleUpdater, BaseUserAddressesFetcher, BaseUserMessagesFetcher, BaseUserProductsFetcher, BaseUserService, BaseUserUiConfigsFetcher, BaseValidateIsPostcodeValidTester, BaseValidateMiFreeValueTester, BaseWebTokenService, BasemoveBasketItemToBasket, BasketInfoMiDetailsImpl, BookableBasket, BookingStatus, BreatfastTypes, CabHireEnterpriseSearch, CarhireEnterpriseSearch, EurostarClassEnum, EurostarEnterpriseSearch, EurostarSearchType, FlightDirectionEnum, FlightEnterpriseSearch, FlightSearchType, HotelEnterpriseSearch, HotelFilters, HotelPolicyEnum, HotelView, IRLEnterpriseSearch, IncludedType, InternalBasket, IrlSearchCriteria, LimitedCache, LocationTypes, LoginError, LoginErrorReason, LogoutEnum, LoungesEnterpriseSearch, MAX_TRAVELLERS, ManagementInfoAndIsValid, Memorise, MenuSlideEnum, ModalTypes, ParkingEnterpriseSearch, PhoneNumberImpl, RailDirection, RailEnterpriseSearch, RailSearchCriteria, RailTicketOptionType, RegExps, RiskLevelRanking, SchemaFormat, SearchHandler, ServiceProvider, SortMethod, SortTypes, SortTypesCar, SortTypesEurostar, SortTypesHotel, SupplementaryBookingInfoImpl, Suppliers, TaxiFormMode, TimeWindow, TravellerObject, TravellerSearchTypes, URLS, USER_SIGNEDIN, USER_SIGNEDOUT, UserFavorurite, UserInfoImpl, ValidatorChecker, Widgets, defaultValidations, excludedExpression, filtersKeys, includedExpression, makeManagamentInfo, ɵ0, FetchableList as ɵd, FetchableObject as ɵe, UpdateableObject as ɵf, BaseTester as ɵg };
+export { AbstractHttpCallService, ActionType, AddressImpl, AirportSearchMode, AuthInfo, BaseAcceptNewPriceUpdater, BaseAddItemToBasketUpdater, BaseAddUserToBasketItemUpdater, BaseBookBasketUpdater, BaseCabhireQuoteFetcher, BaseCarHireAvailabilityDetailFetcher, BaseCarhireQuoteFetcher, BaseConfermaOfficeFetcher, BaseConfermaOfficeNamesFetcher, BaseCreateBasketUpdater, BaseDeleteBasketUpdater, BaseDeleteRecentSearchUpdater, BaseDeleteUserAddressUpdater, BaseEnterpriseBasketService, BaseEnterpriseMyBookingsService, BaseEnterpriseSearch, BaseEnterpriseSearchService, BaseEnvironment, BaseEurostarQuoteFetcher, BaseEventMessenager, BaseFlightQuoteFetcher, BaseGetBasketFetcher, BaseGetMiAutoSugestionFetcher, BaseGetRailStationFetcher, BaseGetRailcardsFetcher, BaseGetRiskAlertsFetcher, BaseGetUserBasketsFetcher, BaseGetUserCompanyOfficesFetcher, BaseGetUserCurrentCarbonAllowanceFetcher, BaseGetUserFetcher, BaseGetUserRecentSearchesFetcher, BaseHelperRoutines, BaseHotelAvalibilityQuoteFetcher, BaseHotelAvalibilityService, BaseHotelQuoteFetcher, BaseIrlQuoteFetcher, BaseLogonService, BaseLoungeQuoteFetcher, BaseModalOpenerService, BaseNetworkCall, BaseParkingQuoteFetcher, BaseRailQuoteFetcher, BaseRemoveItemFromBasketUpdater, BaseRevalidateBasketUpdater, BaseRouteHappyService, BaseSaveRecentSearchUpdater, BaseSaveUserAddressUpdater, BaseSearchAirlinesFetcher, BaseSearchAirportsFetcher, BaseSearchCityFetcher, BaseSearchConfermaCityFetcher, BaseSearchConfermaQuicklistFetcher, BaseSearchDepotFetcher, BaseSearchHotelChainsFetcher, BaseSearchIrlStationsFetcher, BaseSearchPostcodeFetcher, BaseSearchRailStationsFetcher, BaseSearchUsersCanBookForFetcher, BaseSendBasketForApprovalUpdater, BaseSetBasketItemLeadPassengerUpdater, BaseSetBasketItemMiGroupUpdater, BaseSetBasketItemMiValueUpdater, BaseSetPaymentOptionUpdater, BaseStorageService, BaseUpdateBasketNoteUpdater, BaseUpdateBasketTitleUpdater, BaseUserAddressesFetcher, BaseUserMessagesFetcher, BaseUserProductsFetcher, BaseUserService, BaseUserUiConfigsFetcher, BaseValidateIsPostcodeValidTester, BaseValidateMiFreeValueTester, BaseWebTokenService, BasemoveBasketItemToBasket, BasketInfoMiDetailsImpl, BookableBasket, BookingStatus, BreatfastTypes, CabHireEnterpriseSearch, CarhireEnterpriseSearch, DEFAULT_FLIGHT_FILTERS, EurostarClassEnum, EurostarEnterpriseSearch, EurostarSearchType, FlightDirectionEnum, FlightEnterpriseSearch, FlightSearchType, FlightSortTypes, HotelEnterpriseSearch, HotelFilters, HotelPolicyEnum, HotelView, IRLEnterpriseSearch, IncludedType, InternalBasket, IrlSearchCriteria, LimitedCache, LocationTypes, LoginError, LoginErrorReason, LogoutEnum, LoungesEnterpriseSearch, MAX_TRAVELLERS, ManagementInfoAndIsValid, Memorise, MenuSlideEnum, ModalTypes, ParkingEnterpriseSearch, PhoneNumberImpl, RailDirection, RailEnterpriseSearch, RailSearchCriteria, RailTicketOptionType, RegExps, RiskLevelRanking, SchemaFormat, SearchHandler, ServiceProvider, SortMethod, SortTypesCar, SortTypesEurostar, SortTypesHotel, SupplementaryBookingInfoImpl, Suppliers, TaxiFormMode, TimeWindow, TravellerObject, TravellerSearchTypes, URLS, USER_SIGNEDIN, USER_SIGNEDOUT, UserFavorurite, UserInfoImpl, ValidatorChecker, Widgets, ages, defaultValidations, excludedExpression, filtersKeys, includedExpression, makeManagamentInfo, ɵ0, FetchableList as ɵd, FetchableObject as ɵe, UpdateableObject as ɵf, BaseTester as ɵg };
 //# sourceMappingURL=sabstravtech-obtservices-base.js.map