@pisell/private-materials 6.5.27 → 6.6.2

package/lib/components/booking/utils/selectHolderModal.d.ts

@@ -0,0 +1,24 @@
+import React from 'react';
+export interface SelectHolderModalOptions {
+    /** 状态对象 */
+    state: any;
+    /** dispatch 函数 */
+    dispatch: any;
+    /** 初始选中的值 */
+    initialValue?: string | number | (string | number)[];
+    /** 最大可选数量，用于决定单选或多选模式 */
+    maxSelectedCount?: number;
+}
+export declare type SelectHolderResult = number[] | null;
+/**
+ * SelectHolderModal 组件（单例模式）
+ * 使用 Portal 在 body 上渲染，确保全局只有一个实例
+ * 可以在多个地方挂载，但实际只会渲染一个实例
+ */
+export declare const SelectHolderModal: React.FC;
+/**
+ * 通过 await 调用的 Holder 选择弹窗
+ * @param options 配置选项
+ * @returns Promise，resolve 时返回选中的 holder ID 数组，或 null（用户取消时）
+ */
+export declare function selectHolderModal(options: SelectHolderModalOptions): Promise<SelectHolderResult>;

package/lib/components/booking/utils/selectHolderModal.js

@@ -0,0 +1,319 @@
+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/booking/utils/selectHolderModal.tsx
+var selectHolderModal_exports = {};
+__export(selectHolderModal_exports, {
+  SelectHolderModal: () => SelectHolderModal,
+  selectHolderModal: () => selectHolderModal
+});
+module.exports = __toCommonJS(selectHolderModal_exports);
+var import_react = __toESM(require("react"));
+var import_react_dom = require("react-dom");
+var import_utils = require("@pisell/utils");
+var import_utils2 = require("../utils");
+var import_selectHolder = __toESM(require("../../../plus/selectHolder"));
+var modalState = null;
+var allSetStateCallbacks = /* @__PURE__ */ new Set();
+var renderingInstanceId = null;
+function notifyAllInstances(newState) {
+  modalState = newState;
+  allSetStateCallbacks.forEach((setState) => {
+    setState(newState);
+  });
+}
+function getFormDataConfig(state) {
+  var _a, _b, _c, _d, _e;
+  let _holder = (_a = state == null ? void 0 : state.bookingConfig) == null ? void 0 : _a.holder;
+  if (!_holder) {
+    return { formDataConfig: null, isMinorAndWaiver: false };
+  }
+  const formDataConfig = {
+    ..._holder,
+    ..._holder == null ? void 0 : _holder.form,
+    options: [],
+    form_id: (_b = _holder == null ? void 0 : _holder.form) == null ? void 0 : _b.id,
+    field: (_c = _holder == null ? void 0 : _holder.form) == null ? void 0 : _c.form_field,
+    relation_type: "appointment_booking",
+    form_record: []
+  };
+  let isMinorAndWaiver = false;
+  if ((formDataConfig == null ? void 0 : formDataConfig.form_type) === "minors") {
+    const detail = (_d = formDataConfig == null ? void 0 : formDataConfig.form_field) == null ? void 0 : _d.find(
+      (item) => item.filed_type === "form_to_form" && item.status === "hide"
+    );
+    if (detail) {
+      isMinorAndWaiver = (_e = detail == null ? void 0 : detail.setting) == null ? void 0 : _e.linkedTable;
+    }
+  }
+  return { formDataConfig, isMinorAndWaiver };
+}
+function getHolderOptions(state) {
+  var _a, _b, _c, _d, _e, _f, _g, _h, _i;
+  const holdersFromState = Array.isArray((_a = state == null ? void 0 : state.pet) == null ? void 0 : _a.holders) ? state.pet.holders : [];
+  const formId = ((_e = (_d = (_c = (_b = state == null ? void 0 : state.bookingConfig) == null ? void 0 : _b.config) == null ? void 0 : _c.basic) == null ? void 0 : _d.appointment_subject) == null ? void 0 : _e.form_id) || 0;
+  const holdersFromValue = Array.isArray((_g = (_f = state == null ? void 0 : state.pet) == null ? void 0 : _f.value) == null ? void 0 : _g[formId]) ? (_i = (_h = state == null ? void 0 : state.pet) == null ? void 0 : _h.value) == null ? void 0 : _i[formId] : [];
+  const rawList = holdersFromState.length > 0 ? holdersFromState : holdersFromValue;
+  return rawList.map((item) => {
+    const id = (item == null ? void 0 : item.id) || (item == null ? void 0 : item.form_record_id) || (item == null ? void 0 : item.value);
+    if (id === void 0 || id === null) return null;
+    return {
+      label: (item == null ? void 0 : item.main_field) || (item == null ? void 0 : item.label) || (item == null ? void 0 : item.name) || import_utils.locales.getText("pisell-select-holder-please-select"),
+      value: id,
+      avatar: item == null ? void 0 : item.avatar,
+      subtitle: (item == null ? void 0 : item.subtitle) || (item == null ? void 0 : item.second_field) || (item == null ? void 0 : item.sub_field)
+    };
+  }).filter(Boolean);
+}
+function buildDisplayConfig(state, holderOptions, maxSelectedCount = 1) {
+  var _a, _b, _c;
+  const selectType = maxSelectedCount > 1 ? "multiple" : "single";
+  return {
+    direction: "vertical",
+    selectType,
+    showAvatar: true,
+    showTitle: true,
+    showSubtitle: Boolean(holderOptions.some((option) => option.subtitle)),
+    isSkipable: ((_c = (_b = (_a = state == null ? void 0 : state.bookingConfig) == null ? void 0 : _a.config) == null ? void 0 : _b.basic) == null ? void 0 : _c.subject_require) === "optional"
+  };
+}
+var SelectHolderModal = () => {
+  const [localState, setLocalState] = (0, import_react.useState)(modalState);
+  const [container, setContainer] = (0, import_react.useState)(null);
+  const instanceIdRef = (0, import_react.useRef)(Symbol("SelectHolderModal"));
+  const isRenderingInstanceRef = (0, import_react.useRef)(false);
+  (0, import_react.useEffect)(() => {
+    let containerElement = document.getElementById("select-holder-modal-container");
+    if (!containerElement) {
+      containerElement = document.createElement("div");
+      containerElement.id = "select-holder-modal-container";
+      document.body.appendChild(containerElement);
+    }
+    setContainer(containerElement);
+    if (renderingInstanceId === null) {
+      renderingInstanceId = instanceIdRef.current;
+      isRenderingInstanceRef.current = true;
+    } else {
+      isRenderingInstanceRef.current = renderingInstanceId === instanceIdRef.current;
+    }
+    allSetStateCallbacks.add(setLocalState);
+    if (modalState && modalState !== localState) {
+      setLocalState(modalState);
+    }
+    return () => {
+      allSetStateCallbacks.delete(setLocalState);
+      if (isRenderingInstanceRef.current) {
+        renderingInstanceId = null;
+      }
+    };
+  }, []);
+  if (!localState || !localState.open || !container) {
+    return null;
+  }
+  if (!isRenderingInstanceRef.current) {
+    return null;
+  }
+  const { state, dispatch, initialValue, maxSelectedCount, resolve } = localState;
+  return (0, import_react_dom.createPortal)(
+    /* @__PURE__ */ import_react.default.createElement(
+      SelectHolderModalContent,
+      {
+        state,
+        dispatch,
+        initialValue,
+        maxSelectedCount,
+        resolve,
+        onClose: () => {
+          setTimeout(() => {
+            notifyAllInstances(null);
+          }, 350);
+        }
+      }
+    ),
+    container
+  );
+};
+var SelectHolderModalContent = ({ state, dispatch, initialValue, maxSelectedCount, resolve, onClose }) => {
+  var _a, _b, _c, _d, _e;
+  const [open, setOpen] = (0, import_react.useState)(true);
+  const [holderOptions, setHolderOptions] = (0, import_react.useState)(
+    () => getHolderOptions(state)
+  );
+  const [selectedValues, setSelectedValues] = (0, import_react.useState)(() => {
+    if (Array.isArray(initialValue)) {
+      return initialValue.filter(
+        (item) => item !== void 0 && item !== null
+      );
+    }
+    if (initialValue === void 0 || initialValue === null || initialValue === "") {
+      return [];
+    }
+    return [initialValue];
+  });
+  const stateRef = { current: state };
+  (0, import_react.useEffect)(() => {
+    stateRef.current = state;
+    const newOptions = getHolderOptions(state);
+    setHolderOptions(newOptions);
+  }, [state]);
+  const displayConfig = (0, import_react.useMemo)(
+    () => {
+      var _a2, _b2, _c2;
+      return buildDisplayConfig(
+        stateRef.current,
+        holderOptions,
+        maxSelectedCount || ((_c2 = (_b2 = (_a2 = stateRef.current) == null ? void 0 : _a2.bookingConfig) == null ? void 0 : _b2.holder) == null ? void 0 : _c2.maxSelectedCount) || 1
+      );
+    },
+    [holderOptions, maxSelectedCount, state]
+  );
+  const { formDataConfig, isMinorAndWaiver } = (0, import_react.useMemo)(
+    () => getFormDataConfig(stateRef.current),
+    [(_b = (_a = stateRef.current) == null ? void 0 : _a.bookingConfig) == null ? void 0 : _b.holder]
+  );
+  const holderConfig = ((_d = (_c = stateRef.current) == null ? void 0 : _c.bookingConfig) == null ? void 0 : _d.holder) || {};
+  const title = ((_e = holderConfig == null ? void 0 : holderConfig.form) == null ? void 0 : _e.title) || (holderConfig == null ? void 0 : holderConfig.title) || import_utils.locales.getText("pisell2.text.holder");
+  const updateStateHolders = (holders) => {
+    dispatch({
+      type: "setPet",
+      payload: {
+        holders
+      }
+    });
+  };
+  const handleClose = () => {
+    setOpen(false);
+    if (resolve) {
+      resolve(null);
+    }
+    setTimeout(() => {
+      onClose();
+    }, 300);
+  };
+  const handleConfirm = (nextValues) => {
+    setOpen(false);
+    if (resolve) {
+      if (nextValues && nextValues.length > 0) {
+        const selectedIds = nextValues.map((val) => Number(val));
+        resolve(selectedIds);
+      } else {
+        resolve(null);
+      }
+    }
+    setTimeout(() => {
+      onClose();
+    }, 300);
+  };
+  const handleAdd = () => {
+    var _a2, _b2, _c2, _d2, _e2, _f, _g, _h;
+    const currentState = stateRef.current;
+    const waiverForm = (_a2 = currentState == null ? void 0 : currentState.pet) == null ? void 0 : _a2.waiverForm;
+    currentState.action({
+      type: "pisell1.goCustomFormAddData",
+      data: {
+        zIndex: 1101,
+        customerId: (_c2 = (_b2 = currentState.client) == null ? void 0 : _b2.value) == null ? void 0 : _c2.id,
+        formDataConfig: isMinorAndWaiver ? {
+          ...waiverForm,
+          customer_id: (_e2 = (_d2 = currentState.client) == null ? void 0 : _d2.value) == null ? void 0 : _e2.id,
+          is_franchisor: (_g = (_f = currentState.pet.formData) == null ? void 0 : _f[0]) == null ? void 0 : _g.is_franchisor
+        } : { ...((_h = currentState.pet.formData) == null ? void 0 : _h[0]) || {} }
+      },
+      callback: (res) => {
+        var _a3, _b3;
+        let obj = {};
+        for (let item of res) {
+          obj[item.key] = item.value;
+        }
+        const isWalkInBol = (0, import_utils2.isWalkIn)((_b3 = (_a3 = currentState.client) == null ? void 0 : _a3.value) == null ? void 0 : _b3.id);
+        const newHolders = !isWalkInBol ? [obj, ...currentState.pet.holders || []] : currentState.pet.holders || [];
+        updateStateHolders(newHolders);
+        const updatedState = {
+          ...currentState,
+          pet: {
+            ...currentState.pet,
+            holders: newHolders
+          }
+        };
+        stateRef.current = updatedState;
+        const newOptions = getHolderOptions(updatedState);
+        setHolderOptions(newOptions);
+      }
+    });
+  };
+  const handleSkip = () => {
+    setOpen(false);
+    if (resolve) {
+      resolve(null);
+    }
+    setTimeout(() => {
+      onClose();
+    }, 300);
+  };
+  return /* @__PURE__ */ import_react.default.createElement(
+    import_selectHolder.default,
+    {
+      open,
+      modalConfig: {
+        title: `${import_utils.locales.getText("pisell-select-holder-please-select")} ${maxSelectedCount || 1} ${title}`,
+        confirmText: import_utils.locales.getText("pisell2.text.confirm")
+      },
+      dataSource: holderOptions,
+      value: selectedValues,
+      displayConfig,
+      maxSelectedCount,
+      allowAdd: true,
+      onClose: handleClose,
+      onConfirm: handleConfirm,
+      onAdd: handleAdd,
+      onSkip: handleSkip
+    }
+  );
+};
+function selectHolderModal(options) {
+  const { state, dispatch, initialValue, maxSelectedCount } = options;
+  return new Promise((resolve) => {
+    if (modalState && modalState.resolve) {
+      modalState.resolve(null);
+    }
+    const newState = {
+      open: true,
+      state,
+      dispatch,
+      initialValue,
+      maxSelectedCount,
+      resolve
+    };
+    notifyAllInstances(newState);
+  });
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  SelectHolderModal,
+  selectHolderModal
+});

package/lib/components/booking/utils.d.ts

@@ -1,8 +1,4 @@
 import dayjs from 'dayjs';
-/**
- * @title: 高阶函数结果缓存（Memoization）
- */
-export declare function memoize<T extends (...args: any[]) => any>(fn: T): T;
 declare type RType = (url: string, data?: {} | undefined, config?: {} | undefined) => Promise<any>;
 declare class Request {
     private request;
@@ -27,8 +23,21 @@ export declare const request: Request;
  */
 export declare const getDiscountTime: (service_times: number, isDay?: boolean) => string;
 /**
- * @title: 时间切片（带缓存版本）
- * @description: 使用 memoize 高阶函数包裹 sliceDayIntoFiveMinutes，相同参数时直接返回缓存结果
+ * @title: 格式化跨日预约的时长用于展示
+ * @description:
+ * @param {number} days
+ * @param {number} minutes
+ * @return {*}
+ */
+export declare const getDiscountTimeByDayMinutes: (days: number, minutes: number) => string;
+/**
+ * @title: 时间切片
+ * @description:
+ * @param {any} config
+ * @param {string} locale
+ * @return {*}
+ * @Author: zhiwei.Wang
+ * @Date: 2024-04-26 13:59
  */
 export declare const sliceDayIntoFiveMinutes: (config: any, locale: string, isDay?: boolean) => {
     timeSlices: {
@@ -112,7 +121,7 @@ export declare const flexibleObj: {
 export declare const getEndDate: (startDate: any, duration: string | number, endDate: any) => any;
 export declare const getServiceTimes: (service: any) => {
     startDate: dayjs.Dayjs;
-    endDate: dayjs.Dayjs;
+    endDate: any;
 };
 export declare const getErrorList: (resource: any, cacheItem: any, isDay?: boolean) => {
     label: any;

package/lib/components/booking/utils.js

@@ -39,6 +39,7 @@ __export(utils_exports, {
   getCacheParams: () => getCacheParams,
   getDays: () => getDays,
   getDiscountTime: () => getDiscountTime,
+  getDiscountTimeByDayMinutes: () => getDiscountTimeByDayMinutes,
   getDuration: () => getDuration,
   getEndDate: () => getEndDate,
   getErrorList: () => getErrorList,
@@ -57,7 +58,6 @@ __export(utils_exports, {
   isNowTime: () => isNowTime,
   isSessionProduct: () => isSessionProduct,
   isWalkIn: () => isWalkIn,
-  memoize: () => memoize,
   request: () => request,
   sliceDayIntoFiveMinutes: () => sliceDayIntoFiveMinutes
 });
@@ -68,18 +68,7 @@ var import_utils2 = require("./info/service2/utils");
 var import_lodash = require("lodash");
 var import_utilsByBooking = require("./info2/utilsByBooking");
 var import_decimal = __toESM(require("decimal.js"));
-function memoize(fn) {
-  const cache = /* @__PURE__ */ new Map();
-  return function(...args) {
-    const key = JSON.stringify(args);
-    if (cache.has(key)) {
-      return cache.get(key);
-    }
-    const result = fn.apply(this, args);
-    cache.set(key, result);
-    return result;
-  };
-}
+var import_utils3 = require("./info2/service/addService/utils");
 var Request = class {
   request = {};
   constructor() {
@@ -112,7 +101,13 @@ var getDiscountTime = (service_times, isDay) => {
     return str;
   }
 };
-var _sliceDayIntoFiveMinutes = (config, locale, isDay) => {
+var getDiscountTimeByDayMinutes = (days, minutes) => {
+  if (days === 0) {
+    return getDiscountTime(minutes);
+  }
+  return `${days} ${import_utils.locales.getText("pisell2.text.day")(days)} ${getDiscountTime(minutes)}`;
+};
+var sliceDayIntoFiveMinutes = (config, locale, isDay) => {
   let _locale = locale;
   let dayjsLocale = _locale === "en-US" || _locale === "en" ? "en" : "zh-cn";
   import_dayjs.default.locale(dayjsLocale);
@@ -161,7 +156,6 @@ var _sliceDayIntoFiveMinutes = (config, locale, isDay) => {
   }
   return { timeSlices, durationSlicesBasedOnTime };
 };
-var sliceDayIntoFiveMinutes = memoize(_sliceDayIntoFiveMinutes);
 var getNowTime = () => {
   return (0, import_dayjs.default)().format("HH:mm");
 };
@@ -199,15 +193,12 @@ var findNextSlice = ({
   return timeSlices[index].value;
 };
 var findNextDuration = (current, array, defaultValue) => {
-  if (defaultValue) {
-    return defaultValue;
-  }
   for (let i = 0; i < array.length; i++) {
     if (array[i].value == (current == null ? void 0 : current.value)) {
       return array[i].value;
     }
   }
-  return array[0].value;
+  return defaultValue || array[0].value;
 };
 var formatProductListByCategory = (list, filterItem) => {
   let _list = list || [];
@@ -425,6 +416,12 @@ 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)
   );
+  if ((0, import_utils3.isMultiDayProduct)(service)) {
+    return {
+      startDate,
+      endDate: service._extend.end_date
+    };
+  }
   const endDate = startDate.add(
     flexibleObj.getValue(service._extend.duration),
     "minute"
@@ -520,7 +517,7 @@ var formatResource = (resourceItem, cacheItem, formatLabel) => {
   return _resourceItem;
 };
 var getLastServer = (list) => {
-  return list == null ? void 0 : list[0];
+  return list[list.length - 1];
 };
 var getCacheParams = () => {
   const sessionData = sessionStorage.getItem("pisell2.booking.serviceParams");
@@ -713,6 +710,7 @@ var getIsEdit = (state) => {
   getCacheParams,
   getDays,
   getDiscountTime,
+  getDiscountTimeByDayMinutes,
   getDuration,
   getEndDate,
   getErrorList,
@@ -731,7 +729,6 @@ var getIsEdit = (state) => {
   isNowTime,
   isSessionProduct,
   isWalkIn,
-  memoize,
   request,
   sliceDayIntoFiveMinutes
 });

package/lib/components/checkout/PaymentModal.js

@@ -63,7 +63,6 @@ var import_lodash = require("lodash");
 var import_utils2 = require("./utils");
 var import_usePaymentLogger = __toESM(require("./hooks/usePaymentLogger"));
 var import_antd = require("antd");
-var import_printer = __toESM(require("../../hooks/printer"));
 var import_priceKeyboard = require("../../pro/priceKeyboard");
 var import_pisellos = require("../ticketBooking/hooks/pisellos");
 var CheckoutHooks = {
@@ -123,7 +122,6 @@ var PaymentContent = (0, import_react.forwardRef)(
     const walletPassRef = (0, import_react.useRef)(null);
     const [paymentItems, setPaymentItems] = (0, import_react.useState)([]);
     const [walletPassData, setWalletPassData] = (0, import_react.useState)({});
-    const { nativePrint } = (0, import_printer.default)();
     const [syncingLock, setSyncingLock] = (0, import_react.useState)(false);
     const isOrderFree = (0, import_react.useMemo)(() => {
       if (!customAmount) return false;
@@ -420,13 +418,11 @@ var PaymentContent = (0, import_react.forwardRef)(
             );
             const orderSubmitStartUnsubscribe = core.effects.on(
               CheckoutHooks.OnOrderSubmitStart,
-              executeIfActive(
-                () => {
-                  var _a2;
-                  setSyncingLock(true);
-                  (_a2 = Toast == null ? void 0 : Toast.loading) == null ? void 0 : _a2.call(Toast, "", 0);
-                }
-              )
+              executeIfActive(() => {
+                var _a2;
+                setSyncingLock(true);
+                (_a2 = Toast == null ? void 0 : Toast.loading) == null ? void 0 : _a2.call(Toast, "", 0);
+              })
             );
             const orderSubmitEndUnsubscribe = core.effects.on(
               CheckoutHooks.OnOrderSubmitEnd,
@@ -594,12 +590,11 @@ var PaymentContent = (0, import_react.forwardRef)(
             data: {
               order_id: responseData.order_id,
               machine_code_print_info: responseData == null ? void 0 : responseData.machine_code_print_info,
-              small_ticket_data: (_b2 = responseData == null ? void 0 : responseData.payment_info) == null ? void 0 : _b2.small_ticket_data,
-              machine_code_print_info_v2: responseData == null ? void 0 : responseData.machine_code_print_info_v2
+              small_ticket_data: (_b2 = responseData == null ? void 0 : responseData.payment_info) == null ? void 0 : _b2.small_ticket_data
             }
           };
           console.log("print_order_onOrderSynced_params>>>>", params);
-          nativePrint(params, (res) => {
+          (0, import_utils.webPrint)(params, (res) => {
             console.log("print_order_onOrderSynced_res>>>>", res);
           });
         } catch (error) {
@@ -765,7 +760,7 @@ var PaymentContent = (0, import_react.forwardRef)(
               data: { order_id: data.orderId }
             };
             try {
-              nativePrint(params, (res) => {
+              (0, import_utils.webPrint)(params, (res) => {
                 console.log("handleButtonClick_print-receipt_res>>>>", res);
                 if (!(res == null ? void 0 : res.result)) {
                   Toast == null ? void 0 : Toast.error((res == null ? void 0 : res.msg) || "");
@@ -1068,10 +1063,10 @@ var PaymentModal = ({
   const [actualShowCashPayment, setActualShowCashPayment] = (0, import_react.useState)(true);
   const [windowHeight, setWindowHeight] = (0, import_react.useState)(0);
   const [showRetryModal, setShowRetryModal] = (0, import_react.useState)(false);
+  const [showCreateErrorModal, setShowCreateErrorModal] = (0, import_react.useState)(false);
   const [currentEditOrderId, setCurrentEditOrderId] = (0, import_react.useState)(editOrderId || 0);
   const { executeIfActive } = (0, import_pisellos.useActiveExecute)();
   const Toast = (0, import_materials.useToast)();
-  const { nativePrint } = (0, import_printer.default)();
   const handleRetry = async () => {
     const checkoutModule = pisellos == null ? void 0 : pisellos.getModule("checkout");
     const res = await (checkoutModule == null ? void 0 : checkoutModule.manualSyncOrderAsync());
@@ -1506,8 +1501,7 @@ var PaymentModal = ({
                     data: {
                       order_id: responseData.order_id,
                       machine_code_print_info: responseData == null ? void 0 : responseData.machine_code_print_info,
-                      small_ticket_data: (_c3 = responseData == null ? void 0 : responseData.payment_info) == null ? void 0 : _c3.small_ticket_data,
-                      machine_code_print_info_v2: responseData == null ? void 0 : responseData.machine_code_print_info_v2
+                      small_ticket_data: (_c3 = responseData == null ? void 0 : responseData.payment_info) == null ? void 0 : _c3.small_ticket_data
                     }
                   };
                   console.log("print_order_onOrderSynced_params>>>>", params);
@@ -1518,7 +1512,7 @@ var PaymentModal = ({
                       params
                     }
                   });
-                  nativePrint(params, (res) => {
+                  (0, import_utils.webPrint)(params, (res) => {
                     console.log("print_order_onOrderSynced_res>>>>", res);
                     logger == null ? void 0 : logger.addLog({
                       type: "info",
@@ -1627,6 +1621,7 @@ var PaymentModal = ({
             error
           }
         });
+        setShowCreateErrorModal(true);
       }
     };
     if (data) {
@@ -1694,7 +1689,7 @@ var PaymentModal = ({
           data: { order_id: data2.orderId }
         };
         try {
-          nativePrint(params, (res) => {
+          (0, import_utils.webPrint)(params, (res) => {
             console.log("handleButtonClick_print-receipt_res>>>>", res);
             if (!(res == null ? void 0 : res.result)) {
               Toast == null ? void 0 : Toast.error((res == null ? void 0 : res.msg) || "");
@@ -2059,6 +2054,34 @@ var PaymentModal = ({
       },
       import_utils.locales.getText("retry") || "重试"
     ))
+  ), /* @__PURE__ */ import_react.default.createElement(
+    import_materials.PisellContainer,
+    {
+      renderType: "modal",
+      props: {
+        open: showCreateErrorModal,
+        title: import_utils.locales.getText("pisell2.checkout.tips"),
+        footer: null,
+        keyboard: false,
+        onCancel: () => {
+          setShowCreateErrorModal(false);
+        }
+        // 禁用关闭
+      }
+    },
+    /* @__PURE__ */ import_react.default.createElement("div", { style: { textAlign: "center", padding: "20px" } }, /* @__PURE__ */ import_react.default.createElement("div", { style: { marginBottom: "16px", fontSize: "16px" } }, import_utils.locales.getText("pisell2.checkout.order-create-failed")), /* @__PURE__ */ import_react.default.createElement(
+      import_antd.Button,
+      {
+        type: "primary",
+        size: "large",
+        onClick: () => {
+          setShowCreateErrorModal(false);
+          window.location.reload();
+        },
+        style: { width: "100%", marginTop: "80px" }
+      },
+      import_utils.locales.getText("confirm") || "确认"
+    ))
   ));
 };
 var PaymentModal_default = PaymentModal;

package/lib/components/checkout/components/CashPaymentModule/index.js

@@ -38,8 +38,8 @@ var import_useEngineContext = __toESM(require("../../../../hooks/useEngineContex
 var import_utils = require("@pisell/utils");
 var import_locales = __toESM(require("../../locales"));
 var import_useToast = __toESM(require("../../../../hooks/useToast"));
-var import_ahooks = require("ahooks");
 var import_priceKeyboard = require("../../../../pro/priceKeyboard");
+var import_ahooks = require("ahooks");
 var import_index = require("./index.less");
 function CashPaymentModule({
   amountSymbol,
@@ -76,12 +76,6 @@ function CashPaymentModule({
   }, [customAmount, balanceDueAmount, orderInfo == null ? void 0 : orderInfo.isDeposit]);
   const isAmountButtonsDisabled = disabled || Number(customAmount || 0) === 0;
   const isInputDisabled = disabled || Number(customAmount || 0) === 0;
-  const handleAmountClick = (clickedAmount) => {
-    if (isAmountButtonsDisabled) return;
-    const amountStr = clickedAmount.toString();
-    setAmount(amountStr);
-    setRoundingAmount(0);
-  };
   const handleCashPayInternal = () => {
     if (isAmountButtonsDisabled) return;
     if (onPaymentComplete) {

package/lib/components/checkout/components/ScrollableList/index.js

@@ -216,7 +216,6 @@ var ScrollableList = ({
     {
       style: {
         ...bottomGradientStyle,
-        width: "100%",
         border: "none",
         background: "linear-gradient(180deg, rgba(255, 255, 255, 0) 0%, #A78BE1 100%)",
         ...gradientStyle

package/lib/components/checkout/hooks/useWalletPass.d.ts

@@ -17,7 +17,7 @@ export declare const useWalletPass: (props: {
     cardData: any;
     handleSelectWallet: (value: number[]) => void;
     selectedWalletIds: any[];
-    expiredWalletIds: any;
+    expiredWalletIds: any[];
     expiredWalletData: any;
     disabledWalletData: any[];
     clearAllSelectedWallet: () => void;