ublo-lib 1.26.2 → 1.26.4

package/es/common/components/date-picker/month.module.css

@@ -1,54 +1,34 @@
 .month {
-  flex: 0 0 50%;
-  padding: 0 10px;
+  flex: 1 1 100%;
 }
 
 .title {
-  margin-bottom: 10px;
+  margin-bottom: 8px;
   color: var(--ds-grey-600, #383838);
-  font-size: 15px;
+  font-size: 17px;
   font-weight: 700;
-  text-transform: uppercase;
   text-align: center;
 }
 
 .dates,
 .days {
   display: grid;
-  grid-template-columns: repeat(7, minmax(40px, 1fr));
-  gap: 3px;
+  grid-template-columns: repeat(7, minmax(39px, 1fr));
+  gap: 3px 0;
 }
 
 .days {
   height: 34px;
   align-items: center;
-  margin-bottom: 3px;
-  background-color: var(--ds-grey-100, #f5f5f5);
-  border-radius: var(--ds-radius-100, 3px);
+  margin-bottom: 10px;
+  background-color: var(--ds-grey-100, #f8f8f8);
+  border-radius: var(--ds-radius-200, 8px);
 }
 
 .day {
-  color: var(--ds-grey-400, #bbbbbb);
-  font-size: 11px;
+  color: var(--ds-grey-500, #7c7b7b);
+  font-size: 12px;
   text-align: center;
-  font-weight: 700;
-  text-transform: uppercase;
   transition: color 160ms
-    var(--ds-transition-easing, cubic-bezier(0.4, 0, 0.2, 1));
-}
-
-@media (min-width: 480px) {
-  .day {
-    font-size: 13px;
-  }
-}
-
-@media (min-width: 1001px) {
-  .day {
-    font-size: 15px;
-  }
-}
-
-.dayActive {
-  color: var(--ds-secondary, var(--ds-blue-400, #4177f6));
+    var(--ds-transition-easing, cubic-bezier(0.4, 0.1, 0.2, 0.9));
 }

package/es/common/components/date-picker/utils.js

@@ -43,14 +43,6 @@ export const isSameDay = (date, basedate = new Date()) => {
   const dateYear = date.getFullYear();
   return basedateDate === dateDate && basedateMonth === dateMonth && basedateYear === dateYear;
 };
-export const isSaturday = date => {
-  const d = Array.isArray(date) ? date.join("-") : date;
-  return new Date(d).getDay() === 6;
-};
-export const isSunday = date => {
-  const d = Array.isArray(date) ? date.join("-") : date;
-  return new Date(d).getDay() === 0;
-};
 export const isPast = date => {
   const d = Array.isArray(date) ? date.join("-") : date;
   const _date = new Date(d);
@@ -116,4 +108,11 @@ export const getNextMonth = (month, year) => {
     month: nextMonth,
     year: nextMonthYear
   };
-};
+};
+export function getMatchingStays(stays, selectedDates) {
+  if (!stays?.length || !selectedDates.length) return;
+  const matchingStays = stays?.filter(s => {
+    return formatDate(s.start) === formatDate(selectedDates[0]);
+  });
+  return matchingStays;
+}

package/es/common/components/msem-preset-editor/editors/lodgings.js

@@ -171,7 +171,7 @@ export default function Lodgings({
       const children = parseInt(data.children);
       const accomodation = lodging || undefined;
       const openPage = lodging ? data.openPage : undefined;
-      const agesChildren = [...new Array(children)].map(_ => 12);
+      const agesChildren = [...new Array(children)].map(() => 12);
       const paxPlan = adults ? {
         adults,
         children,

package/es/common/components/msem-preset-editor/editors/vakario.js

@@ -25,6 +25,7 @@ export default function Vakario({
   const [levelCodes, setLevelCodes] = React.useState([]);
   const [data, setData] = React.useState(getDefaultData(preset));
   const {
+    channel,
     merchant
   } = preset?.options;
   const cancelPreset = () => {
@@ -68,7 +69,7 @@ export default function Vakario({
     const runEffect = async () => {
       try {
         setLoading(true);
-        const kinds = await API.getVakarioKinds(merchant);
+        const kinds = await API.getVakarioKinds(channel, merchant);
         const formatedKinds = kinds.map(({
           code,
           name
@@ -90,13 +91,13 @@ export default function Vakario({
       }
     };
     runEffect();
-  }, [merchant]);
+  }, [channel, merchant]);
   React.useEffect(() => {
     if (data.kindCodes) {
       const runEffect = async () => {
         try {
           setLoading(true);
-          const ages = await API.getVakarioAges(merchant, data.kindCodes);
+          const ages = await API.getVakarioAges(channel, merchant, data.kindCodes);
           const formatedAges = ages.map(({
             code,
             name
@@ -118,13 +119,13 @@ export default function Vakario({
       };
       runEffect();
     }
-  }, [merchant, data.kindCodes]);
+  }, [merchant, data.kindCodes, channel]);
   React.useEffect(() => {
     if (data.kindCodes && data.ageCodes) {
       const runEffect = async () => {
         try {
           setLoading(true);
-          const categories = await API.getVakarioCategories(merchant, data.kindCodes, data.ageCodes);
+          const categories = await API.getVakarioCategories(channel, merchant, data.kindCodes, data.ageCodes);
           const formatedCategories = categories.map(({
             code,
             name
@@ -145,13 +146,13 @@ export default function Vakario({
       };
       runEffect();
     }
-  }, [merchant, data.kindCodes, data.ageCodes]);
+  }, [merchant, data.kindCodes, data.ageCodes, channel]);
   React.useEffect(() => {
     if (data.kindCodes && data.ageCodes && data.categoryCodes) {
       const runEffect = async () => {
         try {
           setLoading(true);
-          const levels = await API.getVakarioLevels(merchant, data.kindCodes, data.ageCodes, data.categoryCodes);
+          const levels = await API.getVakarioLevels(channel, merchant, data.kindCodes, data.ageCodes, data.categoryCodes);
           const formatedLevels = levels.map(({
             code,
             name
@@ -168,7 +169,7 @@ export default function Vakario({
       };
       runEffect();
     }
-  }, [merchant, data.kindCodes, data.ageCodes, data.categoryCodes]);
+  }, [merchant, data.kindCodes, data.ageCodes, data.categoryCodes, channel]);
   React.useEffect(() => {
     setPreset((current = {}) => {
       const {

package/es/common/components/msem-preset-editor/services/api.js

@@ -77,20 +77,20 @@ export async function getEllohaGroups(merchant, stayFrom, language = "fr") {
     date: stayFrom
   });
 }
-export async function getVakarioKinds(merchant, language = "fr") {
-  const endpoint = `${msemServicesUrl}/api/vakario/${merchant}/${language}/kinds`;
+export async function getVakarioKinds(channel, merchant, language = "fr") {
+  const endpoint = `${msemServicesUrl}/api/vakario/${channel}/${merchant}/${language}/kinds`;
   return Fetcher.get(endpoint);
 }
-export async function getVakarioAges(merchant, kind, language = "fr") {
-  const endpoint = `${msemServicesUrl}/api/vakario/${merchant}/${language}/${kind}/ages`;
+export async function getVakarioAges(channel, merchant, kind, language = "fr") {
+  const endpoint = `${msemServicesUrl}/api/vakario/${channel}/${merchant}/${language}/${kind}/ages`;
   return Fetcher.get(endpoint);
 }
-export async function getVakarioCategories(merchant, kind, age, language = "fr") {
-  const endpoint = `${msemServicesUrl}/api/vakario/${merchant}/${language}/${kind}/${age}/categories`;
+export async function getVakarioCategories(channel, merchant, kind, age, language = "fr") {
+  const endpoint = `${msemServicesUrl}/api/vakario/${channel}/${merchant}/${language}/${kind}/${age}/categories`;
   return Fetcher.get(endpoint);
 }
-export async function getVakarioLevels(merchant, kind, age, category, language = "fr") {
-  const endpoint = `${msemServicesUrl}/api/vakario/${merchant}/${language}/${kind}/${age}/${category}/levels`;
+export async function getVakarioLevels(channel, merchant, kind, age, category, language = "fr") {
+  const endpoint = `${msemServicesUrl}/api/vakario/${channel}/${merchant}/${language}/${kind}/${age}/${category}/levels`;
   return Fetcher.get(endpoint);
 }
 export async function getOtherProductsCategories(facet, merchant, lang = "fr") {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ublo-lib",
-  "version": "1.26.2",
+  "version": "1.26.4",
   "peerDependencies": {
     "dt-design-system": "^3.8.3",
     "leaflet": "^1.9.1",

package/es/common/components/date-picker/modes.js

@@ -1,38 +0,0 @@
-import * as React from "react";
-import classNames from "classnames";
-import { useUbloContext } from "ublo/with-ublo";
-import * as Messages from "./messages";
-import * as Icons from "dt-design-system/es/icons";
-import styles from "./modes.module.css";
-import { jsx as _jsx } from "react/jsx-runtime";
-import { jsxs as _jsxs } from "react/jsx-runtime";
-const modes = ["saturday", "sunday", "custom"];
-const Modes = ({
-  currentMode,
-  setCurrentMode
-}) => {
-  const {
-    lang
-  } = useUbloContext();
-  return _jsx("div", {
-    className: styles.modes,
-    children: modes.map(mode => {
-      const index = modes.indexOf(mode);
-      const classes = classNames(styles.mode, {
-        [styles.modeSelected]: currentMode === index
-      });
-      const clicked = () => setCurrentMode(index);
-      return _jsxs("button", {
-        className: classes,
-        onClick: clicked,
-        children: [_jsx(Icons.ChevronRight, {}), _jsxs("div", {
-          className: styles.inner,
-          children: [Messages.get(lang, "mode-book"), _jsx("span", {
-            children: Messages.get(lang, `mode-book-${mode}`)
-          })]
-        })]
-      }, mode);
-    })
-  });
-};
-export default Modes;

package/es/common/components/date-picker/modes.module.css

@@ -1,90 +0,0 @@
-.modes {
-  display: none;
-}
-
-@media (min-width: 650px) {
-  .modes {
-    position: relative;
-    grid-column: 1;
-    display: flex;
-    flex-direction: column;
-    gap: 8px;
-    padding: 8px;
-    border-radius: var(--ds-radius-100, 3px) 0 0 var(--ds-radius-100, 3px);
-    z-index: 1;
-  }
-}
-
-.mode {
-  position: relative;
-  flex: 1 1 100%;
-  display: flex;
-  align-items: center;
-  text-align: left;
-  padding: 20px 35px 20px 25px;
-  color: var(--ds-grey-600, #383838);
-  font-size: 16px;
-  background-color: var(--ds-grey-100, #f5f5f5);
-  border-radius: var(--ds-radius-100, 3px);
-  cursor: pointer;
-  user-select: none;
-  transition: background-color 160ms
-    var(--ds-transition-easing, cubic-bezier(0.4, 0, 0.2, 1));
-}
-
-@media (min-width: 810px) {
-  .mode:nth-child(3) {
-    border-bottom: 0;
-  }
-}
-
-.mode:not(.modeSelected):hover {
-  background-color: var(--ds-grey-300, #efefef);
-}
-
-.modeSelected {
-  color: var(--ds-grey-000, #fff);
-  background-color: var(--ds-secondary, var(--ds-blue-400, #4177f6));
-}
-
-.mode > svg {
-  position: absolute;
-  top: 50%;
-  left: 20px;
-  width: 20px;
-  height: 20px;
-  fill: var(--ds-grey-000, #fff);
-  transform: translate3d(-15px, -50%, 0) scale3d(0, 0, 0);
-  opacity: 0;
-  transition: transform 160ms
-      var(--ds-transition-easing, cubic-bezier(0.4, 0, 0.2, 1)),
-    opacity 160ms var(--ds-transition-easing, cubic-bezier(0.4, 0, 0.2, 1));
-}
-
-.modeSelected > svg {
-  opacity: 1;
-  transform: translate3d(0, -50%, 0) scale3d(1, 1, 1);
-}
-
-.inner {
-  display: flex;
-  flex-direction: column;
-  justify-content: center;
-  transition: transform 160ms
-    var(--ds-transition-easing, cubic-bezier(0.4, 0, 0.2, 1));
-}
-
-.modeSelected .inner {
-  transform: translate3d(20px, 0, 0);
-}
-
-.inner > span {
-  color: var(--ds-grey-600, #383838);
-  font-size: 19px;
-  white-space: nowrap;
-  font-weight: 700;
-}
-
-.modeSelected .inner > span {
-  color: var(--ds-grey-000, #fff);
-}