@pisell/private-materials 6.6.94 → 6.6.96

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

@@ -92,9 +92,6 @@ var Info = (_, ref) => {
   const resourcesRef = (0, import_react.useRef)(null);
   const isChangeTotal = (0, import_react.useRef)(false);
   const shouldReallocateBundlePriceRef = (0, import_react.useRef)(false);
-  const isEntitlementPrice = (0, import_utils8.hasEntitlementDiscount)(
-    state.service.cacheItem
-  );
   const [noteModalOpen, setNoteModalOpen] = (0, import_react.useState)(false);
   const [open, setOpen] = (0, import_react.useState)(false);
   const [currentTab, setCurrentTab] = (0, import_react.useState)("batch_edit");
@@ -250,7 +247,7 @@ var Info = (_, ref) => {
     }
   };
   const onFinish = (values, cacheItem) => {
-    var _a2, _b2, _c2, _d2, _e2, _f2, _g2, _h2, _i2, _j2, _k2, _l2, _m2, _n2, _o2, _p2, _q2, _r2;
+    var _a2, _b2, _c2, _d2, _e2, _f2, _g2, _h2, _i2, _j2, _k2, _l2, _m2, _n2, _o2, _p2, _q2;
     let isSuccess = (_a2 = resourcesRef.current) == null ? void 0 : _a2.check();
     if (isShowTimeAndResource && !isSuccess) {
       return;
@@ -284,8 +281,7 @@ var Info = (_, ref) => {
       _extend.startDate = startDate;
       _extend.endDate = endDate;
     }
-    const isManualPriceChange = isChangeTotal.current && !(0, import_utils8.hasEntitlementDiscount)(_item);
-    const shouldReallocatePrice = isManualPriceChange || shouldReallocateBundlePriceRef.current;
+    const shouldReallocatePrice = isChangeTotal.current || shouldReallocateBundlePriceRef.current;
     if (shouldReallocatePrice) {
       const discountRatio = new import_decimal.default(values.total).div(_item._extend.origin_total);
       const bundles2 = ((_c2 = _extend == null ? void 0 : _extend.other) == null ? void 0 : _c2.bundle) || [];
@@ -310,9 +306,7 @@ var Info = (_, ref) => {
     _item._time = (/* @__PURE__ */ new Date()).getTime();
     _item._serviceKey = (0, import_utils3.genServiceKey)(_item);
     _item._holderKey = (0, import_utils3.genHolderKey)(_item);
-    const previousItem = _list.find((item) => item._id === _item._id) ?? _list.find((item) => isSameBookingServiceItem(item, _item));
-    const isEntitlementQuantityChange = (0, import_utils8.hasEntitlementDiscount)(previousItem) && Number(_item._extend.quantity || 1) !== Number(((_e2 = previousItem == null ? void 0 : previousItem._extend) == null ? void 0 : _e2.quantity) || 1);
-    if (!isEntitlementQuantityChange && (((_g2 = (_f2 = _item._extend) == null ? void 0 : _f2.holder_id) == null ? void 0 : _g2.length) > 1 || ((_h2 = _item._extend) == null ? void 0 : _h2.quantity) > 1 && ((_j2 = (_i2 = _item._extend) == null ? void 0 : _i2.holder_id) == null ? void 0 : _j2.length) >= 1)) {
+    if (((_f2 = (_e2 = _item._extend) == null ? void 0 : _e2.holder_id) == null ? void 0 : _f2.length) > 1 || ((_g2 = _item._extend) == null ? void 0 : _g2.quantity) > 1 && ((_i2 = (_h2 = _item._extend) == null ? void 0 : _h2.holder_id) == null ? void 0 : _i2.length) >= 1) {
       let holder_ids = _item._extend.holder_id;
       _item._extend.holder_id = holder_ids[0];
       holder_ids = holder_ids.slice(1);
@@ -331,8 +325,8 @@ var Info = (_, ref) => {
       }
     }
     let _id = _item == null ? void 0 : _item._id;
-    let groupId = (_k2 = _item == null ? void 0 : _item._extend) == null ? void 0 : _k2.groupId;
-    const origin_total = (_o2 = (_n2 = (_m2 = (_l2 = _item._extend) == null ? void 0 : _l2.items) == null ? void 0 : _m2[0]) == null ? void 0 : _n2._extend) == null ? void 0 : _o2.origin_total;
+    let groupId = (_j2 = _item == null ? void 0 : _item._extend) == null ? void 0 : _j2.groupId;
+    const origin_total = (_n2 = (_m2 = (_l2 = (_k2 = _item._extend) == null ? void 0 : _k2.items) == null ? void 0 : _l2[0]) == null ? void 0 : _m2._extend) == null ? void 0 : _n2.origin_total;
     if (groupId) {
       if (shouldReallocatePrice) {
         _item = deleteDiscountList(_item, true);
@@ -345,7 +339,7 @@ var Info = (_, ref) => {
     } else {
       _item = (0, import_utils8.setProductPrice)(_item, {
         newTotal: values.total,
-        origin_total: origin_total ?? ((_p2 = _item._extend) == null ? void 0 : _p2.origin_total)
+        origin_total: origin_total ?? ((_o2 = _item._extend) == null ? void 0 : _o2.origin_total)
       });
       const matchById = _list.some((d) => d._id === _id);
       const matchByBooking = !matchById && _list.some((d) => isSameBookingServiceItem(d, _item));
@@ -354,32 +348,13 @@ var Info = (_, ref) => {
           _item = deleteDiscountList(_item, true);
         }
         if (matchById) {
-          _list = _list.flatMap((d) => {
-            if (d._id !== _id) return [d];
-            return (0, import_utils8.updateEntitlementQuantity)(
-              d,
-              { ..._item, new: 0 }
-            ).map((item) => ({
-              ...item,
-              _serviceKey: (0, import_utils3.genServiceKey)(item),
-              _holderKey: (0, import_utils3.genHolderKey)(item)
-            }));
-          });
+          _list = _list.map((d) => d._id === _id ? { ..._item, new: 0 } : d);
         } else {
           let replaced = false;
           _list = _list.reduce((acc, d) => {
             if (isSameBookingServiceItem(d, _item)) {
               if (!replaced) {
-                acc.push(
-                  ...(0, import_utils8.updateEntitlementQuantity)(
-                    d,
-                    { ..._item, new: 0, _id: d._id }
-                  ).map((item) => ({
-                    ...item,
-                    _serviceKey: (0, import_utils3.genServiceKey)(item),
-                    _holderKey: (0, import_utils3.genHolderKey)(item)
-                  }))
-                );
+                acc.push({ ..._item, new: 0, _id: d._id });
                 replaced = true;
               }
             } else {
@@ -396,7 +371,7 @@ var Info = (_, ref) => {
     (0, import_utils6.deleteCacheParams)();
     console.log("_onFinish", _list);
     form.resetFields();
-    if (!!((_q2 = state.service.cacheItem) == null ? void 0 : _q2.new)) {
+    if (!!((_p2 = state.service.cacheItem) == null ? void 0 : _p2.new)) {
       window.dispatchEvent(
         new CustomEvent("onAddNewService", {
           detail: {
@@ -405,7 +380,7 @@ var Info = (_, ref) => {
         })
       );
     }
-    (_r2 = window.closeBookingEditModal) == null ? void 0 : _r2.call(window);
+    (_q2 = window.closeBookingEditModal) == null ? void 0 : _q2.call(window);
     _list.sort((a, b) => {
       var _a3, _b3;
       const aHasHolderId = ((_a3 = a._extend) == null ? void 0 : _a3.holder_id) && (Array.isArray(a._extend.holder_id) ? a._extend.holder_id.length > 0 : true);
@@ -775,7 +750,7 @@ var Info = (_, ref) => {
           precision: 2,
           prefix: state.amountSymbol,
           onChange: handleTotalChange,
-          disabled: state.channelDisabledEdit || isEntitlementPrice,
+          disabled: state.channelDisabledEdit,
           originalValue: ((_f2 = (_e2 = state.service.cacheItem) == null ? void 0 : _e2._extend) == null ? void 0 : _f2.origin_total) || 0,
           placeholder: ((_h2 = (_g2 = state.service.cacheItem) == null ? void 0 : _g2._extend) == null ? void 0 : _h2.origin_total) || "0",
           size: "large",
@@ -792,8 +767,7 @@ var Info = (_, ref) => {
     useTotal,
     (_u = (_t = state.service.cacheItem) == null ? void 0 : _t._extend) == null ? void 0 : _u.origin_total,
     state.amountSymbol,
-    state.channelDisabledEdit,
-    isEntitlementPrice
+    state.channelDisabledEdit
   ]);
   const reason = (0, import_react.useMemo)(() => {
     return isReason ? /* @__PURE__ */ import_react.default.createElement(import_antd.Col, { span: 24 }, /* @__PURE__ */ import_react.default.createElement(

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

@@ -0,0 +1,41 @@
+/**
+1. 在进入编辑服务前
+
+计算出各种需要的列表
+
+设置默认值
+
+判断是否需要进入编辑服务页
+ */
+export declare const getAutoAllocationStorage: (id: string | number) => any;
+export declare const setAutoAllocationStorage: (data: {
+    [key: string]: boolean;
+}) => void;
+/**
+ * 手动折扣后给商品价格和子商品价格重新计算
+ *
+ * 计算逻辑：
+ * 1. 子商品（bundle + option）按折扣比例计算，直接截取两位小数（不四舍五入）
+ * 2. 主商品价格 = newTotal - 所有子商品价格总和（确保总价精确等于 newTotal）
+ *
+ * @param cacheItem - 缓存的商品项
+ * @param newTotal - 折扣后的新总价
+ * @param origin_total - 原始总价
+ */
+export declare const setProductPrice: (cacheItem: any, { newTotal, origin_total }: {
+    newTotal: number;
+    origin_total: number;
+}) => any;
+/**
+ * 获取商品所有折扣列表 包含子商品
+ * @param cacheItem - 缓存的商品项
+ * @returns 折扣列表
+ */
+export declare const getProductAllDiscountList: (cacheItem: any) => any[];
+/**
+ * 合并 bundle 数据，基于 id 和 product_id 匹配，price 优先使用 originalOther 中的值
+ * @param other - callback 返回的新数据
+ * @param originalOther - 编辑前的原始数据 (item._extend.other)
+ * @returns 合并后的 other
+ */
+export declare const mergeBundleWithOriginalPrice: (other: any, originalOther: any) => any;

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

@@ -31,100 +31,20 @@ var utils_exports = {};
 __export(utils_exports, {
   getAutoAllocationStorage: () => getAutoAllocationStorage,
   getProductAllDiscountList: () => getProductAllDiscountList,
-  hasEntitlementDiscount: () => hasEntitlementDiscount,
   mergeBundleWithOriginalPrice: () => mergeBundleWithOriginalPrice,
   setAutoAllocationStorage: () => setAutoAllocationStorage,
-  setProductPrice: () => setProductPrice,
-  updateEntitlementQuantity: () => updateEntitlementQuantity
+  setProductPrice: () => setProductPrice
 });
 module.exports = __toCommonJS(utils_exports);
 var import_utils = require("@pisell/utils");
+var import_utils2 = require("@pisell/utils");
 var import_decimal = __toESM(require("decimal.js"));
-var import_lodash = require("lodash");
-var import_utils2 = require("../../../components/footer/utils");
-var import_utils3 = require("../../../utils");
-var isEntitlementDiscount = (discount) => ((discount == null ? void 0 : discount.tag) || (discount == null ? void 0 : discount.type)) === "entitlement_pass";
-var getServiceDiscounts = (item) => {
-  var _a, _b;
-  return [
-    ...(item == null ? void 0 : item.discount_list) || [],
-    ...(((_b = (_a = item == null ? void 0 : item._extend) == null ? void 0 : _a.other) == null ? void 0 : _b.bundle) || []).flatMap((bundle) => bundle.discount_list || [])
-  ];
-};
-var hasEntitlementDiscount = (item) => getServiceDiscounts(item).some(isEntitlementDiscount);
-var updateEntitlementQuantity = (previous, next) => {
-  var _a, _b, _c, _d;
-  const discounts = getServiceDiscounts(previous);
-  const persisted = [previous == null ? void 0 : previous.booking_id, previous == null ? void 0 : previous.order_detail_id, (_a = previous == null ? void 0 : previous._extend) == null ? void 0 : _a.order_detail_id].some((value) => Number(value) > 0) || discounts.some((discount) => isEntitlementDiscount(discount) && discount.id);
-  const previousQuantity = Number(((_b = previous == null ? void 0 : previous._extend) == null ? void 0 : _b.quantity) || 1);
-  const nextQuantity = Number(next._extend.quantity || 1);
-  if (!persisted || !hasEntitlementDiscount(previous) || nextQuantity === previousQuantity) {
-    return [next];
-  }
-  if (nextQuantity < previousQuantity) {
-    return [{
-      ...previous,
-      _extend: {
-        ...previous._extend,
-        quantity: nextQuantity,
-        ...Array.isArray(next._extend.holder_id) ? { holder_id: next._extend.holder_id.slice(0, nextQuantity) } : {},
-        other: { ...previous._extend.other, quantity: nextQuantity }
-      },
-      discount_list: (previous.discount_list || []).map((discount) => {
-        var _a2, _b2;
-        if (!isEntitlementDiscount(discount) || ((_a2 = discount.metadata) == null ? void 0 : _a2.custom_product_bundle_map_id)) return discount;
-        const num = Math.min(Number(((_b2 = discount.metadata) == null ? void 0 : _b2.num) ?? previousQuantity), nextQuantity);
-        return { ...discount, _num: num, metadata: { ...discount.metadata, num } };
-      })
-    }];
-  }
-  const appended = (0, import_lodash.cloneDeep)(next);
-  const uid = (0, import_utils.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 = { ...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;
-  const extend = appended._extend;
-  extend.order_detail_id = 0;
-  extend.unique_identification_number = uid;
-  extend.quantity = nextQuantity - previousQuantity;
-  if (Array.isArray(extend.holder_id)) {
-    const holders = extend.holder_id.slice(previousQuantity, nextQuantity);
-    extend.holder_id = holders.length ? holders : void 0;
-  }
-  extend.other = { ...extend.other, quantity: extend.quantity };
-  extend.other.bundle = (extend.other.bundle || []).map((bundle) => {
-    var _a2, _b2, _c2;
-    const price = bundle.original_price ?? ((_c2 = (_b2 = (_a2 = bundle.discount_list) == null ? void 0 : _a2[0]) == null ? void 0 : _b2.discount) == null ? void 0 : _c2.original_amount) ?? bundle.product_price ?? bundle.price;
-    const bundleUid = (0, import_utils.getUniqueId)();
-    const metadata = { ...bundle.metadata, custom_product_bundle_map_id: bundleUid, unique_identification_number: bundleUid };
-    delete metadata.entitlement_source_identity;
-    return { ...bundle, _id: bundleUid, price, bundle_selling_price: price, discount_list: [], metadata };
-  });
-  const mainDiscount = (next.discount_list || []).find((discount) => {
-    var _a2, _b2;
-    return !((_a2 = discount.metadata) == null ? void 0 : _a2.custom_product_bundle_map_id) && ((_b2 = discount.discount) == null ? void 0 : _b2.original_amount) != null;
-  });
-  if (mainDiscount && ((_d = (_c = previous == null ? void 0 : previous._extend) == null ? void 0 : _c.other) == null ? void 0 : _d.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 = (0, import_utils3.getMainPrice)(appended);
-  extend.total = (0, import_utils3.getProductTotalPrice)(appended);
-  extend.origin_total = extend.total;
-  return [previous, appended];
-};
+var import_utils3 = require("../../../components/footer/utils");
 var getAutoAllocationStorage = (id) => {
   const value = localStorage.getItem("resource-auto-allocation");
   if (value) {
     const valueObj = JSON.parse(value);
-    return (0, import_utils.isBoolean)(valueObj[id]) ? valueObj[id] : true;
+    return (0, import_utils2.isBoolean)(valueObj[id]) ? valueObj[id] : true;
   }
   return true;
 };
@@ -138,8 +58,8 @@ var setAutoAllocationStorage = (data) => {
   }
 };
 var setProductPrice = (cacheItem, { newTotal, origin_total }) => {
-  var _a, _b, _c, _d, _e, _f, _g, _h;
-  if (hasEntitlementDiscount(cacheItem) || ((cacheItem == null ? void 0 : cacheItem.discount_list) || []).some((item) => ["good_pass", "discount_card", "product_discount_card"].includes(
+  var _a, _b, _c, _d, _e, _f, _g, _h, _i;
+  if (((_a = cacheItem == null ? void 0 : cacheItem.discount_list) == null ? void 0 : _a.length) && ((cacheItem == null ? void 0 : cacheItem.discount_list) || []).some((item) => ["good_pass", "discount_card", "product_discount_card"].includes(
     item.type
   ))) {
     return cacheItem;
@@ -149,16 +69,16 @@ var setProductPrice = (cacheItem, { newTotal, origin_total }) => {
   }
   const discountRatio = new import_decimal.default(newTotal).div(new import_decimal.default(origin_total));
   let subTotal = new import_decimal.default(0);
-  if (((_a = cacheItem._extend.other) == null ? void 0 : _a.bundle) && (0, import_utils.isArr)((_b = cacheItem._extend.other) == null ? void 0 : _b.bundle)) {
-    (_d = (_c = cacheItem._extend.other) == null ? void 0 : _c.bundle) == null ? void 0 : _d.forEach((bundle) => {
+  if (((_b = cacheItem._extend.other) == null ? void 0 : _b.bundle) && (0, import_utils.isArr)((_c = cacheItem._extend.other) == null ? void 0 : _c.bundle)) {
+    (_e = (_d = cacheItem._extend.other) == null ? void 0 : _d.bundle) == null ? void 0 : _e.forEach((bundle) => {
       const newPrice = new import_decimal.default(bundle.original_price || bundle.price).mul(discountRatio).toDecimalPlaces(2, import_decimal.default.ROUND_DOWN).toNumber();
       const quantity = bundle.num ?? bundle.quantity ?? 1;
       subTotal = subTotal.add(new import_decimal.default(newPrice).mul(quantity));
       bundle.price = newPrice;
     });
   }
-  if (((_e = cacheItem._extend.other) == null ? void 0 : _e.option) && (0, import_utils.isArr)((_f = cacheItem._extend.other) == null ? void 0 : _f.option)) {
-    (_h = (_g = cacheItem._extend.other) == null ? void 0 : _g.option) == null ? void 0 : _h.forEach((option) => {
+  if (((_f = cacheItem._extend.other) == null ? void 0 : _f.option) && (0, import_utils.isArr)((_g = cacheItem._extend.other) == null ? void 0 : _g.option)) {
+    (_i = (_h = cacheItem._extend.other) == null ? void 0 : _h.option) == null ? void 0 : _i.forEach((option) => {
       const newPrice = new import_decimal.default(option.price).mul(discountRatio).toDecimalPlaces(2, import_decimal.default.ROUND_DOWN).toNumber();
       const quantity = option.num ?? option.quantity ?? 1;
       subTotal = subTotal.add(new import_decimal.default(newPrice).mul(quantity));
@@ -171,7 +91,7 @@ var setProductPrice = (cacheItem, { newTotal, origin_total }) => {
 var getProductAllDiscountList = (cacheItem) => {
   var _a, _b;
   const discountList = [...cacheItem.discount_list || []];
-  const bundleDiscountList = (0, import_utils2.getBundleDiscountList)(((_b = (_a = cacheItem._extend) == null ? void 0 : _a.other) == null ? void 0 : _b.bundle) || []) || [];
+  const bundleDiscountList = (0, import_utils3.getBundleDiscountList)(((_b = (_a = cacheItem._extend) == null ? void 0 : _a.other) == null ? void 0 : _b.bundle) || []) || [];
   discountList.push(...bundleDiscountList);
   return discountList;
 };
@@ -193,9 +113,7 @@ var mergeBundleWithOriginalPrice = (other, originalOther) => {
 0 && (module.exports = {
   getAutoAllocationStorage,
   getProductAllDiscountList,
-  hasEntitlementDiscount,
   mergeBundleWithOriginalPrice,
   setAutoAllocationStorage,
-  setProductPrice,
-  updateEntitlementQuantity
+  setProductPrice
 });

package/lib/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/lib/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/lib/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/lib/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/lib/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/lib/components/eftposPay/amount.d.ts

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

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

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

package/lib/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/lib/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?: {
             /** 用于重置当前步骤 */

package/lib/components/pay/toC/model.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 export interface FormState {
     platform: 'pc' | 'h5' | '' | undefined;
     order: any;
@@ -29,4 +30,11 @@ export interface PayGroup {
     _order: any;
     front_order_uuid?: 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/lib/components/schedules/model.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { CalendarDataItem, ScheduleItem } from "./type";
 import dayjs from "dayjs";
 export interface FormState {
@@ -68,4 +69,11 @@ export interface FormState {
     };
     setGlobalState: Function | null;
 }
-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/lib/components/ticketBooking/utils/index.d.ts

@@ -0,0 +1,103 @@
+import type { Dayjs } from 'dayjs';
+/** dayjs对象格式化为字符串时间 */
+export declare const formatDateToStr: (date: Dayjs[]) => string | string[];
+export declare const getDefaultStartParam: () => string | string[];
+export declare const formatBookingList: (bookingList: any[]) => any[];
+export declare const getNextTimeSlice: (sliceMinutes: number) => Dayjs;
+export declare const getDisabledEdit: ({ shop_discount, bookings, payment_status }: any) => boolean;
+export declare const formatOptions: (detail: any) => any;
+export declare const formatHolder: (detail: any) => any;
+export declare const restoreProductOtherData: (data: any) => {
+    product_id: any;
+    option: any;
+    bundle: any;
+    product_variant_id: any;
+    quantity: number;
+} | undefined;
+export declare const isSameProduct: (a: any, b: any) => boolean;
+export declare const addService: (list: any[], addItem: any, state: any, isMultiDay?: boolean) => {
+    list: any[];
+    count: number;
+    quantity?: undefined;
+} | {
+    list: any[];
+    quantity: any;
+    count?: undefined;
+};
+export declare const addServiceScroll: (rowKey: string, cacheItem: any) => void;
+export declare const getCartProductOverlay: (state: any) => any;
+export declare const getIsOverlayProduct: (item: any, state: any) => any;
+export declare const getIsShowNumber: (item: any, state: any) => any;
+export declare const genServiceKey: (item: any) => string;
+export declare const genHolderKey: (item: any) => string;
+export declare const getIsParallelResourcesBooking: (record: any) => boolean;
+declare type ScanData = {
+    type: string;
+    status: 'success' | 'failed';
+    scanType: 'nfc' | 'scanner';
+    scanCode: string;
+    result: {
+        searchType: 'customer' | 'wallet' | 'walletPass' | 'product' | 'local_product';
+        response: {
+            status: boolean;
+            code: number;
+            message: string;
+            data: any;
+        };
+    };
+};
+export declare const formatScanCustomer: (data: ScanData) => {
+    searchType: "customer" | "product" | "wallet" | "walletPass" | "local_product";
+    data: any;
+    scanCode: string;
+} | null;
+export declare const formatScanGlobal: (data: ScanData) => {
+    searchType: "wallet";
+    data: any;
+    scanCode: string;
+} | {
+    searchType: "walletPass";
+    data: any;
+    scanCode: string;
+} | {
+    searchType: "product" | "local_product";
+    data: any;
+    scanCode: string;
+} | null | undefined;
+export declare const createSimpleCacheItem: (item: any, e: any, state: any) => any;
+export declare const getBookingTicketKey: (osKey: string) => string;
+export declare const getShopDiscountKey: (osKey: string) => string;
+export declare const rulesHooks: {
+    getProduct(product: Record<string, any>): {
+        booking_id: any;
+        id: any;
+        _id: any;
+        price: any;
+        total: any;
+        discount_list: any;
+        origin_total: any;
+        num: any;
+        quantity: any;
+        vouchersApplicable: any;
+        holder_id: any;
+        isNormalProduct: any;
+        startDate: any;
+        bundle: any;
+        options: any;
+        main_product_selling_price: any;
+    };
+    setProduct(product: Record<string, any>, values: {
+        total: number;
+        discount_list: any[];
+        price: number;
+        quantity: number;
+        _id?: string;
+    }): {
+        _id: any;
+        discount_list: any[];
+        _extend: any;
+    };
+};
+export declare const clearCacheProductDetail: () => void;
+export { getCache, setCache, clearCache, clearAllCache, clearAllCacheByOsKey, getProductCache, setProductCache, clearProductCache, clearAllProductCache, getBoardConfigCache, setBoardConfigCache, clearBoardConfigCache, } from './productCache';
+export type { CacheType } from './productCache';

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

@@ -190,13 +190,13 @@ var addService = (list, addItem, state, isMultiDay) => {
     let isSetCount = false;
     value = list.map((item) => {
       var _a, _b, _c, _d, _e;
-      const isGoodPassDiscountProduct = (item.discount_list || []).some((item2) => ["good_pass", "entitlement_pass"].includes(item2.tag || item2.type));
+      const isGoodPassDiscountProduct = (item.discount_list || []).some((item2) => item2.type === "good_pass");
       const isEdit = item == null ? void 0 : item.edit;
       const bundleDiscountList = [];
       (((_b = (_a = item == null ? void 0 : item._extend) == null ? void 0 : _a.other) == null ? void 0 : _b.bundle) || []).forEach((item2) => {
         bundleDiscountList.push(...(item2 == null ? void 0 : item2.discount_list) || []);
       });
-      const isGoodPassBundleProduct = bundleDiscountList.some((item2) => ["good_pass", "entitlement_pass"].includes(item2.tag || item2.type));
+      const isGoodPassBundleProduct = bundleDiscountList.some((item2) => item2.type === "good_pass");
       if (isSameProduct(item, addItem) && !isSetCount && !isGoodPassDiscountProduct && !isEdit && !isGoodPassBundleProduct) {
         isNotSame = false;
         const quantity = (((_c = item == null ? void 0 : item._extend) == null ? void 0 : _c.quantity) || 1) + (((_d = addItem == null ? void 0 : addItem._extend) == null ? void 0 : _d.quantity) || 1);

package/lib/plus/clinetSearch/Add/index.d.ts

@@ -0,0 +1,18 @@
+import React from 'react';
+import './index.less';
+interface AddClientProps {
+    onChange: (value: any, isChecked: boolean) => void;
+    phone?: string;
+    containerProps: {
+        className?: string;
+        title?: string;
+        open?: boolean;
+        onCancel?: () => void;
+        width?: string | number;
+    };
+}
+export interface AddClientRef {
+    reset: () => void;
+}
+declare const AddClient: React.ForwardRefExoticComponent<AddClientProps & React.RefAttributes<unknown>>;
+export default AddClient;

package/lib/plus/clinetSearch/Add/index.js

@@ -73,6 +73,7 @@ var AddClient = (0, import_react.forwardRef)((props, ref) => {
       return;
     }
     _addClient.run({
+      ...values.is_checked ? { sync_voucher_issuance: true } : {},
       customer: {
         accepts_marketing: 0,
         register_channel: "pos",