@pisell/private-materials 6.2.42 → 6.2.45

package/es/plus/saasRegister/locales.js

@@ -0,0 +1,116 @@
+export default {
+  en: {
+    'pisell-saas-register-welcome-message': 'Welcome to',
+    'pisell-saas-register-title': 'Create account',
+    'pisell-saas-register-subtitle': 'Welcome back! Please enter your details.',
+    'pisell-saas-register-email-label': 'Email Address',
+    'pisell-saas-register-email-placeholder': 'Enter your email',
+    'pisell-saas-register-email-error': 'Please input your email!',
+    'pisell-saas-register-email-error-valid': 'Please enter a valid email!',
+    'pisell-saas-register-button': 'Continue',
+    'pisell-saas-register-login-text': 'Already have an account?',
+    'pisell-saas-register-login-link-text': 'Log in',
+    'pisell-saas-register-failed-button-text': 'Back to Registration',
+    'pisell-saas-register-failed-email-registered-title': 'This email is already registered. Please log in or use a different email',
+    'pisell-saas-register-verify-email-title': 'Verify your email',
+    'pisell-saas-register-verify-email-subtitle': 'Use the verification link sent to your email address',
+    'pisell-saas-register-resend-text': "Didn't receive a link? ",
+    'pisell-saas-register-resend-button-text': 'Resend',
+    'pisell-saas-register-verifying-email-title': 'Verifying your email...',
+    'pisell-saas-register-failed-link-expired-title': 'Verification link expired',
+    'pisell-saas-register-failed-link-expired-subtitle': 'Your verification link has expired. Please request a new verification email to continue.',
+    'pisell-saas-register-failed-link-invalid-title': 'Invalid verification link',
+    'pisell-saas-register-failed-link-invalid-subtitle': 'The verification link is invalid. Please start the registration process again.',
+    'pisell-saas-register-failed-link-email-registered-title': 'Already registered',
+    'pisell-saas-register-failed-link-email-registered-subtitle': 'This email is already registered. Please log in.',
+    'pisell-saas-register-failed-link-email-registered-button-text': 'Log in',
+    'pisell-saas-register-password-label': 'Password',
+    'pisell-saas-register-password-placeholder': 'Enter your password',
+    'pisell-saas-register-password-required': 'Please input your password!',
+    'pisell-saas-register-divider-text': 'Your Information',
+    'pisell-saas-register-first-name-label': 'First Name',
+    'pisell-saas-register-first-name-placeholder': 'Enter your first name',
+    'pisell-saas-register-last-name-label': 'Last Name',
+    'pisell-saas-register-last-name-placeholder': 'Enter your last name',
+    'pisell-saas-register-entry-info-title': 'Set Password',
+    'pisell-saas-register-entry-info-subtitle': 'Your email has been verified. Please set your password and provide your personal information.',
+    'pisell-saas-register-entry-info-document-title': 'Account Setup',
+    'pisell-saas-register-entry-info-document-description': 'Your email has been verified. Please set your password and provide your personal information.'
+  },
+  'zh-CN': {
+    'pisell-saas-register-welcome-message': '欢迎使用',
+    'pisell-saas-register-title': '创建账号',
+    'pisell-saas-register-subtitle': '欢迎回来！请输入您的详细信息。',
+    'pisell-saas-register-email-label': '邮箱地址',
+    'pisell-saas-register-email-placeholder': '输入您的邮箱',
+    'pisell-saas-register-email-error': '请输入您的邮箱！',
+    'pisell-saas-register-email-error-valid': '请输入有效的邮箱！',
+    'pisell-saas-register-button': '继续',
+    'pisell-saas-register-login-text': '已有账号？',
+    'pisell-saas-register-login-link-text': '立即登录',
+    'pisell-saas-register-failed-button-text': '返回注册页面',
+    'pisell-saas-register-failed-email-registered-title': '该邮箱已注册，请登录或使用其他邮箱',
+    'pisell-saas-register-verify-email-title': '验证您的邮箱',
+    'pisell-saas-register-verify-email-subtitle': '请使用发送到您邮箱的验证链接',
+    'pisell-saas-register-resend-text': '没有收到链接？',
+    'pisell-saas-register-resend-button-text': '重新发送',
+    'pisell-saas-register-verifying-email-title': '正在验证您的邮箱...',
+    'pisell-saas-register-failed-link-expired-title': '验证链接已过期',
+    'pisell-saas-register-failed-link-expired-subtitle': '您的验证链接已过期。请重新申请验证邮件以继续。',
+    'pisell-saas-register-failed-link-invalid-title': '无效的验证链接',
+    'pisell-saas-register-failed-link-invalid-subtitle': '验证链接无效。请重新开始注册流程。',
+    'pisell-saas-register-failed-link-email-registered-title': '已注册',
+    'pisell-saas-register-failed-link-email-registered-subtitle': '该邮箱已注册，请登录',
+    'pisell-saas-register-failed-link-email-registered-button-text': '登录',
+    'pisell-saas-register-password-label': '密码',
+    'pisell-saas-register-password-placeholder': '输入您的密码',
+    'pisell-saas-register-password-required': '请输入您的密码！',
+    'pisell-saas-register-divider-text': '您的信息',
+    'pisell-saas-register-first-name-label': '名',
+    'pisell-saas-register-first-name-placeholder': '输入您的名',
+    'pisell-saas-register-last-name-label': '姓',
+    'pisell-saas-register-last-name-placeholder': '输入您的姓',
+    'pisell-saas-register-entry-info-title': '设置密码',
+    'pisell-saas-register-entry-info-subtitle': '邮箱已验证，请设置密码并填写个人信息。',
+    'pisell-saas-register-entry-info-document-title': '账户设置',
+    'pisell-saas-register-entry-info-document-description': '邮箱已验证，请设置密码并填写个人信息。'
+  },
+  'zh-HK': {
+    'pisell-saas-register-welcome-message': '歡迎使用',
+    'pisell-saas-register-title': '創建帳號',
+    'pisell-saas-register-subtitle': '歡迎回來！請輸入您的詳細信息。',
+    'pisell-saas-register-email-label': '電郵地址',
+    'pisell-saas-register-email-placeholder': '輸入您的電子郵件',
+    'pisell-saas-register-email-error': '請輸入您的電子郵件！',
+    'pisell-saas-register-email-error-valid': '請輸入有效的電子郵件！',
+    'pisell-saas-register-button': '繼續',
+    'pisell-saas-register-login-text': '已有帳號？',
+    'pisell-saas-register-login-link-text': '立即登入',
+    'pisell-saas-register-failed-button-text': '返回註冊頁面',
+    'pisell-saas-register-failed-email-registered-title': '該電郵已註冊，請登入或使用其他電郵',
+    'pisell-saas-register-verify-email-title': '驗證您的電郵',
+    'pisell-saas-register-verify-email-subtitle': '請使用發送到您郵箱的驗證鏈接',
+    'pisell-saas-register-resend-text': '沒有收到鏈接？',
+    'pisell-saas-register-resend-button-text': '重新發送',
+    'pisell-saas-register-verifying-email-title': '正在驗證您的電郵...',
+    'pisell-saas-register-failed-link-expired-title': '驗證鏈接已過期',
+    'pisell-saas-register-failed-link-expired-subtitle': '您的驗證鏈接已過期。請重新申請驗證郵件以繼續。',
+    'pisell-saas-register-failed-link-invalid-title': '無效的驗證鏈接',
+    'pisell-saas-register-failed-link-invalid-subtitle': '驗證鏈接無效。請重新開始註冊流程。',
+    'pisell-saas-register-failed-link-email-registered-title': '已註冊',
+    'pisell-saas-register-failed-link-email-registered-subtitle': '該電郵已註冊，請登入',
+    'pisell-saas-register-failed-link-email-registered-button-text': '登入',
+    'pisell-saas-register-password-label': '密碼',
+    'pisell-saas-register-password-placeholder': '輸入您的密碼',
+    'pisell-saas-register-password-required': '請輸入您的密碼！',
+    'pisell-saas-register-divider-text': '您的信息',
+    'pisell-saas-register-first-name-label': '名',
+    'pisell-saas-register-first-name-placeholder': '輸入您的名',
+    'pisell-saas-register-last-name-label': '姓',
+    'pisell-saas-register-last-name-placeholder': '輸入您的姓',
+    'pisell-saas-register-entry-info-title': '設定密碼',
+    'pisell-saas-register-entry-info-subtitle': '郵箱已驗證，請設定密碼並填寫個人資訊。',
+    'pisell-saas-register-entry-info-document-title': '帳戶設定',
+    'pisell-saas-register-entry-info-document-description': '郵箱已驗證，請設定密碼並填寫個人資訊。'
+  }
+};

package/es/plus/saasRegister/types.d.ts

@@ -0,0 +1,114 @@
+export declare enum SRStepStatus {
+    /** 邮箱已被注册 */
+    FAILED_EMAIL_REGISTERED = "failed_email_registered",
+    /** 链接过期 */
+    FAILED_LINK_EXPIRED = "failed_link_expired",
+    /** 链接无效 */
+    FAILED_LINK_INVALID = "failed_link_invalid",
+    /** 链接中邮箱已被注册 */
+    FAILED_LINK_EMAIL_REGISTERED = "failed_link_email_registered"
+}
+export declare enum SRStepKey {
+    /** 输入邮箱 */
+    ENTRY_EMAIL = "entry_email",
+    /** 邮箱等待验证 */
+    WAIT_VERIFY_EMAIL = "wait_verify_email",
+    /** 邮箱验证中 */
+    VERIFYING_EMAIL = "verifying_email",
+    /** 录入信息 */
+    ENTRY_INFO = "entry_info",
+    /** 验证失败 */
+    VERIFY_FAILED = "verify_failed"
+}
+export declare enum SRVerifyCode {
+    /** 成功 */
+    SUCCESS = 200,
+    /** 链接已过期 */
+    LINK_EXPIRED = 601000,
+    /** 邮箱已被注册 */
+    EMAIL_REGISTERED = 601001,
+    /** 链接无效 */
+    LINK_INVALID = 601002
+}
+export interface SRStep {
+    key: SRStepKey;
+    status?: SRStepStatus;
+    params?: {
+        [key: string]: any;
+    };
+}
+export interface SRProps {
+    /** 是否显示Logo */
+    showLogo?: boolean;
+    /** Logo图片地址 */
+    logo?: string;
+    /** Logo位置 */
+    logoPosition?: 'left' | 'center' | 'right';
+    /** Logo尺寸 */
+    logoSize?: {
+        width?: number;
+        height?: number;
+    };
+    /** 是否显示欢迎语 */
+    showWelcomeMessage?: boolean;
+    /** 欢迎语 */
+    welcomeMessage?: string;
+    /** 欢迎语对齐方式 */
+    welcomeMessageAlign?: 'left' | 'center' | 'right';
+    /** 是否显示标题 */
+    showTitle?: boolean;
+    /** 标题 */
+    title?: string;
+    /** 标题对齐方式 */
+    titleAlign?: 'left' | 'center' | 'right';
+    /** 副标题 */
+    subtitle?: string;
+    /** 是否显示副标题 */
+    showSubtitle?: boolean;
+    /** 副标题对齐方式 */
+    subtitleAlign?: 'left' | 'center' | 'right';
+    /** 邮箱输入框标题 */
+    emailLabel?: string;
+    /** 邮箱输入框占位符 */
+    emailPlaceholder?: string;
+    /** 按钮文本 */
+    buttonText?: string;
+    /** 密码输入框标题 */
+    passwordLabel?: string;
+    /** 密码输入框占位符 */
+    passwordPlaceholder?: string;
+    /** 是否显示分割线 */
+    showDivider?: boolean;
+    /** 分割线文案 */
+    dividerText?: string;
+    /** 是否显示名字 */
+    showFirstName?: boolean;
+    /** 是否显示姓氏 */
+    showLastName?: boolean;
+    /** 是否显示去登录入口 */
+    showLogin?: boolean;
+    /** 去登录入口对齐方式 */
+    loginAlign?: 'left' | 'center' | 'right';
+    /** 是否显示去登录入口文本 */
+    showLoginText?: boolean;
+    /** 去登录入口文本 */
+    loginText?: string;
+    /** 是否显示去登录入口链接文本 */
+    showLoginLinkText?: boolean;
+    /** 去登录入口链接文本 */
+    loginLinkText?: string;
+    /** 邮箱验证回调 */
+    onVerifyEmail?: (email: string) => Promise<boolean>;
+    /** 重新发送验证码回调 */
+    onSendEmail?: (email: string) => Promise<void>;
+    /** 去登录入口点击回调 */
+    onGoLogin?: () => void;
+    /** 验证链接回调 */
+    onVerifyLink?: (emailToken: string) => Promise<{
+        code: number;
+    }>;
+    /** 信息录入回调 */
+    onEntryInfo?: (info: any) => Promise<void>;
+    /** step 变化回调 */
+    onStepChange?: (step: SRStep) => void;
+}

package/es/plus/saasRegister/types.js

@@ -0,0 +1,24 @@
+// ********** 为了缩短命名长度，使用SRStepStatus代替SaasRegisterStepStatus **********
+
+export var SRStepStatus = /*#__PURE__*/function (SRStepStatus) {
+  SRStepStatus["FAILED_EMAIL_REGISTERED"] = "failed_email_registered";
+  SRStepStatus["FAILED_LINK_EXPIRED"] = "failed_link_expired";
+  SRStepStatus["FAILED_LINK_INVALID"] = "failed_link_invalid";
+  SRStepStatus["FAILED_LINK_EMAIL_REGISTERED"] = "failed_link_email_registered";
+  return SRStepStatus;
+}({});
+export var SRStepKey = /*#__PURE__*/function (SRStepKey) {
+  SRStepKey["ENTRY_EMAIL"] = "entry_email";
+  SRStepKey["WAIT_VERIFY_EMAIL"] = "wait_verify_email";
+  SRStepKey["VERIFYING_EMAIL"] = "verifying_email";
+  SRStepKey["ENTRY_INFO"] = "entry_info";
+  SRStepKey["VERIFY_FAILED"] = "verify_failed";
+  return SRStepKey;
+}({});
+export var SRVerifyCode = /*#__PURE__*/function (SRVerifyCode) {
+  SRVerifyCode[SRVerifyCode["SUCCESS"] = 200] = "SUCCESS";
+  SRVerifyCode[SRVerifyCode["LINK_EXPIRED"] = 601000] = "LINK_EXPIRED";
+  SRVerifyCode[SRVerifyCode["EMAIL_REGISTERED"] = 601001] = "EMAIL_REGISTERED";
+  SRVerifyCode[SRVerifyCode["LINK_INVALID"] = 601002] = "LINK_INVALID";
+  return SRVerifyCode;
+}({});

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

@@ -30,7 +30,7 @@ export declare const calculateSubtotal: (items: CartItem[]) => string;
  * @return {*}
  * @Author: xiangfeng.xue
  */
-export declare const calculateTaxFee: (shopInfo: any, items: CartItem[]) => Decimal | "0.00";
+export declare const calculateTaxFee: (shopInfo: any, items: CartItem[]) => "0.00" | Decimal;
 /**
  * 计算所有价格明细
  * @param items - 购物车商品数组

package/lib/components/appointmentBooking/components/Cart/Item/Total.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 declare const Total: ({ className, isFooter }: any) => JSX.Element;
 export default Total;

package/lib/components/appointmentBooking/components/Cart/Item/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 declare const CartItem: ({ onNext }: any) => JSX.Element;
 export default CartItem;

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 declare const Cart: ({ open, onCancel, onNext }: any) => JSX.Element;
 export default Cart;

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 export declare const DepositContent: (props: {
     isAgreeDepositPolicy: boolean;

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 declare const Header: () => JSX.Element;
 export default Header;

package/lib/components/appointmentBooking/deposit/components/PolicyModal/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 declare const DepositModal: (props: any) => JSX.Element;
 export default DepositModal;

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 declare const Deposit: (props: any) => JSX.Element;
 export default Deposit;

package/lib/components/booking/components/TabProduct/productItem/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 declare const ProductItem: ({ item, onClick, amountSymbol, style, className, }: any) => JSX.Element;
 export default ProductItem;

package/lib/components/booking/components/TabProduct/selectProductItem/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import "./index.less";
 declare const SelectProductItem: ({ item, onClick, onChangeQuantity, amountSymbol, style, className, disabled, }: any) => JSX.Element;
 export default SelectProductItem;

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

@@ -1 +1,2 @@
+/// <reference types="react" />
 export declare const renderBundles: (item: any, amountSymbol: string) => JSX.Element;

package/lib/components/booking/components/emptyBooking/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 /**
  * @title: 空状态
  * @description:

package/lib/components/booking/components/footer/FooterMenus/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import "./index.less";
 declare const FooterMenus: ({ state, menuChange, items }: any) => JSX.Element | null;
 export default FooterMenus;

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

@@ -676,7 +676,14 @@ var Footer = (props) => {
     }
   }, [state.bookingDetail, total.notPaidAmount]);
   const _buttons = (0, import_react.useMemo)(() => {
-    if (state.appointment_status === "cancelled" || paymentRefundedStatus) {
+    const isEvent = (0, import_utils2.isEventBooking)(state);
+    if (state.appointment_status === "cancelled") {
+      return [buttonMap.rebook];
+    }
+    if (paymentRefundedStatus) {
+      if (isEvent) {
+        return [""];
+      }
       return [buttonMap.rebook];
     }
     if (source === "addons") {
@@ -801,13 +808,6 @@ var Footer = (props) => {
   const totalText = (0, import_react.useMemo)(() => {
     var _a2;
     let str = "";
-    if (isOnlyDeposit) {
-      return `${import_utils.locales.getText("pisell2.text.deposit-paid")} ${(0, import_utils.formatAmount)(
-        (_a2 = state == null ? void 0 : state.bookingDetail) == null ? void 0 : _a2.deposit_paid_amount,
-        2,
-        (state == null ? void 0 : state.amountSymbol) || "$"
-      )} ${total.duration ? `(${total.duration})` : ""}`;
-    }
     if (total.totalRefundAmount > 0) {
       return `${import_utils.locales.getText(
         "pisell2.text.refunded-amount"
@@ -817,6 +817,13 @@ var Footer = (props) => {
         (state == null ? void 0 : state.amountSymbol) || "$"
       )}`;
     }
+    if (isOnlyDeposit) {
+      return `${import_utils.locales.getText("pisell2.text.deposit-paid")} ${(0, import_utils.formatAmount)(
+        (_a2 = state == null ? void 0 : state.bookingDetail) == null ? void 0 : _a2.deposit_paid_amount,
+        2,
+        (state == null ? void 0 : state.amountSymbol) || "$"
+      )} ${total.duration ? `(${total.duration})` : ""}`;
+    }
     if (total.notPaidAmount <= 0 && state.bookingId) {
       str = `${import_utils.locales.getText("pisell1.text.fully-paid")}: ${(0, import_utils.formatAmount)(
         total.sumTotalAmount,

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

@@ -389,10 +389,18 @@ var formatBookings = (data, values) => {
   });
   return bookings;
 };
-var formatRelationProducts = (data) => {
+var formatRelationProducts = (data, type) => {
   var _a;
   let list = ((_a = data.service) == null ? void 0 : _a.value) || [];
-  list = list.filter((item) => (0, import_utils4.isNormalProductByDurationSchedule)(item));
+  list = list.filter(
+    (item) => {
+      var _a2;
+      return (
+        // 跨日预约把普通商品加在relationProducts 活动预约按之前逻辑
+        type === "day" ? (0, import_utils4.isNormalProductByDurationSchedule)(item) : ((_a2 = item._extend) == null ? void 0 : _a2.holder_id) && import_status.appointmentTypes.includes(item.extension_type)
+      );
+    }
+  );
   let relationProducts = [];
   relationProducts = list.map((item) => {
     return formatProducts(item);
@@ -459,7 +467,7 @@ var formatValues = (state) => {
   };
   values.holder = formatHolder(state, values);
   if (isDay || isEvent) {
-    values.relation_products = formatRelationProducts(state);
+    values.relation_products = formatRelationProducts(state, isDay ? "day" : "event");
   } else {
     values.relation_products = formatNormalProducts(state);
     if (!((_b = values.relation_products) == null ? void 0 : _b.length)) {

package/lib/components/booking/components/reloadResourceModal/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 interface IProps {
     modal: any;

package/lib/components/booking/deposit/index.d.ts

@@ -1,2 +1,3 @@
+/// <reference types="react" />
 declare const Deposit: (props: any) => JSX.Element;
 export default Deposit;

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

@@ -60,6 +60,7 @@ var EditBookingModal = (props, ref) => {
     return {
       open: (params2) => {
         console.log("change", params2);
+        form.resetFields();
         setParams(params2);
         setOpen(true);
       }
@@ -159,9 +160,7 @@ var EditBookingModal = (props, ref) => {
     });
   }, [data]);
   const updateResource = (resource) => {
-    form.setFieldsValue({
-      resource
-    });
+    form.setFieldValue("resource", resource);
   };
   const originCacheItem = (0, import_react.useMemo)(() => {
     if (!data) {
@@ -211,9 +210,9 @@ var EditBookingModal = (props, ref) => {
     };
   }, [data, useToDate, useResource]);
   const initState = () => {
-    form.resetFields();
     setData(null);
     setOpen(false);
+    form.resetFields();
   };
   const onCancel = () => {
     initState();

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 interface FooterProps {
     state: any;
     reload: () => void;

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { SendModalValues } from './index';
 declare const useSendModal: (bookingId?: number) => {
     open: boolean;

package/lib/components/booking/forms/single/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 /**
  * @title: 表单选择器

package/lib/components/booking/hooks/useClearCart.d.ts

@@ -1,2 +1,3 @@
+/// <reference types="react" />
 declare const useClearCart: (state: any, dispatch: any) => false | JSX.Element;
 export default useClearCart;

package/lib/components/booking/info/clientVariant/hooks/useClientFn.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { FormState } from '../../../model';
 interface useClientFnParams {
     state: any;

package/lib/components/booking/info/date/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import "./index.less";
 export declare const updateServiceDate: (services: any[], date: any, isTime: boolean) => any[];
 declare const DateCom: () => JSX.Element;

package/lib/components/booking/info/header/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 declare const header: ({ state, dispatch }: any) => JSX.Element;
 export default header;

package/lib/components/booking/info/hooks/useInfoHolder.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { EditServiceRef } from "../service/editService";
 declare const useInfoHolder: (state: any, dispatch: any) => {
     detailRef: import("react").MutableRefObject<EditServiceRef | undefined>;

package/lib/components/booking/info/notes/index.d.ts

@@ -1,2 +1,3 @@
+/// <reference types="react" />
 declare const Notes: () => JSX.Element | null;
 export default Notes;

package/lib/components/booking/info/service/Lists.d.ts

@@ -1,3 +1,2 @@
-/// <reference types="react" />
 declare const Lists: ({ onEdit, onChange, onAction, isParallelResource }: any) => JSX.Element;
 export default Lists;

package/lib/components/booking/info/service/actions/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import "./index.less";
 declare const Actions: ({ currentService }: {
     currentService: any;

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

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

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: any;
+    locale: string;
     slice: any;
     selectProps: {
         size: string;

package/lib/components/booking/info/service/addTimeModal/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 declare const AddTimeModal: () => JSX.Element;
 export default AddTimeModal;

package/lib/components/booking/info/service/serviceList/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 declare const ServiceList: ({ onEdit }: {
     onEdit: any;

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

@@ -248,4 +248,4 @@ export declare const updateAppointmentServicePrice: (state: any, { start_date, e
  * @Author: WangHan
  * @Date: 2024-12-24 11:32
  */
-export declare const updateServicePrice: (state: any) => Promise<any> | never[];
+export declare const updateServicePrice: (state: any) => never[] | Promise<any>;

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

@@ -145,7 +145,8 @@ var isBooking4Shop = (shopId, renderType, businessUtils) => {
     8824,
     8913,
     8918,
-    6413
+    6413,
+    8943
   ];
   return booking4Shops.includes(shopId) || (businessUtils == null ? void 0 : businessUtils.getAppByModal("resourcekit"));
 };

package/lib/components/booking/info2/service/actions/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import '../../../info/service/actions/index.less';
 declare const Actions: ({ currentService }: {
     currentService: any;

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

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

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: any;
+    locale: string;
     slice: any;
     selectProps: {
         size: string;

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

@@ -232,9 +232,21 @@ var setDefaultResource = ({ cacheItem, resources }) => {
   const serviceParams = (0, import_utils.getCacheParams)();
   let resourceId = Number(serviceParams == null ? void 0 : serviceParams.resource_id);
   for (let item of resources) {
-    const renderList = item.renderList.filter(
-      (d) => d.is_default == 1 || d.id === resourceId
-    );
+    const {
+      select_type = {},
+      optional_resource = [],
+      default_resource = []
+    } = item;
+    const renderList = item.renderList.filter((d) => {
+      if ((select_type == null ? void 0 : select_type.type) === "single") {
+        if (resourceId && (optional_resource.includes(resourceId) || default_resource.includes(resourceId))) {
+          return d.id === resourceId;
+        }
+        return d.is_default === 1;
+      } else {
+        return d.is_default === 1 || d.id === resourceId;
+      }
+    });
     let defaultOriginalResource = [];
     if (renderList.length === 0) {
       defaultOriginalResource = getResourceMaxFreeTime(item);

package/lib/components/booking/info2/service/serviceList/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 declare const ServiceList: ({ onEdit }: {
     onEdit: any;

package/lib/components/booking/materiels/contacts/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import "./index.less";
 declare type ContactType = {
     country_calling_code: string;

package/lib/components/booking/materiels/duration/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { SelectProps } from 'antd';
 interface DurationProps extends SelectProps {
     locale?: string;