@pisell/private-materials 3.4.2 → 3.4.4

package/lib/components/Sales/Event/Detail.d.ts

@@ -14,6 +14,7 @@ interface EventDetailContextType {
     currentBookingOption: any;
     selectEventDetailProductDetail: (productDetail: any) => void;
     checkBeforeSelectEventDetail: () => boolean;
+    getProductDetailRequest: any;
 }
 interface EventDetailProviderProps {
     children: React.ReactNode;

package/lib/components/Sales/Event/Detail.js

@@ -196,20 +196,44 @@ var EventDetailProvider = ({
       }
     }
   );
+  const getProductDetailRequest = (0, import_ahooks.useRequest)(import_serve.getProductDetailApi, {
+    manual: true,
+    loadingDelay: 200
+  });
   const selectEventDetailBookingOptions = (id) => {
-    var _a;
+    var _a, _b, _c;
     const { introduction, bookingOptions } = detailRef.current || {};
     const option = (_a = bookingOptions == null ? void 0 : bookingOptions.filter((v) => v.value === id)) == null ? void 0 : _a[0];
-    _setDetail({
-      introduction: {
-        ...introduction,
-        price: option.price,
-        origin_price: option.original_price
-      },
-      selectedProduct: option
-      // 选中的活动关联的商品
-    });
-    _setCurrentBookingOption(id);
+    const setSelectedData = (data) => {
+      _setDetail({
+        introduction: {
+          ...introduction,
+          price: data == null ? void 0 : data.price,
+          origin_price: data == null ? void 0 : data.original_price
+        },
+        selectedProduct: data
+        // 选中的活动关联的商品
+      });
+      _setCurrentBookingOption(id);
+    };
+    if (((_b = option == null ? void 0 : option._originData) == null ? void 0 : _b.is_eject) === 0) {
+      getProductDetailRequest.runAsync(id, {
+        open_deposit: 1,
+        front_end_cache_id: ((_c = introduction == null ? void 0 : introduction._originData) == null ? void 0 : _c.id) + "_" + id
+      }).then((res) => {
+        var _a2;
+        const custom_deposit_data = (_a2 = res == null ? void 0 : res.data) == null ? void 0 : _a2.custom_deposit_data;
+        const newOption = { ...option };
+        if (custom_deposit_data && newOption._originData) {
+          newOption._originData.custom_deposit_data = custom_deposit_data;
+        }
+        setSelectedData(newOption);
+      }).catch(() => {
+        setSelectedData(option);
+      });
+    } else {
+      setSelectedData(option);
+    }
   };
   const selectEventDetailProductDetail = (productDetail) => {
     _setDetail({ productDetail });
@@ -233,7 +257,8 @@ var EventDetailProvider = ({
     getEventDetailSelectDate,
     currentBookingOption,
     selectEventDetailProductDetail,
-    checkBeforeSelectEventDetail
+    checkBeforeSelectEventDetail,
+    getProductDetailRequest
   };
   return /* @__PURE__ */ import_react.default.createElement(EventDetailContext.Provider, { value: contextValue }, children);
 };

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

@@ -37,3 +37,13 @@ export declare const getProductPrice: (params: {
     customer_id: number;
     schedule_date?: string;
 }) => Promise<any>;
+/**
+ * 获取商品详情
+ * @param id 商品id
+ * @param params 参数
+ * @returns
+ */
+export declare const getProductDetailApi: (id: number, params: {
+    open_deposit?: string | number;
+    front_end_cache_id?: string;
+}) => Promise<any>;

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

@@ -24,6 +24,7 @@ __export(serve_exports, {
   getEventDetailSelectDateApi: () => getEventDetailSelectDateApi,
   getEventDetailTeacherApi: () => getEventDetailTeacherApi,
   getEventListApi: () => getEventListApi,
+  getProductDetailApi: () => getProductDetailApi,
   getProductPrice: () => getProductPrice
 });
 module.exports = __toCommonJS(serve_exports);
@@ -46,6 +47,11 @@ var getEventDetailSelectDateApi = (id, params) => {
   });
 };
 var getProductPrice = async (params) => import_utils.request.getRequest().post(`/h5/product/query/price`, params);
+var getProductDetailApi = async (id, params) => {
+  return import_utils.request.getRequest().get(`/h5/product/standard/show/${id}`, params, {
+    useCache: true
+  });
+};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   getEventDetailBookingOptionsApi,
@@ -53,5 +59,6 @@ var getProductPrice = async (params) => import_utils.request.getRequest().post(`
   getEventDetailSelectDateApi,
   getEventDetailTeacherApi,
   getEventListApi,
+  getProductDetailApi,
   getProductPrice
 });

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;
+    };
 }
 /**
  * 计算商品小计（不含其他费用）
@@ -25,7 +30,7 @@ export declare const calculateSubtotal: (items: CartItem[]) => string;
  * @return {*}
  * @Author: xiangfeng.xue
  */
-export declare const calculateTaxFee: (shopInfo: any, items: CartItem[]) => "0.00" | Decimal;
+export declare const calculateTaxFee: (shopInfo: any, items: CartItem[]) => Decimal | "0.00";
 /**
  * 计算所有价格明细
  * @param items - 购物车商品数组
@@ -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/Content/index.js

@@ -190,6 +190,10 @@ var Layout = () => {
     if (isDateSelectedFirst && key === "select-date") return false;
     return key !== "confirm-information";
   }, [isDateSelectedFirst, (_e = currentStep == null ? void 0 : currentStep.step) == null ? void 0 : _e.key]);
+  const depositProtocolRequest = (id) => {
+    var _a2;
+    return (_a2 = appointmentBooking == null ? void 0 : appointmentBooking.getProtocol) == null ? void 0 : _a2.call(appointmentBooking, id);
+  };
   return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, !isRetailTemplate ? /* @__PURE__ */ import_react.default.createElement(import_Header.default, null) : null, /* @__PURE__ */ import_react.default.createElement(
     "div",
     {
@@ -214,7 +218,8 @@ var Layout = () => {
       onConfirm: () => closePolicy(true),
       item: policyParams == null ? void 0 : policyParams.content,
       onChange: () => setLoading(false),
-      isHideCheckout: false
+      isHideCheckout: false,
+      depositProtocolRequest
     }
   ) : null);
 };

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/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/booking/components/footer/index.js

@@ -54,7 +54,7 @@ var import_useIsBooking4Shop = require("../../hooks/useIsBooking4Shop");
 var import_utils4 = require("@pisell/utils");
 var import_dayjs = __toESM(require("dayjs"));
 var Footer = (props) => {
-  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m;
   const { state, buttons, dispatch, source } = props;
   const [showDetail, setShowDetail] = (0, import_react.useState)(false);
   const [loading, setLoading] = (0, import_react.useState)(false);
@@ -359,6 +359,12 @@ var Footer = (props) => {
       }
     });
   };
+  const paymentRefundedStatus = (0, import_react.useMemo)(() => {
+    var _a2;
+    return ["partially_refunded", "refunded"].includes(
+      (_a2 = state == null ? void 0 : state.bookingDetail) == null ? void 0 : _a2.payment_status
+    );
+  }, [state == null ? void 0 : state.bookingDetail]);
   const checkoutButton = (0, import_react.useMemo)(() => {
     let buttonType = "primary";
     if (transaction_habit_selection.type === "service_now_pay_later") {
@@ -608,7 +614,7 @@ var Footer = (props) => {
     }
   }, [state.bookingDetail, total.notPaidAmount]);
   const _buttons = (0, import_react.useMemo)(() => {
-    if (state.appointment_status === "cancelled") {
+    if (state.appointment_status === "cancelled" || paymentRefundedStatus) {
       return [buttonMap.rebook];
     }
     if (source === "addons") {
@@ -674,6 +680,7 @@ var Footer = (props) => {
     isShowClearAll
   ]);
   const moreButton = (0, import_react.useMemo)(() => {
+    var _a2, _b2;
     let arr = [];
     if (!state.bookingId) {
       return [];
@@ -684,8 +691,11 @@ var Footer = (props) => {
     if (state.renderType === "eventBooking") {
       return [];
     }
+    if (((_a2 = state == null ? void 0 : state.bookingDetail) == null ? void 0 : _a2.payment_status) === "refunded") {
+      return [];
+    }
     if (_buttons.length !== 0) {
-      if (state.bookingId && isShowPaymentLink) {
+      if (state.bookingId && isShowPaymentLink && ((_b2 = state == null ? void 0 : state.bookingDetail) == null ? void 0 : _b2.payment_status) !== "partially_refunded") {
         arr.push(actionMap.paymentLink);
       }
     }
@@ -708,7 +718,14 @@ var Footer = (props) => {
       arr.push(actionMap.rebook);
     }
     return arr;
-  }, [state, total, isShowPaymentLink, source, _buttons.length]);
+  }, [
+    state,
+    total,
+    isShowPaymentLink,
+    source,
+    _buttons.length,
+    (_j = state == null ? void 0 : state.bookingDetail) == null ? void 0 : _j.payment_status
+  ]);
   const isOnlyDeposit = (0, import_react.useMemo)(() => {
     var _a2, _b2, _c2, _d2;
     if (((_a2 = state == null ? void 0 : state.bookingDetail) == null ? void 0 : _a2.deposit_payment_time) && ((_d2 = (_c2 = (_b2 = state == null ? void 0 : state.bookingDetail) == null ? void 0 : _b2.payment_types) == null ? void 0 : _c2.every) == null ? void 0 : _d2.call(
@@ -799,7 +816,7 @@ var Footer = (props) => {
   }, [
     state.bookingId,
     state.bookingDetail,
-    (_j = state.addons) == null ? void 0 : _j.load,
+    (_k = state.addons) == null ? void 0 : _k.load,
     state.renderType
   ]);
   const menuChange = (e) => {
@@ -882,7 +899,7 @@ var Footer = (props) => {
         label: import_utils.locales.getText("pisell1.text.rounding")
       }
     ];
-  }, [total, (_k = state.bookingDetail) == null ? void 0 : _k.surcharge, state, state.bookingId]);
+  }, [total, (_l = state.bookingDetail) == null ? void 0 : _l.surcharge, state, state.bookingId]);
   const orderTotalList = (0, import_react.useMemo)(() => {
     return [
       // 订单已付金额
@@ -916,11 +933,7 @@ var Footer = (props) => {
         label: import_utils.locales.getText("pisell2.text.refunded-amount")
       }
     ];
-  }, [total, (_l = state.bookingDetail) == null ? void 0 : _l.surcharge, state, state.bookingId]);
-  const paymentRefundedStatus = (0, import_react.useMemo)(() => {
-    var _a2;
-    return ["partially_refunded", "refunded"].includes((_a2 = state == null ? void 0 : state.bookingDetail) == null ? void 0 : _a2.payment_status);
-  }, [state == null ? void 0 : state.bookingDetail]);
+  }, [total, (_m = state.bookingDetail) == null ? void 0 : _m.surcharge, state, state.bookingId]);
   return /* @__PURE__ */ import_react.default.createElement(import_antd.Skeleton, { title: false, round: true, loading: showFooter, active: true }, (hasGoodPassApp || hasDiscountCardApp) && ["addons", "info"].includes(source) && !paymentRefundedStatus ? /* @__PURE__ */ import_react.default.createElement(import_voucher.default, { state, dispatch, source }) : null, /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-footer-total" }, /* @__PURE__ */ import_react.default.createElement("span", { className: "pisell-lowcode__booking-footer-left" }, /* @__PURE__ */ import_react.default.createElement("span", { className: "pisell-lowcode__booking-footer-left-total" }, totalText), /* @__PURE__ */ import_react.default.createElement("span", { className: "pisell-lowcode__booking-footer-left-arrears" }, arrearsText)), /* @__PURE__ */ import_react.default.createElement(
     "span",
     {

package/lib/components/booking/info/service/addService/utils.d.ts

@@ -6,7 +6,7 @@ export declare const getDurationProps: ({ cacheItem, useStartTime, currentResour
         type: string;
         value: number;
     };
-    locale: string;
+    locale: any;
     slice: any;
     selectProps: {
         size: string;

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

@@ -143,7 +143,9 @@ var isBooking4Shop = (shopId, renderType) => {
     8872,
     6930,
     8824,
-    8913
+    8913,
+    8918,
+    6413
   ];
   return booking4Shops.includes(shopId);
 };

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

@@ -7,7 +7,7 @@ export declare const getDurationProps: ({ cacheItem, useStartTime, currentResour
         type: string;
         value: number;
     };
-    locale: string;
+    locale: any;
     slice: any;
     selectProps: {
         size: string;

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

@@ -69,7 +69,10 @@ var getResourceTimeIsUsable = (item, cacheItem, resourceItem) => {
   let timeEndDate = (0, import_dayjs.default)(time.end_date + " " + time.end_time).add(1, "second");
   let totalCount = getUseableEventCount(time.event_list, resourceItem.capacity);
   const currentCount = getSumCapacity({ cacheItem });
-  const eventList = (time.event_list || []).filter((event) => event.id !== (cacheItem == null ? void 0 : cacheItem.booking_id));
+  let eventList = time.event_list || [];
+  if (cacheItem == null ? void 0 : cacheItem.booking_id) {
+    eventList = eventList.filter((event) => event.id !== (cacheItem == null ? void 0 : cacheItem.booking_id));
+  }
   let endDate = null;
   let isCalcCount = true;
   if (isFlexible) {

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

@@ -165,10 +165,10 @@ export declare const getProductTotalPrice: (item: any) => number;
 export declare const getDuration: (duration: number | {
     type: string;
     value: number;
-}) => number | "flexible" | {
+}) => number | {
     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/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: "success" | "page" | "print" | "fail" | "mark_tx_processed", params?: string | {
+    onChange?: ((status: "success" | "page" | "fail" | "print" | "mark_tx_processed", params?: string | {
         [keys: string]: unknown;
     } | undefined, other?: any) => void) | undefined;
     onClose: () => void;

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

@@ -10,7 +10,7 @@ import './device.less';
 declare const _default: ({ api, onChange, onClose, className, device_number, isMobile, net, client, formatAmount, }: {
     api: PayProps['api'];
     className?: string | undefined;
-    onChange?: ((status: "success" | "page" | "print" | "fail" | "mark_tx_processed", params?: string | {
+    onChange?: ((status: "success" | "page" | "fail" | "print" | "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<"success" | "loading" | "warn" | "fail" | "pedding" | "resove" | "reject" | "question">;
+    readonly statusRef: React.MutableRefObject<"success" | "warn" | "loading" | "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" | "windcave" | "stripe" | "payo">;
+    readonly eftposRef: React.MutableRefObject<"payo" | "tyro" | "windcave" | "stripe">;
     readonly clientRef: React.MutableRefObject<ClientEnum>;
     readonly dataRef: React.MutableRefObject<import("./store").State>;
 };