@sabstravtech/obtservices 0.2.2510281616 → 0.2.2511110930

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

@@ -151,7 +151,7 @@ export declare class HotelEnterpriseSearch<HQ_Q extends HotelQuoteFetcherType, H
     gmtSearch(query: SearchHotelsQueryVariables, locationDetails: LocationDetail): Observable<HotelDetails[]>;
     applyGMTTravelRules(availabilityObservables: HotelDetails[]): Observable<HotelDetails[]>;
     getRecentSearchQuery(query: SearchHotelsQueryVariables): SaveRecentSearchMutationVariables;
-    private updateSerchQuery;
+    private updateSearchQuery;
     startRecentSearch(recentSearch: RecentSearch): void;
     private getRailStationByCode;
     getSearchQuery(ogSearch?: boolean): SearchHotelsQueryVariables;

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

@@ -5,7 +5,6 @@ import { BasketItem, HotelRoom, HotelTag, SearchHotelsQueryVariables, ServiceTyp
 import { BaseEnterpriseSearch } from '../classes/base-enterprise';
 import { ICheapestPrice } from './cheapest-price';
 import { Traveller } from '../models/traveller.object';
-import { EventEmitter } from '@angular/core';
 export interface HotelTempParams {
     location_type_select: LocationTypes;
     checkin_date: moment.Moment;
@@ -75,7 +74,7 @@ export declare enum HotelDetailTypes {
 }
 export interface HotelViewController {
     showMap: boolean;
-    ratesUpdated: EventEmitter<boolean>;
+    ratesUpdated: Subject<boolean>;
     filterChange: any;
     hotelChosen: boolean;
     filtered: boolean;

package/base/lib/vendor/services/enterprise-basket.service.d.ts

@@ -56,7 +56,6 @@ import { BaseValidateBasketMiFetcher, ValidateBasketMiFetcher } from '../fetcher
 import { BaseValidateBasketItemMiFetcher, ValidateBasketItemMiFetcher } from '../fetchers/validate-basket-item-mi.fetcher';
 import { BaseSetMIValuesUpdater, SetMIValuesUpdater } from '../updaters/set-mi-values.updater';
 import { BaseStorageService } from './storage.service';
-import { EventEmitter } from '@angular/core';
 import { BaseBeforeAmendCabSearchQuoteFetcher, BeforeAmendCabSearchQuoteFetcherType } from '../fetchers/before-amend-cab-search-quote-fetcher';
 import { BaseSendBackToQueueUpdater, SendBackToQueueMutationType } from '../updaters/send-back-to-queue-updater';
 import { BaseGetBasketCo2InfoFetcher, GetBasketCo2FetcherInfoType } from '../fetchers/basket-co2.fetcher';
@@ -248,7 +247,7 @@ export declare abstract class BaseEnterpriseBasketService<ANPU_Q extends AcceptN
     basketList: BasketPricesList[];
     basketPrices: BehaviorSubject<BasketPrices>;
     menuState: MenuSlideEnum;
-    checkApproverModalClosed: EventEmitter<any>;
+    checkApproverModalClosed: Subject<any>;
     private requiresService;
     private requiresOverrideService;
     private userCurrency;

package/base/lib/vendor/types/types.d.ts

@@ -54,8 +54,8 @@ export interface LocationDetails {
     postcode?: string;
     gateway?: string;
     searchType?: string;
-    hotelTitle?: string;
     trainStationCode?: string;
+    hotelTitle?: string;
 }
 export interface Country {
     cCode: string;
@@ -992,22 +992,22 @@ export interface FavouriteGuest extends Guest {
 }
 export declare enum MealType {
     None = "None",
-    BLML = "Bland",
-    CHML = "Child",
-    DBML = "Diabetic",
+    VGML = "Vegetarian-Vegan",
+    VOML = "Asian Vegetarian",
+    RVML = "Raw Vegetarian/Vegan",
     FPML = "Fruit Plate",
-    GFML = "Gluten Free",
-    HNML = "Hindu",
+    SFML = "Seafood",
     KSML = "Kosher",
+    MOML = "Muslim",
+    HNML = "Hindu",
     LFML = "Low Fat/Cholesterol",
+    VLML = "Vegetarian Lacto-Ovo",
     LSML = "Low Sodium",
-    MOML = "Muslim",
+    GFML = "Gluten intolerant",
+    DBML = "Diabetic",
     NLML = "Non-Lactose",
-    RVML = "Raw Vegetarian/Vegan",
-    SFML = "Seafood",
-    VGML = "Vegetarian",
-    VLML = "Vegetarian Lacto-Ovo",
-    VOML = "Asian Vegetarian"
+    CHML = "Child",
+    BLML = "Bland"
 }
 export declare enum SpecialNeeds {
     None = "None",

package/fesm2022/sabstravtech-obtservices-base.mjs

@@ -6,7 +6,7 @@ import _, { uniq } from 'lodash';
 import Ajv from 'ajv';
 import addFormats from 'ajv-formats';
 import * as i0 from '@angular/core';
-import { EventEmitter, Injectable } from '@angular/core';
+import { Injectable } from '@angular/core';
 
 var ages;
 (function (ages) {
@@ -2851,7 +2851,7 @@ const PREFERENCE_VALUES$1 = [
     { label: "Child", type: PreferenceKey.MealRequest, code: "CHML" },
     { label: "Diabetic", type: PreferenceKey.MealRequest, code: "DBML" },
     { label: "Fruit Plate", type: PreferenceKey.MealRequest, code: "FPML" },
-    { label: "Gluten Free", type: PreferenceKey.MealRequest, code: "GFML" },
+    { label: "Gluten intolerant", type: PreferenceKey.MealRequest, code: "GFML" },
     { label: "Hindu", type: PreferenceKey.MealRequest, code: "HNML" },
     { label: "Kosher", type: PreferenceKey.MealRequest, code: "KSML" },
     { label: "Low Fat/Cholesterol", type: PreferenceKey.MealRequest, code: "LFML" },
@@ -2860,7 +2860,7 @@ const PREFERENCE_VALUES$1 = [
     { label: "Non-Lactose", type: PreferenceKey.MealRequest, code: "NLML" },
     { label: "Raw Vegetarian/Vegan", type: PreferenceKey.MealRequest, code: "RVML" },
     { label: "Seafood", type: PreferenceKey.MealRequest, code: "SFML" },
-    { label: "Vegetarian", type: PreferenceKey.MealRequest, code: "VGML" },
+    { label: "Vegetarian-Vegan", type: PreferenceKey.MealRequest, code: "VGML" },
     { label: "Vegetarian Lacto-Ovo", type: PreferenceKey.MealRequest, code: "VLML" },
     { label: "Asian Vegetarian", type: PreferenceKey.MealRequest, code: "VOML" },
     { label: "Aisle", type: PreferenceKey.SeatingPreference },
@@ -4626,22 +4626,22 @@ var ErmFareTypes;
 var MealType;
 (function (MealType) {
     MealType["None"] = "None";
-    MealType["BLML"] = "Bland";
-    MealType["CHML"] = "Child";
-    MealType["DBML"] = "Diabetic";
+    MealType["VGML"] = "Vegetarian-Vegan";
+    MealType["VOML"] = "Asian Vegetarian";
+    MealType["RVML"] = "Raw Vegetarian/Vegan";
     MealType["FPML"] = "Fruit Plate";
-    MealType["GFML"] = "Gluten Free";
-    MealType["HNML"] = "Hindu";
+    MealType["SFML"] = "Seafood";
     MealType["KSML"] = "Kosher";
+    MealType["MOML"] = "Muslim";
+    MealType["HNML"] = "Hindu";
     MealType["LFML"] = "Low Fat/Cholesterol";
+    MealType["VLML"] = "Vegetarian Lacto-Ovo";
     MealType["LSML"] = "Low Sodium";
-    MealType["MOML"] = "Muslim";
+    MealType["GFML"] = "Gluten intolerant";
+    MealType["DBML"] = "Diabetic";
     MealType["NLML"] = "Non-Lactose";
-    MealType["RVML"] = "Raw Vegetarian/Vegan";
-    MealType["SFML"] = "Seafood";
-    MealType["VGML"] = "Vegetarian";
-    MealType["VLML"] = "Vegetarian Lacto-Ovo";
-    MealType["VOML"] = "Asian Vegetarian";
+    MealType["CHML"] = "Child";
+    MealType["BLML"] = "Bland";
 })(MealType || (MealType = {}));
 var SpecialNeeds;
 (function (SpecialNeeds) {
@@ -5046,17 +5046,20 @@ class BookableBasket {
             });
         }
         else {
-            const approvalInfo = await firstValueFrom(this.basketService.getBasketApprovalInfo(this.basket.value.id));
-            if (isSelectedNotifyApprover || isSelectedApprover || !approvalInfo.requiresApproverSelection) {
+            // const approvalInfo: BasketApprovalInfo = await firstValueFrom(this.basketService.getBasketApprovalInfo(this.basket.value.id));
+            // if (isSelectedNotifyApprover || isSelectedApprover || !approvalInfo.requiresApproverSelection) {
+            if (isSelectedNotifyApprover || isSelectedApprover) {
                 this.basketService
                     .getApproversList()
                     .subscribe(async ([officeApprovers, userApprovers]) => {
                     const approvers = (officeApprovers || []).concat(userApprovers || []);
-                    await this.handleApprovers(approvers, isSelectedApprover, isSelectedNotifyApprover, false, false, approvalInfo.rulesRequiringSelection);
+                    // await this.handleApprovers(approvers, isSelectedApprover, isSelectedNotifyApprover, false, false, approvalInfo.rulesRequiringSelection);
+                    await this.handleApprovers(approvers, isSelectedApprover, isSelectedNotifyApprover, false, false);
                 });
             }
             else {
-                await this.handleApprovers([], isSelectedApprover, isSelectedNotifyApprover, false, false, approvalInfo.rulesRequiringSelection);
+                // await this.handleApprovers([], isSelectedApprover, isSelectedNotifyApprover, false, false, approvalInfo.rulesRequiringSelection);
+                await this.handleApprovers([], isSelectedApprover, isSelectedNotifyApprover, false, false);
             }
         }
     }
@@ -6491,6 +6494,13 @@ class BaseHelperRoutines {
             const outStops = result1.outboundFlights.length - 1;
             const isDirect = outStops === 0 || (isMultiCity && outStops === multiDestination - 1);
             const multiStops = isMultiCity && outStops > multiDestination - 1 ? outStops - (multiDestination - 1) : 0;
+            if (result1.source.toUpperCase().includes('NDC')) {
+                filters.ndcFares['NDC'] = {
+                    display: "NDC",
+                    selected: false,
+                    value: "NDC"
+                };
+            }
             filters.stops[outStops] = filters.stops[outStops] || {
                 display: isDirect
                     ? 'Direct'
@@ -10787,13 +10797,7 @@ const DEFAULT_FLIGHT_FILTERS = Object.freeze({
     flightNumber: '',
     inboundFlightNumber: '',
     privateFares: {},
-    ndcFares: {
-        "NDC": {
-            display: "NDC",
-            selected: false,
-            value: "NDC"
-        }
-    }
+    ndcFares: {}
 });
 
 var FlightSearchType;
@@ -16591,7 +16595,7 @@ class HotelEnterpriseSearch extends BaseEnterpriseSearch {
         }));
     }
     getRecentSearchQuery(query) {
-        const recentSearchQuery = this.updateSerchQuery(query);
+        const recentSearchQuery = this.updateSearchQuery(query);
         return {
             serviceType: ServiceType.Hotel,
             searchArgs: recentSearchQuery,
@@ -16599,7 +16603,7 @@ class HotelEnterpriseSearch extends BaseEnterpriseSearch {
             travellers: this.helpers.getTravellersId(this.travellers, this.userService.bobo?.id)
         };
     }
-    updateSerchQuery(query) {
+    updateSearchQuery(query) {
         const searchQuery = query;
         searchQuery.location_type_select = this.location_type_select;
         if (this.location?.name && this.location?.type !== LocationTypes.Hotel) {
@@ -16692,6 +16696,14 @@ class HotelEnterpriseSearch extends BaseEnterpriseSearch {
                         query.longitude = tempParams.location.longitude;
                         query.hotelName = tempParams.location.hotelTitle;
                         query.countryCode = tempParams.location.countryCode;
+                        // Use location name as fallback for hotel name if hotel_name field is empty (for recent searches)
+                        if (!tempParams.hotel_name && tempParams.location?.name && !query.hotelName) {
+                            query.hotelName = tempParams.location.name;
+                        }
+                        // Also set cityName if location has city property
+                        if (tempParams.location?.city) {
+                            query.cityName = tempParams.location.city;
+                        }
                         break;
                     case LocationTypes.TrainStation:
                         if (tempParams.location.latitude && tempParams.location.longitude) {
@@ -17862,7 +17874,7 @@ class HotelEnterpriseSearch extends BaseEnterpriseSearch {
     saveSearch(name, hotelName = null) {
         if (this.isFavouriteValid.value) {
             const query = this.getSearchQuery();
-            const favouriteSearchQuery = this.updateSerchQuery(query);
+            const favouriteSearchQuery = this.updateSearchQuery(query);
             if (hotelName)
                 favouriteSearchQuery.hotelName = hotelName;
             const searchInfo = {
@@ -18009,11 +18021,11 @@ class HotelEnterpriseSearch extends BaseEnterpriseSearch {
         this.currency = query.currency;
         this.distance = query.distance;
         this.no_of_rooms = query.rooms;
-        this.hotel_name = query.hotelName
-            ? query.hotelName
-            : cloneBasketItem
-                ? this.clonedBasketItemDetails.hotelName
-                : null;
+        // Don't populate hotel_name from recent search to avoid duplication with location field
+        // The hotel name will be used from location.name as fallback in buildQuery()
+        this.hotel_name = cloneBasketItem
+            ? this.clonedBasketItemDetails.hotelName
+            : null;
         this.hotel_chain = query.groupName ? { name: query.groupName } : null;
         this.country = query.countryCode
             ? (this.country = {
@@ -18037,7 +18049,9 @@ class HotelEnterpriseSearch extends BaseEnterpriseSearch {
         switch (this.location_type_select) {
             case LocationTypes.Address:
                 if (query.iata) {
-                    this.searchService.getAirportByCode(query.iata).subscribe((iata) => {
+                    this.searchService
+                        .getAirportByCode(query.iata)
+                        .subscribe((iata) => {
                         const { name } = iata.iataMatch;
                         this.location = { iata: query.iata, type: LocationTypes.Airport, name };
                         if (startSearch) {
@@ -18047,25 +18061,41 @@ class HotelEnterpriseSearch extends BaseEnterpriseSearch {
                 }
                 else {
                     if ((!query.cityName && !query.postOrZipCode) || query.trainStationCode) {
-                        const { trainStationCode, latitude, longitude } = query;
-                        this.location = { latitude, longitude, type: LocationTypes.TrainStation, name: trainStationCode };
+                        const { trainStationCode, latitude, longitude, hotelName } = query;
+                        const locationName = hotelName || query.cityName || trainStationCode;
+                        const locationType = hotelName ? LocationTypes.Hotel : LocationTypes.TrainStation;
+                        this.location = { latitude, longitude, type: locationType, name: locationName };
                         if (trainStationCode) {
                             this.location.stationCode = trainStationCode;
                         }
                     }
                     else if (!query.cityName && query.postOrZipCode) {
-                        const { postOrZipCode, latitude, longitude } = query;
-                        this.location = { postcode: postOrZipCode, latitude, longitude, type: LocationTypes.Hotel, name: postOrZipCode };
+                        const { postOrZipCode, latitude, longitude, hotelName } = query;
+                        this.location = {
+                            postcode: postOrZipCode,
+                            latitude,
+                            longitude,
+                            type: LocationTypes.Hotel,
+                            name: postOrZipCode || hotelName
+                        };
                     }
                     else {
-                        const { countryCode, cityName, postOrZipCode, latitude, longitude } = query;
-                        this.location = { countryCode, latitude, longitude, type: LocationTypes.City, name: cityName };
+                        const { countryCode, cityName, postOrZipCode, latitude, longitude, hotelName } = query;
+                        const locationName = hotelName || cityName;
+                        const locationType = hotelName ? LocationTypes.Hotel : LocationTypes.City;
+                        this.location = {
+                            countryCode,
+                            latitude,
+                            longitude,
+                            type: locationType,
+                            name: locationName
+                        };
                         if (cityName) {
                             this.location.city = cityName;
                         }
                         else if (!cityName && postOrZipCode) {
                             this.location.postcode = postOrZipCode;
-                            this.location.name = postOrZipCode;
+                            this.location.name = postOrZipCode || hotelName;
                         }
                     }
                     if (startSearch) {
@@ -29862,7 +29892,7 @@ class BaseEnterpriseBasketService {
         list: this.basketList
     });
     menuState = MenuSlideEnum.OUT;
-    checkApproverModalClosed = new EventEmitter();
+    checkApproverModalClosed = new Subject();
     requiresService;
     requiresOverrideService;
     userCurrency = 'GBP';
@@ -31680,7 +31710,7 @@ const PREFERENCE_VALUES = [
     { label: "Child", type: "MEAL_REQUEST", code: "CHML" },
     { label: "Diabetic", type: "MEAL_REQUEST", code: "DBML" },
     { label: "Fruit Plate", type: "MEAL_REQUEST", code: "FPML" },
-    { label: "Gluten Free", type: "MEAL_REQUEST", code: "GFML" },
+    { label: "Gluten intolerant", type: "MEAL_REQUEST", code: "GFML" },
     { label: "Hindu", type: "MEAL_REQUEST", code: "HNML" },
     { label: "Kosher", type: "MEAL_REQUEST", code: "KSML" },
     { label: "Low Fat/Cholesterol", type: "MEAL_REQUEST", code: "LFML" },
@@ -31689,7 +31719,7 @@ const PREFERENCE_VALUES = [
     { label: "Non-Lactose", type: "MEAL_REQUEST", code: "NLML" },
     { label: "Raw Vegetarian/Vegan", type: "MEAL_REQUEST", code: "RVML" },
     { label: "Seafood", type: "MEAL_REQUEST", code: "SFML" },
-    { label: "Vegetarian", type: "MEAL_REQUEST", code: "VGML" },
+    { label: "Vegetarian-Vegan", type: "MEAL_REQUEST", code: "VGML" },
     { label: "Vegetarian Lacto-Ovo", type: "MEAL_REQUEST", code: "VLML" },
     { label: "Asian Vegetarian", type: "MEAL_REQUEST", code: "VOML" },
     { label: "Aisle", type: "SEATING_PREFERENCE" },
@@ -39315,14 +39345,16 @@ class BaseLogonService {
         this.modalService.open(ModalTypes.ModalErrorComponent, { backdrop: 'static' }, modalValues);
     }
     isOnStaging() {
-        return !!['test'].find((url) => {
-            return window.location.hostname.includes(url);
-        });
+        // return !!['test'].find((url: string) => {
+        //   return window.location.hostname.includes(url);
+        // });
+        return true;
     }
     isOnDev() {
-        return !!['localhost', '127.0.0.1', 'dev'].find((url) => {
-            return window.location.hostname.includes(url);
-        });
+        // return !!['localhost', '127.0.0.1', 'dev'].find((url: string) => {
+        //   return window.location.hostname.includes(url);
+        // });
+        return true;
     }
     checkVersionUpdate() {
         const isProd = !this.isOnDev() && !this.isOnStaging();
@@ -39456,12 +39488,12 @@ class BaseLogonService {
         return result.asObservable();
     }
     setEnvironment() {
-        this.isScionEnv = window.location.href.includes('sabsenterprise');
-        this.isLightningEnv = !this.isScionEnv;
-        if (window.location.href.includes('localhost')) {
-            this.isScionEnv = this.environment.obt === 'scion';
-            this.isLightningEnv = !this.isScionEnv;
-        }
+        // this.isScionEnv = window.location.href.includes('sabsenterprise');
+        // this.isLightningEnv = !this.isScionEnv;
+        // if (window.location.href.includes('localhost')) {
+        //   this.isScionEnv = this.environment.obt === 'scion';
+        //   this.isLightningEnv = !this.isScionEnv;
+        // }
     }
 }