@sabstravtech/obtservices 0.0.19020100 → 0.0.22041208

package/base/lib/vendor/fetchers/user-fetcher.d.ts

@@ -4,6 +4,7 @@ import { Observable } from 'rxjs';
 import { ApolloQueryResult } from '@apollo/client/core';
 import { GetUserQuery, GetUserQueryVariables } from '../types/graphql.types';
 import { GetUserResult } from '../types/types';
+import { BaseHelperRoutines } from '../classes/helpers';
 declare type A = GetUserQueryVariables;
 declare type R = {
     getUser: P;
@@ -14,7 +15,7 @@ export declare type SearchGetUserFetcherType = {
     fetch: (a: A) => Observable<ApolloQueryResult<M>>;
 };
 export declare class BaseGetUserFetcher<Q extends SearchGetUserFetcherType> extends FetchableObject<Q, A, R, P, M> {
-    constructor(getUserGQL: Q, modalService: BaseModalOpenerService);
+    constructor(getUserGQL: Q, modalService: BaseModalOpenerService, helpers: BaseHelperRoutines);
     protected getDataFromResult(results: ApolloQueryResult<R>): P;
 }
 export {};

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

@@ -1,6 +1,6 @@
 import moment from 'moment';
-import { BehaviorSubject, Subject } from 'rxjs';
-import { AddressForm, CabhireQuoteResultArray, KeyValue, NgbDateStruct, RailAirport } from '../types/types';
+import { BehaviorSubject, Observable, Subject } from 'rxjs';
+import { AddressForm, CabhireQuoteResultArray, KeyValue, NgbDateStruct, RailAirport, SaveFavouriteSearchResult } from '../types/types';
 import { BasketItem, CabHireLocation, LocationDetail, CabHireQuote, SearchCabHireQueryVariables, ServiceType, CabHireVehicleType } from '../types/graphql.types';
 import { BaseEnterpriseSearch } from '../classes/base-enterprise';
 import { ICheapestPrice } from './cheapest-price';
@@ -131,4 +131,5 @@ export interface CabHireEnterpriseSearchInterface extends BaseEnterpriseSearch<C
     addCabHireToBasket(cabHireQuote: CabHireQuote, cabHireQuery: SearchCabHireQueryVariables): any;
     updateLowestPrice(results: CabHireQuote[]): ICheapestPrice;
     resetParams(): void;
+    saveSearch(): Observable<SaveFavouriteSearchResult>;
 }

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

@@ -3,7 +3,7 @@ import { Observable, BehaviorSubject } from 'rxjs';
 import { CarHireFilters } from './car-hire-filters.interface';
 import { SelectFilter } from './select-filter.interface';
 import { BasketItem, CarHireClass, CarHireDetailRequestResponse, CarHireInputIdentifiers, CarHireTransmission, CarHireType, CarHireVehicleAvailibility, QuerySearchCarHireArgs, ServiceType, SearchCarHireQueryVariables } from '../types/graphql.types';
-import { CarHireDepot, CarHireQuoteResult, CarHireQuoteResultArray, LocationDetails, LocationTypes, NgbDateStruct, OBTAirportDetails } from '../types/types';
+import { CarHireDepot, CarHireQuoteResult, CarHireQuoteResultArray, LocationDetails, LocationTypes, NgbDateStruct, OBTAirportDetails, SaveFavouriteSearchResult } from '../types/types';
 import { BaseEnterpriseSearch } from '../classes/base-enterprise';
 import { ICheapestPrice } from './cheapest-price';
 import { ICarClasses } from './car-hire-classes.interface';
@@ -14,6 +14,7 @@ export interface CarHireTempParams {
     carType: CarHireType;
     children: number;
     chosenVendor: string;
+    chosenDistance: string;
     cityDropoff: LocationDetails;
     cityDropoffDepot: CarHireDepot;
     cityPickup: LocationDetails;
@@ -50,6 +51,7 @@ export interface CarhireEnterpriseSearchInterface extends BaseEnterpriseSearch<C
     dropoff_time: string;
     return_to_pickup: boolean;
     chosenVendor: string;
+    chosenDistance: string;
     carClass: CarHireClass;
     carType: CarHireType;
     transmission: CarHireTransmission;
@@ -96,4 +98,5 @@ export interface CarhireEnterpriseSearchInterface extends BaseEnterpriseSearch<C
     updateLowestPrice(results: CarHireQuoteResultArray): ICheapestPrice;
     getCarHireAvailabilityDetail(locationDetails: CarHireInputIdentifiers, isLoading: BehaviorSubject<boolean>): Observable<CarHireDetailRequestResponse>;
     addCarHireToBasket(carHireQuote: CarHireVehicleAvailibility, carHireQuery: SearchCarHireQueryVariables): Promise<boolean>;
+    saveSearch(): Observable<SaveFavouriteSearchResult>;
 }

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

@@ -35,7 +35,7 @@ export interface EnterpriseBasketServiceInterface {
     subsribeToBasket(id: string, observer: Observer<BasketDetails>): void;
     getLatestBasketItemForTypes(basketItems: BasketItem[]): any;
     getNumberItemsForBasket(basket: InternalBasketInterface): number;
-    removeBasket(basketid: string): any;
+    removeBasket(basketid: string): Observable<unknown>;
     removeExpiredItems(id: string): void;
     continueSearchAndBook(basketItems: any[], itiniaryUrl: string[], searchService: EnterpriseSearchServiceInterface): {};
     addTravellers(basketid: string, basketItem: BasketItem, travellers: Traveller[], index: number): void;
@@ -49,10 +49,11 @@ export interface EnterpriseBasketServiceInterface {
     getMiAutoSugestions(miId: string, partialLabel: string, isLoading: BehaviorSubject<boolean>): Observable<any>;
     saveMiData(basketId: string, bmiArray: BasketItemManagementInfo[]): void;
     sendBasketForApproval(basketid: string): Promise<void>;
-    bookBasket(basketid: string, supplementaryInfo: SupplementaryBookingInfo[]): void;
+    bookBasket(basketid: string, supplementaryInfo: SupplementaryBookingInfo[]): Promise<void>;
     getBasket(query: {
+        convertCurrencyTo: string;
         id: string;
-        withSupplemental: true;
+        withSupplemental: boolean;
     }): Observable<GetUserBasketResult>;
     reset(): void;
     atLeastOneSearchChosen(): boolean;

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

@@ -1,8 +1,8 @@
 import moment from 'moment';
-import { BehaviorSubject } from 'rxjs';
+import { BehaviorSubject, Observable } from 'rxjs';
 import { FlightFilters } from './flight-filters.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 { EurostarFare, EurostarItem, EurostarQuoteResult, EurostarQuoteResultArray, EurostarResults, FlightDirectionEnum, NgbDateStruct, OBTAirlinesDetails, OBTAirportDetails, SaveFavouriteSearchResult } from '../types/types';
 import { SortTypesEurostar } from '../classes/eurostar-enterprise-search';
 import { BaseEnterpriseSearch } from '../classes/base-enterprise';
 import { ICheapestPrice } from './cheapest-price';
@@ -55,6 +55,7 @@ export interface EurostarEnterpriseSearchInterface extends BaseEnterpriseSearch<
     readonly queryOriginAiport: string;
     readonly queryDestinationAiport: string;
     departDate: NgbDateStruct;
+    selectedFareClass: string;
     departTime: string;
     outBoundDate: any;
     returnDate: NgbDateStruct;
@@ -66,6 +67,7 @@ export interface EurostarEnterpriseSearchInterface extends BaseEnterpriseSearch<
     outTimeCriteria: TimeWindow;
     inTimeCriteria: TimeWindow;
     readonly sortDropdownValues: {};
+    readonly sortDropdownValuesLu: {};
     readonly fareTypesValues: {};
     fareType: FareType;
     negotiated: boolean;
@@ -77,10 +79,10 @@ export interface EurostarEnterpriseSearchInterface extends BaseEnterpriseSearch<
     displayAddHotel: boolean;
     searchTypes: ValueDisplay<string>[];
     filters: BehaviorSubject<FlightFilters>;
-    applyFilters(filters: FlightFilters, inbound: boolean): void;
+    applyFilters(filters: FlightFilters): void;
     startSearch(): any;
     getSearchQuery(): SearchFlightsV2QueryVariables;
-    sortResults(sortMethodValue: SortTypesEurostar, givenResults?: EurostarResults[]): void;
+    sortResults(sortMethodValue: SortTypesEurostar, dir: boolean, givenResults?: EurostarResults[]): void;
     sortResultsFlightJourneys(sortMethodValue: SortTypesEurostar, inbound: boolean, givenResults?: FlightItinerary[]): FlightItinerary[];
     updateFromPreviousSearches(previousItems: Record<ServiceType, BasketItem>): void;
     getTotalBaggage(result: FlightItinerary): number;
@@ -90,4 +92,6 @@ export interface EurostarEnterpriseSearchInterface extends BaseEnterpriseSearch<
     selectGroupedEurostar(selectedFlight: EurostarItem, fare: EurostarFare, direction: FlightDirectionEnum): void;
     isOverNight(): boolean;
     addEurostarJourneysToBasket(selectedFlight: FlightItinerary): void;
+    saveSearch(): Observable<SaveFavouriteSearchResult>;
+    convertRecentSearchDateTime(date: string, timeWindow?: string): moment.Moment;
 }

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

@@ -1,13 +1,17 @@
 import moment from 'moment';
-import { BehaviorSubject } from 'rxjs';
+import { BehaviorSubject, Observable } from 'rxjs';
 import { FlightFilters } from './flight-filters.interface';
-import { BasketItem, FareType, FlightCabinClass, FlightItinerary, SearchFlightsV2QueryVariables, ServiceType } from '../types/graphql.types';
-import { FlightAllQuoteResult, FlightDirectionEnum, FlightQuoteResultArray, NgbDateStruct, OBTAirlinesDetails, OBTAirportDetails } from '../types/types';
+import { BasketItem, FareType, FlightCabinClass, FlightItinerary, FlightJourney, SearchFlightsV2QueryVariables, ServiceType, FareConditions } from '../types/graphql.types';
+import { FlightAllQuoteResult, FlightDirectionEnum, FlightQuoteResultArray, NgbDateStruct, OBTAirlinesDetails, OBTAirportDetails, SaveFavouriteSearchResult } from '../types/types';
 import { FlightSortTypes, TimeWindow } from '../classes/flight-enterprise-search';
 import { BaseEnterpriseSearch } from '../classes/base-enterprise';
 import { ICheapestPrice } from './cheapest-price';
 import { IMultiDestination } from './flight-multi-destination.interface';
 import { FlightSearchType } from '../classes/flight-search-type.enum';
+export declare enum FlightDisplayTypes {
+    returns = 1,
+    dualSingles = 2
+}
 export declare const DEFAULT_FLIGHT_FILTERS: FlightFilters;
 export interface FlightTempParams {
     adults: number;
@@ -76,12 +80,19 @@ export interface FlightEnterpriseSearchInterface extends BaseEnterpriseSearch<Fl
     showHotelForm: boolean;
     hotelSearchRequested: boolean;
     filters: BehaviorSubject<FlightFilters>;
+    duralSingleFilter: BehaviorSubject<FlightFilters>;
+    choosenDisplayType: BehaviorSubject<FlightDisplayTypes>;
+    setFlightDisplayType(displayType: FlightDisplayTypes): void;
     startSearch(): any;
     getSearchQuery(): SearchFlightsV2QueryVariables;
     updateFromPreviousSearches(previousItems: Record<ServiceType, BasketItem>): void;
     getTotalBaggage(result: FlightItinerary): number;
     applyFilters(filters: FlightFilters, sortValue: FlightSortTypes): void;
     resetParams(): void;
-    selectGroupedFlight(selectedFlight: FlightItinerary, direction: FlightDirectionEnum): void;
+    selectGroupedFlight(selectedFlight: FlightItinerary, direction: FlightDirectionEnum, groupId?: number): void;
     addFlightJourneysToBasket(selectedFlight: FlightItinerary): void;
+    getMinFlightPriceForBrand(matchingBrandFlights: FlightItinerary[]): number;
+    openFlightFareRules(rules: FareConditions, flights: FlightJourney[]): void;
+    saveSearch(): Observable<SaveFavouriteSearchResult>;
+    convertRecentSearchDateTime(date: string, timeWindow?: string): moment.Moment;
 }

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

@@ -1,6 +1,6 @@
 import { BehaviorSubject, Observable, Subject } from 'rxjs';
 import moment from 'moment';
-import { Country, HotelQuoteResult, HotelQuoteResultArray, LocationTypes, MinMax, NgbDateStruct, LocationDetails, BreatfastTypes } from '../types/types';
+import { Country, HotelQuoteResult, HotelQuoteResultArray, LocationTypes, MinMax, NgbDateStruct, LocationDetails, BreatfastTypes, HotelDetailsArray, SaveFavouriteSearchResult } from '../types/types';
 import { BasketItem, ConfermaOfficeNames, HotelLocation, HotelRoom, HotelTag, SearchHotelsQueryVariables, ServiceType } from '../types/graphql.types';
 import { BaseEnterpriseSearch } from '../classes/base-enterprise';
 import { ICheapestPrice } from './cheapest-price';
@@ -22,24 +22,6 @@ export interface HotelTempParams {
     trainsStation: LocationDetails;
     office: ConfermaOfficeNames;
 }
-export declare type HotelDetails = HotelQuoteResult & {
-    sortedTags?: HotelTag[];
-    Details: {
-        distance_airport: number;
-        airport_details: {
-            name: string;
-        };
-        distance_metro: number;
-        metro_details: {
-            name: string;
-        };
-        distance_rail: number;
-        rail_details: {
-            name: string;
-        };
-    };
-};
-export declare type HotelDetailsArray = HotelDetails[];
 export interface DisplayFilterSettings {
     minprice: number;
     maxprice: number;
@@ -156,8 +138,10 @@ export interface HotelEnterpriseSearchInterface extends BaseEnterpriseSearch<Hot
     country: Country;
     trainsStation: LocationDetails;
     office: ConfermaOfficeNames;
+    postcode: LocationDetails;
     hotel_name: string;
     hotel_chain: string;
+    currency: string;
     readonly max_rooms_array: {};
     readonly max_occupant_array: {};
     readonly distance_list: {};
@@ -169,8 +153,8 @@ export interface HotelEnterpriseSearchInterface extends BaseEnterpriseSearch<Hot
     };
     sortTags(tags: HotelTag[]): {};
     startSearch(): any;
-    getSearchQuery(): SearchHotelsQueryVariables;
-    buildQuery(): void;
+    getSearchQuery(ogSearch?: boolean): SearchHotelsQueryVariables;
+    buildQuery(ogSearch: boolean): void;
     makeHotelAvalilityObject(hotel: HotelQuoteResult): AvailabilityObject;
     byMostExpensive(): void;
     sortByPrice(min?: boolean, debug?: boolean): void;
@@ -187,6 +171,8 @@ export interface HotelEnterpriseSearchInterface extends BaseEnterpriseSearch<Hot
     addPaginationPage(currentPage: number): any;
     toggleView(): void;
     calcDayDiff(): number;
-    updateLowestPrice(results: HotelDetails[]): ICheapestPrice;
+    updateLowestPrice(results: HotelDetailsArray): ICheapestPrice;
     addHotelRoomToBasket(hotelQuoteResult: HotelQuoteResult, hotelRoom: HotelRoom, hotelQuery: SearchHotelsQueryVariables, travellers?: Traveller[]): Promise<boolean>;
+    resultsHaveTag(searchTag: string): boolean;
+    saveSearch(): Observable<SaveFavouriteSearchResult>;
 }

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

@@ -1,12 +1,11 @@
 import moment from 'moment';
-import { NgbDateStruct, IrlQuoteResultArray } from '../types/types';
-import { BasketItem, IrlClass, IrlJourneyOptions, IrlJourneyType, IrlTicketOption, SearchIrlQueryVariables, ServiceType, IrlSupplier, IrlTicket } from '../types/graphql.types';
-import { IrlSearchCriteria } from '../classes/irl-enterprise-search';
+import { NgbDateStruct, IrlQuoteResultArray, IrlTicketOptionWithSelected, SaveFavouriteSearchResult } from '../types/types';
+import { BasketItem, IrlClass, IrlJourneyOption, IrlJourneyOptions, IrlJourneyType, IrlTicketOption, SearchIrlQueryVariables, ServiceType, IrlSupplier, IrlTravelCard } from '../types/graphql.types';
 import { BaseEnterpriseSearch } from '../classes/base-enterprise';
 import { ICheapestPrice } from './cheapest-price';
+import { Observable } from 'rxjs';
 export interface IrlTempParams {
-    returnCriteria: IrlSearchCriteria;
-    outboundCriteria: IrlSearchCriteria;
+    irlDiscountCards: IrlTravelCard;
     supplier: IrlSupplier;
     countryCode: string;
     class: IrlClass;
@@ -21,7 +20,6 @@ export interface IrlTempParams {
 export interface IRLEnterpriseSearchInterface extends BaseEnterpriseSearch<IrlTempParams, IrlQuoteResultArray, IrlQuoteResultArray>, IrlTempParams {
     searchTypes: {};
     classTypes: {};
-    irlCriteria: {};
     travelCards: {};
     type: ServiceType;
     minOutboundDate: NgbDateStruct;
@@ -31,22 +29,29 @@ export interface IRLEnterpriseSearchInterface extends BaseEnterpriseSearch<IrlTe
     noOfChildren: number;
     travellingTo: any;
     travellingFrom: any;
+    discountCard: IrlTravelCard;
+    irlDiscountCardsArray: IrlTravelCard[];
+    offline: boolean;
     outBoundDateTime: moment.Moment;
-    outboundCriteria: IrlSearchCriteria;
     outbound_date: NgbDateStruct;
     outbound_time: string;
     return_date: NgbDateStruct;
     return_time: string;
-    returnCriteria: IrlSearchCriteria;
     readonly timeArray: {};
     cheapestStandard: IrlTicketOption;
     cheapestFirst: IrlTicketOption;
-    cheapestPrice: ICheapestPrice;
     originalUserSearch: IrlTempParams;
+    outboundTicket: IrlTicketOptionWithSelected;
     startSearch(): any;
     getSearchQuery(): SearchIrlQueryVariables;
     updateFromPreviousSearches(previousItems: Record<ServiceType, BasketItem>): void;
-    addSingleJourneyToBasket(serviceId: string, railQuery: SearchIrlQueryVariables, railJourneyOption: IrlTicket): Promise<boolean>;
+    addSingleJourneyToBasket(serviceId: string, irlQuery: SearchIrlQueryVariables, irlTicketOption: IrlTicketOption, irlJourneyOption: IrlJourneyOption): Promise<boolean>;
+    addReturnJourneyToBasket(serviceId: string, irlQuery: SearchIrlQueryVariables, inTicketOption: IrlTicketOption, inJourneyOption: IrlJourneyOption): Promise<boolean>;
     updateLowestPrice(results: IrlJourneyOptions[]): ICheapestPrice;
     findCheapestTicket(results: IrlJourneyOptions[]): number;
+    sortByPrice(): void;
+    sortByDate(): void;
+    filterSelected(filterOutbound?: boolean): void;
+    addOutboundAndFilter(ticket: IrlTicketOptionWithSelected, fullTicket: IrlJourneyOption): void;
+    saveSearch(): Observable<SaveFavouriteSearchResult>;
 }

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

@@ -1,7 +1,7 @@
 import moment from 'moment';
 import { BaseEnterpriseSearch } from '../classes/base-enterprise';
-import { BehaviorSubject } from 'rxjs';
-import { LoungeQuoteResultArray, NgbDateStruct, OBTAirportDetails } from '../types/types';
+import { BehaviorSubject, Observable } from 'rxjs';
+import { LoungeQuoteResultArray, NgbDateStruct, OBTAirportDetails, SaveFavouriteSearchResult } from '../types/types';
 import { BasketItem, LoungeQuote, SearchLoungesQueryVariables, ServiceType } from '../types/graphql.types';
 import { ICheapestPrice } from './cheapest-price';
 export interface LoungesTempParams {
@@ -22,6 +22,7 @@ export interface LoungesEnterpriseSearchInterface extends BaseEnterpriseSearch<L
     locationCode: string | OBTAirportDetails;
     terminal: string;
     selectedTerminal: string;
+    arrivalDatetime: moment.Moment;
     date: NgbDateStruct;
     time: string;
     cheapestPrice: ICheapestPrice;
@@ -33,4 +34,5 @@ export interface LoungesEnterpriseSearchInterface extends BaseEnterpriseSearch<L
     updateFromPreviousSearches(previousItems: Record<ServiceType, BasketItem>): void;
     addLoungeToBasket(loungeQuote: LoungeQuote, loungeQuery: SearchLoungesQueryVariables): any;
     updateLowestPrice(results: LoungeQuote[]): ICheapestPrice;
+    saveSearch(): Observable<SaveFavouriteSearchResult>;
 }

package/base/lib/vendor/interfaces/Imybookings.service.d.ts

@@ -1,5 +1,5 @@
 import { BehaviorSubject, Observable } from 'rxjs';
-import { UserBasketResult } from '../types/types';
+import { CancelUserBookingResult, UserBasketResult } from '../types/types';
 import { QueryGetUserBasketsArgs } from '../types/graphql.types';
 import { BasketItem, BasketItemStatus, BasketStatus, ServiceType, User } from '../types/graphql.types';
 import { EnterpriseSearchServiceInterface } from '../interfaces/Isearch.service';
@@ -21,4 +21,5 @@ export interface EnterpriseMyBookingsServiceInterface {
     getHotelLocation(hotelAddress: {
         [key: string]: string;
     }): string;
+    cancelBooking(basketItemId: string): Observable<CancelUserBookingResult>;
 }

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

@@ -1,6 +1,6 @@
 import moment from 'moment';
-import { BehaviorSubject } from 'rxjs';
-import { NgbDateStruct, OBTAirportDetails, ParkingQuoteResultArray, ParkingFiltersInterface } from '../types/types';
+import { BehaviorSubject, Observable } from 'rxjs';
+import { NgbDateStruct, OBTAirportDetails, ParkingQuoteResultArray, ParkingFiltersInterface, SaveFavouriteSearchResult } from '../types/types';
 import { BasketItem, ParkingQuote, SearchParkingQueryVariables, ServiceType } from '../types/graphql.types';
 import { BaseEnterpriseSearch } from '../classes/base-enterprise';
 import { ICheapestPrice } from './cheapest-price';
@@ -55,4 +55,5 @@ export interface ParkingEnterpriseSearchInterface extends BaseEnterpriseSearch<P
     updateFromPreviousSearches(previousItems: Record<ServiceType, BasketItem>): void;
     addParkingToBasket(parkingQuote: ParkingQuote, parkingQuery: SearchParkingQueryVariables): any;
     updateLowestPrice(results: ParkingQuote[]): ICheapestPrice;
+    saveSearch(): Observable<SaveFavouriteSearchResult>;
 }

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

@@ -1,16 +1,15 @@
 import moment from 'moment';
 import { Observable, BehaviorSubject } from 'rxjs';
-import { RailTicketGroups } from './rail-ticket-groups.interface';
-import { RailTicketGroup } from './rail-ticket-group.interface';
-import { NgbDateStruct, RailQuoteResultArray, RecentSearch, RecursivePartial } from '../types/types';
-import { BasketItem, RailClass, RailJourneyOption, RailJourneyOptions, RailJourneyType, RailSegment, RailStation, RailTicketOption, ReferenceRailCardQualifier, SearchRailQueryVariables, ServiceType } from '../types/graphql.types';
+import { CheapestRailClassPrices, CheapestRailPrices, NgbDateStruct, OBTRailFareTypes, OBTRailJourneyFare, OBTRailJourneyOption, OBTRailQuoteResultArray, RailQuoteResultArray, RecentSearch, SaveFavouriteSearchResult } from '../types/types';
+import { BasketItem, RailClass, RailJourneyOption, RailSearchJourneyType, RailStation, ReferenceRailCardQualifier, SearchRailQueryVariables, ServiceType } from '../types/graphql.types';
 import { RailSearchCriteria } from '../classes/rail-enterprise-search';
 import { BaseEnterpriseSearch } from '../classes/base-enterprise';
 import { CodeName } from './code-name';
 import { ICheapestPrice } from './cheapest-price';
 import { IRailAirportExpressStations } from './rail-airport-express-stations.interface';
+import { RailDirection } from '../classes/rail-direction.enum';
 export interface RailTempParams {
-    chosenSearchType: RailJourneyType;
+    chosenSearchType: RailSearchJourneyType;
     chosenSearchClass: RailClass;
     noOfAdults: number;
     noOfChildren: number;
@@ -29,10 +28,14 @@ export interface RailTempParams {
     applyRailcards: boolean;
     airportExpressStation: string;
     isAirportExpress: boolean;
-    openReturn: boolean;
     railCards: ReferenceRailCardQualifier[];
 }
-export interface RailEnterpriseSearchInterface extends BaseEnterpriseSearch<RailTempParams, RailQuoteResultArray, RailQuoteResultArray>, RailTempParams {
+export interface RailEnterpriseSearchInterface extends BaseEnterpriseSearch<RailTempParams, RailQuoteResultArray, OBTRailQuoteResultArray>, RailTempParams {
+    cheapest: BehaviorSubject<{
+        outboundCheapest: CheapestRailPrices;
+        inboundCheapest: CheapestRailPrices;
+        cheapestClassTicket: CheapestRailClassPrices;
+    }>;
     searchTypes: {};
     classTypes: {};
     airportExpressStations: IRailAirportExpressStations[];
@@ -47,12 +50,8 @@ export interface RailEnterpriseSearchInterface extends BaseEnterpriseSearch<Rail
     type: ServiceType;
     minOutboundDate: NgbDateStruct;
     minInboundDate: NgbDateStruct;
-    readonly chosenTotalPrice: number;
-    readonly chosenTickets: any;
-    readonly chosenOutboundJourney: RecursivePartial<RailJourneyOption>;
-    readonly chosenInboundJourney: RecursivePartial<RailJourneyOption>;
-    openReturn: boolean;
-    chosenSearchType: RailJourneyType;
+    bookRailFromLive: boolean;
+    chosenSearchType: RailSearchJourneyType;
     noOfAdults: number;
     noOfChildren: number;
     travellingTo: any;
@@ -74,15 +73,22 @@ export interface RailEnterpriseSearchInterface extends BaseEnterpriseSearch<Rail
     disableAutoDiscounts: boolean;
     prioritiseByPrice: boolean;
     applyRailcards: boolean;
+    openReturn: boolean;
     readonly timeArray: {};
     airportExpressStation: string;
     isAirportExpress: boolean;
-    cheapestStandard: RailTicketOption;
-    cheapestFirst: RailTicketOption;
     cheapestPrice: ICheapestPrice;
     originalUserSearch: RailTempParams;
     removePassingPointsFromResults: boolean;
-    chosenTicketGroup: RailTicketGroup;
+    selectedTicket: {
+        journey: any;
+        fare: OBTRailJourneyFare;
+    };
+    selectedInboundTicket: {
+        journey: any;
+        fare: OBTRailJourneyFare;
+    };
+    selectedSection: OBTRailFareTypes;
     getAirportExpressStations(): CodeName[];
     setAirportExpressStationIds(stationIds: {
         departureLocationId: string;
@@ -90,21 +96,15 @@ export interface RailEnterpriseSearchInterface extends BaseEnterpriseSearch<Rail
     }): void;
     startSearch(): any;
     startRecentSearch(recentSearch: RecentSearch): void;
-    getSearchQuery(): SearchRailQueryVariables;
-    createTicketGroups(results: RailJourneyOptions[]): RailTicketGroups;
+    getSearchQuery(tempParams: RailTempParams): SearchRailQueryVariables;
     updateFromPreviousSearches(previousItems: Record<ServiceType, BasketItem>): void;
-    updateCanCombine(tkt: RailTicketOption): void;
-    toggleTicketSelect(ticket: RailTicketGroup, way: 'departs' | 'returns', timeSlotId: string, ticketId: string, fareIdentifier: string, ticketsGroups: RailTicketGroups): RailTicketGroups;
-    canCombine(journeyIdentifier: string, fareIdentifier: string): boolean;
-    clearUnneededTickets(way: string, group: RailTicketGroup, timeSlotId: string): RailTicketGroup;
+    selectTicket(direction: 'outbound' | 'inbound', jounery: OBTRailJourneyOption, fare: OBTRailJourneyFare, sourceId: string, section: OBTRailFareTypes): Promise<void>;
+    selectTicketNoAdd(direction: RailDirection, jounery: OBTRailJourneyOption, fare: OBTRailJourneyFare, sourceId: string, section: OBTRailFareTypes): Promise<void>;
     getRailStation(code: string, isLoading?: BehaviorSubject<boolean>): Observable<RailStation>;
-    getLegsFromRailJourneyOption(railJourneyOption: RailJourneyOption): any[];
-    getSelectedRailTicketOption(railJourneyOption: RailJourneyOption, railTicketGroup: RailTicketGroup, providerIndex: number): RailTicketOption;
-    addSingleJourneyToBasket(serviceId: string, railQuery: SearchRailQueryVariables, railJourneyOption: RailJourneyOption, railTicketGroup: RailTicketGroup): Promise<boolean>;
-    addReturnJourneyToBasket(serviceId: string, railQuery: SearchRailQueryVariables, outboundRailJourneyOption: RailJourneyOption, inboundRailJourneyOption: RailJourneyOption, railTicketGroup: RailTicketGroup): Promise<boolean>;
-    updateLowestPrice(results: RailJourneyOptions[]): ICheapestPrice;
-    findCheapestTicket(results: RailJourneyOptions[]): number;
-    calculateTimeDifferenceInMins(rail: RailJourneyOption | RailSegment): string;
-    ticketIsAnETicket(ticket: RailTicketOption): boolean;
-    clearChosenTickets(): void;
+    getLegsFromRailJourneyOption(railJourneyOption: OBTRailJourneyOption): any[];
+    calculateTimeDifferenceInMins(rail: RailJourneyOption): string;
+    applyFilter(): void;
+    addToBasket(sourceId: string, searchQuery: RailTempParams, journey: OBTRailJourneyOption, railFare: OBTRailJourneyFare, inboundRailFare?: OBTRailJourneyFare, inboundJourney?: OBTRailJourneyOption): Promise<boolean>;
+    saveSearch(): Observable<SaveFavouriteSearchResult>;
+    getCriteria(departureDateTime: string, arrivalDateTime: string): RailSearchCriteria;
 }

package/base/lib/vendor/interfaces/Isearch.service.d.ts

@@ -1,9 +1,10 @@
+import moment from 'moment';
 import { BehaviorSubject } from 'rxjs';
 import { Observable } from 'rxjs';
 import { SearchObject, SearchObjects } from './search-objects.interface';
-import { Address, BasketItem, ConfermaOfficeNames, ConfermaOfficeInfo, ReferenceRailCardQualifier, SaveRecentSearchMutationVariables, ServiceType } from '../types/graphql.types';
+import { Address, BasketItem, ConfermaOfficeNames, ConfermaOfficeInfo, ReferenceRailCardQualifier, SaveRecentSearchMutationVariables, ServiceType, InputFlightJourney, SaveFavouriteSearchMutationVariables } from '../types/graphql.types';
 import { Traveller } from '../models/traveller.object';
-import { AirportSearchResults, CountryCode, RecentSearch, TerminalsType } from '../types/types';
+import { AirportSearchResults, CountryCode, GetFlightFareRulesResult, GetUserFavouriteSearchesResultArray, SaveFavouriteSearchResult, SearchRailLiveDeparturesResult, TerminalsType } from '../types/types';
 import { LoungesEnterpriseSearchInterface, LoungesTempParams } from './Ilounges-enterprise-search';
 import { HotelEnterpriseSearchInterface, HotelTempParams } from './Ihotel-enterprise-search';
 import { ParkingEnterpriseSearchInterface, ParkingTempParams } from './Iparking-enterprise-search';
@@ -33,6 +34,7 @@ export interface EnterpriseSearchServiceInterface {
     travellerInformation: BehaviorSubject<Traveller[]>;
     shouldFetchAllOffices(): boolean;
     reset(): void;
+    resetAllSearchItems(): void;
     getAirportsList(term: string, countryCode?: CountryCode, isLoading?: BehaviorSubject<boolean>, hasLounge?: boolean, hasParking?: boolean, hasFastTrack?: boolean): Observable<{}>;
     getAirlinesList(term: string, isLoading?: BehaviorSubject<boolean>): Observable<{}>;
     getAirportLocations(term: string, countryCode: CountryCode, isLoading?: BehaviorSubject<boolean>, hasLounge?: boolean, hasParking?: boolean, hasFastTrack?: boolean): Observable<{}>;
@@ -72,7 +74,7 @@ export interface EnterpriseSearchServiceInterface {
     validateTravellers(): boolean;
     findPaxInTravellers(username: string): any;
     validateForms(): any;
-    startSearches(recentSearch?: RecentSearch): void;
+    startSearches(url?: string): void;
     getTaxiStationLocations(term: string, isLoading?: BehaviorSubject<boolean>): Observable<{}>;
     getAddresses(isLoading: BehaviorSubject<boolean>): Observable<{}>;
     getUserAddresses(isLoading: BehaviorSubject<boolean>): Observable<any>;
@@ -100,4 +102,11 @@ export interface EnterpriseSearchServiceInterface {
     shouldAddTravellerSubscription(): boolean;
     getAutoLogoutConfig(): any;
     getUserRecentSearches(serviceType?: ServiceType, isLoading?: BehaviorSubject<boolean>): Observable<{}>;
+    getCovidMicrositeToken(): Observable<string>;
+    getFlightFareRules(flight: InputFlightJourney): Observable<GetFlightFareRulesResult>;
+    getRailLiveDepartures(station: string, dateTime?: moment.Moment): Observable<SearchRailLiveDeparturesResult>;
+    canBook(search: ServiceType): boolean;
+    saveFavouriteSearch(search: SaveFavouriteSearchMutationVariables): Observable<SaveFavouriteSearchResult>;
+    getUserFavouriteSearches(serviceType?: ServiceType, isLoading?: BehaviorSubject<boolean>): Observable<GetUserFavouriteSearchesResultArray>;
+    deleteFavouriteSearchByID(id: string): Observable<void>;
 }

package/base/lib/vendor/interfaces/Iuser.service.d.ts

@@ -1,4 +1,4 @@
-import { BehaviorSubject } from 'rxjs';
+import { BehaviorSubject, Observable } from 'rxjs';
 import { Suppliers, UserFavorurite } from '../classes/user-favourite.enum';
 import { UserData } from './user.data';
 import { Traveller } from '../models/traveller.object';
@@ -21,6 +21,7 @@ export interface FullUserDetails {
     userServices: BehaviorSubject<UserServices>;
 }
 export interface UserServiceInterface {
+    getUserFavoriteObject<T>(uf: UserFavorurite): T;
     userHasServiceProvider(service: ServiceType, provider: ServiceProvider): boolean;
     fullUserDetails: FullUserDetails;
     changeUser: BehaviorSubject<FullUserDetails>;
@@ -56,4 +57,5 @@ export interface UserServiceInterface {
     isSelfBook(): boolean;
     isBooker(): boolean;
     findService(id: string): Service;
+    confirmMessages(id: string | string[]): Observable<boolean>;
 }

package/base/lib/vendor/interfaces/cab-hire-search-arg.interface.d.ts

@@ -0,0 +1,10 @@
+import { QuerySearchCabHireArgs } from "../types/graphql.types";
+import { AddressForm, RailAirport } from "../types/types";
+export interface ICabHireSearchArgs extends QuerySearchCabHireArgs {
+    fromAddress?: AddressForm;
+    toAddress?: AddressForm;
+    fromStation?: RailAirport;
+    toStation?: RailAirport;
+    viasFrom?: AddressForm;
+    viasTo?: AddressForm;
+}

package/base/lib/vendor/interfaces/car-hire-search-arg.interface.d.ts

@@ -0,0 +1,42 @@
+import { CarHireCityInput, InputCarHireDepot, QuerySearchCarHireArgs } from "../types/graphql.types";
+export declare type CarHireSearchArgs = Omit<QuerySearchCarHireArgs, 'city' | 'depot'> & {
+    city?: ICarHireCity;
+    depot?: ICarHireDepot;
+};
+interface ICarHireCity extends CarHireCityInput {
+    pickupName?: string;
+    pickupLatitude?: number;
+    pickupLongitude?: number;
+    dropOffName?: string;
+    dropOffLatitude?: number;
+    dropOffLongitude?: number;
+    pickupAddressLines?: string;
+    pickupCityName?: string;
+    pickupExtendedLocationCode?: string;
+    pickupLocationCode?: string;
+    pickupVendor?: string;
+    pickupVendorCode?: string;
+    chosenDistance?: string;
+    dropOffAddressLines?: string;
+    dropOffCityName?: string;
+    dropOffExtendedLocationCode?: string;
+    dropOffLocationCode?: string;
+    dropOffVendor?: string;
+    dropOffVendorCode?: string;
+}
+interface ICarHireDepot extends InputCarHireDepot {
+    pickupAddressLines?: string;
+    pickupCityName?: string;
+    pickupVendor?: string;
+    dropoffAddressLines?: string;
+    dropoffCityName?: string;
+    dropoffVendor?: string;
+    chosenDistance?: string;
+    pickupPostCode?: string;
+    pickupLatitude?: number;
+    pickupLongitude?: number;
+    dropoffPostCode?: string;
+    dropoffLatitude?: number;
+    dropoffLongitude?: number;
+}
+export {};

package/base/lib/vendor/interfaces/enable-fresh-chat-interface.d.ts

@@ -0,0 +1,7 @@
+export interface EnableFreshChat {
+    value: EnableFreshChatValue;
+}
+export interface EnableFreshChatValue {
+    enable: boolean;
+    token: string;
+}

package/base/lib/vendor/interfaces/eurostar-search-arg.interface.d.ts

@@ -0,0 +1,6 @@
+import { SearchFlightsV2QueryVariables } from "../types/graphql.types";
+import { OBTAirportDetails } from "../types/types";
+export interface IEurostarSearchArgs extends SearchFlightsV2QueryVariables {
+    departLocation?: string | OBTAirportDetails;
+    arriveLocation?: string | OBTAirportDetails;
+}

package/base/lib/vendor/interfaces/flight-filters.interface.d.ts

@@ -17,6 +17,7 @@ export interface FlightFilters {
     returnDepartureTime: MinMax;
     returnDuration: MinMax;
     stops: Record<number, SelectFilter>;
+    totalStops: Record<number, SelectFilter>;
     airlines: Record<string, SelectFilter>;
     classes: Record<string, SelectFilter>;
     flightNumber: string;

package/base/lib/vendor/interfaces/flight-search-args.interface.d.ts

@@ -0,0 +1,8 @@
+import { SearchFlightsV2QueryVariables } from '../types/graphql.types';
+import { OBTAirportDetails } from '../types/types';
+import { IMultiDestination } from './flight-multi-destination.interface';
+export interface IFlightSearchArgs extends SearchFlightsV2QueryVariables {
+    multiDestinationDetail?: IMultiDestination[];
+    departLocationDetail?: string | OBTAirportDetails;
+    arriveLocationDetail?: string | OBTAirportDetails;
+}

package/base/lib/vendor/interfaces/hotel-recent-search-args.interface.d.ts

@@ -1,4 +1,5 @@
 import { DistanceTypes } from "../types/graphql.types";
+import { LocationDetails, OBTAirportDetails } from "../types/types";
 export interface HotelRecentSearchArgs {
     startDate: string;
     endDate: string;
@@ -20,4 +21,7 @@ export interface HotelRecentSearchArgs {
     hotelName?: string;
     groupName?: string;
     location_type_select?: string;
+    officeName?: string;
+    trainsStationDetail?: LocationDetails;
+    airportDetail?: OBTAirportDetails;
 }

package/base/lib/vendor/interfaces/irl-search-arg.interface.d.ts

@@ -0,0 +1,5 @@
+import { SearchIrlQueryVariables } from "../types/graphql.types";
+export interface IIrlSearchArgs extends SearchIrlQueryVariables {
+    travellingFrom?: string;
+    travellingTo?: string;
+}