@pisell/private-materials 6.5.10 → 6.5.12

package/es/components/ticketBooking/components/ticketBooking/index.js

@@ -23,7 +23,7 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 import React, { useEffect, useMemo, useRef, useState } from 'react';
-import { locales } from '@pisell/utils';
+import { locales, sendWarningLog } from '@pisell/utils';
 import { message } from 'antd';
 import { Iconfont, PisellModal, useToast } from '@pisell/materials';
 import { getOrderInfoByCode, getBookingDetail, getEventBookingDetail, getBookingConfig, getServices } from "../../serve";
@@ -48,6 +48,7 @@ import { getBookingType } from "../bookingDataPanel/bookingList/utils";
 import { useCustomer } from "../../hooks/pisellos";
 import { useMemoizedFn } from 'ahooks';
 import useScanManager from "../../hooks/pisellos/useScanManager";
+import { useDebounceFn } from 'ahooks';
 export var _formatBookingDetail = function _formatBookingDetail(data, modalState) {
   var _bookings$list, _bookings$list2;
   var customer_id = data.customer_id,
@@ -312,8 +313,54 @@ var TicketBooking = function TicketBooking(props) {
       closeScan();
     };
   }, []);
+  var _useDebounceFn = useDebounceFn(function (type, orderId) {
+      // 支付成功后清空状态
+      try {
+        var _store$getState;
+        _initFn(function () {});
+        setState({
+          createCount: state.createCount + 1
+        });
+        sendWarningLog({
+          title: '清空购物车',
+          content: [{
+            key: '店铺id',
+            value: store === null || store === void 0 || (_store$getState = store.getState) === null || _store$getState === void 0 || (_store$getState = _store$getState.call(store)) === null || _store$getState === void 0 || (_store$getState = _store$getState.global) === null || _store$getState === void 0 || (_store$getState = _store$getState.globalConfig) === null || _store$getState === void 0 ? void 0 : _store$getState.id
+          }, {
+            key: '订单id',
+            value: orderId
+          }, {
+            key: '类型',
+            value: type
+          }]
+        });
+      } catch (err) {
+        var _store$getState2;
+        sendWarningLog({
+          title: '清空购物车失败',
+          content: [{
+            key: '店铺id',
+            value: store === null || store === void 0 || (_store$getState2 = store.getState) === null || _store$getState2 === void 0 || (_store$getState2 = _store$getState2.call(store)) === null || _store$getState2 === void 0 || (_store$getState2 = _store$getState2.global) === null || _store$getState2 === void 0 || (_store$getState2 = _store$getState2.globalConfig) === null || _store$getState2 === void 0 ? void 0 : _store$getState2.id
+          }, {
+            key: '订单id',
+            value: orderId
+          }, {
+            key: '类型',
+            value: type
+          }, {
+            key: 'error',
+            value: err === null || err === void 0 ? void 0 : err.message
+          }]
+        });
+      }
+    }, {
+      wait: 500,
+      leading: true,
+      trailing: false
+    }),
+    clearAllCart = _useDebounceFn.run;
   useEffect(function () {
-    var _store$getState, _interaction$utils, _interaction$utils2;
+    var _store$getState3, _interaction$utils, _interaction$utils2;
     // bellaswonderland.mypisell.com localStorage可能满了
     localStorage.removeItem('bookingResourceList');
     _persistentRef.current = storage.get("drawer-booking") === 'true' ? true : isTerminal();
@@ -374,7 +421,7 @@ var TicketBooking = function TicketBooking(props) {
       };
     } catch (error) {}
     setState({
-      amountSymbol: (getData === null || getData === void 0 ? void 0 : getData('shop_symbol')) || (store === null || store === void 0 || (_store$getState = store.getState) === null || _store$getState === void 0 || (_store$getState = _store$getState.call(store)) === null || _store$getState === void 0 || (_store$getState = _store$getState.global) === null || _store$getState === void 0 ? void 0 : _store$getState.symbol) || '$'
+      amountSymbol: (getData === null || getData === void 0 ? void 0 : getData('shop_symbol')) || (store === null || store === void 0 || (_store$getState3 = store.getState) === null || _store$getState3 === void 0 || (_store$getState3 = _store$getState3.call(store)) === null || _store$getState3 === void 0 || (_store$getState3 = _store$getState3.global) === null || _store$getState3 === void 0 ? void 0 : _store$getState3.symbol) || '$'
     }, function () {
       _initStateRef.current = JSON.parse(JSON.stringify(state));
       _getBoardConfig();
@@ -388,6 +435,7 @@ var TicketBooking = function TicketBooking(props) {
       console.log('bookingTicket.clearAllCart');
       // 支付成功后清空状态
       _initFn(function () {});
+      _setIntervalTime(true);
       selectCustomer(null);
       enableAllScanListeners();
       setState({
@@ -633,8 +681,8 @@ var TicketBooking = function TicketBooking(props) {
     }, 100);
   };
   var _setShopOpeningHours = function _setShopOpeningHours() {
-    var _getData, _store$getState2;
-    var time = (getData === null || getData === void 0 || (_getData = getData('operating_day_boundary')) === null || _getData === void 0 ? void 0 : _getData.time) || (store === null || store === void 0 || (_store$getState2 = store.getState) === null || _store$getState2 === void 0 || (_store$getState2 = _store$getState2.call(store)) === null || _store$getState2 === void 0 || (_store$getState2 = _store$getState2.global) === null || _store$getState2 === void 0 || (_store$getState2 = _store$getState2.shopDetail) === null || _store$getState2 === void 0 || (_store$getState2 = _store$getState2.operating_day_boundary) === null || _store$getState2 === void 0 ? void 0 : _store$getState2.time);
+    var _getData, _store$getState4;
+    var time = (getData === null || getData === void 0 || (_getData = getData('operating_day_boundary')) === null || _getData === void 0 ? void 0 : _getData.time) || (store === null || store === void 0 || (_store$getState4 = store.getState) === null || _store$getState4 === void 0 || (_store$getState4 = _store$getState4.call(store)) === null || _store$getState4 === void 0 || (_store$getState4 = _store$getState4.global) === null || _store$getState4 === void 0 || (_store$getState4 = _store$getState4.shopDetail) === null || _store$getState4 === void 0 || (_store$getState4 = _store$getState4.operating_day_boundary) === null || _store$getState4 === void 0 ? void 0 : _store$getState4.time);
     if (time) {
       localStorage.setItem('shopOpeningHours', time);
     }
@@ -653,11 +701,10 @@ var TicketBooking = function TicketBooking(props) {
             });
           case 2:
             data = _context.sent;
-            console.log('wwww', data);
             setState({
               addTimeProducts: (data === null || data === void 0 ? void 0 : data.list) || []
             });
-          case 5:
+          case 4:
           case "end":
             return _context.stop();
         }
@@ -822,9 +869,9 @@ var TicketBooking = function TicketBooking(props) {
         // 储存参数, 添加服务商品时使用
         sessionStorage.setItem('pisell2.booking.serviceParams', JSON.stringify(data));
       } else {
-        var _store$getState3;
+        var _store$getState5;
         // 当前时区的时间
-        var timezone = store === null || store === void 0 || (_store$getState3 = store.getState) === null || _store$getState3 === void 0 || (_store$getState3 = _store$getState3.call(store)) === null || _store$getState3 === void 0 || (_store$getState3 = _store$getState3.global) === null || _store$getState3 === void 0 || (_store$getState3 = _store$getState3.globalConfig) === null || _store$getState3 === void 0 ? void 0 : _store$getState3.timezone;
+        var timezone = store === null || store === void 0 || (_store$getState5 = store.getState) === null || _store$getState5 === void 0 || (_store$getState5 = _store$getState5.call(store)) === null || _store$getState5 === void 0 || (_store$getState5 = _store$getState5.global) === null || _store$getState5 === void 0 || (_store$getState5 = _store$getState5.globalConfig) === null || _store$getState5 === void 0 ? void 0 : _store$getState5.timezone;
         initState.modalState.date.value = dayjs.tz(new Date(), timezone);
         // 兜底, 没有传递则清空下
         sessionStorage.removeItem('pisell2.booking.serviceParams');
@@ -1023,7 +1070,6 @@ var TicketBooking = function TicketBooking(props) {
       isShowDeposit: state.isShowDeposit,
       disableEventBookingEdit: state.disableEventBookingEdit,
       list: state.list,
-      intervalSetTime: state.intervalSetTime,
       createCount: state.createCount,
       bookingFunctions: state.bookingFunctions,
       isParallelResourcesBooking: state.isParallelResourcesBooking

package/es/components/ticketBooking/components/timeBar/index.js

@@ -9,6 +9,7 @@ import { LeftOutlined, RightOutlined } from '@ant-design/icons';
 import { DatePicker, SelectTime } from '@pisell/materials';
 import { useMemoizedFn } from 'ahooks';
 import { Button } from 'antd';
+import dayjs from 'dayjs';
 import classNames from 'classnames';
 import { locales } from '@pisell/utils';
 import "./index.less";
@@ -54,7 +55,7 @@ var TimeBar = function TimeBar(props) {
     setGlobalState({
       isTimeChange: true
     });
-    (_props$setIntervalTim5 = props.setIntervalTime) === null || _props$setIntervalTim5 === void 0 || _props$setIntervalTim5.call(props, false);
+    (_props$setIntervalTim5 = props.setIntervalTime) === null || _props$setIntervalTim5 === void 0 || _props$setIntervalTim5.call(props, timeString === dayjs().format('HH:mm'));
   });
   return useMemo(function () {
     var _state$modalState4, _state$modalState5;

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

@@ -41,7 +41,7 @@ declare type ScanData = {
     };
 };
 export declare const formatScanCustomer: (data: ScanData) => {
-    searchType: "customer" | "product" | "wallet" | "walletPass" | "local_product";
+    searchType: "product" | "customer" | "wallet" | "walletPass" | "local_product";
     data: any;
     scanCode: string;
 } | null;

package/es/components/walletList/index.js

@@ -30,6 +30,7 @@ import "./index.less";
 import classNames from 'classnames';
 // 导入所有类型
 import { DEFAULT_CARD_CONFIG } from "./types";
+import PinModal from "../pinModal";
 
 // 添加 localStorage 相关的操作函数
 var STORAGE_KEY = 'pisell_wallet_list_data';
@@ -174,6 +175,9 @@ var WalletList = Provider(function (props) {
   var requestIdRef = useRef('');
   var pubsub = utils === null || utils === void 0 ? void 0 : utils.pubsub;
 
+  // pinModal的ref
+  var pinModalRef = useRef(null);
+
   //获取登录状态
   var isUserLoggedIn = useMemo(function () {
     var _utils$token, _utils$token$get;
@@ -584,6 +588,14 @@ var WalletList = Provider(function (props) {
       return _ref3.apply(this, arguments);
     };
   }();
+  var _onViewPinClick = function onViewPinClick(card) {
+    if (card !== null && card !== void 0 && card.id) {
+      var _pinModalRef$current;
+      (_pinModalRef$current = pinModalRef.current) === null || _pinModalRef$current === void 0 || _pinModalRef$current.open(card === null || card === void 0 ? void 0 : card.id);
+    } else {
+      console.error('onViewPinClick方法需要传入wallet_detail_id');
+    }
+  };
   var renderWalletCard = function renderWalletCard(item) {
     var _dvaStore$core;
     var code = item.code,
@@ -650,7 +662,11 @@ var WalletList = Provider(function (props) {
     });
     return /*#__PURE__*/React.createElement(WalletCard, _extends({
       key: id
-    }, cardProps));
+    }, cardProps, {
+      onViewPinClick: function onViewPinClick() {
+        return _onViewPinClick(item);
+      }
+    }));
   };
   var carouselProps = {
     className: classNames('pisell-lowcode__walletList'),
@@ -809,7 +825,9 @@ var WalletList = Provider(function (props) {
         fontSize: '24px',
         color: currentIndex === list.length - 1 ? '#D0D5DD' : '#101828'
       }
-    }))));
+    }))), /*#__PURE__*/React.createElement(PinModal, {
+      ref: pinModalRef
+    }));
   };
 
   // 最终返回组件内容

package/es/index.d.ts

@@ -59,3 +59,5 @@ export { default as ProSkuDetailModal } from './pro/skuDetailModal';
 export { default as SaasLogin } from './plus/saasLogin';
 export { default as SaasRegister } from './plus/saasRegister';
 export { default as SaasCreateOrganization } from './plus/saasCreateOrganization';
+export { default as PinModal } from './components/pinModal';
+export { default as PinVerifyModal } from './components/pinVerifyModal';

package/es/index.js

@@ -62,4 +62,6 @@ export { default as ProPriceRadio } from "./pro/pisellPriceRadio";
 export { default as ProSkuDetailModal } from "./pro/skuDetailModal";
 export { default as SaasLogin } from "./plus/saasLogin";
 export { default as SaasRegister } from "./plus/saasRegister";
-export { default as SaasCreateOrganization } from "./plus/saasCreateOrganization";
+export { default as SaasCreateOrganization } from "./plus/saasCreateOrganization";
+export { default as PinModal } from "./components/pinModal";
+export { default as PinVerifyModal } from "./components/pinVerifyModal";

package/es/utils/index.d.ts

@@ -18,6 +18,6 @@ declare let modal: Omit<ModalStaticFunctions, 'warn'>;
 export declare const setModal: (m: Omit<ModalStaticFunctions, 'warn'>) => void;
 export declare const saveConfirm: () => Promise<{
     destroy: () => void;
-    update: (configUpdate: import("antd").ModalFuncProps | ((prevConfig: import("antd").ModalFuncProps) => import("antd").ModalFuncProps)) => void;
+    update: (configUpdate: import("antd/es/modal/interface").ModalFuncProps | ((prevConfig: import("antd/es/modal/interface").ModalFuncProps) => import("antd/es/modal/interface").ModalFuncProps)) => void;
 }>;
 export { modal };

package/lib/components/Sales/Summary/utils.d.ts

@@ -30,7 +30,7 @@ export declare const calculateSubtotal: (items: CartItem[]) => string;
  * @return {*}
  * @Author: xiangfeng.xue
  */
-export declare const calculateTaxFee: (shopInfo: any, items: CartItem[]) => Decimal | "0.00";
+export declare const calculateTaxFee: (shopInfo: any, items: CartItem[]) => "0.00" | Decimal;
 /**
  * 计算所有价格明细
  * @param items - 购物车商品数组

package/lib/components/appointmentBooking/components/Services/index.js

@@ -95,20 +95,27 @@ var Services = (0, import_react.forwardRef)((props, ref) => {
         delete product.option;
         if (isRetailTemplate) {
           if (data == null ? void 0 : data.isCancel) return;
-          appointmentBooking.storeProduct(product);
+          const res = appointmentBooking.storeProduct(product);
+          if (!res.success && res.errorCode === "not_enough_stock") {
+            return (0, import_utils2.Toast)(import_utils.locales.getText("pisell2.appointment.unuse.stock"));
+          }
           return;
         }
         const session = data == null ? void 0 : data.session;
         if (session) {
           const startDate = (0, import_dayjs.default)(session == null ? void 0 : session.start_at).format("YYYY-MM-DD");
           const endDate = (0, import_dayjs.default)(session == null ? void 0 : session.end_at).format("YYYY-MM-DD");
-          appointmentBooking.addProductToCart({
+          const res = appointmentBooking.addProductToCart({
             product: { ...product },
             date: {
               startTime: `${startDate} ${session == null ? void 0 : session.start_time}`,
               endTime: `${endDate} ${session == null ? void 0 : session.end_time}`
             }
           });
+          if (!res.success && res.errorCode === "not_enough_stock") {
+            return (0, import_utils2.Toast)(import_utils.locales.getText("pisell2.appointment.unuse.stock"));
+          }
+          appointmentBooking.closeProductDetail();
           await appointmentBooking.getAvailableDate({
             startDate,
             endDate
@@ -121,7 +128,10 @@ var Services = (0, import_react.forwardRef)((props, ref) => {
               import_utils.locales.getText("pisell2.appointment.no.available.service")
             );
           }
-          appointmentBooking.storeProduct(product);
+          const res = appointmentBooking.storeProduct(product);
+          if (!res.success && res.errorCode === "not_enough_stock") {
+            return (0, import_utils2.Toast)(import_utils.locales.getText("pisell2.appointment.unuse.stock"));
+          }
           if (type === "duration") {
             await appointmentBooking.getAvailableDate();
           }

package/lib/components/appointmentBooking/hooks.js

@@ -189,6 +189,12 @@ var useAppointmentBookingStep = () => {
       if (!result) {
         return (0, import_utils2.Toast)(import_utils.locales.getText("pisell2.appointment.unuse.date"));
       }
+      const capacityResult = appointmentBooking.checkMaxDurationCapacity();
+      if (!capacityResult.success) {
+        const getMessage = import_utils.locales.getText("pisell2.appointment.unuse.capacity");
+        const message = typeof getMessage === "function" ? getMessage(capacityResult.minAvailableCount) : getMessage;
+        return (0, import_utils2.Toast)(message);
+      }
     }
     if (!isRetailTemplate && (currentKey == null ? void 0 : currentKey.startsWith("select-resource"))) {
       const { hasError, updatedCartList } = (0, import_utils2.checkAndMarkCartRenderError)(currentSelectedResources, appointmentBooking, utils);

package/lib/components/booking/components/footer/index.js

@@ -463,7 +463,7 @@ var Footer = (props) => {
     JSON.stringify(subTotalList),
     (_l = (_k = state.client) == null ? void 0 : _k.value) == null ? void 0 : _l.id
   ]);
-  const handleCheckout = async () => {
+  const handleCheckoutInternal = async () => {
     (0, import_PaymentResultToast.closeAllPaymentResultToasts)();
     const isNewOrder = !state.bookingId;
     if (isEdit) {
@@ -524,6 +524,11 @@ var Footer = (props) => {
     }
     return goCheckout(state.bookingId, isNewOrder);
   };
+  const { run: handleCheckout } = (0, import_ahooks.useDebounceFn)(handleCheckoutInternal, {
+    wait: 500,
+    leading: true,
+    trailing: false
+  });
   const handleSaveAddons = async () => {
     try {
       let _list = [...state.addons.value];
@@ -588,7 +593,7 @@ var Footer = (props) => {
     messageShow = true,
     noSubmit = false
   }) => {
-    var _a2;
+    var _a2, _b2, _c2, _d2, _e2;
     (0, import_PaymentResultToast.closeAllPaymentResultToasts)();
     if ((0, import_utils2.isDayBooking)(state)) {
       const isHasDayProducts = handleDaySubmit();
@@ -647,7 +652,20 @@ var Footer = (props) => {
         title: "saveBooking",
         content: [
           { key: "下单前数据", value: JSON.stringify(values) },
-          { key: "日期", value: (0, import_dayjs.default)().format("YYYY-MM-DD HH:mm") }
+          { key: "日期", value: (0, import_dayjs.default)().format("YYYY-MM-DD HH:mm") },
+          {
+            key: "店铺id",
+            value: (_e2 = (_d2 = (_c2 = (_b2 = store == null ? void 0 : store.getState) == null ? void 0 : _b2.call(store)) == null ? void 0 : _c2.global) == null ? void 0 : _d2.globalConfig) == null ? void 0 : _e2.id
+          },
+          {
+            key: "shopApi",
+            value: JSON.stringify(window == null ? void 0 : window.shopApi, (key, value) => {
+              if (typeof value === "function") {
+                return "function";
+              }
+              return value;
+            })
+          }
         ]
       });
       if (addonsEdit) {

package/lib/components/booking/editBookingModal/index.js

@@ -113,7 +113,12 @@ var EditBookingModal = (props, ref) => {
               _cloned[_idx] = _targetResource;
             }
           } else {
-            _cloned.push(_targetResource);
+            const _targetIdx = _cloned.findIndex((rs) => {
+              return rs.relation_id == (_targetResource == null ? void 0 : _targetResource.relation_id);
+            });
+            if (_targetIdx === -1) {
+              _cloned.push(_targetResource);
+            }
           }
           _initResourceVal = {
             ..._initResourceVal,

package/lib/components/booking/forms/sendModal/useSendModal.d.ts

@@ -4,6 +4,6 @@ declare const useSendModal: (bookingId?: number) => {
     setOpen: import("react").Dispatch<import("react").SetStateAction<boolean>>;
     handleOpen: () => void;
     handleValuesChange: (val: any) => void;
-    handleOk: (values: SendModalValues) => Promise<any>;
+    handleOk: (values: SendModalValues) => Promise<boolean | undefined>;
 };
 export default useSendModal;

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

@@ -248,4 +248,4 @@ export declare const updateAppointmentServicePrice: (state: any, { start_date, e
  * @Author: WangHan
  * @Date: 2024-12-24 11:32
  */
-export declare const updateServicePrice: (state: any) => Promise<any> | never[];
+export declare const updateServicePrice: (state: any) => never[] | Promise<any>;

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

@@ -156,6 +156,8 @@ declare const _default: {
         'pisell2.text.deposit-delete-message': string;
         'pisell2.text.deposit-paid': string;
         "pisell2.text.stock": string;
+        'pisell2.appointment.unuse.stock': string;
+        'pisell2.appointment.unuse.capacity': (count: number) => string;
         'pisell2.text.payment-link': string;
         'pisell2.text.send-mail': string;
         'pisell2.text.copy-to-clipboard': string;
@@ -458,6 +460,8 @@ declare const _default: {
         'pisell2.text.deposit-delete-message': string;
         'pisell2.text.deposit-paid': string;
         "pisell2.text.stock": string;
+        'pisell2.appointment.unuse.stock': string;
+        'pisell2.appointment.unuse.capacity': (count: number) => string;
         'pisell2.text.payment-link': string;
         'pisell2.text.send-mail': string;
         'pisell2.text.copy-to-clipboard': string;
@@ -760,6 +764,8 @@ declare const _default: {
         'pisell2.text.deposit-delete-message': string;
         'pisell2.text.deposit-paid': string;
         "pisell2.text.stock": string;
+        'pisell2.appointment.unuse.stock': string;
+        'pisell2.appointment.unuse.capacity': (count: number) => string;
         'pisell2.text.payment-link': string;
         'pisell2.text.send-mail': string;
         'pisell2.text.copy-to-clipboard': string;

package/lib/components/booking/locales.js

@@ -200,6 +200,8 @@ var locales_default = {
     "pisell2.text.deposit-delete-message": "It cannot be restored after deletion. Please confirm the operation.",
     "pisell2.text.deposit-paid": "Deposit paid",
     "pisell2.text.stock": "Stock",
+    "pisell2.appointment.unuse.stock": "Not enough stock",
+    "pisell2.appointment.unuse.capacity": (count) => `Only ${count} spots available. Please reduce quantity.`,
     "pisell2.text.payment-link": "Payment link",
     "pisell2.text.send-mail": "Send email",
     "pisell2.text.copy-to-clipboard": "Copy to clipboard",
@@ -540,6 +542,8 @@ var locales_default = {
     "pisell2.text.deposit-delete-message": "删除后不可恢复，请确认操作",
     "pisell2.text.deposit-paid": "已付定金",
     "pisell2.text.stock": "库存",
+    "pisell2.appointment.unuse.stock": "库存不足",
+    "pisell2.appointment.unuse.capacity": (count) => `仅可预约 ${count} 个，请减少数量`,
     "pisell2.text.payment-link": "付款链接",
     "pisell2.text.send-mail": "发送邮件",
     "pisell2.text.copy-to-clipboard": "复制到剪切板",
@@ -880,6 +884,8 @@ var locales_default = {
     "pisell2.text.deposit-delete-message": "刪除後不可恢復，請確認操作",
     "pisell2.text.deposit-paid": "已付定金",
     "pisell2.text.stock": "庫存",
+    "pisell2.appointment.unuse.stock": "庫存不足",
+    "pisell2.appointment.unuse.capacity": (count) => `僅可預約 ${count} 個，請減少數量`,
     "pisell2.text.payment-link": "付款鏈接",
     "pisell2.text.send-mail": "發送郵件",
     "pisell2.text.copy-to-clipboard": "複製到剪切板",

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

@@ -165,10 +165,10 @@ export declare const getProductTotalPrice: (item: any) => number;
 export declare const getDuration: (duration: number | {
     type: string;
     value: number;
-}) => number | "flexible" | {
+}) => number | {
     type: string;
     value: number;
-};
+} | "flexible";
 export declare const isWalkIn: (customer_id?: number | string) => boolean;
 export declare const getIsEdit: (state: any) => boolean;
 export {};

package/lib/components/checkout/PaymentModal.js

@@ -109,6 +109,7 @@ var PaymentContent = (0, import_react.forwardRef)(
     const savePayLaterHandlerRef = (0, import_react.useRef)(null);
     const [customAmount, setCustomAmount] = (0, import_react.useState)("");
     const [balanceDueAmount, setBalanceDueAmount] = (0, import_react.useState)("");
+    const [balanceDueTotalAmount, setBalanceDueTotalAmount] = (0, import_react.useState)("");
     const [recommendAmounts, setRecommendAmounts] = (0, import_react.useState)([]);
     const paymentMethodsRef = (0, import_react.useRef)(null);
     const [paymentMethods, setPaymentMethods] = (0, import_react.useState)([]);
@@ -321,6 +322,7 @@ var PaymentContent = (0, import_react.forwardRef)(
           if (currentAmount) {
             setCustomAmount(currentAmount);
             setBalanceDueAmount(currentAmount);
+            setBalanceDueTotalAmount(orderInfo.totalAmount || "0");
             const currentNote = checkoutModule.getOrderNote();
             if (currentNote) {
               setOrderNote(currentNote);
@@ -409,6 +411,7 @@ var PaymentContent = (0, import_react.forwardRef)(
               CheckoutHooks.OnBalanceDueAmountChanged,
               (data) => {
                 setBalanceDueAmount(data.newAmount);
+                setBalanceDueTotalAmount(data.totalAmount || "0");
               }
             );
             const orderSubmitStartUnsubscribe = core.effects.on(
@@ -453,17 +456,19 @@ var PaymentContent = (0, import_react.forwardRef)(
                   );
                   const paymentItems2 = await checkoutModule.getCurrentOrderPaymentItemsAsync();
                   let totalAmount2 = new import_decimal.default(orderInfo2.isDeposit ? orderInfo2.depositAmount : orderInfo2.totalAmount);
-                  if (paymentItems2.length > 0 && paymentItems2.filter((n) => n.isSynced).some((item) => item.service_charge)) {
+                  if (paymentItems2.length > 0 && paymentItems2.filter((n) => n.isSynced).some((item) => item.service_charge || item.rounding_amount)) {
                     const serviceChargeTotal = paymentItems2.reduce((acc, item) => {
                       var _a3, _b3;
                       const chargeAmount = new import_decimal.default(((_a3 = item.service_charge) == null ? void 0 : _a3.amount) || 0);
                       const chargePercentage = new import_decimal.default(((_b3 = item.service_charge) == null ? void 0 : _b3.percentage) || 0);
                       const itemAmount = new import_decimal.default(item.amount || 0);
-                      const itemServiceCharge = chargeAmount.add(chargePercentage.mul(itemAmount));
+                      let itemServiceCharge = chargeAmount.add(chargePercentage.mul(itemAmount));
+                      console.log(itemServiceCharge);
                       return acc.add(itemServiceCharge);
                     }, new import_decimal.default(0));
                     totalAmount2 = totalAmount2.add(serviceChargeTotal);
                   }
+                  console.log(totalAmount2, paymentItems2);
                   await (0, import_PaymentResultToastUtils.displayPaymentResultToast)(
                     {
                       paymentStatus: "partially_paid",
@@ -565,6 +570,9 @@ var PaymentContent = (0, import_react.forwardRef)(
       const result = await checkoutModule.manualSyncOrderAsync();
       await (showSuccessToast == null ? void 0 : showSuccessToast(result));
       if (result.success) {
+        checkoutModule.core.effects.emit("checkout:onPaymentStarted", {
+          paymentMethodCode: ""
+        });
         const orderInfo2 = checkoutModule.getCurrentOrderInfo();
         setCurrentEditOrderId == null ? void 0 : setCurrentEditOrderId(result.orderId);
         if (result.is_deposit && Number(orderInfo2.depositAmount) < Number(orderInfo2.totalAmount)) {
@@ -934,7 +942,8 @@ var PaymentContent = (0, import_react.forwardRef)(
               amountButtons: recommendAmounts,
               customAmount,
               roundingFunction,
-              balanceDueAmount
+              balanceDueAmount,
+              balanceDueTotalAmount
             }
           )
         ),
@@ -1047,7 +1056,7 @@ var PaymentModal = ({
     import_locales2.default,
     ((_e = (_d = (_c = (_b = (_a = context.appHelper.utils) == null ? void 0 : _a.getApp) == null ? void 0 : _b.call(_a)) == null ? void 0 : _c.locales) == null ? void 0 : _d.getLocale) == null ? void 0 : _e.call(_d)) || ((_g = (_f = context.appHelper.utils) == null ? void 0 : _f.storage) == null ? void 0 : _g.get("umi_locale")) || "en"
   );
-  const { pisellos, getData, interaction } = ((_h = context == null ? void 0 : context.appHelper) == null ? void 0 : _h.utils) || {};
+  const { pisellos, getData, interaction, isWebPos } = ((_h = context == null ? void 0 : context.appHelper) == null ? void 0 : _h.utils) || {};
   const [orderInfo, setOrderInfo] = (0, import_react.useState)(null);
   const [totalAmount, setTotalAmount] = (0, import_react.useState)(0);
   const [actualShowCashPayment, setActualShowCashPayment] = (0, import_react.useState)(true);
@@ -1426,6 +1435,13 @@ var PaymentModal = ({
               totalInfo: newData.subtotal_info
             });
           } else {
+            logger == null ? void 0 : logger.addLog({
+              type: "info",
+              title: "正常创建 createLocalOrderAsync",
+              metadata: {
+                data
+              }
+            });
             await checkout.createLocalOrderAsync({
               orderData: newData.order_info,
               cartSummary: (_b2 = newData.subtotal_info) == null ? void 0 : _b2.subTotalList,
@@ -1520,10 +1536,15 @@ var PaymentModal = ({
                   paymentStatus,
                   !!currentChangeGivenAmount
                 );
-                const enabledAutoPrint = await ((_e2 = (_d3 = interaction == null ? void 0 : interaction.utils) == null ? void 0 : _d3.asyncDataManager) == null ? void 0 : _e2.call(_d3, {
-                  module: "get",
-                  key: "auto_print_receipt"
-                }));
+                let enabledAutoPrint = false;
+                if (isWebPos) {
+                  enabledAutoPrint = false;
+                } else {
+                  enabledAutoPrint = await ((_e2 = (_d3 = interaction == null ? void 0 : interaction.utils) == null ? void 0 : _d3.asyncDataManager) == null ? void 0 : _e2.call(_d3, {
+                    module: "get",
+                    key: "auto_print_receipt"
+                  }));
+                }
                 const orderInfo3 = checkout.getCurrentOrderInfo();
                 await (0, import_PaymentResultToastUtils.displayPaymentResultToast)(
                   {
@@ -1569,6 +1590,13 @@ var PaymentModal = ({
               totalInfo: data == null ? void 0 : data.subtotal_info
             });
           } else {
+            logger == null ? void 0 : logger.addLog({
+              type: "info",
+              title: "含有 localOrderCreate, 调用 createLocalOrderAsync",
+              metadata: {
+                data
+              }
+            });
             await checkout.createLocalOrderAsync({
               orderData: data == null ? void 0 : data.order_info,
               cartSummary: (_d2 = data == null ? void 0 : data.subtotal_info) == null ? void 0 : _d2.subTotalList,
@@ -1623,7 +1651,7 @@ var PaymentModal = ({
       setTimeout(() => {
         (0, import_PaymentResultToast.closePaymentResultToast)();
       }, 0);
-      const { isTerminal, isWebPos } = (_a2 = context.appHelper) == null ? void 0 : _a2.utils;
+      const { isTerminal, isWebPos: isWebPos2 } = (_a2 = context.appHelper) == null ? void 0 : _a2.utils;
       if (isTerminal == null ? void 0 : isTerminal()) {
         const checkout = pisellos.getModule("checkout");
         const orderId = await checkout.getCurrentOrderId();

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

@@ -365,8 +365,8 @@ function AmountSummary({
     let balanceAmountValue = parseFormattedAmount(getBalanceDueAmount());
     let balanceDecimal = new import_decimal.default(balanceAmountValue);
     const syncedVoucherAmount = paymentItems == null ? void 0 : paymentItems.reduce((acc, item) => {
-      if (item.voucher_id && item.isSynced) {
-        return acc.plus(item.amount).plus(item.rounding_amount);
+      if (item.isSynced && (paymentType === "regular" && item.order_payment_type !== "deposit" || paymentType === "deposit" && item.order_payment_type === "deposit")) {
+        return acc.plus(item.amount).plus(Number(item.rounding_amount) > 0 ? 0 : item.rounding_amount || 0);
       }
       return acc;
     }, new import_decimal.default(0)).toNumber();
@@ -447,7 +447,7 @@ function AmountSummary({
     if (paymentType === "regular") {
       const depositPaidAmount = paymentItems == null ? void 0 : paymentItems.reduce((acc, item) => {
         if (item.order_payment_type === "deposit") {
-          return acc.plus(item.amount).plus(Math.abs(item.rounding_amount));
+          return acc.plus(item.amount).plus(Number(item.rounding_amount) > 0 ? 0 : item.rounding_amount || 0);
         }
         return acc;
       }, new import_decimal.default(0)).toNumber();
@@ -456,7 +456,7 @@ function AmountSummary({
     } else {
       const depositPaidAmount = paymentItems == null ? void 0 : paymentItems.reduce((acc, item) => {
         if (item.order_payment_type === "deposit") {
-          return acc.plus(item.amount);
+          return acc.plus(item.amount).plus(Number(item.rounding_amount) > 0 ? 0 : item.rounding_amount || 0);
         }
         return acc;
       }, new import_decimal.default(0)).toNumber();

package/lib/components/checkout/components/CashPaymentModule/index.d.ts

@@ -13,10 +13,12 @@ export interface CashPaymentModuleProps {
         roundingDifference: number;
     }>;
     balanceDueAmount?: string;
+    balanceDueTotalAmount?: string;
     syncingLock?: boolean;
 }
 export declare function CashPaymentModule({ amountSymbol, orderInfo, onPaymentComplete, customAmount, amountButtons, // 按钮列表，默认5个推荐金额
 disabled, // 禁用状态
-roundingFunction, balanceDueAmount, // 剩余支付金额
+roundingFunction, balanceDueAmount, // 当前阶段剩余支付金额（定金或普通支付）
+balanceDueTotalAmount, // 完整订单剩余待付金额
 syncingLock, }: CashPaymentModuleProps): JSX.Element;
 export default CashPaymentModule;