@pisell/private-materials 3.0.166 → 3.0.167

package/lib/components/booking/info2/service/editService/index.js

@@ -50,7 +50,7 @@ var import_utilsByBooking = require("../../utilsByBooking");
 var import_utils4 = require("../addService/utils");
 var submitLock = false;
 var Info = (_, ref) => {
-  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _A, _B, _C;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _A;
   const [form] = import_antd.Form.useForm();
   const useTotal = import_antd.Form.useWatch("total", form);
   const useResource = import_antd.Form.useWatch("resource", form);
@@ -94,9 +94,14 @@ var Info = (_, ref) => {
     });
   }, [durationProps, import_utils.locales.locale]);
   const timeObj = (0, import_react.useMemo)(() => {
-    var _a2, _b2;
-    return (_b2 = (_a2 = state.service) == null ? void 0 : _a2.cacheItem) == null ? void 0 : _b2._data.timeObj;
-  }, [(_e = (_d = state.service) == null ? void 0 : _d.cacheItem) == null ? void 0 : _e._data.timeObj]);
+    return (0, import_utils4.getTimeObj)({
+      durationProps,
+      useStartTime,
+      currentResource,
+      state,
+      useDuration
+    });
+  }, [durationProps, useStartTime, currentResource, state, useDuration]);
   (0, import_react.useEffect)(() => {
     try {
       if (useDuration.indexOf("flexible_") == 0) {
@@ -206,7 +211,7 @@ var Info = (_, ref) => {
     let oPrice = Number(((_a2 = state.service.cacheItem) == null ? void 0 : _a2._extend.origin_total) || 0);
     let cPrice = Number(useTotal || 0);
     return cPrice !== oPrice;
-  }, [useTotal, (_g = (_f = state.service.cacheItem) == null ? void 0 : _f._extend) == null ? void 0 : _g.origin_total]);
+  }, [useTotal, (_e = (_d = state.service.cacheItem) == null ? void 0 : _d._extend) == null ? void 0 : _e.origin_total]);
   const getResources = () => {
     let res = (0, import_utils4.formatResources)({
       cacheItem: getCurrentCacheItem(),
@@ -269,18 +274,18 @@ var Info = (_, ref) => {
   }, [state.service.editModal, state.isBookingCreatePage]);
   (0, import_react.useEffect)(() => {
     getDiscount();
-  }, [useTotal, (_i = (_h = state.service.cacheItem) == null ? void 0 : _h._extend) == null ? void 0 : _i.origin_total]);
+  }, [useTotal, (_g = (_f = state.service.cacheItem) == null ? void 0 : _f._extend) == null ? void 0 : _g.origin_total]);
   const isDiscount = (0, import_react.useMemo)(() => {
     var _a2, _b2, _c2;
     if (!((_a2 = state.service) == null ? void 0 : _a2.cacheItem)) {
       return false;
     }
     return useTotal != ((_c2 = (_b2 = state.service) == null ? void 0 : _b2.cacheItem) == null ? void 0 : _c2._extend.origin_total);
-  }, [useTotal, (_k = (_j = state.service) == null ? void 0 : _j.cacheItem) == null ? void 0 : _k._extend.origin_total]);
+  }, [useTotal, (_i = (_h = state.service) == null ? void 0 : _h.cacheItem) == null ? void 0 : _i._extend.origin_total]);
   const bundles = (0, import_react.useMemo)(() => {
     var _a2, _b2, _c2, _d2;
     return ((_d2 = (_c2 = (_b2 = (_a2 = state.service) == null ? void 0 : _a2.cacheItem) == null ? void 0 : _b2._extend) == null ? void 0 : _c2.other) == null ? void 0 : _d2.bundle) || [];
-  }, [(_o = (_n = (_m = (_l = state.service) == null ? void 0 : _l.cacheItem) == null ? void 0 : _m._extend) == null ? void 0 : _n.other) == null ? void 0 : _o.bundle]);
+  }, [(_m = (_l = (_k = (_j = state.service) == null ? void 0 : _j.cacheItem) == null ? void 0 : _k._extend) == null ? void 0 : _l.other) == null ? void 0 : _m.bundle]);
   const handleEdit = (e) => {
     const item = state.service.cacheItem;
     let values = form.getFieldsValue();
@@ -348,14 +353,14 @@ var Info = (_, ref) => {
     };
   });
   console.log("state.service.value", state.service.value);
-  const SelectTime = (_p = window.BaseMaterials) == null ? void 0 : _p.SelectTime;
+  const SelectTime = (_n = window.BaseMaterials) == null ? void 0 : _n.SelectTime;
   return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, /* @__PURE__ */ import_react.default.createElement(
     import_drawer.default,
     {
       titleNoWrap: true,
       zIndex: state.service.changeService ? 999 : 1e3,
       forceRender: true,
-      open: state.service.editModal && !((_q = state.service.cacheItem) == null ? void 0 : _q.autoClose),
+      open: state.service.editModal && !((_o = state.service.cacheItem) == null ? void 0 : _o.autoClose),
       title: import_utils.locales.getText("pisell2.text.edit-service"),
       onClose: () => {
         dispatch({
@@ -368,7 +373,7 @@ var Info = (_, ref) => {
         });
       }
     },
-    /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-service-body-edit" }, /* @__PURE__ */ import_react.default.createElement(import_antd.Form, { layout: "vertical", form, onFinish }, /* @__PURE__ */ import_react.default.createElement(import_antd.Row, { style: { width: "100%" }, gutter: [16, 0] }, /* @__PURE__ */ import_react.default.createElement(import_antd.Col, { span: 24 }, /* @__PURE__ */ import_react.default.createElement(import_antd.Form.Item, { name: "product_name" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "current-service-info" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "current-service-info-name-wrap" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "current-service-info-name" }, ((_t = (_s = (_r = state.service) == null ? void 0 : _r.cacheItem) == null ? void 0 : _s._extend) == null ? void 0 : _t.product_name) || "-"), /* @__PURE__ */ import_react.default.createElement(import_antd.Button, { onClick: handleEdit }, import_utils.locales.getText("pisell2.text.edit")), !state.isBookingCreatePage && /* @__PURE__ */ import_react.default.createElement(import_antd.Button, { onClick: handleChange }, import_utils.locales.getText("pisell2.text.change"))), /* @__PURE__ */ import_react.default.createElement(
+    /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-service-body-edit" }, /* @__PURE__ */ import_react.default.createElement(import_antd.Form, { layout: "vertical", form, onFinish }, /* @__PURE__ */ import_react.default.createElement(import_antd.Row, { style: { width: "100%" }, gutter: [16, 0] }, /* @__PURE__ */ import_react.default.createElement(import_antd.Col, { span: 24 }, /* @__PURE__ */ import_react.default.createElement(import_antd.Form.Item, { name: "product_name" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "current-service-info" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "current-service-info-name-wrap" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "current-service-info-name" }, ((_r = (_q = (_p = state.service) == null ? void 0 : _p.cacheItem) == null ? void 0 : _q._extend) == null ? void 0 : _r.product_name) || "-"), /* @__PURE__ */ import_react.default.createElement(import_antd.Button, { onClick: handleEdit }, import_utils.locales.getText("pisell2.text.edit")), !state.isBookingCreatePage && /* @__PURE__ */ import_react.default.createElement(import_antd.Button, { onClick: handleChange }, import_utils.locales.getText("pisell2.text.change"))), /* @__PURE__ */ import_react.default.createElement(
       import_collapsibleList.default,
       {
         style: { marginTop: bundles.length ? "8px" : 0 },
@@ -391,8 +396,8 @@ var Info = (_, ref) => {
           precision: 2,
           style: { width: "100%" },
           min: 0,
-          max: ((_v = (_u = state.service.cacheItem) == null ? void 0 : _u._extend) == null ? void 0 : _v.origin_total) || 0,
-          placeholder: ((_x = (_w = state.service.cacheItem) == null ? void 0 : _w._extend) == null ? void 0 : _x.origin_total) || "0"
+          max: ((_t = (_s = state.service.cacheItem) == null ? void 0 : _s._extend) == null ? void 0 : _t.origin_total) || 0,
+          placeholder: ((_v = (_u = state.service.cacheItem) == null ? void 0 : _u._extend) == null ? void 0 : _v.origin_total) || "0"
         }
       )
     )), /* @__PURE__ */ import_react.default.createElement(import_antd.Col, { span: 12 }, /* @__PURE__ */ import_react.default.createElement(
@@ -432,7 +437,7 @@ var Info = (_, ref) => {
       SelectTime ? /* @__PURE__ */ import_react.default.createElement(
         SelectTime,
         {
-          slice: (_B = (_A = (_z = (_y = state.bookingConfig) == null ? void 0 : _y.config) == null ? void 0 : _z.basic) == null ? void 0 : _A.service_time) == null ? void 0 : _B.value,
+          slice: (_z = (_y = (_x = (_w = state.bookingConfig) == null ? void 0 : _w.config) == null ? void 0 : _x.basic) == null ? void 0 : _y.service_time) == null ? void 0 : _z.value,
           timePickerProps: {
             style: { width: "100%" }
           },
@@ -477,7 +482,7 @@ var Info = (_, ref) => {
       {
         type: "primary",
         className: "pisell-lowcode__booking-service-body-edit-footer-apple",
-        disabled: !((_C = state.service.resourcesOrigin) == null ? void 0 : _C.length),
+        disabled: !((_A = state.service.resourcesOrigin) == null ? void 0 : _A.length),
         onClick: () => {
           form.submit();
         }

package/lib/components/booking/info2/utilsByBooking.js

@@ -70,6 +70,7 @@ var getResourceTimeIsUsable = (item, cacheItem, resourceItem) => {
   const currentCount = getSumCapacity({ cacheItem });
   const eventList = time.event_list || [];
   let endDate = null;
+  let isCalcCount = true;
   if (isFlexible) {
     if (eventList.length) {
       timeStartDate = eventList.reduce((max, event) => {
@@ -78,6 +79,11 @@ var getResourceTimeIsUsable = (item, cacheItem, resourceItem) => {
       }, (0, import_dayjs.default)(eventList[0].end_at));
     }
     isDateRange = startDate.isAfter(timeStartDate) && startDate.isBefore(timeEndDate);
+    if (!isDateRange && eventList.length) {
+      isCalcCount = false;
+      isDateRange = true;
+      isCountRange = false;
+    }
   } else {
     endDate = startDate.add(import_utils2.flexibleObj.getValue(cacheItem._extend.duration), "minute");
     const isTimeRange = startDate.isAfter(timeStartDate) && endDate.isBefore(timeEndDate);
@@ -85,21 +91,23 @@ var getResourceTimeIsUsable = (item, cacheItem, resourceItem) => {
       isDateRange = true;
     }
   }
-  let conflict = (time.event_list || []).filter((d) => {
-    return isConflict({ start_at: d.start_at, end_at: d.end_at }, { start_at: startDate, end_at: endDate });
-  });
-  if (resourceItem.resourceType === "single") {
-    if (conflict.length === 0) {
-      isCountRange = true;
-    } else {
-      isCountRange = false;
-    }
-  } else {
-    let conflictCount = getUseableEventCount(conflict, resourceItem.capacity);
-    if (currentCount <= conflictCount) {
-      isCountRange = true;
+  if (isCalcCount) {
+    let conflict = (time.event_list || []).filter((d) => {
+      return isConflict({ start_at: d.start_at, end_at: d.end_at }, { start_at: startDate, end_at: endDate });
+    });
+    if (resourceItem.resourceType === "single") {
+      if (conflict.length === 0) {
+        isCountRange = true;
+      } else {
+        isCountRange = false;
+      }
     } else {
-      isCountRange = false;
+      let conflictCount = getUseableEventCount(conflict, resourceItem.capacity);
+      if (currentCount <= conflictCount) {
+        isCountRange = true;
+      } else {
+        isCountRange = false;
+      }
     }
   }
   const isUsable = isDateRange && isCountRange;

package/lib/components/booking/materiels/duration/index.d.ts

@@ -1,5 +1,5 @@
-import { SelectProps } from "antd";
-import React from "react";
+import { SelectProps } from 'antd';
+import React from 'react';
 interface DurationProps extends SelectProps {
     locale?: string;
     slice?: number;

package/lib/components/booking/notes/index.d.ts

@@ -4,5 +4,5 @@ export interface InfoProps {
     globalState: any;
     setGlobalState: any;
 }
-declare const Notes: (props: any) => any;
+declare const Notes: any;
 export default Notes;

package/lib/components/booking/notes/model.d.ts

@@ -1,6 +1,5 @@
-/// <reference types="react" />
 import { FormState } from "../model";
-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/booking/payments/model.d.ts

@@ -1,6 +1,5 @@
-/// <reference types="react" />
 import { FormState } from "../model";
-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/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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/private-materials",
-  "version": "3.0.166",
+  "version": "3.0.167",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",
@@ -60,9 +60,9 @@
     "rc-virtual-list": "^3.11.3",
     "decimal.js": "^10.4.3",
     "@pisell/utils": "1.0.42",
+    "@pisell/materials": "3.0.50",
     "@pisell/icon": "0.0.11",
-    "@pisell/date-picker": "1.0.100",
-    "@pisell/materials": "3.0.50"
+    "@pisell/date-picker": "1.0.100"
   },
   "peerDependencies": {
     "react": "^18.0.0",