@pisell/private-materials 3.3.86 → 3.3.87

package/lib/components/Sales/Checkout/index.js

@@ -41,6 +41,7 @@ var import_useEngineContext = __toESM(require("../../../hooks/useEngineContext")
 var import_ahooks = require("ahooks");
 var import_serve = require("./serve");
 var import_Cart = require("../Cart");
+var import_utils = require("../../appointmentBooking/utils");
 var defaultState = {};
 var CheckoutContext = (0, import_react.createContext)(
   void 0
@@ -54,6 +55,7 @@ var CheckoutProvider = ({
   const { updateDisabledCartItem } = (0, import_Cart.useCart)();
   const checkoutCallback = (0, import_react.useRef)(null);
   const checkRef = (0, import_react.useRef)(null);
+  const payRef = (0, import_react.useRef)(null);
   const checkBeforeBooking = (0, import_ahooks.useRequest)(import_serve.checkBeforeBookingApi, {
     manual: true,
     onSuccess: (res) => {
@@ -76,6 +78,17 @@ var CheckoutProvider = ({
       checkoutCallback.current({ success: false, err });
     }
   });
+  const freePay = (0, import_ahooks.useRequest)(import_serve.freePayApi, {
+    manual: true,
+    onSuccess: (res) => {
+      var _a, _b;
+      if (res == null ? void 0 : res.status) {
+        goPaymentFinish((_a = payRef.current) == null ? void 0 : _a.order_id, (_b = payRef.current) == null ? void 0 : _b.total_amount);
+      } else {
+        (0, import_utils.Toast)(res == null ? void 0 : res.message);
+      }
+    }
+  });
   const onCheckBeforeBooking = (data2) => {
     return new Promise((resolve) => {
       checkRef.current = (res) => {
@@ -94,21 +107,40 @@ var CheckoutProvider = ({
       createBooking.runAsync(data2);
     });
   };
+  const goPaymentFinish = (order_id, amount) => {
+    var _a;
+    const url = `/payment-finish/success?order_id=${order_id}&amount=${Number(
+      amount
+    )}`;
+    (_a = utils == null ? void 0 : utils.history) == null ? void 0 : _a.replace(url);
+  };
   const onPay = (payProps) => {
-    utils.action({
-      type: "pisell1.payment",
-      data: payProps,
-      callback: (e) => {
-        checkoutCallback.current && checkoutCallback.current(e);
+    payRef.current = payProps;
+    const { is_deposit, deposit_amount, total_amount } = payProps;
+    const _total = is_deposit ? deposit_amount || 0 : total_amount || 0;
+    if (_total > 0) {
+      utils.action({
+        type: "pisell1.payment",
+        data: { ...payProps, total_amount: _total },
+        callback: (e) => {
+          checkoutCallback.current && checkoutCallback.current(e);
+        }
+      });
+    } else {
+      if (is_deposit) {
+        goPaymentFinish(payProps.order_id, _total);
+        return;
       }
-    });
+      freePay.runAsync(payProps.order_id);
+    }
   };
   const contextValue = {
     onCheckBeforeBooking,
     onCheckout,
     onPay,
     createBooking,
-    checkBeforeBooking
+    checkBeforeBooking,
+    freePay
   };
   return /* @__PURE__ */ import_react.default.createElement(CheckoutContext.Provider, { value: contextValue }, children);
 };

package/lib/components/Sales/Checkout/serve.d.ts

@@ -1,2 +1,15 @@
+/**
+ * @title: 下单前置校验接口
+ * @param {any} data
+ */
 export declare const checkBeforeBookingApi: (data: any) => Promise<any>;
+/**
+ * @title: 创建订单
+ * @param {any} data
+ */
 export declare const createBookingApi: (data: any) => Promise<any>;
+/**
+ * @title: 免费支付
+ * @param {string} orderId
+ */
+export declare const freePayApi: (orderId: string) => Promise<any>;

package/lib/components/Sales/Checkout/serve.js

@@ -20,7 +20,8 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var serve_exports = {};
 __export(serve_exports, {
   checkBeforeBookingApi: () => checkBeforeBookingApi,
-  createBookingApi: () => createBookingApi
+  createBookingApi: () => createBookingApi,
+  freePayApi: () => freePayApi
 });
 module.exports = __toCommonJS(serve_exports);
 var import_utils = require("../../../utils");
@@ -30,8 +31,12 @@ var checkBeforeBookingApi = (data) => {
 var createBookingApi = (data) => {
   return import_utils.request.getRequest().post("/h5/eventbookingv2/order", data);
 };
+var freePayApi = (orderId) => {
+  return import_utils.request.getRequest().post(`/h5/pay/order/free-pay/${orderId}`, {});
+};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   checkBeforeBookingApi,
-  createBookingApi
+  createBookingApi,
+  freePayApi
 });

package/lib/components/Sales/Checkout/utils.js

@@ -79,6 +79,8 @@ var formatValues = (state, excludeDisabled, otherValue) => {
   } else {
     data = state.cartData.cartItems;
   }
+  const is_deposit = data.find((v) => v.deposit) ? 1 : 0;
+  values.is_deposit = is_deposit;
   values.bookings = formatBookings(data);
   return values;
 };

package/lib/components/Sales/Summary/index.d.ts

@@ -7,6 +7,16 @@ interface SummaryContextType {
     taxTitle?: string;
     totalTaxFee?: string;
     isPriceIncludeTax?: 0 | 1;
+    deposit?: {
+        total: string;
+        protocols: any[];
+        hasDeposit: boolean;
+    };
+    isAgreeDepositPolicy: boolean;
+    setIsAgreeDepositPolicy: (value: boolean) => void;
+    getDepositProtocol: (params: {
+        id: string;
+    }) => Promise<any>;
 }
 interface SummaryProviderProps {
     children: React.ReactNode;

package/lib/components/Sales/Summary/index.js

@@ -39,6 +39,7 @@ var import_react = __toESM(require("react"));
 var import_Cart = require("../Cart");
 var import_utils = require("./utils");
 var import_Init = require("../Init");
+var import_serve = require("./serve");
 var defaultState = {};
 var SummaryContext = (0, import_react.createContext)(
   void 0
@@ -48,6 +49,7 @@ var SummaryProvider = ({
 }) => {
   const { cartData } = (0, import_Cart.useCart)();
   const { initData } = (0, import_Init.useInit)();
+  const [isAgreeDepositPolicy, setIsAgreeDepositPolicy] = (0, import_react.useState)(false);
   const summaryData = (0, import_react.useMemo)(() => {
     return (0, import_utils.calculatePriceDetails)(
       (initData == null ? void 0 : initData.shop) || {},
@@ -61,7 +63,11 @@ var SummaryProvider = ({
     total: summaryData.total,
     taxTitle: summaryData.taxTitle,
     totalTaxFee: summaryData.totalTaxFee,
-    isPriceIncludeTax: summaryData.isPriceIncludeTax
+    isPriceIncludeTax: summaryData.isPriceIncludeTax,
+    deposit: summaryData.deposit,
+    isAgreeDepositPolicy,
+    setIsAgreeDepositPolicy,
+    getDepositProtocol: import_serve.getDepositProtocolApi
   };
   return /* @__PURE__ */ import_react.default.createElement(SummaryContext.Provider, { value: contextValue }, children);
 };

package/lib/components/Sales/Summary/serve.d.ts

@@ -0,0 +1 @@
+export declare const getDepositProtocolApi: (id: string) => Promise<any>;

package/lib/components/Sales/Summary/serve.js

@@ -0,0 +1,32 @@
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/components/Sales/Summary/serve.ts
+var serve_exports = {};
+__export(serve_exports, {
+  getDepositProtocolApi: () => getDepositProtocolApi
+});
+module.exports = __toCommonJS(serve_exports);
+var import_utils = require("../../../utils");
+var getDepositProtocolApi = (id) => {
+  return import_utils.request.getRequest().get(`/h5/shop-policy/${id}`, {});
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  getDepositProtocolApi
+});

package/lib/components/Sales/Summary/utils.d.ts

@@ -10,6 +10,11 @@ interface PriceDetail {
     taxTitle?: string;
     totalTaxFee?: string;
     isPriceIncludeTax?: 0 | 1;
+    deposit?: {
+        total: string;
+        protocols: any[];
+        hasDeposit: boolean;
+    };
 }
 /**
  * 计算商品小计（不含其他费用）
@@ -33,4 +38,14 @@ export declare const calculateTaxFee: (shopInfo: any, items: CartItem[]) => "0.0
  * @returns 价格明细对象
  */
 export declare const calculatePriceDetails: (shopInfo: any, items: CartItem[]) => PriceDetail;
+/**
+ * @title: 计算定金
+ * @param items - 购物车商品数组
+ * @returns 定金字符串，保留2位小数
+ */
+export declare const calculateDeposit: (items: CartItem[]) => {
+    total: string;
+    protocols: any[];
+    hasDeposit: never;
+} | undefined;
 export {};

package/lib/components/Sales/Summary/utils.js

@@ -29,6 +29,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/components/Sales/Summary/utils.ts
 var utils_exports = {};
 __export(utils_exports, {
+  calculateDeposit: () => calculateDeposit,
   calculatePriceDetails: () => calculatePriceDetails,
   calculateSubtotal: () => calculateSubtotal,
   calculateTaxFee: () => calculateTaxFee
@@ -65,16 +66,44 @@ var calculatePriceDetails = (shopInfo, items) => {
   const totalTaxFee = new import_decimal.default(calculateTaxFee(shopInfo, items));
   console.log("totalTaxFee", totalTaxFee.toFixed(2));
   const total = (shopInfo == null ? void 0 : shopInfo.is_price_include_tax) ? subtotal : subtotal.plus(totalTaxFee);
+  const deposit = calculateDeposit(items);
   return {
     subtotal: subtotal.toFixed(2),
     total: total.toFixed(2),
     taxTitle: shopInfo == null ? void 0 : shopInfo.tax_title,
     totalTaxFee: totalTaxFee.toFixed(2),
-    isPriceIncludeTax: shopInfo == null ? void 0 : shopInfo.is_price_include_tax
+    isPriceIncludeTax: shopInfo == null ? void 0 : shopInfo.is_price_include_tax,
+    deposit
   };
 };
+var calculateDeposit = (items) => {
+  if (!(items == null ? void 0 : items.length)) {
+    return void 0;
+  }
+  const protocols = [];
+  let hasDeposit = false;
+  const total = items.reduce((sum, item) => {
+    var _a, _b, _c;
+    if (item == null ? void 0 : item.deposit) {
+      hasDeposit = true;
+      const cartItemTotalPrice = new import_decimal.default(((_a = item == null ? void 0 : item.deposit) == null ? void 0 : _a.total) || 0);
+      (_c = (_b = item == null ? void 0 : item.deposit) == null ? void 0 : _b.protocols) == null ? void 0 : _c.forEach((protocol) => {
+        if (protocols.findIndex((p) => p.id === protocol.id) === -1) {
+          protocols.push(protocol);
+        }
+      });
+      return sum.plus(cartItemTotalPrice);
+    }
+    return sum;
+  }, new import_decimal.default(0));
+  if (hasDeposit) {
+    return { total: total.toFixed(2), protocols, hasDeposit };
+  }
+  return void 0;
+};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  calculateDeposit,
   calculatePriceDetails,
   calculateSubtotal,
   calculateTaxFee

package/lib/components/appointmentBooking/components/Deposit/index.d.ts

@@ -1,3 +1,9 @@
 import './index.less';
+export declare const DepositContent: (props: {
+    isAgreeDepositPolicy: boolean;
+    setIsAgreeDepositPolicy: (value: boolean) => void;
+    deposit: any;
+    depositProtocolRequest?: any;
+}) => JSX.Element;
 declare const Deposit: () => JSX.Element;
 export default Deposit;

package/lib/components/appointmentBooking/components/Deposit/index.js

@@ -29,6 +29,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/components/appointmentBooking/components/Deposit/index.tsx
 var Deposit_exports = {};
 __export(Deposit_exports, {
+  DepositContent: () => DepositContent,
   default: () => Deposit_default
 });
 module.exports = __toCommonJS(Deposit_exports);
@@ -38,9 +39,13 @@ var import_deposit = __toESM(require("../../deposit"));
 var import_context = require("../../context");
 var import_utils = require("@pisell/utils");
 var import_index = require("./index.less");
-var Deposit = () => {
-  const { setIsAgreeDepositPolicy, isAgreeDepositPolicy, summary } = (0, import_context.useAppointmentBookingContext)();
-  const { deposit } = summary;
+var DepositContent = (props) => {
+  const {
+    isAgreeDepositPolicy,
+    setIsAgreeDepositPolicy,
+    deposit,
+    depositProtocolRequest
+  } = props;
   return /* @__PURE__ */ import_react.default.createElement("div", { className: "appointment-deposit-wrap" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "appointment-deposit-top" }, /* @__PURE__ */ import_react.default.createElement("span", null, import_utils.locales.getText("pisell2.appointment.deposit")), /* @__PURE__ */ import_react.default.createElement(
     import_materials.PisellText.Amount,
     {
@@ -54,8 +59,35 @@ var Deposit = () => {
       total: deposit == null ? void 0 : deposit.total,
       protocols: deposit == null ? void 0 : deposit.protocols,
       isAgreePolicy: isAgreeDepositPolicy,
-      onChange: (value) => setIsAgreeDepositPolicy(value)
+      onChange: (value) => setIsAgreeDepositPolicy(value),
+      depositProtocolRequest
     }
   ));
 };
+var Deposit = () => {
+  const {
+    setIsAgreeDepositPolicy,
+    isAgreeDepositPolicy,
+    summary,
+    appointmentBooking
+  } = (0, import_context.useAppointmentBookingContext)();
+  const { deposit } = summary;
+  const depositProtocolRequest = (id) => {
+    var _a;
+    return (_a = appointmentBooking == null ? void 0 : appointmentBooking.getProtocol) == null ? void 0 : _a.call(appointmentBooking, id);
+  };
+  return /* @__PURE__ */ import_react.default.createElement(
+    DepositContent,
+    {
+      isAgreeDepositPolicy: !!isAgreeDepositPolicy,
+      setIsAgreeDepositPolicy,
+      deposit,
+      depositProtocolRequest
+    }
+  );
+};
 var Deposit_default = Deposit;
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  DepositContent
+});

package/lib/components/appointmentBooking/components/Voucher/index.js

@@ -140,7 +140,7 @@ var VoucherCard = (props) => {
       setCode("");
     } else {
       (0, import_materials.PisellToast)({
-        content: import_utils.locales.getText("pisell2.text.goodpass.code-invalid")
+        content: val.type === "server" ? import_utils.locales.getText("pisell2.text.goodpass.code-invalid") : import_utils.locales.getText("pisell2.text.goodpass.code-invalid-cart")
       });
     }
   };

package/lib/components/appointmentBooking/deposit/components/PolicyModal/index.js

@@ -36,7 +36,6 @@ var import_react = __toESM(require("react"));
 var import_antd = require("antd");
 var import_materials = require("@pisell/materials");
 var import_utils = require("@pisell/utils");
-var import_context = require("../../../context");
 var import_index = require("./index.less");
 var DepositModal = (props) => {
   const {
@@ -45,9 +44,10 @@ var DepositModal = (props) => {
     item,
     onChange,
     onConfirm,
-    isHideCheckout = true
+    isHideCheckout = true,
+    depositProtocolRequest
+    // 定金协议请求
   } = props;
-  const { appointmentBooking } = (0, import_context.useAppointmentBookingContext)();
   const [policy, setPolicy] = (0, import_react.useState)(null);
   const [loading, setLoading] = (0, import_react.useState)(false);
   const [disabled, setDisabled] = (0, import_react.useState)(false);
@@ -55,9 +55,13 @@ var DepositModal = (props) => {
     setDisabled(!isHideCheckout);
   }, [isHideCheckout]);
   const getPolicy = async (id) => {
+    if (!depositProtocolRequest) {
+      console.error("depositProtocolRequest is not defined");
+      return;
+    }
     setLoading(true);
     try {
-      const { data } = await appointmentBooking.getProtocol(id);
+      const { data } = await (depositProtocolRequest == null ? void 0 : depositProtocolRequest(id));
       setPolicy(data);
       onChange && onChange(data);
     } catch (error) {

package/lib/components/appointmentBooking/deposit/index.js

@@ -48,7 +48,8 @@ var Deposit = (props) => {
     title,
     isAgreePolicy = true,
     isShowTitle = true,
-    onChange
+    onChange,
+    depositProtocolRequest
   } = props;
   const context = (0, import_useEngineContext.default)();
   const [visible, setVisible] = (0, import_react.useState)(false);
@@ -102,7 +103,8 @@ var Deposit = (props) => {
     {
       open: visible,
       onCancel: () => setVisible(false),
-      item: policyItem
+      item: policyItem,
+      depositProtocolRequest
     }
   ));
 };

package/lib/components/appointmentBooking/locales.d.ts

@@ -114,6 +114,7 @@ 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.goodpass.login': string;
         'pisell2.text.goodpass.login-tip': string;
     };
@@ -232,6 +233,7 @@ 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.goodpass.login': string;
         'pisell2.text.goodpass.login-tip': string;
     };
@@ -350,6 +352,7 @@ 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.goodpass.login': string;
         'pisell2.text.goodpass.login-tip': string;
     };

package/lib/components/appointmentBooking/locales.js

@@ -138,6 +138,7 @@ var locales_default = {
     "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.goodpass.login": "Login",
     "pisell2.text.goodpass.login-tip": " for member benefit Or use account credit"
   },
@@ -256,6 +257,7 @@ var locales_default = {
     "pisell2.text.goodpass.code": "券码",
     "pisell2.text.goodpass.enter-code": "请输入券码",
     "pisell2.text.goodpass.code-invalid": "当前券码不可用",
+    "pisell2.text.goodpass.code-invalid-cart": "当前购物车中无可用商品",
     "pisell2.text.goodpass.login": "登录",
     "pisell2.text.goodpass.login-tip": "以获取会员福利或使用账户积分"
   },
@@ -374,6 +376,7 @@ var locales_default = {
     "pisell2.text.goodpass.code": "券碼",
     "pisell2.text.goodpass.enter-code": "請輸入券碼",
     "pisell2.text.goodpass.code-invalid": "當前券碼不可用",
+    "pisell2.text.goodpass.code-invalid-cart": "當前購物車中無可用商品",
     "pisell2.text.goodpass.login": "登錄",
     "pisell2.text.goodpass.login-tip": "以獲取會員福利或使用賬戶積分"
   }

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

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

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

@@ -257,7 +257,7 @@ var formatAppointmentProductLists = (data) => {
     let list = data.service.value;
     list = list.filter((item) => {
       var _a2;
-      return ((_a2 = item._extend) == null ? void 0 : _a2.holder_id) && import_status.appointmentTypes.includes(item.extension_type);
+      return ((_a2 = item._extend) == null ? void 0 : _a2.holder_id) && !(0, import_utils4.isNormalProductByDurationSchedule)(item);
     });
     const groupMap = /* @__PURE__ */ new Map();
     list.forEach((item) => {
@@ -361,10 +361,7 @@ var formatBookings = (data, values) => {
 var formatRelationProducts = (data) => {
   var _a;
   let list = ((_a = data.service) == null ? void 0 : _a.value) || [];
-  list = list.filter((item) => {
-    var _a2;
-    return !((_a2 = item._extend) == null ? void 0 : _a2.holder_id);
-  });
+  list = list.filter((item) => (0, import_utils4.isNormalProductByDurationSchedule)(item));
   let relationProducts = [];
   relationProducts = list.map((item) => {
     return formatProducts(item);

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

@@ -67,13 +67,17 @@ var VoucherCard = (props) => {
   const isBooking4Shop = (0, import_useIsBooking4Shop.useIsBooking4Shop)(state);
   const shopDiscount = pisellos.getModule("shopDiscount");
   services = state.service;
-  (0, import_ahooks.useDebounceEffect)(() => {
-    if (isBooking4Shop) {
-      shopDiscount.setCustomer(state.client.value);
+  (0, import_ahooks.useDebounceEffect)(
+    () => {
+      if (isBooking4Shop) {
+        shopDiscount.setCustomer(state.client.value);
+      }
+    },
+    [(_b = state.client.value) == null ? void 0 : _b.id, isBooking4Shop],
+    {
+      wait: 200
     }
-  }, [(_b = state.client.value) == null ? void 0 : _b.id, isBooking4Shop], {
-    wait: 200
-  });
+  );
   (0, import_react.useEffect)(() => {
     if (isBooking4Shop) {
       shopDiscount.setProductList([
@@ -116,7 +120,9 @@ var VoucherCard = (props) => {
   }, [state.addons.value]);
   const disabled = (0, import_react.useMemo)(() => {
     var _a2;
-    if (["paid", "partially_paid"].includes((_a2 = state.bookingDetail) == null ? void 0 : _a2.payment_status) && [...addonsMemo, ...serviceMemo].every((item) => item.booking_id)) {
+    if (["paid", "partially_paid"].includes(
+      (_a2 = state.bookingDetail) == null ? void 0 : _a2.payment_status
+    ) && [...addonsMemo, ...serviceMemo].every((item) => item.booking_id)) {
       return true;
     }
     return false;
@@ -173,9 +179,15 @@ var VoucherCard = (props) => {
     );
     return () => {
       shopDiscount.clear();
-      pisellos.effects.off(ShopDiscountHooks.onCustomerChange, onScanCustomerChange);
+      pisellos.effects.off(
+        ShopDiscountHooks.onCustomerChange,
+        onScanCustomerChange
+      );
       pisellos.effects.off(ShopDiscountHooks.onLoadPrepareCalcResult, fn);
-      pisellos.effects.off(ShopDiscountHooks.onDiscountListChange, onDiscountListChange);
+      pisellos.effects.off(
+        ShopDiscountHooks.onDiscountListChange,
+        onDiscountListChange
+      );
     };
   }, [state.bookingId, isBooking4Shop, fn]);
   const productListToValue = (0, import_ahooks.useMemoizedFn)((list, edit) => {

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

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

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

@@ -4,6 +4,6 @@ declare const useSendModal: (bookingId?: number) => {
     setOpen: import("react").Dispatch<import("react").SetStateAction<boolean>>;
     handleOpen: () => void;
     handleValuesChange: (val: any) => void;
-    handleOk: (values: SendModalValues) => Promise<any>;
+    handleOk: (values: SendModalValues) => Promise<boolean | undefined>;
 };
 export default useSendModal;

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

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

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

@@ -264,7 +264,7 @@ var Info = (props) => {
     if ((0, import_utils3.isDaysBooking)(state)) {
       if (!(0, import_utils3.holderId)(state)) {
         _list = _list.filter(
-          (item) => !import_status.appointmentTypes.includes(item.extension_type)
+          (item) => (0, import_utils3.isNormalProductByDurationSchedule)(item)
         );
       }
     }

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

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

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

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