@pisell/private-materials 3.3.55 → 3.3.57

package/lib/components/ticketBooking/components/addServiceVariant/addService.js

@@ -35,7 +35,6 @@ module.exports = __toCommonJS(addService_exports);
 var import_utils = require("@pisell/utils");
 var import_react = __toESM(require("react"));
 var import_ahooks = require("ahooks");
-var import_materials = require("@pisell/materials");
 var import_useEngineContext = __toESM(require("../../../../hooks/useEngineContext"));
 var import_utils2 = require("../../../booking/utils");
 var import_utils3 = require("../../../booking/info2/service/addService/utils");
@@ -49,13 +48,14 @@ var import_index = require("./index.less");
 var import_utils6 = require("../../utils");
 var import_notAvailable = __toESM(require("../notAvailable"));
 var AddSerivce = (props) => {
-  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m;
   const { onEdit, state, dispatch, renderMode = "current" } = props;
-  const [loading, setLoading] = (0, import_react.useState)(false);
+  const [loading, setLoading] = (0, import_react.useState)(true);
   const context = (0, import_useEngineContext.default)();
   const notAvailableRef = (0, import_react.useRef)(null);
   const isLoadedServiceRef = (0, import_react.useRef)(false);
   import_utils2.request.setRequest(context.appHelper.utils.request);
+  const Toast = (_b = (_a = context.appHelper) == null ? void 0 : _a.utils) == null ? void 0 : _b.Toast;
   const { createBookingData, createBooking } = (0, import_serviceManager.useService)({
     renderMode,
     onEdit,
@@ -63,18 +63,18 @@ var AddSerivce = (props) => {
     dispatch
   });
   const isBooking4 = (0, import_utils5.isBooking4Shop)(
-    (_e = (_d = (_c = (_b = (_a = context.appHelper.utils.store) == null ? void 0 : _a.getState) == null ? void 0 : _b.call(_a)) == null ? void 0 : _c.global) == null ? void 0 : _d.globalConfig) == null ? void 0 : _e.id,
+    (_g = (_f = (_e = (_d = (_c = context.appHelper.utils.store) == null ? void 0 : _c.getState) == null ? void 0 : _d.call(_c)) == null ? void 0 : _e.global) == null ? void 0 : _f.globalConfig) == null ? void 0 : _g.id,
     state == null ? void 0 : state.renderType
   );
   const [currentProduct, setCurrentProduct] = (0, import_react.useState)(null);
   const menuList = (0, import_react.useMemo)(() => {
     var _a2, _b2, _c2;
     return ((_c2 = (_b2 = (_a2 = state == null ? void 0 : state.bookingConfig) == null ? void 0 : _a2.config) == null ? void 0 : _b2.menu_list_tab) == null ? void 0 : _c2.menu_list) || [];
-  }, [(_f = state == null ? void 0 : state.bookingConfig) == null ? void 0 : _f.config]);
+  }, [(_h = state == null ? void 0 : state.bookingConfig) == null ? void 0 : _h.config]);
   const customerId = (0, import_react.useMemo)(() => {
     var _a2, _b2;
     return ((_b2 = (_a2 = state.client) == null ? void 0 : _a2.value) == null ? void 0 : _b2.id) || void 0;
-  }, [(_h = (_g = state.client) == null ? void 0 : _g.value) == null ? void 0 : _h.id]);
+  }, [(_j = (_i = state.client) == null ? void 0 : _i.value) == null ? void 0 : _j.id]);
   const setDefaultService = async (list) => {
     if (state.renderType !== "eventBooking") {
       return;
@@ -229,7 +229,7 @@ var AddSerivce = (props) => {
           setCurrentProduct(null);
         },
         callback: async (e, extension_type, detail) => {
-          var _a2;
+          var _a2, _b2;
           setCurrentProduct(null);
           if (lock) {
             return;
@@ -273,16 +273,27 @@ var AddSerivce = (props) => {
           if (renderMode === "current") {
             cacheItem.currentDefaultTime = state.date.value.format("HH:mm");
           }
-          cacheItem = (0, import_utils3.getProductExtend)({ cacheItem, state });
+          cacheItem = (0, import_utils3.getProductExtend)({
+            cacheItem,
+            state,
+            isDisabledTime: true
+          });
           if (state.renderType === "eventBooking") {
             cacheItem.autoClose = false;
           }
           if (cacheItem.autoClose) {
             cacheItem.autoClose = false;
-            let _list = (0, import_utils6.addService)(state.service.value, cacheItem);
-            (0, import_materials.PisellToast)({
-              content: import_utils.locales.getText("pisell2.ticket-booking.add-to-cart")
-            });
+            let { list: _list, quantity } = (0, import_utils6.addService)(
+              state.service.value,
+              cacheItem
+            );
+            (_b2 = Toast == null ? void 0 : Toast.success) == null ? void 0 : _b2.call(
+              Toast,
+              /* @__PURE__ */ import_react.default.createElement("div", { className: "add-toast-wrap" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "add-toast-title" }, cacheItem.title), /* @__PURE__ */ import_react.default.createElement("div", { className: "add-toast-quantity" }, import_utils.locales.getText("pisell2.ticket-booking.in-cart")(
+                quantity || 1
+              )))
+            );
+            (0, import_utils6.addServiceScroll)(e.rowKey, cacheItem);
             dispatch({
               type: "setService",
               payload: {
@@ -319,7 +330,7 @@ var AddSerivce = (props) => {
       }
     }
     return _list;
-  }, [(_i = state.service) == null ? void 0 : _i.services, state == null ? void 0 : state.activeCartId]);
+  }, [(_k = state.service) == null ? void 0 : _k.services, state == null ? void 0 : state.activeCartId]);
   const currentDate = (0, import_react.useMemo)(() => {
     return state.date.value.format("YYYY-MM-DD");
   }, [state.date.value]);
@@ -362,7 +373,7 @@ var AddSerivce = (props) => {
     }
     return null;
   }, [
-    (_k = (_j = state.service) == null ? void 0 : _j.cacheItem) == null ? void 0 : _k.autoClose,
+    (_m = (_l = state.service) == null ? void 0 : _l.cacheItem) == null ? void 0 : _m.autoClose,
     state.service.addModal,
     import_utils.locales,
     renderList,

package/lib/components/ticketBooking/components/addServiceVariant/index.less

@@ -0,0 +1,10 @@
+.add-toast-wrap {
+  width: 190px;
+  .add-toast-title {
+    margin-bottom: 12px;
+    line-height: 22px;
+  }
+  .add-toast-quantity {
+    font-size: 14px;
+  }
+}

package/lib/components/ticketBooking/components/ticketBooking/index.js

@@ -57,7 +57,7 @@ var TicketBooking = () => {
   const _timerRef = (0, import_react.useRef)();
   const _callbackFnRef = (0, import_react.useRef)();
   (0, import_react.useEffect)(() => {
-    var _a2, _b, _c, _d, _e;
+    var _a2, _b, _c, _d, _e, _f;
     _persistentRef.current = storage.get(`drawer-booking`) === "true" ? true : isTerminal();
     if (lowcodeRef) {
       lowcodeRef.onReady(void 0);
@@ -95,10 +95,15 @@ var TicketBooking = () => {
       "booking",
       "refreshBookingDetail",
       (type, orderId) => {
-        console.log(type, orderId, "type, orderId");
-        if (state.bookingId) {
-          _getBookingDetail();
-        }
+        _initFn(() => {
+        });
+      }
+    );
+    (_f = interaction == null ? void 0 : interaction.utils) == null ? void 0 : _f.mountFunction(
+      "booking",
+      "voidBooking",
+      (orderId) => {
+        (0, import_serve.voidAppointment)(orderId);
       }
     );
     return () => {
@@ -277,6 +282,7 @@ var TicketBooking = () => {
         }
       }
     }
+    _modalState.service.value = [];
     _modalState.service.cacheItem = null;
     _modalState.service.addTimeModal = false;
     _modalState.service.changeService = false;
@@ -644,8 +650,10 @@ var TicketBooking = () => {
       }
     );
   };
-  const _callback = (data) => {
-    console.log("callbackcallback");
+  const _callback = (data, type) => {
+    if (isTerminal() && type === "checkout") {
+      return;
+    }
     setState({
       createCount: state.createCount + 1
     });
@@ -761,7 +769,8 @@ var TicketBooking = () => {
           locale: engineProps.locale,
           refreshData: _refreshData,
           setActiveTab: _setActiveTab,
-          clearAllValue: _clearAllValue
+          clearAllValue: _clearAllValue,
+          drawerMask: true
         },
         setGlobalState: _setModalState,
         setState,

package/lib/components/ticketBooking/index.js

@@ -36,6 +36,7 @@ var import_react = __toESM(require("react"));
 var import_miniRedux = require("./miniRedux");
 var import_utils = require("@pisell/utils");
 var import_dayjs = __toESM(require("dayjs"));
+var import_lodash = require("lodash");
 var import_ticketBooking = __toESM(require("./components/ticketBooking/index"));
 var import_utils2 = require("../../utils");
 var import_useEngineContext = __toESM(require("../../hooks/useEngineContext"));
@@ -186,7 +187,7 @@ var ticketBooking_default = (props) => {
     import_utils2.request.setRequest(context.appHelper.utils.request);
   }, []);
   (0, import_react.useMemo)(() => {
-    const store = (0, import_miniRedux.createStore)({ ...initialState, bookingConfigParams, productExtensionType });
+    const store = (0, import_miniRedux.createStore)({ ...(0, import_lodash.cloneDeep)(initialState), bookingConfigParams, productExtensionType });
     storeRef.current = store;
   }, []);
   return /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-ticket-booking-wrapper" }, /* @__PURE__ */ import_react.default.createElement(import_menuBar.default, null), /* @__PURE__ */ import_react.default.createElement(import_miniRedux.Provider, { store: storeRef.current }, /* @__PURE__ */ import_react.default.createElement(import_ticketBooking.default, null)));

package/lib/components/ticketBooking/locales.d.ts

@@ -47,6 +47,7 @@ declare const _default: {
         "pisell2.ticket-booking.add-to-cart": string;
         "pisell2.ticket-booking.not-available-title": string;
         "pisell2.ticket-booking.not-available-ok": string;
+        "pisell2.ticket-booking.in-cart": (number: number) => string;
     };
     "zh-CN": {
         "pisell2.ticket-booking.info": string;
@@ -96,6 +97,7 @@ declare const _default: {
         "pisell2.ticket-booking.add-to-cart": string;
         "pisell2.ticket-booking.not-available-title": string;
         "pisell2.ticket-booking.not-available-ok": string;
+        "pisell2.ticket-booking.in-cart": (number: number) => string;
     };
     "zh-HK": {
         "pisell2.ticket-booking.info": string;
@@ -145,6 +147,7 @@ declare const _default: {
         "pisell2.ticket-booking.add-to-cart": string;
         "pisell2.ticket-booking.not-available-title": string;
         "pisell2.ticket-booking.not-available-ok": string;
+        "pisell2.ticket-booking.in-cart": (number: number) => string;
     };
 };
 export default _default;

package/lib/components/ticketBooking/locales.js

@@ -70,7 +70,8 @@ var locales_default = {
     "pisell2.ticket-booking.create-new": "Create new",
     "pisell2.ticket-booking.add-to-cart": "Added to Cart",
     "pisell2.ticket-booking.not-available-title": "Sorry, Not available at current time.",
-    "pisell2.ticket-booking.not-available-ok": "OK"
+    "pisell2.ticket-booking.not-available-ok": "OK",
+    "pisell2.ticket-booking.in-cart": (number) => `${number} in cart`
   },
   "zh-CN": {
     "pisell2.ticket-booking.info": "信息",
@@ -119,7 +120,8 @@ var locales_default = {
     "pisell2.ticket-booking.create-new": "新建",
     "pisell2.ticket-booking.add-to-cart": "已加入购物车",
     "pisell2.ticket-booking.not-available-title": "抱歉，目前不在可售时间。",
-    "pisell2.ticket-booking.not-available-ok": "好的"
+    "pisell2.ticket-booking.not-available-ok": "好的",
+    "pisell2.ticket-booking.in-cart": (number) => `已有${number}件`
   },
   "zh-HK": {
     "pisell2.ticket-booking.info": "資訊",
@@ -168,6 +170,7 @@ var locales_default = {
     "pisell2.ticket-booking.create-new": "新建",
     "pisell2.ticket-booking.add-to-cart": "已加入购物车",
     "pisell2.ticket-booking.not-available-title": "抱歉，目前不在可售時間。",
-    "pisell2.ticket-booking.not-available-ok": "好的"
+    "pisell2.ticket-booking.not-available-ok": "好的",
+    "pisell2.ticket-booking.in-cart": (number) => `已有${number}件`
   }
 };

package/lib/components/ticketBooking/serve.d.ts

@@ -280,3 +280,8 @@ export declare const getOrderInfoByCode: (params: any) => Promise<any>;
  * @Date: 2025-04-24 16:28
  */
 export declare const getClientsEs: (params: any) => Promise<any>;
+/**
+ * 作废2.0预约订单
+ * @param order_id
+ */
+export declare const voidAppointment: (order_id: number) => Promise<any>;

package/lib/components/ticketBooking/serve.js

@@ -48,7 +48,8 @@ __export(serve_exports, {
   getServices: () => getServices,
   removeNoteByOrder: () => removeNoteByOrder,
   saveAddonsByOrderId: () => saveAddonsByOrderId,
-  saveBookingFormData: () => saveBookingFormData
+  saveBookingFormData: () => saveBookingFormData,
+  voidAppointment: () => voidAppointment
 });
 module.exports = __toCommonJS(serve_exports);
 var import_utils = require("./../../utils");
@@ -183,6 +184,10 @@ var getClientsEs = async (params) => {
   let { data } = await import_utils.request.getRequest().get(prefix + "/customer/es/data", params);
   return data;
 };
+var voidAppointment = async (order_id) => {
+  let { data } = await import_utils.request.getRequest().put(prefix + `/order/void/appointment/${order_id}`, {});
+  return data;
+};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   addNotesByOrder,
@@ -214,5 +219,6 @@ var getClientsEs = async (params) => {
   getServices,
   removeNoteByOrder,
   saveAddonsByOrderId,
-  saveBookingFormData
+  saveBookingFormData,
+  voidAppointment
 });

package/lib/components/ticketBooking/utils/index.d.ts

@@ -12,4 +12,8 @@ export declare const restoreProductOtherData: (data: any) => {
     product_variant_id: number;
     quantity: number;
 } | undefined;
-export declare const addService: (list: any[], addItem: any) => any[];
+export declare const addService: (list: any[], addItem: any) => {
+    list: any[];
+    quantity: any;
+};
+export declare const addServiceScroll: (rowKey: string, cacheItem: any) => void;

package/lib/components/ticketBooking/utils/index.js

@@ -30,6 +30,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var utils_exports = {};
 __export(utils_exports, {
   addService: () => addService,
+  addServiceScroll: () => addServiceScroll,
   formatBookingList: () => formatBookingList,
   formatDateToStr: () => formatDateToStr,
   getDefaultStartParam: () => getDefaultStartParam,
@@ -128,19 +129,27 @@ var isSameProduct = (a, b) => {
 };
 var addService = (list, addItem) => {
   let value = list;
+  let count;
   if (!(0, import_utils.isNormalProductByDurationSchedule)(addItem)) {
     value.push(addItem);
+    count = addItem._extend.quantity;
   } else {
     let isNotSame = true;
     value = list.map((item) => {
-      var _a, _b;
+      var _a, _b, _c;
       if (isSameProduct(item, addItem)) {
         isNotSame = false;
+        const quantity = (((_a = item == null ? void 0 : item._extend) == null ? void 0 : _a.quantity) || 1) + (((_b = addItem == null ? void 0 : addItem._extend) == null ? void 0 : _b.quantity) || 1);
+        count = quantity;
         return {
           ...item,
           _extend: {
             ...item._extend,
-            quantity: (((_a = item == null ? void 0 : item._extend) == null ? void 0 : _a.quantity) || 1) + (((_b = addItem == null ? void 0 : addItem._extend) == null ? void 0 : _b.quantity) || 1)
+            quantity,
+            other: {
+              ...((_c = item._extend) == null ? void 0 : _c.other) || {},
+              quantity
+            }
           }
         };
       }
@@ -148,13 +157,36 @@ var addService = (list, addItem) => {
     });
     if (isNotSame) {
       value.push(addItem);
+      count = addItem._extend.quantity;
     }
   }
-  return value;
+  return { list: value, quantity: count };
+};
+var addServiceScroll = (rowKey, cacheItem) => {
+  const list = document.querySelectorAll(`#rowKey-${rowKey}`);
+  setTimeout(() => {
+    if (list.length && (0, import_utils.isNormalProductByDurationSchedule)(cacheItem)) {
+      list[list.length - 1].scrollIntoView({
+        behavior: "smooth",
+        block: "center"
+      });
+    } else {
+      setTimeout(() => {
+        const bookingWrap = document.querySelectorAll(`.booking-info-warp`);
+        if (bookingWrap.length) {
+          bookingWrap[0].scrollTo({
+            top: 99999,
+            behavior: "smooth"
+          });
+        }
+      }, 100);
+    }
+  });
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   addService,
+  addServiceScroll,
   formatBookingList,
   formatDateToStr,
   getDefaultStartParam,

package/lib/components/wallet/index.js

@@ -239,9 +239,21 @@ var Wallet = (0, import_model.Provider)(() => {
     ]
   };
   const menuItem = ({ count = 0, title = "" }) => /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode-wallet-menu-item" }, /* @__PURE__ */ import_react.default.createElement("div", null, /* @__PURE__ */ import_react.default.createElement("span", { className: "pisell-lowcode-wallet-menu-title" }, title), count > 0 && /* @__PURE__ */ import_react.default.createElement(import_materials.Badge, { styleType: "default", count })), /* @__PURE__ */ import_react.default.createElement(import_icons.RightOutlined, null));
+  const mergeSearch = (currentSearch, params) => {
+    const searchParams = new URLSearchParams(currentSearch);
+    Object.entries(params).forEach(([key, value]) => {
+      searchParams.set(key, value);
+    });
+    return searchParams.toString();
+  };
   const MenuProps = {
     className: "pisell-lowcode-wallet-menu",
     onClick: (e) => {
+      var _a2, _b2;
+      (_b2 = (_a2 = context.appHelper.utils) == null ? void 0 : _a2.history) == null ? void 0 : _b2.push({
+        hash: location.hash,
+        search: mergeSearch(location.search, { type: "list" })
+      });
       dispatch({
         type: "setState",
         payload: {
@@ -286,12 +298,22 @@ var Wallet = (0, import_model.Provider)(() => {
       }
     ]
   };
+  (0, import_react.useEffect)(() => {
+    const searchParams = new URLSearchParams(location.search);
+    const type = searchParams.get("type");
+    if (type) {
+      dispatch({ type: "setState", payload: { setup: type } });
+    } else {
+      dispatch({ type: "setState", payload: { setup: "menu" } });
+    }
+  }, [location.search]);
   const onBack = () => {
     if (setup === "menu") {
       history.back();
     } else {
       const prevSetup = setup === "detail" ? "list" : "menu";
       dispatch({ type: "setState", payload: { setup: prevSetup } });
+      history.back();
     }
   };
   const openAddModal = () => {
@@ -424,7 +446,10 @@ var Wallet = (0, import_model.Provider)(() => {
     }
     return null;
   };
-  const renderMobileLayout = () => /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode-wallet-mobile" }, /* @__PURE__ */ import_react.default.createElement(import_WalletBar.default, { setup, onBack }), /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode-wallet-content" }, renderMobileContent()), /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode-wallet-footer" }, renderMobileFooter()));
+  const renderMobileLayout = () => {
+    var _a2, _b2, _c2;
+    return /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode-wallet-mobile" }, !((_c2 = (_b2 = (_a2 = utils == null ? void 0 : utils.interaction) == null ? void 0 : _a2.utils) == null ? void 0 : _b2.isAppEnv) == null ? void 0 : _c2.call(_b2)) && /* @__PURE__ */ import_react.default.createElement(import_WalletBar.default, { setup, onBack }), /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode-wallet-content" }, renderMobileContent()), /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode-wallet-footer" }, renderMobileFooter()));
+  };
   const renderSearchCard = (item) => {
     const {
       id,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/private-materials",
-  "version": "3.3.55",
+  "version": "3.3.57",
   "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/icon": "0.0.11",
     "@pisell/utils": "1.0.42",
-    "@pisell/materials": "3.3.18",
-    "@pisell/date-picker": "3.0.2",
-    "@pisell/icon": "0.0.11"
+    "@pisell/materials": "3.3.22",
+    "@pisell/date-picker": "3.0.2"
   },
   "peerDependencies": {
     "react": "^18.0.0",

package/es/components/booking/info2/service/editService/Resources/index.d.ts

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

package/lib/components/booking/info2/service/editService/Resources/index.d.ts

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