@sabstravtech/obtservices 0.0.3 → 0.0.19020100

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

@@ -20,6 +20,7 @@
             };
             this.isValid = new rxjs.BehaviorSubject(false);
             this.results = new rxjs.BehaviorSubject([]);
+            this.multiResults = new rxjs.BehaviorSubject([]);
             this.messages = new rxjs.BehaviorSubject([]);
             this.messagesInfo = new rxjs.BehaviorSubject([]);
             this.validationMessages = [];
@@ -28,6 +29,7 @@
             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 = function (results) {
                 return results;
             };
@@ -63,7 +65,7 @@
                 try {
                     results.pipe(operators.take(1)).subscribe(function (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);
@@ -84,10 +86,56 @@
                 }
             });
         };
+        BaseEnterpriseSearch.prototype._startMultiSearch = function (resultsArray) {
+            var _this = this;
+            this.isLoading.next(true);
+            this.fullMultiResults = [];
+            var allQueries = [];
+            resultsArray.forEach(function (results, index) {
+                allQueries.push(new Promise(function (resolve, reject) {
+                    try {
+                        results.pipe(operators.take(1)).subscribe(function (results1) {
+                            console.log('Got results', _.cloneDeep(results1));
+                            var 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);
+                        }, function (error) {
+                            _this.multiResults.next([]);
+                            resolve(false);
+                        });
+                    }
+                    catch (err) {
+                        _this.storageService.setSessionItem(_this.resultsSessionName, []);
+                        _this.multiResults.next([]);
+                        reject(err);
+                    }
+                }));
+            });
+            return Promise.all(allQueries).then(function (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;
+            });
+        };
         BaseEnterpriseSearch.prototype.reset = function () {
             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();
         };
         BaseEnterpriseSearch.prototype.makeSessionResults = function (data) {
@@ -800,9 +848,10 @@
     (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";
@@ -838,6 +887,15 @@
         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";
@@ -923,6 +981,7 @@
     (function (UiPresentation) {
         UiPresentation["FreeText"] = "FREE_TEXT";
         UiPresentation["AutoSuggest"] = "AUTO_SUGGEST";
+        UiPresentation["Dropdown"] = "DROPDOWN";
         UiPresentation["Hidden"] = "HIDDEN";
     })(UiPresentation || (UiPresentation = {}));
 
@@ -1108,6 +1167,64 @@
         HiddenManagementInfo.prototype.save = function (basketid, userId) { };
         return HiddenManagementInfo;
     }(ManagementInfoAndIsValid));
+    var DropdownManagementInfo = /** @class */ (function (_super) {
+        __extends(DropdownManagementInfo, _super);
+        function DropdownManagementInfo(managementInfo, basketService) {
+            var _this = this;
+            var _a;
+            _this = _super.call(this, managementInfo) || this;
+            _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  ');
+            }
+            return _this;
+        }
+        DropdownManagementInfo.prototype.getValue = function () {
+            return this.selectedValues[0] ? this.selectedValues[0].value.id : '__NONE';
+        };
+        DropdownManagementInfo.prototype.hasErrors = function (id) {
+            return __awaiter(this, void 0, void 0, function () {
+                return __generator(this, function (_b) {
+                    return [2 /*return*/, !this.avaliableItems.find(function (value1) {
+                            return value1.id === id;
+                        })
+                            ? { hasErrors: true }
+                            : null];
+                });
+            });
+        };
+        DropdownManagementInfo.prototype.setValue = function (id) {
+            var value = this.avaliableItems.find(function (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 = [];
+            }
+        };
+        DropdownManagementInfo.prototype.save = function (basketid, userid) {
+            this.basketService.setMiSelectedValue(basketid, this, this.selectedValues[0].value.id, userid);
+        };
+        return DropdownManagementInfo;
+    }(ManagementInfoAndIsValid));
     var makeManagamentInfo = function (managementInfo, basketService) {
         switch (managementInfo.uiPresentation) {
             case UiPresentation.FreeText:
@@ -1116,6 +1233,11 @@
                 return new AutoSugestManagementInfo(managementInfo, basketService);
             case UiPresentation.Hidden:
                 return new HiddenManagementInfo(managementInfo);
+            case UiPresentation.Dropdown:
+                return new DropdownManagementInfo(managementInfo, basketService);
+            default:
+                var tmp = managementInfo.uiPresentation;
+                console.log(tmp);
         }
         return null;
     };
@@ -1379,7 +1501,7 @@
             }
         };
         BookableBasket.prototype.sendBasketForApproval = function () {
-            this.basketService.sendBasketForApproval(this.id);
+            return this.basketService.sendBasketForApproval(this.id);
         };
         BookableBasket.prototype.workoutApprovedState = function (basket) {
             var status = exports.BookingStatus.ApprovedBook;
@@ -1601,13 +1723,17 @@
                 { 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 = exports.TaxiFormMode.ADDRESS;
             _this.minSelectDate = moment__default['default']();
+            _this.minReturnSelectDate = {
+                day: moment__default['default']().date(),
+                month: moment__default['default']().month() + 1,
+                year: moment__default['default']().year()
+            };
             // getters and setters
             _this._date = null;
             _this.selectedPlaces = [];
@@ -1642,6 +1768,7 @@
             _this._terminal = null;
             _this._time = null;
             _this.resultsSessionName = CabHireEnterpriseSearch.STORAGE_SESSION_RESULTS;
+            _this.multiResultsSessionName = CabHireEnterpriseSearch.MULTI_STORAGE_SESSION_RESULTS;
             _this.getPassengers = function () {
                 var adults = _this.adults;
                 var children = _this.children;
@@ -1661,10 +1788,17 @@
             var 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 {
+                var returnData = storageService.getSessionItem(CabHireEnterpriseSearch.SECONDARY_STORAGE_SESSION_PARAMS);
+                if (returnData) {
+                    _this.returnDateTime = moment__default['default'](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;
             }
@@ -1684,6 +1818,9 @@
             _this.fullResults = results;
             _this._cheapestResultPrice = _this.updateLowestPrice(results);
             _this.results.next(results || []);
+            var secondaryResults = storageService.getSessionItemAsList(_this.multiResultsSessionName) || [];
+            _this.fullMultiResults = secondaryResults;
+            _this.multiResults.next(secondaryResults);
             _this._isValid();
             _this.outboundVisibility = new rxjs.BehaviorSubject(false);
             _this.inboundVisibility = new rxjs.BehaviorSubject(false);
@@ -1720,6 +1857,7 @@
             },
             set: function (value) {
                 this._searchType = value;
+                this._isValid();
             },
             enumerable: false,
             configurable: true
@@ -1786,6 +1924,7 @@
             },
             set: function (value) {
                 this._returnDateTime = value;
+                this._isValid();
             },
             enumerable: false,
             configurable: true
@@ -1844,6 +1983,14 @@
                     this._date = this.helpers.momentToNgDate(value);
                     this._time = this.helpers.formatTimeColon(value);
                 }
+                this.minReturnSelectDate = {
+                    day: moment__default['default'](value).date(),
+                    month: moment__default['default'](value).month() + 1,
+                    year: moment__default['default'](value).year(),
+                };
+                if (value.isAfter(this.returnDateTime)) {
+                    this.returnDateTime.set('date', value.date());
+                }
                 this._isValid();
             },
             enumerable: false,
@@ -2013,12 +2160,19 @@
         });
         CabHireEnterpriseSearch.prototype.resetQuery = function () {
             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();
         };
         CabHireEnterpriseSearch.prototype.resetParams = function () {
             this.reset();
             this.resetQuery();
             this.results.next([]);
+            this.multiResults.next([]);
         };
         CabHireEnterpriseSearch.prototype._isValid = function () {
             if (!this.doChecks) {
@@ -2040,6 +2194,9 @@
             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);
         };
@@ -2050,10 +2207,26 @@
         };
         CabHireEnterpriseSearch.prototype.startSearch = function () {
             this.results.next([]);
+            this.multiResults.next([]);
             if (this.isValid.value) {
-                var 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
+                    var query = this.getSearchQuery();
+                    var 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 {
+                    var query = this.getSearchQuery();
+                    this.searchService.saveRecentSearch(this.getRecentSearchQuery(query));
+                    return this._startSearch(this.cabfetcher.fetchList(this.helpers.removeNulls(query)));
+                }
             }
             else {
                 return Promise.resolve(false);
@@ -2128,6 +2301,19 @@
             };
             return this.helpers.removeNulls(query);
         };
+        CabHireEnterpriseSearch.prototype.getReturnSearchQuery = function () {
+            var 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);
+        };
         CabHireEnterpriseSearch.prototype.updateOutboundAddress = function (location, placeDescription) {
             this.tempParams.fromAddress = this.getAddressFormat(location, placeDescription);
         };
@@ -2153,15 +2339,29 @@
             this._fromLocation = this.createCabHireLocation(this.tempParams.fromAddress);
             this._isValid();
         };
-        CabHireEnterpriseSearch.prototype.sortBy = function (asc) {
-            var results = this.helpers.clone(this.fullResults);
-            if (asc) {
-                results = results.sort(function (a, b) { return b.price - a.price; });
+        CabHireEnterpriseSearch.prototype.sortBy = function (asc, returnIndex) {
+            if (returnIndex >= 0) {
+                console.log('here');
+                var results = this.helpers.clone(this.fullMultiResults[returnIndex]);
+                if (asc) {
+                    results = results.sort(function (a, b) { return b.price - a.price; });
+                }
+                else {
+                    results = results.sort(function (a, b) { return a.price - b.price; });
+                }
+                this.fullMultiResults[returnIndex] = results;
+                this.multiResults.next(this.fullMultiResults);
             }
             else {
-                results = results.sort(function (a, b) { return a.price - b.price; });
+                var results = this.helpers.clone(this.fullResults);
+                if (asc) {
+                    results = results.sort(function (a, b) { return b.price - a.price; });
+                }
+                else {
+                    results = results.sort(function (a, b) { return a.price - b.price; });
+                }
+                this.results.next(results);
             }
-            this.results.next(results);
         };
         // ! stuff to go in a postcode servie
         CabHireEnterpriseSearch.prototype.getAddressFormat = function (location, placeDescription) {
@@ -2375,7 +2575,9 @@
         return CabHireEnterpriseSearch;
     }(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';
 
     (function (SortTypesCar) {
         SortTypesCar["price"] = "price";
@@ -2588,6 +2790,7 @@
             _this._dropoff_date = null;
             _this._dropoff_time = null;
             _this.resultsSessionName = CarhireEnterpriseSearch.STORAGE_SESSION_RESULTS;
+            _this.multiResultsSessionName = CarhireEnterpriseSearch.STORAGE_SESSION_RESULTS;
             var data = storageService.getSessionItem(CarhireEnterpriseSearch.STORAGE_SESSION_PARAMS) || {
                 tempParams: {}
             };
@@ -3782,6 +3985,49 @@
         return BaseEventMessenager;
     }());
 
+    var 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: ''
+    });
+
     (function (FlightSearchType) {
         FlightSearchType["return"] = "return";
         FlightSearchType["oneWay"] = "oneWay";
@@ -3793,23 +4039,29 @@
         TimeWindow["Depart"] = "Depart By";
         TimeWindow["Arrive"] = "Arrive By";
     })(exports.TimeWindow || (exports.TimeWindow = {}));
-    (function (SortTypes) {
-        SortTypes["CheapestFirst"] = "C";
-        SortTypes["MostExpensiveFirst"] = "M";
-        SortTypes["FastestFirst"] = "F";
-        SortTypes["PreferredFirst"] = "P";
-        SortTypes["LowestEmissions"] = "L";
-    })(exports.SortTypes || (exports.SortTypes = {}));
+    (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";
+    })(exports.FlightSortTypes || (exports.FlightSortTypes = {}));
     var FlightEnterpriseSearch = /** @class */ (function (_super) {
         __extends(FlightEnterpriseSearch, _super);
         function FlightEnterpriseSearch(flightfetcher, helpers, userService, basketService, storageService, searchService) {
+            var _o, _p;
             var _this = _super.call(this, storageService, function (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(function (previousItems, nextItem) {
                         return previousItems.concat(nextItem.results);
                     }, results.journeys)
@@ -3820,11 +4072,12 @@
                         var _o;
                         var isOutBound = item.boundIndicator === exports.FlightDirectionEnum.Outbound;
                         var returnObject = {
+                            type: 'FlightGroupedQuoteResult',
                             direction: item.boundIndicator,
                             classes: (_o = {},
                                 _o[FlightCabinClass.EconomyNoBags] = null,
                                 _o[FlightCabinClass.EconomyRestricted] = null,
-                                _o[FlightCabinClass.Economy] = null,
+                                _o[FlightCabinClass.EconomyFlexi] = null,
                                 _o[FlightCabinClass.Business] = null,
                                 _o[FlightCabinClass.First] = null,
                                 _o[FlightCabinClass.PremiumEconomy] = null,
@@ -3847,7 +4100,11 @@
                             operator: '',
                             operatorFull: '',
                             inboundFlightNumber: '',
-                            isReturn: false
+                            isReturn: false,
+                            minPrice: Number.MAX_SAFE_INTEGER,
+                            maxPrice: Number.MAX_SAFE_INTEGER,
+                            co2PerItem: 0,
+                            co2PerPassenger: 0
                         };
                         var brands = item.flights;
                         Object.keys(brands)
@@ -3862,62 +4119,78 @@
                                 (_this.flightsToGroup[flightNum] =
                                     _this.flightsToGroup[flightNum] || []).push(groupNumber);
                                 var 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;
                             }, []);
-                            var 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;
-                            }
-                            var minprice = _this.getMinFlightPriceForBrand(matchingBrandFlights);
-                            var 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: minprice,
-                                    maxprice: maxprice,
-                                    currency: matchingBrandFlights[0].total.currency
-                                };
+                            if (matchingBrandFlights.length > 0) {
+                                var correctBrand = void 0;
+                                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;
+                                }
+                                var minprice = _this.getMinFlightPriceForBrand(matchingBrandFlights);
+                                var 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: minprice,
+                                        maxprice: maxprice,
+                                        currency: matchingBrandFlights[0].total.currency
+                                    };
+                                }
                             }
                         });
-                        if (returnObject) {
-                            acc.push(returnObject);
+                        if (returnObject &&
+                            !!Object.values(returnObject.classes).find(function (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;
                     }, []);
@@ -3939,12 +4212,139 @@
             _this._negotiated = false;
             _this._nearby_airports = false;
             _this._sortArray = [
-                { display: 'Cheapest First', value: exports.SortTypes.CheapestFirst },
-                { display: 'Most Expensive First', value: exports.SortTypes.MostExpensiveFirst },
-                { display: 'Fastest First', value: exports.SortTypes.FastestFirst },
-                { display: 'Preferred Fares First', value: exports.SortTypes.PreferredFirst },
-                { display: 'Lowest Co2 Emissions First', value: exports.SortTypes.LowestEmissions }
+                { display: 'Cheapest First', value: exports.FlightSortTypes.Cheapest },
+                {
+                    display: 'Most Expensive First',
+                    value: exports.FlightSortTypes.MostExpensive
+                },
+                { display: 'Fastest First', value: exports.FlightSortTypes.Fastest },
+                { display: 'Preferred Fares First', value: exports.FlightSortTypes.Preferred },
+                {
+                    display: 'Lowest Co2 Emissions First',
+                    value: exports.FlightSortTypes.LowestEmissions
+                }
             ];
+            _this._sortItinaryRoutines = (_o = {},
+                _o[exports.FlightSortTypes.Cheapest] = function (a, b) {
+                    return a.total.price - b.total.price;
+                },
+                _o[exports.FlightSortTypes.MostExpensive] = function (a, b) {
+                    return b.total.price - a.total.price;
+                },
+                _o[exports.FlightSortTypes.Fastest] = function (a, b) {
+                    return (a.outboundTotalDuration +
+                        (a.inboundTotalDuration ? a.inboundTotalDuration : 0) -
+                        (b.outboundTotalDuration +
+                            (b.inboundTotalDuration ? b.inboundTotalDuration : 0)));
+                },
+                _o[exports.FlightSortTypes.Preferred] = function (a, b) {
+                    return (a.tmcPreferred ? 1 : 0) - (b.tmcPreferred ? 1 : 0);
+                },
+                _o[exports.FlightSortTypes.LowestEmissions] = function (a, b) {
+                    return a.co2PerItem - b.co2PerItem;
+                },
+                _o[exports.FlightSortTypes.DepartureTime] = function (a, b) {
+                    var aTime = moment__default['default'](a.outboundFlights[0].dateTimeDeparting);
+                    var bTime = moment__default['default'](b.outboundFlights[0].dateTimeDeparting);
+                    if (aTime.isBefore(bTime)) {
+                        return -1;
+                    }
+                    return aTime.isSame(bTime) ? 0 : 1;
+                },
+                _o[exports.FlightSortTypes.ArrivalTime] = function (a, b) {
+                    var aTime = moment__default['default'](a.outboundFlights[0].dateTimeArriving);
+                    var bTime = moment__default['default'](b.outboundFlights[0].dateTimeArriving);
+                    if (aTime.isBefore(bTime)) {
+                        return -1;
+                    }
+                    return aTime.isSame(bTime) ? 0 : 1;
+                },
+                _o[exports.FlightSortTypes.Quickest] = function (a, b) {
+                    return (a.outboundTotalDuration +
+                        (a.inboundTotalDuration ? a.inboundTotalDuration : 0) -
+                        (b.outboundTotalDuration +
+                            (b.inboundTotalDuration ? b.inboundTotalDuration : 0)));
+                },
+                _o[exports.FlightSortTypes.MostDirect] = function (a, b) {
+                    return (a.outboundFlights.length +
+                        (a.outboundFlights ? a.outboundFlights.length : 0) -
+                        (b.outboundFlights.length +
+                            (b.outboundFlights ? b.outboundFlights.length : 0)));
+                },
+                _o);
+            _this._sortGroupedRoutines = (_p = {},
+                _p[exports.FlightSortTypes.Cheapest] = function (a, b) {
+                    if (a.direction !== b.direction) {
+                        return a.direction - b.direction;
+                    }
+                    return a.minPrice - b.minPrice;
+                },
+                _p[exports.FlightSortTypes.MostExpensive] = function (a, b) {
+                    if (a.direction !== b.direction) {
+                        return a.direction - b.direction;
+                    }
+                    return b.minPrice - a.maxPrice;
+                },
+                _p[exports.FlightSortTypes.Fastest] = function (a, b) {
+                    if (a.direction !== b.direction) {
+                        return a.direction - b.direction;
+                    }
+                    return a.direction === exports.FlightDirectionEnum.Outbound
+                        ? a.outboundTotalDuration - b.outboundTotalDuration
+                        : a.inboundTotalDuration - b.inboundTotalDuration;
+                },
+                _p[exports.FlightSortTypes.Preferred] = function (a, b) {
+                    if (a.direction !== b.direction) {
+                        return a.direction - b.direction;
+                    }
+                    return (a.preferred ? 1 : 0) - (b.preferred ? 1 : 0);
+                },
+                _p[exports.FlightSortTypes.LowestEmissions] = function (a, b) {
+                    if (a.direction !== b.direction) {
+                        return a.direction - b.direction;
+                    }
+                    return a.co2PerItem - b.co2PerItem;
+                },
+                _p[exports.FlightSortTypes.DepartureTime] = function (a, b) {
+                    if (a.direction !== b.direction) {
+                        return a.direction - b.direction;
+                    }
+                    var aTime = moment__default['default'](a.departDateTime);
+                    var bTime = moment__default['default'](b.departDateTime);
+                    if (aTime.isBefore(bTime)) {
+                        return -1;
+                    }
+                    return aTime.isSame(bTime) ? 0 : 1;
+                },
+                _p[exports.FlightSortTypes.ArrivalTime] = function (a, b) {
+                    if (a.direction !== b.direction) {
+                        return a.direction - b.direction;
+                    }
+                    var aTime = moment__default['default'](a.arrivalDateTime);
+                    var bTime = moment__default['default'](b.arrivalDateTime);
+                    if (aTime.isBefore(bTime)) {
+                        return -1;
+                    }
+                    return aTime.isSame(bTime) ? 0 : 1;
+                },
+                _p[exports.FlightSortTypes.Quickest] = function (a, b) {
+                    if (a.direction !== b.direction) {
+                        return a.direction - b.direction;
+                    }
+                    return a.direction === exports.FlightDirectionEnum.Outbound
+                        ? a.outboundTotalDuration - b.outboundTotalDuration
+                        : (a.inboundTotalDuration ? a.inboundTotalDuration : 0) -
+                            (b.inboundTotalDuration ? b.inboundTotalDuration : 0);
+                },
+                _p[exports.FlightSortTypes.MostDirect] = function (a, b) {
+                    if (a.direction !== b.direction) {
+                        return a.direction - b.direction;
+                    }
+                    return a.direction === exports.FlightDirectionEnum.Outbound
+                        ? a.outlegs.length - b.outlegs.length
+                        : (a.inlegs || []).length - (b.inlegs || []).length;
+                },
+                _p);
             _this._fareTypeArray = [
                 { value: FareType.Flexible, display: 'Flexible' },
                 { value: FareType.Leisure, display: 'Leisure' },
@@ -3968,8 +4368,10 @@
             _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 rxjs.BehaviorSubject(DEFAULT_FLIGHT_FILTERS);
             _this._multiDestination = [];
             var data = storageService.getSessionItem(FlightEnterpriseSearch.STORAGE_SESSION_PARAMS) || {
                 tempParams: {},
@@ -4001,22 +4403,28 @@
                 _this.updateAvaliableClasses();
             });
             _this.updateTravellers();
-            if (_this.isValid.value) {
-                var 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;
             return _this;
@@ -4425,7 +4833,7 @@
             enumerable: false,
             configurable: true
         });
-        FlightEnterpriseSearch.prototype.createGroupedItem = function (returnObject, source, outboundFlights, outboundTotalDuration, inboundFlights, inboundTotalDuration) {
+        FlightEnterpriseSearch.prototype.createGroupedItem = function (returnObject, source, outboundFlights, outboundTotalDuration, inboundFlights, inboundTotalDuration, co2PerItem, co2PerPassenger) {
             if ((outboundFlights === null || outboundFlights === void 0 ? void 0 : outboundFlights.length) && !returnObject.departDateTime) {
                 var first = outboundFlights[0];
                 var last = outboundFlights[outboundFlights.length - 1];
@@ -4444,6 +4852,8 @@
                 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;
@@ -4751,43 +5161,6 @@
                 { name: 'First', type: FlightCabinClass.First }
             ]);
         };
-        /**
-         * @description - sort the flight results
-         * @todo - Fill out Preferred and Co2 sorting when we have that data
-         */
-        FlightEnterpriseSearch.prototype.sortResults = function (sortMethodValue, givenResults) {
-            var results = this.helpers.clone(givenResults
-                ? givenResults
-                : this.fullResults);
-            switch (sortMethodValue) {
-                case exports.SortTypes.CheapestFirst:
-                    results = results.sort(function (a, b) {
-                        return a.total.price - b.total.price;
-                    });
-                    break;
-                case exports.SortTypes.MostExpensiveFirst:
-                    results = results.sort(function (a, b) {
-                        return b.total.price - a.total.price;
-                    });
-                    break;
-                case exports.SortTypes.FastestFirst:
-                    results = results.sort(function (a, b) {
-                        return (a.outboundTotalDuration +
-                            (a.inboundTotalDuration ? a.inboundTotalDuration : 0) -
-                            (b.outboundTotalDuration +
-                                (b.inboundTotalDuration ? b.inboundTotalDuration : 0)));
-                    });
-                    break;
-                case exports.SortTypes.LowestEmissions:
-                    results = results.sort(function (a, b) {
-                        return a.co2PerItem - b.co2PerItem;
-                    });
-                    break;
-                default:
-                    console.error("+++ Unknown sorting method: " + sortMethodValue + " +++");
-            }
-            return results;
-        };
         FlightEnterpriseSearch.prototype.updateFromPreviousSearches = function (previousItems) {
             // Flights can not be search after other products so no defaults can be set.
         };
@@ -4813,621 +5186,214 @@
             }
             return total;
         };
+        FlightEnterpriseSearch.prototype.isGroupedFlights = function (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
          */
-        FlightEnterpriseSearch.prototype.filterResults = function (filters, sortValue, givenResults) {
-            console.log('+++ Applying Filters to flights: ', filters, ' +++');
-            var results = this.helpers.clone(givenResults);
-            if (this.isReturn) {
-                results = results.filter(function (result) { return 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
-         */
-        FlightEnterpriseSearch.prototype.transformMin = function (min) {
-            var 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');
-        };
-        FlightEnterpriseSearch.prototype.filterByDuration = function (minDuration, maxDuration, results, isReturn) {
-            if (isReturn === void 0) { isReturn = false; }
-            results = results.filter(function (result) {
-                var _a;
-                var dur = 0;
-                if (!isReturn) {
-                    result.outboundFlights.forEach(function (out) {
-                        dur += out.totalDuration;
-                    });
+        FlightEnterpriseSearch.prototype.applyFilters = function (filters, sortValue) {
+            var _this = this;
+            // console.log('+++ Applying Filters to flights: ', filters, ' +++');
+            if (this.fullResults.length === 0) {
+                this.results.next([]);
+            }
+            var tester = function (filtersTotest, testFunction) {
+                var selected = Object.values(filtersTotest).filter(function (filter) { return filter.selected; });
+                if (selected.length) {
+                    return function (flightItinerary) {
+                        return !!selected.find(function (filter) {
+                            return testFunction(flightItinerary, filter.value);
+                        });
+                    };
                 }
-                if (((_a = result.inboundFlights) === null || _a === void 0 ? void 0 : _a.length) && isReturn) {
-                    result.inboundFlights.forEach(function (inb) {
-                        dur += inb.totalDuration;
-                    });
+                else {
+                    return function (flightItinerary) {
+                        return true;
+                    };
                 }
-                return dur >= minDuration && dur <= maxDuration;
-            });
-            return results;
-        };
-        FlightEnterpriseSearch.prototype.filterByDepartureTime = function (minDep, maxDep, results) {
-            var _this = this;
-            results = results.filter(function (result) {
-                var departureTime = Number(moment__default['default'](result.outboundFlights[0].dateTimeDeparting).format('HHmm'));
-                var newNumString1 = Number(Math.floor(Number(minDep / 100)).toString() +
-                    _this.transformMin(Math.ceil(Number(minDep % 100))));
-                var newNumString2 = Number(Math.floor(Number(maxDep / 100)).toString() +
-                    _this.transformMin(Math.ceil(Number(maxDep % 100))));
-                return departureTime >= newNumString1 && departureTime <= newNumString2;
-            });
-            return results;
-        };
-        FlightEnterpriseSearch.prototype.filterByReturnDepartureTime = function (minDep, maxDep, results) {
-            if (!minDep && !maxDep) {
-                return results;
-            }
-            var newNumString1 = Number(Math.floor(Number(minDep / 100)).toString() +
-                this.transformMin(Math.ceil(Number(minDep % 100))));
-            var newNumString2 = Number(Math.floor(Number(maxDep / 100)).toString() +
-                this.transformMin(Math.ceil(Number(maxDep % 100))));
-            results = results.filter(function (result) {
-                if (!result.inboundFlights || !result.inboundFlights[0]) {
-                    return true;
-                }
-                var departureTime = Number(moment__default['default'](result.inboundFlights[0].dateTimeDeparting).format('HHmm'));
-                return departureTime >= newNumString1 && departureTime <= newNumString2;
-            });
-            return results;
-        };
-        FlightEnterpriseSearch.prototype.filterByReturnArrivalTime = function (minArr, maxArr, results) {
-            if (!minArr && !maxArr) {
-                return results;
-            }
-            var newNumString1 = Number(Math.floor(Number(minArr / 100)).toString() +
-                this.transformMin(Math.ceil(Number(minArr % 100))));
-            var newNumString2 = Number(Math.floor(Number(maxArr / 100)).toString() +
-                this.transformMin(Math.ceil(Number(maxArr % 100))));
-            results = results.filter(function (result) {
-                if (!result.inboundFlights || !result.inboundFlights[0]) {
-                    return true;
-                }
-                var arrivalTime = Number(moment__default['default'](result.inboundFlights[result.inboundFlights.length - 1]
-                    .dateTimeArriving).format('HHmm'));
-                var retVal = arrivalTime >= newNumString1 && arrivalTime <= newNumString2;
-                // for debugging
-                // if (!retVal) {
-                //   console.warn(`+++ Filtering Out: ${arrivalTime} +++`);
-                // }
-                return retVal;
-            });
-            return results;
-        };
-        FlightEnterpriseSearch.prototype.filterByArrivalTime = function (minArr, maxArr, results) {
-            var newNumString1 = Number(Math.floor(Number(minArr / 100)).toString() +
-                this.transformMin(Math.ceil(Number(minArr % 100))));
-            var newNumString2 = Number(Math.floor(Number(maxArr / 100)).toString() +
-                this.transformMin(Math.ceil(Number(maxArr % 100))));
-            results = results.filter(function (result) {
-                var arrivalTime = Number(moment__default['default'](result.outboundFlights[result.outboundFlights.length - 1]
-                    .dateTimeArriving).format('HHmm'));
-                return arrivalTime >= newNumString1 && arrivalTime <= newNumString2;
-            });
-            return results;
-        };
-        FlightEnterpriseSearch.prototype.filterByBaggage = function (baggageFilters, results) {
-            var _this = this;
-            var selected = baggageFilters.filter(function (x) { return x.selected; });
-            if ((selected === null || selected === void 0 ? void 0 : selected.length) >= 1 && selected.length !== baggageFilters.length) {
-                results = results.filter(function (result) {
-                    try {
-                        var totalBags_1 = _this.getTotalBaggage(result);
-                        return selected.find(function (x) { return x.value === totalBags_1; });
-                    }
-                    catch (error) {
-                        console.error('+++ Error determening baggage: ${error} +++');
-                        return false;
-                    }
-                });
-            }
-            return results;
-        };
-        FlightEnterpriseSearch.prototype.filterByPrice = function (minPrice, maxPrice, results) {
-            results = results.filter(function (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
-         */
-        FlightEnterpriseSearch.prototype.filterResultsByStops = function (stopFilters, fullResults) {
-            var selected = stopFilters.filter(function (x) { return x.selected; });
-            if ((selected === null || selected === void 0 ? void 0 : selected.length) >= 1 && selected.length !== stopFilters.length) {
-                fullResults = fullResults.filter(function (result) {
-                    var totalStops = result.outboundFlights.length - 1;
-                    var haveStop = selected.find(function (selected1) { return selected1.value === totalStops; });
-                    return haveStop;
-                });
-            }
-            return fullResults;
-        };
-        FlightEnterpriseSearch.prototype.filterResultsByAirline = function (airlineFilters, results) {
-            var selected = airlineFilters.filter(function (x) { return x.selected; });
-            if ((selected === null || selected === void 0 ? void 0 : selected.length) >= 1 && selected.length !== airlineFilters.length) {
-                results = results.filter(function (result) {
-                    return selected.find(function (x) { return x.value === result.outboundFlights[0].operatingCarrier; });
-                });
-            }
-            return results;
-        };
-        FlightEnterpriseSearch.prototype.filterResultsByClass = function (classFilters, results) {
-            var selected = classFilters.filter(function (x) { return x.selected; });
-            if ((selected === null || selected === void 0 ? void 0 : selected.length) >= 1 && selected.length !== classFilters.length) {
-                results = results.filter(function (result) {
-                    return selected.find(function (x) { return x.value === result.outboundFlights[0].cabinClass; });
-                });
-            }
-            return results;
-        };
-        FlightEnterpriseSearch.prototype.filterByDepartureAirport = function (departureAirports, results) {
-            var selected = departureAirports.filter(function (x) { return x.selected; });
-            if ((selected === null || selected === void 0 ? void 0 : selected.length) >= 1 && selected.length !== departureAirports.length) {
-                results = results.filter(function (result) {
-                    return selected.find(function (x) { return x.value === result.outboundFlights[0].originAirport; });
-                });
-            }
-            return results;
-        };
-        FlightEnterpriseSearch.prototype.filterByArrivalAirport = function (arrivalAirports, results) {
-            var selected = arrivalAirports.filter(function (x) { return x.selected; });
-            if ((selected === null || selected === void 0 ? void 0 : selected.length) >= 1 && selected.length !== arrivalAirports.length) {
-                results = results.filter(function (result) {
-                    var destinationAirport = result.outboundFlights[result.outboundFlights.length - 1]
-                        .destinationAirport;
-                    return selected.find(function (x) { return x.value === destinationAirport; });
-                });
-            }
-            return results;
-        };
-        FlightEnterpriseSearch.prototype.filterByDepartureReturnAirport = function (departureAirports, results) {
-            var selected = departureAirports.filter(function (x) { return x.selected; });
-            if ((selected === null || selected === void 0 ? void 0 : selected.length) >= 1 && selected.length !== departureAirports.length) {
-                results = results.filter(function (result) {
-                    var _a;
-                    if (!((_a = result.inboundFlights) === null || _a === void 0 ? void 0 : _a.length)) {
-                        return true;
-                    }
-                    return selected.find(function (x) { return x.value === result.inboundFlights[0].originAirport; });
-                });
-            }
-            return results;
-        };
-        FlightEnterpriseSearch.prototype.filterByArrivalReturnAirport = function (arrivalAirports, results) {
-            var selected = arrivalAirports.filter(function (x) { return x.selected; });
-            if ((selected === null || selected === void 0 ? void 0 : selected.length) >= 1 && selected.length !== arrivalAirports.length) {
-                results = results.filter(function (result) {
-                    var _a;
-                    if (!((_a = result.inboundFlights) === null || _a === void 0 ? void 0 : _a.length)) {
-                        return true;
-                    }
-                    var destinationAirport = result.inboundFlights[result.inboundFlights.length - 1]
-                        .destinationAirport;
-                    return selected.find(function (x) { return x.value === destinationAirport; });
-                });
-            }
-            return results;
-        };
-        FlightEnterpriseSearch.prototype.filterByFlightNumber = function (flightNumber, results) {
-            if (flightNumber) {
-                // make sure to check both outbound and inbound
-                results = results.filter(function (result) {
-                    var _a;
-                    var inOutbound = result.outboundFlights.find(function (out) {
-                        return out.operatingFlightNumber
-                            .toUpperCase()
-                            .includes(flightNumber.toUpperCase());
-                    });
-                    var inInbound;
-                    if ((_a = result.inboundFlights) === null || _a === void 0 ? void 0 : _a.length) {
-                        inInbound = result.inboundFlights.find(function (inB) {
-                            return inB.operatingFlightNumber
-                                .toUpperCase()
-                                .includes(flightNumber.toUpperCase());
-                        });
-                    }
-                    return inOutbound || inInbound;
-                });
-            }
-            return results;
-        };
-        FlightEnterpriseSearch.prototype.createFilters = function (results) {
-            if (results === void 0) { results = []; }
-            var minPrice = this.getMinPrice(results);
-            var maxPrice = this.getMaxPrice(results);
-            var newFilters = {
-                stops: this.getAllStops(results),
-                mustInclude: [],
-                classes: this.getAllClasses(results),
-                airlines: this.getAllAirlines(results),
-                travelPolicy: [],
-                depatureAirport: this.getAllDepartureAirports(results),
-                arrivalAirport: this.getAllArrivalAirports(results),
-                minPrice: minPrice,
-                maxPrice: 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;
-        };
-        FlightEnterpriseSearch.prototype.getMinDuration = function (results, isReturn) {
-            if (isReturn === void 0) { isReturn = false; }
-            var min = 0;
-            results.forEach(function (result) {
-                var _a;
-                var dur = 0;
-                if (!isReturn) {
-                    result.outboundFlights.forEach(function (out) {
-                        dur += out.totalDuration;
-                    });
-                }
-                if (((_a = result.inboundFlights) === null || _a === void 0 ? void 0 : _a.length) && isReturn) {
-                    result.inboundFlights.forEach(function (inb) {
-                        dur += inb.totalDuration;
-                    });
-                }
-                if (!min || dur < min) {
-                    min = dur;
-                }
-            });
-            return min;
-        };
-        FlightEnterpriseSearch.prototype.getMaxDuration = function (results, isReturn) {
-            if (isReturn === void 0) { isReturn = false; }
-            var max = 0;
-            results.forEach(function (result) {
-                var _a;
-                var dur = 0;
-                if (!isReturn) {
-                    result.outboundFlights.forEach(function (out) {
-                        dur += out.totalDuration;
-                    });
-                }
-                if (((_a = result.inboundFlights) === null || _a === void 0 ? void 0 : _a.length) && isReturn) {
-                    result.inboundFlights.forEach(function (inb) {
-                        dur += inb.totalDuration;
-                    });
-                }
-                if (!max || dur > max) {
-                    max = dur;
-                }
-            });
-            return max;
-        };
-        FlightEnterpriseSearch.prototype.getMinArrivalTime = function (results) {
-            var min;
-            results.forEach(function (result) {
-                var minDepTime = Number(moment__default['default'](result.outboundFlights[result.outboundFlights.length - 1]
-                    .dateTimeArriving).format('HHmm'));
-                minDepTime = Math.floor(minDepTime / 100) * 100;
-                if (!min || minDepTime < min) {
-                    min = minDepTime;
-                }
-            });
-            return min;
-        };
-        FlightEnterpriseSearch.prototype.getMinReturnArrivalTime = function (results) {
-            var min;
-            results.forEach(function (result) {
-                if (result.inboundFlights && result.inboundFlights.length) {
-                    var minDepTime = Number(moment__default['default'](result.inboundFlights[result.inboundFlights.length - 1]
-                        .dateTimeArriving).format('HHmm'));
-                    minDepTime = Math.floor(minDepTime / 100) * 100;
-                    if (!min || minDepTime < min) {
-                        min = minDepTime;
-                    }
-                }
-            });
-            return min;
-        };
-        FlightEnterpriseSearch.prototype.getMaxReturnArrivalTime = function (results) {
-            var max;
-            results.forEach(function (result) {
-                if (result.inboundFlights && result.inboundFlights.length) {
-                    var maxDepTime = Number(moment__default['default'](result.inboundFlights[result.inboundFlights.length - 1]
-                        .dateTimeArriving).format('HHmm'));
-                    maxDepTime = Math.ceil(maxDepTime / 100) * 100;
-                    if (!max || maxDepTime > max) {
-                        max = maxDepTime;
-                    }
-                }
-            });
-            return max;
-        };
-        FlightEnterpriseSearch.prototype.getMaxArrivalTime = function (results) {
-            var max;
-            results.forEach(function (result) {
-                var maxDepTime = Number(moment__default['default'](result.outboundFlights[result.outboundFlights.length - 1]
-                    .dateTimeArriving).format('HHmm'));
-                maxDepTime = Math.ceil(maxDepTime / 100) * 100;
-                if (!max || maxDepTime > max) {
-                    max = maxDepTime;
-                }
-            });
-            return max;
-        };
-        FlightEnterpriseSearch.prototype.getMinDepartureTime = function (results) {
-            var min;
-            results.forEach(function (result) {
-                var minDepTime = Number(moment__default['default'](result.outboundFlights[0].dateTimeDeparting).format('HHmm'));
-                minDepTime = Math.floor(minDepTime / 100) * 100;
-                if (!min || minDepTime < min) {
-                    min = minDepTime;
-                }
-            });
-            return min;
-        };
-        FlightEnterpriseSearch.prototype.getMinReturnDepartureTime = function (results) {
-            var min;
-            results.forEach(function (result) {
-                if (result.inboundFlights && result.inboundFlights[0]) {
-                    var minDepTime = Number(moment__default['default'](result.inboundFlights[0].dateTimeDeparting).format('HHmm'));
-                    minDepTime = Math.floor(minDepTime / 100) * 100;
-                    if (!min || minDepTime < min) {
-                        min = minDepTime;
-                    }
-                }
-            });
-            return min;
-        };
-        FlightEnterpriseSearch.prototype.getMaxReturnDepartureTime = function (results) {
-            var max;
-            results.forEach(function (result) {
-                if (result.inboundFlights && result.inboundFlights[0]) {
-                    var maxDepTime = Number(moment__default['default'](result.inboundFlights[0].dateTimeDeparting).format('HHmm'));
-                    maxDepTime = Math.ceil(maxDepTime / 100) * 100;
-                    if (!max || maxDepTime > max) {
-                        max = maxDepTime;
-                    }
-                }
-            });
-            return max;
-        };
-        FlightEnterpriseSearch.prototype.getMaxDepartureTime = function (results) {
-            var max;
-            results.forEach(function (result) {
-                var maxDepTime = Number(moment__default['default'](result.outboundFlights[0].dateTimeDeparting).format('HHmm'));
-                maxDepTime = Math.ceil(maxDepTime / 100) * 100;
-                if (!max || maxDepTime > max) {
-                    max = maxDepTime;
-                }
-            });
-            return max;
-        };
-        FlightEnterpriseSearch.prototype.getBaggage = function (results) {
-            var baggage = {};
-            results.forEach(function (result) {
-                var _a, _b, _c, _d, _e, _f;
-                try {
-                    if (result.baggageAllowance.length) {
-                        var 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' : '')
-                        };
-                    }
-                }
-                catch (error) {
-                    console.error("+++ Error parsing additional flight data: " + error + " +++");
-                }
-            });
-            return Object.values(baggage);
-        };
-        FlightEnterpriseSearch.prototype.getMinPrice = function (results) {
-            var minPrice;
-            results.forEach(function (result) {
-                if (!minPrice || result.total.price < minPrice) {
-                    minPrice = result.total.price;
-                }
-            });
-            return minPrice;
-        };
-        FlightEnterpriseSearch.prototype.getMaxPrice = function (results) {
-            var maxPrice;
-            results.forEach(function (result) {
-                if (!maxPrice || result.total.price > maxPrice) {
-                    maxPrice = result.total.price;
-                }
-            });
-            return maxPrice;
-        };
-        FlightEnterpriseSearch.prototype.getAllStops = function (results) {
-            var allStops = {};
-            results.forEach(function (result) {
-                var totalStops = result.outboundFlights.length - 1; // might have to recalculate this
-                allStops[totalStops] = {
-                    value: totalStops,
-                    display: totalStops + " stop" + (totalStops !== 1 ? 's' : ''),
-                    selected: false
+            };
+            var replaceFields = function (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));
+            };
+            var isBetween = function (minmax, field) {
+                return function (flightItinerary) {
+                    var _o;
+                    var val = (_o = _this.helpers).fromObject.apply(_o, __spread([flightItinerary], replaceFields(field, flightItinerary).split('.')));
+                    return val >= minmax.min && val <= minmax.max;
                 };
-            });
-            return Object.values(allStops);
-        };
-        FlightEnterpriseSearch.prototype.getAllClasses = function (results) {
-            var allClasses = [];
-            results.forEach(function (result) {
-                result.outboundFlights.forEach(function (outFlight) {
-                    allClasses[outFlight.cabinClass] = {
-                        value: outFlight.cabinClass,
-                        display: outFlight.cabinClass,
-                        selected: false
-                    };
-                });
-                if (result.inboundFlights) {
-                    result.inboundFlights.forEach(function (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
-         */
-        FlightEnterpriseSearch.prototype.getAllDepartureAirports = function (results, inbound) {
-            if (inbound === void 0) { inbound = false; }
-            var allAirports = {};
-            results.forEach(function (result) {
+            };
+            var isHourBetween = function (minmax, field) {
+                return function (flightItinerary) {
+                    var _o;
+                    var val = moment__default['default']((_o = _this.helpers).fromObject.apply(_o, __spread([flightItinerary], replaceFields(field, flightItinerary).split('.')))).get('hour');
+                    return val >= minmax.min && val <= minmax.max;
+                };
+            };
+            var hasValue = function (field) {
+                return function (flightItinerary, toTest) {
+                    var _o;
+                    var val = (_o = _this.helpers).fromObject.apply(_o, __spread([flightItinerary], replaceFields(field, flightItinerary).split('.')));
+                    return val === toTest;
+                };
+            };
+            var fieldHasValue = function (field) {
+                return function (flight, value) {
+                    return flight[field] === value;
+                };
+            };
+            var outItineraryTesters = [];
+            var 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, function (flightItinerary, value) {
+                return (flightItinerary.outboundFlights.length === value ||
+                    (flightItinerary.inboundFlights || []).length === value);
+            }));
+            outItineraryTesters.push(isHourBetween(filters.arrivalTime, 'OUTBOUND_ARRIVAL.dateTimeArriving'));
+            outItineraryTesters.push(tester(filters.depatureAirport, function (flightItinerary, value) {
                 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
-         */
-        FlightEnterpriseSearch.prototype.getAllArrivalAirports = function (results, inbound) {
-            if (inbound === void 0) { inbound = false; }
-            var allAirports = {};
-            results.forEach(function (result) {
+                return ((_a = flightItinerary.outboundFlights[0]) === null || _a === void 0 ? void 0 : _a.originAirport) === value;
+            }));
+            outItineraryTesters.push(tester(filters.arrivalAirport, function (flightItinerary, value) {
                 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
-         */
-        FlightEnterpriseSearch.prototype.getAllAirlines = function (results) {
-            var allAirlines = {};
-            results.forEach(function (result) {
-                result.outboundFlights.forEach(function (outFlight) {
-                    allAirlines[outFlight.operatingCarrier] = {
-                        value: outFlight.operatingCarrier,
-                        display: outFlight.operatingCarrierName,
-                        selected: false
-                    };
-                });
-                if (result.inboundFlights) {
-                    result.inboundFlights.forEach(function (inFlight) {
-                        allAirlines[inFlight.operatingCarrier] = {
-                            value: inFlight.operatingCarrier,
-                            display: inFlight.operatingCarrierName,
-                            selected: false
-                        };
-                    });
-                }
-            });
-            return Object.values(allAirlines);
+                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, function (flightItinerary, value) {
+                return (flightItinerary.outboundFlights.length === value ||
+                    (flightItinerary.inboundFlights || []).length === value);
+            }));
+            inItineraryTesters.push(isHourBetween(filters.arrivalTime, 'INBOUND_ARRIVAL.dateTimeArriving'));
+            inItineraryTesters.push(tester(filters.depatureReturnAirport, function (flightItinerary, value) {
+                var _a;
+                return ((_a = flightItinerary.inboundFlights[0]) === null || _a === void 0 ? void 0 : _a.originAirport) === value;
+            }));
+            inItineraryTesters.push(tester(filters.arrivalReturnAirport, function (flightItinerary, value) {
+                var _a;
+                return (((_a = flightItinerary.inboundFlights[flightItinerary.inboundFlights.length - 1]) === null || _a === void 0 ? void 0 : _a.destinationAirport) === value);
+            }));
+            var outJourneyTesters = [];
+            outJourneyTesters.push(tester(filters.classes, fieldHasValue('cabinClass')));
+            outJourneyTesters.push(tester(filters.airlines, fieldHasValue('marketingCarrier')));
+            var inJourneyTesters = [];
+            inJourneyTesters.push(tester(filters.classes, fieldHasValue('cabinClass')));
+            inJourneyTesters.push(tester(filters.airlines, fieldHasValue('marketingCarrier')));
+            var outFilterItineraries = function (flightItinerary) {
+                return (outItineraryTesters.reduce(function (acc, tester1) {
+                    acc = acc && tester1(flightItinerary);
+                    return acc;
+                }, true) &&
+                    (!flightItinerary.outboundFlights ||
+                        !!(flightItinerary.outboundFlights || []).find(function (flightJourney) {
+                            return !!outJourneyTesters.reduce(function (acc, tester2) {
+                                return acc && tester2(flightJourney);
+                            }, true);
+                        })));
+            };
+            var inFilterItineraries = function (flightItinerary) {
+                return (inItineraryTesters.reduce(function (acc, tester1) {
+                    return acc && tester1(flightItinerary);
+                }, true) &&
+                    (!flightItinerary.inboundFlights ||
+                        !!(flightItinerary.inboundFlights || []).find(function (flightJourney) {
+                            return !!inJourneyTesters.reduce(function (acc, tester2) {
+                                return acc && tester2(flightJourney);
+                            }, true);
+                        })));
+            };
+            if (this.isGroupedFlights(this.fullResults)) {
+                this.results.next(this.helpers
+                    .clone(this.fullResults)
+                    .filter(function (result) {
+                    return !!result;
+                })
+                    .map(function (result) {
+                    var _a, _b, _c, _d, _e, _f;
+                    var filterItineraries = result.direction === exports.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(function (flightItinerary) { return !!flightItinerary; })
+                            .filter(filterItineraries);
+                    }
+                    if (result.classes.EconomyRestricted) {
+                        result.classes.EconomyRestricted.flights = (((_b = result.classes.EconomyRestricted) === null || _b === void 0 ? void 0 : _b.flights) || [])
+                            .filter(function (flightItinerary) { return !!flightItinerary; })
+                            .filter(filterItineraries);
+                    }
+                    if (result.classes.EconomyFlexi) {
+                        result.classes.EconomyFlexi.flights = (((_c = result.classes.EconomyFlexi) === null || _c === void 0 ? void 0 : _c.flights) || [])
+                            .filter(function (flightItinerary) { return !!flightItinerary; })
+                            .filter(filterItineraries);
+                    }
+                    if (result.classes.PremiumEconomy) {
+                        result.classes.PremiumEconomy.flights = (((_d = result.classes.PremiumEconomy) === null || _d === void 0 ? void 0 : _d.flights) || [])
+                            .filter(function (flightItinerary) { return !!flightItinerary; })
+                            .filter(filterItineraries);
+                    }
+                    if (result.classes.Business) {
+                        result.classes.Business.flights = (((_e = result.classes.Business) === null || _e === void 0 ? void 0 : _e.flights) || [])
+                            .filter(function (flightItinerary) { return !!flightItinerary; })
+                            .filter(filterItineraries);
+                    }
+                    if (result.classes.First) {
+                        result.classes.First.flights = (((_f = result.classes.First) === null || _f === void 0 ? void 0 : _f.flights) || [])
+                            .filter(function (flightItinerary) { return !!flightItinerary; })
+                            .filter(filterItineraries);
+                    }
+                    return result;
+                })
+                    .filter(function (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(function (result) {
+                    // return {
+                    //   type: 'FlightAllQuoteResult',
+                    //   journeys: result.journeys.filter(filterItineraries)
+                    // };
+                    return result;
+                })));
+            }
         };
         FlightEnterpriseSearch.prototype.updateLowestPrice = function (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;
+            }
+            var journeys = results[0].journeys;
+            var currency = journeys[0].total.currency;
+            return journeys.reduce(function (cheapestPrice, result) {
+                var price = result.total.price;
+                if (cheapestPrice.amount > price)
+                    cheapestPrice.amount = price;
+                return cheapestPrice;
+            }, { amount: Number.MAX_SAFE_INTEGER, currencyCode: currency });
         };
         FlightEnterpriseSearch.prototype.selectGroupedFlight = function (selectedFlight, direction) {
             return __awaiter(this, void 0, void 0, function () {
@@ -5524,7 +5490,9 @@
                 operatingCarrier: selectedFlight.operatingCarrier,
                 operatingFlightNumber: selectedFlight.operatingFlightNumber,
                 originAirport: selectedFlight.originAirport,
-                totalDuration: selectedFlight.totalDuration
+                totalDuration: selectedFlight.totalDuration,
+                originTerminal: selectedFlight.originTerminal,
+                destinationTerminal: selectedFlight.destinationTerminal
             };
         };
         FlightEnterpriseSearch.prototype.addFlightJourneysToBasket = function (flightQuote) {
@@ -6301,22 +6269,43 @@
             };
         };
         BaseHelperRoutines.prototype.removeNulls = function (query) {
-            return Object.keys(query).reduce(function (accum, key) {
-                var value = query[key];
-                var data = Array.isArray(value)
-                    ? value.filter(function (item) { return !!item; }) || null
-                    : value;
-                if ((data !== null && data !== undefined && data !== 'null') ||
-                    (Array.isArray(data) && data.length > 0)) {
-                    accum[key] = data;
-                }
-                return accum;
-            }, {});
+            var _this = this;
+            if (!query) {
+                return query;
+            }
+            if (moment__default['default'].isMoment(query)) {
+                return query;
+            }
+            else if (Array.isArray(query)) {
+                return (query
+                    .map(function (item) {
+                    return _this.removeNulls(item);
+                })
+                    .filter(function (item1) {
+                    return !!item1;
+                }) || null);
+            }
+            else if (typeof query === 'object') {
+                return Object.keys(query).reduce(function (accum, key) {
+                    var value = query[key];
+                    var 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;
+            }
         };
         BaseHelperRoutines.prototype.getTravellersId = function (travellers) {
             if (travellers) {
                 return travellers.reduce(function (previousValue, currentValue, idx) {
-                    return idx === 0 ? [currentValue.id] : __spread(previousValue, [currentValue.id]);
+                    return idx === 0
+                        ? [currentValue.id]
+                        : __spread(previousValue, [currentValue.id]);
                 }, []);
             }
         };
@@ -6532,7 +6521,6 @@
          * @desc - generates ics file body content based on the provided basketItems param
          */
         BaseHelperRoutines.prototype.generateIcsFileBodyContent = function (basketItems) {
-            // TODO: currently only basket items with ServiceType.Lounge are handled. See below to TODOs for remaining tasks
             var bodyContent = [];
             // generate calendar data for each basket item
             basketItems.map(function (basketItem, index) {
@@ -6546,11 +6534,12 @@
                     serviceType: '',
                     summary: ''
                 };
+                var dateFormat = 'DD MMMM YYYY HH:mm';
                 var type = basketItem.service.type;
+                var adults = basketItem.adults, children = basketItem.children, bookingThirdPartyReference = basketItem.bookingThirdPartyReference, detail = basketItem.detail, service = basketItem.service;
                 // populate data object depending on the service type in the basket
                 switch (type) {
                     case ServiceType.Lounge:
-                        var adults = basketItem.adults, children = basketItem.children, bookingThirdPartyReference = basketItem.bookingThirdPartyReference, detail = basketItem.detail, service = basketItem.service;
                         data.basketId = basketItem.id;
                         data.dStart = detail === null || detail === void 0 ? void 0 : detail.arrivalDatetime;
                         data.dEnd = '';
@@ -6558,31 +6547,113 @@
                         data.serviceType = service.type.toLowerCase();
                         data.description = [
                             "Lounge: " + detail.name + "\r\n",
-                            "Starts: " + detail.arrivalDatetime + "\r\n",
+                            "Starts: " + moment__default['default'](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
+                        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__default['default'](detail.departs).format(dateFormat) + "\r\n",
+                            "Booking Ref: " + bookingThirdPartyReference
+                        ].join('');
+                        break;
                     case ServiceType.Car:
-                    // TODO: handle this case
+                        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__default['default'](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__default['default'](detail.outboundFlights[0].dateTimeDeparting).format(dateFormat) + "\r\n",
+                            "To: " + detail.outboundFlights[0].destinationAirport + "\r\n",
+                            "Arrive: " + moment__default['default'](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__default['default'](detail.checkIn).format(dateFormat) + "\r\n",
+                            "Departure: " + moment__default['default'](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__default['default'](detail.outwardDetail.departureDateTime).format(dateFormat) + "\r\n",
+                            "Arrival " + moment__default['default'](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__default['default'](detail.outwardDetail.departureDateTime).format(dateFormat) + "\r\n",
+                            "Arrival " + moment__default['default'](detail.outwardDetail.arrivalDateTime).format(dateFormat) + "\r\n",
+                            "Booking Ref: " + bookingThirdPartyReference
+                        ].join('');
+                        break;
                 }
                 bodyContent.push([
                     'BEGIN:VEVENT\r\n',
@@ -6632,6 +6703,119 @@
             }
             return splitString;
         };
+        BaseHelperRoutines.prototype.createFlightFilters = function (journeys, defaultFilters) {
+            return journeys.reduce(function (filters, result1) {
+                var totalStops = result1.outboundFlights.length - 1;
+                filters.stops[totalStops] = filters.stops[totalStops] || {
+                    display: totalStops + " stop" + (totalStops !== 1 ? 's' : ''),
+                    selected: false,
+                    value: totalStops + 1
+                };
+                var updateFlightItems = function (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);
+                var baggage = Math.min.apply(Math, __spread(result1.baggageAllowance.map(function (baggageAllowance) { return baggageAllowance.qty; })));
+                filters.baggage[baggage] = filters.baggage[baggage] || {
+                    selected: false,
+                    display: baggage + " bag" + (baggage !== 1 ? 's' : ''),
+                    value: baggage
+                };
+                var indexedFlight = function (flights, filterAttribute, flightAttribute, flightAttributeName, index) {
+                    var 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;
+                var departTime = moment__default['default'](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;
+                var arrivalTime = moment__default['default'](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;
+                    var departTimeReturn = moment__default['default'](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;
+                    var arrivalTimeReturn = moment__default['default'](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));
+        };
+        BaseHelperRoutines.prototype.mapOverObject = function (items, callback) {
+            return Object.entries(items).reduce(function (accum, entries) {
+                accum[entries[0]] = callback(entries[1], entries[0]);
+                return accum;
+            }, {});
+        };
         return BaseHelperRoutines;
     }());
     BaseHelperRoutines.READ_DATE_FORMAT = 'dd, D MMM YYYY';
@@ -6776,6 +6960,7 @@
             _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 = function () {
                 _this.results.next(_this.fullResults.filter(function (hotel) {
@@ -7174,7 +7359,7 @@
             this._isValid();
         };
         HotelEnterpriseSearch.prototype._isValid = function () {
-            var _a, _b, _c, _d, _e;
+            var _a, _b, _c, _d, _e, _f;
             if (!this.doChecks) {
                 return;
             }
@@ -7196,7 +7381,7 @@
                     }
                     break;
                 case exports.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;
@@ -7212,13 +7397,7 @@
                     }
                     break;
                 case exports.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;
@@ -7270,18 +7449,21 @@
         };
         HotelEnterpriseSearch.prototype.getRecentSearchQuery = function (query) {
             var _a;
+            var 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)
             };
         };
         HotelEnterpriseSearch.prototype.startRecentSearch = function (recentSearch) {
             var _this = this;
+            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;
@@ -7289,72 +7471,68 @@
             this.checkout_date = moment__default['default'](recentSearch.searchArgs.endDate);
             this.hotel_name = recentSearch.searchArgs.hotelName;
             if (recentSearch.searchArgs.groupName) {
-                this.hotel_chain = {
-                    name: recentSearch.searchArgs.groupName
-                };
-            }
-            // get location_type_select
-            if (recentSearch.searchArgs.iata) {
-                this.location_type_select = exports.LocationTypes.Airport;
-                this.searchService.getAirportByCode(recentSearch.searchArgs.iata).subscribe(function (iata) {
-                    var airport = {
-                        airport: {
-                            gateway: iata.iataMatch.iata
-                        }
-                    };
-                    _this.location = Object.assign(Object.assign({}, airport), iata.iataMatch);
-                    _this.searchService.startSearches();
-                });
-            }
-            else if ((recentSearch.searchArgs.latitude && recentSearch.searchArgs.longitude) || recentSearch.searchArgs.postOrZipCode) {
-                this.location_type_select = exports.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: exports.LocationTypes.Postcode
-                    };
-                }
-                this.searchService.startSearches();
+                this.hotel_chain = {
+                    name: recentSearch.searchArgs.groupName
+                };
             }
-            else if (recentSearch.searchArgs.officeId) {
-                this.location_type_select = exports.LocationTypes.Office;
-                this.searchService.getOfficeNames(this.isLoading).pipe(operators.take(1)).subscribe(function (offices) {
-                    if (offices) {
-                        var office = offices.find(function (office) { return office.id === recentSearch.searchArgs.officeId; });
+            // get location_type_select
+            switch (this.location_type_select) {
+                case exports.LocationTypes.Airport:
+                    this.searchService.getAirportByCode(recentSearch.searchArgs.iata).subscribe(function (iata) {
+                        var airport = {
+                            airport: {
+                                gateway: iata.iataMatch.iata
+                            }
+                        };
+                        _this.location = Object.assign(Object.assign({}, airport), iata.iataMatch);
+                        _this.searchService.startSearches();
+                    });
+                    break;
+                case exports.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: exports.LocationTypes.Postcode
+                        };
+                    }
+                    this.searchService.startSearches();
+                    break;
+                case exports.LocationTypes.Office:
+                    this.searchService.getOffice(recentSearch.searchArgs.officeId).pipe(operators.take(1)).subscribe(function (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 = exports.LocationTypes.TrainStation;
-                this.getRailStationByCode(recentSearch.searchArgs.trainStationCode).subscribe(function (trainsStation) {
-                    _this.trainsStation = trainsStation;
-                    _this.searchService.startSearches();
-                });
-            }
-            else {
-                this.location_type_select = exports.LocationTypes.Shortlist;
-                this.country = {
-                    cCode: recentSearch.searchArgs.countryCode,
-                    cName: ''
-                };
-                this.searchService.startSearches();
+                    });
+                    break;
+                case exports.LocationTypes.TrainStation:
+                    this.getRailStationByCode(recentSearch.searchArgs.trainStationCode).subscribe(function (trainsStation) {
+                        _this.trainsStation = trainsStation;
+                        _this.searchService.startSearches();
+                    });
+                    break;
+                case exports.LocationTypes.Shortlist:
+                    this.country = {
+                        cCode: recentSearch.searchArgs.countryCode,
+                        cName: ''
+                    };
+                    this.searchService.startSearches();
+                    break;
+                default:
+                    break;
             }
         };
         HotelEnterpriseSearch.prototype.getRailStationByCode = function (code) {
@@ -7370,7 +7548,7 @@
             return this.helpers.removeNulls(this.query);
         };
         HotelEnterpriseSearch.prototype.buildQuery = function () {
-            var _a, _b;
+            var _a, _b, _c, _d, _e, _f;
             var query = {
                 startDate: this.tempParams.checkin_date.format('YYYY-MM-DD'),
                 endDate: this.tempParams.checkout_date.format('YYYY-MM-DD'),
@@ -7399,10 +7577,20 @@
                     }
                     break;
                 case exports.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 exports.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 exports.LocationTypes.Shortlist:
                     query.countryCode = this.country.cCode;
@@ -7414,7 +7602,7 @@
             }
             // 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;
         };
@@ -7772,8 +7960,8 @@
         HotelEnterpriseSearch.prototype.addHotelRoomToBasket = function (hotel, hotelRoom, hotelQuery, travellers) {
             return __awaiter(this, void 0, void 0, function () {
                 var searchQuery, intBasket, basket, hotelAaddress, rateDescription, roomDescription, roomId, roomType;
-                return __generator(this, function (_f) {
-                    switch (_f.label) {
+                return __generator(this, function (_g) {
+                    switch (_g.label) {
                         case 0:
                             if (hotel.unavailable) {
                                 return [2 /*return*/, Promise.resolve(false)];
@@ -7785,7 +7973,7 @@
                             delete searchQuery.adults;
                             return [4 /*yield*/, this.basketService.getDefaultBasket()];
                         case 1:
-                            intBasket = _f.sent();
+                            intBasket = _g.sent();
                             basket = intBasket === null || intBasket === void 0 ? void 0 : intBasket.subject.value;
                             if (basket) {
                                 hotelAaddress = hotel.address;
@@ -7850,6 +8038,7 @@
             _this._date = null;
             _this._time = null;
             _this.resultsSessionName = LoungesEnterpriseSearch.STORAGE_SESSION_RESULTS;
+            _this.multiResultsSessionName = LoungesEnterpriseSearch.STORAGE_SESSION_RESULTS;
             var data = storageService.getSessionItem(LoungesEnterpriseSearch.STORAGE_SESSION_PARAMS) || {
                 tempParams: {}
             };
@@ -8238,6 +8427,7 @@
                 day: moment__default['default']().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;
@@ -8569,7 +8759,9 @@
             this.departDatetime = moment__default['default'](recentSearch.searchArgs.departDatetime);
             this.outFlightNumber = recentSearch.searchArgs.outFlightNumber;
             this.terminal = recentSearch.searchArgs.terminal;
-            this.searchService.getAirportByCode(recentSearch.searchArgs.locationCode).subscribe(function (airport) {
+            this.searchService
+                .getAirportByCode(recentSearch.searchArgs.locationCode)
+                .subscribe(function (airport) {
                 var _a, _b, _c, _d, _e, _f;
                 if (airport) {
                     _this.locationCode = {
@@ -8578,7 +8770,7 @@
                         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();
                 }
@@ -8678,9 +8870,52 @@
         EurostarSearchType["oneWay"] = "oneWay";
     })(exports.EurostarSearchType || (exports.EurostarSearchType = {}));
 
+    var 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: ''
+    });
     (function (SortTypesEurostar) {
         SortTypesEurostar["CheapestFirst"] = "C";
         SortTypesEurostar["EarliestFirst"] = "E";
+        SortTypesEurostar["LatestFirst"] = "L";
     })(exports.SortTypesEurostar || (exports.SortTypesEurostar = {}));
     (function (SortMethod) {
         SortMethod["sortByPrice"] = "sortByPrice";
@@ -8692,6 +8927,7 @@
             var _this = _super.call(this, storageService, function (results1) {
                 _this.resultQuery = _this.getSearchQuery();
                 delete _this.resultQuery.withGrouped;
+                _this.filters.next(_this.helpers.createFlightFilters(results1.journeys, DEFAULT_FILTERS));
                 if (results1 && _this.searchService.isFlightsGrouped()) {
                     var returndata = (results1.journeys || []).reduce(function (acc, result) {
                         if (result.outboundFlights.length) {
@@ -8748,6 +8984,13 @@
                     icon: 'ico-calendar',
                     dir: true,
                     code: exports.SortTypesEurostar.EarliestFirst
+                },
+                {
+                    title: 'Time (Descending)',
+                    method: exports.SortMethod.sortByDate,
+                    icon: 'ico-calendar',
+                    dir: true,
+                    code: exports.SortTypesEurostar.LatestFirst
                 }
             ];
             _this._fareTypeArray = [
@@ -8771,13 +9014,15 @@
             };
             _this.searchTypes = [
                 { value: exports.EurostarSearchType.return, display: 'Return' },
-                { value: exports.EurostarSearchType.oneWay, display: 'One-way' },
+                { value: exports.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 rxjs.BehaviorSubject(DEFAULT_FILTERS);
             _this._multiDestination = [];
             _this.minToHour = function (dur) { return Math.floor(dur / 60) + "h " + dur % 60 + "m"; };
             var data = storageService.getSessionItem(EurostarEnterpriseSearch.STORAGE_SESSION_PARAMS) || {
@@ -8818,6 +9063,10 @@
             _this.fullResults = _this.helpers.clone(results.results);
             _this.flightsToGroup = results.groupData || {};
             _this.resultQuery = results.query;
+            var isFlightsGrouped = _this.searchService.isFlightsGrouped();
+            if (!isFlightsGrouped) {
+                _this._cheapestResultPrice = _this.updateLowestPrice(results.results);
+            }
             _this.results.next(results.results || []);
             _this._isValid();
             _this.negotiated =
@@ -9344,13 +9593,104 @@
                     tempParams: this.tempParams,
                     originalUserSearch: this.originalUserSearch
                 });
+                var query = this.getSearchQuery();
+                this.searchService.saveRecentSearch(this.getRecentSearchQuery(query));
                 return this._startSearch(this.eurostarFetcher.fetchList(this.getSearchQuery()));
             }
             else {
                 return Promise.resolve(false);
             }
         };
-        EurostarEnterpriseSearch.prototype.startRecentSearch = function (recentSearch) { };
+        EurostarEnterpriseSearch.prototype.getRecentSearchQuery = function (query) {
+            return {
+                serviceType: ServiceType.Eurostar,
+                searchArgs: query,
+                travelDate: this.outBoundDate.format(),
+                travellers: this.helpers.getTravellersId(this.travellers)
+            };
+        };
+        EurostarEnterpriseSearch.prototype.startRecentSearch = function (recentSearch) {
+            var _this = this;
+            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
+                ? exports.EurostarSearchType.return
+                : exports.EurostarSearchType.oneWay;
+            if (recentSearch.searchArgs.outboundDepartureTimeWindow) {
+                this.outTimeCriteria = exports.TimeWindow.Depart;
+            }
+            else if (recentSearch.searchArgs.outboundArrivalTimeWindow) {
+                this.outTimeCriteria = exports.TimeWindow.Arrive;
+            }
+            else {
+                this.outTimeCriteria = exports.TimeWindow.Anytime;
+            }
+            if (recentSearch.searchArgs.returnDepartureTimeWindow) {
+                this.inTimeCriteria = exports.TimeWindow.Depart;
+            }
+            else if (recentSearch.searchArgs.returnArrivalTimeWindow) {
+                this.inTimeCriteria = exports.TimeWindow.Arrive;
+            }
+            else {
+                this.inTimeCriteria = exports.TimeWindow.Anytime;
+            }
+            rxjs.combineLatest([
+                this.searchService.getAirportByCode(recentSearch.searchArgs.originAirport),
+                this.searchService.getAirportByCode(recentSearch.searchArgs.destinationAirport)
+            ]).subscribe(function (_o) {
+                var _p = __read(_o, 2), departLocation = _p[0], arriveLocation = _p[1];
+                var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
+                if (departLocation && arriveLocation) {
+                    _this.departLocation = {
+                        destination: departLocation.iataMatch.name,
+                        gateway: departLocation.iataMatch.iata,
+                        terminals: _this.searchService.processTerminals(departLocation.iataMatch.terminals),
+                        country: (_b = (_a = departLocation.iataMatch) === null || _a === void 0 ? void 0 : _a.locationDetails) === null || _b === void 0 ? void 0 : _b.country,
+                        postcode: (_d = (_c = departLocation.iataMatch) === null || _c === void 0 ? void 0 : _c.locationDetails) === null || _d === void 0 ? void 0 : _d.postcode,
+                        countryCode: (_f = (_e = departLocation.iataMatch) === null || _e === void 0 ? void 0 : _e.locationDetails) === null || _f === void 0 ? void 0 : _f.countryCode
+                    };
+                    _this.arriveLocation = {
+                        destination: arriveLocation.iataMatch.name,
+                        gateway: arriveLocation.iataMatch.iata,
+                        terminals: _this.searchService.processTerminals(arriveLocation.iataMatch.terminals),
+                        country: (_h = (_g = arriveLocation.iataMatch) === null || _g === void 0 ? void 0 : _g.locationDetails) === null || _h === void 0 ? void 0 : _h.country,
+                        postcode: (_k = (_j = arriveLocation.iataMatch) === null || _j === void 0 ? void 0 : _j.locationDetails) === null || _k === void 0 ? void 0 : _k.postcode,
+                        countryCode: (_m = (_l = arriveLocation.iataMatch) === null || _l === void 0 ? void 0 : _l.locationDetails) === null || _m === void 0 ? void 0 : _m.countryCode
+                    };
+                    if (recentSearch.searchArgs.preferredCarriers) {
+                        var preferredCarriers_1 = [];
+                        recentSearch.searchArgs.preferredCarriers.map(function (preferredCarry) {
+                            _this.searchService
+                                .getAirlinesList(preferredCarry)
+                                .subscribe(function (items) {
+                                items.map(function (item) {
+                                    if (item.code === preferredCarry) {
+                                        preferredCarriers_1.push(item);
+                                    }
+                                });
+                                _this.preferredCarriers = preferredCarriers_1;
+                                _this.searchService.startSearches();
+                            });
+                        });
+                    }
+                    _this.searchService.startSearches();
+                }
+            });
+            this.searchService.startSearches();
+        };
         EurostarEnterpriseSearch.prototype.makeDepartureTimeWindow = function (dateTime, window) {
             return window === exports.TimeWindow.Depart
                 ? this.helpers.makeTimeWindow(dateTime, -2, 2)
@@ -9362,6 +9702,17 @@
             }
             return this.helpers.makeTimeWindow(dateTime, -2, 2);
         };
+        EurostarEnterpriseSearch.prototype.convertRecentSearchDateTime = function (date, timeWindow) {
+            if (timeWindow) {
+                var flightTime = timeWindow.split('-');
+                var timeAndDate = moment__default['default'](date).add(moment__default['default'].duration(this.helpers.hhmmToTime(flightTime[0])));
+                // add 2 hour
+                return timeAndDate.clone().add(2, 'hour');
+            }
+            else {
+                return moment__default['default'](date);
+            }
+        };
         EurostarEnterpriseSearch.prototype.getSearchQuery = function () {
             return this.helpers.removeNulls(Object.assign({}, {
                 originAirport: this._originAirport,
@@ -9443,6 +9794,53 @@
             }
             this.results.next(results);
         };
+        EurostarEnterpriseSearch.prototype.sortResultsFlightJourneys = function (sortMethodValue, inbound, givenResults) {
+            if (inbound === void 0) { inbound = false; }
+            var results = this.helpers.clone(givenResults);
+            switch (sortMethodValue) {
+                case exports.SortTypesEurostar.CheapestFirst:
+                    results = this.sortByPriceFlight(results);
+                    break;
+                case exports.SortTypesEurostar.EarliestFirst:
+                    results = this.sortByDateFlight(results, inbound);
+                    break;
+                case exports.SortTypesEurostar.LatestFirst:
+                    results = this.sortByDateFlightDecending(results, inbound);
+                    break;
+                default:
+                    console.error("+++ Unknown sorting method: " + sortMethodValue + " +++");
+            }
+            return results;
+        };
+        EurostarEnterpriseSearch.prototype.sortByPriceFlight = function (results) {
+            return results.sort(function (a, b) {
+                return Number(a.total.price) - Number(b.total.price);
+            });
+        };
+        EurostarEnterpriseSearch.prototype.sortByDateFlight = function (results, inbound) {
+            return results.sort(function (a, b) {
+                if (inbound) {
+                    return (moment__default['default'](a.inboundFlights[0].dateTimeDeparting).unix() -
+                        moment__default['default'](b.inboundFlights[0].dateTimeDeparting).unix());
+                }
+                else {
+                    return (moment__default['default'](a.outboundFlights[0].dateTimeDeparting).unix() -
+                        moment__default['default'](b.outboundFlights[0].dateTimeDeparting).unix());
+                }
+            });
+        };
+        EurostarEnterpriseSearch.prototype.sortByDateFlightDecending = function (results, inbound) {
+            return results.sort(function (a, b) {
+                if (inbound) {
+                    return (moment__default['default'](b.inboundFlights[0].dateTimeDeparting).unix() -
+                        moment__default['default'](a.inboundFlights[0].dateTimeDeparting).unix());
+                }
+                else {
+                    return (moment__default['default'](b.outboundFlights[0].dateTimeDeparting).unix() -
+                        moment__default['default'](a.outboundFlights[0].dateTimeDeparting).unix());
+                }
+            });
+        };
         /**
          * Sort results by departure time
          *
@@ -9531,6 +9929,47 @@
             }
             return num.toString().padStart(2, '0');
         };
+        /**
+         * @description - apply all filters to results
+         * @param filters
+         * @param inbound
+         * @param results
+         * @returns
+         */
+        EurostarEnterpriseSearch.prototype.applyFilters = function (filters, inbound) {
+            if (inbound === void 0) { 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;
+        };
         EurostarEnterpriseSearch.prototype.filterByDuration = function (minDuration, maxDuration, results, isReturn) {
             if (isReturn === void 0) { isReturn = false; }
             results = results.filter(function (result) {
@@ -9720,40 +10159,6 @@
             }
             return results;
         };
-        EurostarEnterpriseSearch.prototype.createFilters = function (results) {
-            if (results === void 0) { results = []; }
-            var minPrice = this.getMinPrice(results);
-            var maxPrice = this.getMaxPrice(results);
-            var newFilters = {
-                stops: this.getAllStops(results),
-                mustInclude: [],
-                classes: this.getAllClasses(results),
-                airlines: this.getAllAirlines(results),
-                travelPolicy: [],
-                depatureAirport: this.getAllDepartureAirports(results),
-                arrivalAirport: this.getAllArrivalAirports(results),
-                minPrice: minPrice,
-                maxPrice: 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;
-        };
         EurostarEnterpriseSearch.prototype.getMinDuration = function (results, isReturn) {
             if (isReturn === void 0) { isReturn = false; }
             var min = 0;
@@ -10070,11 +10475,11 @@
         EurostarEnterpriseSearch.prototype.selectGroupedEurostar = function (selectedEurostar, fare, direction) {
             return __awaiter(this, void 0, void 0, function () {
                 var intBasket, basket, index_1;
-                return __generator(this, function (_b) {
-                    switch (_b.label) {
+                return __generator(this, function (_o) {
+                    switch (_o.label) {
                         case 0: return [4 /*yield*/, this.basketService.getDefaultBasket()];
                         case 1:
-                            intBasket = _b.sent();
+                            intBasket = _o.sent();
                             basket = intBasket === null || intBasket === void 0 ? void 0 : intBasket.subject.value;
                             if (basket &&
                                 this.originalUserSearch.chosenSearchType === exports.EurostarSearchType.oneWay &&
@@ -10105,9 +10510,7 @@
                                     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);
@@ -10118,17 +10521,17 @@
             });
         };
         EurostarEnterpriseSearch.prototype.updateLowestPrice = function (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;
+            var result = results[0];
+            var journeys = result.journeys;
+            var currency = journeys[0].total.currency;
+            return journeys.reduce(function (cheapestPrice, result) {
+                var price = result.total.price;
+                if (cheapestPrice.amount > price)
+                    cheapestPrice.amount = price;
+                return cheapestPrice;
+            }, { amount: Number.MAX_SAFE_INTEGER, currencyCode: currency });
         };
         EurostarEnterpriseSearch.prototype.doBooking = function (intBasket, selectedFlight, schemaDetails, outboundDate, inboundDate) {
             var sourceId = selectedFlight.sourceId, co2PerItem = selectedFlight.co2PerItem, co2PerPassenger = selectedFlight.co2PerPassenger, total = selectedFlight.total;
@@ -10241,20 +10644,22 @@
             return __awaiter(this, void 0, void 0, function () {
                 var intBasket, basket, sourceId, co2PerItem, co2PerPassenger, total, outboundDate, inboundDate, schemaDetails, booking;
                 var _this = this;
-                return __generator(this, function (_b) {
-                    switch (_b.label) {
+                return __generator(this, function (_o) {
+                    switch (_o.label) {
                         case 0:
                             if (eurostarQuote.unavailable) {
                                 return [2 /*return*/, Promise.resolve(false)];
                             }
                             return [4 /*yield*/, this.basketService.getDefaultBasket()];
                         case 1:
-                            intBasket = _b.sent();
+                            intBasket = _o.sent();
                             basket = intBasket === null || intBasket === void 0 ? void 0 : intBasket.subject.value;
                             if (basket) {
                                 sourceId = eurostarQuote.sourceId, co2PerItem = eurostarQuote.co2PerItem, co2PerPassenger = eurostarQuote.co2PerPassenger, total = eurostarQuote.total;
                                 outboundDate = moment__default['default'](eurostarQuote.outboundFlights[0].dateTimeDeparting);
-                                inboundDate = eurostarQuote.inboundFlights.length ? moment__default['default'](eurostarQuote.inboundFlights[0].dateTimeDeparting) : null;
+                                inboundDate = eurostarQuote.inboundFlights.length
+                                    ? moment__default['default'](eurostarQuote.inboundFlights[0].dateTimeDeparting)
+                                    : null;
                                 schemaDetails = {
                                     outboundFlights: __spread(eurostarQuote.outboundFlights.map(function (flight, segmentIndex) { return _this.makeSchemaFlights(flight, 'outbound', 0, segmentIndex); })),
                                     inboundFlights: __spread(eurostarQuote.inboundFlights.map(function (flight, segmentIndex) { return _this.makeSchemaFlights(flight, 'inbound', 0, segmentIndex); })),
@@ -10307,6 +10712,7 @@
             _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 }
@@ -11747,21 +12153,68 @@
             });
             return foundETicket ? true : null;
         };
-        /**
-         * @description - clear all of our chosen tickets/other rail stuff, call this when kicking off a new search
-         */
-        RailEnterpriseSearch.prototype.clearChosenTickets = function () {
-            this._chosenInboundTicket = null;
-            this._chosenOutboundTicket = null;
-            this._chosenInboundJourney = null;
-            this._chosenOutboundJourney = null;
-            this._chosenTicketGroup = null;
+        /**
+         * @description - clear all of our chosen tickets/other rail stuff, call this when kicking off a new search
+         */
+        RailEnterpriseSearch.prototype.clearChosenTickets = function () {
+            this._chosenInboundTicket = null;
+            this._chosenOutboundTicket = null;
+            this._chosenInboundJourney = null;
+            this._chosenOutboundJourney = null;
+            this._chosenTicketGroup = null;
+        };
+        return RailEnterpriseSearch;
+    }(BaseEnterpriseSearch));
+    RailEnterpriseSearch.STORAGE_SESSION_PARAMS = 'search_rail';
+    RailEnterpriseSearch.STORAGE_SESSION_RESULTS = 'rail_results';
+    RailEnterpriseSearch.PASSING_POINT = 'Passing';
+
+    (function (ages) {
+        ages["Child"] = "Child";
+        ages["Youth"] = "Youth";
+        ages["Adult"] = "Adult";
+        ages["Senior"] = "Senior";
+    })(exports.ages || (exports.ages = {}));
+    // @dynamic
+    var TravellerObject = /** @class */ (function () {
+        function TravellerObject() {
+        }
+        TravellerObject.hasItem = function (item) {
+            return !!item;
+        };
+        TravellerObject.fullname = function (traveller) {
+            return [traveller.title, traveller.forename, traveller.surname].filter(this.hasItem).join(' ');
+        };
+        TravellerObject.makeTravellerObjectFromUser = function (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
+            };
+        };
+        TravellerObject.equals = function (first, second) {
+            return first.email === second.email;
         };
-        return RailEnterpriseSearch;
-    }(BaseEnterpriseSearch));
-    RailEnterpriseSearch.STORAGE_SESSION_PARAMS = 'search_rail';
-    RailEnterpriseSearch.STORAGE_SESSION_RESULTS = 'rail_results';
-    RailEnterpriseSearch.PASSING_POINT = 'Passing';
+        TravellerObject.compare = function (first, second) {
+            var name1 = TravellerObject.fullname(first);
+            var name2 = TravellerObject.fullname(second);
+            if (name1 === name2) {
+                return 0;
+            }
+            if (name1 < name2) {
+                return -1;
+            }
+            return 1;
+        };
+        return TravellerObject;
+    }());
 
     (function (IrlSearchCriteria) {
         IrlSearchCriteria["Depart"] = "Depart After";
@@ -11769,15 +12222,15 @@
     })(exports.IrlSearchCriteria || (exports.IrlSearchCriteria = {}));
     var IRLEnterpriseSearch = /** @class */ (function (_super) {
         __extends(IRLEnterpriseSearch, _super);
-        function IRLEnterpriseSearch(Irlfetcher, 
-        // private getRailStationFetcher: BaseGetRailStationFetcher<GRS_Q>, // doesnt exist yet
-        helpers, basketService, storageService, searchService) {
+        function IRLEnterpriseSearch(Irlfetcher, searchIrlStationsFetcher, helpers, basketService, storageService, searchService) {
             var _this = _super.call(this, storageService) || this;
             _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 }
@@ -11789,8 +12242,8 @@
                 { 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 = [exports.IrlSearchCriteria.Depart, exports.IrlSearchCriteria.Arrive];
+            _this.ageRanges = [{ key: exports.ages.Child, value: 'Child (0-3)' }, { key: exports.ages.Child, value: 'Child (4-5)' }, { key: exports.ages.Child, value: 'Child (6-11)' }, { key: exports.ages.Youth, value: 'Youth (12-14)' }, { key: exports.ages.Youth, value: 'Youth (15-25)' }, { key: exports.ages.Adult, value: 'Adult (26-59)' }, { key: exports.ages.Youth, value: 'Senior (60+)' }];
+            _this.irlCriteria = [exports.IrlSearchCriteria.Depart, exports.IrlSearchCriteria.Arrive];
             _this.travelCards = [
                 { display: 'Young persons railcard', value: 'YNG' },
                 { display: 'Disability railcard', value: 'DIS' },
@@ -11819,22 +12272,6 @@
             _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;
@@ -11843,7 +12280,7 @@
             _this._cheapestStandard = null;
             _this._cheapestFirst = null;
             _this._irlClass = null;
-            _this._journeytype = null;
+            _this._journeytype = IrlJourneyType.SingleJourney;
             var data = storageService.getSessionItem(IRLEnterpriseSearch.STORAGE_SESSION_PARAMS) || {
                 query: {},
                 tempParams: {},
@@ -11854,7 +12291,10 @@
             if (searchService.shouldAddTravellerSubscription()) {
                 searchService.travellerInformation.subscribe(function (travellers) {
                     _this.travellers = travellers;
-                    var splitTravellers = _this.helpers.selectedTravellers(travellers, ServiceType.Rail);
+                    if (_this.travellers[0] && !_this.travellers[0].ageType) {
+                        _this.travellers[0].ageType = exports.ages.Adult;
+                    }
+                    var splitTravellers = _this.helpers.selectedTravellers(travellers, ServiceType.InternationalRail);
                     _this.tempParams.adults = splitTravellers.adults.length;
                     _this.tempParams.children = splitTravellers.children.length;
                     _this.travellers = travellers;
@@ -11966,6 +12406,7 @@
                 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();
             },
@@ -12006,8 +12447,13 @@
             get: function () {
                 return this._outboundDepartureDateTime;
             },
-            set: function (data) {
-                this._outboundDepartureDateTime = data;
+            set: function (newDateTime) {
+                this._outboundDepartureDateTime = newDateTime;
+                this._outbound_date = this.helpers.momentToNgDate(newDateTime);
+                this._outbound_time = moment__default['default'](newDateTime).format('HHmm')
+                    ? moment__default['default'](newDateTime).format('HHmm')
+                    : '0700';
+                this._updateOutboundDateTime();
             },
             enumerable: false,
             configurable: true
@@ -12056,8 +12502,13 @@
             get: function () {
                 return this._returnDepartureDateTime;
             },
-            set: function (data) {
-                this._returnDepartureDateTime = data;
+            set: function (newDateTime) {
+                this._returnDepartureDateTime = newDateTime;
+                this._return_date = this.helpers.momentToNgDate(newDateTime);
+                this._return_time = moment__default['default'](newDateTime).format('HHmm')
+                    ? moment__default['default'](newDateTime).format('HHmm')
+                    : '0700';
+                this._updateReturnDateTime();
             },
             enumerable: false,
             configurable: true
@@ -12097,13 +12548,46 @@
                     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__default['default'](newDateTime).format('HHmm')
+                        ? moment__default['default'](newDateTime).format('HHmm')
+                        : '0700';
+                }
+                if (this.outBoundDateTime &&
+                    this.inBoundDateTime &&
+                    this.outBoundDateTime.isAfter(this.inBoundDateTime)) {
+                    this.inBoundDateTime = this.outBoundDateTime.clone().add(1, 'day');
+                }
+                this._isValid();
+            },
+            enumerable: false,
+            configurable: true
+        });
+        Object.defineProperty(IRLEnterpriseSearch.prototype, "outboundCriteria", {
+            get: function () {
+                return this.tempParams.outboundCriteria;
+            },
+            set: function (newCrit) {
+                // console.warn(`+++ Setting New Criteria: ${newCrit} +++`);
+                this.tempParams.outboundCriteria = newCrit;
+                this._isValid();
+            },
+            enumerable: false,
+            configurable: true
+        });
+        Object.defineProperty(IRLEnterpriseSearch.prototype, "inBoundDateTime", {
+            get: function () {
+                return this.tempParams.returnDepartureDateTime;
+            },
+            set: function (newDateTime) {
+                this.tempParams.returnDepartureDateTime = newDateTime;
+                if (newDateTime && newDateTime.isValid()) {
+                    this._return_date = this.helpers.momentToNgDate(newDateTime);
+                    this._return_time = moment__default['default'](newDateTime).format('HHmm')
+                        ? moment__default['default'](newDateTime).format('HHmm')
+                        : '1600';
+                }
                 this._isValid();
             },
             enumerable: false,
@@ -12153,14 +12637,18 @@
             enumerable: false,
             configurable: true
         });
+        Object.defineProperty(IRLEnterpriseSearch.prototype, "returnCriteria", {
+            get: function () {
+                return this.tempParams.returnCriteria;
+            },
+            set: function (newCrit) {
+                this.tempParams.returnCriteria = newCrit;
+                this._isValid();
+            },
+            enumerable: false,
+            configurable: true
+        });
         Object.defineProperty(IRLEnterpriseSearch.prototype, "timeArray", {
-            // get returnCriteria(): IrlSearchCriteria {
-            //   return this.tempParams.returnCriteria;
-            // }
-            // set returnCriteria(newCrit: IrlSearchCriteria) {
-            //   this.tempParams.returnCriteria = newCrit;
-            //   this._isValid();
-            // }
             // set railCards(newRailCards: string[]) {
             //   this.tempParams.railCards = newRailCards;
             //   this._isValid();
@@ -12312,11 +12800,14 @@
         IRLEnterpriseSearch.prototype._updateReturnDateTime = function () {
             if (this._return_date && this._return_time) {
                 var time = this.helpers.ngDateToMoment(this._return_date, this._return_time);
-                // this.inBoundDateTime = time.isValid() ? time : null;
+                this.inBoundDateTime = time.isValid() ? time : null;
                 this._isValid();
             }
         };
         IRLEnterpriseSearch.prototype.getSearchQuery = function () {
+            // this.travellers = travellers;
+            this.noOfAdults = this.travellers.filter(function (traveller) { return traveller.ageType === exports.ages.Adult || traveller.ageType === exports.ages.Youth || traveller.ageType === exports.ages.Senior; }).length;
+            this.noOfChildren = this.travellers.filter(function (traveller) { return traveller.ageType === exports.ages.Child; }).length;
             var query = {
                 supplier: this.supplier,
                 countryCode: 'GB',
@@ -12328,14 +12819,14 @@
                 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;
@@ -12347,7 +12838,7 @@
             // }
             // switch (this.tempParams.returnCriteria) {
             //   case IrlSearchCriteria.Depart:
-            //     query.returnArrivalDateTime = null;
+            //     query.returnDepartureDateTime = null;
             //     break;
             //   case IrlSearchCriteria.Arrive:
             //     query.returnDepartureDateTime = null;
@@ -12749,78 +13240,90 @@
             }
             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);
-        // }
+        IRLEnterpriseSearch.prototype.addSingleJourneyToBasket = function (serviceId, railQuery, irlJourneyOption) {
+            return __awaiter(this, void 0, void 0, function () {
+                var intBasket, basket;
+                return __generator(this, function (_c) {
+                    switch (_c.label) {
+                        case 0:
+                            console.log(serviceId, railQuery, irlJourneyOption);
+                            return [4 /*yield*/, this.basketService.getDefaultBasket()];
+                        case 1:
+                            intBasket = _c.sent();
+                            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 [2 /*return*/, Promise.resolve(false)];
+                    }
+                });
+            });
+        };
         // async addReturnJourneyToBasket(
         //   serviceId: string,
         //   railQuery: SearchRailQueryVariables,
@@ -13525,7 +14028,7 @@
         }
         BaseIrlQuoteFetcher.prototype.getDataFromResult = function (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;
         };
         return BaseIrlQuoteFetcher;
     }(FetchableList));
@@ -13719,6 +14222,18 @@
         return BaseConfermaOfficeNamesFetcher;
     }(FetchableList));
 
+    var BaseConfermaOfficeFetcher = /** @class */ (function (_super) {
+        __extends(BaseConfermaOfficeFetcher, _super);
+        function BaseConfermaOfficeFetcher(getUserAddressGQL, modalService) {
+            return _super.call(this, getUserAddressGQL, modalService) || this;
+        }
+        BaseConfermaOfficeFetcher.prototype.getDataFromResult = function (results) {
+            var _a;
+            return (_a = results === null || results === void 0 ? void 0 : results.data) === null || _a === void 0 ? void 0 : _a.getConfermaOffice;
+        };
+        return BaseConfermaOfficeFetcher;
+    }(FetchableObject));
+
     var BaseGetUserCurrentCarbonAllowanceFetcher = /** @class */ (function (_super) {
         __extends(BaseGetUserCurrentCarbonAllowanceFetcher, _super);
         function BaseGetUserCurrentCarbonAllowanceFetcher(getUserBasketsGQL, helpers, modalService) {
@@ -13778,6 +14293,20 @@
         return BaseEurostarQuoteFetcher;
     }(FetchableList));
 
+    var BaseSearchIrlStationsFetcher = /** @class */ (function (_super) {
+        __extends(BaseSearchIrlStationsFetcher, _super);
+        function BaseSearchIrlStationsFetcher(gql, helpers, modalService) {
+            return _super.call(this, gql, helpers, modalService) || this;
+        }
+        BaseSearchIrlStationsFetcher.prototype.getDataFromResult = function (results) {
+            var _a;
+            return (_a = results === null || results === void 0 ? void 0 : results.data) === null || _a === void 0 ? void 0 : _a.searchIRLSupplierStations;
+        };
+        return BaseSearchIrlStationsFetcher;
+    }(FetchableList));
+
+    // | 'fareTypes';
+
     /**
      * @desc Known reg expresions
      */
@@ -13860,47 +14389,6 @@
         return AuthInfo;
     }());
 
-    // @dynamic
-    var TravellerObject = /** @class */ (function () {
-        function TravellerObject() {
-        }
-        TravellerObject.hasItem = function (item) {
-            return !!item;
-        };
-        TravellerObject.fullname = function (traveller) {
-            return [traveller.title, traveller.forename, traveller.surname].filter(this.hasItem).join(' ');
-        };
-        TravellerObject.makeTravellerObjectFromUser = function (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
-            };
-        };
-        TravellerObject.equals = function (first, second) {
-            return first.email === second.email;
-        };
-        TravellerObject.compare = function (first, second) {
-            var name1 = TravellerObject.fullname(first);
-            var name2 = TravellerObject.fullname(second);
-            if (name1 === name2) {
-                return 0;
-            }
-            if (name1 < name2) {
-                return -1;
-            }
-            return 1;
-        };
-        return TravellerObject;
-    }());
-
     var TEMPID = 'TEMPID_';
     var InternalBasket = /** @class */ (function () {
         function InternalBasket(basket, helpers, basketService, getUserFetcher) {
@@ -14361,6 +14849,7 @@
             var 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)) {
                 var error = "Item searchQuery is not valid for " + serviceToCheck.name + " search schema.";
                 console.warn('searchSchema', serviceToCheck.searchQuerySchema);
@@ -14567,7 +15056,7 @@
             });
         };
         BaseEnterpriseBasketService.prototype.sendBasketForApproval = function (basketid) {
-            this.updateBasket(basketid, this.sendBasketForApprovalUpdater
+            return this.updateBasket(basketid, this.sendBasketForApprovalUpdater
                 .updateOne({ basket: basketid })
                 .pipe(operators.take(1)));
         };
@@ -16633,7 +17122,7 @@
         TravellerSearchTypes["employeeNumber"] = "employeeNumber";
     })(exports.TravellerSearchTypes || (exports.TravellerSearchTypes = {}));
     var BaseEnterpriseSearchService = /** @class */ (function () {
-        function BaseEnterpriseSearchService(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) {
+        function BaseEnterpriseSearchService(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) {
             var _d;
             var _this = this;
             this.searchAirportsFetcher = searchAirportsFetcher;
@@ -16655,6 +17144,7 @@
             this.baseValidateIsPostcodeValidTester = baseValidateIsPostcodeValidTester;
             this.depotFetcher = depotFetcher;
             this.confermaOfficeNamesFetcher = confermaOfficeNamesFetcher;
+            this.confermaOfficeFetcher = confermaOfficeFetcher;
             this.baseDeleteUserAddressUpdater = baseDeleteUserAddressUpdater;
             this.baseDeleteRecentSearchUpdater = baseDeleteRecentSearchUpdater;
             this.baseSaveRecentSearchUpdater = baseSaveRecentSearchUpdater;
@@ -16665,6 +17155,7 @@
             this.getUserRecentSearchesFetcher = getUserRecentSearchesFetcher;
             this.getRailCardsFetcher = getRailCardsFetcher;
             this.searchUsersCanBookForFetcher = searchUsersCanBookForFetcher;
+            this.searchIrlStationsFetcher = searchIrlStationsFetcher;
             this.traveller_error = false;
             this.travellerInformation = new rxjs.BehaviorSubject([]);
             this.errors = new rxjs.BehaviorSubject([]);
@@ -16689,9 +17180,7 @@
                 _d[ServiceType.Hotel] = new HotelEnterpriseSearch(hotelFetcher, helpers, userService, environment, hotelAvalibilityService, basketService, storageService, this, httpCallService, quicklistFetcher, getRailStationFetcher),
                 _d[ServiceType.Car] = new CarhireEnterpriseSearch(carhireFetcher, carHireAvailabilityDetailFetcher, helpers, basketService, storageService, this),
                 _d[ServiceType.Cab] = new CabHireEnterpriseSearch(cabhireFetcher, helpers, storageService, this, basketService),
-                _d[ServiceType.InternationalRail] = new IRLEnterpriseSearch(irlFetcher, 
-                // getRailStationFetcher,
-                helpers, basketService, storageService, this),
+                _d[ServiceType.InternationalRail] = new IRLEnterpriseSearch(irlFetcher, searchIrlStationsFetcher, helpers, basketService, storageService, this),
                 _d[ServiceType.FastTrack] = null,
                 _d[ServiceType.Coach] = null,
                 _d[ServiceType.Rail] = new RailEnterpriseSearch(railFetcher, getRailStationFetcher, helpers, basketService, storageService, this),
@@ -16949,6 +17438,23 @@
         BaseEnterpriseSearchService.prototype.getSelectedPlaceById = function (placeId) {
             return this.selectedPlaces.find(function (place) { return place.place_id === placeId; });
         };
+        BaseEnterpriseSearchService.prototype.getConfirmaOffices = function (term) {
+            if ((term === null || term === void 0 ? void 0 : term.length) > 2) {
+                var obs = this.confermaOfficeNamesFetcher.fetchList();
+                var func = function (results) {
+                    var data = results.results.map(function (result) {
+                        return {
+                            name: result.name,
+                            type: exports.LocationTypes.Office,
+                            id: result.id
+                        };
+                    });
+                    return data;
+                };
+                return obs.pipe(operators.take(1), operators.map(func));
+            }
+            return rxjs.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
@@ -16996,6 +17502,31 @@
                 return rxjs.of([]);
             }
         };
+        BaseEnterpriseSearchService.prototype.searchIrlStationsLocations = function (term, isLoading) {
+            if (term.length > 2) {
+                isLoading === null || isLoading === void 0 ? void 0 : isLoading.next(true);
+                return this.searchIrlStationsFetcher
+                    .fetchList({
+                    query: term
+                })
+                    .pipe(operators.take(1), operators.map(function (results) {
+                    if (isLoading) {
+                        isLoading.next(false);
+                    }
+                    return results
+                        .map(function (result) {
+                        return {
+                            type: exports.LocationTypes.TrainStation,
+                            name: result.name + " (" + result.supplier + ")",
+                            railstation: result
+                        };
+                    });
+                }));
+            }
+            else {
+                return rxjs.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
@@ -17014,7 +17545,7 @@
                         this.getAirportLocations(term, countryCode, isLoading),
                         this.getCityLocations(term, countryCode, isLoading),
                         this.getStationLocations(term, isLoading),
-                        this.getOfficeLocations(term)
+                        this.getConfirmaOffices(term)
                     ]).pipe(operators.map(function (results) {
                         if (isLoading === null || isLoading === void 0 ? void 0 : isLoading.value) {
                             isLoading.next(false);
@@ -17452,6 +17983,18 @@
             }));
             isLoading === null || isLoading === void 0 ? void 0 : isLoading.next(false);
         };
+        BaseEnterpriseSearchService.prototype.getOffice = function (officeId) {
+            if (officeId) {
+                return this.confermaOfficeFetcher.fetchOne({ officeId: officeId }).pipe(operators.take(1), operators.map(function (results) {
+                    if (results) {
+                        return results.results;
+                    }
+                }));
+            }
+            else {
+                return rxjs.of();
+            }
+        };
         BaseEnterpriseSearchService.prototype.getRailCards = function () {
             return this.getRailCardsFetcher.fetchList().pipe(operators.take(1), operators.map(function (results) {
                 if (results) {
@@ -17773,7 +18316,7 @@
         };
         /*
          * 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
          */
         BaseEnterpriseSearchService.prototype.makeIrlQuery = function () {
@@ -17783,17 +18326,18 @@
             }
             var time = this.helpers.momentRoundMinutes(moment__default['default'](), 30);
             var defaultVal = {
+                returnCriteria: exports.IrlSearchCriteria.Depart,
+                outboundCriteria: exports.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.apply(Object, __spread([{}], args)), ['returnDepartureDateTime', 'outboundDepartureDateTime']);
         };
@@ -18497,6 +19041,7 @@
     exports.BaseCabhireQuoteFetcher = BaseCabhireQuoteFetcher;
     exports.BaseCarHireAvailabilityDetailFetcher = BaseCarHireAvailabilityDetailFetcher;
     exports.BaseCarhireQuoteFetcher = BaseCarhireQuoteFetcher;
+    exports.BaseConfermaOfficeFetcher = BaseConfermaOfficeFetcher;
     exports.BaseConfermaOfficeNamesFetcher = BaseConfermaOfficeNamesFetcher;
     exports.BaseCreateBasketUpdater = BaseCreateBasketUpdater;
     exports.BaseDeleteBasketUpdater = BaseDeleteBasketUpdater;
@@ -18543,6 +19088,7 @@
     exports.BaseSearchConfermaQuicklistFetcher = BaseSearchConfermaQuicklistFetcher;
     exports.BaseSearchDepotFetcher = BaseSearchDepotFetcher;
     exports.BaseSearchHotelChainsFetcher = BaseSearchHotelChainsFetcher;
+    exports.BaseSearchIrlStationsFetcher = BaseSearchIrlStationsFetcher;
     exports.BaseSearchPostcodeFetcher = BaseSearchPostcodeFetcher;
     exports.BaseSearchRailStationsFetcher = BaseSearchRailStationsFetcher;
     exports.BaseSearchUsersCanBookForFetcher = BaseSearchUsersCanBookForFetcher;
@@ -18567,6 +19113,7 @@
     exports.BookableBasket = BookableBasket;
     exports.CabHireEnterpriseSearch = CabHireEnterpriseSearch;
     exports.CarhireEnterpriseSearch = CarhireEnterpriseSearch;
+    exports.DEFAULT_FLIGHT_FILTERS = DEFAULT_FLIGHT_FILTERS;
     exports.EurostarEnterpriseSearch = EurostarEnterpriseSearch;
     exports.FlightEnterpriseSearch = FlightEnterpriseSearch;
     exports.HotelEnterpriseSearch = HotelEnterpriseSearch;