@sabstravtech/obtservices 0.0.3 → 0.0.19020100

package/base/fetchers.d.ts

@@ -29,8 +29,10 @@ export * from './lib/vendor/fetchers/search-depots.fetcher';
 export * from './lib/vendor/fetchers/get-user-company-offices.fetcher';
 export * from './lib/vendor/fetchers/search-hotel-chains.fetcher';
 export * from './lib/vendor/fetchers/conferma-office-names.fetcher';
+export * from './lib/vendor/fetchers/conferma-office.fetcher';
 export * from './lib/vendor/fetchers/get-user-current-carbon-allowance.fetcher';
 export * from './lib/vendor/fetchers/get-risk-alerts.fetcher';
 export * from './lib/vendor/fetchers/conferma-quicklist.fetcher';
 export * from './lib/vendor/fetchers/get-rail-cards.fetcher';
 export * from './lib/vendor/fetchers/eurostar-quote.fetcher';
+export * from './lib/vendor/fetchers/search-irl-stations.fetcher';

package/base/lib/vendor/classes/base-enterprise.d.ts

@@ -9,22 +9,26 @@ export declare abstract class BaseEnterpriseSearch<P, R, O extends Array<any>> {
     protected _originalUserSearch: P;
     isValid: BehaviorSubject<boolean>;
     results: BehaviorSubject<O>;
+    multiResults: BehaviorSubject<O[][]>;
     messages: BehaviorSubject<string[]>;
     messagesInfo: BehaviorSubject<string[]>;
     validationMessages: string[];
     infoMessages: string[];
     isLoading: BehaviorSubject<boolean>;
     protected abstract resultsSessionName: string;
+    protected abstract multiResultsSessionName: string;
     protected tempParams: P;
     protected doChecks: boolean;
     abstract type: ServiceType;
     fullResults: O;
+    fullMultiResults: O[][];
     private mapper;
     get cheapestPrice(): ICheapestPrice;
     get originalUserSearch(): P;
     constructor(storageService: BaseStorageService, mapper?: (r: R) => O);
     protected updateTempParams(tempParams: P): void;
     protected _startSearch(results: Observable<R>): Promise<boolean>;
+    protected _startMultiSearch(resultsArray: Observable<R>[]): Promise<boolean>;
     reset(): void;
     protected makeSessionResults(data: O): any;
     protected abstract resetQuery(): void;

package/base/lib/vendor/classes/bookable-basket.d.ts

@@ -17,7 +17,7 @@ export declare class BookableBasket {
     loadBasket(id: string): void;
     private _loadBasket;
     updateBasket(basket: BasketDetails): void;
-    sendBasketForApproval(): void;
+    sendBasketForApproval(): Promise<void>;
     workoutApprovedState(basket: BasketDetails): BookingStatus;
     workoutState(basket: BasketDetails, defaultState: BookingStatus): BookingStatus;
     workoutOpenState(basket: BasketDetails): BookingStatus;

package/base/lib/vendor/classes/cabhire-enterprise-search.d.ts

@@ -16,7 +16,9 @@ export declare class CabHireEnterpriseSearch<CH_Q extends CabhireQuoteFetcherTyp
     private searchService;
     private basketService;
     static readonly STORAGE_SESSION_PARAMS = "search_cab";
+    static readonly SECONDARY_STORAGE_SESSION_PARAMS = "secondary_search_cab";
     static readonly STORAGE_SESSION_RESULTS = "results_cab";
+    static readonly MULTI_STORAGE_SESSION_RESULTS = "multi_results_cab";
     private outboundVisibility;
     private inboundVisibility;
     type: ServiceType;
@@ -29,6 +31,7 @@ export declare class CabHireEnterpriseSearch<CH_Q extends CabhireQuoteFetcherTyp
     readonly criteria: string[];
     mode: TaxiFormMode;
     minSelectDate: moment.Moment;
+    minReturnSelectDate: NgbDateStruct;
     private _date;
     selectedPlaces: any;
     private _fromLocation;
@@ -96,6 +99,7 @@ export declare class CabHireEnterpriseSearch<CH_Q extends CabhireQuoteFetcherTyp
     set toStation(value: RailAirport);
     constructor(cabfetcher: BaseCabhireQuoteFetcher<CH_Q>, helpers: BaseHelperRoutines, storageService: BaseStorageService, searchService: EnterpriseSearchServiceInterface, basketService: EnterpriseBasketServiceInterface);
     protected resultsSessionName: string;
+    protected multiResultsSessionName: string;
     protected resetQuery(): void;
     resetParams(): void;
     private _isValid;
@@ -104,11 +108,12 @@ export declare class CabHireEnterpriseSearch<CH_Q extends CabhireQuoteFetcherTyp
     getRecentSearchQuery(query: QuerySearchCabHireArgs): SaveRecentSearchMutationVariables;
     startRecentSearch(recentSearch: RecentSearch): void;
     getSearchQuery(): QuerySearchCabHireArgs;
+    getReturnSearchQuery(): QuerySearchCabHireArgs;
     updateOutboundAddress(location: any, placeDescription?: string): void;
     updateInboundAddress(location: any, placeDescription?: string): void;
     private createCabHireLocation;
     matchAddresses(): void;
-    sortBy(asc?: boolean): void;
+    sortBy(asc?: boolean, returnIndex?: number): void;
     getAddressFormat(location: any, placeDescription?: string): {
         House: string;
         Street: string;

package/base/lib/vendor/classes/carhire-enterprise-search.d.ts

@@ -120,7 +120,7 @@ export declare class CarhireEnterpriseSearch<CH_Q extends CarHireFetcherType, CH
     set airCon(newCon: boolean);
     get locationType(): LocationTypes;
     set locationType(value: LocationTypes);
-    get timeArray(): ValueDisplay[];
+    get timeArray(): ValueDisplay<string>[];
     get carAirConditionTypes(): [string, string, boolean][];
     get carTransmissionCodes(): [string, string, CarHireTransmission][];
     get carTypeCodes(): [string, string, CarHireType][];
@@ -128,6 +128,7 @@ export declare class CarhireEnterpriseSearch<CH_Q extends CarHireFetcherType, CH
     get sortingOptions(): CarHireSort[];
     constructor(carhirefetcher: BaseCarhireQuoteFetcher<CH_Q>, carHireAvailabilityDetailFetcher: BaseCarHireAvailabilityDetailFetcher<CHAD_Q>, helpers: BaseHelperRoutines, basketService: EnterpriseBasketServiceInterface, storageService: BaseStorageService, searchService: EnterpriseSearchServiceInterface);
     protected resultsSessionName: string;
+    protected multiResultsSessionName: string;
     protected resetQuery(): void;
     private _isValid;
     startSearch(): Promise<boolean>;

package/base/lib/vendor/classes/eurostar-enterprise-search.d.ts

@@ -7,7 +7,7 @@ import { BehaviorSubject } from 'rxjs';
 import { ValueDisplay } from '../interfaces/value-display';
 import { FlightFilters } from '../interfaces/flight-filters.interface';
 import { SelectFilter } from '../interfaces/select-filter.interface';
-import { BasketItem, DestinationEntry, FareType, FlightCabinClass, FlightFareTotal, FlightItinerary, FlightJourney, SearchFlightsV2QueryVariables, ServiceType } from '../types/graphql.types';
+import { BasketItem, DestinationEntry, FareType, FlightCabinClass, FlightFareTotal, FlightItinerary, FlightJourney, SearchFlightsV2QueryVariables, ServiceType, SaveRecentSearchMutationVariables } from '../types/graphql.types';
 import { EurostarQuoteResult, NgbDateStruct, OBTAirportDetails, OBTAirlinesDetails, FlightDirectionEnum, GroupedFlights, FlightItineraryWithSelected, RecentSearch, EurostarResults, EurostarItem, EurostarFare, EurostarClassEnum, EurostarQuoteResultArray } from '../types/types';
 import { UserServiceInterface } from '../interfaces/Iuser.service';
 import { EnterpriseSearchServiceInterface } from '../interfaces/Isearch.service';
@@ -29,7 +29,8 @@ export declare type EurostarStation = {
 };
 export declare enum SortTypesEurostar {
     CheapestFirst = "C",
-    EarliestFirst = "E"
+    EarliestFirst = "E",
+    LatestFirst = "L"
 }
 export declare enum SortMethod {
     sortByPrice = "sortByPrice",
@@ -97,13 +98,15 @@ export declare class EurostarEnterpriseSearch<SE_Q extends EurostarQuoteFetcherT
     protected grouped: GroupedFlights;
     travellers: Traveller[];
     protected resultsSessionName: string;
+    protected multiResultsSessionName: string;
     selectedGroupFlight: FlightItineraryWithSelected;
     private _displayAddHotel;
+    filters: BehaviorSubject<FlightFilters>;
     get displayAddHotel(): boolean;
     set displayAddHotel(newVal: boolean);
     selectedGroupEurostar: EurostarItem;
     selectedEurostarFare: EurostarFare;
-    get timeArray(): ValueDisplay[];
+    get timeArray(): ValueDisplay<string>[];
     get preferredCarriers(): OBTAirlinesDetails[];
     set preferredCarriers(value: OBTAirlinesDetails[]);
     get operator1(): OBTAirlinesDetails;
@@ -169,9 +172,11 @@ export declare class EurostarEnterpriseSearch<SE_Q extends EurostarQuoteFetcherT
     resetParams(): void;
     private _isValid;
     startSearch(): Promise<boolean>;
+    getRecentSearchQuery(query: SearchFlightsV2QueryVariables): SaveRecentSearchMutationVariables;
     startRecentSearch(recentSearch: RecentSearch): void;
     private makeDepartureTimeWindow;
     private makeArrivalTimeWindow;
+    convertRecentSearchDateTime(date: string, timeWindow?: string): moment.Moment;
     getSearchQuery(): SearchFlightsV2QueryVariables;
     private updateTravellers;
     private updateAvaliableClasses;
@@ -180,6 +185,10 @@ export declare class EurostarEnterpriseSearch<SE_Q extends EurostarQuoteFetcherT
      * @todo - Fill out Preferred and Co2 sorting when we have that data
      */
     sortResults(sortMethodValue: SortTypesEurostar, givenResults?: EurostarResults[]): void;
+    sortResultsFlightJourneys(sortMethodValue: SortTypesEurostar, inbound?: boolean, givenResults?: FlightItinerary[]): FlightItinerary[];
+    sortByPriceFlight(results: FlightItinerary[]): FlightItinerary[];
+    sortByDateFlight(results: FlightItinerary[], inbound: boolean): FlightItinerary[];
+    sortByDateFlightDecending(results: FlightItinerary[], inbound: boolean): FlightItinerary[];
     /**
      * Sort results by departure time
      *
@@ -203,6 +212,14 @@ export declare class EurostarEnterpriseSearch<SE_Q extends EurostarQuoteFetcherT
      * @param min - the min in 100th's to transform onto 60th's
      */
     transformMin(min: number): string;
+    /**
+     * @description - apply all filters to results
+     * @param filters
+     * @param inbound
+     * @param results
+     * @returns
+     */
+    applyFilters(filters: FlightFilters, inbound?: boolean): void;
     filterByDuration(minDuration: number, maxDuration: number, results: FlightItinerary[], isReturn?: boolean): FlightItinerary[];
     filterByDepartureTime(minDep: number, maxDep: number, results: FlightItinerary[]): FlightItinerary[];
     filterByReturnDepartureTime(minDep: number, maxDep: number, results: FlightItinerary[]): FlightItinerary[];
@@ -222,7 +239,6 @@ export declare class EurostarEnterpriseSearch<SE_Q extends EurostarQuoteFetcherT
     filterByArrivalAirport(arrivalAirports: SelectFilter[], results: FlightItinerary[]): FlightItinerary[];
     filterByDepartureReturnAirport(departureAirports: SelectFilter[], results: FlightItinerary[]): FlightItinerary[];
     filterByArrivalReturnAirport(arrivalAirports: SelectFilter[], results: FlightItinerary[]): FlightItinerary[];
-    createFilters(results?: FlightItinerary[]): FlightFilters;
     getMinDuration(results: FlightItinerary[], isReturn?: boolean): number;
     getMaxDuration(results: FlightItinerary[], isReturn?: boolean): number;
     getMinArrivalTime(results: FlightItinerary[]): number;
@@ -254,7 +270,7 @@ export declare class EurostarEnterpriseSearch<SE_Q extends EurostarQuoteFetcherT
      */
     getAllAirlines(results: FlightItinerary[]): SelectFilter[];
     selectGroupedEurostar(selectedEurostar: EurostarItem, fare: EurostarFare, direction: FlightDirectionEnum): Promise<void>;
-    updateLowestPrice(results: EurostarResults[]): ICheapestPrice;
+    updateLowestPrice(results: EurostarQuoteResultArray): ICheapestPrice;
     doBooking(intBasket: InternalBasketInterface, selectedFlight: EurostarItem, schemaDetails: any, outboundDate: string, inboundDate?: string): void;
     makeSchemaFlights(selectedFlight: FlightJourney, flightGroup: 'outbound' | 'inbound', groupIndex: number, segmentIndex?: number): any;
     private createGroupedItem;

package/base/lib/vendor/classes/flight-enterprise-search.d.ts

@@ -6,9 +6,8 @@ import { Traveller } from '../models/traveller.object';
 import { BehaviorSubject } from 'rxjs';
 import { ValueDisplay } from '../interfaces/value-display';
 import { FlightFilters } from '../interfaces/flight-filters.interface';
-import { SelectFilter } from '../interfaces/select-filter.interface';
 import { BasketItem, DestinationEntry, FareType, FlightCabinClass, FlightItinerary, FlightJourney, SaveRecentSearchMutationVariables, SearchFlightsV2QueryVariables, ServiceType } from '../types/graphql.types';
-import { FlightAllQuoteResult, FlightQuoteResultArray, NgbDateStruct, OBTAirportDetails, OBTAirlinesDetails, FlightDirectionEnum, GroupedFlights, FlightItineraryWithSelected, RecentSearch } from '../types/types';
+import { FlightAllQuoteResult, FlightGroupedQuoteResult, FlightQuoteResultArray, NgbDateStruct, OBTAirportDetails, OBTAirlinesDetails, FlightDirectionEnum, GroupedFlights, FlightItineraryWithSelected, RecentSearch } from '../types/types';
 import { BaseFlightQuoteFetcher, FlightQuoteFetcherType } from '../fetchers/flight-quote.fetcher';
 import { UserServiceInterface } from '../interfaces/Iuser.service';
 import { EnterpriseSearchServiceInterface } from '../interfaces/Isearch.service';
@@ -31,15 +30,19 @@ export declare enum TimeWindow {
     Depart = "Depart By",
     Arrive = "Arrive By"
 }
-export declare enum SortTypes {
-    CheapestFirst = "C",
-    MostExpensiveFirst = "M",
-    FastestFirst = "F",
-    PreferredFirst = "P",
-    LowestEmissions = "L"
+export declare enum FlightSortTypes {
+    Cheapest = "Cheapest",
+    MostExpensive = "Most Expensive",
+    Fastest = "Fastest",
+    Preferred = "Preferred",
+    LowestEmissions = "Lowest Emissions",
+    DepartureTime = "Departure Time",
+    ArrivalTime = "Arrival Time",
+    Quickest = "Quickest",
+    MostDirect = "Most Direct"
 }
-export declare type FlightGroups = 'LiteEconomy' | 'Economy' | 'EconomyNoBags' | 'EconomyRestricted' | 'PremiumEconomy' | 'Business' | 'PremiumBusiness' | 'First' | 'PremiumFirst';
-export declare type RestrictedFlightGroups = 'Economy' | 'EconomyNoBags' | 'EconomyRestricted' | 'PremiumEconomy' | 'Business' | 'First';
+export declare type FlightGroups = 'LiteEconomy' | 'Economy' | 'EconomyNoBags' | 'EconomyRestricted' | 'EconomyFlexi' | 'PremiumEconomy' | 'Business' | 'PremiumBusiness' | 'First' | 'PremiumFirst';
+export declare type RestrictedFlightGroups = 'EconomyNoBags' | 'EconomyFlexi' | 'EconomyRestricted' | 'PremiumEconomy' | 'Business' | 'First';
 interface FlightSessionType {
     results: FlightQuoteResultArray;
     groupData: {
@@ -63,6 +66,8 @@ export declare class FlightEnterpriseSearch<FQ_Q extends FlightQuoteFetcherType>
     private _nearby_airports;
     private _timeArray;
     private _sortArray;
+    private _sortItinaryRoutines;
+    private _sortGroupedRoutines;
     private _fareTypeArray;
     minimumOutBoundDate: {
         year: number;
@@ -89,10 +94,12 @@ export declare class FlightEnterpriseSearch<FQ_Q extends FlightQuoteFetcherType>
     protected grouped: GroupedFlights;
     travellers: Traveller[];
     protected resultsSessionName: string;
+    protected multiResultsSessionName: string;
     selectedGroupFlight: FlightItineraryWithSelected;
     private _showHotelForm;
     private _hotelSearchRequested;
-    get timeArray(): ValueDisplay[];
+    filters: BehaviorSubject<FlightFilters>;
+    get timeArray(): ValueDisplay<string>[];
     get preferredCarriers(): OBTAirlinesDetails[];
     set preferredCarriers(value: OBTAirlinesDetails[]);
     get operator1(): OBTAirlinesDetails;
@@ -148,8 +155,8 @@ export declare class FlightEnterpriseSearch<FQ_Q extends FlightQuoteFetcherType>
     get hotelSearchRequested(): boolean;
     set hotelSearchRequested(newVal: boolean);
     setMultiDestinationQuery(multiDestination: IMultiDestination[]): DestinationEntry[];
-    get sortDropdownValues(): ValueDisplay[];
-    get fareTypesValues(): ValueDisplay[];
+    get sortDropdownValues(): ValueDisplay<FlightSortTypes>[];
+    get fareTypesValues(): ValueDisplay<FareType>[];
     get fareType(): FareType;
     set fareType(value: FareType);
     get negotiated(): boolean;
@@ -174,74 +181,14 @@ export declare class FlightEnterpriseSearch<FQ_Q extends FlightQuoteFetcherType>
     getSearchQuery(): SearchFlightsV2QueryVariables;
     private updateTravellers;
     private updateAvaliableClasses;
-    /**
-     * @description - sort the flight results
-     * @todo - Fill out Preferred and Co2 sorting when we have that data
-     */
-    sortResults(sortMethodValue: SortTypes, givenResults?: FlightItinerary[]): FlightItinerary[];
     updateFromPreviousSearches(previousItems: Record<ServiceType, BasketItem>): void;
     getTotalBaggage(result: FlightItinerary): number;
+    isGroupedFlights(toTest: FlightQuoteResultArray): toTest is FlightGroupedQuoteResult[];
     /**
      * @description - filter the results, then sort the remainder
      * @todo - Add filters for travel policy, fare types and ancilliaries
      */
-    filterResults(filters: FlightFilters, sortValue: SortTypes, givenResults?: FlightItinerary[]): FlightItinerary[];
-    /**
-     * @description - give the correct format for transfering minuetes on the sliders
-     * @param min - the min in 100th's to transform onto 60th's
-     */
-    transformMin(min: number): string;
-    filterByDuration(minDuration: number, maxDuration: number, results: FlightItinerary[], isReturn?: boolean): FlightItinerary[];
-    filterByDepartureTime(minDep: number, maxDep: number, results: FlightItinerary[]): FlightItinerary[];
-    filterByReturnDepartureTime(minDep: number, maxDep: number, results: FlightItinerary[]): FlightItinerary[];
-    filterByReturnArrivalTime(minArr: number, maxArr: number, results: FlightItinerary[]): FlightItinerary[];
-    filterByArrivalTime(minArr: number, maxArr: number, results: FlightItinerary[]): FlightItinerary[];
-    filterByBaggage(baggageFilters: SelectFilter[], results: FlightItinerary[]): FlightItinerary[];
-    filterByPrice(minPrice: number, maxPrice: number, results: FlightItinerary[]): FlightItinerary[];
-    /**
-     * @description - filter the results by the number of stops
-     * @param stopFilters - the selected stops
-     * @param fullResults - all of our results so far
-     */
-    filterResultsByStops(stopFilters: SelectFilter[], fullResults: FlightItinerary[]): FlightItinerary[];
-    filterResultsByAirline(airlineFilters: SelectFilter[], results: FlightItinerary[]): FlightItinerary[];
-    filterResultsByClass(classFilters: SelectFilter[], results: FlightItinerary[]): FlightItinerary[];
-    filterByDepartureAirport(departureAirports: SelectFilter[], results: FlightItinerary[]): FlightItinerary[];
-    filterByArrivalAirport(arrivalAirports: SelectFilter[], results: FlightItinerary[]): FlightItinerary[];
-    filterByDepartureReturnAirport(departureAirports: SelectFilter[], results: FlightItinerary[]): FlightItinerary[];
-    filterByArrivalReturnAirport(arrivalAirports: SelectFilter[], results: FlightItinerary[]): FlightItinerary[];
-    filterByFlightNumber(flightNumber: string, results: FlightItinerary[]): FlightItinerary[];
-    createFilters(results?: FlightItinerary[]): FlightFilters;
-    getMinDuration(results: FlightItinerary[], isReturn?: boolean): number;
-    getMaxDuration(results: FlightItinerary[], isReturn?: boolean): number;
-    getMinArrivalTime(results: FlightItinerary[]): number;
-    getMinReturnArrivalTime(results: FlightItinerary[]): number;
-    getMaxReturnArrivalTime(results: FlightItinerary[]): number;
-    getMaxArrivalTime(results: FlightItinerary[]): number;
-    getMinDepartureTime(results: FlightItinerary[]): number;
-    getMinReturnDepartureTime(results: FlightItinerary[]): number;
-    getMaxReturnDepartureTime(results: FlightItinerary[]): number;
-    getMaxDepartureTime(results: FlightItinerary[]): number;
-    getBaggage(results: FlightItinerary[]): SelectFilter[];
-    getMinPrice(results: FlightItinerary[]): number;
-    getMaxPrice(results: FlightItinerary[]): number;
-    getAllStops(results: FlightItinerary[]): SelectFilter[];
-    getAllClasses(results: FlightItinerary[]): SelectFilter[];
-    /**
-     * @description - create select filters for all unique departure airports returned in the search
-     * @param results - the flight results
-     */
-    getAllDepartureAirports(results: FlightItinerary[], inbound?: boolean): SelectFilter[];
-    /**
-     * @description - create select filters for all unique departure airports returned in the search
-     * @param results - the flight results
-     */
-    getAllArrivalAirports(results: FlightItinerary[], inbound?: boolean): SelectFilter[];
-    /**
-     * @description - create select filters for all unique airlines returned in the search
-     * @param results - the flight results
-     */
-    getAllAirlines(results: FlightItinerary[]): SelectFilter[];
+    applyFilters(filters: FlightFilters, sortValue: FlightSortTypes): void;
     updateLowestPrice(results: FlightQuoteResultArray): ICheapestPrice;
     selectGroupedFlight(selectedFlight: FlightItineraryWithSelected, direction: FlightDirectionEnum): Promise<void>;
     doBooking(intBasket: InternalBasketInterface, selectedFlight: FlightItinerary, schemaDetails: any, outboundDate: string, inboundDate?: string): void;

package/base/lib/vendor/classes/helpers.d.ts

@@ -7,6 +7,7 @@ import { UserServices } from '../interfaces/Iuser.service';
 import { FlightDirectionEnum, MinMax, NgbDateStruct, Schema } from '../types/types';
 import { Airport, BasketItem, FareConditions, FlightItinerary, FlightJourney, Service, ServiceType, UserPassengerTypeInput } from '../types/graphql.types';
 import { SupplementaryBookingInfoInterface } from '../interfaces/Isupplementary-booking-info-impl';
+import { FlightFilters } from '../interfaces/flight-filters.interface';
 export declare class BaseHelperRoutines {
     static READ_DATE_FORMAT: string;
     static READ_TIME_FORMAT: string;
@@ -170,4 +171,6 @@ export declare class BaseHelperRoutines {
      * @returns string/string[]
      */
     splitStringOnCapitals(rawString: string, join?: boolean): string | string[];
+    createFlightFilters(journeys: FlightItinerary[], defaultFilters: FlightFilters): FlightFilters;
+    mapOverObject<T extends Record<string | number, V>, V>(items: Record<string | number, V>, callback: (value: V, key?: string | number) => V): Record<string | number, V>;
 }

package/base/lib/vendor/classes/hotel-enterprise-search.d.ts

@@ -117,6 +117,7 @@ export declare class HotelEnterpriseSearch<HQ_Q extends HotelQuoteFetcherType, H
     get filters(): HotelFilters;
     constructor(hotelFetcher: BaseHotelQuoteFetcher<HQ_Q>, helpers: BaseHelperRoutines, userService: UserServiceInterface, environment: BaseEnvironment, avaliabilityService: BaseHotelAvalibilityService<HA_Q>, basketService: EnterpriseBasketServiceInterface, storageService: BaseStorageService, searchService: EnterpriseSearchServiceInterface, httpCallService: AbstractHttpCallService, quickListFetcher: BaseSearchConfermaQuicklistFetcher<QL_Q>, getRailStationFetcher: BaseGetRailStationFetcher<GRS_Q>);
     protected resultsSessionName: string;
+    protected multiResultsSessionName: string;
     private query;
     makeLocations(location: HotelLocation[]): {
         [key: string]: HotelLocation[];

package/base/lib/vendor/classes/irl-enterprise-search.d.ts

@@ -1,4 +1,4 @@
-import moment, { Moment } from 'moment';
+import moment from 'moment';
 import { BaseEnterpriseSearch } from './base-enterprise';
 import { BaseStorageService } from '../services/storage.service';
 import { BaseHelperRoutines } from './helpers';
@@ -6,18 +6,21 @@ import { RailTicketGroups } from '../interfaces/rail-ticket-groups.interface';
 import { RailTicketGroup } from '../interfaces/rail-ticket-group.interface';
 import { ValueDisplay } from '../interfaces/value-display';
 import { NgbDateStruct, IrlQuoteResultArray, RecentSearch } from '../types/types';
-import { BasketItem, IrlClass, IrlJourneyOption, IrlJourneyOptions, IrlTicketOption, SearchIrlQueryVariables, ServiceType, IrlJourneyType, IrlSupplier } from '../types/graphql.types';
+import { BasketItem, IrlClass, IrlJourneyOption, IrlJourneyOptions, IrlTicketOption, SearchIrlQueryVariables, ServiceType, IrlJourneyType, IrlSupplier, IrlTicket } from '../types/graphql.types';
 import { BaseIrlQuoteFetcher, IrlQuoteFetcherType } from '../fetchers/irl-quote-fetcher';
+import { BaseSearchIrlStationsFetcher, SearchIrlStationsFetcherType } from '../fetchers/search-irl-stations.fetcher';
 import { EnterpriseBasketServiceInterface } from '../interfaces/Ienterprise-basket.service';
 import { EnterpriseSearchServiceInterface } from '../interfaces/Isearch.service';
 import { IRLEnterpriseSearchInterface, IrlTempParams } from '../interfaces/Iirl-enterprise-search';
+import { ages } from '../models/traveller.object';
 import { ICheapestPrice } from '../interfaces/cheapest-price';
 export declare enum IrlSearchCriteria {
     Depart = "Depart After",
     Arrive = "Arrive Before"
 }
-export declare class IRLEnterpriseSearch<Q extends IrlQuoteFetcherType> extends BaseEnterpriseSearch<IrlTempParams, IrlQuoteResultArray, IrlQuoteResultArray> implements IRLEnterpriseSearchInterface {
+export declare class IRLEnterpriseSearch<Q extends IrlQuoteFetcherType, SIS_Q extends SearchIrlStationsFetcherType> extends BaseEnterpriseSearch<IrlTempParams, IrlQuoteResultArray, IrlQuoteResultArray> implements IRLEnterpriseSearchInterface {
     private Irlfetcher;
+    private searchIrlStationsFetcher;
     private helpers;
     private basketService;
     private searchService;
@@ -26,6 +29,7 @@ export declare class IRLEnterpriseSearch<Q extends IrlQuoteFetcherType> extends
     static readonly PASSING_POINT = "Passing";
     private travellers;
     protected resultsSessionName: string;
+    protected multiResultsSessionName: string;
     searchTypes: {
         display: string;
         value: IrlJourneyType;
@@ -35,10 +39,10 @@ export declare class IRLEnterpriseSearch<Q extends IrlQuoteFetcherType> extends
         value: IrlClass;
     }[];
     ageRanges: {
-        key: string;
+        key: ages;
         value: string;
     }[];
-    railCriteria: IrlSearchCriteria[];
+    irlCriteria: IrlSearchCriteria[];
     travelCards: {
         display: string;
         value: string;
@@ -70,8 +74,8 @@ export declare class IRLEnterpriseSearch<Q extends IrlQuoteFetcherType> extends
     get class(): IrlClass;
     set class(data: IrlClass);
     private _outboundDepartureDateTime;
-    get outboundDepartureDateTime(): Moment;
-    set outboundDepartureDateTime(data: Moment);
+    get outboundDepartureDateTime(): moment.Moment;
+    set outboundDepartureDateTime(newDateTime: moment.Moment);
     private _departureLocationId;
     get departureLocationId(): string;
     set departureLocationId(data: string);
@@ -85,8 +89,8 @@ export declare class IRLEnterpriseSearch<Q extends IrlQuoteFetcherType> extends
     get children(): number;
     set children(data: number);
     private _returnDepartureDateTime;
-    get returnDepartureDateTime(): Moment;
-    set returnDepartureDateTime(data: Moment);
+    get returnDepartureDateTime(): moment.Moment;
+    set returnDepartureDateTime(newDateTime: moment.Moment);
     private _ageRange;
     get ageRange(): string;
     set ageRange(data: string);
@@ -94,6 +98,10 @@ export declare class IRLEnterpriseSearch<Q extends IrlQuoteFetcherType> extends
     set chosenSearchClass(classR: IrlClass);
     get outBoundDateTime(): moment.Moment;
     set outBoundDateTime(newDateTime: moment.Moment);
+    get outboundCriteria(): IrlSearchCriteria;
+    set outboundCriteria(newCrit: IrlSearchCriteria);
+    get inBoundDateTime(): moment.Moment;
+    set inBoundDateTime(newDateTime: moment.Moment);
     private _outbound_date;
     get outbound_date(): NgbDateStruct;
     set outbound_date(value: NgbDateStruct);
@@ -106,6 +114,8 @@ export declare class IRLEnterpriseSearch<Q extends IrlQuoteFetcherType> extends
     private _return_time;
     get return_time(): string;
     set return_time(value: string);
+    get returnCriteria(): IrlSearchCriteria;
+    set returnCriteria(newCrit: IrlSearchCriteria);
     get timeArray(): ValueDisplay[];
     private _cheapestStandard;
     get cheapestStandard(): IrlTicketOption;
@@ -117,7 +127,7 @@ export declare class IRLEnterpriseSearch<Q extends IrlQuoteFetcherType> extends
     private _journeytype;
     get journeyType(): IrlJourneyType;
     set journeyType(data: IrlJourneyType);
-    constructor(Irlfetcher: BaseIrlQuoteFetcher<Q>, helpers: BaseHelperRoutines, basketService: EnterpriseBasketServiceInterface, storageService: BaseStorageService, searchService: EnterpriseSearchServiceInterface);
+    constructor(Irlfetcher: BaseIrlQuoteFetcher<Q>, searchIrlStationsFetcher: BaseSearchIrlStationsFetcher<SIS_Q>, helpers: BaseHelperRoutines, basketService: EnterpriseBasketServiceInterface, storageService: BaseStorageService, searchService: EnterpriseSearchServiceInterface);
     protected resetQuery(): void;
     private _isValid;
     startSearch(): Promise<boolean>;
@@ -134,6 +144,7 @@ export declare class IRLEnterpriseSearch<Q extends IrlQuoteFetcherType> extends
      */
     clearUnneededTickets(way: string, group: RailTicketGroup, timeSlotId: string): RailTicketGroup;
     getLegsFromRailJourneyOption(railJourneyOption: IrlJourneyOption): any[];
+    addSingleJourneyToBasket(serviceId: string, railQuery: SearchIrlQueryVariables, irlJourneyOption: IrlTicket): Promise<boolean>;
     updateLowestPrice(results: IrlJourneyOptions[]): ICheapestPrice;
     findCheapestTicket(results: IrlJourneyOptions[]): number;
 }

package/base/lib/vendor/classes/lounges-enterprise-search.d.ts

@@ -51,6 +51,7 @@ export declare class LoungesEnterpriseSearch<LQ_Q extends LoungeQuoteFetcherType
     get arrivalDatetime(): moment.Moment;
     set arrivalDatetime(value: moment.Moment);
     protected resultsSessionName: string;
+    protected multiResultsSessionName: string;
     constructor(loungefetcher: BaseLoungeQuoteFetcher<LQ_Q>, helpers: BaseHelperRoutines, basketService: EnterpriseBasketServiceInterface, storageService: BaseStorageService, searchService: EnterpriseSearchServiceInterface);
     protected resetQuery(): void;
     getSearchQuery(): SearchLoungesQueryVariables;

package/base/lib/vendor/classes/parking-enterprise-search.d.ts

@@ -86,6 +86,7 @@ export declare class ParkingEnterpriseSearch<Q extends ParkingQuoteFetcherType>
     private travellers;
     constructor(parkingfetcher: BaseParkingQuoteFetcher<Q>, helpers: BaseHelperRoutines, basketService: EnterpriseBasketServiceInterface, storageService: BaseStorageService, searchService: EnterpriseSearchServiceInterface);
     protected resultsSessionName: string;
+    protected multiResultsSessionName: string;
     private _outdate;
     private _outtime;
     private _indate;

package/base/lib/vendor/classes/rail-enterprise-search.d.ts

@@ -35,6 +35,7 @@ export declare class RailEnterpriseSearch<Q extends RailQuoteFetcherType, GRS_Q
     static readonly PASSING_POINT = "Passing";
     private travellers;
     protected resultsSessionName: string;
+    protected multiResultsSessionName: string;
     searchTypes: {
         display: string;
         value: RailJourneyType;

package/base/lib/vendor/fetchers/conferma-office.fetcher.d.ts

@@ -0,0 +1,20 @@
+import { ApolloQueryResult } from '@apollo/client/core';
+import { BaseModalOpenerService } from '../services/modal-opener.service';
+import { Observable } from 'rxjs';
+import { ConfermaOfficeResult } from '../types/types';
+import { GetConfermaOfficeQuery, GetConfermaOfficeQueryVariables } from '../types/graphql.types';
+import { FetchableObject } from './object-fetchable-enterprise';
+declare type R = {
+    getConfermaOffice: P;
+};
+declare type P = ConfermaOfficeResult;
+declare type A = GetConfermaOfficeQueryVariables;
+declare type M = GetConfermaOfficeQuery;
+export declare type ConfermaOfficeFetcherType = {
+    fetch: (a: A) => Observable<ApolloQueryResult<M>>;
+};
+export declare class BaseConfermaOfficeFetcher<Q extends ConfermaOfficeFetcherType> extends FetchableObject<Q, A, R, P, M> {
+    constructor(getUserAddressGQL: Q, modalService: BaseModalOpenerService);
+    protected getDataFromResult(results: ApolloQueryResult<R>): P;
+}
+export {};

package/base/lib/vendor/fetchers/irl-quote-fetcher.d.ts

@@ -6,7 +6,7 @@ import { Observable } from 'rxjs';
 import { IrlQuoteResultArray } from '../types/types';
 import { SearchIrlQuery, SearchIrlQueryVariables } from '../types/graphql.types';
 declare type R = {
-    searchIrl: {
+    searchIRL: {
         results: P;
     };
 };

package/base/lib/vendor/fetchers/search-irl-stations.fetcher.d.ts

@@ -0,0 +1,20 @@
+import { ApolloQueryResult } from '@apollo/client/core';
+import { BaseHelperRoutines } from '../classes/helpers';
+import { FetchableList } from './list-fetchable-enterprise';
+import { BaseModalOpenerService } from '../services/modal-opener.service';
+import { Observable } from 'rxjs';
+import { SearchIrlSupplierStationsQuery, SearchIrlSupplierStationsQueryVariables, IrlSupplierStation } from '../types/graphql.types';
+declare type R = {
+    searchIRLSupplierStations: P;
+};
+declare type P = IrlSupplierStation[];
+declare type A = SearchIrlSupplierStationsQueryVariables;
+declare type M = SearchIrlSupplierStationsQuery;
+export declare type SearchIrlStationsFetcherType = {
+    fetch: (a: A) => Observable<ApolloQueryResult<M>>;
+};
+export declare class BaseSearchIrlStationsFetcher<Q extends SearchIrlStationsFetcherType> extends FetchableList<Q, A, R, P, M> {
+    constructor(gql: Q, helpers: BaseHelperRoutines, modalService: BaseModalOpenerService);
+    protected getDataFromResult(results: ApolloQueryResult<R>): P;
+}
+export {};

package/base/lib/vendor/interfaces/Icabhire-enterprise-search.d.ts

@@ -105,6 +105,7 @@ export interface CabHireEnterpriseSearchInterface extends BaseEnterpriseSearch<C
     cheapestPrice: ICheapestPrice;
     startSearch(): any;
     getSearchQuery(): SearchCabHireQueryVariables;
+    getReturnSearchQuery(): SearchCabHireQueryVariables;
     updateOutboundAddress(location: any, placeDescription?: string): void;
     updateInboundAddress(location: any, placeDescription?: string): void;
     matchAddresses(): void;

package/base/lib/vendor/interfaces/Ienterprise-basket.service.d.ts

@@ -48,7 +48,7 @@ export interface EnterpriseBasketServiceInterface {
     setMiSelectedValue(basketid: string, miItem: ManagementInfo, selectedValue: string, userId: string): void;
     getMiAutoSugestions(miId: string, partialLabel: string, isLoading: BehaviorSubject<boolean>): Observable<any>;
     saveMiData(basketId: string, bmiArray: BasketItemManagementInfo[]): void;
-    sendBasketForApproval(basketid: string): void;
+    sendBasketForApproval(basketid: string): Promise<void>;
     bookBasket(basketid: string, supplementaryInfo: SupplementaryBookingInfo[]): void;
     getBasket(query: {
         id: string;

package/base/lib/vendor/interfaces/Ieurostar-enterprise-search.d.ts

@@ -1,7 +1,6 @@
 import moment from 'moment';
 import { BehaviorSubject } from 'rxjs';
 import { FlightFilters } from './flight-filters.interface';
-import { SelectFilter } from './select-filter.interface';
 import { BasketItem, FareType, FlightCabinClass, FlightItinerary, SearchFlightsV2QueryVariables, ServiceType } from '../types/graphql.types';
 import { EurostarFare, EurostarItem, EurostarQuoteResult, EurostarQuoteResultArray, EurostarResults, FlightDirectionEnum, NgbDateStruct, OBTAirlinesDetails, OBTAirportDetails } from '../types/types';
 import { SortTypesEurostar } from '../classes/eurostar-enterprise-search';
@@ -76,46 +75,16 @@ export interface EurostarEnterpriseSearchInterface extends BaseEnterpriseSearch<
     chosenSearchType: EurostarSearchType;
     multiDestination: IMultiDestination[];
     displayAddHotel: boolean;
-    searchTypes: ValueDisplay[];
+    searchTypes: ValueDisplay<string>[];
+    filters: BehaviorSubject<FlightFilters>;
+    applyFilters(filters: FlightFilters, inbound: boolean): void;
     startSearch(): any;
     getSearchQuery(): SearchFlightsV2QueryVariables;
     sortResults(sortMethodValue: SortTypesEurostar, givenResults?: EurostarResults[]): void;
+    sortResultsFlightJourneys(sortMethodValue: SortTypesEurostar, inbound: boolean, givenResults?: FlightItinerary[]): FlightItinerary[];
     updateFromPreviousSearches(previousItems: Record<ServiceType, BasketItem>): void;
     getTotalBaggage(result: FlightItinerary): number;
     transformMin(min: number): string;
-    filterByDuration(minDuration: number, maxDuration: number, results: FlightItinerary[], isReturn?: boolean): {};
-    filterByDepartureTime(minDep: number, maxDep: number, results: FlightItinerary[]): {};
-    filterByReturnDepartureTime(minDep: number, maxDep: number, results: FlightItinerary[]): {};
-    filterByReturnArrivalTime(minArr: number, maxArr: number, results: FlightItinerary[]): {};
-    filterByArrivalTime(minArr: number, maxArr: number, results: FlightItinerary[]): {};
-    filterByBaggage(baggageFilters: SelectFilter[], results: FlightItinerary[]): {};
-    filterByPrice(minPrice: number, maxPrice: number, results: FlightItinerary[]): {};
-    filterResultsByStops(stopFilters: SelectFilter[], fullResults: FlightItinerary[]): {};
-    filterResultsByAirline(airlineFilters: SelectFilter[], results: FlightItinerary[]): {};
-    filterResultsByClass(classFilters: SelectFilter[], results: FlightItinerary[]): {};
-    filterByDepartureAirport(departureAirports: SelectFilter[], results: FlightItinerary[]): {};
-    filterByArrivalAirport(arrivalAirports: SelectFilter[], results: FlightItinerary[]): {};
-    filterByDepartureReturnAirport(departureAirports: SelectFilter[], results: FlightItinerary[]): {};
-    filterByArrivalReturnAirport(arrivalAirports: SelectFilter[], results: FlightItinerary[]): {};
-    createFilters(results: FlightItinerary[]): FlightFilters;
-    getMinDuration(results: FlightItinerary[], isReturn?: boolean): number;
-    getMaxDuration(results: FlightItinerary[], isReturn?: boolean): number;
-    getMinArrivalTime(results: FlightItinerary[]): number;
-    getMinReturnArrivalTime(results: FlightItinerary[]): number;
-    getMaxReturnArrivalTime(results: FlightItinerary[]): number;
-    getMaxArrivalTime(results: FlightItinerary[]): number;
-    getMinDepartureTime(results: FlightItinerary[]): number;
-    getMinReturnDepartureTime(results: FlightItinerary[]): number;
-    getMaxReturnDepartureTime(results: FlightItinerary[]): number;
-    getMaxDepartureTime(results: FlightItinerary[]): number;
-    getBaggage(results: FlightItinerary[]): {};
-    getMinPrice(results: FlightItinerary[]): number;
-    getMaxPrice(results: FlightItinerary[]): number;
-    getAllStops(results: FlightItinerary[]): {};
-    getAllClasses(results: FlightItinerary[]): {};
-    getAllDepartureAirports(results: FlightItinerary[], inbound?: boolean): {};
-    getAllArrivalAirports(results: FlightItinerary[], inbound?: boolean): {};
-    getAllAirlines(results: FlightItinerary[]): {};
     updateLowestPrice(results: EurostarResults[]): ICheapestPrice;
     resetParams(): void;
     selectGroupedEurostar(selectedFlight: EurostarItem, fare: EurostarFare, direction: FlightDirectionEnum): void;