@pisell/private-materials 6.6.95 → 6.6.97

package/es/components/booking/addons/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/components/footer/utils.js

@@ -513,6 +513,19 @@ var formatProducts = function formatProducts(item, quantity) {
   // 非手动折扣
   var notManualDiscount = discount_list.filter(function (item) {
     return item.type !== 'product';
+  }).map(function (discount) {
+    var _discount$metadata, _discount$metadata$nu, _discount$metadata2;
+    // 预约按份拆成 num=1 提交时，主商品扣次也要按当前提交数量拆分。
+    if (quantity === undefined || (discount.tag || discount.type) !== 'entitlement_pass' || (_discount$metadata = discount.metadata) !== null && _discount$metadata !== void 0 && _discount$metadata.custom_product_bundle_map_id) {
+      return discount;
+    }
+    var num = Math.min(Number((_discount$metadata$nu = (_discount$metadata2 = discount.metadata) === null || _discount$metadata2 === void 0 ? void 0 : _discount$metadata2.num) !== null && _discount$metadata$nu !== void 0 ? _discount$metadata$nu : item._extend.quantity), quantity);
+    return _objectSpread(_objectSpread({}, discount), {}, {
+      _num: num,
+      metadata: _objectSpread(_objectSpread({}, discount.metadata), {}, {
+        num: num
+      })
+    });
   });
   if (item.isCustomItem) {
     item.product_id = 0;

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

@@ -107,6 +107,14 @@ var VoucherCard = function VoucherCard(props) {
       changeCustomerToGlobalState: changeCustomerToGlobalState
     }),
     selectCustomer = _useCustomer.selectCustomer;
+  useEffect(function () {
+    var _shopDiscount$setEnti;
+    shopDiscount === null || shopDiscount === void 0 || (_shopDiscount$setEnti = shopDiscount.setEntitlementPassEnabled) === null || _shopDiscount$setEnti === void 0 || _shopDiscount$setEnti.call(shopDiscount, isBooking4Shop);
+    return function () {
+      var _shopDiscount$setEnti2;
+      return shopDiscount === null || shopDiscount === void 0 || (_shopDiscount$setEnti2 = shopDiscount.setEntitlementPassEnabled) === null || _shopDiscount$setEnti2 === void 0 ? void 0 : _shopDiscount$setEnti2.call(shopDiscount, false);
+    };
+  }, [shopDiscount, isBooking4Shop]);
 
   // 设置client
   useDebounceEffect(function () {
@@ -354,11 +362,42 @@ var VoucherCard = function VoucherCard(props) {
     if (!isBooking4Shop) return [];
     return discountList.filter(function (item) {
       return !!item.isAvailable;
-    }).map(function (discount) {
-      return _objectSpread(_objectSpread({}, discount), {}, {
-        isDisabled: discount.isDisabled || discount.isDisabledForProductUsed || disabled,
+    }).flatMap(function (discount) {
+      var _discount$appliedProd, _discount$committedAp, _discount$applicableP;
+      var currentRow = _objectSpread(_objectSpread({}, discount), {}, {
+        // 原卡片仍读取 isSelected，历史扣次不代表本次勾选。
+        isSelected: discount.tag === 'entitlement_pass' && !discount.isDisabled ? !!discount.isSelected && (((_discount$appliedProd = discount.appliedProductDetails) === null || _discount$appliedProd === void 0 ? void 0 : _discount$appliedProd.length) || 0) > (((_discount$committedAp = discount.committedAppliedProductDetails) === null || _discount$committedAp === void 0 ? void 0 : _discount$committedAp.length) || 0) : discount.isSelected,
+        isDisabled: discount.isDisabled || (discount.tag === 'entitlement_pass' ? !discount.isAvailable : discount.isDisabledForProductUsed) || disabled,
         savedAmount: shopDiscount.calcDiscountApplicableProductTotalPrice(discount)
       });
+      var committedDetails = discount.tag === 'entitlement_pass' ? discount.committedAppliedProductDetails || [] : [];
+      if (!committedDetails.length) return [currentRow];
+
+      // 历史抵扣独立展示；卡的次数配置只影响本次使用，不影响上次结算记录。
+      var historyRow = _objectSpread(_objectSpread({}, discount), {}, {
+        displayKey: "".concat(discount.id, "-last-settlement"),
+        isEditMode: true,
+        isSelected: true,
+        isDisabled: true,
+        appliedProductDetails: committedDetails,
+        savedAmount: shopDiscount.calcDiscountApplicableProductTotalPrice(_objectSpread(_objectSpread({}, discount), {}, {
+          savedAmount: 0,
+          appliedProductDetails: committedDetails
+        }))
+      });
+      // Rules 返回的 appliedProductDetails 按“历史抵扣 + 本次抵扣”排列。
+      var currentDetails = (discount.appliedProductDetails || []).slice(committedDetails.length);
+      var canApplyToNewProducts = !discount.isDisabled && (((_discount$applicableP = discount.applicableProductDetails) === null || _discount$applicableP === void 0 ? void 0 : _discount$applicableP.length) || 0) > 0;
+      if (!currentDetails.length && !canApplyToNewProducts) return [historyRow];
+      return [historyRow, _objectSpread(_objectSpread({}, currentRow), {}, {
+        displayKey: "".concat(discount.id, "-current"),
+        isEditMode: false,
+        appliedProductDetails: currentDetails,
+        savedAmount: shopDiscount.calcDiscountApplicableProductTotalPrice(_objectSpread(_objectSpread({}, discount), {}, {
+          savedAmount: 0,
+          appliedProductDetails: currentDetails
+        }))
+      })];
     });
   }, [discountList, isBooking4Shop, disabled]);
   if (!isBooking4Shop) return null;

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

@@ -149,7 +149,7 @@ var BookingDashboard = /*#__PURE__*/forwardRef(function (props, ref) {
           case 7:
             res = _context.sent;
             setStatisticData(res);
-            calcBookingDataCount();
+            calcBookingDataCount(res);
             // const data = await getBookingList({
             //   ...otherParams,
             //   item_type: 'appointment_booking',
@@ -171,31 +171,32 @@ var BookingDashboard = /*#__PURE__*/forwardRef(function (props, ref) {
     };
   }();
   var calcBookingDataCount = function calcBookingDataCount() {
-    var _statisticData$total_, _statisticData$total_2, _statisticData$ongoin, _statisticData$ongoin2, _statisticData$upcomi, _statisticData$upcomi2, _statisticData$comple, _statisticData$comple2;
+    var _currentStatisticData, _currentStatisticData2, _currentStatisticData3, _currentStatisticData4, _currentStatisticData5, _currentStatisticData6, _currentStatisticData7, _currentStatisticData8;
+    var currentStatisticData = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : statisticData;
     // 当前在场团体
-    var groupsOnSiteNow = statisticData.groups_today_num || 0;
+    var groupsOnSiteNow = currentStatisticData.groups_today_num || 0;
     // 当前在场人数
-    var peopleOnSiteNow = statisticData.people_on_site_now_num || (hasTurnstileApp ? 0 : '-');
+    var peopleOnSiteNow = currentStatisticData.people_on_site_now_num || (hasTurnstileApp ? 0 : '-');
     // 今日游客总数
-    var totalVisitorsToday = ((_statisticData$total_ = statisticData.total_visitors_today) === null || _statisticData$total_ === void 0 ? void 0 : _statisticData$total_.num) || 0;
+    var totalVisitorsToday = ((_currentStatisticData = currentStatisticData.total_visitors_today) === null || _currentStatisticData === void 0 ? void 0 : _currentStatisticData.num) || 0;
     // 今日游客二级数据
-    var totalVisitorsTodayChildren = ((_statisticData$total_2 = statisticData.total_visitors_today) === null || _statisticData$total_2 === void 0 ? void 0 : _statisticData$total_2.statistics) || [];
+    var totalVisitorsTodayChildren = ((_currentStatisticData2 = currentStatisticData.total_visitors_today) === null || _currentStatisticData2 === void 0 ? void 0 : _currentStatisticData2.statistics) || [];
     // 正在进行中的游客
-    var ongoing = ((_statisticData$ongoin = statisticData.ongoing_visitors) === null || _statisticData$ongoin === void 0 ? void 0 : _statisticData$ongoin.num) || 0;
+    var ongoing = ((_currentStatisticData3 = currentStatisticData.ongoing_visitors) === null || _currentStatisticData3 === void 0 ? void 0 : _currentStatisticData3.num) || 0;
     // 正在进行中的游客二级数据
-    var ongoingChildren = ((_statisticData$ongoin2 = statisticData.ongoing_visitors) === null || _statisticData$ongoin2 === void 0 ? void 0 : _statisticData$ongoin2.statistics) || [];
+    var ongoingChildren = ((_currentStatisticData4 = currentStatisticData.ongoing_visitors) === null || _currentStatisticData4 === void 0 ? void 0 : _currentStatisticData4.statistics) || [];
     // 即将到达的游客
-    var upcoming = ((_statisticData$upcomi = statisticData.upcoming_visitors) === null || _statisticData$upcomi === void 0 ? void 0 : _statisticData$upcomi.num) || 0;
+    var upcoming = ((_currentStatisticData5 = currentStatisticData.upcoming_visitors) === null || _currentStatisticData5 === void 0 ? void 0 : _currentStatisticData5.num) || 0;
     // 即将到达的游客二级数据
-    var upcomingChildren = ((_statisticData$upcomi2 = statisticData.upcoming_visitors) === null || _statisticData$upcomi2 === void 0 ? void 0 : _statisticData$upcomi2.statistics) || [];
+    var upcomingChildren = ((_currentStatisticData6 = currentStatisticData.upcoming_visitors) === null || _currentStatisticData6 === void 0 ? void 0 : _currentStatisticData6.statistics) || [];
     // 超时的游客
-    var overdue = statisticData.overdue_visitors_num || (hasTurnstileApp ? 0 : '-');
+    var overdue = currentStatisticData.overdue_visitors_num || (hasTurnstileApp ? 0 : '-');
     // 已完成的游客
-    var completed = ((_statisticData$comple = statisticData.completed_visitors) === null || _statisticData$comple === void 0 ? void 0 : _statisticData$comple.num) || 0;
+    var completed = ((_currentStatisticData7 = currentStatisticData.completed_visitors) === null || _currentStatisticData7 === void 0 ? void 0 : _currentStatisticData7.num) || 0;
     // 已完成的游客二级数据
-    var completedChildren = ((_statisticData$comple2 = statisticData.completed_visitors) === null || _statisticData$comple2 === void 0 ? void 0 : _statisticData$comple2.statistics) || [];
+    var completedChildren = ((_currentStatisticData8 = currentStatisticData.completed_visitors) === null || _currentStatisticData8 === void 0 ? void 0 : _currentStatisticData8.statistics) || [];
     // 已离场的游客
-    var departed = statisticData.departed_visitors_num || (hasTurnstileApp ? 0 : '-');
+    var departed = currentStatisticData.departed_visitors_num || (hasTurnstileApp ? 0 : '-');
     onDataChange === null || onDataChange === void 0 || onDataChange({
       groupsOnSiteNow: groupsOnSiteNow,
       peopleOnSiteNow: peopleOnSiteNow,

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/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/info2/service/editService/index.js

@@ -41,7 +41,7 @@ import { editSessionProduct } from "../../../info/utils";
 import { deleteCacheParams, getDays, getProductOriginTotalPrice, getProductTotalPrice, getServiceTimes, isSessionProduct, isWalkIn } from "../../../utils";
 import { getErrorList, getIsNoSpecAndPackage } from "../../utilsByBooking";
 import { formatResources, getDurationProps, getFlexibleOption, getMultiDay, getTimeObj, setDefaultCapacitys } from "../addService/utils";
-import { getProductAllDiscountList, mergeBundleWithOriginalPrice, setProductPrice } from "./utils";
+import { getProductAllDiscountList, hasEntitlementDiscount, mergeBundleWithOriginalPrice, setProductPrice, updateEntitlementQuantity } from "./utils";
 import NoteModal from "../../../../../plus/noteModal";
 import { DiscountKeyboard } from "../../../../../pro/priceKeyboard";
 import EditTabs from "../../../info/service/editService/EditTabs";
@@ -91,6 +91,7 @@ var Info = function Info(_, ref) {
   var resourcesRef = useRef(null);
   var isChangeTotal = useRef(false);
   var shouldReallocateBundlePriceRef = useRef(false);
+  var isEntitlementPrice = hasEntitlementDiscount(state.service.cacheItem);
   var _useState3 = useState(false),
     _useState4 = _slicedToArray(_useState3, 2),
     noteModalOpen = _useState4[0],
@@ -322,7 +323,7 @@ var Info = function Info(_, ref) {
    * @Date: 2024-01-09 14:04
    */
   var onFinish = function onFinish(values, cacheItem) {
-    var _resourcesRef$current, _item$_extend, _item$_extend2, _item$_extend3, _item$_extend4, _item2, _item3, _item$_extend5, _state$service$cacheI3, _window$closeBookingE2, _window2;
+    var _resourcesRef$current, _item$_extend, _list$find, _previousItem$_extend, _item$_extend2, _item$_extend3, _item$_extend4, _item2, _item3, _item$_extend5, _state$service$cacheI3, _window$closeBookingE2, _window2;
     var isSuccess = (_resourcesRef$current = resourcesRef.current) === null || _resourcesRef$current === void 0 ? void 0 : _resourcesRef$current.check();
     if (isShowTimeAndResource && !isSuccess) {
       return;
@@ -362,7 +363,8 @@ var Info = function Info(_, ref) {
       _extend.startDate = startDate;
       _extend.endDate = endDate;
     }
-    var shouldReallocatePrice = isChangeTotal.current || shouldReallocateBundlePriceRef.current;
+    var isManualPriceChange = isChangeTotal.current && !hasEntitlementDiscount(_item);
+    var shouldReallocatePrice = isManualPriceChange || shouldReallocateBundlePriceRef.current;
     if (shouldReallocatePrice) {
       var _extend$other, _extend$other2;
       // 计算折扣比例
@@ -394,9 +396,16 @@ var Info = function Info(_, ref) {
     _item._time = new Date().getTime();
     _item._serviceKey = genServiceKey(_item);
     _item._holderKey = genHolderKey(_item);
+    var previousItem = (_list$find = _list.find(function (item) {
+      return item._id === _item._id;
+    })) !== null && _list$find !== void 0 ? _list$find : _list.find(function (item) {
+      return isSameBookingServiceItem(item, _item);
+    });
+    var isEntitlementQuantityChange = hasEntitlementDiscount(previousItem) && Number(_item._extend.quantity || 1) !== Number((previousItem === null || previousItem === void 0 || (_previousItem$_extend = previousItem._extend) === null || _previousItem$_extend === void 0 ? void 0 : _previousItem$_extend.quantity) || 1);
     // 如果holder 有多个，则需要拆分多个商品
     // 另外一个情况 如果商品数量有多个，holder 数量小于商品数量也需要拆分
-    if (((_item$_extend2 = _item._extend) === null || _item$_extend2 === void 0 || (_item$_extend2 = _item$_extend2.holder_id) === null || _item$_extend2 === void 0 ? void 0 : _item$_extend2.length) > 1 || ((_item$_extend3 = _item._extend) === null || _item$_extend3 === void 0 ? void 0 : _item$_extend3.quantity) > 1 && ((_item$_extend4 = _item._extend) === null || _item$_extend4 === void 0 || (_item$_extend4 = _item$_extend4.holder_id) === null || _item$_extend4 === void 0 ? void 0 : _item$_extend4.length) >= 1) {
+    // 多次卡改量由 updateEntitlementQuantity 拆分，避免复制历史扣次。
+    if (!isEntitlementQuantityChange && (((_item$_extend2 = _item._extend) === null || _item$_extend2 === void 0 || (_item$_extend2 = _item$_extend2.holder_id) === null || _item$_extend2 === void 0 ? void 0 : _item$_extend2.length) > 1 || ((_item$_extend3 = _item._extend) === null || _item$_extend3 === void 0 ? void 0 : _item$_extend3.quantity) > 1 && ((_item$_extend4 = _item._extend) === null || _item$_extend4 === void 0 || (_item$_extend4 = _item$_extend4.holder_id) === null || _item$_extend4 === void 0 ? void 0 : _item$_extend4.length) >= 1)) {
       var holder_ids = _item._extend.holder_id;
       _item._extend.holder_id = holder_ids[0];
       holder_ids = holder_ids.slice(1);
@@ -465,10 +474,16 @@ var Info = function Info(_, ref) {
           _item = deleteDiscountList(_item, true);
         }
         if (matchById) {
-          _list = _list.map(function (d) {
-            return d._id === _id ? _objectSpread(_objectSpread({}, _item), {}, {
+          _list = _list.flatMap(function (d) {
+            if (d._id !== _id) return [d];
+            return updateEntitlementQuantity(d, _objectSpread(_objectSpread({}, _item), {}, {
               new: 0
-            }) : d;
+            })).map(function (item) {
+              return _objectSpread(_objectSpread({}, item), {}, {
+                _serviceKey: genServiceKey(item),
+                _holderKey: genHolderKey(item)
+              });
+            });
           });
         } else {
           // fallback：合并同预约重复项，沿用 list 内 _id 避免再次失配
@@ -476,10 +491,15 @@ var Info = function Info(_, ref) {
           _list = _list.reduce(function (acc, d) {
             if (isSameBookingServiceItem(d, _item)) {
               if (!replaced) {
-                acc.push(_objectSpread(_objectSpread({}, _item), {}, {
+                acc.push.apply(acc, _toConsumableArray(updateEntitlementQuantity(d, _objectSpread(_objectSpread({}, _item), {}, {
                   new: 0,
                   _id: d._id
-                }));
+                })).map(function (item) {
+                  return _objectSpread(_objectSpread({}, item), {}, {
+                    _serviceKey: genServiceKey(item),
+                    _holderKey: genHolderKey(item)
+                  });
+                })));
                 replaced = true;
               }
             } else {
@@ -952,7 +972,7 @@ var Info = function Info(_, ref) {
       precision: 2,
       prefix: state.amountSymbol,
       onChange: handleTotalChange,
-      disabled: state.channelDisabledEdit,
+      disabled: state.channelDisabledEdit || isEntitlementPrice,
       originalValue: ((_state$service$cacheI10 = state.service.cacheItem) === null || _state$service$cacheI10 === void 0 || (_state$service$cacheI10 = _state$service$cacheI10._extend) === null || _state$service$cacheI10 === void 0 ? void 0 : _state$service$cacheI10.origin_total) || 0,
       placeholder: ((_state$service$cacheI11 = state.service.cacheItem) === null || _state$service$cacheI11 === void 0 || (_state$service$cacheI11 = _state$service$cacheI11._extend) === null || _state$service$cacheI11 === void 0 ? void 0 : _state$service$cacheI11.origin_total) || '0',
       size: "large",
@@ -963,7 +983,7 @@ var Info = function Info(_, ref) {
         selectType: 'dark'
       }
     })));
-  }, [useTotal, (_state$service$cacheI12 = state.service.cacheItem) === null || _state$service$cacheI12 === void 0 || (_state$service$cacheI12 = _state$service$cacheI12._extend) === null || _state$service$cacheI12 === void 0 ? void 0 : _state$service$cacheI12.origin_total, state.amountSymbol, state.channelDisabledEdit]);
+  }, [useTotal, (_state$service$cacheI12 = state.service.cacheItem) === null || _state$service$cacheI12 === void 0 || (_state$service$cacheI12 = _state$service$cacheI12._extend) === null || _state$service$cacheI12 === void 0 ? void 0 : _state$service$cacheI12.origin_total, state.amountSymbol, state.channelDisabledEdit, isEntitlementPrice]);
   var reason = useMemo(function () {
     return isReason ? /*#__PURE__*/React.createElement(Col, {
       span: 24

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

@@ -7,6 +7,9 @@
 
 判断是否需要进入编辑服务页
  */
+export declare const hasEntitlementDiscount: (item: any) => boolean;
+/** 已提交部分保留原扣次；增加的数量作为新商品交给 OS 重新计算。 */
+export declare const updateEntitlementQuantity: (previous: any, next: any) => any[];
 export declare const getAutoAllocationStorage: (id: string | number) => any;
 export declare const setAutoAllocationStorage: (data: {
     [key: string]: boolean;

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

@@ -1,15 +1,15 @@
 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(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 _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
 function _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 _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
-function 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(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); }
 /**
 1. 在进入编辑服务前
 
@@ -20,16 +20,125 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
 判断是否需要进入编辑服务页
  */
 
-import { isArr } from "@pisell/utils";
-import { isBoolean } from "@pisell/utils";
+import { getUniqueId, isArr, isBoolean } from "@pisell/utils";
 import Decimal from "decimal.js";
+import { cloneDeep } from 'lodash';
 import { getBundleDiscountList } from "../../../components/footer/utils";
+import { getMainPrice, getProductTotalPrice } from "../../../utils";
+var isEntitlementDiscount = function isEntitlementDiscount(discount) {
+  return ((discount === null || discount === void 0 ? void 0 : discount.tag) || (discount === null || discount === void 0 ? void 0 : discount.type)) === 'entitlement_pass';
+};
+var getServiceDiscounts = function getServiceDiscounts(item) {
+  var _item$_extend;
+  return [].concat(_toConsumableArray((item === null || item === void 0 ? void 0 : item.discount_list) || []), _toConsumableArray(((item === null || item === void 0 || (_item$_extend = item._extend) === null || _item$_extend === void 0 || (_item$_extend = _item$_extend.other) === null || _item$_extend === void 0 ? void 0 : _item$_extend.bundle) || []).flatMap(function (bundle) {
+    return bundle.discount_list || [];
+  })));
+};
+export var hasEntitlementDiscount = function hasEntitlementDiscount(item) {
+  return getServiceDiscounts(item).some(isEntitlementDiscount);
+};
+
+/** 已提交部分保留原扣次；增加的数量作为新商品交给 OS 重新计算。 */
+export var updateEntitlementQuantity = function updateEntitlementQuantity(previous, next) {
+  var _previous$_extend, _previous$_extend2, _previous$_extend3;
+  var discounts = getServiceDiscounts(previous);
+  var persisted = [previous === null || previous === void 0 ? void 0 : previous.booking_id, previous === null || previous === void 0 ? void 0 : previous.order_detail_id, previous === null || previous === void 0 || (_previous$_extend = previous._extend) === null || _previous$_extend === void 0 ? void 0 : _previous$_extend.order_detail_id].some(function (value) {
+    return Number(value) > 0;
+  }) || discounts.some(function (discount) {
+    return isEntitlementDiscount(discount) && discount.id;
+  });
+  var previousQuantity = Number((previous === null || previous === void 0 || (_previous$_extend2 = previous._extend) === null || _previous$_extend2 === void 0 ? void 0 : _previous$_extend2.quantity) || 1);
+  var nextQuantity = Number(next._extend.quantity || 1);
+  if (!persisted || !hasEntitlementDiscount(previous) || nextQuantity === previousQuantity) {
+    return [next];
+  }
+  if (nextQuantity < previousQuantity) {
+    // 商品弹窗会重算原价；历史行减量只调整数量，沿用已提交的价格和商品配置。
+    return [_objectSpread(_objectSpread({}, previous), {}, {
+      _extend: _objectSpread(_objectSpread(_objectSpread({}, previous._extend), {}, {
+        quantity: nextQuantity
+      }, Array.isArray(next._extend.holder_id) ? {
+        holder_id: next._extend.holder_id.slice(0, nextQuantity)
+      } : {}), {}, {
+        other: _objectSpread(_objectSpread({}, previous._extend.other), {}, {
+          quantity: nextQuantity
+        })
+      }),
+      discount_list: (previous.discount_list || []).map(function (discount) {
+        var _discount$metadata, _discount$metadata$nu, _discount$metadata2;
+        // 套餐扣次是每份主商品中的子商品次数，不能按主商品数量裁剪。
+        if (!isEntitlementDiscount(discount) || (_discount$metadata = discount.metadata) !== null && _discount$metadata !== void 0 && _discount$metadata.custom_product_bundle_map_id) return discount;
+        var num = Math.min(Number((_discount$metadata$nu = (_discount$metadata2 = discount.metadata) === null || _discount$metadata2 === void 0 ? void 0 : _discount$metadata2.num) !== null && _discount$metadata$nu !== void 0 ? _discount$metadata$nu : previousQuantity), nextQuantity);
+        return _objectSpread(_objectSpread({}, discount), {}, {
+          _num: num,
+          metadata: _objectSpread(_objectSpread({}, discount.metadata), {}, {
+            num: num
+          })
+        });
+      })
+    })];
+  }
+  var appended = cloneDeep(next);
+  var uid = getUniqueId();
+  appended._id = uid;
+  appended.booking_id = 0;
+  appended.order_detail_id = 0;
+  appended.new = 0;
+  appended.discount_list = [];
+  appended.discount_amount = 0;
+  appended.metadata = _objectSpread(_objectSpread({}, appended.metadata), {}, {
+    unique_identification_number: uid
+  });
+  delete appended.metadata.entitlement_source_identity;
+  delete appended.metadata.entitlement_source_product_uid;
+  if (appended._origin) delete appended._origin.booking_id;
+  var extend = appended._extend;
+  extend.order_detail_id = 0;
+  extend.unique_identification_number = uid;
+  extend.quantity = nextQuantity - previousQuantity;
+  if (Array.isArray(extend.holder_id)) {
+    var holders = extend.holder_id.slice(previousQuantity, nextQuantity);
+    extend.holder_id = holders.length ? holders : undefined;
+  }
+  extend.other = _objectSpread(_objectSpread({}, extend.other), {}, {
+    quantity: extend.quantity
+  });
+  extend.other.bundle = (extend.other.bundle || []).map(function (bundle) {
+    var _ref, _ref2, _bundle$original_pric, _bundle$discount_list;
+    var price = (_ref = (_ref2 = (_bundle$original_pric = bundle.original_price) !== null && _bundle$original_pric !== void 0 ? _bundle$original_pric : (_bundle$discount_list = bundle.discount_list) === null || _bundle$discount_list === void 0 || (_bundle$discount_list = _bundle$discount_list[0]) === null || _bundle$discount_list === void 0 || (_bundle$discount_list = _bundle$discount_list.discount) === null || _bundle$discount_list === void 0 ? void 0 : _bundle$discount_list.original_amount) !== null && _ref2 !== void 0 ? _ref2 : bundle.product_price) !== null && _ref !== void 0 ? _ref : bundle.price;
+    var bundleUid = getUniqueId();
+    var metadata = _objectSpread(_objectSpread({}, bundle.metadata), {}, {
+      custom_product_bundle_map_id: bundleUid,
+      unique_identification_number: bundleUid
+    });
+    delete metadata.entitlement_source_identity;
+    return _objectSpread(_objectSpread({}, bundle), {}, {
+      _id: bundleUid,
+      price: price,
+      bundle_selling_price: price,
+      discount_list: [],
+      metadata: metadata
+    });
+  });
+  var mainDiscount = (next.discount_list || []).find(function (discount) {
+    var _discount$metadata3, _discount$discount;
+    return !((_discount$metadata3 = discount.metadata) !== null && _discount$metadata3 !== void 0 && _discount$metadata3.custom_product_bundle_map_id) && ((_discount$discount = discount.discount) === null || _discount$discount === void 0 ? void 0 : _discount$discount.original_amount) != null;
+  });
+  if (mainDiscount && (previous === null || previous === void 0 || (_previous$_extend3 = previous._extend) === null || _previous$_extend3 === void 0 || (_previous$_extend3 = _previous$_extend3.other) === null || _previous$_extend3 === void 0 ? void 0 : _previous$_extend3.product_variant_id) === extend.other.product_variant_id) {
+    extend.price = Number(mainDiscount.discount.original_amount);
+    if (extend.other.product_variant_id) extend.other.price = extend.price;
+  }
+  extend.main_product_selling_price = getMainPrice(appended);
+  extend.total = getProductTotalPrice(appended);
+  extend.origin_total = extend.total;
+  return [previous, appended];
+};
 var isNewService = function isNewService(service) {
   return !service.new && service._extend.endDate;
 };
-var init = function init(_ref) {
-  var cacheItem = _ref.cacheItem,
-    state = _ref.state;
+var init = function init(_ref3) {
+  var cacheItem = _ref3.cacheItem,
+    state = _ref3.state;
   var _cacheItem = _objectSpread({}, cacheItem);
   var renderData = {};
   var _extend = {};
@@ -74,11 +183,11 @@ export var setAutoAllocationStorage = function setAutoAllocationStorage(data) {
  * @param newTotal - 折扣后的新总价
  * @param origin_total - 原始总价
  */
-export var setProductPrice = function setProductPrice(cacheItem, _ref2) {
-  var _cacheItem$discount_l, _cacheItem$_extend$ot, _cacheItem$_extend$ot2, _cacheItem$_extend$ot4, _cacheItem$_extend$ot5;
-  var newTotal = _ref2.newTotal,
-    origin_total = _ref2.origin_total;
-  if (cacheItem !== null && cacheItem !== void 0 && (_cacheItem$discount_l = cacheItem.discount_list) !== null && _cacheItem$discount_l !== void 0 && _cacheItem$discount_l.length && ((cacheItem === null || cacheItem === void 0 ? void 0 : cacheItem.discount_list) || []).some(function (item) {
+export var setProductPrice = function setProductPrice(cacheItem, _ref4) {
+  var _cacheItem$_extend$ot, _cacheItem$_extend$ot2, _cacheItem$_extend$ot4, _cacheItem$_extend$ot5;
+  var newTotal = _ref4.newTotal,
+    origin_total = _ref4.origin_total;
+  if (hasEntitlementDiscount(cacheItem) || ((cacheItem === null || cacheItem === void 0 ? void 0 : cacheItem.discount_list) || []).some(function (item) {
     return ['good_pass', 'discount_card', 'product_discount_card'].includes(item.type);
   })) {
     return cacheItem;
@@ -97,12 +206,12 @@ export var setProductPrice = function setProductPrice(cacheItem, _ref2) {
   if ((_cacheItem$_extend$ot = cacheItem._extend.other) !== null && _cacheItem$_extend$ot !== void 0 && _cacheItem$_extend$ot.bundle && isArr((_cacheItem$_extend$ot2 = cacheItem._extend.other) === null || _cacheItem$_extend$ot2 === void 0 ? void 0 : _cacheItem$_extend$ot2.bundle)) {
     var _cacheItem$_extend$ot3;
     (_cacheItem$_extend$ot3 = cacheItem._extend.other) === null || _cacheItem$_extend$ot3 === void 0 || (_cacheItem$_extend$ot3 = _cacheItem$_extend$ot3.bundle) === null || _cacheItem$_extend$ot3 === void 0 || _cacheItem$_extend$ot3.forEach(function (bundle) {
-      var _ref3, _bundle$num;
+      var _ref5, _bundle$num;
       // 计算新价格，直接截取两位小数（不四舍五入）
       var newPrice = new Decimal(bundle.original_price || bundle.price).mul(discountRatio).toDecimalPlaces(2, Decimal.ROUND_DOWN).toNumber();
 
       // 获取数量，优先取 num，再取 quantity，默认为 1
-      var quantity = (_ref3 = (_bundle$num = bundle.num) !== null && _bundle$num !== void 0 ? _bundle$num : bundle.quantity) !== null && _ref3 !== void 0 ? _ref3 : 1;
+      var quantity = (_ref5 = (_bundle$num = bundle.num) !== null && _bundle$num !== void 0 ? _bundle$num : bundle.quantity) !== null && _ref5 !== void 0 ? _ref5 : 1;
 
       // 累加到子商品总价
       subTotal = subTotal.add(new Decimal(newPrice).mul(quantity));
@@ -116,12 +225,12 @@ export var setProductPrice = function setProductPrice(cacheItem, _ref2) {
   if ((_cacheItem$_extend$ot4 = cacheItem._extend.other) !== null && _cacheItem$_extend$ot4 !== void 0 && _cacheItem$_extend$ot4.option && isArr((_cacheItem$_extend$ot5 = cacheItem._extend.other) === null || _cacheItem$_extend$ot5 === void 0 ? void 0 : _cacheItem$_extend$ot5.option)) {
     var _cacheItem$_extend$ot6;
     (_cacheItem$_extend$ot6 = cacheItem._extend.other) === null || _cacheItem$_extend$ot6 === void 0 || (_cacheItem$_extend$ot6 = _cacheItem$_extend$ot6.option) === null || _cacheItem$_extend$ot6 === void 0 || _cacheItem$_extend$ot6.forEach(function (option) {
-      var _ref4, _option$num;
+      var _ref6, _option$num;
       // 计算新价格，直接截取两位小数（不四舍五入）
       var newPrice = new Decimal(option.price).mul(discountRatio).toDecimalPlaces(2, Decimal.ROUND_DOWN).toNumber();
 
       // 获取数量，优先取 num，再取 quantity，默认为 1
-      var quantity = (_ref4 = (_option$num = option.num) !== null && _option$num !== void 0 ? _option$num : option.quantity) !== null && _ref4 !== void 0 ? _ref4 : 1;
+      var quantity = (_ref6 = (_option$num = option.num) !== null && _option$num !== void 0 ? _option$num : option.quantity) !== null && _ref6 !== void 0 ? _ref6 : 1;
 
       // 累加到子商品总价
       subTotal = subTotal.add(new Decimal(newPrice).mul(quantity));

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 export interface FormState {
     amountSymbol: string;
     apis: {
@@ -109,4 +110,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/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/payments/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/utils.d.ts

@@ -175,10 +175,10 @@ export declare const getProductOriginTotalPrice: (item: any) => number;
 export declare const getDuration: (duration: number | {
     type: string;
     value: number;
-}) => number | {
+}) => number | "flexible" | {
     type: string;
     value: number;
-} | "flexible";
+};
 export declare const isWalkIn: (customer_id?: number | string) => boolean;
 export declare const getIsEdit: (state: any) => boolean;
 export {};

package/es/components/checkout/hooks/useWalletPass.d.ts

@@ -17,7 +17,7 @@ export declare const useWalletPass: (props: {
     cardData: any;
     handleSelectWallet: (value: number[]) => void;
     selectedWalletIds: any[];
-    expiredWalletIds: any[];
+    expiredWalletIds: any;
     expiredWalletData: any;
     disabledWalletData: any[];
     clearAllSelectedWallet: () => void;

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

@@ -15,11 +15,11 @@ export declare const useStoreRef: <T extends {
     readonly numRef: React.MutableRefObject<string | number | undefined>;
     readonly orderIdRef: React.MutableRefObject<string | number>;
     readonly modeRef: React.MutableRefObject<ModeEnum>;
-    readonly statusRef: React.MutableRefObject<"loading" | "success" | "warn" | "fail" | "init" | "pedding" | "resove" | "reject" | "question">;
+    readonly statusRef: React.MutableRefObject<"loading" | "success" | "warn" | "init" | "fail" | "pedding" | "resove" | "reject" | "question">;
     readonly netRef: React.MutableRefObject<boolean | undefined>;
     readonly symbolRef: React.MutableRefObject<string>;
     readonly amountRef: React.MutableRefObject<string | number>;
-    readonly eftposRef: React.MutableRefObject<"tyro" | "mx51" | "payo" | "windcave" | "stripe" | "linkly" | "huifu" | "adyenpos" | "adyenalipay" | "adyenwechat">;
+    readonly eftposRef: React.MutableRefObject<"stripe" | "tyro" | "mx51" | "payo" | "windcave" | "linkly" | "huifu" | "adyenpos" | "adyenalipay" | "adyenwechat">;
     readonly clientRef: React.MutableRefObject<ClientEnum>;
     readonly dataRef: React.MutableRefObject<import("./store").State>;
 };

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

@@ -299,20 +299,20 @@ export declare const backUpFree: (payload: Partial<State>) => {
         name?: string | undefined;
         symbol?: string | undefined;
         amount?: string | number | undefined;
-        mode?: "refund" | "fullPay" | "pay" | "query" | undefined;
+        mode?: "pay" | "refund" | "fullPay" | "query" | undefined;
         order_id?: string | number | undefined;
-        eftpos?: "tyro" | "mx51" | "payo" | "windcave" | "stripe" | "linkly" | "huifu" | "adyenpos" | "adyenalipay" | "adyenwechat" | undefined;
-        action?: "amount" | "pay" | "deviceList" | undefined;
+        eftpos?: "stripe" | "tyro" | "mx51" | "payo" | "windcave" | "linkly" | "huifu" | "adyenpos" | "adyenalipay" | "adyenwechat" | undefined;
+        action?: "pay" | "amount" | "deviceList" | undefined;
         key?: number | undefined;
         step?: number | undefined;
         title?: string | undefined;
         subTitle?: string | undefined;
-        type?: "step" | "unset" | undefined;
+        type?: "unset" | "step" | undefined;
         render?: boolean | undefined;
         net?: boolean | undefined;
         component?: string | undefined;
         form?: string | undefined;
-        status?: "loading" | "success" | "warn" | "fail" | "init" | "pedding" | "resove" | "reject" | "question" | undefined;
+        status?: "loading" | "success" | "warn" | "init" | "fail" | "pedding" | "resove" | "reject" | "question" | undefined;
         warn?: string | undefined;
         steps?: {
             /** 用于重置当前步骤 */