@pisell/private-materials 6.11.178 → 6.11.180

package/es/components/checkout/PaymentModal.js

@@ -732,7 +732,6 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
           // const orderSyncFailedUnsubscribe = core.effects.on(
           //   CheckoutHooks.OnOrderSyncFailed,
           //   () => {
-          //     debugger
           //     Toast?.fail(locales.getText('pisell2.checkout.order-sync-failed') || 'Order sync failed');
           //   }
           // );

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

@@ -8,7 +8,7 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-import React, { useState, useEffect } from 'react';
+import React, { useState, useEffect, useMemo } from 'react';
 import useEngineContext from "../../../../hooks/useEngineContext";
 // @ts-ignore
 import { locales, formatAmount } from '@pisell/utils';
@@ -66,16 +66,16 @@ export function CashPaymentModule(_ref) {
     // 回退到全局语言包
     return locales.getText(key) || fallback;
   };
-
-  // 检查是否应该禁用按钮：原本disabled为true 或者 订单金额为0
-  var isAmountButtonsDisabled = disabled || Number(customAmount || 0) === 0;
-
-  // 检查是否应该禁用输入框：原本disabled为true 或者 订单金额为0
-  var isInputDisabled = disabled || Number(customAmount || 0) === 0;
-  var getOrderBaseAmount = function getOrderBaseAmount() {
+  var orderBaseAmount = useMemo(function () {
     var baseAmount = parseFloat(orderInfo !== null && orderInfo !== void 0 && orderInfo.isDeposit ? balanceDueTotalAmount || '0' : balanceDueAmount || '0');
     return Number.isFinite(baseAmount) ? baseAmount : 0;
-  };
+  }, [orderInfo === null || orderInfo === void 0 ? void 0 : orderInfo.isDeposit, balanceDueAmount, balanceDueTotalAmount]);
+
+  // 检查是否应该禁用按钮：原本disabled为true 或者 订单待付金额为0
+  var isAmountButtonsDisabled = disabled || orderBaseAmount <= 0;
+
+  // 检查是否应该禁用输入框：原本disabled为true 或者 订单待付金额为0
+  var isInputDisabled = disabled || orderBaseAmount <= 0;
   var shouldKeepOrderRounding = function shouldKeepOrderRounding(inputAmount, baseInfo) {
     var targetBaseInfo = baseInfo || roundingBaseInfo;
     if (Math.abs(targetBaseInfo.orderRoundingAmount) === 0) return false;
@@ -144,52 +144,61 @@ export function CashPaymentModule(_ref) {
     var isCancelled = false;
     var syncRoundingBaseInfo = /*#__PURE__*/function () {
       var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-        var orderBaseAmount, roundedBaseAmount, orderRoundingAmount, _result$roundedAmount, _result$roundingDiffe, _result, nextBaseInfo;
+        var roundedBaseAmount, orderRoundingAmount, _result$roundedAmount, _result$roundingDiffe, _result, nextBaseInfo, nextInputAmount;
         return _regeneratorRuntime().wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
-              orderBaseAmount = getOrderBaseAmount();
               roundedBaseAmount = orderBaseAmount;
               orderRoundingAmount = 0;
               if (!(roundingFunction && orderBaseAmount > 0)) {
-                _context.next = 9;
+                _context.next = 16;
                 break;
               }
+              _context.prev = 3;
               _context.next = 6;
               return roundingFunction(orderBaseAmount);
             case 6:
               _result = _context.sent;
               roundedBaseAmount = (_result$roundedAmount = _result === null || _result === void 0 ? void 0 : _result.roundedAmount) !== null && _result$roundedAmount !== void 0 ? _result$roundedAmount : orderBaseAmount;
               orderRoundingAmount = (_result$roundingDiffe = _result === null || _result === void 0 ? void 0 : _result.roundingDifference) !== null && _result$roundingDiffe !== void 0 ? _result$roundingDiffe : 0;
-            case 9:
+              _context.next = 16;
+              break;
+            case 11:
+              _context.prev = 11;
+              _context.t0 = _context["catch"](3);
+              console.warn('Failed to calculate cash rounding amount:', _context.t0);
+              roundedBaseAmount = orderBaseAmount;
+              orderRoundingAmount = 0;
+            case 16:
               nextBaseInfo = {
                 orderBaseAmount: orderBaseAmount,
                 roundedBaseAmount: roundedBaseAmount,
                 orderRoundingAmount: orderRoundingAmount
               };
               if (!isCancelled) {
-                _context.next = 12;
+                _context.next = 19;
                 break;
               }
               return _context.abrupt("return");
-            case 12:
+            case 19:
               setRoundingBaseInfo(nextBaseInfo);
               if (!isInputDisabled) {
-                _context.next = 17;
+                _context.next = 24;
                 break;
               }
               setAmount('0.00');
               setRoundingAmount(0);
               return _context.abrupt("return");
-            case 17:
-              applyInputAmount(customAmount || '', {
+            case 24:
+              nextInputAmount = Number(customAmount || 0) > 0 ? customAmount !== null && customAmount !== void 0 ? customAmount : '' : String(nextBaseInfo.roundedBaseAmount || nextBaseInfo.orderBaseAmount || '');
+              applyInputAmount(nextInputAmount, {
                 baseInfo: nextBaseInfo
               });
-            case 18:
+            case 26:
             case "end":
               return _context.stop();
           }
-        }, _callee);
+        }, _callee, null, [[3, 11]]);
       }));
       return function syncRoundingBaseInfo() {
         return _ref3.apply(this, arguments);
@@ -199,7 +208,7 @@ export function CashPaymentModule(_ref) {
     return function () {
       isCancelled = true;
     };
-  }, [customAmount, balanceDueAmount, balanceDueTotalAmount, orderInfo === null || orderInfo === void 0 ? void 0 : orderInfo.isDeposit, roundingFunction, isInputDisabled]);
+  }, [customAmount, balanceDueAmount, balanceDueTotalAmount, orderInfo === null || orderInfo === void 0 ? void 0 : orderInfo.isDeposit, roundingFunction, isInputDisabled, orderBaseAmount]);
   var handleAmountClick = function handleAmountClick(clickedAmount) {
     if (isAmountButtonsDisabled) return;
     var amountStr = clickedAmount.toString();

package/es/plus/pisellReservation/hooks/useFloorMapBookingInteraction.js

@@ -154,6 +154,7 @@ function buildServiceItemFromRuleProduct(product, resource) {
   return _objectSpread(_objectSpread({}, product), {}, {
     _id: "pre_".concat((_product$id = product === null || product === void 0 ? void 0 : product.id) !== null && _product$id !== void 0 ? _product$id : 'unknown', "_").concat(Date.now()),
     id: product === null || product === void 0 ? void 0 : product.id,
+    product_id: product === null || product === void 0 ? void 0 : product.id,
     title: title,
     quantity: 1,
     price: price,

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

@@ -78,14 +78,14 @@ function CashPaymentModule({
     }
     return import_utils.locales.getText(key) || fallback;
   };
-  const isAmountButtonsDisabled = disabled || Number(customAmount || 0) === 0;
-  const isInputDisabled = disabled || Number(customAmount || 0) === 0;
-  const getOrderBaseAmount = () => {
+  const orderBaseAmount = (0, import_react.useMemo)(() => {
     const baseAmount = parseFloat(
       (orderInfo == null ? void 0 : orderInfo.isDeposit) ? balanceDueTotalAmount || "0" : balanceDueAmount || "0"
     );
     return Number.isFinite(baseAmount) ? baseAmount : 0;
-  };
+  }, [orderInfo == null ? void 0 : orderInfo.isDeposit, balanceDueAmount, balanceDueTotalAmount]);
+  const isAmountButtonsDisabled = disabled || orderBaseAmount <= 0;
+  const isInputDisabled = disabled || orderBaseAmount <= 0;
   const shouldKeepOrderRounding = (inputAmount, baseInfo) => {
     const targetBaseInfo = baseInfo || roundingBaseInfo;
     if (Math.abs(targetBaseInfo.orderRoundingAmount) === 0) return false;
@@ -155,13 +155,18 @@ function CashPaymentModule({
   (0, import_react.useEffect)(() => {
     let isCancelled = false;
     const syncRoundingBaseInfo = async () => {
-      const orderBaseAmount = getOrderBaseAmount();
       let roundedBaseAmount = orderBaseAmount;
       let orderRoundingAmount = 0;
       if (roundingFunction && orderBaseAmount > 0) {
-        const result = await roundingFunction(orderBaseAmount);
-        roundedBaseAmount = (result == null ? void 0 : result.roundedAmount) ?? orderBaseAmount;
-        orderRoundingAmount = (result == null ? void 0 : result.roundingDifference) ?? 0;
+        try {
+          const result = await roundingFunction(orderBaseAmount);
+          roundedBaseAmount = (result == null ? void 0 : result.roundedAmount) ?? orderBaseAmount;
+          orderRoundingAmount = (result == null ? void 0 : result.roundingDifference) ?? 0;
+        } catch (error) {
+          console.warn("Failed to calculate cash rounding amount:", error);
+          roundedBaseAmount = orderBaseAmount;
+          orderRoundingAmount = 0;
+        }
       }
       const nextBaseInfo = {
         orderBaseAmount,
@@ -175,7 +180,8 @@ function CashPaymentModule({
         setRoundingAmount(0);
         return;
       }
-      applyInputAmount(customAmount || "", { baseInfo: nextBaseInfo });
+      const nextInputAmount = Number(customAmount || 0) > 0 ? customAmount ?? "" : String(nextBaseInfo.roundedBaseAmount || nextBaseInfo.orderBaseAmount || "");
+      applyInputAmount(nextInputAmount, { baseInfo: nextBaseInfo });
     };
     syncRoundingBaseInfo();
     return () => {
@@ -187,7 +193,8 @@ function CashPaymentModule({
     balanceDueTotalAmount,
     orderInfo == null ? void 0 : orderInfo.isDeposit,
     roundingFunction,
-    isInputDisabled
+    isInputDisabled,
+    orderBaseAmount
   ]);
   const handleAmountClick = (clickedAmount) => {
     if (isAmountButtonsDisabled) return;

package/lib/plus/pisellReservation/hooks/useFloorMapBookingInteraction.js

@@ -164,6 +164,7 @@ function buildServiceItemFromRuleProduct(product, resource) {
     ...product,
     _id: `pre_${(product == null ? void 0 : product.id) ?? "unknown"}_${Date.now()}`,
     id: product == null ? void 0 : product.id,
+    product_id: product == null ? void 0 : product.id,
     title,
     quantity: 1,
     price,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/private-materials",
-  "version": "6.11.178",
+  "version": "6.11.180",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",
@@ -69,8 +69,8 @@
     "styled-components": "^6.0.0-rc.3",
     "@pisell/utils": "3.0.2",
     "@pisell/materials": "6.11.57",
-    "@pisell/date-picker": "3.0.8",
-    "@pisell/icon": "0.0.11"
+    "@pisell/icon": "0.0.11",
+    "@pisell/date-picker": "3.0.8"
   },
   "peerDependencies": {
     "react": "^18.0.0",

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

@@ -1,16 +0,0 @@
-import React from 'react';
-import { type TicketBookingSecondaryDisplayConfig } from './useTicketBookingSecondaryScreen';
-import './index.less';
-import { ProductDisplayConfig, ProductDisplayPresetKey } from '../ProductDisplayAdapter/types';
-import { BaseResponsiveProps } from '../../../../responsive/type';
-export declare const _formatBookingDetail: (data: any, modalState: any) => any;
-interface TicketBookingProps {
-    onPrerenderComplete?: () => void;
-    productDisplayConfig?: ProductDisplayPresetKey | ProductDisplayConfig;
-    isShowTimeBar?: boolean;
-    isShowFloatButtons?: boolean;
-    /** 副屏展示：购物车列数、是否显示客户信息等 */
-    secondaryScreenDisplay?: TicketBookingSecondaryDisplayConfig;
-}
-declare const _default: React.ForwardRefExoticComponent<TicketBookingProps & BaseResponsiveProps & React.RefAttributes<unknown>>;
-export default _default;

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

@@ -1,16 +0,0 @@
-import React from 'react';
-import { type TicketBookingSecondaryDisplayConfig } from './useTicketBookingSecondaryScreen';
-import './index.less';
-import { ProductDisplayConfig, ProductDisplayPresetKey } from '../ProductDisplayAdapter/types';
-import { BaseResponsiveProps } from '../../../../responsive/type';
-export declare const _formatBookingDetail: (data: any, modalState: any) => any;
-interface TicketBookingProps {
-    onPrerenderComplete?: () => void;
-    productDisplayConfig?: ProductDisplayPresetKey | ProductDisplayConfig;
-    isShowTimeBar?: boolean;
-    isShowFloatButtons?: boolean;
-    /** 副屏展示：购物车列数、是否显示客户信息等 */
-    secondaryScreenDisplay?: TicketBookingSecondaryDisplayConfig;
-}
-declare const _default: React.ForwardRefExoticComponent<TicketBookingProps & BaseResponsiveProps & React.RefAttributes<unknown>>;
-export default _default;