mozrest-sdk-react-dev 0.2.24 → 0.2.26

package/mozrest-sdk.es.js

@@ -2133,7 +2133,9 @@ const useFetch = (uri, params, extra) => {
         return;
       setTimeout(() => revalidate({ retryCount }), 5e3);
     },
-    onSuccess: (extra == null ? void 0 : extra.onSuccess) || noop$c
+    onSuccess: (extra == null ? void 0 : extra.onSuccess) || noop$c,
+    revalidateOnFocus: false,
+    revalidateOnReconnect: true
   });
   return {
     data: handleFormat(data2, (extra == null ? void 0 : extra.formatData) || noopFormat),
@@ -6361,6 +6363,8 @@ const SHOWTEMPLATES = "Show templates";
 const NOSHOWRESERVATION = "No show reservation";
 const AREYOUSURENOSHOWRESERVATION = "Are you sure you want to change this reservation to no-show status?";
 const NOSHOW = "No show";
+const VENUEISCLOSED = "Venue is closed";
+const VenueClosedByConfigurationAtThisTime = "Venue is closed by configuration at this time";
 var en = {
   errors,
   SPECIALCLOSINGDATES,
@@ -6680,7 +6684,9 @@ var en = {
   SHOWTEMPLATES,
   NOSHOWRESERVATION,
   AREYOUSURENOSHOWRESERVATION,
-  NOSHOW
+  NOSHOW,
+  VENUEISCLOSED,
+  VenueClosedByConfigurationAtThisTime
 };
 instance.use(initReactI18next).init({
   resources: {
@@ -96098,25 +96104,25 @@ const UpdateResbook = async ({
       await instance$1.put(`${BASE_URL}${venue_id}/tables/${table_id}`, formarTableRules(data2));
       return { data: "updated" };
     case "opHour":
-      instance$1.put(`${BASE_URL}${venue_id}/opening-hours`, formarRegularHours(data2));
+      await instance$1.put(`${BASE_URL}${venue_id}/opening-hours`, formarRegularHours(data2));
       return { data: "updated" };
     case "arrRule":
-      instance$1.put(`${BASE_URL}${venue_id}/arrival-rules/${table_id}`, formatArrivalRules(data2));
+      await instance$1.put(`${BASE_URL}${venue_id}/arrival-rules/${table_id}`, formatArrivalRules(data2));
       return { data: "updated" };
     case "seatingRule":
-      instance$1.put(`${BASE_URL}${venue_id}/seating-rules/${table_id}`, formarSeatingRules(data2));
+      await instance$1.put(`${BASE_URL}${venue_id}/seating-rules/${table_id}`, formarSeatingRules(data2));
       return { data: "updated" };
     case "specialDate":
       if (table_id) {
-        instance$1.put(`${BASE_URL}${venue_id}/special-dates/${table_id}`, formarSpecialHours((_a2 = Object.values(data2)[0]) != null ? _a2 : {}));
+        await instance$1.put(`${BASE_URL}${venue_id}/special-dates/${table_id}`, formarSpecialHours((_a2 = Object.values(data2)[0]) != null ? _a2 : {}));
         return { data: "updated" };
       } else {
-        instance$1.post(`${BASE_URL}${venue_id}/special-dates`, formarSpecialHours((_b = Object.values(data2)[0]) != null ? _b : {}));
+        await instance$1.post(`${BASE_URL}${venue_id}/special-dates`, formarSpecialHours((_b = Object.values(data2)[0]) != null ? _b : {}));
         return { data: "created" };
       }
     case "deleteSpecialDate":
       if (table_id) {
-        instance$1.delete(`${BASE_URL}${venue_id}/special-dates/${table_id}`);
+        await instance$1.delete(`${BASE_URL}${venue_id}/special-dates/${table_id}`);
         return { data: "deleted" };
       } else {
         break;
@@ -96201,9 +96207,8 @@ const Form$3 = ({
       onCloseForm();
     }
   });
-  const handleSubmit = (data2) => {
-    execute({ venue_id: venueId, data: data2, module: "opHour" });
-    reload();
+  const handleSubmit = async (data2) => {
+    await execute({ venue_id: venueId, data: data2, module: "opHour" });
   };
   return /* @__PURE__ */ React__default.createElement(Modal2, {
     open,
@@ -97855,6 +97860,7 @@ const ReservationComp = ({
   value: value2,
   currentTimeZone,
   onClick,
+  toggleArrivedConfirmed,
   isTablet = false
 }) => {
   return /* @__PURE__ */ React__default.createElement("tr", {
@@ -97880,13 +97886,50 @@ const ReservationComp = ({
     style: { textAlign: "center" }
   }, status === "arrived" ? /* @__PURE__ */ React__default.createElement(Button$3, {
     size: "mini",
-    className: styles$g.btnWarning
-  }, "Mark as Closed") : status === "confirmed" ? /* @__PURE__ */ React__default.createElement(Button$3, {
+    className: styles$g.btnWarning,
+    onClick: (e3) => {
+      e3.stopPropagation();
+      if (toggleArrivedConfirmed) {
+        toggleArrivedConfirmed(value2, "confirmed");
+      }
+    }
+  }, "Mark as Confirmed") : status === "confirmed" ? /* @__PURE__ */ React__default.createElement(Button$3, {
     size: "mini",
-    className: styles$g.btnWarning
-  }, "Mark as Arrived") : /* @__PURE__ */ React__default.createElement("span", null)));
+    className: styles$g.btnWarning,
+    onClick: (e3) => {
+      e3.stopPropagation();
+      if (toggleArrivedConfirmed) {
+        toggleArrivedConfirmed(value2, "arrived");
+      }
+    }
+  }, "Mark as Arrived") : null));
+};
+const UpdateBooking = async ({ venueId, bookingId, data: data2 }) => {
+  await instance$1.put(`/resbook/venue/${venueId}/bookings/${bookingId}`, data2);
+  return { data: "updated" };
 };
-const Table$2 = ({ data: data2, setSelectedRow, currentTimeZone }) => {
+const UpdateBookingStatusBooking = async ({ venueId, bookingId, data: data2 }) => {
+  await instance$1.put(`/resbook/venue/${venueId}/bookings/${bookingId}`, data2);
+  return { data: "ok" };
+};
+const Table$2 = ({ data: data2, venueId, onOpenDetailReservation, selectedRow, setSelectedRow, currentTimeZone, reloadMainTable }) => {
+  const [status, setStatus] = useState("");
+  const { execute } = useService(UpdateBookingStatusBooking, {
+    onSuccess: async () => {
+      setSelectedRow({ ...selectedRow, status });
+      reloadMainTable();
+    }
+  });
+  const toggleArrivedConfirmed = async (row2, status2) => {
+    setStatus(status2);
+    execute({
+      venueId,
+      bookingId: row2.id,
+      data: {
+        status: status2
+      }
+    });
+  };
   return /* @__PURE__ */ React__default.createElement("div", null, /* @__PURE__ */ React__default.createElement("div", {
     className: styles$g.mainTableTablet
   }, data2.map((bookingValue, index2) => /* @__PURE__ */ React__default.createElement("div", {
@@ -97917,17 +97960,26 @@ const Table$2 = ({ data: data2, setSelectedRow, currentTimeZone }) => {
     status: bookingValue.status,
     id: "",
     value: bookingValue,
-    onClick: (value2) => setSelectedRow(value2),
+    onClick: (value2) => {
+      onOpenDetailReservation();
+      setSelectedRow(value2);
+    },
     isTablet: true
-  }), /* @__PURE__ */ React__default.createElement("td", {
+  }), (bookingValue.status === "arrived" || bookingValue.status === "confirmed") && /* @__PURE__ */ React__default.createElement("td", {
     style: { textAlign: "center", backgroundColor: "#F8F8F8", padding: 5 },
     colSpan: 10
   }, bookingValue.status === "arrived" ? /* @__PURE__ */ React__default.createElement(Button$3, {
     size: "mini",
-    className: styles$g.btnWarning
-  }, "Mark as Closed") : bookingValue.status === "confirmed" ? /* @__PURE__ */ React__default.createElement(Button$3, {
+    className: styles$g.btnWarning,
+    onClick: () => {
+      toggleArrivedConfirmed(bookingValue, "confirmed");
+    }
+  }, "Mark as Confirmed") : bookingValue.status === "confirmed" ? /* @__PURE__ */ React__default.createElement(Button$3, {
     size: "mini",
-    className: styles$g.btnWarning
+    className: styles$g.btnWarning,
+    onClick: () => {
+      toggleArrivedConfirmed(bookingValue, "arrived");
+    }
   }, "Mark as Arrived") : /* @__PURE__ */ React__default.createElement("span", null))))))), /* @__PURE__ */ React__default.createElement("div", {
     className: styles$g.mainTableDesktop
   }, /* @__PURE__ */ React__default.createElement("table", {
@@ -97957,7 +98009,11 @@ const Table$2 = ({ data: data2, setSelectedRow, currentTimeZone }) => {
     status: bookingValue.status,
     id: "",
     value: bookingValue,
-    onClick: (value2) => setSelectedRow(value2)
+    onClick: (value2) => {
+      onOpenDetailReservation();
+      setSelectedRow(value2);
+    },
+    toggleArrivedConfirmed
   }))))));
 };
 const container$1 = "_container_1iezk_1";
@@ -99532,7 +99588,7 @@ const TableRow$1 = ({ row: row2, setSelectedTable }) => {
     onClick: () => setSelectedTable(row2)
   }, /* @__PURE__ */ React__default.createElement("td", {
     style: { textAlign: "left", paddingTop: 10, paddingBottom: 10 }
-  }, `${row2.name} ${row2.area ? "(" + row2.area + ")" : ""}`), /* @__PURE__ */ React__default.createElement("td", {
+  }, `${row2.name} ${row2.area ? "(" + row2.area.name + ")" : ""}`), /* @__PURE__ */ React__default.createElement("td", {
     style: { textAlign: "center" }
   }, `${(_a2 = row2.minCapacity) != null ? _a2 : "?"} - ${(_b = row2.maxCapacity) != null ? _b : "?"}`), /* @__PURE__ */ React__default.createElement("td", {
     style: { textAlign: "center" }
@@ -99897,18 +99953,6 @@ const TableSelectField = ({ value: value2, tableOptions, isEdit, setIsEdit }) =>
     onClick: () => handleSubmit()
   }, "SAVE"));
 };
-const UpdateBooking = async ({ venueId, bookingId, data: data2 }) => {
-  await instance$1.put(`/resbook/venue/${venueId}/bookings/${bookingId}`, data2);
-  return { data: "updated" };
-};
-const CancelBooking = async ({ venueId, bookingId, data: data2 }) => {
-  await instance$1.put(`/resbook/venue/${venueId}/bookings/${bookingId}/cancel`, data2);
-  return { data: "canceled" };
-};
-const NoShowBooking = async ({ venueId, bookingId }) => {
-  await instance$1.put(`/resbook/venue/${venueId}/bookings/${bookingId}`, { status: "no-show" });
-  return { data: "no show ok" };
-};
 const TableSelectForm = ({ table: table2, id: id2, tableOptions, initialValues, isEdit, setIsEdit, reloadMainTable, onClose: onClose2, venueId }) => {
   const emptyVal = {
     table: { id: null, label: "Not selected" }
@@ -99934,32 +99978,10 @@ const TableSelectForm = ({ table: table2, id: id2, tableOptions, initialValues,
 };
 const CancelReservationModal = ({ onAccept, isLoading, message: message2, title: title2, ...props }) => {
   const { t: t2 } = useTranslation();
-  const initialValues = {
-    cancelActor: "",
-    cancelReason: ""
-  };
-  const bookingSchema = create$1().shape({
-    cancelActor: create$2().required(t2("errors.required")),
-    cancelReason: create$2()
-  });
   return /* @__PURE__ */ React__default.createElement(Modal2, {
     ...props,
     title: t2("CANCELRESERVATION")
-  }, /* @__PURE__ */ React__default.createElement("h5", null, t2("AREYOUSURECANCELRESERVATION")), /* @__PURE__ */ React__default.createElement("div", null, /* @__PURE__ */ React__default.createElement(Formik, {
-    initialValues,
-    validationSchema: bookingSchema,
-    onSubmit: (values, { resetForm }) => {
-      onAccept(values);
-      resetForm({ values: initialValues });
-    }
-  }, ({ values, errors: errors2, touched, isValid: isValid2 }) => /* @__PURE__ */ React__default.createElement(Form$c, null, /* @__PURE__ */ React__default.createElement(TextInputField, {
-    id: "cancelActor",
-    label: t2("FIRSTNAME")
-  }), /* @__PURE__ */ React__default.createElement(TextAreaField, {
-    id: "cancelReason",
-    label: t2("CANCELREASON"),
-    maxLength: 100
-  }), /* @__PURE__ */ React__default.createElement("div", {
+  }, /* @__PURE__ */ React__default.createElement("h5", null, t2("AREYOUSURECANCELRESERVATION")), /* @__PURE__ */ React__default.createElement("div", null, /* @__PURE__ */ React__default.createElement("div", {
     style: { display: "flex", justifyContent: "center", gap: 20, marginTop: 20 }
   }, /* @__PURE__ */ React__default.createElement(Button$3, {
     size: "small",
@@ -99969,9 +99991,9 @@ const CancelReservationModal = ({ onAccept, isLoading, message: message2, title:
   }, t2("CANCEL")), /* @__PURE__ */ React__default.createElement(Button$3, {
     size: "small",
     type: "submit",
-    disabled: !isValid2,
+    onClick: () => onAccept(),
     isLoading
-  }, t2("ACCEPT")))))));
+  }, t2("ACCEPT")))));
 };
 const NoShowReservationModal = ({ onAccept, isLoading, message: message2, title: title2, ...props }) => {
   const { t: t2 } = useTranslation();
@@ -100011,29 +100033,37 @@ const ReservationDetail = ({ open, onClose: onClose2, venueId, reloadMainTable,
       partySize: selectedRow.partySize
     } : { startSec: null }
   });
-  const { isExecuting, execute } = useService(CancelBooking, {
+  const { isExecuting, execute } = useService(UpdateBookingStatusBooking, {
     onSuccess: async () => {
       setSelectedRow({ ...selectedRow, status: "canceled" });
       onCloseCancelRevModal();
       reloadMainTable();
     }
   });
-  const { isExecuting: isExecutingNoShow, execute: executoNoShow } = useService(NoShowBooking, {
+  const { isExecuting: isExecutingNoShow, execute: executoNoShow } = useService(UpdateBookingStatusBooking, {
     onSuccess: async () => {
       setSelectedRow({ ...selectedRow, status: "no-show" });
       onCloseNoShowRevModal();
       reloadMainTable();
     }
   });
-  const cancelReservation = async (values) => {
-    const toSend = {
-      cancelActor: values.cancelActor,
-      cancelReason: values.cancelReason
-    };
-    execute({ data: toSend, venueId, bookingId: selectedRow.id });
+  const cancelReservation = async () => {
+    execute({
+      venueId,
+      bookingId: selectedRow.id,
+      data: {
+        status: "canceled"
+      }
+    });
   };
   const noShowReservation = async () => {
-    executoNoShow({ venueId, bookingId: selectedRow.id });
+    executoNoShow({
+      venueId,
+      bookingId: selectedRow.id,
+      data: {
+        status: "no-show"
+      }
+    });
   };
   useEffect(() => {
     if (selectedRow && selectedRow.table && open) {
@@ -100127,14 +100157,14 @@ const ReservationDetail = ({ open, onClose: onClose2, venueId, reloadMainTable,
     type: "submit",
     className: styles$g.btnDanger,
     onClick: () => onOpenNoShowRevModal()
-  }, t2("NOSHOW")))), selectedRow && selectedRow.status && selectedRow.status !== "canceled" && /* @__PURE__ */ React__default.createElement(CancelReservationModal, {
+  }, t2("NOSHOW")))), /* @__PURE__ */ React__default.createElement(CancelReservationModal, {
     width: 400,
     message: t2("AREYOUSURECANCELRESERVATION"),
     onAccept: cancelReservation,
     open: openCancelReservationModal,
     onClose: onCloseCancelRevModal,
     isLoading: isExecuting || isExecutingNoShow
-  }), selectedRow && selectedRow.status && selectedRow.status === "confirmed" && /* @__PURE__ */ React__default.createElement(NoShowReservationModal, {
+  }), /* @__PURE__ */ React__default.createElement(NoShowReservationModal, {
     width: 400,
     message: t2("AREYOUSURENOSHOWRESERVATION"),
     onAccept: noShowReservation,
@@ -100309,11 +100339,16 @@ const WalkinButton = ({ partyOptions, onOpenCreateWalkInReservation, walkInParty
 };
 const CreateWalkInReservation = ({ open, onClose: onClose2, venueId, reloadMainTable, currentTimeZone, currentDate, partySize }) => {
   const { t: t2 } = useTranslation();
+  const [hourOpen, setHourOpen] = useState(true);
   const params = {
     partySize,
-    startSec: moment$1.tz(`${currentDate} 12:00`, currentTimeZone ? currentTimeZone : "").valueOf() / 1e3
+    startSec: moment$1.tz(`${currentDate} ${moment$1().format("HH:mm")}`, currentTimeZone ? currentTimeZone : "").valueOf() / 1e3
   };
-  const { data: data2, isLoading, reload } = useFetch(GetTableWalkInAvailability, { cacheId: "walkIntableAvailability", venue_id: venueId, params });
+  const { data: data2, isLoading } = useFetch(GetTableWalkInAvailability, { cacheId: "walkIntableAvailability", venue_id: venueId, params });
+  const { data: openingHours, isLoading: isLoadingOpeningHours } = useFetch(GetOpeningHours, {
+    cacheId: "opening0hours",
+    venue_id: venueId
+  });
   const { execute, isExecuting } = useService(AddBooking);
   const handleOnSubmit = async () => {
     const toSend = {
@@ -100336,18 +100371,40 @@ const CreateWalkInReservation = ({ open, onClose: onClose2, venueId, reloadMainT
     reloadMainTable();
     onClose2();
   };
-  return /* @__PURE__ */ React__default.createElement(ModalConfirmation, {
-    title: data2 && data2.id ? t2("AREYOUSURE?") : t2("NoBookingAvailability"),
-    icon: data2 && data2.id ? "calendar" : "no",
-    message: data2 && data2.id ? t2("ConfirmCreateWalkInReservation", { value: partySize }) : t2("NoAvailabilityForPartySize", { value: partySize }),
-    showSubmitButton: data2 && data2.id ? true : false,
-    cancelButtonText: data2 && data2.id ? void 0 : t2("CLOSE"),
+  const isTimeBetween = (targetTime, startTime, endTime) => {
+    const targetMoment = moment$1(targetTime, "HH:mm");
+    const startMoment = moment$1(startTime, "HH:mm");
+    const endMoment = moment$1(endTime, "HH:mm");
+    return targetMoment.isBetween(startMoment, endMoment, null, "[]");
+  };
+  useEffect(() => {
+    if (openingHours && openingHours.length > 0) {
+      const dayWeekName = moment$1(currentDate).format("dddd").toLocaleLowerCase();
+      const dayWeek = openingHours.find((d2) => d2.day === dayWeekName && !d2.closed);
+      if (dayWeek && dayWeek.timeslots && dayWeek.timeslots.length > 0) {
+        const time2 = moment$1.tz(moment$1(), currentTimeZone ? currentTimeZone : "").format("HH:mm");
+        let isBetween2 = false;
+        dayWeek.timeslots.map((ts) => {
+          if (isTimeBetween(time2, ts.start, ts.end)) {
+            isBetween2 = true;
+          }
+        });
+        setHourOpen(isBetween2);
+      }
+    }
+  }, [openingHours]);
+  return /* @__PURE__ */ React__default.createElement(React__default.Fragment, null, !isLoading && !isLoadingOpeningHours && /* @__PURE__ */ React__default.createElement(ModalConfirmation, {
+    title: !hourOpen ? t2("VENUEISCLOSED") : data2 && data2.id ? t2("AREYOUSURE?") : t2("NoBookingAvailability"),
+    icon: hourOpen && data2 && data2.id ? "calendar" : "no",
+    message: !hourOpen ? t2("VenueClosedByConfigurationAtThisTime") : data2 && data2.id ? t2("ConfirmCreateWalkInReservation", { value: partySize }) : t2("NoAvailabilityForPartySize", { value: partySize }),
+    showSubmitButton: hourOpen && data2 && data2.id ? true : false,
+    cancelButtonText: hourOpen && data2 && data2.id ? void 0 : t2("CLOSE"),
     onAccept: () => handleOnSubmit(),
     open,
     onClose: onClose2,
     isLoading: isLoading || isExecuting,
     width: 500
-  });
+  }));
 };
 const ReservationDashboard = ({
   Header: Header2,
@@ -100475,9 +100532,12 @@ const ReservationDashboard = ({
     currentDate
   })), isLoading ? /* @__PURE__ */ React__default.createElement(SkeletonPage, null) : /* @__PURE__ */ React__default.createElement(Table$2, {
     currentTimeZone: currentTimeZone.current,
+    venueId,
     data: data2,
+    reloadMainTable: reload,
+    onOpenDetailReservation,
+    selectedRow,
     setSelectedRow: (row2) => {
-      onOpenDetailReservation();
       setSelectedRow(row2);
     }
   })), /* @__PURE__ */ React__default.createElement(HoursAvailability, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mozrest-sdk-react-dev",
-  "version": "0.2.24",
+  "version": "0.2.26",
   "main": "mozrest-sdk.es.js",
   "keywords": ["mozrest"],
   "author": {