ublo-lib 1.37.15 → 1.37.16

package/es/common/components/cart-dialog/cart-dialog.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cart-dialog.d.ts","sourceRoot":"","sources":["../../../../src/common/components/cart-dialog/cart-dialog.js"],"names":[],"mappings":";AAoBA;;;;;;;;;4CA6DC"}
+{"version":3,"file":"cart-dialog.d.ts","sourceRoot":"","sources":["../../../../src/common/components/cart-dialog/cart-dialog.js"],"names":[],"mappings":";AAsBA;;;;;;;;;4CA6DC"}

package/es/common/components/cart-dialog/cart-dialog.js

@@ -17,12 +17,13 @@ const products = {
     SKI_RENTAL: SkiRental,
     VAKARIO: Vakario,
 };
+const STAND_PRODUCTS = ["VAKARIO", "ELLOHA-ACTIVITY"];
 const CartDialog = ({ cart, setCart, shortcuts, paxPlan, facet, zoneId, zonePath, hasImage, }) => {
     if (!cart)
         return null;
     const { cart: cartContent, kind, data } = cart;
     const isSupported = Object.keys(products).includes(kind);
-    const convertedKind = kind === "VAKARIO" ? "STAND" : kind;
+    const convertedKind = STAND_PRODUCTS.includes(kind) ? "STAND" : kind;
     if (!cartContent?.cart?.orders?.[convertedKind]?.[0]) {
         return null;
     }

package/es/common/components/cross-selling-editor/services/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../../src/common/components/cross-selling-editor/services/utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,gBAAgB,EAAE,QAAQ,EAAa,MAAM,UAAU,CAAC;AAE9E,KAAK,IAAI,GAAG;IACV,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,QAAQ,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;CAC5B,CAAC;AAEF,KAAK,WAAW,GAAG;IACjB,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC9B,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC;IACrB,IAAI,CAAC,EAAE,IAAI,CAAC;IACZ,gBAAgB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC5B,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;IACxB,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;IACxB,gBAAgB,CAAC,EAAE,gBAAgB,EAAE,CAAC;CACvC,CAAC;AAEF,eAAO,MAAM,YAAY;;;;;;;CAOxB,CAAC;AAEF,KAAK,QAAQ,GAAG,MAAM,OAAO,YAAY,CAAC;AAE1C,wBAAgB,eAAe,CAC7B,SAAS,EAAE,WAAW,EACtB,WAAW,EAAE,WAAW,EACxB,MAAM,EAAE,MAAM,EACd,iBAAiB,CAAC,EAAE,MAAM;;;;;IA6D3B;AAED,wBAAgB,iBAAiB,CAC/B,GAAG,EAAE,MAAM,GAAG,QAAQ,EACtB,WAAW,EAAE,WAAW,EACxB,MAAM,EAAE,MAAM,EACd,iBAAiB,CAAC,EAAE,MAAM,YAoB3B;AAkKD,eAAO,MAAM,gBAAgB,UAAgD,CAAC;AAE9E,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,MAAM,WAE/C;AAED,KAAK,WAAW,GAAG;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;IACxB,WAAW,CAAC,EAAE;QACZ,KAAK,CAAC,EAAE,MAAM,CAAC;KAChB,CAAC;IACF,KAAK,EAAE,gBAAgB,CAAC;CACzB,CAAC;AAEF,KAAK,KAAK,GAAG;IAAE,QAAQ,EAAE,MAAM,CAAC;IAAC,YAAY,EAAE,WAAW,EAAE,CAAA;CAAE,CAAC;AAE/D,KAAK,IAAI,GAAG;IACV,MAAM,CAAC,EAAE,MAAM,CAAC,QAAQ,EAAE,KAAK,EAAE,CAAC,CAAC;IACnC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,IAAI,MAY3C;AAED,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,IAAI,YAS9C;AAED,wBAAgB,eAAe,CAAC,IAAI,EAAE,IAAI;;;;;;;;EAMzC;AAED,wBAAgB,0BAA0B,CAAC,IAAI,EAAE,IAAI,YAKpD;AAcD,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,IAAI,YAQjD;AAED,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,IAAI,YAMjD;AAED,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,IAAI,GAAG,gBAAgB,EAAE,CAUnE;AAED,eAAO,MAAM,SAAS,yBAAyB,CAAC;AAEhD,wBAAgB,SAAS,CAAC,SAAS,EAAE,WAAW,OAc/C;AAED,wBAAgB,0BAA0B,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,UAOlE"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../../src/common/components/cross-selling-editor/services/utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,gBAAgB,EAAE,QAAQ,EAAa,MAAM,UAAU,CAAC;AAE9E,KAAK,IAAI,GAAG;IACV,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,QAAQ,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;CAC5B,CAAC;AAEF,KAAK,WAAW,GAAG;IACjB,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC9B,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC;IACrB,IAAI,CAAC,EAAE,IAAI,CAAC;IACZ,gBAAgB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC5B,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;IACxB,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;IACxB,gBAAgB,CAAC,EAAE,gBAAgB,EAAE,CAAC;CACvC,CAAC;AAEF,eAAO,MAAM,YAAY;;;;;;;CAOxB,CAAC;AAEF,KAAK,QAAQ,GAAG,MAAM,OAAO,YAAY,CAAC;AAE1C,wBAAgB,eAAe,CAC7B,SAAS,EAAE,WAAW,EACtB,WAAW,EAAE,WAAW,EACxB,MAAM,EAAE,MAAM,EACd,iBAAiB,CAAC,EAAE,MAAM;;;;;IA6D3B;AAED,wBAAgB,iBAAiB,CAC/B,GAAG,EAAE,MAAM,GAAG,QAAQ,EACtB,WAAW,EAAE,WAAW,EACxB,MAAM,EAAE,MAAM,EACd,iBAAiB,CAAC,EAAE,MAAM,YAoB3B;AAkJD,eAAO,MAAM,gBAAgB,UAAgD,CAAC;AAE9E,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,MAAM,WAE/C;AAED,KAAK,WAAW,GAAG;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;IACxB,WAAW,CAAC,EAAE;QACZ,KAAK,CAAC,EAAE,MAAM,CAAC;KAChB,CAAC;IACF,KAAK,EAAE,gBAAgB,CAAC;CACzB,CAAC;AAEF,KAAK,KAAK,GAAG;IAAE,QAAQ,EAAE,MAAM,CAAC;IAAC,YAAY,EAAE,WAAW,EAAE,CAAA;CAAE,CAAC;AAE/D,KAAK,IAAI,GAAG;IACV,MAAM,CAAC,EAAE,MAAM,CAAC,QAAQ,EAAE,KAAK,EAAE,CAAC,CAAC;IACnC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,IAAI,MAY3C;AAED,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,IAAI,YAS9C;AAED,wBAAgB,eAAe,CAAC,IAAI,EAAE,IAAI;;;;;;;;EAMzC;AAED,wBAAgB,0BAA0B,CAAC,IAAI,EAAE,IAAI,YAKpD;AAcD,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,IAAI,YAQjD;AAED,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,IAAI,YAMjD;AAED,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,IAAI,GAAG,gBAAgB,EAAE,CAUnE;AAED,eAAO,MAAM,SAAS,yBAAyB,CAAC;AAEhD,wBAAgB,SAAS,CAAC,SAAS,EAAE,WAAW,OAc/C;AAED,wBAAgB,0BAA0B,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,UAOlE"}

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

@@ -64,25 +64,12 @@ function getMatchingOverrides(item, cartContent, forcedEsfOverride) {
         const isDurationTagMatching = checkDurationTags(override, durationTags);
         const isEllohaGroupMatching = checkEllohaGroup(override, ellohaGroups);
         const isEsfProductMatching = checkEsfProduct(override, esfOffersContent, forcedEsfOverride);
-        let isMatching = false;
-        if (merchants?.length > 0) {
-            isMatching = isMerchantMatching;
-        }
-        if (durationTags?.length > 0) {
-            isMatching = isDurationTagMatching || isMatching;
-        }
-        if (ellohaGroups?.length > 0) {
-            isMatching = isEllohaGroupMatching || isMatching;
-        }
-        if (skiPassDurations?.length > 0) {
-            isMatching = isSkiPassDurationMatching || isMatching;
-        }
-        if (esfOffersContent?.length > 0) {
-            isMatching = isEsfProductMatching || isMatching;
-        }
-        if (stay) {
-            isMatching = isStayMatching || isMatching;
-        }
+        const isMatching = isStayMatching &&
+            isMerchantMatching &&
+            isSkiPassDurationMatching &&
+            isDurationTagMatching &&
+            isEllohaGroupMatching &&
+            isEsfProductMatching;
         return isMatching ? [...acc, override.id] : acc;
     }, []);
     return matchs;
@@ -90,7 +77,7 @@ function getMatchingOverrides(item, cartContent, forcedEsfOverride) {
 function checkStay(override, stay) {
     const { stayFrom, stayTo, stayDuration } = override.triggers || {};
     if (!stayFrom || !stayTo || !stay?.from || !stay?.to)
-        return false;
+        return true;
     const triggerStayFrom = new Date(stayFrom).getTime();
     const triggerStayTo = new Date(stayTo).getTime();
     const stayFromTime = new Date(stay?.from).getTime();
@@ -104,7 +91,11 @@ function checkStay(override, stay) {
     return stayIsBetweenTrigger || stayHasRightDuration;
 }
 function checkMerchants(override, merchants) {
+    if (!merchants?.length)
+        return false;
     const { merchant = "" } = override.triggers || {};
+    if (!merchant)
+        return true;
     const splittedMerchant = merchant.split(",").map((m) => m.trim());
     return merchants && splittedMerchant.some((m) => merchants.includes(m));
 }
@@ -115,7 +106,7 @@ function checkSkiPassDurations(override, skiPassDurations) {
     const maxDuration = Math.max(...durations);
     const { skiPassDuration, skiPassDurationOperator = ">=" } = override.triggers || {};
     if (!skiPassDuration)
-        return false;
+        return true;
     switch (skiPassDurationOperator) {
         case ">":
             return maxDuration > skiPassDuration;
@@ -136,7 +127,7 @@ function checkDurationTags(override, durationTags) {
         return false;
     const { durationTag } = override.triggers || {};
     if (!durationTag)
-        return false;
+        return true;
     return durationTags.includes(durationTag);
 }
 function checkEllohaGroup(override, ellohaGroups) {
@@ -144,7 +135,7 @@ function checkEllohaGroup(override, ellohaGroups) {
         return false;
     const { ellohaGroup } = override.triggers || {};
     if (!ellohaGroup)
-        return false;
+        return true;
     return ellohaGroups.includes(ellohaGroup);
 }
 function checkEsfProduct(override, esfOffersContent, forcedEsfOverride) {
@@ -155,7 +146,7 @@ function checkEsfProduct(override, esfOffersContent, forcedEsfOverride) {
     }
     const rules = override.triggers?.esf?.rules;
     if (!rules)
-        return false;
+        return true;
     return esfOffersContent.some((content) => {
         const keys = Object.keys(content);
         return keys.some((key) => {

package/es/common/components/cross-selling-editor/tester/tester.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tester.d.ts","sourceRoot":"","sources":["../../../../../src/common/components/cross-selling-editor/tester/tester.tsx"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,MAAM,EAAE,SAAS,EAAoB,MAAM,UAAU,CAAC;AAEpE,KAAK,KAAK,GAAG;IACX,SAAS,EAAE,WAAW,CAAC;IACvB,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,CAAC,EAAE,SAAS,CAAC;IACtB,iBAAiB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC7B,qBAAqB,CAAC,EAAE,MAAM,EAAE,CAAC;CAClC,CAAC;AAEF,MAAM,CAAC,OAAO,UAAU,MAAM,CAAC,EAC7B,SAAS,EACT,MAAM,EACN,SAAS,EACT,iBAAiB,EACjB,qBAAqB,GACtB,EAAE,KAAK,2CAkPP"}
+{"version":3,"file":"tester.d.ts","sourceRoot":"","sources":["../../../../../src/common/components/cross-selling-editor/tester/tester.tsx"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,MAAM,EAAE,SAAS,EAAoB,MAAM,UAAU,CAAC;AAEpE,KAAK,KAAK,GAAG;IACX,SAAS,EAAE,WAAW,CAAC;IACvB,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,CAAC,EAAE,SAAS,CAAC;IACtB,iBAAiB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC7B,qBAAqB,CAAC,EAAE,MAAM,EAAE,CAAC;CAClC,CAAC;AAEF,MAAM,CAAC,OAAO,UAAU,MAAM,CAAC,EAC7B,SAAS,EACT,MAAM,EACN,SAAS,EACT,iBAAiB,EACjB,qBAAqB,GACtB,EAAE,KAAK,2CAqPP"}

package/es/common/components/cross-selling-editor/tester/tester.js

@@ -16,6 +16,7 @@ export default function Tester({ container, config, durations, tunnelOffersOrder
     const [skiPassDurations, setSkiPassDurations] = React.useState([]);
     const [durationTags, setDurationTags] = React.useState([]);
     const [esfRules, setEsfRules] = React.useState([]);
+    const [ellohaGroups, setEllohaGroups] = React.useState([]);
     const updateStayFrom = (value) => {
         setStayFrom(value);
         const stayToIsUndefined = !stayTo;
@@ -67,6 +68,7 @@ export default function Tester({ container, config, durations, tunnelOffersOrder
         skiPassDurations,
         durationTags,
         esfOffersContent,
+        ellohaGroups,
     };
     const sortedOffers = Utils.getSortedOffers(container, cartContent, config, firstActiveEsfRule);
     const activeOverrides = Object.keys(cartOffers).reduce((acc, key) => {
@@ -106,10 +108,11 @@ export default function Tester({ container, config, durations, tunnelOffersOrder
                     }
                 });
             });
-            setMerchants(cartContent?.merchants);
-            setSkiPassDurations(cartContent?.skiPassDurations);
-            setDurationTags(cartContent?.durationTags);
-            setEsfRules(cartContent?.esfRules);
+            setMerchants(cartContent?.merchants || []);
+            setSkiPassDurations(cartContent?.skiPassDurations || []);
+            setDurationTags(cartContent?.durationTags || []);
+            setEsfRules(cartContent?.esfRules || []);
+            setEllohaGroups(cartContent?.ellohaGroups || []);
         }
     };
     const tunnelOptions = Object.keys(Utils.tunnelOffers)

package/es/common/components/cross-selling-editor/tester/tunnel-offer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tunnel-offer.d.ts","sourceRoot":"","sources":["../../../../../src/common/components/cross-selling-editor/tester/tunnel-offer.tsx"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAIlD,KAAK,KAAK,GAAG;IACX,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAEnC,gBAAgB,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IAC5D,kBAAkB,EAAE,MAAM,IAAI,CAAC;IAC/B,SAAS,CAAC,EAAE,SAAS,CAAC;IACtB,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,MAAM,CAAC,OAAO,UAAU,iBAAiB,CAAC,EACxC,IAAI,EACJ,KAAK,EACL,KAAK,EACL,UAAU,EACV,gBAAgB,EAChB,kBAAkB,EAClB,SAAS,EACT,MAAM,GACP,EAAE,KAAK,2CAsIP"}
+{"version":3,"file":"tunnel-offer.d.ts","sourceRoot":"","sources":["../../../../../src/common/components/cross-selling-editor/tester/tunnel-offer.tsx"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAIlD,KAAK,KAAK,GAAG;IACX,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAEnC,gBAAgB,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IAC5D,kBAAkB,EAAE,MAAM,IAAI,CAAC;IAC/B,SAAS,CAAC,EAAE,SAAS,CAAC;IACtB,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,MAAM,CAAC,OAAO,UAAU,iBAAiB,CAAC,EACxC,IAAI,EACJ,KAAK,EACL,KAAK,EACL,UAAU,EACV,gBAAgB,EAChB,kBAAkB,EAClB,SAAS,EACT,MAAM,GACP,EAAE,KAAK,2CA6JP"}

package/es/common/components/cross-selling-editor/tester/tunnel-offer.js

@@ -14,6 +14,7 @@ export default function TesterTunnelOffer({ kind, value, label, cartOffers, upda
     const overrideAllowed = Utils.allowedOverrides.includes(kind);
     const isSkiPasses = kind === "LIFT";
     const isEsf = kind === "ESF";
+    const isStandardProduct = kind === "STAND";
     const itemValue = cartOffers[value] || 0;
     const items = [...new Array(itemValue)];
     const esfOverrides = config.ESF?.overrides || [];
@@ -47,7 +48,10 @@ export default function TesterTunnelOffer({ kind, value, label, cartOffers, upda
                                 return null;
                             }
                             if (isSkiPasses) {
-                                return (_jsxs(React.Fragment, { children: [_jsx(Input, { className: styles.input, label: `Marchand n°${number}`, placeholder: "Code (Optionnel)", value: state.merchants?.[index] || "", onValueChange: updateState("merchants"), compact: true }, index), _jsx(Input, { type: "number", className: styles.input, label: `Durée du forfait n°${number}`, placeholder: "En jour(s) (Optionnel)", min: 0, max: 40, value: state.skiPassDurations?.[index] || 0, onValueChange: updateState("skiPassDurations"), compact: true }), durations && (_jsx(Select, { className: styles.input, label: durations?.title + ` n°${number}`, placeholder: " ", options: durations?.tags, value: state.durationTags?.[index] || "", onValueChange: updateState("durationTags"), compact: true }))] }, index));
+                                return (_jsxs(React.Fragment, { children: [_jsx(Input, { className: styles.input, label: `Marchand n°${number}`, placeholder: "Code (Optionnel)", value: state.merchants?.[index] || "", onValueChange: updateState("merchants"), compact: true }), _jsx(Input, { type: "number", className: styles.input, label: `Durée du forfait n°${number}`, placeholder: "En jour(s) (Optionnel)", min: 0, max: 40, value: state.skiPassDurations?.[index] || 0, onValueChange: updateState("skiPassDurations"), compact: true }), durations && (_jsx(Select, { className: styles.input, label: durations?.title + ` n°${number}`, placeholder: " ", options: durations?.tags, value: state.durationTags?.[index] || "", onValueChange: updateState("durationTags"), compact: true }))] }, index));
+                            }
+                            if (isStandardProduct) {
+                                return (_jsxs(React.Fragment, { children: [_jsx(Input, { className: styles.input, label: `Marchand n°${number}`, placeholder: "Code (Optionnel)", value: state.merchants?.[index] || "", onValueChange: updateState("merchants"), compact: true }), _jsx(Input, { className: styles.input, label: `Groupe Elloha n°${number}`, placeholder: "Nom du groupe (Optionnel)", value: state.ellohaGroups?.[index] || "", onValueChange: updateState("ellohaGroups"), compact: true })] }, index));
                             }
                             return (_jsx(Input, { className: styles.input, label: `Marchand n°${number}`, placeholder: "Code (Optionnel)", value: state.merchants?.[index] || "", onValueChange: updateState("merchants"), compact: true }, index));
                         })] })), _jsx(NumberPicker, { label: label, value: itemValue, onChange: updateCartOffers(value), min: 0, max: 10 })] }, label));

package/package.json

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