@pisell/private-materials 3.3.76 → 3.3.78

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

@@ -7,6 +7,10 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
+function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
 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); }
@@ -22,7 +26,8 @@ import useEngineContext from "../../../../hooks/useEngineContext";
 import { PisellInput, PisellGoodPassCard, PisellToast } from '@pisell/materials';
 import { useIsBooking4Shop } from "../../hooks/useIsBooking4Shop";
 import "./index.less";
-import { useMemoizedFn, useDebounceFn } from 'ahooks';
+import { useMemoizedFn, useDebounceFn, useDebounceEffect } from 'ahooks';
+import { getServiceAddons } from "./utils";
 var ShopDiscountHooks = {
   onInited: 'shopDiscount:onInited',
   onDestroy: 'shopDiscount:onDestroy',
@@ -35,10 +40,11 @@ var ShopDiscountHooks = {
 };
 var services = {};
 var VoucherCard = function VoucherCard(props) {
-  var _context$appHelper, _state$client$value;
+  var _context$appHelper, _state$client$value, _state$service2;
   var context = useEngineContext();
   var state = props.state,
-    dispatch = props.dispatch;
+    dispatch = props.dispatch,
+    source = props.source;
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
     showDetail = _useState2[0],
@@ -53,35 +59,27 @@ var VoucherCard = function VoucherCard(props) {
     _useState6 = _slicedToArray(_useState5, 2),
     discountList = _useState6[0],
     setDisCountList = _useState6[1];
-  var productRef = useRef(state.service.value);
+  var serviceValueRef = useRef(state.service.value);
+  var addonsValueRef = useRef(state.addons.value);
   var isBooking4Shop = useIsBooking4Shop(state);
   var shopDiscount = pisellos.getModule('shopDiscount');
   services = state.service;
-  var availableData = useMemo(function () {
-    if (!isBooking4Shop) return [];
-    var shopDiscount = pisellos.getModule('shopDiscount');
-    return discountList.filter(function (item) {
-      return !!item.isAvailable;
-    }).map(function (discount) {
-      return _objectSpread(_objectSpread({}, discount), {}, {
-        savedAmount: shopDiscount.calcDiscountApplicableProductTotalPrice(discount)
-      });
-    });
-  }, [discountList, isBooking4Shop]);
 
   // 设置client
-  useEffect(function () {
+  useDebounceEffect(function () {
     if (isBooking4Shop) {
       shopDiscount.setCustomer(state.client.value);
     }
-  }, [(_state$client$value = state.client.value) === null || _state$client$value === void 0 ? void 0 : _state$client$value.id, isBooking4Shop]);
+  }, [(_state$client$value = state.client.value) === null || _state$client$value === void 0 ? void 0 : _state$client$value.id, isBooking4Shop], {
+    wait: 200
+  });
 
   // 设置productList
   useEffect(function () {
     if (isBooking4Shop) {
-      shopDiscount.setProductList(state.service.value);
+      shopDiscount.setProductList([].concat(_toConsumableArray(state.service.value), _toConsumableArray(state.addons.value)));
     }
-  }, [state.service.value, isBooking4Shop]);
+  }, [state.service.value, state.addons.value, isBooking4Shop]);
   var serviceMemo = useMemo(function () {
     var _ref;
     var val = (_ref = state.service.value || []) === null || _ref === void 0 ? void 0 : _ref.map(function (value) {
@@ -89,7 +87,6 @@ var VoucherCard = function VoucherCard(props) {
       return {
         booking_id: value.booking_id,
         id: value.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,
@@ -98,24 +95,43 @@ var VoucherCard = function VoucherCard(props) {
     });
     return val;
   }, [state.service.value]);
+  var addonsMemo = useMemo(function () {
+    var _ref2;
+    var val = (_ref2 = state.addons.value || []) === null || _ref2 === void 0 ? void 0 : _ref2.map(function (value) {
+      var _value$_extend3, _value$_extend4;
+      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,
+        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
+      };
+    });
+    return val;
+  }, [state.addons.value]);
+  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) {
+      return item.booking_id;
+    })) {
+      return true;
+    }
+    return false;
+  }, [state, addonsMemo, serviceMemo]);
   var _useDebounceFn = useDebounceFn(function () {
       var _state$service;
       // console.log('state.service.value1', state.service.value);
-      if (productRef.current === state.service.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 || !((_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) {
-        var val = shopDiscount.calcDiscount(state.service.value);
-        // console.log('input: ', state.service.value);
-        // console.log('output: ', val);
-        productRef.current = val.productList;
-        // console.log('val.productList', val.productList);
-        dispatch({
-          type: 'setService',
-          payload: _objectSpread(_objectSpread({}, services), {}, {
-            value: ((val === null || val === void 0 ? void 0 : val.productList) || []).filter(Boolean)
-          })
-        });
+        var val = shopDiscount.calcDiscount([].concat(_toConsumableArray(state.service.value), _toConsumableArray(state.addons.value)));
+        console.log('input: ', state.service.value);
+        console.log('output: ', val);
+        productListToValue(val.productList);
       }
     }, {
       wait: 500
@@ -125,7 +141,7 @@ var VoucherCard = function VoucherCard(props) {
   // 更新productList
   useEffect(function () {
     run();
-  }, [JSON.stringify(serviceMemo), isBooking4Shop]);
+  }, [JSON.stringify(serviceMemo), JSON.stringify(addonsMemo), 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) {
@@ -133,18 +149,13 @@ var VoucherCard = function VoucherCard(props) {
     })) {
       return;
     }
-    dispatch({
-      type: 'setService',
-      payload: _objectSpread(_objectSpread({}, services), {}, {
-        value: result.productList
-      })
-    });
+    productListToValue(result.productList);
   });
 
   // 监听customer变化
   useEffect(function () {
     if (!isBooking4Shop) return;
-    pisellos.effects.on(ShopDiscountHooks.onScanCustomerChange, function (customer) {
+    var onScanCustomerChange = function onScanCustomerChange(customer) {
       // 更新客户
       dispatch({
         type: 'setClient',
@@ -152,22 +163,49 @@ var VoucherCard = function VoucherCard(props) {
           value: customer
         }
       });
-    });
-    pisellos.effects.on(ShopDiscountHooks.onLoadPrepareCalcResult, fn);
-    pisellos.effects.on(ShopDiscountHooks.onDiscountListChange, function (discount) {
+    };
+    var onDiscountListChange = function onDiscountListChange(discount) {
       setDisCountList(discount);
-    });
+    };
+    pisellos.effects.on(ShopDiscountHooks.onScanCustomerChange, onScanCustomerChange);
+    pisellos.effects.on(ShopDiscountHooks.onLoadPrepareCalcResult, fn);
+    pisellos.effects.on(ShopDiscountHooks.onDiscountListChange, onDiscountListChange);
     return function () {
       shopDiscount.clear();
-      pisellos.effects.off(ShopDiscountHooks.onCustomerChange);
-      pisellos.effects.off(ShopDiscountHooks.onLoadPrepareCalcResult);
-      pisellos.effects.off(ShopDiscountHooks.onDiscountListChange);
+      pisellos.effects.off(ShopDiscountHooks.onCustomerChange, onScanCustomerChange);
+      pisellos.effects.off(ShopDiscountHooks.onLoadPrepareCalcResult, fn);
+      pisellos.effects.off(ShopDiscountHooks.onDiscountListChange, onDiscountListChange);
     };
   }, [state.bookingId, isBooking4Shop, fn]);
+  var productListToValue = useMemoizedFn(function (list, edit) {
+    var _getServiceAddons = getServiceAddons(list),
+      serviceList = _getServiceAddons.serviceList,
+      addonsList = _getServiceAddons.addonsList;
+    serviceValueRef.current = serviceList;
+    addonsValueRef.current = addonsList;
+    var other = {};
+    if (edit) {
+      other = {
+        edit: true
+      };
+    }
+    dispatch({
+      type: 'setService',
+      payload: _objectSpread({
+        value: serviceList
+      }, other)
+    });
+    dispatch({
+      type: 'setAddons',
+      payload: _objectSpread({
+        value: addonsList
+      }, other)
+    });
+  });
 
   // apply code
   var onScanCode = /*#__PURE__*/function () {
-    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+    var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
       var val;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
@@ -178,18 +216,11 @@ var VoucherCard = function VoucherCard(props) {
             val = _context.sent;
             console.log(val);
             if (val !== null && val !== void 0 && val.isAvailable) {
-              productRef.current = val.productList;
-              dispatch({
-                type: 'setService',
-                payload: {
-                  value: val.productList,
-                  edit: true
-                }
-              });
+              productListToValue(val.productList, true);
               setCode('');
             } else {
               PisellToast({
-                content: locales.getText('pisell2.text.goodpass.code-invalid')
+                content: val.type === 'server' ? locales.getText('pisell2.text.goodpass.code-invalid') : locales.getText('pisell2.text.goodpass.code-invalid-cart')
               });
             }
           case 5:
@@ -199,10 +230,27 @@ var VoucherCard = function VoucherCard(props) {
       }, _callee);
     }));
     return function onScanCode() {
-      return _ref2.apply(this, arguments);
+      return _ref3.apply(this, arguments);
     };
   }();
+  var availableData = useMemo(function () {
+    if (!isBooking4Shop) return [];
+    var shopDiscount = pisellos.getModule('shopDiscount');
+    return discountList.filter(function (item) {
+      return !!item.isAvailable;
+    }).map(function (discount) {
+      return _objectSpread(_objectSpread({}, discount), {}, {
+        isDisabled: discount.isDisabled || discount.isDisabledForProductUsed || disabled,
+        savedAmount: shopDiscount.calcDiscountApplicableProductTotalPrice(discount)
+      });
+    });
+  }, [discountList, isBooking4Shop, disabled]);
   if (!isBooking4Shop) return null;
+  var mixedSort = function mixedSort(val) {
+    return _toConsumableArray(val).sort(function (a, b) {
+      return Number(b === null || b === void 0 ? void 0 : b.isSelected) - Number(a === null || a === void 0 ? void 0 : a.isSelected);
+    });
+  };
   return /*#__PURE__*/React.createElement("div", {
     className: "pisell-lowcode__booking-footer-voucher-container"
   }, /*#__PURE__*/React.createElement("div", {
@@ -227,7 +275,8 @@ var VoucherCard = function VoucherCard(props) {
     style: {
       width: '100%'
     },
-    dataSource: availableData,
+    dataSource: (_state$service2 = state.service) !== null && _state$service2 !== void 0 && (_state$service2 = _state$service2.value) !== null && _state$service2 !== void 0 && _state$service2.length ? availableData : [],
+    mixedSort: mixedSort,
     onChange: function onChange(val) {
       var shopDiscount = pisellos.getModule('shopDiscount');
       var detail = shopDiscount.setDiscountSelected({
@@ -235,13 +284,7 @@ var VoucherCard = function VoucherCard(props) {
         isSelected: val.isSelected
       });
       console.log('setDiscountSelected:', detail);
-      dispatch({
-        type: 'setService',
-        payload: {
-          edit: true,
-          value: detail.productList
-        }
-      });
+      productListToValue(detail.productList, true);
     }
   }) : null, /*#__PURE__*/React.createElement("div", {
     className: "voucher-code-input-wrapper"
@@ -258,6 +301,7 @@ var VoucherCard = function VoucherCard(props) {
       setCode((_e$target = e.target) === null || _e$target === void 0 ? void 0 : _e$target.value);
     },
     size: "small",
+    allowClear: true,
     placeholder: locales.getText('pisell2.text.goodpass.enter-code')
     // suffix={
     //   <PisellTooltip title="">

package/es/components/booking/components/voucher/utils.d.ts

@@ -0,0 +1,4 @@
+export declare const getServiceAddons: (list: any[]) => {
+    serviceList: any[];
+    addonsList: any[];
+};

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

@@ -0,0 +1,15 @@
+export var getServiceAddons = function getServiceAddons(list) {
+  var serviceList = [];
+  var addonsList = [];
+  list.forEach(function (item) {
+    if (item.isAddons) {
+      addonsList.push(item);
+    } else {
+      serviceList.push(item);
+    }
+  });
+  return {
+    serviceList: serviceList,
+    addonsList: addonsList
+  };
+};

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 interface FooterProps {
     state: any;
     reload: () => void;

package/es/components/booking/forms/model.js

@@ -1,9 +1,9 @@
-function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
-function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 import { miniRedux } from "@pisell/utils";
 var defaultState = {};
 var _miniRedux = miniRedux({

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { SendModalValues } from './index';
 declare const useSendModal: (bookingId?: number) => {
     open: boolean;

package/es/components/booking/hooks/useClearCart.d.ts

@@ -1,2 +1,3 @@
+/// <reference types="react" />
 declare const useClearCart: (state: any, dispatch: any) => false | JSX.Element;
 export default useClearCart;

package/es/components/booking/hooks/useQuotation.d.ts

@@ -1,3 +1,4 @@
+export declare const calculateTotalPrice: (data: any) => number;
 declare const useQuotation: (state: any, dispatch: any) => {
     dom: JSX.Element;
 };

package/es/components/booking/hooks/useQuotation.js

@@ -19,6 +19,7 @@ import useEngineContext from "../../../../es/hooks/useEngineContext";
 import { locales } from "@pisell/utils";
 import { PisellModal } from "@pisell/materials";
 import { getProductPrice } from "../info/service/serve";
+import Decimal from 'decimal.js';
 var formatBundleItemMap = function formatBundleItemMap(product) {
   return product.bundle_group.reduce(function (pre, cur) {
     var curObj = {};
@@ -28,6 +29,13 @@ var formatBundleItemMap = function formatBundleItemMap(product) {
     return _objectSpread(_objectSpread({}, pre), curObj);
   }, {});
 };
+export var calculateTotalPrice = function calculateTotalPrice(data) {
+  var _price = data.reduce(function (total, item) {
+    var _price = (item === null || item === void 0 ? void 0 : item.price) || (item === null || item === void 0 ? void 0 : item.add_price);
+    return total + _price * item.num;
+  }, 0);
+  return parseFloat(_price);
+};
 var setNewCartValue = function setNewCartValue(cartValue, newProducts) {
   if (!newProducts.length) {
     return {
@@ -70,9 +78,16 @@ var setNewCartValue = function setNewCartValue(cartValue, newProducts) {
         isChangePrice = true;
         isBundleChange = true;
       }
+      if (bundleItemMap[bundle.id].price_type === 'markdown') {
+        bundleItemMap[bundle.id].price = new Decimal(bundleItemMap[bundle.id].price || 0).mul(-1).toNumber();
+      }
+      var selectBundleInfo = item._extend.other.bundle.find(function (item) {
+        return item.id === bundle.id;
+      });
+      var optionPrice = calculateTotalPrice((selectBundleInfo === null || selectBundleInfo === void 0 ? void 0 : selectBundleInfo.option) || []);
       return _objectSpread(_objectSpread({}, bundle), {}, {
         base_price: bundleItemMap[bundle.id].base_price,
-        price: bundleItemMap[bundle.id].price
+        price: new Decimal(bundleItemMap[bundle.id].price || 0).add(optionPrice).toNumber()
         // product_price: bundleItemMap[item.id].product_price,
       });
     });

package/es/components/booking/info/client/index.js

@@ -33,6 +33,7 @@ import { isWalkIn as getIsWalkIn } from "../../utils";
 import { getFranchiseeCustomerInfo, getFranchiseeCustomerList } from "./serve";
 import { useMemoizedFn } from 'ahooks';
 import { getWaiverTitle } from "../clientVariant/utils";
+import useGetHolderList from "../hooks/useGetHolderList";
 var isLoadClient = false;
 var Client = function Client() {
   var _state$client$value2, _state$client$value3, _state$client$value4, _state$client$value5, _state$client$value6, _state$client$value7, _state$client$value8, _state$client$value9, _state$client$value10, _state$client$value11;
@@ -52,6 +53,7 @@ var Client = function Client() {
     _useState6 = _slicedToArray(_useState5, 2),
     franchiseeLoading = _useState6[0],
     setFranchiseeLoading = _useState6[1];
+  var getHolders = useGetHolderList(state, dispatch);
   var _useState7 = useState({
       skip: 1,
       num: 10,
@@ -281,6 +283,7 @@ var Client = function Client() {
         if (data) {
           handleSelectClient([data]);
         }
+        getHolders();
         getClients(_objectSpread(_objectSpread({}, state.client.clientsParams), {}, {
           search: '',
           customer_id: data === null || data === void 0 ? void 0 : data.id,
@@ -298,14 +301,20 @@ var Client = function Client() {
         showAcceptsMarketing: false
       },
       callback: function callback(customer_id, params) {
-        var _params$, _params$2, _state$client2;
+        var _state$client2, _state$client2$map, _params$, _params$2, _state$client3;
+        var waiverForm = ((_state$client2 = state.client) === null || _state$client2 === void 0 || (_state$client2 = _state$client2.clients) === null || _state$client2 === void 0 || (_state$client2 = _state$client2[0].waiver_form) === null || _state$client2 === void 0 || (_state$client2$map = _state$client2.map) === null || _state$client2$map === void 0 ? void 0 : _state$client2$map.call(_state$client2, function (item) {
+          return _objectSpread(_objectSpread({}, item), {}, {
+            is_filled: 0
+          });
+        })) || [];
         // 创建后本地数据处理到数组
         dispatch({
           type: 'setClient',
           payload: {
             clients: [].concat(_toConsumableArray(params !== null && params !== void 0 && (_params$ = params[0]) !== null && _params$ !== void 0 && _params$.customer ? [_objectSpread(_objectSpread({}, params === null || params === void 0 || (_params$2 = params[0]) === null || _params$2 === void 0 ? void 0 : _params$2.customer), {}, {
-              id: customer_id
-            })] : []), _toConsumableArray(((_state$client2 = state.client) === null || _state$client2 === void 0 ? void 0 : _state$client2.clients) || []))
+              id: customer_id,
+              waiver_form: waiverForm
+            })] : []), _toConsumableArray(((_state$client3 = state.client) === null || _state$client3 === void 0 ? void 0 : _state$client3.clients) || []))
           }
         });
       }

package/es/components/booking/info/dateRange/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 export declare const disabledDate: (current: any, position: any, currentDate: any) => any;
 declare const DateRange: ({ state, dispatch, key }: any) => JSX.Element;

package/es/components/booking/info/service/Lists.d.ts

@@ -1,2 +1,3 @@
+/// <reference types="react" />
 declare const Lists: ({ onEdit, onChange, onAction, isParallelResource }: any) => JSX.Element;
 export default Lists;

package/es/components/booking/info/service/Lists.js

@@ -92,7 +92,7 @@ var Lists = function Lists(_ref) {
       isShowChangeHolder: isShowChangeHolder,
       isShowChangeResource: true,
       isShowAddHolderButton: true,
-      isShowEditProduct: true
+      isShowEditProduct: !state.isBookingCreatePage
     };
   }, [state === null || state === void 0 ? void 0 : state.bookingId, state === null || state === void 0 ? void 0 : state.disabledEdit, isShowChangeHolder, state.isBookingCreatePage]);
   return /*#__PURE__*/React.createElement(CartContext.Provider, {

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { PisellDrawerProps } from '../../../components/drawer';
 import './index.less';
 interface AddServiceProps {

package/es/components/booking/info/service/addService/index.js

@@ -28,7 +28,7 @@ import useEngineContext from "../../../../../hooks/useEngineContext";
 import TabProduct from "../../../components/TabProduct";
 import AddButton from "../../../components/addButton";
 import Drawer from "../../../components/drawer";
-import { formatProductListByCategory, getIsEject, isSessionProduct, request } from "../../../utils";
+import { formatProductListByCategory, getIsEject, getIsOnlySession, isSessionProduct, request } from "../../../utils";
 import DateRange from "../../dateRange";
 import { Context } from "../../model";
 import { appointmentTypes, inputDateCol } from "../../service2/status";
@@ -311,6 +311,7 @@ var Info = function Info(props) {
     var isSession = isSessionProduct(item);
     // 是否有单规格 组合规格 套餐, 如果没有不需要打开弹窗
     var isEject = getIsEject(item, type);
+    var isOnlySession = getIsOnlySession(item);
 
     // 跨日预约开启单规格 组合规格 套餐
     if (isDay) {
@@ -328,6 +329,7 @@ var Info = function Info(props) {
           package: true
         },
         is_eject: isEject ? 1 : 0,
+        isOnlySession: isOnlySession,
         customer_id: customerId,
         isOS: isSession
       },

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: any;
+    locale: string;
     slice: any;
     selectProps: {
         size: string;

package/es/components/booking/info/service/editService/BookingList/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 declare const BookingList: ({ items }: {
     items: any[];
 }) => JSX.Element;

package/es/components/booking/info/service/like/index.js

@@ -19,7 +19,7 @@ var Like = function Like(_ref) {
       }
       e.preventDefault();
       e.stopPropagation();
-      onChange === null || onChange === void 0 ? void 0 : onChange(status === "like" ? "common" : "like");
+      onChange === null || onChange === void 0 || onChange(status === "like" ? "common" : "like");
     }
   });
 };

package/es/components/booking/info/service/serviceItem/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 declare const ServiceItem: ({ d, handleEditService, state, handleLike, resourceItem, errorMessage, handleDeleteService, }: any) => JSX.Element;
 export default ServiceItem;

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

@@ -20,7 +20,7 @@ function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol"
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 import { getNoResource } from "../../mock";
 import { getErrorList, getProductTotalPrice } from "../../utils";
-import { locales } from '@pisell/utils';
+import { isArr, locales } from '@pisell/utils';
 import dayjs from 'dayjs';
 import { appointmentTypes, openingTime } from "./status";
 import { postMultiDay } from "../service/serve";
@@ -199,7 +199,9 @@ export var handleChangeHolder = function handleChangeHolder(products, currentIte
     if (item._id === currentItem._id) {
       return _objectSpread(_objectSpread({}, item), {}, {
         _extend: _objectSpread(_objectSpread({}, item._extend), {}, {
-          holder_id: other.id
+          holder_id: isArr(other) ? other.map(function (item) {
+            return item.id;
+          }) : item._extend.quantity > 1 ? [other.id] : other.id
         })
       });
     }
@@ -610,6 +612,8 @@ var getGeneralParams = function getGeneralParams(item, state, isParallelResource
     actionText: locales.getText('page.booking.text.add-time'),
     isMultipleResource: true,
     multiResources: multiResources,
+    holderMaxCount: item === null || item === void 0 ? void 0 : item._extend.quantity,
+    holderMode: (item === null || item === void 0 ? void 0 : item._extend.quantity) > 1 ? 'multiple' : undefined,
     isErrorHolder: getIsSubjectRequire(state),
     addHolderButtonText: (formData === null || formData === void 0 || (_formData$ = formData[0]) === null || _formData$ === void 0 || (_formData$ = _formData$.form) === null || _formData$ === void 0 ? void 0 : _formData$.title) || "",
     holder_id: item === null || item === void 0 || (_item$_extend5 = item._extend) === null || _item$_extend5 === void 0 ? void 0 : _item$_extend5.holder_id,

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

@@ -95,7 +95,7 @@ export var isBooking4Shop = function isBooking4Shop(shopId, renderType) {
   if (renderType === 'eventBooking') {
     return false;
   }
-  var booking4Shops = [8390, 1350, 1401, 3013, 7154, 7572, 7007, 8119, 7320, 7362, 6497, 6087, 6303, 6726, 8191, 6812, 6813, 6814, 7651, 8586, 8581, 9, 2155, 8030, 1749, 8194, 2327, 8609, 8610, 8782, 1285, 6124, 8727, 5538, 6988, 8872, 6930];
+  var booking4Shops = [8390, 1350, 1401, 3013, 7154, 7572, 7007, 8119, 7320, 7362, 6497, 6087, 6303, 6726, 8191, 6812, 6813, 6814, 7651, 8586, 8581, 9, 2155, 8030, 1749, 8194, 2327, 8609, 8610, 8782, 1285, 6124, 8727, 5538, 6988];
   return booking4Shops.includes(shopId);
 };
 function generateDateRange(start, end) {

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

@@ -31,6 +31,7 @@ import { Skeleton } from 'antd';
 import classNames from 'classnames';
 import useCreateBookingPageHeader from "../hooks/useCreateBookingPageHeader";
 import { getLocale } from "../../../utils/locales";
+import { useDebounceEffect } from "ahooks";
 var defaultModules = {
   client: 1,
   date: 1,
@@ -164,7 +165,7 @@ var Info = Provider(function (props) {
             try {
               // 同步最新数据用, 增加延迟为了不和getProduct接口冲突
               setTimeout( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-                var _stateRef$current;
+                var _stateRef$current, _stateRef$current$map;
                 var data;
                 return _regeneratorRuntime().wrap(function _callee$(_context) {
                   while (1) switch (_context.prev = _context.next) {
@@ -172,7 +173,9 @@ var Info = Provider(function (props) {
                       _context.next = 2;
                       return getResourceList({
                         date: currentDate
-                      }, stateRef === null || stateRef === void 0 || (_stateRef$current = stateRef.current) === null || _stateRef$current === void 0 ? void 0 : _stateRef$current.bookingId);
+                      }, stateRef === null || stateRef === void 0 || (_stateRef$current = stateRef.current) === null || _stateRef$current === void 0 || (_stateRef$current = _stateRef$current.service) === null || _stateRef$current === void 0 || (_stateRef$current = _stateRef$current.value) === null || _stateRef$current === void 0 || (_stateRef$current$map = _stateRef$current.map) === null || _stateRef$current$map === void 0 ? void 0 : _stateRef$current$map.call(_stateRef$current, function (item) {
+                        return item === null || item === void 0 ? void 0 : item.booking_id;
+                      }));
                     case 2:
                       data = _context.sent;
                       data.date = currentDate;
@@ -203,13 +206,15 @@ var Info = Provider(function (props) {
       return _ref.apply(this, arguments);
     };
   }();
-  useEffect(function () {
+  useDebounceEffect(function () {
     // setTimeout(() => {
     if (currentDate) {
       getResourcesData();
     }
     // }, 20);
-  }, [currentDate]);
+  }, [currentDate], {
+    wait: 300
+  });
   return /*#__PURE__*/React.createElement(React.Fragment, null, !!modal.state.setGlobalState ? /*#__PURE__*/React.createElement(TabPane, _defineProperty(_defineProperty({
     style: style,
     header: header,

package/es/components/booking/info2/serve.d.ts

@@ -1,4 +1,4 @@
-export declare const getResourceList: (params: any, bookingId?: number) => Promise<{
+export declare const getResourceList: (params: any, bookingId?: number[]) => Promise<{
     list: any[];
     listMap: any;
 }>;