ublo-lib 1.37.9 → 1.37.11

package/es/common/components/cross-selling-editor/services/utils.js

@@ -68,20 +68,20 @@ function getMatchingOverrides(item, cartContent, forcedEsfOverride) {
         if (merchants?.length > 0) {
             isMatching = isMerchantMatching;
         }
-        if (isMatching && durationTags?.length > 0) {
-            isMatching = isDurationTagMatching;
+        if (durationTags?.length > 0) {
+            isMatching = isDurationTagMatching || isMatching;
         }
-        if (isMatching && ellohaGroups?.length > 0) {
-            isMatching = isEllohaGroupMatching;
+        if (ellohaGroups?.length > 0) {
+            isMatching = isEllohaGroupMatching || isMatching;
         }
-        if (isMatching && skiPassDurations?.length > 0) {
-            isMatching = isSkiPassDurationMatching;
+        if (skiPassDurations?.length > 0) {
+            isMatching = isSkiPassDurationMatching || isMatching;
         }
-        if (isMatching && esfOffersContent?.length > 0) {
-            isMatching = isEsfProductMatching;
+        if (esfOffersContent?.length > 0) {
+            isMatching = isEsfProductMatching || isMatching;
         }
-        if (isMatching && stay) {
-            isMatching = isStayMatching;
+        if (stay) {
+            isMatching = isStayMatching || isMatching;
         }
         return isMatching ? [...acc, override.id] : acc;
     }, []);

package/es/esf/components/magic-box/filter.module.css

@@ -3,6 +3,7 @@
   align-items: center;
   justify-content: center;
   gap: 1ch;
+  color: inherit;
 }
 
 .filter.startDates {

package/es/esf/components/magic-box/filters.d.ts

@@ -1,7 +1,10 @@
 export default Filters;
-declare function Filters({ filters, values, setValues }: {
+declare function Filters({ filters, values, setValues, customSubmit, customSubmitChecked, setCustomSubmitChecked, }: {
     filters: any;
     values: any;
     setValues: any;
+    customSubmit: any;
+    customSubmitChecked: any;
+    setCustomSubmitChecked: any;
 }): import("react/jsx-runtime").JSX.Element;
 //# sourceMappingURL=filters.d.ts.map

package/es/esf/components/magic-box/filters.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"filters.d.ts","sourceRoot":"","sources":["../../../../src/esf/components/magic-box/filters.js"],"names":[],"mappings":";AAIA;;;;4CAeC"}
+{"version":3,"file":"filters.d.ts","sourceRoot":"","sources":["../../../../src/esf/components/magic-box/filters.js"],"names":[],"mappings":";AAKA;;;;;;;4CAkCC"}

package/es/esf/components/magic-box/filters.js

@@ -1,9 +1,13 @@
-import { jsx as _jsx } from "react/jsx-runtime";
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import * as React from "react";
 import Filter from "./filter";
+import Checkbox from "dt-design-system/es/checkbox";
 import css from "./filters.module.css";
-const Filters = ({ filters, values, setValues }) => (_jsx("div", { className: css.filters, children: Object.keys(filters).map((key) => {
-        const filter = filters[key];
-        return (_jsx(Filter, { code: key, filter: filter, values: values, setValues: setValues }, key));
-    }) }));
+const Filters = ({ filters, values, setValues, customSubmit, customSubmitChecked, setCustomSubmitChecked, }) => {
+    const { label } = customSubmit || {};
+    return (_jsxs("div", { className: css.filters, children: [Object.keys(filters).map((key) => {
+                const filter = filters[key];
+                return (_jsx(Filter, { code: key, filter: filter, values: values, setValues: setValues }, key));
+            }), customSubmit && (_jsx(Checkbox, { className: css.customCheckbox, label: label, checked: customSubmitChecked, onCheckedChange: setCustomSubmitChecked }))] }));
+};
 export default Filters;

package/es/esf/components/magic-box/filters.module.css

@@ -5,6 +5,7 @@
   flex-wrap: wrap;
   gap: 40px 1ch;
   margin: 30px auto;
+  color: inherit;
 }
 
 [data-align="left"] .filters {
@@ -14,3 +15,20 @@
 [data-align="right"] .filters {
   justify-content: flex-end;
 }
+
+.customCheckbox {
+  flex: 1 1 100%;
+  justify-content: center;
+}
+
+.customCheckbox > div {
+  flex: 0 1 auto;
+  font-size: 15px;
+  color: inherit;
+}
+
+@media (min-width: 990px) {
+  .customCheckbox > div {
+    font-size: 20px;
+  }
+}

package/es/esf/components/magic-box/magic-box.d.ts

@@ -21,8 +21,13 @@ type Props = {
     msemWidgetHost?: MseMWidgetHost;
     msemApiHost?: MseMApiHost;
     msemAdminHost?: MseMAdminHost;
+    customSubmit?: {
+        label: string;
+        destination: string;
+        forwardFieldValues: boolean;
+    };
 };
 declare const _default: React.MemoExoticComponent<typeof MagicBox>;
 export default _default;
-declare function MagicBox({ stay, cartUrl, channel, className, alignContent, maxCPDuration, minDays, maxDays, allowedActivities, categories, msemWidgetHost, msemApiHost, msemAdminHost, children, }: Props): import("react/jsx-runtime").JSX.Element;
+declare function MagicBox({ stay, cartUrl, channel, className, alignContent, maxCPDuration, minDays, maxDays, allowedActivities, categories, msemWidgetHost, msemApiHost, msemAdminHost, customSubmit, children, }: Props): import("react/jsx-runtime").JSX.Element;
 //# sourceMappingURL=magic-box.d.ts.map

package/es/esf/components/magic-box/magic-box.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"magic-box.d.ts","sourceRoot":"","sources":["../../../../src/esf/components/magic-box/magic-box.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAW/B,KAAK,IAAI,GAAG;IACV,IAAI,EAAE,MAAM,CAAC;IACb,EAAE,EAAE,MAAM,CAAC;CACZ,CAAC;AAEF,KAAK,cAAc,GACf,0BAA0B,GAC1B,sCAAsC,CAAC;AAC3C,KAAK,WAAW,GACZ,oCAAoC,GACpC,gDAAgD,CAAC;AACrD,KAAK,aAAa,GACd,oDAAoD,GACpD,gEAAgE,CAAC;AAErE,KAAK,KAAK,GAAG;IACX,IAAI,CAAC,EAAE,IAAI,CAAC;IACZ,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,KAAK,GAAG,MAAM,CAAC;IACxB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,YAAY,CAAC,EAAE,MAAM,GAAG,QAAQ,GAAG,OAAO,CAAC;IAC3C,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,iBAAiB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC7B,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;IACtB,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;IAC3B,cAAc,CAAC,EAAE,cAAc,CAAC;IAChC,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,aAAa,CAAC,EAAE,aAAa,CAAC;CAC/B,CAAC;;AAIF,wBAAoC;AAEpC,iBAAS,QAAQ,CAAC,EAChB,IAAI,EACJ,OAAO,EACP,OAAe,EACf,SAAS,EACT,YAAY,EACZ,aAAa,EACb,OAAW,EACX,OAAkB,EAClB,iBAAiB,EACjB,UAAU,EACV,cAA2C,EAC3C,WAAkD,EAClD,aAAoE,EACpE,QAAQ,GACT,EAAE,KAAK,2CA6KP"}
+{"version":3,"file":"magic-box.d.ts","sourceRoot":"","sources":["../../../../src/esf/components/magic-box/magic-box.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAY/B,KAAK,IAAI,GAAG;IACV,IAAI,EAAE,MAAM,CAAC;IACb,EAAE,EAAE,MAAM,CAAC;CACZ,CAAC;AAEF,KAAK,cAAc,GACf,0BAA0B,GAC1B,sCAAsC,CAAC;AAC3C,KAAK,WAAW,GACZ,oCAAoC,GACpC,gDAAgD,CAAC;AACrD,KAAK,aAAa,GACd,oDAAoD,GACpD,gEAAgE,CAAC;AAErE,KAAK,KAAK,GAAG;IACX,IAAI,CAAC,EAAE,IAAI,CAAC;IACZ,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,KAAK,GAAG,MAAM,CAAC;IACxB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,YAAY,CAAC,EAAE,MAAM,GAAG,QAAQ,GAAG,OAAO,CAAC;IAC3C,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,iBAAiB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC7B,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;IACtB,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;IAC3B,cAAc,CAAC,EAAE,cAAc,CAAC;IAChC,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,aAAa,CAAC,EAAE,aAAa,CAAC;IAC9B,YAAY,CAAC,EAAE;QACb,KAAK,EAAE,MAAM,CAAC;QACd,WAAW,EAAE,MAAM,CAAC;QACpB,kBAAkB,EAAE,OAAO,CAAC;KAC7B,CAAC;CACH,CAAC;;AAIF,wBAAoC;AAEpC,iBAAS,QAAQ,CAAC,EAChB,IAAI,EACJ,OAAO,EACP,OAAe,EACf,SAAS,EACT,YAAY,EACZ,aAAa,EACb,OAAW,EACX,OAAkB,EAClB,iBAAiB,EACjB,UAAU,EACV,cAA2C,EAC3C,WAAkD,EAClD,aAAoE,EACpE,YAAY,EACZ,QAAQ,GACT,EAAE,KAAK,2CA6MP"}

package/es/esf/components/magic-box/magic-box.js

@@ -1,6 +1,7 @@
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 import * as React from "react";
 import classNames from "classnames";
+import Router from "next/router";
 import { useUbloContext } from "ublo/with-ublo";
 import Button from "dt-design-system/es/button";
 import * as Icons from "dt-design-system/es/icons";
@@ -10,10 +11,12 @@ import { message } from "./messages";
 import * as API from "./services/api";
 import css from "./magic-box.module.css";
 export default React.memo(MagicBox);
-function MagicBox({ stay, cartUrl, channel = "ESF", className, alignContent, maxCPDuration, minDays = 0, maxDays = Infinity, allowedActivities, categories, msemWidgetHost = "https://widget.msem.tech", msemApiHost = "https://services.msem.tech/api/esf", msemAdminHost = "https://admin.mon-sejour-en-montagne.com/api/gesco", children, }) {
+function MagicBox({ stay, cartUrl, channel = "ESF", className, alignContent, maxCPDuration, minDays = 0, maxDays = Infinity, allowedActivities, categories, msemWidgetHost = "https://widget.msem.tech", msemApiHost = "https://services.msem.tech/api/esf", msemAdminHost = "https://admin.mon-sejour-en-montagne.com/api/gesco", customSubmit, children, }) {
     const [filters, setFilters] = React.useState();
     const [values, setValues] = React.useState();
     const [currentStep, setCurrentStep] = React.useState(0);
+    const [VELClosed] = React.useState(false);
+    const [customSubmitChecked, setCustomSubmitChecked] = React.useState(false);
     const { lang, config } = useUbloContext();
     const { resort, merchant } = config;
     const valuesKeys = React.useMemo(() => (values ? Object.keys(values) : []), [values]);
@@ -28,6 +31,19 @@ function MagicBox({ stay, cartUrl, channel = "ESF", className, alignContent, max
         });
     }, [filtersKeys.length, values, valuesKeys]);
     const isValid = validate();
+    const submit = () => {
+        if (customSubmitChecked) {
+            const params = encodeURIComponent(JSON.stringify(values));
+            Router.push({
+                pathname: customSubmit?.destination,
+                query: { values: params },
+                hash: "prestige-form",
+            });
+        }
+        else {
+            setCurrentStep(1);
+        }
+    };
     const refreshFilters = React.useCallback(async () => {
         if (stay) {
             const { from: stayFrom, to: stayTo } = stay;
@@ -42,46 +58,48 @@ function MagicBox({ stay, cartUrl, channel = "ESF", className, alignContent, max
                 API.fetchParams(msemAdminHost, lang, resort, merchant, channel, categories),
             ]);
             const { season: currentSeason, availableSeasons } = welcomeResult;
-            const { categories: categoryList } = paramsResult;
-            const season = currentSeason || availableSeasons[0] || "2022";
-            const filtersResult = await API.fetchFilters({
-                msemApiHost,
-                lang,
-                resort,
-                season,
-                stayFrom,
-                stayTo,
-            });
-            const newFilters = Object.keys(filtersResult.filters).reduce((acc, key) => {
-                const filter = filtersResult.filters[key];
-                if (key === "days") {
-                    const days = filter.filter((item) => {
-                        return (!item.restricted &&
-                            item.value >= minDays &&
-                            item.value <= maxDays);
-                    });
-                    return { ...acc, [key]: days };
-                }
-                if (key === "activities") {
-                    const mustFilterActivites = allowedActivities && allowedActivities.length > 0;
-                    const activities = filter.filter((item) => {
-                        if (mustFilterActivites) {
-                            return (!item.restricted && allowedActivities.includes(item.value));
-                        }
-                        return !item.restricted;
-                    });
-                    return { ...acc, activities };
-                }
-                const filterWithoutRestricted = filter.filter((item) => !item.restricted);
-                return { ...acc, [key]: filterWithoutRestricted };
-            }, {});
-            const formattedCategories = categoryList?.map(({ code, label }) => {
-                return { value: code, libelle: label };
-            });
-            const allFilters = categories
-                ? { ...newFilters, categories: formattedCategories }
-                : newFilters;
-            setFilters(allFilters);
+            if (true) {
+                const { categories: categoryList } = paramsResult;
+                const season = currentSeason || availableSeasons[0] || "2025";
+                const filtersResult = await API.fetchFilters({
+                    msemApiHost,
+                    lang,
+                    resort,
+                    season,
+                    stayFrom,
+                    stayTo,
+                });
+                const newFilters = Object.keys(filtersResult.filters).reduce((acc, key) => {
+                    const filter = filtersResult.filters[key];
+                    if (key === "days") {
+                        const days = filter.filter((item) => {
+                            return (!item.restricted &&
+                                item.value >= minDays &&
+                                item.value <= maxDays);
+                        });
+                        return { ...acc, [key]: days };
+                    }
+                    if (key === "activities") {
+                        const mustFilterActivities = allowedActivities && allowedActivities.length > 0;
+                        const activities = filter.filter((item) => {
+                            if (mustFilterActivities) {
+                                return (!item.restricted && allowedActivities.includes(item.value));
+                            }
+                            return !item.restricted;
+                        });
+                        return { ...acc, activities };
+                    }
+                    const filterWithoutRestricted = filter.filter((item) => !item.restricted);
+                    return { ...acc, [key]: filterWithoutRestricted };
+                }, {});
+                const formattedCategories = categoryList?.map(({ code, label }) => {
+                    return { value: code, libelle: label };
+                });
+                const allFilters = categories
+                    ? { ...newFilters, categories: formattedCategories }
+                    : newFilters;
+                setFilters(allFilters);
+            }
         }
     }, [
         allowedActivities,
@@ -109,8 +127,9 @@ function MagicBox({ stay, cartUrl, channel = "ESF", className, alignContent, max
         refreshFilters();
     }, [refreshFilters, stay]);
     const showFilter = stay && filters && values;
+    const SubmitIcon = customSubmitChecked ? Icons.ArrowRight : Icons.Search;
     const classes = classNames(css.root, className);
-    return (_jsx("div", { className: classes, "data-align": alignContent, children: _jsxs("div", { className: css.top, children: [children, currentStep === 0 && (_jsxs(_Fragment, { children: [!filters && _jsx("div", { className: css.loader }), showFilter && (_jsx(Filters, { filters: filters, values: values, setValues: setValues })), _jsxs(Button, { className: css.confirm, onClick: () => setCurrentStep(1), disabled: !isValid, children: [message(lang, "confirm"), _jsx(Icons.Search, {})] })] })), currentStep === 1 && (_jsx(Booking, { stay: stay, cartUrl: cartUrl, channel: channel, values: values, maxCPDuration: maxCPDuration, setCurrentStep: setCurrentStep, msemWidgetHost: msemWidgetHost }))] }) }));
+    return (_jsx("div", { className: classes, "data-align": alignContent, children: _jsxs("div", { className: css.top, children: [children, VELClosed && (_jsx("div", { className: css.closedMessage, children: message(lang, "vel-closed") })), !VELClosed && currentStep === 0 && (_jsxs(_Fragment, { children: [!filters && _jsx("div", { className: css.loader }), showFilter && (_jsx(Filters, { filters: filters, values: values, setValues: setValues, customSubmit: customSubmit, customSubmitChecked: customSubmitChecked, setCustomSubmitChecked: setCustomSubmitChecked })), _jsxs(Button, { className: css.confirm, onClick: submit, disabled: !isValid, children: [message(lang, customSubmitChecked ? "proceed" : "confirm"), _jsx(SubmitIcon, {})] })] })), currentStep === 1 && (_jsx(Booking, { stay: stay, cartUrl: cartUrl, channel: channel, values: values, maxCPDuration: maxCPDuration, setCurrentStep: setCurrentStep, msemWidgetHost: msemWidgetHost }))] }) }));
 }
 function getDefaultValues(filters) {
     return Object.keys(filters || {}).reduce((acc, key) => {

package/es/esf/components/magic-box/magic-box.module.css

@@ -2,6 +2,7 @@
   position: relative;
   display: flex;
   flex-direction: column;
+  color: inherit;
   background-color: var(--ds-grey-200, #efefef);
 }
 
@@ -26,6 +27,10 @@
   }
 }
 
+.closedMessage {
+  text-align: center;
+}
+
 .loader {
   display: table;
   width: 42px;

package/es/esf/components/magic-box/messages.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"messages.d.ts","sourceRoot":"","sources":["../../../../src/esf/components/magic-box/messages.js"],"names":[],"mappings":"AAyBO,iDAIN"}
+{"version":3,"file":"messages.d.ts","sourceRoot":"","sources":["../../../../src/esf/components/magic-box/messages.js"],"names":[],"mappings":"AA6BO,iDAIN"}

package/es/esf/components/magic-box/messages.js

@@ -9,6 +9,8 @@ const locales = {
         days: " pendant ",
         durations: " sur des cours de ",
         categories: " à ",
+        "vel-closed": "La vente en ligne est fermée pour le moment.",
+        proceed: "Finaliser ma demande",
     },
     en: {
         confirm: "Find an instructor",
@@ -20,6 +22,8 @@ const locales = {
         days: " for ",
         durations: " with lessons of ",
         categories: " at ",
+        "vel-closed": "Online sales are closed for now.",
+        proceed: "Finalize my request",
     },
 };
 export const message = (lang, id) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ublo-lib",
-  "version": "1.37.9",
+  "version": "1.37.11",
   "peerDependencies": {
     "dt-design-system": "^3.9.9",
     "leaflet": "^1.9.1",