@qite/tide-booking-component 1.4.33 → 1.4.35

package/build/build-esm/qsm/types.d.ts

@@ -35,7 +35,6 @@ export interface QSMConfiguration {
     maxChildAge?: number;
     maxInfantAge?: number;
     onSubmit: (data: any) => void;
-    submitLabel: string;
     submitIcon: ReactNode;
     nationalities: Nationality[];
     languageCode?: string;

package/build/build-esm/search-results/components/filters/filters.d.ts

@@ -2,8 +2,8 @@ import React from 'react';
 import { Filter } from '../../types';
 interface FiltersProps {
     filters: Filter[];
-    isMobileFiltersOpen: boolean;
-    handleSetIsMobileFiltersOpen: () => void;
+    isOpen: boolean;
+    handleSetIsOpen: () => void;
     handleApplyFilters: () => void;
     isLoading?: boolean;
 }

package/build/build-esm/search-results/components/flight/flight-results.d.ts

@@ -1,5 +1,7 @@
 import React from 'react';
+import { BookingPackageFlight } from '@qite/tide-client';
 interface FlightResultsProps {
+    flights: BookingPackageFlight[];
     isDeparture?: boolean;
 }
 declare const FlightResults: React.FC<FlightResultsProps>;

package/build/build-esm/search-results/components/hotel/hotel-card.d.ts

@@ -2,6 +2,7 @@ import React from 'react';
 import { HotelResult } from '../../types';
 interface HotelCardProps {
     result: HotelResult;
+    translations?: any;
 }
 declare const HotelCard: React.FC<HotelCardProps>;
 export default HotelCard;

package/build/build-esm/search-results/components/itinerary/index.d.ts

@@ -1,7 +1,7 @@
 import React from 'react';
 interface ItineraryProps {
-    isMobileFiltersOpen: boolean;
-    handleSetIsMobileFiltersOpen: () => void;
+    isOpen: boolean;
+    handleSetIsOpen: () => void;
     isLoading?: boolean;
 }
 declare const Itinerary: React.FC<ItineraryProps>;

package/build/build-esm/search-results/store/search-results-slice.d.ts

@@ -1,8 +1,10 @@
 import { Filter } from '../types';
-import { BookingPackageItem } from '@qite/tide-client/build/types';
+import { BookingPackage, BookingPackageItem, EntryLight } from '@qite/tide-client/build/types';
 export interface SearchResultsState {
     results: BookingPackageItem[];
     selectedHotelId: number | null;
+    bookingPackageDetails: BookingPackage | null;
+    entry: EntryLight | null;
     isLoading: boolean;
     filters: Filter[];
     sortKey: string | null;
@@ -11,6 +13,13 @@ export interface SearchResultsState {
 }
 export declare const setResults: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
     results: BookingPackageItem[];
-}, "searchResults/setResults">, setSelectedHotel: import("@reduxjs/toolkit").ActionCreatorWithPayload<number | null, "searchResults/setSelectedHotel">, setIsLoading: import("@reduxjs/toolkit").ActionCreatorWithPayload<boolean, "searchResults/setIsLoading">, setFilters: import("@reduxjs/toolkit").ActionCreatorWithPayload<Filter[], "searchResults/setFilters">, resetFilters: import("@reduxjs/toolkit").ActionCreatorWithPayload<Filter[], "searchResults/resetFilters">, setSortKey: import("@reduxjs/toolkit").ActionCreatorWithPayload<string | null, "searchResults/setSortKey">, setActiveTab: import("@reduxjs/toolkit").ActionCreatorWithPayload<string | null, "searchResults/setActiveTab">, setCurrentPage: import("@reduxjs/toolkit").ActionCreatorWithPayload<number, "searchResults/setCurrentPage">, resetSearchState: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"searchResults/resetSearchState">;
+}, "searchResults/setResults">, setSelectedHotel: import("@reduxjs/toolkit").ActionCreatorWithPayload<number | null, "searchResults/setSelectedHotel">, setBookingPackageDetails: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
+    details: BookingPackage;
+}, "searchResults/setBookingPackageDetails">, setEntry: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
+    entry: EntryLight;
+}, "searchResults/setEntry">, selectFlight: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
+    flightOptionId: string;
+    isDeparture: boolean;
+}, "searchResults/selectFlight">, setIsLoading: import("@reduxjs/toolkit").ActionCreatorWithPayload<boolean, "searchResults/setIsLoading">, setFilters: import("@reduxjs/toolkit").ActionCreatorWithPayload<Filter[], "searchResults/setFilters">, resetFilters: import("@reduxjs/toolkit").ActionCreatorWithPayload<Filter[], "searchResults/resetFilters">, setSortKey: import("@reduxjs/toolkit").ActionCreatorWithPayload<string | null, "searchResults/setSortKey">, setActiveTab: import("@reduxjs/toolkit").ActionCreatorWithPayload<string | null, "searchResults/setActiveTab">, setCurrentPage: import("@reduxjs/toolkit").ActionCreatorWithPayload<number, "searchResults/setCurrentPage">, resetSearchState: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"searchResults/resetSearchState">;
 declare const _default: import("redux").Reducer<SearchResultsState, import("redux").AnyAction>;
 export default _default;

package/build/build-esm/search-results/types.d.ts

@@ -19,22 +19,8 @@ export interface SearchResultsConfiguration {
     showCustomCards?: boolean;
     customCardRenderer?: (result: SearchResult) => ReactNode;
     showMapView?: boolean;
-    noResultsLabel?: string;
     isLoading?: boolean;
     customSpinner?: ReactNode;
-    translations?: {
-        filters?: string;
-        filterTitle?: string;
-        resetButton?: string;
-        sortBy?: string;
-        noResults?: string;
-        totalResultsLabel?: string;
-        luggageIncluded?: string;
-        cancel?: string;
-        apply?: string;
-        loading?: string;
-        searchResultCTA?: string;
-    };
     cmsHotelData?: any[];
     languageCode?: string;
 }

package/package.json

@@ -1,77 +1,77 @@
-{
-  "name": "@qite/tide-booking-component",
-  "version": "1.4.33",
-  "description": "React Booking wizard & Booking product component for Tide",
-  "main": "build/build-cjs/index.js",
-  "module": "build/build-esm/index.js",
-  "scripts": {
-    "start": "rollup -c -w",
-    "build": "rollup -c",
-    "tsc": "tsc --noEmit",
-    "format": "prettier --write .",
-    "prepare": "husky"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+ssh://git@bitbucket.org/qitegeneral/tide-booking-component.git"
-  },
-  "keywords": [
-    "tide",
-    "booking",
-    "react",
-    "component"
-  ],
-  "author": "Qite",
-  "license": "OBSD",
-  "homepage": "https://bitbucket.org/qitegeneral/tide-booking-component#readme",
-  "devDependencies": {
-    "@jsonurl/jsonurl": "^1.1.4",
-    "@popperjs/core": "^2.10.2",
-    "@qite/tide-client": "^1.1.123",
-    "@reach/router": "^1.3.4",
-    "@reduxjs/toolkit": "^1.6.0",
-    "@rollup/plugin-commonjs": "^19.0.1",
-    "@rollup/plugin-json": "^4.1.0",
-    "@rollup/plugin-node-resolve": "^13.0.2",
-    "@types/flat": "^5.0.2",
-    "@types/lodash": "^4.14.171",
-    "@types/reach__router": "^1.3.9",
-    "@types/react": "^17.0.2",
-    "@types/react-dom": "^17.0.2",
-    "@types/uuid": "^8.3.1",
-    "date-fns": "^2.22.1",
-    "flat": "^5.0.2",
-    "formik": "^2.2.9",
-    "husky": "^9.1.7",
-    "lodash": "^4.17.21",
-    "prettier": "^2.3.2",
-    "react-popper": "^2.2.5",
-    "react-redux": "^7.2.4",
-    "rollup": "^2.53.2",
-    "rollup-plugin-delete": "^2.0.0",
-    "rollup-plugin-peer-deps-external": "^2.2.4",
-    "rollup-plugin-typescript2": "0.36.0",
-    "tslib": "^2.3.1",
-    "typescript": "^4.3.5",
-    "uuid": "^8.3.2"
-  },
-  "peerDependencies": {
-    "@jsonurl/jsonurl": "^1.1.4",
-    "@popperjs/core": "^2.10.2",
-    "@reach/router": "^1.3.4",
-    "@reduxjs/toolkit": "^1.6.0",
-    "date-fns": "^2.22.1",
-    "flat": "^5.0.2",
-    "formik": "^2.2.9",
-    "immer": "^9.0.5",
-    "lodash": "^4.17.21",
-    "react": "^17.0.2",
-    "react-dom": "^17.0.2",
-    "react-popper": "^2.2.5",
-    "react-redux": "^7.2.4",
-    "uuid": "^8.3.2"
-  },
-  "dependencies": {
-    "react-html-comment": "^2.0.16"
-  }
-}
+{
+  "name": "@qite/tide-booking-component",
+  "version": "1.4.35",
+  "description": "React Booking wizard & Booking product component for Tide",
+  "main": "build/build-cjs/index.js",
+  "module": "build/build-esm/index.js",
+  "scripts": {
+    "start": "rollup -c -w",
+    "build": "rollup -c",
+    "tsc": "tsc --noEmit",
+    "format": "prettier --write .",
+    "prepare": "husky"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+ssh://git@bitbucket.org/qitegeneral/tide-booking-component.git"
+  },
+  "keywords": [
+    "tide",
+    "booking",
+    "react",
+    "component"
+  ],
+  "author": "Qite",
+  "license": "OBSD",
+  "homepage": "https://bitbucket.org/qitegeneral/tide-booking-component#readme",
+  "devDependencies": {
+    "@jsonurl/jsonurl": "^1.1.4",
+    "@popperjs/core": "^2.10.2",
+    "@qite/tide-client": "^1.1.126",
+    "@reach/router": "^1.3.4",
+    "@reduxjs/toolkit": "^1.6.0",
+    "@rollup/plugin-commonjs": "^19.0.1",
+    "@rollup/plugin-json": "^4.1.0",
+    "@rollup/plugin-node-resolve": "^13.0.2",
+    "@types/flat": "^5.0.2",
+    "@types/lodash": "^4.14.171",
+    "@types/reach__router": "^1.3.9",
+    "@types/react": "^17.0.2",
+    "@types/react-dom": "^17.0.2",
+    "@types/uuid": "^8.3.1",
+    "date-fns": "^2.22.1",
+    "flat": "^5.0.2",
+    "formik": "^2.2.9",
+    "husky": "^9.1.7",
+    "lodash": "^4.17.21",
+    "prettier": "^2.3.2",
+    "react-popper": "^2.2.5",
+    "react-redux": "^7.2.4",
+    "rollup": "^2.53.2",
+    "rollup-plugin-delete": "^2.0.0",
+    "rollup-plugin-peer-deps-external": "^2.2.4",
+    "rollup-plugin-typescript2": "0.36.0",
+    "tslib": "^2.3.1",
+    "typescript": "^4.3.5",
+    "uuid": "^8.3.2"
+  },
+  "peerDependencies": {
+    "@jsonurl/jsonurl": "^1.1.4",
+    "@popperjs/core": "^2.10.2",
+    "@reach/router": "^1.3.4",
+    "@reduxjs/toolkit": "^1.6.0",
+    "date-fns": "^2.22.1",
+    "flat": "^5.0.2",
+    "formik": "^2.2.9",
+    "immer": "^9.0.5",
+    "lodash": "^4.17.21",
+    "react": "^17.0.2",
+    "react-dom": "^17.0.2",
+    "react-popper": "^2.2.5",
+    "react-redux": "^7.2.4",
+    "uuid": "^8.3.2"
+  },
+  "dependencies": {
+    "react-html-comment": "^2.0.16"
+  }
+}

package/src/booking-product/components/product.tsx

@@ -57,6 +57,7 @@ const Product: React.FC<ProductProps> = ({ productCode, productName, duration, r
   const [hasTransfer, setHasTransfer] = useState<boolean>(false);
   const [rooms, setRooms] = useState<ProductRoom[]>([{ adults: 2, children: 0, childAges: [] }]);
   const [searchResponse, setSearchResponse] = useState<BookingPackageItem[]>([]);
+  const [detailResponse, setDetailResponse] = useState<any>();
   const [dateRange, setDateRange] = useState<DateRange>();
   const [packageProductName, setPackageProductName] = useState<string>(productName);
   const [currencyCode, setCurrencyCode] = useState<string>('');
@@ -135,35 +136,14 @@ const Product: React.FC<ProductProps> = ({ productCode, productName, duration, r
 
       setIsLoading(true);
 
-      let detailResponse;
       if (displayMode === 'calendar' && searchType === 0) {
-        detailResponse = await packageApi.fetchDetails(detailsRequest, signal, language, apiSettingsState);
+        setDetailResponse(await packageApi.fetchDetails(detailsRequest, signal, language, apiSettingsState));
       }
 
       if (searchType === 1) {
         setSearchResponse(await packageApi.fetchSearch(searchRequest, signal, apiSettingsState));
       }
 
-      if (detailResponse && !detailResponse.errorCode && detailResponse.payload) {
-        const selectedOption = detailResponse.payload.options.find((x) => x.isSelected);
-
-        if (selectedOption) {
-          const hasFlight = selectedOption.includedServiceTypes.some((x) => x === 7);
-          const hasTranfer = selectedOption.includedServiceTypes.some((x) => x === 13);
-
-          setPrice(selectedOption.price);
-          setHasFlight(hasFlight);
-          setHasTransfer(hasTranfer);
-          setCurrencyCode(detailResponse.payload.currencyCode);
-          setPackageProductName(selectedOption.name);
-        }
-      } else {
-        setPrice(undefined);
-        setHasFlight(false);
-        setHasTransfer(false);
-        setCurrencyCode('');
-      }
-
       setIsLoading(false);
     }
   };
@@ -256,9 +236,11 @@ const Product: React.FC<ProductProps> = ({ productCode, productName, duration, r
       if (selectedItem) {
         setPrice(selectedItem.price);
         setPackageProductName(selectedItem.name);
+        setCurrencyCode(selectedItem.currencyCode);
       } else {
         setPrice(searchResponse[0].price);
         setPackageProductName(searchResponse[0].name);
+        setCurrencyCode(searchResponse[0].currencyCode);
       }
     } else {
       setSearchResults([]);
@@ -267,6 +249,28 @@ const Product: React.FC<ProductProps> = ({ productCode, productName, duration, r
     }
   }, [searchResponse]);
 
+  useEffect(() => {
+    if (detailResponse && !detailResponse.errorCode && detailResponse.payload) {
+      const selectedOption = detailResponse.payload.options.find((x: any) => x.isSelected);
+
+      if (selectedOption) {
+        const hasFlight = selectedOption.includedServiceTypes.some((x: any) => x === 7);
+        const hasTranfer = selectedOption.includedServiceTypes.some((x: any) => x === 13);
+
+        setPrice(selectedOption.price);
+        setHasFlight(hasFlight);
+        setHasTransfer(hasTranfer);
+        setCurrencyCode(detailResponse.payload.currencyCode);
+        setPackageProductName(selectedOption.name);
+      }
+    } else if (detailResponse !== undefined) {
+      setPrice(undefined);
+      setHasFlight(false);
+      setHasTransfer(false);
+      setCurrencyCode('');
+    }
+  }, [detailResponse]);
+
   useEffect(() => {
     if (searchType === 1 && skipNextFetchRef.current) {
       skipNextFetchRef.current = false;