@pisell/private-materials 3.0.157-gray → 3.0.158

package/lib/components/booking/utils.js

@@ -112,9 +112,7 @@ var sliceDayIntoFiveMinutes = (config, locale) => {
         value: durationValue
       });
     } else {
-      const durationLabel = `${durationValue} ${import_utils.locales.getText(
-        "pisell2.text.min"
-      )}`;
+      const durationLabel = `${durationValue} ${import_utils.locales.getText("pisell2.text.min")}`;
       durationSlicesBasedOnTime.push({
         label: durationLabel,
         value: durationValue
@@ -137,9 +135,7 @@ var getServeStartTime = (start_time) => {
   return start_time;
 };
 var getServiceTime = (item, currentDate) => {
-  const startDate = (0, import_dayjs.default)(
-    currentDate.format("YYYY-MM-DD") + " " + getServeStartTime(item._extend.start_time)
-  );
+  const startDate = (0, import_dayjs.default)(currentDate.format("YYYY-MM-DD") + " " + getServeStartTime(item._extend.start_time));
   const startTime = startDate.format("HH:mm");
   const endTime = startDate.add(flexibleObj.getValue(item._extend.duration), "minute").format("HH:mm");
   const duration = getDiscountTime(flexibleObj.getValue(item._extend.duration));
@@ -187,7 +183,10 @@ var formatProductListByCategory = (list, filterItem) => {
         }
         categoryObject[categoryItem.id] = {
           ...categoryItem,
-          products: [...categoryObject[categoryItem.id].products, productItem]
+          products: [
+            ...categoryObject[categoryItem.id].products,
+            productItem
+          ]
         };
       }
     } else {
@@ -209,9 +208,7 @@ var formatProductListByCategory = (list, filterItem) => {
   return Object.values(categoryObject).sort((a, b) => b.sort - a.sort);
 };
 var getResourceTimeIsUsable = (item, cacheItem) => {
-  const startDate = (0, import_dayjs.default)(
-    cacheItem._extend.start_date.format("YYYY-MM-DD") + " " + getServeStartTime(cacheItem._extend.start_time)
-  );
+  const startDate = (0, import_dayjs.default)(cacheItem._extend.start_date.format("YYYY-MM-DD") + " " + getServeStartTime(cacheItem._extend.start_time));
   const isFlexible = flexibleObj.isFlexible(cacheItem._extend.duration);
   let isMaxLimitRange = false;
   let isDateRange = false;
@@ -221,22 +218,13 @@ var getResourceTimeIsUsable = (item, cacheItem) => {
   } else {
     isMaxLimitRange = "unknown";
   }
-  const timeStartDate = (0, import_dayjs.default)(time.start_date + " " + time.start_time).subtract(
-    1,
-    "second"
-  );
-  const timeEndDate = (0, import_dayjs.default)(time.end_date + " " + time.end_time).add(
-    1,
-    "second"
-  );
+  const timeStartDate = (0, import_dayjs.default)(time.start_date + " " + time.start_time).subtract(1, "second");
+  const timeEndDate = (0, import_dayjs.default)(time.end_date + " " + time.end_time).add(1, "second");
   let bol;
   if (isFlexible) {
     bol = startDate.isAfter(timeStartDate) && startDate.isBefore(timeEndDate);
   } else {
-    let endDate = startDate.add(
-      flexibleObj.getValue(cacheItem._extend.duration),
-      "minute"
-    );
+    let endDate = startDate.add(flexibleObj.getValue(cacheItem._extend.duration), "minute");
     bol = startDate.isAfter(timeStartDate) && endDate.isBefore(timeEndDate);
   }
   if (bol) {
@@ -341,9 +329,7 @@ var flexibleObj = {
 };
 var getEndDate = (startDate, duration, endDate) => {
   if (duration === "flexible") {
-    let openingDate = (0, import_dayjs.default)(
-      startDate.format("YYYY-MM-DD") + " " + getShopOpeningHours()
-    );
+    let openingDate = (0, import_dayjs.default)(startDate.format("YYYY-MM-DD") + " " + getShopOpeningHours());
     if ((0, import_dayjs.default)(startDate).isAfter(openingDate)) {
       openingDate = openingDate.add(1, "day");
     }
@@ -358,13 +344,8 @@ var getEndDate = (startDate, duration, endDate) => {
   return startDate.add(duration, "minute");
 };
 var getServiceTimes = (service) => {
-  const startDate = (0, import_dayjs.default)(
-    (0, import_dayjs.default)(service._extend.start_date).format("YYYY-MM-DD ") + getServeStartTime(service._extend.start_time)
-  );
-  const endDate = startDate.add(
-    flexibleObj.getValue(service._extend.duration),
-    "minute"
-  );
+  const startDate = (0, import_dayjs.default)((0, import_dayjs.default)(service._extend.start_date).format("YYYY-MM-DD ") + getServeStartTime(service._extend.start_time));
+  const endDate = startDate.add(flexibleObj.getValue(service._extend.duration), "minute");
   return {
     startDate,
     endDate
@@ -373,12 +354,10 @@ var getServiceTimes = (service) => {
 var getErrorList = (resource, cacheItem) => {
   var _a, _b, _c;
   if (!(cacheItem == null ? void 0 : cacheItem.id)) {
-    return [
-      {
-        label: import_utils.locales.getText("pisell2.text.no-product-added"),
-        type: "products"
-      }
-    ];
+    return [{
+      label: import_utils.locales.getText("pisell2.text.no-product-added"),
+      type: "products"
+    }];
   }
   if (!resource || !resource._extend || !cacheItem) {
     return [];
@@ -387,10 +366,7 @@ var getErrorList = (resource, cacheItem) => {
   if (!resource.usable) {
     if (!((_a = resource == null ? void 0 : resource._extend) == null ? void 0 : _a.usableProduct)) {
       list.push({
-        label: import_utils.locales.getText("pisell1.text.resource-error-message-1")(
-          resource.labelText,
-          cacheItem == null ? void 0 : cacheItem.title
-        ),
+        label: import_utils.locales.getText("pisell1.text.resource-error-message-1")(resource.labelText, cacheItem == null ? void 0 : cacheItem.title),
         type: "product"
       });
     }
@@ -402,21 +378,13 @@ var getErrorList = (resource, cacheItem) => {
     }
     if (!((_b = resource._extend) == null ? void 0 : _b.usableTime)) {
       list.push({
-        label: import_utils.locales.getText("pisell1.text.resource-error-message-2")(
-          resource.labelText,
-          startText,
-          endText
-        ),
+        label: import_utils.locales.getText("pisell1.text.resource-error-message-2")(resource.labelText, startText, endText),
         type: "time"
       });
     } else {
       if (!((_c = resource._extend) == null ? void 0 : _c.usableTime._extend.isMaxLimitRange)) {
         list.push({
-          label: import_utils.locales.getText("pisell1.text.resource-error-message-3")(
-            resource.labelText,
-            startText,
-            endText
-          ),
+          label: import_utils.locales.getText("pisell1.text.resource-error-message-3")(resource.labelText, startText, endText),
           type: "limit"
         });
       }
@@ -486,14 +454,11 @@ var getServerItemExtend = (state, cacheItem, timeObj) => {
         _extend.resource = resourceId;
       }
     }
+    console.log("_extend", findNextSliceProps);
     if (findNextSliceProps.date && findNextSliceProps.date !== "00:00") {
       _extend.start_time = findNextSlice(findNextSliceProps);
     } else {
-      if (cacheItem.currentDefaultTime) {
-        _extend.start_time = cacheItem.currentDefaultTime;
-      } else {
-        _extend.start_time = (0, import_dayjs.default)().format("HH:mm");
-      }
+      _extend.start_time = (0, import_dayjs.default)().format("HH:mm");
     }
   }
   _extend = {

package/lib/components/schedules/index.d.ts

@@ -1,3 +1,3 @@
 import "./index.less";
-declare const Schedules: (props: any) => any;
+declare const Schedules: (props: any) => JSX.Element;
 export default Schedules;

package/lib/components/schedules/model.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { CalendarDataItem, ScheduleItem } from "./type";
 import dayjs from "dayjs";
 export interface FormState {
@@ -69,7 +68,7 @@ export interface FormState {
     };
     setGlobalState: Function | null;
 }
-export declare const Provider: (ComponentUi: any) => (props: any) => any, Context: import("react").Context<{
+export declare const Provider: (ComponentUi: any) => (props: any) => JSX.Element, Context: import("react").Context<{
     state: FormState;
 } & {
     dispatch: (params: {

package/lib/components/schedules/resources/add/index.js

@@ -36,9 +36,9 @@ var import_antd = require("antd");
 var import_react = require("react");
 var import_useComponents = __toESM(require("../../../../hooks/useComponents"));
 var ResourcesAdd = ({ onSuccess }, refs) => {
-  const fromDataNewRef = (0, import_react.useRef)();
-  const [FromDataNew] = (0, import_useComponents.default)({
-    components: ["FromDataNew"]
+  const formDataNewRef = (0, import_react.useRef)();
+  const [FormDataNew] = (0, import_useComponents.default)({
+    components: ["FormDataNew"]
   });
   const [open, setOpen] = (0, import_react.useState)(false);
   const [formId, setFormId] = (0, import_react.useState)(0);
@@ -58,7 +58,7 @@ var ResourcesAdd = ({ onSuccess }, refs) => {
   });
   const onSubmit = () => {
     var _a;
-    (_a = fromDataNewRef.current) == null ? void 0 : _a.submit();
+    (_a = formDataNewRef.current) == null ? void 0 : _a.submit();
   };
   return /* @__PURE__ */ React.createElement(
     import_antd.Modal,
@@ -69,11 +69,11 @@ var ResourcesAdd = ({ onSuccess }, refs) => {
       onOk: onSubmit,
       destroyOnClose: true
     },
-    FromDataNew && /* @__PURE__ */ React.createElement(
-      FromDataNew,
+    FormDataNew && /* @__PURE__ */ React.createElement(
+      FormDataNew,
       {
         formId,
-        ref: fromDataNewRef,
+        ref: formDataNewRef,
         formChange: (isSuccess, params) => {
           if (isSuccess) {
             onSuccess == null ? void 0 : onSuccess(params);

package/lib/components/schedules/resources/edit/index.d.ts

@@ -0,0 +1,4 @@
+import React from 'react';
+import './index.less';
+declare const _default: React.ForwardRefExoticComponent<Omit<any, "ref"> & React.RefAttributes<unknown>>;
+export default _default;

package/lib/components/schedules/resources/edit/index.js

@@ -0,0 +1,132 @@
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/components/schedules/resources/edit/index.tsx
+var edit_exports = {};
+__export(edit_exports, {
+  default: () => edit_default
+});
+module.exports = __toCommonJS(edit_exports);
+var import_react = __toESM(require("react"));
+var import_antd = require("antd");
+var import_drawer = __toESM(require("../../../booking/components/drawer"));
+var import_useComponents = __toESM(require("../../../../hooks/useComponents"));
+var import_utils = require("@pisell/utils");
+var import_index = require("./index.less");
+var filterList = [
+  "schedule",
+  "max_participants",
+  "partyroom_package",
+  "products",
+  "capacity"
+];
+var ResourcesDetail = ({ onSuccess }, refs) => {
+  const formDataEditRef = (0, import_react.useRef)();
+  const [FormDataEdit] = (0, import_useComponents.default)({
+    components: ["FormDataEdit"]
+  });
+  const [open, setOpen] = (0, import_react.useState)(false);
+  const [currentResource, setCurrentResource] = (0, import_react.useState)({});
+  const [formId, setFormId] = (0, import_react.useState)(0);
+  const [formRecordId, setFormRecordId] = (0, import_react.useState)(0);
+  const onClose = () => {
+    setOpen(false);
+  };
+  const onOpen = () => {
+    setOpen(true);
+  };
+  (0, import_react.useImperativeHandle)(refs, () => {
+    return {
+      open: (item) => {
+        onOpen();
+        setCurrentResource(item);
+        setFormId(item.form_id);
+        setFormRecordId(item.id);
+      }
+    };
+  });
+  const onSubmit = () => {
+    var _a;
+    console.log("formDataEditRef", formDataEditRef);
+    (_a = formDataEditRef.current) == null ? void 0 : _a.submit();
+  };
+  (0, import_react.useEffect)(() => {
+    console.log("formDataEditRef?.current", formDataEditRef == null ? void 0 : formDataEditRef.current);
+  }, [formDataEditRef == null ? void 0 : formDataEditRef.current]);
+  return /* @__PURE__ */ import_react.default.createElement(
+    import_drawer.default,
+    {
+      width: "100%",
+      placement: "right",
+      open,
+      getContainer: document.querySelector(
+        ".pisell-lowcode__schedules-component-resources"
+      ) || document.body,
+      titleNoWrap: true,
+      headerStyle: {
+        display: "none"
+      },
+      onClose: () => {
+        onClose(false);
+      },
+      bodyStyle: {
+        padding: 0
+      },
+      title: currentResource == null ? void 0 : currentResource.title,
+      rootStyle: { position: "absolute" },
+      contentWrapperStyle: { boxShadow: "none" },
+      destroyOnClose: true
+    },
+    FormDataEdit && /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, /* @__PURE__ */ import_react.default.createElement(
+      FormDataEdit,
+      {
+        formId,
+        formRecordId,
+        filterList,
+        onReady: (ref) => {
+          formDataEditRef.current = ref;
+        },
+        formChange: (isSuccess, params) => {
+          if (isSuccess) {
+            onSuccess == null ? void 0 : onSuccess(params);
+            onClose();
+          }
+        }
+      }
+    ), /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__schedules-component-resources-detail-footer" }, /* @__PURE__ */ import_react.default.createElement(
+      import_antd.Button,
+      {
+        className: "footer-btn",
+        type: "primary",
+        onClick: onSubmit
+      },
+      import_utils.locales.getText("pisell2.text.schedules.save")
+    )))
+  );
+};
+var edit_default = (0, import_react.forwardRef)(ResourcesDetail);

package/lib/components/schedules/resources/edit/index.less

@@ -0,0 +1,19 @@
+.pisell-lowcode__schedules-component-resources-detail-footer {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  position: absolute;
+  padding: 8px 16px;
+  border-top: 1px solid rgba(22, 44, 88, 0.09);
+  bottom: 0;
+  width: 100%;
+  left: 0;
+  background-color: #ffffff;
+  z-index: 999;
+  .footer-btn {
+    flex: 1;
+    &.cancel-btn {
+      margin-right: 12px;
+    }
+  }
+}

package/lib/components/schedules/resources/index.d.ts

@@ -1,4 +1,4 @@
-import React from "react";
-import "./index.less";
+import React from 'react';
+import './index.less';
 declare const Resources: () => React.JSX.Element;
 export default Resources;

package/lib/components/schedules/resources/index.js

@@ -39,6 +39,7 @@ var import_CurrentDay = __toESM(require("../components/CurrentDay"));
 var import_Search = __toESM(require("../components/Search"));
 var import_model = require("../model");
 var import_add = __toESM(require("./add"));
+var import_edit = __toESM(require("./edit"));
 var import_detail = __toESM(require("./detail"));
 var import_index = require("./index.less");
 var import_list = __toESM(require("./list"));
@@ -49,6 +50,7 @@ var Resources = () => {
   const { currentSelectDayDetail, resources, tabKey } = state;
   const cacheResource = resources == null ? void 0 : resources.cacheResource;
   const resourcesAddRef = (0, import_react.useRef)();
+  const resourcesEditRef = (0, import_react.useRef)();
   const resourcesDetailRef = (0, import_react.useRef)();
   const [seachText, setSearchText] = (0, import_react.useState)("");
   const [activeKey, setActiveKey] = (0, import_react.useState)([]);
@@ -98,7 +100,7 @@ var Resources = () => {
   (0, import_react.useEffect)(() => {
     var _a, _b;
     if (cacheResource) {
-      (_b = (_a = resourcesDetailRef.current) == null ? void 0 : _a.open) == null ? void 0 : _b.call(_a, cacheResource);
+      (_b = (_a = resourcesEditRef.current) == null ? void 0 : _a.open) == null ? void 0 : _b.call(_a, cacheResource);
       setTimeout(() => {
         var _a2;
         const el = document.getElementById(`${cacheResource.id}`);
@@ -137,7 +139,8 @@ var Resources = () => {
             list: resources2.map((resource) => {
               return {
                 id: resource.id,
-                title: resource.title
+                title: resource.title,
+                form_id: item.id
               };
             }),
             addClick: () => {
@@ -146,7 +149,7 @@ var Resources = () => {
             },
             itemClick: (resource) => {
               var _a, _b;
-              (_b = (_a = resourcesDetailRef.current) == null ? void 0 : _a.open) == null ? void 0 : _b.call(_a, resource);
+              (_b = (_a = resourcesEditRef.current) == null ? void 0 : _a.open) == null ? void 0 : _b.call(_a, resource);
             }
           }
         )
@@ -193,7 +196,7 @@ var Resources = () => {
         )
       }
     )
-  ))), /* @__PURE__ */ import_react.default.createElement(import_add.default, { ref: resourcesAddRef, onSuccess: init }), /* @__PURE__ */ import_react.default.createElement(
+  ))), /* @__PURE__ */ import_react.default.createElement(import_add.default, { ref: resourcesAddRef, onSuccess: init }), /* @__PURE__ */ import_react.default.createElement(import_edit.default, { ref: resourcesEditRef, onSuccess: init }), /* @__PURE__ */ import_react.default.createElement(
     import_detail.default,
     {
       tabKey,

package/lib/index.d.ts

@@ -12,7 +12,6 @@ export { default as BookingStartTime } from './components/booking/materiels/star
 export { default as BookingDuration } from './components/booking/materiels/duration';
 export { default as BookingContacts } from './components/booking/materiels/contacts';
 export { VerticalClient } from './components/booking/info/clientVariant';
-export { default as VerticalAddService } from './components/booking/info/addServiceVariant';
 export { default as ProductExtension } from './components/productExtension';
 export { default as BookingDeposit } from './components/booking/deposit';
 export { default as RuleSetting } from './components/ruleSetting';
@@ -20,4 +19,3 @@ export { default as TaxSelect } from './components/taxSelect';
 export { default as ToCPay } from './components/pay/toC';
 export { default as Eftpos } from './components/eftpos';
 export { default as EftposPay } from './components/eftposPay';
-export { default as BookingDashboard } from './components/booking/dashboard';

package/lib/index.js

@@ -32,7 +32,6 @@ __export(src_exports, {
   Booking: () => import_booking.default,
   BookingAddons: () => import_addons.default,
   BookingContacts: () => import_contacts.default,
-  BookingDashboard: () => import_dashboard.default,
   BookingDeposit: () => import_deposit.default,
   BookingDuration: () => import_duration.default,
   BookingForms: () => import_forms.default,
@@ -49,7 +48,6 @@ __export(src_exports, {
   Schedules: () => import_schedules.default,
   TaxSelect: () => import_taxSelect.default,
   ToCPay: () => import_toC.default,
-  VerticalAddService: () => import_addServiceVariant.default,
   VerticalClient: () => import_clientVariant.VerticalClient
 });
 module.exports = __toCommonJS(src_exports);
@@ -69,7 +67,6 @@ var import_startTime = __toESM(require("./components/booking/materiels/startTime
 var import_duration = __toESM(require("./components/booking/materiels/duration"));
 var import_contacts = __toESM(require("./components/booking/materiels/contacts"));
 var import_clientVariant = require("./components/booking/info/clientVariant");
-var import_addServiceVariant = __toESM(require("./components/booking/info/addServiceVariant"));
 var import_productExtension = __toESM(require("./components/productExtension"));
 var import_deposit = __toESM(require("./components/booking/deposit"));
 var import_ruleSetting = __toESM(require("./components/ruleSetting"));
@@ -77,7 +74,6 @@ var import_taxSelect = __toESM(require("./components/taxSelect"));
 var import_toC = __toESM(require("./components/pay/toC"));
 var import_eftpos = __toESM(require("./components/eftpos"));
 var import_eftposPay = __toESM(require("./components/eftposPay"));
-var import_dashboard = __toESM(require("./components/booking/dashboard"));
 import_dayjs.default.extend(import_weekday.default);
 import_dayjs.default.extend(import_localeData.default);
 // Annotate the CommonJS export names for ESM import in node:
@@ -85,7 +81,6 @@ import_dayjs.default.extend(import_localeData.default);
   Booking,
   BookingAddons,
   BookingContacts,
-  BookingDashboard,
   BookingDeposit,
   BookingDuration,
   BookingForms,
@@ -102,6 +97,5 @@ import_dayjs.default.extend(import_localeData.default);
   Schedules,
   TaxSelect,
   ToCPay,
-  VerticalAddService,
   VerticalClient
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/private-materials",
-  "version": "3.0.157-gray",
+  "version": "3.0.158",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",
@@ -59,10 +59,10 @@
     "react-infinite-scroll-component": "^6.1.0",
     "rc-virtual-list": "^3.11.3",
     "decimal.js": "^10.4.3",
+    "@pisell/materials": "3.0.48",
     "@pisell/utils": "1.0.42",
-    "@pisell/date-picker": "1.0.100",
     "@pisell/icon": "0.0.11",
-    "@pisell/materials": "3.0.49-gray"
+    "@pisell/date-picker": "1.0.100"
   },
   "peerDependencies": {
     "react": "^18.0.0",

package/es/components/booking/dashboard/index.d.ts

@@ -1,20 +0,0 @@
-import React from 'react';
-export interface BookingDashboardProps extends React.HTMLAttributes<HTMLDivElement> {
-    backgroundColors?: string[];
-    labelColor?: string;
-    valueColor?: string;
-    otherParams?: Record<string, any>;
-    refreshKey?: string;
-    onDataChange?: (data: {
-        groupsOnSiteNow: string | number;
-        peopleOnSiteNow: string | number;
-        totalVisitorsToday: string | number;
-        ongoing: string | number;
-        upcoming: string | number;
-        overdue: string | number;
-        completed: string | number;
-        departed: string | number;
-    }, dataList: string[]) => void;
-}
-declare const BookingDashboard: (props: BookingDashboardProps) => React.JSX.Element;
-export default BookingDashboard;