@pisell/private-materials 3.3.78 → 3.3.80

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

@@ -7,10 +7,6 @@ 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); }
@@ -26,8 +22,7 @@ import useEngineContext from "../../../../hooks/useEngineContext";
 import { PisellInput, PisellGoodPassCard, PisellToast } from '@pisell/materials';
 import { useIsBooking4Shop } from "../../hooks/useIsBooking4Shop";
 import "./index.less";
-import { useMemoizedFn, useDebounceFn, useDebounceEffect } from 'ahooks';
-import { getServiceAddons } from "./utils";
+import { useMemoizedFn, useDebounceFn } from 'ahooks';
 var ShopDiscountHooks = {
   onInited: 'shopDiscount:onInited',
   onDestroy: 'shopDiscount:onDestroy',
@@ -40,11 +35,10 @@ var ShopDiscountHooks = {
 };
 var services = {};
 var VoucherCard = function VoucherCard(props) {
-  var _context$appHelper, _state$client$value, _state$service2;
+  var _context$appHelper, _state$client$value;
   var context = useEngineContext();
   var state = props.state,
-    dispatch = props.dispatch,
-    source = props.source;
+    dispatch = props.dispatch;
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
     showDetail = _useState2[0],
@@ -59,27 +53,35 @@ var VoucherCard = function VoucherCard(props) {
     _useState6 = _slicedToArray(_useState5, 2),
     discountList = _useState6[0],
     setDisCountList = _useState6[1];
-  var serviceValueRef = useRef(state.service.value);
-  var addonsValueRef = useRef(state.addons.value);
+  var productRef = useRef(state.service.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
-  useDebounceEffect(function () {
+  useEffect(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], {
-    wait: 200
-  });
+  }, [(_state$client$value = state.client.value) === null || _state$client$value === void 0 ? void 0 : _state$client$value.id, isBooking4Shop]);
 
   // 设置productList
   useEffect(function () {
     if (isBooking4Shop) {
-      shopDiscount.setProductList([].concat(_toConsumableArray(state.service.value), _toConsumableArray(state.addons.value)));
+      shopDiscount.setProductList(state.service.value);
     }
-  }, [state.service.value, state.addons.value, isBooking4Shop]);
+  }, [state.service.value, isBooking4Shop]);
   var serviceMemo = useMemo(function () {
     var _ref;
     var val = (_ref = state.service.value || []) === null || _ref === void 0 ? void 0 : _ref.map(function (value) {
@@ -87,6 +89,7 @@ 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,
@@ -95,43 +98,24 @@ 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 (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 (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)) {
         return;
       }
       if (isBooking4Shop) {
-        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);
+        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)
+          })
+        });
       }
     }, {
       wait: 500
@@ -141,7 +125,7 @@ var VoucherCard = function VoucherCard(props) {
   // 更新productList
   useEffect(function () {
     run();
-  }, [JSON.stringify(serviceMemo), JSON.stringify(addonsMemo), isBooking4Shop]);
+  }, [JSON.stringify(serviceMemo), 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) {
@@ -149,13 +133,18 @@ var VoucherCard = function VoucherCard(props) {
     })) {
       return;
     }
-    productListToValue(result.productList);
+    dispatch({
+      type: 'setService',
+      payload: _objectSpread(_objectSpread({}, services), {}, {
+        value: result.productList
+      })
+    });
   });
 
   // 监听customer变化
   useEffect(function () {
     if (!isBooking4Shop) return;
-    var onScanCustomerChange = function onScanCustomerChange(customer) {
+    pisellos.effects.on(ShopDiscountHooks.onScanCustomerChange, function (customer) {
       // 更新客户
       dispatch({
         type: 'setClient',
@@ -163,49 +152,22 @@ var VoucherCard = function VoucherCard(props) {
           value: customer
         }
       });
-    };
-    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);
+    pisellos.effects.on(ShopDiscountHooks.onDiscountListChange, function (discount) {
+      setDisCountList(discount);
+    });
     return function () {
       shopDiscount.clear();
-      pisellos.effects.off(ShopDiscountHooks.onCustomerChange, onScanCustomerChange);
-      pisellos.effects.off(ShopDiscountHooks.onLoadPrepareCalcResult, fn);
-      pisellos.effects.off(ShopDiscountHooks.onDiscountListChange, onDiscountListChange);
+      pisellos.effects.off(ShopDiscountHooks.onCustomerChange);
+      pisellos.effects.off(ShopDiscountHooks.onLoadPrepareCalcResult);
+      pisellos.effects.off(ShopDiscountHooks.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 _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
       var val;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
@@ -216,11 +178,18 @@ var VoucherCard = function VoucherCard(props) {
             val = _context.sent;
             console.log(val);
             if (val !== null && val !== void 0 && val.isAvailable) {
-              productListToValue(val.productList, true);
+              productRef.current = val.productList;
+              dispatch({
+                type: 'setService',
+                payload: {
+                  value: val.productList,
+                  edit: true
+                }
+              });
               setCode('');
             } else {
               PisellToast({
-                content: val.type === 'server' ? locales.getText('pisell2.text.goodpass.code-invalid') : locales.getText('pisell2.text.goodpass.code-invalid-cart')
+                content: locales.getText('pisell2.text.goodpass.code-invalid')
               });
             }
           case 5:
@@ -230,27 +199,10 @@ var VoucherCard = function VoucherCard(props) {
       }, _callee);
     }));
     return function onScanCode() {
-      return _ref3.apply(this, arguments);
+      return _ref2.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", {
@@ -275,8 +227,7 @@ var VoucherCard = function VoucherCard(props) {
     style: {
       width: '100%'
     },
-    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,
+    dataSource: availableData,
     onChange: function onChange(val) {
       var shopDiscount = pisellos.getModule('shopDiscount');
       var detail = shopDiscount.setDiscountSelected({
@@ -284,7 +235,13 @@ var VoucherCard = function VoucherCard(props) {
         isSelected: val.isSelected
       });
       console.log('setDiscountSelected:', detail);
-      productListToValue(detail.productList, true);
+      dispatch({
+        type: 'setService',
+        payload: {
+          edit: true,
+          value: detail.productList
+        }
+      });
     }
   }) : null, /*#__PURE__*/React.createElement("div", {
     className: "voucher-code-input-wrapper"
@@ -301,7 +258,6 @@ 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/forms/model.d.ts

@@ -1 +1,10 @@
-export declare const Provider: any, Context: any;
+/// <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;
+}>;

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

@@ -1,9 +1,9 @@
-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 _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 _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 _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); }
 import { miniRedux } from "@pisell/utils";
 var defaultState = {};
 var _miniRedux = miniRedux({

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

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

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 || onChange(status === "like" ? "common" : "like");
+      onChange === null || onChange === void 0 ? void 0 : onChange(status === "like" ? "common" : "like");
     }
   });
 };

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 { isArr, locales } from '@pisell/utils';
+import { locales } from '@pisell/utils';
 import dayjs from 'dayjs';
 import { appointmentTypes, openingTime } from "./status";
 import { postMultiDay } from "../service/serve";
@@ -199,9 +199,7 @@ export var handleChangeHolder = function handleChangeHolder(products, currentIte
     if (item._id === currentItem._id) {
       return _objectSpread(_objectSpread({}, item), {}, {
         _extend: _objectSpread(_objectSpread({}, item._extend), {}, {
-          holder_id: isArr(other) ? other.map(function (item) {
-            return item.id;
-          }) : item._extend.quantity > 1 ? [other.id] : other.id
+          holder_id: other.id
         })
       });
     }
@@ -612,8 +610,6 @@ 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];
+  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];
   return booking4Shops.includes(shopId);
 };
 function generateDateRange(start, end) {

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

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

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

@@ -33,7 +33,7 @@ import { getProductExtend } from "./utils";
 import { formatProductListByCategory, getIsEject, getIsOnlySession, getProductTotalPrice, isSessionProduct, request } from "../../../utils";
 import { locales, getUniqueId } from '@pisell/utils';
 import { useUpdateEffect } from 'ahooks';
-import { getIsShowNumber } from "../../../../ticketBooking/utils";
+import { isNormalProductByDurationSchedule } from "../../../info/service2/utils";
 var shopList = [2886, 4422, 5538, 6930, 6814, 6813, 6812, 6087, 6303, 6080, 6978, 7386, 6848, 6305];
 var Info = function Info(props) {
   var _state$client2, _state$service2, _state$service4, _state$service5;
@@ -255,7 +255,7 @@ var Info = function Info(props) {
           session: isSession,
           variant: true,
           package: true,
-          number: getIsShowNumber(item, state)
+          number: isNormalProductByDurationSchedule(item)
         },
         is_eject: isEject ? 1 : 0,
         isOnlySession: isOnlySession,

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

@@ -35,7 +35,6 @@ import { formatResources, getDurationProps, getFlexibleOption, getTimeObj, setDe
 import { PisellAdjustPriceInputNumber } from '@pisell/materials';
 import { editSessionProduct } from "../../../info/utils";
 import { isNormalProductByDurationSchedule } from "../../../info/service2/utils";
-import { addService, genServiceKey, getIsShowNumber } from "../../../../ticketBooking/utils";
 var submitLock = false;
 var Info = function Info(_, ref) {
   var _state$service3, _state$bookingConfig2, _state$service$cacheI4, _state$service$cacheI5, _state$service6, _state$service8, _window$BaseMaterials, _state$service$cacheI6, _state$service9, _state$service$cacheI7, _state$service$cacheI8, _state$service$cacheI9, _state$service$cacheI10, _state$bookingConfig3, _state$service$resour;
@@ -245,15 +244,13 @@ var Info = function Info(_, ref) {
     }
     _item._extend = _extend;
     _item._time = new Date().getTime();
-    _item._serviceKey = genServiceKey(_item);
     var _id = _item === null || _item === void 0 ? void 0 : _item._id;
 
     // 判断是新增还是编辑
     if (!_list.some(function (d) {
       return d._id === _id;
     })) {
-      var detail = addService(_list, _item, state);
-      _list = detail.list;
+      _list.push(_item);
     } else {
       // 手动改价时移除优惠券使用
       if (isChangeTotal.current) {
@@ -431,7 +428,7 @@ var Info = function Info(_, ref) {
           session: isSession,
           variant: true,
           package: true,
-          number: getIsShowNumber(item, state)
+          number: isNormalProductByDurationSchedule(item)
         },
         isOS: isSession,
         customer_id: (_state$client = state.client) === null || _state$client === void 0 || (_state$client = _state$client.value) === null || _state$client === void 0 ? void 0 : _state$client.id,

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

@@ -1,5 +1,5 @@
 export declare const getResourceTimeIsUsable: (item: any, cacheItem: any, resourceItem: any) => any;
-export declare const getSumCapacity: ({ cacheItem }: any, isCalcQuantity?: boolean) => number;
+export declare const getSumCapacity: ({ cacheItem }: any) => number;
 /**
  * @title: 查找是否有可用的time
  * @description:

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

@@ -162,9 +162,7 @@ export var getResourceTimeIsUsable = function getResourceTimeIsUsable(item, cach
   return time;
 };
 export var getSumCapacity = function getSumCapacity(_ref) {
-  var _cacheItem$_extend;
   var cacheItem = _ref.cacheItem;
-  var isCalcQuantity = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
   var sum = 0;
   var _iterator = _createForOfIteratorHelper(cacheItem._extend.capacity || []),
     _step;
@@ -178,7 +176,7 @@ export var getSumCapacity = function getSumCapacity(_ref) {
   } finally {
     _iterator.f();
   }
-  return sum * (isCalcQuantity ? (cacheItem === null || cacheItem === void 0 || (_cacheItem$_extend = cacheItem._extend) === null || _cacheItem$_extend === void 0 ? void 0 : _cacheItem$_extend.quantity) || 1 : 1);
+  return sum;
 };
 
 /**
@@ -304,7 +302,7 @@ export var getAppointmentTimingPreference = function getAppointmentTimingPrefere
  * @Date: 2024-01-26 14:09
  */
 export var getServiceStartTimeAndEndTime = function getServiceStartTimeAndEndTime(state, cacheItem, timeObj) {
-  var _cacheItem$duration, _cacheItem$_extend2;
+  var _cacheItem$duration, _cacheItem$_extend;
   var appointmentTimingPreference = getAppointmentTimingPreference(state);
 
   // 获取上一个服务商品
@@ -372,7 +370,7 @@ export var getServiceStartTimeAndEndTime = function getServiceStartTimeAndEndTim
     endDate = _getServiceTimes2.endDate;
   _extend.startDate = startDate;
   _extend.endDate = endDate;
-  var session = cacheItem === null || cacheItem === void 0 || (_cacheItem$_extend2 = cacheItem._extend) === null || _cacheItem$_extend2 === void 0 || (_cacheItem$_extend2 = _cacheItem$_extend2.other) === null || _cacheItem$_extend2 === void 0 ? void 0 : _cacheItem$_extend2.session;
+  var session = cacheItem === null || cacheItem === void 0 || (_cacheItem$_extend = cacheItem._extend) === null || _cacheItem$_extend === void 0 || (_cacheItem$_extend = _cacheItem$_extend.other) === null || _cacheItem$_extend === void 0 ? void 0 : _cacheItem$_extend.session;
   if (isSessionProduct(cacheItem) && session) {
     _extend.start_date = session.start_at;
     _extend.startDate = session.start_at;

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

@@ -261,7 +261,6 @@ declare const _default: {
         'pisell2.text.goodpass.code': string;
         'pisell2.text.goodpass.enter-code': string;
         'pisell2.text.goodpass.code-invalid': string;
-        'pisell2.text.goodpass.code-invalid-cart': string;
         'pisell2.text.status.valid': string;
         'pisell2.text.status.expired': string;
         'pisell2.text.validity.expired': (str: string) => string;
@@ -532,7 +531,6 @@ declare const _default: {
         'pisell2.text.goodpass.code': string;
         'pisell2.text.goodpass.enter-code': string;
         'pisell2.text.goodpass.code-invalid': string;
-        'pisell2.text.goodpass.code-invalid-cart': string;
         'pisell2.text.status.valid': string;
         'pisell2.text.status.expired': string;
         'pisell2.text.validity.expired': (str: string) => string;
@@ -803,7 +801,6 @@ declare const _default: {
         'pisell2.text.goodpass.code': string;
         'pisell2.text.goodpass.enter-code': string;
         'pisell2.text.goodpass.code-invalid': string;
-        'pisell2.text.goodpass.code-invalid-cart': string;
         'pisell2.text.status.valid': string;
         'pisell2.text.status.expired': string;
         'pisell2.text.validity.expired': (str: string) => string;

package/es/components/booking/locales.js

@@ -292,13 +292,12 @@ export default {
     'pisell2.text.send-form-reminder-tooltip': 'Refresh forms',
     'pisell2.text.send-form-reminder-refresh': 'Forms refreshed successfully',
     'pisell2.text.send-form-reminder-error-message': 'Please select at least one reminder method',
-    'pisell2.text.goodpass': "Promotion",
+    'pisell2.text.goodpass': "GoodPass",
     'pisell2.text.goodpass.product-vouchers': "Product Vouchers",
     'pisell2.text.goodpass.view-more': "View More",
     'pisell2.text.goodpass.code': "Code",
     'pisell2.text.goodpass.enter-code': "Enter Code",
     'pisell2.text.goodpass.code-invalid': "Current code is invalid",
-    'pisell2.text.goodpass.code-invalid-cart': "No eligible items in the cart",
     'pisell2.text.status.valid': 'Valid',
     'pisell2.text.status.expired': 'Expired',
     'pisell2.text.validity.expired': function pisell2TextValidityExpired(str) {
@@ -610,13 +609,12 @@ export default {
     'pisell2.text.send-form-reminder-tooltip': '刷新表单',
     'pisell2.text.send-form-reminder-refresh': '已刷新表单',
     'pisell2.text.send-form-reminder-error-message': '请至少选择一种提醒方式',
-    'pisell2.text.goodpass': "促销",
+    'pisell2.text.goodpass': "商品券",
     'pisell2.text.goodpass.product-vouchers': "商品兑换券",
     'pisell2.text.goodpass.view-more': "查看更多",
     'pisell2.text.goodpass.code': "券码",
     'pisell2.text.goodpass.enter-code': "请输入券码",
     'pisell2.text.goodpass.code-invalid': "当前券码不可用",
-    'pisell2.text.goodpass.code-invalid-cart': "当前购物车中无可用商品",
     'pisell2.text.status.valid': '有效',
     'pisell2.text.status.expired': '已过期',
     'pisell2.text.validity.expired': function pisell2TextValidityExpired(str) {
@@ -928,13 +926,12 @@ export default {
     'pisell2.text.send-form-reminder-tooltip': '刷新表單',
     'pisell2.text.send-form-reminder-refresh': '已刷新表單',
     'pisell2.text.send-form-reminder-error-message': '請至少選擇一種提醒方式',
-    'pisell2.text.goodpass': "促銷",
+    'pisell2.text.goodpass': "商品券",
     'pisell2.text.goodpass.product-vouchers': "商品兌換券",
     'pisell2.text.goodpass.view-more': "查看更多",
     'pisell2.text.goodpass.code': "券碼",
     'pisell2.text.goodpass.enter-code': "請輸入券碼",
     'pisell2.text.goodpass.code-invalid': "當前券碼不可用",
-    'pisell2.text.goodpass.code-invalid-cart': "當前購物車中無可用商品",
     'pisell2.text.status.valid': '有效',
     'pisell2.text.status.expired': '已過期',
     'pisell2.text.validity.expired': function pisell2TextValidityExpired(str) {

package/es/components/booking/materiels/startTime/index.js

@@ -25,7 +25,7 @@ var StartTime = function StartTime(props) {
     return sliceDayIntoFiveMinutes(slice, locale);
   }, [slice, locale]);
   useEffect(function () {
-    timeObjChange === null || timeObjChange === void 0 || timeObjChange(timeObj);
+    timeObjChange === null || timeObjChange === void 0 ? void 0 : timeObjChange(timeObj);
   }, [timeObj]);
   var renderOptions = useCallback(function (array) {
     var value = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : "value";

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

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

package/es/components/booking/notes/NoteBlock/NoteItem/index.js

@@ -18,7 +18,7 @@ var NoteItem = function NoteItem(props) {
     _props$menus = props.menus,
     menus = _props$menus === void 0 ? defaultMenus : _props$menus;
   var menuChange = function menuChange(e) {
-    onChange === null || onChange === void 0 || onChange(item, e.key);
+    onChange === null || onChange === void 0 ? void 0 : onChange(item, e.key);
   };
   return /*#__PURE__*/React.createElement("div", {
     className: "pisell-lowcode__booking-notes-item"