@pisell/private-materials 6.6.101 → 6.6.103

package/es/components/eftpos/form/index.js

@@ -46,7 +46,9 @@ var CustomFormItem = function CustomFormItem(_ref) {
   var formItemList = _ref.formItemList,
     _ref$level = _ref.level,
     level = _ref$level === void 0 ? 0 : _ref$level,
-    onChange = _ref.onChange;
+    onChange = _ref.onChange,
+    _ref$surchargeReadOnl = _ref.surchargeReadOnly,
+    surchargeReadOnly = _ref$surchargeReadOnl === void 0 ? false : _ref$surchargeReadOnl;
   return /*#__PURE__*/React.createElement(React.Fragment, null, formItemList.map(function (_ref2, index) {
     var __sourceName = _ref2.__sourceName,
       Component = _ref2.Component,
@@ -55,6 +57,7 @@ var CustomFormItem = function CustomFormItem(_ref) {
       return /*#__PURE__*/React.createElement(CustomFormItem, {
         formItemList: item.children,
         onChange: onChange,
+        surchargeReadOnly: surchargeReadOnly,
         key: item.name ? "".concat(item.name).concat(level) : "".concat(Component).concat(index).concat(level),
         level: level + 1
       });
@@ -82,7 +85,9 @@ var CustomFormItem = function CustomFormItem(_ref) {
     }
     if (CustomMapping[Component]) {
       var _Comm2 = CustomMapping[Component];
-      return /*#__PURE__*/React.createElement(_Comm2, _extends({}, item, {
+      return /*#__PURE__*/React.createElement(_Comm2, _extends({}, item, Component === 'Surcharge' ? {
+        surchargeReadOnly: surchargeReadOnly
+      } : {}, {
         key: "".concat(item.name).concat(level)
       }));
     }

package/es/components/eftpos/index.js

@@ -32,6 +32,7 @@ import { Eftpos, getCommByFields, DeviceEnum, getDefaultValue, TYPES_WITH_MERCHA
 import { Image } from '@pisell/materials';
 import mx51SCISvg from "./assets/mx51SCI.svg";
 import useEngineContext from "../../hooks/useEngineContext";
+import useCardSurchargeReadOnly from "../../hooks/useCardSurchargeReadOnly";
 import { request } from "../../utils";
 import "./index.less";
 locales.init(localeTexts, getLocale());
@@ -139,6 +140,7 @@ export default (function (props) {
     tyroUrl = props.tyroUrl,
     tyroVersion = props.tyroVersion,
     useTyroLog = props.useTyroLog;
+  var surchargeReadOnly = useCardSurchargeReadOnly(type);
   // 设置request
   var context = useEngineContext();
   var utils = context.appHelper.utils || {};
@@ -665,6 +667,7 @@ export default (function (props) {
         wrapperClassName: "pisell-lowcode__pos_setting_box"
       }, /*#__PURE__*/React.createElement(Pos, {
         eftposName: name,
+        surchargeReadOnly: surchargeReadOnly,
         onSave: onSavePos,
         formItemList: posItemList
       })),
@@ -683,6 +686,7 @@ export default (function (props) {
       wrapperClassName: "pisell-lowcode__pos_box"
     }, /*#__PURE__*/React.createElement(Device, {
       formItemList: deviceItemList,
+      surchargeReadOnly: surchargeReadOnly,
       onSave: onSave,
       key: "posdevice".concat(type)
     }, pairStatus ? /*#__PURE__*/React.createElement(Form.Item, {
@@ -749,6 +753,7 @@ export default (function (props) {
     wrapperClassName: "pisell-lowcode__pos_box"
   }, /*#__PURE__*/React.createElement(Device, {
     formItemList: deviceItemList,
+    surchargeReadOnly: surchargeReadOnly,
     onSave: onSavePair,
     key: "device".concat(type),
     type: type,

package/es/components/eftpos/pos.d.ts

@@ -2,7 +2,8 @@ import { DeviceProp } from "./const";
 interface PosProps {
     eftposName: string;
     formItemList: any[];
+    surchargeReadOnly?: boolean;
     onSave: (device: DeviceProp) => void;
 }
-declare const PosForm: ({ onSave, formItemList }: PosProps) => JSX.Element;
+declare const PosForm: ({ onSave, formItemList, surchargeReadOnly, }: PosProps) => JSX.Element;
 export default PosForm;

package/es/components/eftpos/pos.js

@@ -1,12 +1,14 @@
 import { Form, Button, Typography } from "antd";
 import React from "react";
-import { getDefaultValue } from "./const";
+import { getDefaultValue, preserveSurchargeValues } from "./const";
 import { locales } from "@pisell/utils";
 import FormItem from "./form";
 var Title = Typography.Title;
 var PosForm = function PosForm(_ref) {
   var onSave = _ref.onSave,
-    formItemList = _ref.formItemList;
+    formItemList = _ref.formItemList,
+    _ref$surchargeReadOnl = _ref.surchargeReadOnly,
+    surchargeReadOnly = _ref$surchargeReadOnl === void 0 ? false : _ref$surchargeReadOnl;
   var initialValues = getDefaultValue(formItemList);
   return /*#__PURE__*/React.createElement("div", {
     className: "pisell-lowcode__pos-form-box"
@@ -15,14 +17,17 @@ var PosForm = function PosForm(_ref) {
     className: "pisell-lowcode__pos-title"
   }, locales.getText('page.eftpos.text.setting')), /*#__PURE__*/React.createElement(Form, {
     layout: "vertical",
-    onFinish: onSave,
+    onFinish: function onFinish(values) {
+      return onSave(surchargeReadOnly ? preserveSurchargeValues(values, formItemList) : values);
+    },
     initialValues: initialValues,
     className: "pisell-lowcode__pos-form",
     key: formItemList
   }, /*#__PURE__*/React.createElement("div", {
     className: "pisell-lowcode__pos-form-content"
   }, /*#__PURE__*/React.createElement(FormItem, {
-    formItemList: formItemList
+    formItemList: formItemList,
+    surchargeReadOnly: surchargeReadOnly
   })), /*#__PURE__*/React.createElement("div", {
     className: "pisell-lowcode__pos-form-btn"
   }, /*#__PURE__*/React.createElement(Form.Item, null, /*#__PURE__*/React.createElement(Button, {

package/es/components/eftpos/surcharge/index.js

@@ -68,7 +68,9 @@ export default (function (props) {
   var origin = props.origin,
     top = props.top,
     left = props.left,
-    right = props.right;
+    right = props.right,
+    _props$surchargeReadO = props.surchargeReadOnly,
+    surchargeReadOnly = _props$surchargeReadO === void 0 ? false : _props$surchargeReadO;
   var leftRef = useRef(left.input.default || 0);
   var rightRef = useRef(right.input.default || 0);
   var _useState = useState(origin.input.defaultValue),
@@ -90,6 +92,7 @@ export default (function (props) {
    * @Date: 2024-08-20 11:12
    */
   var onValueChange = function onValueChange(e) {
+    if (surchargeReadOnly) return;
     setStatus(e.target.value);
   };
 
@@ -99,6 +102,7 @@ export default (function (props) {
    * @Date: 2024-08-20 11:13
    */
   var onChangeRate = function onChangeRate(val) {
+    if (surchargeReadOnly) return;
     leftRef.current = val;
   };
 
@@ -108,6 +112,7 @@ export default (function (props) {
    * @Date: 2024-08-20 11:13
    */
   var onChangeMoney = function onChangeMoney(val) {
+    if (surchargeReadOnly) return;
     rightRef.current = val;
   };
 
@@ -120,8 +125,10 @@ export default (function (props) {
     rules: origin.rules || [],
     style: origin.style || {}
   }, /*#__PURE__*/React.createElement(Radio.Group, {
+    disabled: surchargeReadOnly,
     value: origin.input.defaultValue,
     onChange: function onChange(e) {
+      if (surchargeReadOnly) return;
       setStatusOrigin(e.target.value);
     }
   }, /*#__PURE__*/React.createElement(Space, {
@@ -132,6 +139,7 @@ export default (function (props) {
         value = item.value,
         other = _objectWithoutProperties(item, _excluded);
       return /*#__PURE__*/React.createElement(Radio, _extends({}, other, {
+        disabled: surchargeReadOnly || other.disabled,
         value: value,
         key: "".concat(item.value)
       }), label);
@@ -146,6 +154,7 @@ export default (function (props) {
     rules: top.rules || [],
     style: top.style || {}
   }, /*#__PURE__*/React.createElement(Radio.Group, {
+    disabled: surchargeReadOnly,
     value: top.input.defaultValue,
     onChange: onValueChange
   }, /*#__PURE__*/React.createElement(Space, {
@@ -156,6 +165,7 @@ export default (function (props) {
         value = item.value,
         other = _objectWithoutProperties(item, _excluded2);
       return /*#__PURE__*/React.createElement(Radio, _extends({}, other, {
+        disabled: surchargeReadOnly || other.disabled,
         value: value,
         key: "".concat(item.value)
       }), label);
@@ -168,6 +178,7 @@ export default (function (props) {
     rules: left.rules || [],
     style: left.style || {}
   }, /*#__PURE__*/React.createElement(InputNumber, {
+    disabled: surchargeReadOnly,
     min: 0,
     max: 100,
     precision: 2,
@@ -183,6 +194,7 @@ export default (function (props) {
     rules: right.rules || [],
     style: right.style || {}
   }, /*#__PURE__*/React.createElement(InputNumber, {
+    disabled: surchargeReadOnly,
     min: 0,
     max: 100000,
     precision: 2,

package/es/components/eftposPay/amount.js

@@ -11,14 +11,16 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import { locales } from '@pisell/utils';
 import { InputNumber, Button, message } from 'antd';
 import { Decimal } from 'decimal.js';
-import React, { useMemo, useState } from 'react';
+import React, { useEffect, useMemo, useState } from 'react';
 import { useMount } from 'ahooks';
 import Alert from "./component/alert";
 import Titlebar from "./component/header/titlebar";
+import { ModeEnum } from "./const";
 import { getAmonunt } from "./manufacturer";
 import { limitDecimals } from "./helper";
 import { useDispatch, useContextData, updateComponent, updateState } from "./store";
 import payLog from "./utils/payLog";
+import useCardSurchargeReadOnly from "../../hooks/useCardSurchargeReadOnly";
 
 /**
  * @title: 支付金额信息配置页
@@ -45,6 +47,15 @@ export default (function (_ref) {
     status = _useState2[0],
     setStatus = _useState2[1];
   var store = useContextData();
+  var isPayment = store.mode === ModeEnum.Pay || store.mode === ModeEnum.FullPay;
+  var surchargeReadOnly = useCardSurchargeReadOnly(store.eftpos, {
+    includePos: isPayment
+  });
+  var hideSurchargeEdit = isPayment && surchargeReadOnly;
+  var isAmountPage = status || hideSurchargeEdit;
+  useEffect(function () {
+    if (hideSurchargeEdit) setStatus(true);
+  }, [hideSurchargeEdit]);
   var _getAmonunt = getAmonunt(store),
     name = _getAmonunt.name,
     symbol = _getAmonunt.symbol,
@@ -129,6 +140,7 @@ export default (function (_ref) {
   var onSubmit = function onSubmit() {
     if (!status) {
       setStatus(true);
+      if (surchargeReadOnly) return;
       setSurRate(tempSurRate);
       setSurMoney(tempSurMoney);
       return;
@@ -185,6 +197,7 @@ export default (function (_ref) {
    * @Date: 2024-08-19 09:53
    */
   var onEdit = function onEdit() {
+    if (surchargeReadOnly || useOriginSurcharge) return;
     payLog.log('金额页-点击编辑');
     setStatus(false);
     setTempSurRate(curSurRate);
@@ -201,7 +214,7 @@ export default (function (_ref) {
   }, isMobile ? null : /*#__PURE__*/React.createElement(Titlebar, {
     type: 'left-title-close',
     onClose: onClose
-  }, status ? name : locales.getText('page.eftpos-pay.text.surcharge.edit.title')), status ? /*#__PURE__*/React.createElement("div", {
+  }, isAmountPage ? name : locales.getText('page.eftpos-pay.text.surcharge.edit.title')), isAmountPage ? /*#__PURE__*/React.createElement("div", {
     className: "pisell-lowcode__eft-pay-amount-body"
   }, /*#__PURE__*/React.createElement("div", {
     className: "pisell-lowcode__eft-pay-cash",
@@ -239,10 +252,10 @@ export default (function (_ref) {
     className: "pisell-lowcode__eft-pay-total"
   }, locales.getText('page.eftpos-pay.text.surcharge.edit.actual.pay'), ":", formatAmount("".concat(total), 2, symbol)), /*#__PURE__*/React.createElement("div", {
     className: "pisell-lowcode__eft-pay-money"
-  }, locales.getText('page.eftpos-pay.text.surcharge.edit.inc.surcharge'), ": ", formatAmount("".concat(totalSurMoney), 2, symbol), " (", locales.getText('page.eftpos-pay.text.surcharge.edit.rate'), ":", curSurRate, "% + ", formatAmount("".concat(curSurMoney), 2, symbol), ")")), /*#__PURE__*/React.createElement(Button, {
+  }, locales.getText('page.eftpos-pay.text.surcharge.edit.inc.surcharge'), ": ", formatAmount("".concat(totalSurMoney), 2, symbol), " (", locales.getText('page.eftpos-pay.text.surcharge.edit.rate'), ":", curSurRate, "% + ", formatAmount("".concat(curSurMoney), 2, symbol), ")")), !hideSurchargeEdit && /*#__PURE__*/React.createElement(Button, {
     type: "link",
     onClick: onEdit,
-    disabled: useOriginSurcharge
+    disabled: surchargeReadOnly || useOriginSurcharge
   }, locales.getText('page.eftpos-pay.text.surcharge.edit.surcharge')))) : /*#__PURE__*/React.createElement("div", {
     className: "pisell-lowcode__eft-pay-amount-body"
   }, /*#__PURE__*/React.createElement(Alert, null, locales.getText('page.eftpos-pay.text.surcharge.percentage-fixed')), /*#__PURE__*/React.createElement("div", {
@@ -253,6 +266,7 @@ export default (function (_ref) {
     className: "pisell-lowcode__eft-pay-amount-item-title"
   }, locales.getText('page.eftpos-pay.text.surcharge.percentage')), /*#__PURE__*/React.createElement(InputNumber, {
     type: "number",
+    disabled: surchargeReadOnly,
     value: tempSurRate,
     min: 0,
     max: 100,
@@ -270,6 +284,7 @@ export default (function (_ref) {
     className: "pisell-lowcode__eft-pay-amount-item-title"
   }, locales.getText('page.eftpos-pay.text.surcharge.fixed')), /*#__PURE__*/React.createElement(InputNumber, {
     type: "number",
+    disabled: surchargeReadOnly,
     value: tempSurMoney,
     min: 0,
     max: 100000,
@@ -292,6 +307,6 @@ export default (function (_ref) {
     className: "pisell-lowcode__eft-pay-step-item-btn",
     type: "primary",
     onClick: onSubmit,
-    disabled: currentMoney <= 0 && status
+    disabled: currentMoney <= 0 && isAmountPage
   }, locales.getText('page.eftpos-pay.text.sure'))));
 });

package/es/components/eftposPay/hooks.d.ts

@@ -19,7 +19,7 @@ export declare const useStoreRef: <T extends {
     readonly netRef: React.MutableRefObject<boolean | undefined>;
     readonly symbolRef: React.MutableRefObject<string>;
     readonly amountRef: React.MutableRefObject<string | number>;
-    readonly eftposRef: React.MutableRefObject<"stripe" | "tyro" | "mx51" | "payo" | "windcave" | "linkly" | "huifu" | "adyenpos" | "adyenalipay" | "adyenwechat">;
+    readonly eftposRef: React.MutableRefObject<"stripe" | "payo" | "tyro" | "windcave" | "linkly" | "mx51" | "adyenpos" | "huifu" | "adyenalipay" | "adyenwechat">;
     readonly clientRef: React.MutableRefObject<ClientEnum>;
     readonly dataRef: React.MutableRefObject<import("./store").State>;
 };

package/es/components/eftposPay/store/index.d.ts

@@ -301,7 +301,7 @@ export declare const backUpFree: (payload: Partial<State>) => {
         amount?: string | number | undefined;
         mode?: "pay" | "refund" | "fullPay" | "query" | undefined;
         order_id?: string | number | undefined;
-        eftpos?: "stripe" | "tyro" | "mx51" | "payo" | "windcave" | "linkly" | "huifu" | "adyenpos" | "adyenalipay" | "adyenwechat" | undefined;
+        eftpos?: "stripe" | "payo" | "tyro" | "windcave" | "linkly" | "mx51" | "adyenpos" | "huifu" | "adyenalipay" | "adyenwechat" | undefined;
         action?: "pay" | "amount" | "deviceList" | undefined;
         key?: number | undefined;
         step?: number | undefined;

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

@@ -161,18 +161,18 @@ export var addService = function addService(list, addItem, state, isMultiDay) {
     var isSetCount = false;
     value = list.map(function (item) {
       var _item$_extend;
-      // 是否商品券折扣的商品
+      // 商品券或多次卡已分配到具体商品行，新增数量需另起一行计算。
       var isGoodPassDiscountProduct = (item.discount_list || []).some(function (item) {
-        return item.type === 'good_pass';
+        return ['good_pass', 'entitlement_pass'].includes(item.tag || item.type);
       });
       var isEdit = item === null || item === void 0 ? void 0 : item.edit;
-      // 子商品是否有商品券折扣的商品
+      // 子商品是否有商品券或多次卡折扣
       var bundleDiscountList = [];
       ((item === null || item === void 0 || (_item$_extend = item._extend) === null || _item$_extend === void 0 || (_item$_extend = _item$_extend.other) === null || _item$_extend === void 0 ? void 0 : _item$_extend.bundle) || []).forEach(function (item) {
         bundleDiscountList.push.apply(bundleDiscountList, _toConsumableArray((item === null || item === void 0 ? void 0 : item.discount_list) || []));
       });
       var isGoodPassBundleProduct = bundleDiscountList.some(function (item) {
-        return item.type === 'good_pass';
+        return ['good_pass', 'entitlement_pass'].includes(item.tag || item.type);
       });
       if (isSameProduct(item, addItem) && !isSetCount && !isGoodPassDiscountProduct && !isEdit && !isGoodPassBundleProduct) {
         var _item$_extend2, _addItem$_extend, _item$_extend3;

package/es/hooks/useCardSurchargeReadOnly.d.ts

@@ -0,0 +1,4 @@
+/** POS opts in only for payment amount pages; configuration keeps the Shop policy. */
+export default function useCardSurchargeReadOnly(paymentType: string, { includePos }?: {
+    includePos?: boolean;
+}): boolean;

package/es/hooks/useCardSurchargeReadOnly.js

@@ -0,0 +1,61 @@
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+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 { useCallback, useEffect, useState } from 'react';
+import useEngineContext from "./useEngineContext";
+var cardEftposTypes = new Set(['payo', 'tyro', 'windcave', 'stripe', 'linkly', 'mx51', 'adyenpos']);
+
+/** POS opts in only for payment amount pages; configuration keeps the Shop policy. */
+export default function useCardSurchargeReadOnly(paymentType) {
+  var _context$appHelper, _context$appHelper2;
+  var _ref = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {},
+    _ref$includePos = _ref.includePos,
+    includePos = _ref$includePos === void 0 ? false : _ref$includePos;
+  var context = useEngineContext();
+  var _ref2 = (context === null || context === void 0 || (_context$appHelper = context.appHelper) === null || _context$appHelper === void 0 ? void 0 : _context$appHelper.constants) || {},
+    platform = _ref2.platform;
+  var _ref3 = (context === null || context === void 0 || (_context$appHelper2 = context.appHelper) === null || _context$appHelper2 === void 0 ? void 0 : _context$appHelper2.utils) || {},
+    store = _ref3.store,
+    getData = _ref3.getData,
+    isCardSurchargeReadOnly = _ref3.isCardSurchargeReadOnly;
+  var isPosCardPayment = includePos && (platform === 'webpos' || platform === 'pos') && cardEftposTypes.has(paymentType.toLowerCase().replace(/^eftpos_/, ''));
+  var getReadOnly = useCallback(function () {
+    var _store$getState, _state$core, _state$core2;
+    if (platform === 'shop') {
+      return typeof isCardSurchargeReadOnly === 'function' && Boolean(isCardSurchargeReadOnly(paymentType));
+    }
+    if (!isPosCardPayment) return false;
+
+    // shop_info comes from /shop/shop/show/:id and contains the saved address.
+    // Missing or stale shop details keep the entry closed while loading.
+    var state = store === null || store === void 0 || (_store$getState = store.getState) === null || _store$getState === void 0 ? void 0 : _store$getState.call(store);
+    var shopInfo = (state === null || state === void 0 || (_state$core = state.core) === null || _state$core === void 0 ? void 0 : _state$core.shopInfo) || (getData === null || getData === void 0 ? void 0 : getData('shop_info'));
+    var shopId = state === null || state === void 0 || (_state$core2 = state.core) === null || _state$core2 === void 0 || (_state$core2 = _state$core2.core) === null || _state$core2 === void 0 ? void 0 : _state$core2.id;
+    if (shopId != null && (shopInfo === null || shopInfo === void 0 ? void 0 : shopInfo.id) != null && String(shopId) !== String(shopInfo.id)) {
+      return true;
+    }
+    var countryCode = String((shopInfo === null || shopInfo === void 0 ? void 0 : shopInfo.country_code) || '').toUpperCase();
+    return !countryCode || countryCode === 'AU';
+  }, [platform, isCardSurchargeReadOnly, paymentType, isPosCardPayment, store, getData]);
+  var _useState = useState(getReadOnly),
+    _useState2 = _slicedToArray(_useState, 2),
+    setReadOnly = _useState2[1];
+  useEffect(function () {
+    var _store$subscribe;
+    if (!isPosCardPayment && (platform !== 'shop' || typeof isCardSurchargeReadOnly !== 'function')) {
+      return;
+    }
+    var update = function update() {
+      return setReadOnly(getReadOnly());
+    };
+    var unsubscribe = store === null || store === void 0 || (_store$subscribe = store.subscribe) === null || _store$subscribe === void 0 ? void 0 : _store$subscribe.call(store, update);
+    update();
+    return function () {
+      return unsubscribe === null || unsubscribe === void 0 ? void 0 : unsubscribe();
+    };
+  }, [store, getReadOnly, platform, isCardSurchargeReadOnly, isPosCardPayment]);
+  return getReadOnly();
+}

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

@@ -400,7 +400,14 @@ var formatProducts = (item, quantity) => {
   });
   const notManualDiscount = discount_list.filter(
     (item2) => item2.type !== "product"
-  );
+  ).map((discount) => {
+    var _a2, _b2;
+    if (quantity === void 0 || (discount.tag || discount.type) !== "entitlement_pass" || ((_a2 = discount.metadata) == null ? void 0 : _a2.custom_product_bundle_map_id)) {
+      return discount;
+    }
+    const num = Math.min(Number(((_b2 = discount.metadata) == null ? void 0 : _b2.num) ?? item._extend.quantity), quantity);
+    return { ...discount, _num: num, metadata: { ...discount.metadata, num } };
+  });
   if (item.isCustomItem) {
     item.product_id = 0;
   }

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

@@ -87,6 +87,14 @@ var VoucherCard = (props) => {
   const { selectCustomer } = (0, import_pisellos.useCustomer)({
     changeCustomerToGlobalState
   });
+  (0, import_react.useEffect)(() => {
+    var _a2;
+    (_a2 = shopDiscount == null ? void 0 : shopDiscount.setEntitlementPassEnabled) == null ? void 0 : _a2.call(shopDiscount, isBooking4Shop);
+    return () => {
+      var _a3;
+      return (_a3 = shopDiscount == null ? void 0 : shopDiscount.setEntitlementPassEnabled) == null ? void 0 : _a3.call(shopDiscount, false);
+    };
+  }, [shopDiscount, isBooking4Shop]);
   (0, import_ahooks.useDebounceEffect)(
     () => {
       if (isBooking4Shop) {
@@ -332,12 +340,44 @@ var VoucherCard = (props) => {
   };
   const availableData = (0, import_react.useMemo)(() => {
     if (!isBooking4Shop) return [];
-    return discountList.filter((item) => !!item.isAvailable).map((discount) => {
-      return {
+    return discountList.filter((item) => !!item.isAvailable).flatMap((discount) => {
+      var _a2, _b2, _c2;
+      const currentRow = {
         ...discount,
-        isDisabled: discount.isDisabled || discount.isDisabledForProductUsed || disabled,
+        // 原卡片仍读取 isSelected，历史扣次不代表本次勾选。
+        isSelected: discount.tag === "entitlement_pass" && !discount.isDisabled ? !!discount.isSelected && (((_a2 = discount.appliedProductDetails) == null ? void 0 : _a2.length) || 0) > (((_b2 = discount.committedAppliedProductDetails) == null ? void 0 : _b2.length) || 0) : discount.isSelected,
+        isDisabled: discount.isDisabled || (discount.tag === "entitlement_pass" ? !discount.isAvailable : discount.isDisabledForProductUsed) || disabled,
         savedAmount: shopDiscount.calcDiscountApplicableProductTotalPrice(discount)
       };
+      const committedDetails = discount.tag === "entitlement_pass" ? discount.committedAppliedProductDetails || [] : [];
+      if (!committedDetails.length) return [currentRow];
+      const historyRow = {
+        ...discount,
+        displayKey: `${discount.id}-last-settlement`,
+        isEditMode: true,
+        isSelected: true,
+        isDisabled: true,
+        appliedProductDetails: committedDetails,
+        savedAmount: shopDiscount.calcDiscountApplicableProductTotalPrice({
+          ...discount,
+          savedAmount: 0,
+          appliedProductDetails: committedDetails
+        })
+      };
+      const currentDetails = (discount.appliedProductDetails || []).slice(committedDetails.length);
+      const canApplyToNewProducts = !discount.isDisabled && (((_c2 = discount.applicableProductDetails) == null ? void 0 : _c2.length) || 0) > 0;
+      if (!currentDetails.length && !canApplyToNewProducts) return [historyRow];
+      return [historyRow, {
+        ...currentRow,
+        displayKey: `${discount.id}-current`,
+        isEditMode: false,
+        appliedProductDetails: currentDetails,
+        savedAmount: shopDiscount.calcDiscountApplicableProductTotalPrice({
+          ...discount,
+          savedAmount: 0,
+          appliedProductDetails: currentDetails
+        })
+      }];
     });
   }, [discountList, isBooking4Shop, disabled]);
   if (!isBooking4Shop) return null;

package/lib/components/booking/info/clientVariant/hooks/useClientFn.js

@@ -52,7 +52,7 @@ var useClientFn = (_params) => {
     num: 5,
     total: 0,
     search: "",
-    with: ["formRecord", "contactsInfo"],
+    with: ["contactsInfo"],
     relation_form_id: (_d = (_c = (_b = (_a = state == null ? void 0 : state.bookingConfig) == null ? void 0 : _a.config) == null ? void 0 : _b.basic) == null ? void 0 : _c.appointment_subject) == null ? void 0 : _d.form_id
   });
   const paramsRef = (0, import_react.useRef)(params);
@@ -77,7 +77,7 @@ var useClientFn = (_params) => {
     customer_ids,
     ...resetParams
   }, returnResult) => {
-    var _a2, _b2;
+    var _a2, _b2, _c2, _d2, _e2, _f2;
     let _setLoading;
     if (resetParams.skip === 1) {
       if (resetParams.search) {
@@ -100,7 +100,9 @@ var useClientFn = (_params) => {
       ...resetParams.search ? { num: 10 } : {},
       ...state.isFranchisee ? { franchisee_customer_ids: customer_ids } : { customer_ids },
       ...!state.isFranchisee && !returnResult ? { _config: { abort: true } } : {},
-      with: withKey
+      with: withKey,
+      with_form_records: 1,
+      relation_form_id: (_f2 = (_e2 = (_d2 = (_c2 = state == null ? void 0 : state.bookingConfig) == null ? void 0 : _c2.config) == null ? void 0 : _d2.basic) == null ? void 0 : _e2.appointment_subject) == null ? void 0 : _f2.form_id
     });
     const list = ((data == null ? void 0 : data.list) || []).map((d) => {
       var _a3;
@@ -108,9 +110,9 @@ var useClientFn = (_params) => {
         ...d,
         name: getNickname(d),
         id: d.franchisee_customer_id || d.id,
-        form_record: ((_a3 = d.form_record) == null ? void 0 : _a3.map((item) => ({
-          ...item,
+        form_record: ((_a3 = d.form_record_list) == null ? void 0 : _a3.map((item) => ({
           ...item.data,
+          ...item,
           form_record_id: item.id
         }))) || []
       };

package/lib/components/booking/info/clientVariant/vertical/index.js

@@ -282,7 +282,7 @@ var VerticalClient = (0, import_react.forwardRef)((props, ref) => {
         } else {
           const val = await getClients(
             {
-              with: ["formRecord", "contactsInfo"],
+              with: ["contactsInfo"],
               relation_form_id: boardConfig == null ? void 0 : boardConfig.form_id,
               skip: 1,
               num: 20,