@pisell/private-materials 3.4.61 → 3.4.62

package/es/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/es/components/appointmentBooking/components/Voucher/index.js

@@ -111,10 +111,26 @@ var VoucherCard = function VoucherCard(props) {
     appointmentBooking === null || appointmentBooking === void 0 || (_appointmentBooking$b = appointmentBooking.batchUpdateCart) === null || _appointmentBooking$b === void 0 || _appointmentBooking$b.call(appointmentBooking, items);
   };
   var onCartChange = function onCartChange() {
+    var _shopDiscount$setBook, _appointmentBooking$o;
     var products = cart === null || cart === void 0 ? void 0 : cart.getItems();
+    shopDiscount === null || shopDiscount === void 0 || (_shopDiscount$setBook = shopDiscount.setBookingSubject) === null || _shopDiscount$setBook === void 0 || _shopDiscount$setBook.call(shopDiscount, appointmentBooking === null || appointmentBooking === void 0 || (_appointmentBooking$o = appointmentBooking.otherParams) === null || _appointmentBooking$o === void 0 || (_appointmentBooking$o = _appointmentBooking$o.bookingSetting) === null || _appointmentBooking$o === void 0 ? void 0 : _appointmentBooking$o.bookingSubject);
     var val = shopDiscount.calcDiscount(products);
     batchUpdateCart(val.productList);
   };
+  var stringifiedHolders = useMemo(function () {
+    var _ret;
+    try {
+      _ret = JSON.stringify(products.map(function (item) {
+        return (item === null || item === void 0 ? void 0 : item.holder_id) || '';
+      }));
+    } catch (error) {
+      _ret = '';
+    }
+    return _ret;
+  }, [products]);
+  useEffect(function () {
+    onCartChange();
+  }, [stringifiedHolders]);
 
   // // 监听customer变化
   useEffect(function () {
@@ -183,7 +199,6 @@ var VoucherCard = function VoucherCard(props) {
             // const user = utils.store?.getState()?.global?.userInfo;
             // const currentUser = formatCustomer(user);
             // const meAccount = accountLists?.find((d: any) => !d?.isGuest);
-
             // if (status === 'success') {
             //   // appointmentBooking.setLoginAccount(
             //   //   meAccount?.id,

package/es/components/booking/addons/model.d.ts

@@ -1,10 +1 @@
-/// <reference types="react" />
-import { FormState } from "../model";
-export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
-    state: FormState;
-} & {
-    dispatch: (params: {
-        type: string;
-        payload: any;
-    }) => void;
-}>;
+export declare const Provider: any, Context: any;

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

@@ -289,7 +289,7 @@ export var formatProductPrice = function formatProductPrice(item) {
   return price;
 };
 var formatMetaData = function formatMetaData(item, isMultiDayPrices) {
-  var _item$_extend8, _item$_extend9, _item$_extend11, _item$_extend13;
+  var _item$_extend8, _item$_extend$holder_, _item$_extend9, _item$_extend10, _item$_extend12;
   var metadata = {};
   if ((_item$_extend8 = item._extend) !== null && _item$_extend8 !== void 0 && _item$_extend8.capacity) {
     metadata.capacity = item._extend.capacity;
@@ -297,17 +297,16 @@ var formatMetaData = function formatMetaData(item, isMultiDayPrices) {
   if (item._extend.groupId) {
     metadata.groupId = item._extend.groupId;
   }
-  if ((_item$_extend9 = item._extend) !== null && _item$_extend9 !== void 0 && _item$_extend9.holder_id) {
-    var _item$_extend10;
-    metadata.holder_id = (_item$_extend10 = item._extend) === null || _item$_extend10 === void 0 ? void 0 : _item$_extend10.holder_id;
+  // if (item._extend?.holder_id) {
+  metadata.holder_id = (_item$_extend$holder_ = (_item$_extend9 = item._extend) === null || _item$_extend9 === void 0 ? void 0 : _item$_extend9.holder_id) !== null && _item$_extend$holder_ !== void 0 ? _item$_extend$holder_ : null;
+  // }
+  if (isMultiDayPrices && (_item$_extend10 = item._extend) !== null && _item$_extend10 !== void 0 && _item$_extend10.multiDayPrices) {
+    var _item$_extend11;
+    metadata.multiDayPrices = (_item$_extend11 = item._extend) === null || _item$_extend11 === void 0 ? void 0 : _item$_extend11.multiDayPrices;
   }
-  if (isMultiDayPrices && (_item$_extend11 = item._extend) !== null && _item$_extend11 !== void 0 && _item$_extend11.multiDayPrices) {
-    var _item$_extend12;
-    metadata.multiDayPrices = (_item$_extend12 = item._extend) === null || _item$_extend12 === void 0 ? void 0 : _item$_extend12.multiDayPrices;
-  }
-  if ((_item$_extend13 = item._extend) !== null && _item$_extend13 !== void 0 && _item$_extend13.unique_identification_number) {
-    var _item$_extend14;
-    metadata.unique_identification_number = (_item$_extend14 = item._extend) === null || _item$_extend14 === void 0 ? void 0 : _item$_extend14.unique_identification_number;
+  if ((_item$_extend12 = item._extend) !== null && _item$_extend12 !== void 0 && _item$_extend12.unique_identification_number) {
+    var _item$_extend13;
+    metadata.unique_identification_number = (_item$_extend13 = item._extend) === null || _item$_extend13 === void 0 ? void 0 : _item$_extend13.unique_identification_number;
   }
   return metadata;
 };
@@ -328,9 +327,9 @@ var formatMetaData = function formatMetaData(item, isMultiDayPrices) {
 
 // 获取商品价格 包含组合规格
 var getSourceProductPrice = function getSourceProductPrice(item) {
-  var _item$_extend15, _item$_extend16, _item$variant2;
-  var other = (_item$_extend15 = item._extend) === null || _item$_extend15 === void 0 ? void 0 : _item$_extend15.other;
-  var price = Number((_item$_extend16 = item._extend) === null || _item$_extend16 === void 0 ? void 0 : _item$_extend16.price);
+  var _item$_extend14, _item$_extend15, _item$variant2;
+  var other = (_item$_extend14 = item._extend) === null || _item$_extend14 === void 0 ? void 0 : _item$_extend14.other;
+  var price = Number((_item$_extend15 = item._extend) === null || _item$_extend15 === void 0 ? void 0 : _item$_extend15.price);
 
   // 组合规格: 根据当前选择的组合规格id 和商品的组合规格列表 获取当前商品的价格
   if ((other === null || other === void 0 ? void 0 : other.product_variant_id) > 0 && (item === null || item === void 0 || (_item$variant2 = item.variant) === null || _item$variant2 === void 0 ? void 0 : _item$variant2.length) > 0) {
@@ -346,8 +345,8 @@ var getSourceProductPrice = function getSourceProductPrice(item) {
 
 // 获取主商品价格 要增加option
 export var getMainProductSellingPrice = function getMainProductSellingPrice(item) {
-  var _item$_extend17, _item$_extend$other, _item$_extend$other2, _item$_extend18;
-  if (!isNumber((_item$_extend17 = item._extend) === null || _item$_extend17 === void 0 ? void 0 : _item$_extend17.main_product_selling_price)) {
+  var _item$_extend16, _item$_extend$other, _item$_extend$other2, _item$_extend17;
+  if (!isNumber((_item$_extend16 = item._extend) === null || _item$_extend16 === void 0 ? void 0 : _item$_extend16.main_product_selling_price)) {
     return undefined;
   }
   var optionPrice = new Decimal(0);
@@ -360,7 +359,7 @@ export var getMainProductSellingPrice = function getMainProductSellingPrice(item
       return accumulator.add(currentPrice.mul(currentNum));
     }, optionPrice);
   }
-  return new Decimal((_item$_extend18 = item._extend) === null || _item$_extend18 === void 0 ? void 0 : _item$_extend18.main_product_selling_price).add(optionPrice).toNumber();
+  return new Decimal((_item$_extend17 = item._extend) === null || _item$_extend17 === void 0 ? void 0 : _item$_extend17.main_product_selling_price).add(optionPrice).toNumber();
 };
 
 /**
@@ -372,11 +371,11 @@ export var getMainProductSellingPrice = function getMainProductSellingPrice(item
  * @Date: 2024-12-07 14:21
  */
 var formatProducts = function formatProducts(item, quantity) {
-  var _item$_extend19, _getMainProductSellin, _item$_extend20, _item$_extend21, _item$_extend22;
+  var _item$_extend18, _getMainProductSellin, _item$_extend19, _item$_extend20, _item$_extend21;
   var total = Number(item._extend.total);
   var origin_total = Number(item._extend.origin_total);
   var discount_amount = origin_total - total;
-  var bundleDiscountList = getBundleDiscountList(((_item$_extend19 = item._extend) === null || _item$_extend19 === void 0 || (_item$_extend19 = _item$_extend19.other) === null || _item$_extend19 === void 0 ? void 0 : _item$_extend19.bundle) || []);
+  var bundleDiscountList = getBundleDiscountList(((_item$_extend18 = item._extend) === null || _item$_extend18 === void 0 || (_item$_extend18 = _item$_extend18.other) === null || _item$_extend18 === void 0 ? void 0 : _item$_extend18.bundle) || []);
   var discount_list = _toConsumableArray((item === null || item === void 0 ? void 0 : item.discount_list) || []);
   discount_list.push.apply(discount_list, _toConsumableArray(bundleDiscountList));
 
@@ -401,10 +400,10 @@ var formatProducts = function formatProducts(item, quantity) {
     "discount_per": item._extend.discount_per,
     "discount_type": item._extend.discount_type || discount_type,
     "order_detail_id": item._extend.order_detail_id || 0,
-    "product_bundle": formatProductBundle((_item$_extend20 = item._extend) === null || _item$_extend20 === void 0 || (_item$_extend20 = _item$_extend20.other) === null || _item$_extend20 === void 0 ? void 0 : _item$_extend20.bundle),
+    "product_bundle": formatProductBundle((_item$_extend19 = item._extend) === null || _item$_extend19 === void 0 || (_item$_extend19 = _item$_extend19.other) === null || _item$_extend19 === void 0 ? void 0 : _item$_extend19.bundle),
     "bundle_edit": item._extend.bundle_edit || bundleDiscountList.length ? 1 : 0,
-    "product_option_item": formatProductOption((_item$_extend21 = item._extend) === null || _item$_extend21 === void 0 || (_item$_extend21 = _item$_extend21.other) === null || _item$_extend21 === void 0 ? void 0 : _item$_extend21.option),
-    "product_variant_id": ((_item$_extend22 = item._extend) === null || _item$_extend22 === void 0 || (_item$_extend22 = _item$_extend22.other) === null || _item$_extend22 === void 0 ? void 0 : _item$_extend22.product_variant_id) || 0,
+    "product_option_item": formatProductOption((_item$_extend20 = item._extend) === null || _item$_extend20 === void 0 || (_item$_extend20 = _item$_extend20.other) === null || _item$_extend20 === void 0 ? void 0 : _item$_extend20.option),
+    "product_variant_id": ((_item$_extend21 = item._extend) === null || _item$_extend21 === void 0 || (_item$_extend21 = _item$_extend21.other) === null || _item$_extend21 === void 0 ? void 0 : _item$_extend21.product_variant_id) || 0,
     "discount_list": notManualDiscount,
     metadata: formatMetaData(item, false)
   };
@@ -424,8 +423,8 @@ var formatDayRelationProducts = function formatDayRelationProducts(data, booking
 
   // 过滤出卡片中的普通商品
   var relation_products = list === null || list === void 0 ? void 0 : list.filter(function (item) {
-    var _item$_extend23;
-    var holderId = (_item$_extend23 = item._extend) === null || _item$_extend23 === void 0 ? void 0 : _item$_extend23.holder_id;
+    var _item$_extend22;
+    var holderId = (_item$_extend22 = item._extend) === null || _item$_extend22 === void 0 ? void 0 : _item$_extend22.holder_id;
     var bookingHolderId = booking_item._extend.holder_id;
     var isDayBookingProduct = appointmentTypes.includes(item.extension_type);
     return holderId && holderId === bookingHolderId && !isDayBookingProduct;
@@ -451,15 +450,15 @@ var formatAppointmentProductLists = function formatAppointmentProductLists(data)
 
     // 找出预约商品
     list = list.filter(function (item) {
-      var _item$_extend24;
-      return ((_item$_extend24 = item._extend) === null || _item$_extend24 === void 0 ? void 0 : _item$_extend24.holder_id) && !isNormalProductByDurationSchedule(item);
+      var _item$_extend23;
+      return ((_item$_extend23 = item._extend) === null || _item$_extend23 === void 0 ? void 0 : _item$_extend23.holder_id) && !isNormalProductByDurationSchedule(item);
     });
 
     // 对预约商品列表根据holder_id进行分组
     var groupMap = new Map();
     list.forEach(function (item) {
-      var _item$_extend25;
-      var key = (_item$_extend25 = item._extend) === null || _item$_extend25 === void 0 ? void 0 : _item$_extend25.holder_id; // 分组键
+      var _item$_extend24;
+      var key = (_item$_extend24 = item._extend) === null || _item$_extend24 === void 0 ? void 0 : _item$_extend24.holder_id; // 分组键
       if (!groupMap.has(key)) {
         groupMap.set(key, []);
       }
@@ -520,7 +519,7 @@ var formatBookings = function formatBookings(data, values) {
   var bookings = [];
   var obj = {};
   list.forEach(function (item) {
-    var _item$_extend30;
+    var _item$_extend29;
     var start_date = item._extend.startDate.format('YYYY-MM-DD');
     var end_date = item._extend.endDate.format('YYYY-MM-DD');
     var end_time = item._extend.endDate.format('HH:mm');
@@ -534,9 +533,9 @@ var formatBookings = function formatBookings(data, values) {
 
     // 跨日预约下的普通商品
     if (isDay) {
-      var _item$_extend26, _item$_extend27, _item$_extend28, _item$_extend29;
-      var startDate = ((_item$_extend26 = item._extend) === null || _item$_extend26 === void 0 ? void 0 : _item$_extend26.startDate) || ((_item$_extend27 = item._extend) === null || _item$_extend27 === void 0 ? void 0 : _item$_extend27.start_date);
-      var endDate = ((_item$_extend28 = item._extend) === null || _item$_extend28 === void 0 ? void 0 : _item$_extend28.endDate) || ((_item$_extend29 = item._extend) === null || _item$_extend29 === void 0 ? void 0 : _item$_extend29.end_date);
+      var _item$_extend25, _item$_extend26, _item$_extend27, _item$_extend28;
+      var startDate = ((_item$_extend25 = item._extend) === null || _item$_extend25 === void 0 ? void 0 : _item$_extend25.startDate) || ((_item$_extend26 = item._extend) === null || _item$_extend26 === void 0 ? void 0 : _item$_extend26.start_date);
+      var endDate = ((_item$_extend27 = item._extend) === null || _item$_extend27 === void 0 ? void 0 : _item$_extend27.endDate) || ((_item$_extend28 = item._extend) === null || _item$_extend28 === void 0 ? void 0 : _item$_extend28.end_date);
       var _formatDayTime = formatDayTime({
           startDate: startDate,
           endDate: endDate
@@ -562,7 +561,7 @@ var formatBookings = function formatBookings(data, values) {
     // 跨日预约处理： 跨日预约所有数据都在list中， 每一组预约通过groupId进行分组
     // 通过obj 记录下每个GroupId第一次出现的时机，  第一次出现需要设置 metadata.multiDayPrices
     // 后续出现不需要设置 metadata.multiDayPrices. 节省体积
-    var isSetGroupId = obj[item === null || item === void 0 || (_item$_extend30 = item._extend) === null || _item$_extend30 === void 0 ? void 0 : _item$_extend30.groupId];
+    var isSetGroupId = obj[item === null || item === void 0 || (_item$_extend29 = item._extend) === null || _item$_extend29 === void 0 ? void 0 : _item$_extend29.groupId];
     var booking = _objectSpread(_objectSpread({
       product: formatProducts(item),
       relation_products: formatRelationDetails(item._extend.relation_details),
@@ -620,10 +619,10 @@ var formatRelationProducts = function formatRelationProducts(data, type) {
   var list = ((_data$service = data.service) === null || _data$service === void 0 ? void 0 : _data$service.value) || [];
   // open items 下的商品
   list = list.filter(function (item) {
-    var _item$_extend31;
+    var _item$_extend30;
     return (
       // 跨日预约把普通商品加在relationProducts 活动预约按之前逻辑
-      type === 'day' ? isNormalProductByDurationSchedule(item) : ((_item$_extend31 = item._extend) === null || _item$_extend31 === void 0 ? void 0 : _item$_extend31.holder_id) && appointmentTypes.includes(item.extension_type)
+      type === 'day' ? isNormalProductByDurationSchedule(item) : ((_item$_extend30 = item._extend) === null || _item$_extend30 === void 0 ? void 0 : _item$_extend30.holder_id) && appointmentTypes.includes(item.extension_type)
     );
   });
   var relationProducts = [];
@@ -757,7 +756,7 @@ export var formatValues = function formatValues(state) {
 export var checkHolderIsError = function checkHolderIsError(state) {
   var _state$client;
   var holderError = state.service.value.some(function (item) {
-    var _item$_extend32;
+    var _item$_extend31;
     // 普通商品不需要检测holder
     if (isNormalProductByDurationSchedule(item)) {
       return false;
@@ -765,7 +764,7 @@ export var checkHolderIsError = function checkHolderIsError(state) {
     if (item._extend.quantity === 1 && !item._extend.holder_id) {
       return true;
     }
-    if (item._extend.quantity > 1 && ((_item$_extend32 = item._extend) === null || _item$_extend32 === void 0 || (_item$_extend32 = _item$_extend32.holder_id) === null || _item$_extend32 === void 0 ? void 0 : _item$_extend32.length) !== item._extend.quantity) {
+    if (item._extend.quantity > 1 && ((_item$_extend31 = item._extend) === null || _item$_extend31 === void 0 || (_item$_extend31 = _item$_extend31.holder_id) === null || _item$_extend31 === void 0 ? void 0 : _item$_extend31.length) !== item._extend.quantity) {
       return true;
     }
     return false;

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

@@ -40,7 +40,7 @@ var ShopDiscountHooks = {
 };
 var services = {};
 var VoucherCard = function VoucherCard(props) {
-  var _context$appHelper, _state$client$value, _state$service2;
+  var _context$appHelper, _state$client$value, _state$pet2, _state$service2;
   var context = useEngineContext();
   var state = props.state,
     dispatch = props.dispatch,
@@ -63,6 +63,7 @@ var VoucherCard = function VoucherCard(props) {
   var addonsValueRef = useRef(state.addons.value);
   var isBooking4Shop = useIsBooking4Shop(state);
   var shopDiscount = pisellos.getModule('shopDiscount');
+  var holderChangedRef = useRef(false);
   services = state.service;
 
   // 设置client
@@ -83,17 +84,18 @@ var VoucherCard = function VoucherCard(props) {
   var serviceMemo = useMemo(function () {
     var _ref;
     var val = (_ref = state.service.value || []) === null || _ref === void 0 ? void 0 : _ref.map(function (value) {
-      var _value$_extend, _value$_extend2;
-      return _defineProperty({
+      var _value$_extend, _value$_extend2, _value$_extend3;
+      return {
         booking_id: value.booking_id,
         id: value.id,
         price: value.price,
         total: value === null || value === void 0 || (_value$_extend = value._extend) === null || _value$_extend === void 0 ? void 0 : _value$_extend.total,
         discount_list: value.discount_list,
         origin_total: value === null || value === void 0 || (_value$_extend2 = value._extend) === null || _value$_extend2 === void 0 ? void 0 : _value$_extend2.origin_total,
+        holder_id: value === null || value === void 0 || (_value$_extend3 = value._extend) === null || _value$_extend3 === void 0 ? void 0 : _value$_extend3.holder_id,
         quantity: value._extend.quantity,
         startDate: value._extend.startDate
-      }, "quantity", value._extend.quantity);
+      };
     });
     return val;
   }, [state.service.value]);
@@ -103,22 +105,44 @@ var VoucherCard = function VoucherCard(props) {
     }, 0);
   }, [serviceMemo]);
   var addonsMemo = useMemo(function () {
-    var _ref3;
-    var val = (_ref3 = state.addons.value || []) === null || _ref3 === void 0 ? void 0 : _ref3.map(function (value) {
-      var _value$_extend3, _value$_extend4;
+    var _ref2;
+    var val = (_ref2 = state.addons.value || []) === null || _ref2 === void 0 ? void 0 : _ref2.map(function (value) {
+      var _value$_extend4, _value$_extend5;
       return {
         booking_id: value.booking_id,
         id: value.id,
         _id: value._id,
         price: value.price,
-        total: value === null || value === void 0 || (_value$_extend3 = value._extend) === null || _value$_extend3 === void 0 ? void 0 : _value$_extend3.total,
+        total: value === null || value === void 0 || (_value$_extend4 = value._extend) === null || _value$_extend4 === void 0 ? void 0 : _value$_extend4.total,
         discount_list: value.discount_list,
         _key: value._key,
-        num: value === null || value === void 0 || (_value$_extend4 = value._extend) === null || _value$_extend4 === void 0 ? void 0 : _value$_extend4.quantity
+        num: value === null || value === void 0 || (_value$_extend5 = value._extend) === null || _value$_extend5 === void 0 ? void 0 : _value$_extend5.quantity
       };
     });
     return val;
   }, [state.addons.value]);
+  var holdersMemo = useMemo(function () {
+    if (isBooking4Shop) {
+      var _state$pet;
+      var list = [];
+      if ((_state$pet = state.pet) !== null && _state$pet !== void 0 && _state$pet.value) {
+        var entries = Object.entries(state.pet.value);
+        // 多余 1 个表单类型时，无法计算
+        // 同一表单多个 holder 时，os内只取第一个
+        if (entries.length === 1) {
+          list = entries[0][1];
+        }
+      }
+      shopDiscount.setHolders(list);
+      holderChangedRef.current = true;
+      return list || [];
+    }
+  }, [(_state$pet2 = state.pet) === null || _state$pet2 === void 0 ? void 0 : _state$pet2.value, isBooking4Shop]);
+  useEffect(function () {
+    var _shopDiscount$setBook, _state$bookingConfig;
+    console.log('update booking subject', state.bookingConfig);
+    shopDiscount === null || shopDiscount === void 0 || (_shopDiscount$setBook = shopDiscount.setBookingSubject) === null || _shopDiscount$setBook === void 0 || _shopDiscount$setBook.call(shopDiscount, (_state$bookingConfig = state.bookingConfig) === null || _state$bookingConfig === void 0 || (_state$bookingConfig = _state$bookingConfig.config) === null || _state$bookingConfig === void 0 || (_state$bookingConfig = _state$bookingConfig.basic) === null || _state$bookingConfig === void 0 ? void 0 : _state$bookingConfig.appointment_subject);
+  }, [state.bookingConfig]);
   var disabled = useMemo(function () {
     var _state$bookingDetail;
     if (['paid', 'partially_paid'].includes((_state$bookingDetail = state.bookingDetail) === null || _state$bookingDetail === void 0 ? void 0 : _state$bookingDetail.payment_status) && [].concat(_toConsumableArray(addonsMemo), _toConsumableArray(serviceMemo)).every(function (item) {
@@ -130,8 +154,7 @@ var VoucherCard = function VoucherCard(props) {
   }, [state, addonsMemo, serviceMemo]);
   var _useDebounceFn = useDebounceFn(function () {
       var _state$service;
-      // console.log('state.service.value1', state.service.value);
-      if (serviceValueRef.current === state.service.value && addonsValueRef.current === state.addons.value || !((_state$service = state.service) !== null && _state$service !== void 0 && (_state$service = _state$service.value) !== null && _state$service !== void 0 && _state$service.length)) {
+      if (serviceValueRef.current === state.service.value && addonsValueRef.current === state.addons.value && !holderChangedRef.current || !((_state$service = state.service) !== null && _state$service !== void 0 && (_state$service = _state$service.value) !== null && _state$service !== void 0 && _state$service.length)) {
         return;
       }
       if (isBooking4Shop) {
@@ -139,6 +162,8 @@ var VoucherCard = function VoucherCard(props) {
         console.log('input: ', state.service.value);
         console.log('output: ', val);
         productListToValue(val.productList);
+        // 重置 holder 变化标识，防止重复计算
+        holderChangedRef.current = false;
       }
     }, {
       wait: 500
@@ -148,7 +173,7 @@ var VoucherCard = function VoucherCard(props) {
   // 更新productList
   useEffect(function () {
     run();
-  }, [JSON.stringify(serviceMemo), JSON.stringify(addonsMemo), isBooking4Shop]);
+  }, [JSON.stringify(serviceMemo), JSON.stringify(addonsMemo), JSON.stringify(holdersMemo), isBooking4Shop]);
   var fn = useMemoizedFn(function (result) {
     var _result$productList;
     if (!(result !== null && result !== void 0 && result.productList) || result !== null && result !== void 0 && (_result$productList = result.productList) !== null && _result$productList !== void 0 && _result$productList.some(function (item) {
@@ -220,7 +245,7 @@ var VoucherCard = function VoucherCard(props) {
 
   // apply code
   var onScanCode = /*#__PURE__*/function () {
-    var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+    var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
       var _state$client$value2;
       var customerId, val;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
@@ -248,7 +273,7 @@ var VoucherCard = function VoucherCard(props) {
       }, _callee);
     }));
     return function onScanCode() {
-      return _ref4.apply(this, arguments);
+      return _ref3.apply(this, arguments);
     };
   }();
   var availableData = useMemo(function () {

package/es/components/booking/forms/model.d.ts

@@ -1,10 +1 @@
-/// <reference types="react" />
-import { FormState } from "../model";
-export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
-    state: FormState;
-} & {
-    dispatch: (params: {
-        type: string;
-        payload: any;
-    }) => void;
-}>;
+export declare const Provider: any, Context: any;

package/es/components/booking/info/model.d.ts

@@ -1,14 +1,5 @@
-/// <reference types="react" />
-import { FormState } from '../model';
 export declare const walkInData: {
     id: number;
     nickname: string;
 };
-export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
-    state: FormState;
-} & {
-    dispatch: (params: {
-        type: string;
-        payload: any;
-    }) => void;
-}>;
+export declare const Provider: any, Context: any;

package/es/components/booking/info/service/addService/utils.d.ts

@@ -6,7 +6,7 @@ export declare const getDurationProps: ({ cacheItem, useStartTime, currentResour
         type: string;
         value: number;
     };
-    locale: string;
+    locale: any;
     slice: any;
     selectProps: {
         size: string;

package/es/components/booking/info/service2/utils.js

@@ -201,7 +201,7 @@ export var handleChangeHolder = function handleChangeHolder(products, currentIte
         _extend: _objectSpread(_objectSpread({}, item._extend), {}, {
           holder_id: isArr(other) ? other.map(function (item) {
             return item.id;
-          }) : item._extend.quantity > 1 ? [other.id] : other.id
+          }) : item._extend.quantity > 1 ? [other.id] : other === null || other === void 0 ? void 0 : other.id
         })
       });
     }
@@ -612,6 +612,7 @@ var getGeneralParams = function getGeneralParams(item, state, isParallelResource
     holders: formatHolders(holders),
     isShowChangeHolder: !isNormalProduct,
     isShowAction: isShowAddTime(state, item),
+    allowClearHolder: true,
     actionText: locales.getText('page.booking.text.add-time'),
     isMultipleResource: true,
     multiResources: multiResources,

package/es/components/booking/info2/service/addService/utils.d.ts

@@ -7,7 +7,7 @@ export declare const getDurationProps: ({ cacheItem, useStartTime, currentResour
         type: string;
         value: number;
     };
-    locale: string;
+    locale: any;
     slice: any;
     selectProps: {
         size: string;

package/es/components/booking/model.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 export interface FormState {
     amountSymbol: string;
     apis: {
@@ -109,11 +108,4 @@ export declare const walkInData: {
     id: number;
     nickname: string;
 };
-export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
-    state: FormState;
-} & {
-    dispatch: (params: {
-        type: string;
-        payload: any;
-    }) => void;
-}>;
+export declare const Provider: any, Context: any;

package/es/components/booking/notes/model.d.ts

@@ -1,10 +1 @@
-/// <reference types="react" />
-import { FormState } from "../model";
-export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
-    state: FormState;
-} & {
-    dispatch: (params: {
-        type: string;
-        payload: any;
-    }) => void;
-}>;
+export declare const Provider: any, Context: any;

package/es/components/booking/payments/model.d.ts

@@ -1,10 +1 @@
-/// <reference types="react" />
-import { FormState } from "../model";
-export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
-    state: FormState;
-} & {
-    dispatch: (params: {
-        type: string;
-        payload: any;
-    }) => void;
-}>;
+export declare const Provider: any, Context: any;

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

@@ -8,7 +8,7 @@ import { PosProps } from './const';
  */
 declare const _default: ({ className, onChange, onClose, formatAmount, isMobile, net, client }: {
     className?: string | undefined;
-    onChange?: ((status: "success" | "page" | "fail" | "print" | "mark_tx_processed", params?: string | {
+    onChange?: ((status: "success" | "page" | "print" | "fail" | "mark_tx_processed", params?: string | {
         [keys: string]: unknown;
     } | undefined, other?: any) => void) | undefined;
     onClose: () => void;

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

@@ -10,7 +10,7 @@ import './device.less';
 declare const _default: ({ api, onChange, onClose, className, device_number, isMobile, net, client, formatAmount, }: {
     api: PayProps['api'];
     className?: string | undefined;
-    onChange?: ((status: "success" | "page" | "fail" | "print" | "mark_tx_processed", params?: string | {
+    onChange?: ((status: "success" | "page" | "print" | "fail" | "mark_tx_processed", params?: string | {
         [keys: string]: unknown;
     } | undefined, other?: any) => void) | undefined;
     onClose: () => void;

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

@@ -295,7 +295,7 @@ export declare const backUpFree: (payload: Partial<State>) => {
         name?: string | undefined;
         symbol?: string | undefined;
         amount?: string | number | undefined;
-        mode?: "pay" | "fullPay" | "refund" | "query" | undefined;
+        mode?: "refund" | "pay" | "fullPay" | "query" | undefined;
         order_id?: string | number | undefined;
         eftpos?: "payo" | "tyro" | "windcave" | "stripe" | "linkly" | undefined;
         action?: "pay" | "amount" | "deviceList" | undefined;

package/es/components/pay/toC/PaymentList/index.d.ts

@@ -12,7 +12,7 @@ export interface PaymentListProps {
     renderTitle?: () => React.ReactNode;
 }
 export interface PaymentListRef {
-    init: (props: any) => {};
+    init: (props: any, amount?: number) => {};
     calculateSurcharge: (amount: number) => any;
 }
 declare const _default: React.ForwardRefExoticComponent<PaymentListProps & React.RefAttributes<unknown>>;