@pisell/private-materials 6.6.1 → 6.7.1

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

@@ -44,9 +44,6 @@ declare const _default: {
         'pisell2.text.order-notes': string;
         'pisell2.text.add-order-notes': string;
         'pisell2.text.add-internal-notes': string;
-        'pisell2.text.holder-unassigned': (count: number) => string;
-        'pisell2.text.press-card-assign-holder': string;
-        'pisell2.text.skip-for-now': string;
         'pisell2.text.add-notes': string;
         'pisell2.text.notes': string;
         'pisell2.text.new-appointment': string;
@@ -201,7 +198,6 @@ declare const _default: {
         'page.booking.text.refund': string;
         'page.booking.text.confirm': string;
         'page.booking.text.go-back': string;
-        'page.booking.text.undo': string;
         'page.booking.text.cancel-booking': string;
         'page.booking.text.cancel-booking.msg': string;
         'page.booking.text.disabled-tickets': string;
@@ -211,7 +207,6 @@ declare const _default: {
         'page.booking.text.please-choose-an-option-2': string;
         'page.booking.text.resource.min-length-error': (x: number, y: string) => string;
         'page.booking.text.resource.check-auto-allocation-tip': string;
-        'page.booking.text.holder.length-error': string;
         'page.booking.text.price-extra': (origin: string, current: string) => string;
         'pisell2.booking.dashboard.groups-on-site-now': string;
         'pisell2.booking.dashboard.groups-on-site-now-tip': string;
@@ -233,8 +228,6 @@ declare const _default: {
         'pisell2.booking.info.text.clear': string;
         'pisell2.booking.info.text.clear-cart': string;
         'pisell2.booking.info.text.clear-all': string;
-        'pisell2.booking.info.text.add-holder': string;
-        'pisell2.booking.info.text.select-holder-title': string;
         'pisell2.booking.info.text.create-new': string;
         'pisell2.booking.info.text.form-agreement-yes': string;
         'pisell2.booking.info.text.form-agreement-no': string;
@@ -250,7 +243,6 @@ declare const _default: {
         'pisell2.text.missing.reservation.content': string;
         'pisell2.text.confirm': string;
         'pisell2.text.cancel': string;
-        'pisell2.text.close-confirm-message': string;
         'pisell2.action-buttons.clear': string;
         'pisell2.action-buttons.manuel-order': string;
         'pisell2.action-buttons.customise-item': string;
@@ -312,8 +304,6 @@ declare const _default: {
         'pisell2.text.form.link.to.another.record.more': string;
         'pisell2.booking.text.contact-info.title': string;
         'pisell2.booking.text.search-placeholder': string;
-        'pisell-select-holder-please-select': string;
-        'pisell-select-holder-selected': string;
     };
     'zh-CN': {
         'pisell2.text.refunded-amount': string;
@@ -365,9 +355,6 @@ declare const _default: {
         'pisell2.text.order-notes': string;
         'pisell2.text.add-order-notes': string;
         'pisell2.text.add-internal-notes': string;
-        'pisell2.text.holder-unassigned': (count: number) => string;
-        'pisell2.text.press-card-assign-holder': string;
-        'pisell2.text.skip-for-now': string;
         'pisell2.text.add-notes': string;
         'pisell2.text.notes': string;
         'pisell2.text.new-appointment': string;
@@ -517,7 +504,6 @@ declare const _default: {
         'page.booking.text.refund': string;
         'page.booking.text.confirm': string;
         'page.booking.text.go-back': string;
-        'page.booking.text.undo': string;
         'page.booking.text.cancel-booking': string;
         'page.booking.text.cancel-booking.msg': string;
         'page.booking.text.disabled-tickets': string;
@@ -527,7 +513,6 @@ declare const _default: {
         'page.booking.text.please-choose-an-option-2': string;
         'page.booking.text.resource.min-length-error': (x: number, y: string) => string;
         'page.booking.text.resource.check-auto-allocation-tip': string;
-        'page.booking.text.holder.length-error': string;
         'page.booking.text.price-extra': (origin: string, current: string) => string;
         'pisell2.booking.dashboard.groups-on-site-now': string;
         'pisell2.booking.dashboard.groups-on-site-now-tip': string;
@@ -549,8 +534,6 @@ declare const _default: {
         'pisell2.booking.info.text.clear': string;
         'pisell2.booking.info.text.clear-cart': string;
         'pisell2.booking.info.text.clear-all': string;
-        'pisell2.booking.info.text.add-holder': string;
-        'pisell2.booking.info.text.select-holder-title': string;
         'pisell2.booking.info.text.create-new': string;
         'pisell2.booking.info.text.form-agreement-yes': string;
         'pisell2.booking.info.text.form-agreement-no': string;
@@ -566,7 +549,6 @@ declare const _default: {
         'pisell2.text.missing.reservation.content': string;
         'pisell2.text.confirm': string;
         'pisell2.text.cancel': string;
-        'pisell2.text.close-confirm-message': string;
         'pisell2.action-buttons.clear': string;
         'pisell2.action-buttons.manuel-order': string;
         'pisell2.action-buttons.customise-item': string;
@@ -628,8 +610,6 @@ declare const _default: {
         'pisell2.text.form.link.to.another.record.more': string;
         'pisell2.booking.text.contact-info.title': string;
         'pisell2.booking.text.search-placeholder': string;
-        'pisell-select-holder-please-select': string;
-        'pisell-select-holder-selected': string;
     };
     'zh-HK': {
         'pisell2.text.refunded-amount': string;
@@ -681,9 +661,6 @@ declare const _default: {
         'pisell2.text.order-notes': string;
         'pisell2.text.add-order-notes': string;
         'pisell2.text.add-internal-notes': string;
-        'pisell2.text.holder-unassigned': (count: number) => string;
-        'pisell2.text.press-card-assign-holder': string;
-        'pisell2.text.skip-for-now': string;
         'pisell2.text.add-notes': string;
         'pisell2.text.notes': string;
         'pisell2.text.new-appointment': string;
@@ -833,7 +810,6 @@ declare const _default: {
         'page.booking.text.refund': string;
         'page.booking.text.confirm': string;
         'page.booking.text.go-back': string;
-        'page.booking.text.undo': string;
         'page.booking.text.cancel-booking': string;
         'page.booking.text.cancel-booking.msg': string;
         'page.booking.text.disabled-tickets': string;
@@ -843,7 +819,6 @@ declare const _default: {
         'page.booking.text.please-choose-an-option-2': string;
         'page.booking.text.resource.min-length-error': (x: number, y: string) => string;
         'page.booking.text.resource.check-auto-allocation-tip': string;
-        'page.booking.text.holder.length-error': string;
         'page.booking.text.price-extra': (origin: string, current: string) => string;
         'pisell2.booking.dashboard.groups-on-site-now': string;
         'pisell2.booking.dashboard.groups-on-site-now-tip': string;
@@ -865,8 +840,6 @@ declare const _default: {
         'pisell2.booking.info.text.clear': string;
         'pisell2.booking.info.text.clear-cart': string;
         'pisell2.booking.info.text.clear-all': string;
-        'pisell2.booking.info.text.add-holder': string;
-        'pisell2.booking.info.text.select-holder-title': string;
         'pisell2.booking.info.text.create-new': string;
         'pisell2.booking.info.text.form-agreement-yes': string;
         'pisell2.booking.info.text.form-agreement-no': string;
@@ -882,7 +855,6 @@ declare const _default: {
         'pisell2.text.missing.reservation.content': string;
         'pisell2.text.confirm': string;
         'pisell2.text.cancel': string;
-        'pisell2.text.close-confirm-message': string;
         'pisell2.action-buttons.clear': string;
         'pisell2.action-buttons.manuel-order': string;
         'pisell2.action-buttons.customise-item': string;
@@ -944,8 +916,6 @@ declare const _default: {
         'pisell2.text.form.link.to.another.record.more': string;
         'pisell2.booking.text.contact-info.title': string;
         'pisell2.booking.text.search-placeholder': string;
-        'pisell-select-holder-please-select': string;
-        'pisell-select-holder-selected': string;
     };
 };
 export default _default;

package/lib/components/booking/locales.js

@@ -79,9 +79,6 @@ var locales_default = {
     "pisell2.text.order-notes": "Order notes",
     "pisell2.text.add-order-notes": "Add Order Note",
     "pisell2.text.add-internal-notes": "Add Internal note",
-    "pisell2.text.holder-unassigned": (count) => `${count} Holder(s) Unassigned`,
-    "pisell2.text.press-card-assign-holder": "Please Press Each Card to Assign Holder",
-    "pisell2.text.skip-for-now": "Skip for Now",
     "pisell2.text.add-notes": "Add Notes",
     "pisell2.text.notes": "Notes",
     "pisell2.text.new-appointment": "New appointment",
@@ -257,7 +254,6 @@ var locales_default = {
     "page.booking.text.refund": "Refund",
     "page.booking.text.confirm": "Confirm",
     "page.booking.text.go-back": "Go back",
-    "page.booking.text.undo": "Undo",
     "page.booking.text.cancel-booking": "Cancel Booking",
     "page.booking.text.cancel-booking.msg": "The action is irreversible. Please proceed with caution. ",
     "page.booking.text.disabled-tickets": "All tickets will be disabled.",
@@ -267,7 +263,6 @@ var locales_default = {
     "page.booking.text.please-choose-an-option-2": "Cancel only: Cancel the appointment without processing a refund. (You can still process a refund after cancellation if needed)",
     "page.booking.text.resource.min-length-error": (x, y) => `Select at least ${x} ${y}`,
     "page.booking.text.resource.check-auto-allocation-tip": `When checked, content will be automatically filled in without manual selection`,
-    "page.booking.text.holder.length-error": "Please select enough holder(s)",
     "page.booking.text.price-extra": (origin, current) => `Original price of the item:${origin},Current price of the item:${current}`,
     "pisell2.booking.dashboard.groups-on-site-now": "Groups on-site now",
     "pisell2.booking.dashboard.groups-on-site-now-tip": "Tip: Total number of groups who have checked in and are currently on-site",
@@ -289,8 +284,6 @@ var locales_default = {
     "pisell2.booking.info.text.clear": "Clear",
     "pisell2.booking.info.text.clear-cart": "Clear cart",
     "pisell2.booking.info.text.clear-all": "Clear all",
-    "pisell2.booking.info.text.add-holder": "Select",
-    "pisell2.booking.info.text.select-holder-title": "Who would you like to book this event for？",
     "pisell2.booking.info.text.create-new": "Create new",
     "pisell2.booking.info.text.form-agreement-yes": "Yes",
     "pisell2.booking.info.text.form-agreement-no": "No",
@@ -306,7 +299,6 @@ var locales_default = {
     "pisell2.text.missing.reservation.content": "You have not selected a reservation type, Please select one before proceeding.",
     "pisell2.text.confirm": "Confirm",
     "pisell2.text.cancel": "Cancel",
-    "pisell2.text.close-confirm-message": "Closing will discard all changes. Are you sure you want to close?",
     // Action Buttons
     "pisell2.action-buttons.clear": "Clear",
     "pisell2.action-buttons.manuel-order": "Manual\nOrder $",
@@ -380,9 +372,7 @@ var locales_default = {
     "pisell2.text.form.link.to.another.record.more": "View More",
     // 联系信息
     "pisell2.booking.text.contact-info.title": "Contact info",
-    "pisell2.booking.text.search-placeholder": "Search Customers / Contacts",
-    "pisell-select-holder-please-select": "Please Select",
-    "pisell-select-holder-selected": "Selected: "
+    "pisell2.booking.text.search-placeholder": "Search Customers / Contacts"
   },
   "zh-CN": {
     "pisell2.text.refunded-amount": "已退金额",
@@ -434,9 +424,6 @@ var locales_default = {
     "pisell2.text.order-notes": "订单备注",
     "pisell2.text.add-order-notes": "添加订单备注",
     "pisell2.text.add-internal-notes": "添加内部备注",
-    "pisell2.text.holder-unassigned": (count) => `${count} 个预约主体未分配`,
-    "pisell2.text.press-card-assign-holder": "请点击每个卡片来分配预约主体",
-    "pisell2.text.skip-for-now": "稍后处理",
     "pisell2.text.add-notes": "添加备注",
     "pisell2.text.notes": "备注",
     "pisell2.text.new-appointment": "新预约",
@@ -612,7 +599,6 @@ var locales_default = {
     "page.booking.text.refund": "退款",
     "page.booking.text.confirm": "确认",
     "page.booking.text.go-back": "返回",
-    "page.booking.text.undo": "撤销",
     "page.booking.text.cancel-booking": "取消预约",
     "page.booking.text.cancel-booking.msg": "该操作不可撤销，请谨慎操作。",
     "page.booking.text.disabled-tickets": "所有票单将被禁用。",
@@ -622,7 +608,6 @@ var locales_default = {
     "page.booking.text.please-choose-an-option-2": "仅取消：仅取消预约，但不进行退款处理。（您仍然可以在取消后再进行退款操作）",
     "page.booking.text.resource.min-length-error": (x, y) => `至少选择${x}项${y}`,
     "page.booking.text.resource.check-auto-allocation-tip": `勾选后将自动填入内容，无需手动选择`,
-    "page.booking.text.holder.length-error": "请选择足够的持有者",
     "page.booking.text.price-extra": (origin, current) => `商品原价:${origin},商品现价:${current}`,
     "pisell2.booking.dashboard.groups-on-site-now": "当前在场团体",
     "pisell2.booking.dashboard.groups-on-site-now-tip": "提示：已检票并在场内的团体总数",
@@ -644,8 +629,6 @@ var locales_default = {
     "pisell2.booking.info.text.clear": "清空",
     "pisell2.booking.info.text.clear-cart": "清空购物车",
     "pisell2.booking.info.text.clear-all": "清空",
-    "pisell2.booking.info.text.add-holder": "请选择",
-    "pisell2.booking.info.text.select-holder-title": "您想为谁预订这个活动？",
     "pisell2.booking.info.text.create-new": "新建",
     "pisell2.booking.info.text.form-agreement-yes": "是",
     "pisell2.booking.info.text.form-agreement-no": "否",
@@ -661,7 +644,6 @@ var locales_default = {
     "pisell2.text.missing.reservation.content": "您尚未选择预约类型，请在继续操作前选择。",
     "pisell2.text.confirm": "确定",
     "pisell2.text.cancel": "取消",
-    "pisell2.text.close-confirm-message": "关闭后，已填写或操作的内容将不会保存，确定要关闭吗？",
     // Action Buttons
     "pisell2.action-buttons.clear": "清空",
     "pisell2.action-buttons.manuel-order": "手动\n订单 $",
@@ -735,9 +717,7 @@ var locales_default = {
     "pisell2.text.form.link.to.another.record.more": "查看更多",
     // 联系信息
     "pisell2.booking.text.contact-info.title": "联系信息",
-    "pisell2.booking.text.search-placeholder": "搜索客户/联系信息",
-    "pisell-select-holder-please-select": "请选择",
-    "pisell-select-holder-selected": "已选择："
+    "pisell2.booking.text.search-placeholder": "搜索客户/联系信息"
   },
   "zh-HK": {
     "pisell2.text.refunded-amount": "已退金額",
@@ -789,9 +769,6 @@ var locales_default = {
     "pisell2.text.order-notes": "訂單備注",
     "pisell2.text.add-order-notes": "添加訂單備注",
     "pisell2.text.add-internal-notes": "添加內部備注",
-    "pisell2.text.holder-unassigned": (count) => `${count} 個預約主體未分配`,
-    "pisell2.text.press-card-assign-holder": "請點擊每個卡片來分配預約主體",
-    "pisell2.text.skip-for-now": "稍後處理",
     "pisell2.text.add-notes": "添加備注",
     "pisell2.text.notes": "備注",
     "pisell2.text.new-appointment": "新預約",
@@ -967,7 +944,6 @@ var locales_default = {
     "page.booking.text.refund": "退款",
     "page.booking.text.confirm": "確認",
     "page.booking.text.go-back": "返回",
-    "page.booking.text.undo": "撤销",
     "page.booking.text.cancel-booking": "取消預約",
     "page.booking.text.cancel-booking.msg": "該操作不可撤銷，請謹慎操作。",
     "page.booking.text.disabled-tickets": "所有票單將被禁用。",
@@ -977,7 +953,6 @@ var locales_default = {
     "page.booking.text.please-choose-an-option-2": "僅取消：僅取消預約，但不進行退款處理。（您仍然可以在取消後再進行退款操作）",
     "page.booking.text.resource.min-length-error": (x, y) => `至少選擇${x}項${y}`,
     "page.booking.text.resource.check-auto-allocation-tip": `勾選後將自動填入內容，無需手動選擇`,
-    "page.booking.text.holder.length-error": "請選擇足夠的持有者",
     "page.booking.text.price-extra": (origin, current) => `商品原價:${origin},商品現價:${current}`,
     "pisell2.booking.dashboard.groups-on-site-now": "當前在場團體",
     "pisell2.booking.dashboard.groups-on-site-now-tip": "提示：已檢票並在場內的團體總數",
@@ -999,8 +974,6 @@ var locales_default = {
     "pisell2.booking.info.text.clear": "清空",
     "pisell2.booking.info.text.clear-cart": "清空購物車",
     "pisell2.booking.info.text.clear-all": "清空",
-    "pisell2.booking.info.text.add-holder": "请选择",
-    "pisell2.booking.info.text.select-holder-title": "您想为谁预订这个活动？",
     "pisell2.booking.info.text.create-new": "新建",
     "pisell2.booking.info.text.form-agreement-yes": "是",
     "pisell2.booking.info.text.form-agreement-no": "否",
@@ -1016,7 +989,6 @@ var locales_default = {
     "pisell2.text.missing.reservation.content": "您尚未選擇預約類型，請在繼續操作前選擇。",
     "pisell2.text.confirm": "確定",
     "pisell2.text.cancel": "取消",
-    "pisell2.text.close-confirm-message": "關閉後，已填寫或操作的內容將不會保存，確定要關閉嗎？",
     // Action Buttons
     "pisell2.action-buttons.clear": "清空",
     "pisell2.action-buttons.manuel-order": "手動\n訂單 $",
@@ -1090,8 +1062,6 @@ var locales_default = {
     "pisell2.text.form.link.to.another.record.more": "查看更多",
     // 联系信息
     "pisell2.booking.text.contact-info.title": "聯繫信息",
-    "pisell2.booking.text.search-placeholder": "搜索客戶/聯系信息",
-    "pisell-select-holder-please-select": "請選擇",
-    "pisell-select-holder-selected": "已選擇："
+    "pisell2.booking.text.search-placeholder": "搜索客戶/聯系信息"
   }
 };

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

@@ -1,4 +1,8 @@
 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;
@@ -23,21 +27,8 @@ export declare const request: Request;
  */
 export declare const getDiscountTime: (service_times: number, isDay?: boolean) => string;
 /**
- * @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
+ * @title: 时间切片（带缓存版本）
+ * @description: 使用 memoize 高阶函数包裹 sliceDayIntoFiveMinutes，相同参数时直接返回缓存结果
  */
 export declare const sliceDayIntoFiveMinutes: (config: any, locale: string, isDay?: boolean) => {
     timeSlices: {
@@ -121,7 +112,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: any;
+    endDate: dayjs.Dayjs;
 };
 export declare const getErrorList: (resource: any, cacheItem: any, isDay?: boolean) => {
     label: any;

package/lib/components/booking/utils.js

@@ -39,7 +39,6 @@ __export(utils_exports, {
   getCacheParams: () => getCacheParams,
   getDays: () => getDays,
   getDiscountTime: () => getDiscountTime,
-  getDiscountTimeByDayMinutes: () => getDiscountTimeByDayMinutes,
   getDuration: () => getDuration,
   getEndDate: () => getEndDate,
   getErrorList: () => getErrorList,
@@ -58,6 +57,7 @@ __export(utils_exports, {
   isNowTime: () => isNowTime,
   isSessionProduct: () => isSessionProduct,
   isWalkIn: () => isWalkIn,
+  memoize: () => memoize,
   request: () => request,
   sliceDayIntoFiveMinutes: () => sliceDayIntoFiveMinutes
 });
@@ -68,7 +68,18 @@ 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"));
-var import_utils3 = require("./info2/service/addService/utils");
+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 Request = class {
   request = {};
   constructor() {
@@ -101,13 +112,7 @@ var getDiscountTime = (service_times, isDay) => {
     return str;
   }
 };
-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) => {
+var _sliceDayIntoFiveMinutes = (config, locale, isDay) => {
   let _locale = locale;
   let dayjsLocale = _locale === "en-US" || _locale === "en" ? "en" : "zh-cn";
   import_dayjs.default.locale(dayjsLocale);
@@ -156,6 +161,7 @@ var sliceDayIntoFiveMinutes = (config, locale, isDay) => {
   }
   return { timeSlices, durationSlicesBasedOnTime };
 };
+var sliceDayIntoFiveMinutes = memoize(_sliceDayIntoFiveMinutes);
 var getNowTime = () => {
   return (0, import_dayjs.default)().format("HH:mm");
 };
@@ -193,12 +199,15 @@ 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 defaultValue || array[0].value;
+  return array[0].value;
 };
 var formatProductListByCategory = (list, filterItem) => {
   let _list = list || [];
@@ -416,12 +425,6 @@ 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"
@@ -517,7 +520,7 @@ var formatResource = (resourceItem, cacheItem, formatLabel) => {
   return _resourceItem;
 };
 var getLastServer = (list) => {
-  return list[list.length - 1];
+  return list == null ? void 0 : list[0];
 };
 var getCacheParams = () => {
   const sessionData = sessionStorage.getItem("pisell2.booking.serviceParams");
@@ -710,7 +713,6 @@ var getIsEdit = (state) => {
   getCacheParams,
   getDays,
   getDiscountTime,
-  getDiscountTimeByDayMinutes,
   getDuration,
   getEndDate,
   getErrorList,
@@ -729,6 +731,7 @@ var getIsEdit = (state) => {
   isNowTime,
   isSessionProduct,
   isWalkIn,
+  memoize,
   request,
   sliceDayIntoFiveMinutes
 });

package/lib/components/checkout/PaymentModal.js

@@ -63,6 +63,7 @@ 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 = {
@@ -122,6 +123,7 @@ 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;
@@ -418,11 +420,13 @@ 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,
@@ -590,11 +594,12 @@ 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
+              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
             }
           };
           console.log("print_order_onOrderSynced_params>>>>", params);
-          (0, import_utils.webPrint)(params, (res) => {
+          nativePrint(params, (res) => {
             console.log("print_order_onOrderSynced_res>>>>", res);
           });
         } catch (error) {
@@ -760,7 +765,7 @@ var PaymentContent = (0, import_react.forwardRef)(
               data: { order_id: data.orderId }
             };
             try {
-              (0, import_utils.webPrint)(params, (res) => {
+              nativePrint(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) || "");
@@ -1063,10 +1068,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());
@@ -1501,7 +1506,8 @@ 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
+                      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
                     }
                   };
                   console.log("print_order_onOrderSynced_params>>>>", params);
@@ -1512,7 +1518,7 @@ var PaymentModal = ({
                       params
                     }
                   });
-                  (0, import_utils.webPrint)(params, (res) => {
+                  nativePrint(params, (res) => {
                     console.log("print_order_onOrderSynced_res>>>>", res);
                     logger == null ? void 0 : logger.addLog({
                       type: "info",
@@ -1621,7 +1627,6 @@ var PaymentModal = ({
             error
           }
         });
-        setShowCreateErrorModal(true);
       }
     };
     if (data) {
@@ -1689,7 +1694,7 @@ var PaymentModal = ({
           data: { order_id: data2.orderId }
         };
         try {
-          (0, import_utils.webPrint)(params, (res) => {
+          nativePrint(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) || "");
@@ -2054,34 +2059,6 @@ 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_priceKeyboard = require("../../../../pro/priceKeyboard");
 var import_ahooks = require("ahooks");
+var import_priceKeyboard = require("../../../../pro/priceKeyboard");
 var import_index = require("./index.less");
 function CashPaymentModule({
   amountSymbol,
@@ -76,6 +76,12 @@ 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,6 +216,7 @@ 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;