@sabstravtech/obtservices 0.2.2505201645 → 0.2.2506041247

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

@@ -1786,11 +1786,13 @@
           _this.search = function (terms) {
               return rxjs.of([]);
           };
+          _this.searchByTriggerValue = function () {
+              return Promise.resolve([]);
+          };
           Object.assign(_this, managementInfo); // This will automatically call _isValid()
           return _this;
       }
       ;
-      ;
       Object.defineProperty(ManagementInfoAndIsValid.prototype, "value", {
           get: function () {
               return this.getValue();
@@ -1817,9 +1819,7 @@
       ManagementInfoAndIsValid.prototype.hasErrors = function (value) {
           var _this = this;
           return new Promise(function (resolve, reject) {
-              resolve(_this.mandatory && (!value || value.length === 0)
-                  ? { hasErrors: true }
-                  : null);
+              resolve(_this.mandatory && (!value || value.length === 0) ? { hasErrors: true } : null);
           });
       };
       return ManagementInfoAndIsValid;
@@ -1884,6 +1884,23 @@
                   _this.availableItems = sugestions;
               }));
           };
+          _this.searchByTriggerValue = function () { return __awaiter(_this, void 0, void 0, function () {
+              var _a, values;
+              return __generator(this, function (_c) {
+                  switch (_c.label) {
+                      case 0:
+                          if (!(!((_a = this.availableItems) === null || _a === void 0 ? void 0 : _a.length) ||
+                              (this.tempTriggerMIValueId && this.triggerMIValueId !== this.tempTriggerMIValueId))) return [3 /*break*/, 2];
+                          return [4 /*yield*/, rxjs.firstValueFrom(this.basketService.getMiAutoSugestions(this.id, '', this.isLoading, this.serviceId, this.managementInfoValueGroup, this.triggerMIValueId))];
+                      case 1:
+                          values = _c.sent();
+                          this.availableItems = values;
+                          this.tempTriggerMIValueId = this.triggerMIValueId;
+                          return [2 /*return*/, values];
+                      case 2: return [2 /*return*/];
+                  }
+              });
+          }); };
           _this.searchNoHash = function (terms) {
               return terms.pipe(operators.debounceTime(300), operators.distinctUntilChanged(), operators.switchMap(function (term) {
                   var ob = term.length > 0
@@ -3146,7 +3163,9 @@
       'exel Breakfast',
       'Breakfast Costs',
       'no breakfast',
-      'ROOM ONL'
+      'ROOM ONL',
+      'Fee for buffet breakfast',
+      'RO/RO'
   ];
   var AccessibleIncluded = [
       'Accessibility',
@@ -3331,7 +3350,13 @@
       ServiceProvider["Trenitalia"] = "Trenitalia";
       ServiceProvider["Renfe"] = "Renfe";
       ServiceProvider["Italo"] = "NTV";
+      ServiceProvider["AmadeusCarHire"] = "Amadeus Car Hire";
   })(exports.ServiceProvider || (exports.ServiceProvider = {}));
+  var nonEnterpriseCarServices = [
+      exports.ServiceProvider.SabreCarHire,
+      exports.ServiceProvider.TravelportCarHire,
+      exports.ServiceProvider.AmadeusCarHire
+  ];
   exports.ResendConfirmationEmailOption = void 0;
   (function (ResendConfirmationEmailOption) {
       ResendConfirmationEmailOption["Agent"] = "Agent";
@@ -7008,7 +7033,7 @@
       };
       BaseHelperRoutines.prototype.createFlightFilters = function (journeys, defaultFilters, via) {
           return journeys.reduce(function (filters, result1) {
-              var _a;
+              var _a, _b;
               var outStops = result1.outboundFlights.length - 1;
               filters.stops[outStops] = filters.stops[outStops] || {
                   display: outStops === 0 ? 'Direct' : outStops + " stop" + (outStops !== 1 ? 's' : ''),
@@ -7017,7 +7042,7 @@
               };
               var requiresReason = result1.unavailable
                   ? exports.TravelPolicies.UNAVAILABLE
-                  : result1.requiresReasonKeys
+                  : ((_a = result1.requiresReasonKeys) === null || _a === void 0 ? void 0 : _a.length)
                       ? exports.TravelPolicies.ALLOW_WITH_REASON
                       : exports.TravelPolicies.IN_POLICY;
               if (requiresReason !== 'Unavailable') {
@@ -7047,7 +7072,7 @@
                   // };
                   if (flight.fareInfo.type === 'Private') {
                       filters.privateFares[flight.fareInfo.title] = filters.privateFares[flight.fareInfo.title] || {
-                          display: flight.fareInfo.title,
+                          display: flight.fareInfo.title === "Corporate Fare" ? "Client" : flight.fareInfo.title,
                           selected: false,
                           value: flight.fareInfo.title
                       };
@@ -7072,7 +7097,7 @@
                   result1.outboundFlights.forEach(getAirline);
               }
               result1.outboundFlights.forEach(updateFlightItems);
-              var baggageArray = (_a = result1.baggageAllowance) === null || _a === void 0 ? void 0 : _a.filter(function (a) { return (a === null || a === void 0 ? void 0 : a.type) === 'CheckIn'; }).map(function (a) { return a === null || a === void 0 ? void 0 : a.qty; });
+              var baggageArray = (_b = result1.baggageAllowance) === null || _b === void 0 ? void 0 : _b.filter(function (a) { return (a === null || a === void 0 ? void 0 : a.type) === 'CheckIn'; }).map(function (a) { return a === null || a === void 0 ? void 0 : a.qty; });
               var baggage = baggageArray.length ? Math.min.apply(Math, __spreadArray([], __read(baggageArray))) : 0;
               filters.baggage[baggage] = filters.baggage[baggage] || {
                   selected: false,
@@ -8553,6 +8578,7 @@
           return this.cabfetcher.fetchList(query);
       };
       CabHireEnterpriseSearch.prototype.gmtGetCabSearchQuery = function (fromLocation, toLocation, dateTme) {
+          var _a, _b;
           var createLocation = function (location) {
               var _a, _b;
               return {
@@ -8577,14 +8603,14 @@
                   countryCode: from.countryCode,
                   postcode: from.postcode,
                   streetAndNumber: from.streetAndNumber,
-                  town: from.town,
+                  town: (_a = from.town) !== null && _a !== void 0 ? _a : undefined,
               },
               toLocation: {
                   buildingName: to.buildingName,
                   countryCode: to.countryCode,
                   postcode: to.postcode,
                   streetAndNumber: to.streetAndNumber,
-                  town: to.town,
+                  town: (_b = to.town) !== null && _b !== void 0 ? _b : undefined,
               },
               travellers: this.travellers.map(function (traveller) { return { id: traveller.id }; })
           };
@@ -9455,6 +9481,7 @@
   UserFavorurite.ReplaceBasketWithIntinerary = new UserFavorurite('replaceBasketWithIntinerary');
   UserFavorurite.useKmForCarHire = new UserFavorurite('useKmForCarHire');
   UserFavorurite.distanceUnit = new UserFavorurite('distanceUnit');
+  UserFavorurite.eurostarSearchDefaults = new UserFavorurite('eurostarSearchDefaults');
   var Suppliers = /** @class */ (function () {
       function Suppliers(value) {
           this.value = value;
@@ -9717,6 +9744,13 @@
           _this._cheapestResultPrice = _this.updateLowestPrice(results);
           _this.averageCo2PerItem = _this.helpers.calculateAverageCo2PerItem(results);
           _this.results.next(results);
+          _this.userService.changeUser.subscribe(function () {
+              var isEnterpriseCarHire = _this.userService.userHasServiceProvider(ServiceType.Car, exports.ServiceProvider.EnterpriseCarHire);
+              _this.hasNonEnterpriseCarAccess = isEnterpriseCarHire ? nonEnterpriseCarServices.some(function (provider) { return _this.userService.userHasServiceProvider(ServiceType.Car, provider); }) : true;
+              if (!_this.hasNonEnterpriseCarAccess) {
+                  _this.checkAndSetDriverAgeAndPickupTime();
+              }
+          });
           return _this;
       }
       Object.defineProperty(CarhireEnterpriseSearch.prototype, "adults", {
@@ -10222,7 +10256,7 @@
       });
       CarhireEnterpriseSearch.prototype.checkAndSetDriverAgeAndPickupTime = function () {
           var _a;
-          if (this._delivery || this._collection) {
+          if (this._delivery || this._collection || !this.hasNonEnterpriseCarAccess) {
               var minDate = moment__default["default"](this.helpers.momentRoundMinutes(this.helpers.makeMomentDayTime(), 30)).add(24, 'hours');
               this._minDate = {
                   day: minDate.date(),
@@ -10254,7 +10288,11 @@
           configurable: true
       });
       CarhireEnterpriseSearch.prototype.resetQuery = function () {
-          this.updateTempParams(this.searchService.makeCarHireQuery());
+          var query = this.searchService.makeCarHireQuery();
+          if (!this.hasNonEnterpriseCarAccess) {
+              query.driverAge = this.driverAges[0].value;
+          }
+          this.updateTempParams(query);
           this.estimatedMileage = null;
           this._isValid();
       };
@@ -10310,7 +10348,7 @@
               if ((_a = this.dropoff_datetime) === null || _a === void 0 ? void 0 : _a.isSameOrBefore(this.pickup_datetime, 'minute')) {
                   this.addValidationMessage('Dropoff date/time cannot be before or the same as pickup date/time');
               }
-              if ((this.delivery || this.collection) && ((_b = this.pickup_datetime) === null || _b === void 0 ? void 0 : _b.isBefore(moment__default["default"]().add(24, 'hours')))) {
+              if ((this.delivery || this.collection || !this.hasNonEnterpriseCarAccess) && ((_b = this.pickup_datetime) === null || _b === void 0 ? void 0 : _b.isBefore(moment__default["default"]().add(24, 'hours')))) {
                   this.validationMessages.push('Pickup date/time must be at least 24 hours from now');
               }
               if ((_c = this.pickup_datetime) === null || _c === void 0 ? void 0 : _c.isBefore(moment__default["default"]())) {
@@ -10369,6 +10407,22 @@
                       dropoffDateTime: options === null || options === void 0 ? void 0 : options.dropoffDateTime,
                       class: options === null || options === void 0 ? void 0 : options.class
                   };
+                  _this.searchService.getAirportByCode(dropoffDepot.locationCode).pipe(operators.map(function (result) { return result; })).subscribe(function (result) {
+                      var _a, _b;
+                      if (result.iataMatch) {
+                          var match = result.iataMatch;
+                          var test = {
+                              gateway: match.iata,
+                              locationType: LocationType.A,
+                              destination: match.name,
+                              terminals: match.terminals,
+                              country: (_a = match.locationDetails) === null || _a === void 0 ? void 0 : _a.country,
+                              countryCode: (_b = match.locationDetails) === null || _b === void 0 ? void 0 : _b.countryCode
+                          };
+                          _this.pickup_location = test;
+                          _this.dropoff_location = test;
+                      }
+                  });
                   return _this.gmtSearch(query).pipe(operators.switchMap(function (result) {
                       if (result.length) {
                           var preferredOptions = result.filter(function (option) { return option.companyPreferred || option.tmcPreferred; });
@@ -10604,7 +10658,7 @@
                   query.airport.dropoffCountryCode = this.dropoff_location.countryCode;
                   break;
               case exports.LocationTypes.City:
-                  if (this.delivery || this.collection) {
+                  if (this.delivery || this.collection || !this.hasNonEnterpriseCarAccess) {
                       query.location = {
                           dropoffCountryCode: this.cityDropoffDepot.countryCode,
                           dropoffPostalCode: this.cityDropoffDepot.locationCode,
@@ -10636,7 +10690,7 @@
                   // };
                   break;
               case exports.LocationTypes.Postcode:
-                  if (this.delivery || this.collection) {
+                  if (this.delivery || this.collection || !this.hasNonEnterpriseCarAccess) {
                       query.location = {
                           dropoffCountryCode: this.postcodeDropoff.countryCode,
                           dropoffPostalCode: this.postcodeDropoff.locationCode,
@@ -10674,7 +10728,7 @@
           query.travellers = this.travellers.map(function (traveller) { return { id: traveller.id }; });
           query.collection = this.collection || null;
           query.delivery = this.delivery || null;
-          query.driverAge = this.delivery || this.collection ? this.driverAge : null;
+          query.driverAge = this.delivery || this.collection || !this.hasNonEnterpriseCarAccess ? this.driverAge : null;
           return this.helpers.removeNulls(query);
       };
       /**
@@ -17065,7 +17119,7 @@
   var HotelEnterpriseSearch = /** @class */ (function (_super) {
       __extends(HotelEnterpriseSearch, _super);
       function HotelEnterpriseSearch(hotelFetcher, helpers, userService, environment, avaliabilityService, basketService, storageService, searchService, httpCallService, quickListFetcher, getRailStationFetcher, applyHotelRulesFetcher, getRequestedHotelUpdateFetcher) {
-          var _x, _y, _z;
+          var _y, _z, _0;
           var _this = _super.call(this, storageService, helpers, searchService, userService) || this;
           _this.hotelFetcher = hotelFetcher;
           _this.environment = environment;
@@ -17115,38 +17169,38 @@
               month: moment__default["default"]().month() + 1,
               day: moment__default["default"]().date() + 1 // min 1 night stay
           };
-          _this.hiddenExtraFilters = (_x = {},
-              _x[exports.ExtraSearchHandler.FEMALE_FRIENDLY] = true,
-              _x[exports.ExtraSearchHandler.GREEN_HOTEL] = true,
-              _x[exports.ExtraSearchHandler.CTM_PARTNERS] = true,
-              _x[exports.ExtraSearchHandler.FCDO_HOTEL] = true,
-              _x[exports.ExtraSearchHandler.REFUNDABLE] = true,
-              _x[exports.ExtraSearchHandler.NON_REFUNDABLE] = true,
-              _x[exports.ExtraSearchHandler.ACCESSIBLE_ROOM] = true,
-              _x[exports.ExtraSearchHandler.AVAILABILITY] = true,
-              _x);
-          _this.hiddenAmenitiesFilters = (_y = {},
-              _y[exports.AmenitiesSearchHandler.AIR_CONDITIONING] = true,
-              _y[exports.AmenitiesSearchHandler.BUSINESS_CENTRE] = true,
-              _y[exports.AmenitiesSearchHandler.ELECTRIC_CAR_CHARGING_POINT] = true,
-              _y[exports.AmenitiesSearchHandler.EXPRESS_CHECKOUT] = true,
-              _y[exports.AmenitiesSearchHandler.GOLF_FACILITIES] = true,
-              _y[exports.AmenitiesSearchHandler.ON_SITE_SAFE] = true,
-              _y[exports.AmenitiesSearchHandler.PARKING] = true,
-              _y[exports.AmenitiesSearchHandler.RESTAURANT] = true,
-              _y[exports.AmenitiesSearchHandler.ROOM_SERVICE_24_HOUR] = true,
-              _y[exports.AmenitiesSearchHandler.SWIMMING_POOL] = true,
-              _y[exports.AmenitiesSearchHandler.WHEELCHAIR_ACCESS] = true,
-              _y[exports.AmenitiesSearchHandler.WIFI] = true,
-              _y[exports.AmenitiesSearchHandler.ECO_FRIENDLY] = true,
+          _this.hiddenExtraFilters = (_y = {},
+              _y[exports.ExtraSearchHandler.FEMALE_FRIENDLY] = true,
+              _y[exports.ExtraSearchHandler.GREEN_HOTEL] = true,
+              _y[exports.ExtraSearchHandler.CTM_PARTNERS] = true,
+              _y[exports.ExtraSearchHandler.FCDO_HOTEL] = true,
+              _y[exports.ExtraSearchHandler.REFUNDABLE] = true,
+              _y[exports.ExtraSearchHandler.NON_REFUNDABLE] = true,
+              _y[exports.ExtraSearchHandler.ACCESSIBLE_ROOM] = true,
+              _y[exports.ExtraSearchHandler.AVAILABILITY] = true,
               _y);
-          _this.hiddenStarRatingFilters = (_z = {},
-              _z[exports.StarRating.TwoStar] = true,
-              _z[exports.StarRating.ThreeStar] = true,
-              _z[exports.StarRating.FourStar] = true,
-              _z[exports.StarRating.FiveStar] = true,
-              _z[exports.StarRating.Unrated] = true,
+          _this.hiddenAmenitiesFilters = (_z = {},
+              _z[exports.AmenitiesSearchHandler.AIR_CONDITIONING] = true,
+              _z[exports.AmenitiesSearchHandler.BUSINESS_CENTRE] = true,
+              _z[exports.AmenitiesSearchHandler.ELECTRIC_CAR_CHARGING_POINT] = true,
+              _z[exports.AmenitiesSearchHandler.EXPRESS_CHECKOUT] = true,
+              _z[exports.AmenitiesSearchHandler.GOLF_FACILITIES] = true,
+              _z[exports.AmenitiesSearchHandler.ON_SITE_SAFE] = true,
+              _z[exports.AmenitiesSearchHandler.PARKING] = true,
+              _z[exports.AmenitiesSearchHandler.RESTAURANT] = true,
+              _z[exports.AmenitiesSearchHandler.ROOM_SERVICE_24_HOUR] = true,
+              _z[exports.AmenitiesSearchHandler.SWIMMING_POOL] = true,
+              _z[exports.AmenitiesSearchHandler.WHEELCHAIR_ACCESS] = true,
+              _z[exports.AmenitiesSearchHandler.WIFI] = true,
+              _z[exports.AmenitiesSearchHandler.ECO_FRIENDLY] = true,
               _z);
+          _this.hiddenStarRatingFilters = (_0 = {},
+              _0[exports.StarRating.TwoStar] = true,
+              _0[exports.StarRating.ThreeStar] = true,
+              _0[exports.StarRating.FourStar] = true,
+              _0[exports.StarRating.FiveStar] = true,
+              _0[exports.StarRating.Unrated] = true,
+              _0);
           // private variables
           // don't need to worry about times here - maybe normalise these in the request body?
           _this.localFilters = new HotelFilters();
@@ -17199,6 +17253,7 @@
               // console.log('lightning sort results');
               // console.log(this.results.value);
               var filteredResults = _this.resultsFilterMethod(_this.fullResults);
+              console.log(filteredResults);
               _this.results.next(filteredResults);
               _this.reapplySorting.next(true);
           };
@@ -17253,22 +17308,13 @@
           _this._isValid();
           _this.userService.changeUser.subscribe(function () {
               var propertyNumber = _this.userService.userIsAgent() ? [exports.LocationTypes.PropertyNumber] : [];
-              if (_this.userService.userHasServiceProvider(ServiceType.Hotel, exports.ServiceProvider.Confirma)) {
-                  _this.location_types.next(__spreadArray([
-                      exports.LocationTypes.Airport,
-                      exports.LocationTypes.City,
-                      exports.LocationTypes.Office,
-                      exports.LocationTypes.Shortlist,
-                      exports.LocationTypes.TrainStation
-                  ], __read(propertyNumber)));
-              }
-              else {
-                  _this.location_types.next(__spreadArray([
-                      exports.LocationTypes.Airport,
-                      exports.LocationTypes.City,
-                      exports.LocationTypes.TrainStation
-                  ], __read(propertyNumber)));
-              }
+              _this.location_types.next(__spreadArray([
+                  exports.LocationTypes.Airport,
+                  exports.LocationTypes.City,
+                  exports.LocationTypes.Office,
+                  exports.LocationTypes.Shortlist,
+                  exports.LocationTypes.TrainStation
+              ], __read(propertyNumber)));
               if (searchService.shouldFetchAllOffices()) {
                   _this.offices.next([]); // TODO fetch offices
               }
@@ -17918,12 +17964,12 @@
               // Combine the observables
               if (availabilityObservables.length) {
                   return rxjs.combineLatest(availabilityObservables).pipe(operators.map(function (combinedResults) {
-                      combinedResults.forEach(function (_x) {
-                          var hotelAvaliability = _x.hotelAvaliability, hotelDetails = _x.hotelDetails;
+                      combinedResults.forEach(function (_y) {
+                          var hotelAvaliability = _y.hotelAvaliability, hotelDetails = _y.hotelDetails;
                           hotelDetails.availableRates = hotelAvaliability;
                       });
-                      return combinedResults.map(function (_x) {
-                          var hotelDetails = _x.hotelDetails;
+                      return combinedResults.map(function (_y) {
+                          var hotelDetails = _y.hotelDetails;
                           return hotelDetails;
                       });
                   }));
@@ -18987,8 +19033,8 @@
           return __awaiter(this, void 0, void 0, function () {
               var fullHotel, searchQuery, roomCsl, detailRooms, intBasket, basket, paxPerRoom, roomArray, numberToSplit_1, bookedTravellersChunks_1, hotelAaddress_1, termsAndConditions_1;
               var _this = this;
-              return __generator(this, function (_x) {
-                  switch (_x.label) {
+              return __generator(this, function (_y) {
+                  switch (_y.label) {
                       case 0:
                           console.log(hotel);
                           console.log(hotelRoom);
@@ -19024,7 +19070,7 @@
                           });
                           return [4 /*yield*/, this.basketService.getDefaultBasket()];
                       case 1:
-                          intBasket = _x.sent();
+                          intBasket = _y.sent();
                           basket = intBasket === null || intBasket === void 0 ? void 0 : intBasket.subject.value;
                           if (!basket) return [3 /*break*/, 3];
                           paxPerRoom = this.tempParams.no_of_occupants;
@@ -19034,12 +19080,12 @@
                           hotelAaddress_1 = hotel.address;
                           termsAndConditions_1 = this.getTermsAndCond(hotelRoom, hotelQuery, hotel.source === exports.ServiceProvider.SabreCSL);
                           return [4 /*yield*/, roomArray.reduce(function (current, chunk, index) { return __awaiter(_this, void 0, void 0, function () {
-                                  var _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, wh;
-                                  return __generator(this, function (_x) {
-                                      switch (_x.label) {
+                                  var _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, wh;
+                                  return __generator(this, function (_y) {
+                                      switch (_y.label) {
                                           case 0: return [4 /*yield*/, current];
                                           case 1:
-                                              switch (_x.sent()) {
+                                              switch (_y.sent()) {
                                                   case exports.DifferentInvokdedUserReasons.cancel:
                                                       return [2 /*return*/, exports.DifferentInvokdedUserReasons.cancel];
                                                   case exports.DifferentInvokdedUserReasons.research:
@@ -19063,11 +19109,11 @@
                                                                       : 'Conferma',
                                                               county: hotelAaddress_1.addressLine3,
                                                               postcode: hotelAaddress_1.postOrZipCode,
-                                                              countryCode: this.location_type_select === exports.LocationTypes.TrainStation &&
-                                                                  !hotelAaddress_1.countryCode
-                                                                  ? ((_k = this.trainsStation) === null || _k === void 0 ? void 0 : _k.countryCode) ||
-                                                                      ((_l = this.trainsStation) === null || _l === void 0 ? void 0 : _l.railstation.locationDetails.countryCode)
-                                                                  : this.location_type_select === exports.LocationTypes.Airport && !hotelAaddress_1.countryCode ? (_o = (_m = this.location) === null || _m === void 0 ? void 0 : _m.locationDetails) === null || _o === void 0 ? void 0 : _o.countryCode : hotelAaddress_1.countryCode
+                                                              countryCode: this.location_type_select === exports.LocationTypes.TrainStation && !hotelAaddress_1.countryCode
+                                                                  ? ((_k = this.trainsStation) === null || _k === void 0 ? void 0 : _k.countryCode) || ((_l = this.trainsStation) === null || _l === void 0 ? void 0 : _l.railstation.locationDetails.countryCode)
+                                                                  : this.location_type_select === exports.LocationTypes.Airport && !hotelAaddress_1.countryCode
+                                                                      ? ((_o = (_m = this.location) === null || _m === void 0 ? void 0 : _m.airport) === null || _o === void 0 ? void 0 : _o.countryCode) || ((_p = this.location) === null || _p === void 0 ? void 0 : _p.locationDetails.countryCode)
+                                                                      : hotelAaddress_1.countryCode,
                                                           },
                                                           hotelDescription: hotel.group,
                                                           hotelFaxNumber: hotelAaddress_1.facsimile,
@@ -19082,9 +19128,9 @@
                                                           hotelPreferred: hotel.preferred,
                                                           hotelDistance: {
                                                               search: hotel.location.distance.toFixed(2),
-                                                              airport: (_q = (_p = hotel.transports) === null || _p === void 0 ? void 0 : _p.find(function (a) { return a.type == exports.HotelDetailTypes.AIRPORT; })) === null || _q === void 0 ? void 0 : _q.distance.toFixed(2),
-                                                              train: (_s = (_r = hotel.transports) === null || _r === void 0 ? void 0 : _r.find(function (a) { return a.type == exports.HotelDetailTypes.TRAIN; })) === null || _s === void 0 ? void 0 : _s.distance.toFixed(2),
-                                                              metro: (_u = (_t = hotel.transports) === null || _t === void 0 ? void 0 : _t.find(function (a) { return a.type == exports.HotelDetailTypes.METRO; })) === null || _u === void 0 ? void 0 : _u.distance.toFixed(2)
+                                                              airport: (_r = (_q = hotel.transports) === null || _q === void 0 ? void 0 : _q.find(function (a) { return a.type == exports.HotelDetailTypes.AIRPORT; })) === null || _r === void 0 ? void 0 : _r.distance.toFixed(2),
+                                                              train: (_t = (_s = hotel.transports) === null || _s === void 0 ? void 0 : _s.find(function (a) { return a.type == exports.HotelDetailTypes.TRAIN; })) === null || _t === void 0 ? void 0 : _t.distance.toFixed(2),
+                                                              metro: (_v = (_u = hotel.transports) === null || _u === void 0 ? void 0 : _u.find(function (a) { return a.type == exports.HotelDetailTypes.METRO; })) === null || _v === void 0 ? void 0 : _v.distance.toFixed(2)
                                                           },
                                                           location: {
                                                               longitude: hotel.location.longitude,
@@ -19097,8 +19143,8 @@
                                                       searchQuery: searchQuery,
                                                       outboundDate: hotelQuery.startDate,
                                                       inboundDate: hotelQuery.endDate,
-                                                      lowestPrice: (_v = this.cheapestPrice) === null || _v === void 0 ? void 0 : _v.amount,
-                                                      lowestPriceCurrency: (_w = this.cheapestPrice) === null || _w === void 0 ? void 0 : _w.currencyCode,
+                                                      lowestPrice: (_w = this.cheapestPrice) === null || _w === void 0 ? void 0 : _w.amount,
+                                                      lowestPriceCurrency: (_x = this.cheapestPrice) === null || _x === void 0 ? void 0 : _x.currencyCode,
                                                       lowestPriceDetail: this.createLowestPriceDetail(hotelQuery),
                                                       co2PerItem: hotel.co2PerItem,
                                                       co2PerPassenger: hotel.co2PerPassenger,
@@ -19109,7 +19155,7 @@
                                                   // chunk
                                                   bookedTravellersChunks_1[index] || [], hotelRoom.requiresReasonKeys, false, ignoreInvoked)];
                                           case 2:
-                                              wh = _x.sent();
+                                              wh = _y.sent();
                                               if (wh === exports.DifferentInvokdedUserReasons.research) {
                                                   this.researchWithNewUser();
                                               }
@@ -19119,7 +19165,7 @@
                               }); }, exports.DifferentInvokdedUserReasons.continue)];
                       case 2: 
                       // bookedTravellersChunks.forEach((chunk: Traveller[], index: number) => {
-                      return [2 /*return*/, _x.sent()];
+                      return [2 /*return*/, _y.sent()];
                       case 3: return [2 /*return*/, exports.DifferentInvokdedUserReasons.cancel];
                   }
               });
@@ -19182,7 +19228,7 @@
       };
       HotelEnterpriseSearch.prototype.applyFavourite = function (fav) {
           return __awaiter(this, void 0, void 0, function () {
-              return __generator(this, function (_x) {
+              return __generator(this, function (_y) {
                   this.checkin_date = moment__default["default"]().set('hour', 23).set('minute', 59);
                   this.checkout_date = moment__default["default"]().add(1, 'day').set('hour', 23).set('minute', 59);
                   this.applySearchQuery(fav);
@@ -19279,7 +19325,7 @@
           return detail;
       };
       HotelEnterpriseSearch.prototype.noRoomFilterSelected = function () {
-          var _x = this.filters, refundableRoomType = _x.refundableRoomType, priceRange = _x.priceRange, roomType = _x.roomType, accessibleRoomType = _x.accessibleRoomType, breakfastType = _x.breakfastType, crownPreferred = _x.crownPreferred;
+          var _y = this.filters, refundableRoomType = _y.refundableRoomType, priceRange = _y.priceRange, roomType = _y.roomType, accessibleRoomType = _y.accessibleRoomType, breakfastType = _y.breakfastType, crownPreferred = _y.crownPreferred;
           return !accessibleRoomType.length && !refundableRoomType.length && !roomType.length && priceRange.min === 0 && priceRange.max === Number.MAX_SAFE_INTEGER && (!breakfastType.length || breakfastType.length === 2) && !crownPreferred.length;
       };
       // We use this method for features: RecentSearch, FavouriteSearch, ExpiredBasket, CopyBasket, CloneBasket
@@ -19288,10 +19334,10 @@
           if (startSearch === void 0) { startSearch = false; }
           if (cloneBasketItem === void 0) { cloneBasketItem = false; }
           return __awaiter(this, void 0, void 0, function () {
-              var _x, fetchLocation$, offices;
+              var _y, fetchLocation$, offices;
               var _this = this;
-              return __generator(this, function (_y) {
-                  switch (_y.label) {
+              return __generator(this, function (_z) {
+                  switch (_z.label) {
                       case 0:
                           this.currency = query.currency;
                           this.distance = query.distance;
@@ -19318,8 +19364,8 @@
                           else {
                               this.location_type_select = exports.LocationTypes.City;
                           }
-                          _x = this.location_type_select;
-                          switch (_x) {
+                          _y = this.location_type_select;
+                          switch (_y) {
                               case exports.LocationTypes.Airport: return [3 /*break*/, 1];
                               case exports.LocationTypes.City: return [3 /*break*/, 2];
                               case exports.LocationTypes.Office: return [3 /*break*/, 3];
@@ -19351,7 +19397,7 @@
                                       : null;
                               fetchLocation$.subscribe(function (locations) {
                                   var locationMatch = query.postOrZipCode
-                                      ? locations.find(function (loc) { return loc.postcode === query.postOrZipCode; })
+                                      ? locations.find(function (loc) { return loc.postcode === query.postOrZipCode || loc.name === query.postOrZipCode; })
                                       : locations.find(function (loc) { return loc.name === query.cityName; });
                                   if (query.postOrZipCode) {
                                       _this.postcode = locationMatch || null;
@@ -19369,7 +19415,7 @@
                           return [3 /*break*/, 8];
                       case 3: return [4 /*yield*/, this.searchService.getOfficeLocationsNoUserAddresses().toPromise()];
                       case 4:
-                          offices = _y.sent();
+                          offices = _z.sent();
                           this.office = offices.find(function (office) { return Number(office.id) === Number(query.officeId); });
                           if (startSearch) {
                               this.searchService.startSearches();
@@ -21312,8 +21358,10 @@
               });
           }
           userService.changeUser.subscribe(function (user) {
+              var _a;
               _this.timeCriteriaOptions.next([exports.TimeWindow.Anytime, exports.TimeWindow.Arrive, exports.TimeWindow.Depart]); // TODO update with any UFs
-              _this.updateAvaliableClasses();
+              var classesToHide = (_a = _this.userService.getUserFavoriteObject(UserFavorurite.eurostarSearchDefaults)) === null || _a === void 0 ? void 0 : _a.hideEurostarClasses;
+              _this.updateAvaliableClasses(classesToHide);
           });
           _this.updateTravellers();
           var results = storageService.getSessionItem(_this.resultsSessionName) || {
@@ -21325,7 +21373,6 @@
           _this.fullResults = _this.helpers.clone(results.results);
           _this.flightsToGroup = results.groupData || {};
           _this.resultQuery = results.query;
-          var isFlightsGrouped = _this.searchService.isEuroStarGrouped();
           _this.results.next((results.results || []));
           var resultsClone = _this.helpers.clone(results.results);
           // get around the annoying type restrictions - I KNOW JOURNEYS IS THERE I CAN SEE IT STOP TELLING ME IT ISN'T TYPESCRIPT!
@@ -22069,6 +22116,7 @@
                   returnObject.standardFare.unavailableMessage = hasField(journeyHash, 'unavailableMessage', '');
                   returnObject.standardFare.requiresReasonKeys = hasField(journeyHash, 'requiresReasonKeys', []);
                   returnObject.standardFare.requiresReasonMessages = hasField(journeyHash, 'requiresReasonMessages', []);
+                  break;
               case 'standardPremierFare':
                   returnObject.standardPremierFare.companyPreferred =
                       ((_y = this._ruleActionSummary.journeyWhenSelected[journeyHash]) === null || _y === void 0 ? void 0 : _y.companyPreferred) ||
@@ -22111,6 +22159,7 @@
                   returnObject.standardPremierFare.unavailableMessage = hasField(journeyHash, 'unavailableMessage', '');
                   returnObject.standardPremierFare.requiresReasonKeys = hasField(journeyHash, 'requiresReasonKeys', []);
                   returnObject.standardPremierFare.requiresReasonMessages = hasField(journeyHash, 'requiresReasonMessages', []);
+                  break;
               case 'businessPremierFare':
                   returnObject.businessPremierFare.companyPreferred =
                       ((_19 = this._ruleActionSummary.journeyWhenSelected[journeyHash]) === null || _19 === void 0 ? void 0 : _19.companyPreferred) ||
@@ -22354,25 +22403,53 @@
           this._passengers = travellers;
           this._isValid();
       };
-      EurostarEnterpriseSearch.prototype.updateAvaliableClasses = function () {
-          this.avaliableClasses.next([
-              {
+      EurostarEnterpriseSearch.prototype.updateAvaliableClasses = function (classesToHide) {
+          var allowedClasses = [{
                   name: 'Any',
                   type: FlightCabinClass.Any
-              },
-              {
-                  name: 'Standard (semi flexible)',
-                  type: FlightCabinClass.Economy
-              },
-              {
-                  name: 'Standard premier (semi flexible)',
-                  type: FlightCabinClass.PremiumEconomy
-              },
-              {
-                  name: 'Business premier (fully flexible)',
-                  type: FlightCabinClass.Business
+              }];
+          if (classesToHide && Object.keys(classesToHide)) {
+              var business_premier = classesToHide.business_premier, standard = classesToHide.standard, standard_premier = classesToHide.standard_premier;
+              if (!standard) {
+                  allowedClasses.push({
+                      name: 'Standard (semi flexible)',
+                      type: FlightCabinClass.Economy
+                  });
               }
-          ]);
+              if (!standard_premier) {
+                  allowedClasses.push({
+                      name: 'Standard premier (semi flexible)',
+                      type: FlightCabinClass.PremiumEconomy
+                  });
+              }
+              if (!business_premier) {
+                  allowedClasses.push({
+                      name: 'Business premier (fully flexible)',
+                      type: FlightCabinClass.Business
+                  });
+              }
+          }
+          else {
+              allowedClasses = [
+                  {
+                      name: 'Any',
+                      type: FlightCabinClass.Any
+                  },
+                  {
+                      name: 'Standard (semi flexible)',
+                      type: FlightCabinClass.Economy
+                  },
+                  {
+                      name: 'Standard premier (semi flexible)',
+                      type: FlightCabinClass.PremiumEconomy
+                  },
+                  {
+                      name: 'Business premier (fully flexible)',
+                      type: FlightCabinClass.Business
+                  }
+              ];
+          }
+          this.avaliableClasses.next(allowedClasses);
       };
       /**
        * @description - sort the flight results
@@ -22790,7 +22867,7 @@
           var inJourneyTesters = [];
           inJourneyTesters.push(tester(filters.classes, fieldHasValue('cabinClass')));
           // !- Itineraries
-          var outFilterItineraries = function (flightItinerary, groupIndex) {
+          var outFilterItineraries = function (flightItinerary) {
               return (outItineraryTesters.reduce(function (acc, tester1) {
                   acc = acc && tester1(flightItinerary);
                   return acc;
@@ -22802,7 +22879,7 @@
                           }, true);
                       })));
           };
-          var inFilterItineraries = function (flightItinerary, groupIndex) {
+          var inFilterItineraries = function (flightItinerary) {
               var _a;
               return (inItineraryTesters.reduce(function (acc, tester1) {
                   return acc && tester1(flightItinerary);
@@ -33538,6 +33615,7 @@
               }
               else {
                   // add the data to the array
+                  console.log("+++ Add hotel: " + fullHotel.id + " to behaviours +++");
                   this.behaviours[fullHotel.id] =
                       new rxjs.BehaviorSubject(null);
                   var newBehaviourObject = fullHotel.availableRates;
@@ -33578,6 +33656,7 @@
               {});
       };
       BaseHotelAvalibilityService.prototype.updateHotel = function (hotel) {
+          console.log('updating hotels');
           if (!hotel.availableRates) {
               hotel.availableRates = this.getAvailabilityValue(hotel);
           }
@@ -33612,7 +33691,6 @@
           return hotel;
       };
       BaseHotelAvalibilityService.prototype._getAvailabilityForId = function (hotel) {
-          // console.log('+++ Fetching availabilty for: ', hotel, ' +++');
           if (this.timeout) {
               window.clearTimeout(this.timeout);
               this.timeout = 0;
@@ -33713,7 +33791,8 @@
                       _this.lowestPriceHotel.price = hotel.minprice;
                   }
                   hotel.rooms = hotel.rooms;
-                  hotel.fullRooms = hotel.rooms;
+                  hotel.fullRooms = _this.helpers.clone(hotel.rooms);
+                  _this.data[hotel.hotelId] = _this.helpers.clone(hotel);
                   if ((hotel === null || hotel === void 0 ? void 0 : hotel.hotelId) && _this.behaviours[hotel.hotelId]) {
                       _this.data[hotel.hotelId] = hotel;
                       _this.behaviours[hotel.hotelId].next(hotel);
@@ -36793,14 +36872,15 @@
           return this.fasttrackFetcher.fetchList(query);
       };
       FastTrackEnterpriseSearch.prototype.getSearchQuery = function () {
+          var _a, _b;
           var query = {
               adults: this.tempParams.adults,
               children: this.tempParams.children ? this.tempParams.children : null,
-              locationCode: this._locationCode,
+              locationCode: this._locationCode || ((_a = this.originalUserSearch.locationCode) === null || _a === void 0 ? void 0 : _a.gateway),
               flight: this.tempParams.flightNumber,
               terminal: this.tempParams.terminal === 'Any' ? null : this.tempParams.terminal,
               arrivalDatetime: this.tempParams.arrivalDatetime,
-              airportFullName: this.locationCode.destination,
+              airportFullName: this.locationCode.destination || ((_b = this.originalUserSearch.locationCode) === null || _b === void 0 ? void 0 : _b.destination),
               travellers: this.travellers.map(function (traveller) { return { id: traveller.id }; })
           };
           return this.helpers.removeNulls(query);
@@ -38709,7 +38789,7 @@
   })(exports.TravellerSearchTypes || (exports.TravellerSearchTypes = {}));
   var BaseEnterpriseSearchService = /** @class */ (function () {
       function BaseEnterpriseSearchService(searchAirportsFetcher, searchAirlinesFetcher, storageService, userService, modalService, router, helpers, hotelAvalibilityService, citiesFetcher, postcodeFetcher, railStationFetcher, saveUserAddressUpdater, editUserAddressUpdater, userAddressesFetcher, basketService, getUserCompanyOfficesFetcher, searchHotelChainsFetcher, getConfermaRoomImagesFetcher, baseValidateIsPostcodeValidTester, depotFetcher, baseDeleteUserAddressUpdater, baseDeleteRecentSearchUpdater, baseSaveRecentSearchUpdater, getUserCarbonAllowanceFetcher, baseSaveFavouriteSearchUpdater, environment, loungeFetcher, parkingFetcher, httpCallService, flightFetcher, hotelFetcher, carhireFetcher, carHireAvailabilityDetailFetcher, cabhireFetcher, railFetcher, irlFetcher, getRailStationInfoFetcher, getRailStationFetcher, getIrlSupplierStationFetcher, webTokenService, riskAlertsFetcher, quicklistFetcher, getUserRecentSearchesFetcher, getRailCardsFetcher, getCovidMicrositeTokenFetcher, eurostarFetcher, searchUsersCanBookForFetcher, searchIrlStationsFetcher, irlDiscountCardsFetcher, getFlightFareRulesFetcher, getFlightSeatMapFetcher, getRailLiveDeparturesFetcher, applyHotelRulesFetcher, applyFlightRules, getUserFavouriteSearchesFetcher, deleteFavouriteSearchUpdater, emailBasketFetcher, fasttrackFetcher, sendOfflineNotificationFetcher, getHotelChainsFetcher, getRailProvidersFetcher, getAllAirlinesFetcher, getCarHireProvidersFetcher, baseGenerateBasketPdfFetcher, emailFerryFetcher, getFlightExtrasOptions, getRequestedHotelUpdateFetcher, convertCurrencyFetcher, getCurrencyConversionRatesFetcher, getHotelDetailsFetcher, getServiceFetcher, getFlightBrandedFaresFetcher, getTrainlineSearchConfigFetcher, searchRailInwardFetcher, railSearchExchangeFetcher, createItineraryExchangeUpdater, getAirAvailabilityFetcher, getFlightAtNewClassFetcher, getFlightUpsellOffersFetcher, getOfficesFetcher, emailApartmentBookingFetcher, emailSeasonTicketFetcher, suggestPlaces, latLonFromHereID, getGMTItineraryOptions, getGUTCitySuggestions, getGUTLocationSuggestions, getRouteHappyFetcher, getMultipleHotelRatingFetcher, emailMeetingRoomBookingFetcher, flightSearchExchangeFetcher, flighExchangeDetailsFetcher, getEntLocationsByPostcode, getEntLocationsByCity, getUserRecentBoltSearchesFetcher, saveRecentBoltSearchUpdater, getFerryPortsFetcher, getBannerFetcher, updateDOB, updateFlightSeatMapUpdater, deleteAllRecentSearchesUpdater, getOfficeDivisionsFetcher) {
-          var _e;
+          var _j;
           var _this = this;
           this.searchAirportsFetcher = searchAirportsFetcher;
           this.searchAirlinesFetcher = searchAirlinesFetcher;
@@ -38834,23 +38914,23 @@
           console.log('Enterpise search service being inited');
           console.log('Newly created search objects: ', this.searches);
           this.search_objects = {};
-          this.searches = (_e = {},
-              _e[ServiceType.Cab] = null,
-              _e[ServiceType.Car] = null,
-              _e[ServiceType.Coach] = null,
-              _e[ServiceType.Eurostar] = null,
-              _e[ServiceType.FastTrack] = null,
-              _e[ServiceType.Ferry] = null,
-              _e[ServiceType.Flight] = null,
-              _e[ServiceType.Hotel] = null,
-              _e[ServiceType.InternationalRail] = null,
-              _e[ServiceType.Lounge] = null,
-              _e[ServiceType.Parking] = null,
-              _e[ServiceType.Rail] = null,
-              _e[ServiceType.LongStays] = null,
-              _e[ServiceType.SeasonTicket] = null,
-              _e[ServiceType.MeetingRoom] = null,
-              _e);
+          this.searches = (_j = {},
+              _j[ServiceType.Cab] = null,
+              _j[ServiceType.Car] = null,
+              _j[ServiceType.Coach] = null,
+              _j[ServiceType.Eurostar] = null,
+              _j[ServiceType.FastTrack] = null,
+              _j[ServiceType.Ferry] = null,
+              _j[ServiceType.Flight] = null,
+              _j[ServiceType.Hotel] = null,
+              _j[ServiceType.InternationalRail] = null,
+              _j[ServiceType.Lounge] = null,
+              _j[ServiceType.Parking] = null,
+              _j[ServiceType.Rail] = null,
+              _j[ServiceType.LongStays] = null,
+              _j[ServiceType.SeasonTicket] = null,
+              _j[ServiceType.MeetingRoom] = null,
+              _j);
           this.selectedTravellers = this.storageService.getSessionItemAsList(BaseEnterpriseSearchService.SESSION_TRAVELLER);
           this.travellerInformation.next(this.selectedTravellers);
           userService.fullUserDetails.userServices.subscribe(function (services) {
@@ -38923,29 +39003,29 @@
           configurable: true
       });
       BaseEnterpriseSearchService.prototype.createSearchObjects = function (loungeFetcher, helpers, basketService, storageService, userService, parkingFetcher, flightFetcher, applyFlightRules, modalService, hotelFetcher, environment, hotelAvalibilityService, httpCallService, quicklistFetcher, getRailStationFetcher, applyHotelRulesFetcher, carhireFetcher, carHireAvailabilityDetailFetcher, cabhireFetcher, irlFetcher, irlDiscountCardsFetcher, getIrlSupplierStationFetcher, fasttrackFetcher, emailFerryFetcher, railFetcher, eurostarFetcher, getFlightExtrasOptionsFetcher, getRequestedHotelUpdateFetcher, emailApartmentBookingFetcher, emailSeasonTicketFetcher, getFlightSearchExchangeFetcher, getFlightExchangeDetailsFetcher, emailMeetingRoomBookingFetcher, updateFlightSeatMapUpdater) {
-          var _e;
+          var _j;
           var searchesAreNull = this.checkIfSearchesAreNull();
           if (!this.search_objects ||
               Object.values(this.search_objects).length === 0 ||
               searchesAreNull) {
               this.search_objects = this.helpers.clone(this.init_search_objects());
-              this.searches = (_e = {},
-                  _e[ServiceType.Lounge] = new LoungesEnterpriseSearch(loungeFetcher, helpers, basketService, storageService, this, userService),
-                  _e[ServiceType.Parking] = new ParkingEnterpriseSearch(parkingFetcher, helpers, basketService, storageService, this, userService),
-                  _e[ServiceType.Flight] = new FlightEnterpriseSearch(flightFetcher, helpers, userService, basketService, storageService, this, applyFlightRules, modalService, getFlightExtrasOptionsFetcher, getFlightSearchExchangeFetcher, getFlightExchangeDetailsFetcher, updateFlightSeatMapUpdater),
-                  _e[ServiceType.Hotel] = new HotelEnterpriseSearch(hotelFetcher, helpers, userService, environment, hotelAvalibilityService, basketService, storageService, this, httpCallService, quicklistFetcher, getRailStationFetcher, applyHotelRulesFetcher, getRequestedHotelUpdateFetcher),
-                  _e[ServiceType.Car] = new CarhireEnterpriseSearch(carhireFetcher, carHireAvailabilityDetailFetcher, helpers, basketService, storageService, this, userService),
-                  _e[ServiceType.Cab] = new CabHireEnterpriseSearch(cabhireFetcher, helpers, storageService, this, basketService, userService),
-                  _e[ServiceType.InternationalRail] = new IRLEnterpriseSearch(irlFetcher, irlDiscountCardsFetcher, helpers, basketService, storageService, this, getIrlSupplierStationFetcher, userService),
-                  _e[ServiceType.FastTrack] = new FastTrackEnterpriseSearch(fasttrackFetcher, helpers, basketService, storageService, this, userService),
-                  _e[ServiceType.Coach] = null,
-                  _e[ServiceType.Ferry] = new FerryEnterpriseSearch(emailFerryFetcher, helpers, basketService, storageService, this, userService),
-                  _e[ServiceType.Rail] = new RailEnterpriseSearch(railFetcher, getRailStationFetcher, helpers, basketService, storageService, this, userService, modalService),
-                  _e[ServiceType.Eurostar] = new EurostarEnterpriseSearch(eurostarFetcher, helpers, userService, basketService, storageService, this, modalService, applyFlightRules),
-                  _e[ServiceType.LongStays] = new ApartmentEnterpriseSearch(emailApartmentBookingFetcher, helpers, basketService, storageService, this, userService),
-                  _e[ServiceType.SeasonTicket] = new SeasonTicketsEnterpriseSearch(emailSeasonTicketFetcher, helpers, basketService, storageService, this, userService),
-                  _e[ServiceType.MeetingRoom] = new MeetingRoomEnterpriseSearch(emailMeetingRoomBookingFetcher, helpers, basketService, storageService, this, userService),
-                  _e);
+              this.searches = (_j = {},
+                  _j[ServiceType.Lounge] = new LoungesEnterpriseSearch(loungeFetcher, helpers, basketService, storageService, this, userService),
+                  _j[ServiceType.Parking] = new ParkingEnterpriseSearch(parkingFetcher, helpers, basketService, storageService, this, userService),
+                  _j[ServiceType.Flight] = new FlightEnterpriseSearch(flightFetcher, helpers, userService, basketService, storageService, this, applyFlightRules, modalService, getFlightExtrasOptionsFetcher, getFlightSearchExchangeFetcher, getFlightExchangeDetailsFetcher, updateFlightSeatMapUpdater),
+                  _j[ServiceType.Hotel] = new HotelEnterpriseSearch(hotelFetcher, helpers, userService, environment, hotelAvalibilityService, basketService, storageService, this, httpCallService, quicklistFetcher, getRailStationFetcher, applyHotelRulesFetcher, getRequestedHotelUpdateFetcher),
+                  _j[ServiceType.Car] = new CarhireEnterpriseSearch(carhireFetcher, carHireAvailabilityDetailFetcher, helpers, basketService, storageService, this, userService),
+                  _j[ServiceType.Cab] = new CabHireEnterpriseSearch(cabhireFetcher, helpers, storageService, this, basketService, userService),
+                  _j[ServiceType.InternationalRail] = new IRLEnterpriseSearch(irlFetcher, irlDiscountCardsFetcher, helpers, basketService, storageService, this, getIrlSupplierStationFetcher, userService),
+                  _j[ServiceType.FastTrack] = new FastTrackEnterpriseSearch(fasttrackFetcher, helpers, basketService, storageService, this, userService),
+                  _j[ServiceType.Coach] = null,
+                  _j[ServiceType.Ferry] = new FerryEnterpriseSearch(emailFerryFetcher, helpers, basketService, storageService, this, userService),
+                  _j[ServiceType.Rail] = new RailEnterpriseSearch(railFetcher, getRailStationFetcher, helpers, basketService, storageService, this, userService, modalService),
+                  _j[ServiceType.Eurostar] = new EurostarEnterpriseSearch(eurostarFetcher, helpers, userService, basketService, storageService, this, modalService, applyFlightRules),
+                  _j[ServiceType.LongStays] = new ApartmentEnterpriseSearch(emailApartmentBookingFetcher, helpers, basketService, storageService, this, userService),
+                  _j[ServiceType.SeasonTicket] = new SeasonTicketsEnterpriseSearch(emailSeasonTicketFetcher, helpers, basketService, storageService, this, userService),
+                  _j[ServiceType.MeetingRoom] = new MeetingRoomEnterpriseSearch(emailMeetingRoomBookingFetcher, helpers, basketService, storageService, this, userService),
+                  _j);
           }
       };
       BaseEnterpriseSearchService.prototype.checkIfSearchesAreNull = function () {
@@ -39059,7 +39139,7 @@
                           //     : airport;
                           // })
                           .map(function (airport) {
-                          var _a, _b, _c, _d;
+                          var _a, _b, _c, _d, _e, _f, _g, _h;
                           return {
                               destination: airport.name,
                               gateway: airport.iata,
@@ -39067,7 +39147,9 @@
                               country: (_a = airport === null || airport === void 0 ? void 0 : airport.locationDetails) === null || _a === void 0 ? void 0 : _a.country,
                               postcode: (_b = airport === null || airport === void 0 ? void 0 : airport.locationDetails) === null || _b === void 0 ? void 0 : _b.postcode,
                               countryCode: (_c = airport === null || airport === void 0 ? void 0 : airport.locationDetails) === null || _c === void 0 ? void 0 : _c.countryCode,
-                              locationType: (_d = airport === null || airport === void 0 ? void 0 : airport.locationDetails) === null || _d === void 0 ? void 0 : _d.locationType
+                              locationType: (_d = airport === null || airport === void 0 ? void 0 : airport.locationDetails) === null || _d === void 0 ? void 0 : _d.locationType,
+                              latitude: (_f = (_e = airport === null || airport === void 0 ? void 0 : airport.locationDetails) === null || _e === void 0 ? void 0 : _e.coordinates) === null || _f === void 0 ? void 0 : _f.latitude,
+                              longitude: (_h = (_g = airport === null || airport === void 0 ? void 0 : airport.locationDetails) === null || _g === void 0 ? void 0 : _g.coordinates) === null || _h === void 0 ? void 0 : _h.longitude
                           };
                       }));
                   }
@@ -39109,7 +39191,9 @@
                   return {
                       name: result.destination,
                       type: exports.LocationTypes.Airport,
-                      airport: result
+                      airport: result,
+                      latitude: result.latitude,
+                      longitude: result.longitude
                   };
               });
           };
@@ -39295,13 +39379,16 @@
                   return results
                       ? results
                           .map(function (result) {
+                          var _a, _b, _c, _d;
                           if (!euOnly ||
                               result.locationDetails.countryCode !== 'GB' ||
                               result.stationCode === 'STP') {
                               return {
                                   type: exports.LocationTypes.TrainStation,
                                   name: result.name,
-                                  railstation: result
+                                  railstation: result,
+                                  latitude: (_b = (_a = result.locationDetails) === null || _a === void 0 ? void 0 : _a.coordinates) === null || _b === void 0 ? void 0 : _b.latitude,
+                                  longitude: (_d = (_c = result.locationDetails) === null || _c === void 0 ? void 0 : _c.coordinates) === null || _d === void 0 ? void 0 : _d.longitude
                               };
                           }
                       })
@@ -39555,8 +39642,8 @@
       };
       BaseEnterpriseSearchService.prototype._getHighestSearchPriorityObject = function (basketItems) {
           if (basketItems === void 0) { basketItems = {}; }
-          return Object.values(this.search_objects).reduce(function (_e, item) {
-              var highest = _e.highest, currentItem = _e.currentItem;
+          return Object.values(this.search_objects).reduce(function (_j, item) {
+              var highest = _j.highest, currentItem = _j.currentItem;
               if (item.chosen && item.priority < highest) {
                   if (!basketItems[item.type]) {
                       return { highest: item.priority, currentItem: item };
@@ -39632,8 +39719,8 @@
       BaseEnterpriseSearchService.prototype.getAllErrorMessages = function (isFavourite) {
           var _this = this;
           if (isFavourite === void 0) { isFavourite = false; }
-          var concattedErrors = Object.entries(this.search_objects).reduce(function (accum, _e) {
-              var _f = __read(_e, 2), type = _f[0], searchObject = _f[1];
+          var concattedErrors = Object.entries(this.search_objects).reduce(function (accum, _j) {
+              var _k = __read(_j, 2), type = _k[0], searchObject = _k[1];
               var search = _this.searches[type];
               var messages = search ?
                   (!isFavourite ? search.validationMessages : search.validationFavouriteMessages) :
@@ -40035,8 +40122,8 @@
       BaseEnterpriseSearchService.prototype.saveUserAddress = function (formAddress) {
           return __awaiter(this, void 0, void 0, function () {
               var House, Street, Town, PostCode, Country, descArr, description, address, value;
-              return __generator(this, function (_e) {
-                  switch (_e.label) {
+              return __generator(this, function (_j) {
+                  switch (_j.label) {
                       case 0:
                           House = formAddress.House, Street = formAddress.Street, Town = formAddress.Town, PostCode = formAddress.PostCode, Country = formAddress.Country;
                           descArr = [];
@@ -40062,7 +40149,7 @@
                           if (!address) return [3 /*break*/, 2];
                           return [4 /*yield*/, this.saveUserAddressUpdater.updateOne(address).toPromise()];
                       case 1:
-                          value = _e.sent();
+                          value = _j.sent();
                           return [2 /*return*/, value];
                       case 2: return [2 /*return*/];
                   }
@@ -40863,11 +40950,11 @@
       };
       BaseEnterpriseSearchService.prototype.simultaneousSearchesCheck = function (ignoreChosen) {
           if (ignoreChosen === void 0) { ignoreChosen = false; }
-          var _a, _b, _c, _d;
+          var _a, _b, _c, _d, _e, _f;
           return __awaiter(this, void 0, void 0, function () {
-              var search_objects_copy, trainlineConfig, hasTLEnabled;
-              return __generator(this, function (_e) {
-                  switch (_e.label) {
+              var search_objects_copy, trainlineConfig, hasTLEnabled, flightSearchQuery, outCc, inCc, notUKRail;
+              return __generator(this, function (_j) {
+                  switch (_j.label) {
                       case 0:
                           search_objects_copy = this.helpers.clone(this.init_search_objects());
                           if (this.userService.canBook(ServiceType.Flight) && this.searches[ServiceType.Flight]) {
@@ -40893,47 +40980,51 @@
                               (!this.search_objects[ServiceType.Rail].chosen || ignoreChosen))) return [3 /*break*/, 8];
                           trainlineConfig = '';
                           hasTLEnabled = this.userService.userHasServiceProvider(ServiceType.Rail, exports.ServiceProvider.Trainline);
-                          if (!hasTLEnabled) return [3 /*break*/, 2];
+                          flightSearchQuery = this.searches[ServiceType.Flight];
+                          outCc = (_b = flightSearchQuery.departLocation) === null || _b === void 0 ? void 0 : _b.countryCode;
+                          inCc = (_c = flightSearchQuery.arriveLocation) === null || _c === void 0 ? void 0 : _c.countryCode;
+                          notUKRail = outCc !== 'GB' && inCc !== 'GB';
+                          if (!(hasTLEnabled && notUKRail)) return [3 /*break*/, 2];
                           return [4 /*yield*/, this.getTrainlineSearchConfig().toPromise()];
                       case 1:
-                          trainlineConfig = _e.sent();
-                          _e.label = 2;
+                          trainlineConfig = _j.sent();
+                          _j.label = 2;
                       case 2: return [4 /*yield*/, this.searches[ServiceType.Flight].canBeRailSearched(this.searches[ServiceType.Flight].chosenSearchType, trainlineConfig)];
                       case 3:
-                          if (!_e.sent()) return [3 /*break*/, 8];
-                          if (!(trainlineConfig && hasTLEnabled)) return [3 /*break*/, 5];
+                          if (!_j.sent()) return [3 /*break*/, 8];
+                          if (!(trainlineConfig && trainlineConfig !== 'UK_only' && hasTLEnabled)) return [3 /*break*/, 5];
                           // do a specific trainline one
-                          return [4 /*yield*/, this.searches[ServiceType.Rail].generateQueryFromFlightQueryTrainline(this.searches[ServiceType.Flight].getSearchQuery(), this.searches[ServiceType.Flight].outboundSameSearchTrainlineStations, this.searches[ServiceType.Flight].inboundSameSearchTrainlineStations, this.searches[ServiceType.Flight].departLocation, this.searches[ServiceType.Flight].arriveLocation)];
+                          return [4 /*yield*/, this.searches[ServiceType.Rail].generateQueryFromFlightQueryTrainline(flightSearchQuery.getSearchQuery(), flightSearchQuery.outboundSameSearchTrainlineStations, flightSearchQuery.inboundSameSearchTrainlineStations, flightSearchQuery.departLocation, flightSearchQuery.arriveLocation)];
                       case 4:
                           // do a specific trainline one
-                          _e.sent();
+                          _j.sent();
                           return [3 /*break*/, 7];
-                      case 5: return [4 /*yield*/, this.searches[ServiceType.Rail].generateQueryFromFlightQuery(this.searches[ServiceType.Flight].getSearchQuery())];
+                      case 5: return [4 /*yield*/, this.searches[ServiceType.Rail].generateQueryFromFlightQuery(flightSearchQuery.getSearchQuery())];
                       case 6:
-                          _e.sent();
-                          _e.label = 7;
+                          _j.sent();
+                          _j.label = 7;
                       case 7:
                           console.log(this.searches[ServiceType.Rail]);
-                          this.searches[ServiceType.Flight].railFromFlightSearchPerformed = true;
+                          flightSearchQuery.railFromFlightSearchPerformed = true;
                           this.search_objects[ServiceType.Rail].priority = this.search_objects.FLIGHT.priority;
                           this.search_objects[ServiceType.Rail].resultUrl = this.search_objects.FLIGHT.resultUrl;
-                          _e.label = 8;
+                          _j.label = 8;
                       case 8:
-                          if (!(((_b = this.search_objects[ServiceType.Flight]) === null || _b === void 0 ? void 0 : _b.chosen) &&
+                          if (!(((_d = this.search_objects[ServiceType.Flight]) === null || _d === void 0 ? void 0 : _d.chosen) &&
                               this.userService.canBook(ServiceType.Eurostar) &&
                               (!this.search_objects[ServiceType.Eurostar].chosen || ignoreChosen))) return [3 /*break*/, 10];
                           if (!this.searches[ServiceType.Flight].canBeEuroSearched()) return [3 /*break*/, 10];
                           return [4 /*yield*/, this.searches[ServiceType.Eurostar].generateQueryFromFlightQuery(this.searches[ServiceType.Flight].getSearchQuery(), this.searches[ServiceType.Flight].departLocation.gateway, this.searches[ServiceType.Flight].arriveLocation.gateway)];
                       case 9:
-                          _e.sent();
+                          _j.sent();
                           this.searches[ServiceType.Flight].eurostarFromFlightSearchPerformed = true;
                           this.search_objects[ServiceType.Eurostar].priority = this.search_objects.FLIGHT.priority;
                           this.search_objects[ServiceType.Eurostar].resultUrl = this.search_objects.FLIGHT.resultUrl;
-                          _e.label = 10;
+                          _j.label = 10;
                       case 10:
-                          if ((_c = this.search_objects[ServiceType.Flight]) === null || _c === void 0 ? void 0 : _c.chosen) {
+                          if ((_e = this.search_objects[ServiceType.Flight]) === null || _e === void 0 ? void 0 : _e.chosen) {
                               this.searches[ServiceType.Flight].hotelFromFlightSearchPerformed =
-                                  (_d = this.search_objects[ServiceType.Hotel]) === null || _d === void 0 ? void 0 : _d.chosen;
+                                  (_f = this.search_objects[ServiceType.Hotel]) === null || _f === void 0 ? void 0 : _f.chosen;
                           }
                           return [2 /*return*/];
                   }
@@ -41440,7 +41531,9 @@
                       _this.router.navigate(['logOutDigitsUser']);
                   }
                   else if (ssoUser) {
-                      _this.router.navigate(['sso-logout']);
+                      // App doesnt have sso-logout route
+                      // this.router.navigate(['sso-logout']);
+                      _this.router.navigate(['logon']);
                   }
                   else {
                       _this.router.navigate(['logon']);
@@ -41448,7 +41541,8 @@
               });
           }
           else if (ssoUser) {
-              this.router.navigate(['sso-logout']);
+              // this.router.navigate(['sso-logout']);
+              this.router.navigate(['logon']);
           }
           else {
               this.router.navigate(['logon']);
@@ -43970,6 +44064,7 @@
   exports.makeDraftManagamentInfo = makeDraftManagamentInfo;
   exports.makeManagamentInfo = makeManagamentInfo;
   exports.maxTravellerWellbeing = maxTravellerWellbeing;
+  exports.nonEnterpriseCarServices = nonEnterpriseCarServices;
   exports["ɵ0"] = ɵ0;
   exports["ɵk"] = FetchableList;
   exports["ɵl"] = FetchableObject;