@pisell/private-materials 3.3.73 → 3.3.75

package/es/components/stepController/components/Footer/index.less

@@ -0,0 +1,39 @@
+.pisell-step-controller-footer-wrap {
+  position: sticky;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  width: 100%;
+  background: #fff;
+  // box-shadow: 0 -2px 8px rgba(0, 0, 0, 0.04);
+  padding: 24px;
+  z-index: 100;
+  border-top: 1px solid var(--Gray-100, #f2f4f7);
+
+  .pisell-step-controller-footer {
+    width: 1000px;
+    margin: 0 auto;
+    max-width: 100%;
+    display: flex;
+    gap: 12px;
+    justify-content: flex-end;
+
+    .pisell-section-headers-main {
+      color: var(--Gray-900, #101828);
+      font-size: 14px;
+      font-weight: 400;
+      line-height: 20px;
+      justify-content: start;
+
+      .select-text {
+        font-size: 18px;
+        font-weight: 600;
+        line-height: 24px;
+      }
+    }
+  }
+}
+
+.pisell-step-controller-footer-wrap-mobile {
+  border-top: 1px solid #eaecf0;
+}

package/es/components/stepController/components/Header/index.d.ts

@@ -0,0 +1,20 @@
+import React from 'react';
+import { Step } from '../../types';
+import './index.less';
+export interface HeaderProps {
+    steps: Step[];
+    currentStepIndex: number;
+    className?: string;
+    style?: React.CSSProperties;
+    onBack?: (key: string) => void;
+    onClose?: () => void;
+    confirmCloseProps?: {
+        isConfirmClose?: boolean;
+        title?: string;
+        content?: string;
+        okText?: string;
+        cancelText?: string;
+    };
+}
+declare const Header: React.FC<HeaderProps>;
+export default Header;

package/es/components/stepController/components/Header/index.js

@@ -0,0 +1,97 @@
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
+function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+import React, { useState } from 'react';
+import { PisellHeaderProgressBar, PisellModal } from '@pisell/materials';
+import { locales } from '@pisell/utils';
+import "./index.less";
+var Header = function Header(_ref) {
+  var _steps$currentStepInd;
+  var steps = _ref.steps,
+    currentStepIndex = _ref.currentStepIndex,
+    style = _ref.style,
+    onBack = _ref.onBack,
+    onClose = _ref.onClose,
+    confirmCloseProps = _ref.confirmCloseProps;
+  var _useState = useState(false),
+    _useState2 = _slicedToArray(_useState, 2),
+    open = _useState2[0],
+    setOpen = _useState2[1];
+
+  /**
+   * @title: 点击关闭
+   * @description:
+   * @return {*}
+   * @Author: WangHan
+   * @Date: 2025-01-14 22:41
+   */
+  var handleClose = function handleClose() {
+    // 二次确认
+    if (confirmCloseProps !== null && confirmCloseProps !== void 0 && confirmCloseProps.isConfirmClose) {
+      setOpen(true);
+    } else {
+      onClose === null || onClose === void 0 || onClose();
+    }
+  };
+
+  /**
+   * @title: 点击退出
+   * @description:
+   * @return {*}
+   * @Author: WangHan
+   * @Date: 2025-02-10 17:46
+   */
+  var handleOk = function handleOk() {
+    setOpen(false);
+    onClose === null || onClose === void 0 || onClose();
+  };
+
+  /**
+   * @title: 返回上一步
+   * @description:
+   * @return {*}
+   * @Author: WangHan
+   * @Date: 2025-06-12 16:44
+   */
+  var handleBack = function handleBack() {
+    if (!steps) return;
+    if (currentStepIndex > 0) {
+      var prevKey = steps[currentStepIndex - 1].key;
+      onBack === null || onBack === void 0 || onBack(prevKey);
+    }
+  };
+  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(PisellHeaderProgressBar, {
+    className: "pisell-step-controller-header",
+    style: style,
+    stepText: locales.getText('pisell2.step.controller.step')(currentStepIndex + 1),
+    title: steps === null || steps === void 0 || (_steps$currentStepInd = steps[currentStepIndex]) === null || _steps$currentStepInd === void 0 ? void 0 : _steps$currentStepInd.description,
+    showClose: true,
+    onBack: handleBack,
+    onClose: handleClose,
+    enableBorder: true,
+    borderColor: "#EAECF0",
+    showBack: currentStepIndex > 0 || false
+  }), /*#__PURE__*/React.createElement(PisellModal.Information, {
+    open: open,
+    title: (confirmCloseProps === null || confirmCloseProps === void 0 ? void 0 : confirmCloseProps.title) || '',
+    describe: (confirmCloseProps === null || confirmCloseProps === void 0 ? void 0 : confirmCloseProps.content) || '',
+    okText: (confirmCloseProps === null || confirmCloseProps === void 0 ? void 0 : confirmCloseProps.okText) || '',
+    cancelText: (confirmCloseProps === null || confirmCloseProps === void 0 ? void 0 : confirmCloseProps.cancelText) || '',
+    closable: true,
+    okButtonProps: {
+      style: {
+        backgroundColor: '#D92D20'
+      }
+    },
+    onCancel: function onCancel() {
+      setOpen(false);
+    },
+    onOk: function onOk() {
+      return handleOk();
+    }
+  }));
+};
+export default Header;

package/es/components/stepController/components/Header/index.less

@@ -0,0 +1,21 @@
+.pisell-step-controller-header {
+  .pisell-section-headers-content {
+    width: 1000px;
+    margin: 0 auto;
+    max-width: 100%;
+
+    .pisell-section-headers-main {
+      color: var(--Gray-900, #101828);
+      font-size: 14px;
+      font-weight: 400;
+      line-height: 20px;
+      justify-content: start;
+
+      .select-text {
+        font-size: 18px;
+        font-weight: 600;
+        line-height: 24px;
+      }
+    }
+  }
+}

package/es/components/stepController/index.d.ts

@@ -0,0 +1,5 @@
+import React from 'react';
+import { StepControllerProps } from './types';
+import './index.less';
+declare const StepController: React.FC<StepControllerProps>;
+export default StepController;

package/es/components/stepController/index.js

@@ -0,0 +1,64 @@
+import React, { useMemo } from 'react';
+import classNames from 'classnames';
+import { locales } from '@pisell/utils';
+import { usePisellConfig } from '@pisell/materials';
+import useEngineContext from "../../hooks/useEngineContext";
+import { useWindowSize } from "../../hooks/useWindowSize";
+import Header from "./components/Header";
+import Footer from "./components/Footer";
+import Content from "./components/Content";
+import localeTexts from "./locales";
+import "./index.less";
+var StepController = function StepController(_ref) {
+  var _context$engine;
+  var steps = _ref.steps,
+    currentStep = _ref.currentStep,
+    children = _ref.children,
+    onBack = _ref.onBack,
+    confirmCloseProps = _ref.confirmCloseProps,
+    showFooter = _ref.showFooter,
+    footerContent = _ref.footerContent,
+    onClose = _ref.onClose;
+  var context = useEngineContext();
+  locales.init(localeTexts, (context === null || context === void 0 || (_context$engine = context.engine) === null || _context$engine === void 0 || (_context$engine = _context$engine.props) === null || _context$engine === void 0 ? void 0 : _context$engine.locale) || 'en');
+
+  // 监听窗口大小变化，重新计算vh
+  useWindowSize({
+    debounceMs: 200
+  });
+
+  /**
+   * @title: 是否是移动端
+   * @description:
+   * @return {*}
+   * @Author: WangHan
+   * @Date: 2025-06-12 15:56
+   */
+  var isMobile = useMemo(function () {
+    var config = usePisellConfig();
+    var platform = (config === null || config === void 0 ? void 0 : config.platform) || 'h5';
+    return platform === 'h5';
+  }, []);
+  var currentStepIndex = useMemo(function () {
+    return (steps === null || steps === void 0 ? void 0 : steps.findIndex(function (step) {
+      return step.key === currentStep;
+    })) || 0;
+  }, [steps, currentStep]);
+  return /*#__PURE__*/React.createElement("div", {
+    className: classNames('pisell-step-controller', {
+      'pisell-step-controller-mobile': isMobile
+    })
+  }, /*#__PURE__*/React.createElement(Header, {
+    steps: steps,
+    currentStepIndex: currentStepIndex,
+    confirmCloseProps: confirmCloseProps,
+    onBack: onBack,
+    onClose: onClose
+  }), /*#__PURE__*/React.createElement(Content, {
+    children: children
+  }), showFooter && footerContent ? /*#__PURE__*/React.createElement(Footer, {
+    children: footerContent,
+    isMobile: isMobile
+  }) : null);
+};
+export default StepController;

package/es/components/stepController/index.less

@@ -0,0 +1,11 @@
+.pisell-step-controller {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  height: calc(var(--vh, 1vh) * 100);
+  box-sizing: border-box;
+  overflow-y: auto;
+}
+
+.pisell-step-controller-mobile {
+}

package/es/components/stepController/locales.d.ts

@@ -0,0 +1,27 @@
+declare const _default: {
+    en: {
+        'pisell2.step.controller.step': (step: number) => string;
+        'pisell2.step.controller.sendEmail': string;
+        'pisell2.step.controller.copy': string;
+        'pisell2.step.controller.download': string;
+        'pisell2.step.controller.preview': string;
+        'pisell2.step.controller.continue': string;
+    };
+    'zh-CN': {
+        'pisell2.step.controller.step': (step: number) => string;
+        'pisell2.step.controller.sendEmail': string;
+        'pisell2.step.controller.copy': string;
+        'pisell2.step.controller.download': string;
+        'pisell2.step.controller.preview': string;
+        'pisell2.step.controller.continue': string;
+    };
+    'zh-HK': {
+        'pisell2.step.controller.step': (step: number) => string;
+        'pisell2.step.controller.sendEmail': string;
+        'pisell2.step.controller.copy': string;
+        'pisell2.step.controller.download': string;
+        'pisell2.step.controller.preview': string;
+        'pisell2.step.controller.continue': string;
+    };
+};
+export default _default;

package/es/components/stepController/locales.js

@@ -0,0 +1,32 @@
+export default {
+  en: {
+    'pisell2.step.controller.step': function pisell2StepControllerStep(step) {
+      return "Step ".concat(step || 1);
+    },
+    'pisell2.step.controller.sendEmail': 'Send Email',
+    'pisell2.step.controller.copy': 'Copy',
+    'pisell2.step.controller.download': 'Download',
+    'pisell2.step.controller.preview': 'Preview',
+    'pisell2.step.controller.continue': 'Continue'
+  },
+  'zh-CN': {
+    'pisell2.step.controller.step': function pisell2StepControllerStep(step) {
+      return "\u6B65\u9AA4 ".concat(step || 1);
+    },
+    'pisell2.step.controller.sendEmail': '发送邮件',
+    'pisell2.step.controller.copy': '复制',
+    'pisell2.step.controller.download': '下载',
+    'pisell2.step.controller.preview': '预览',
+    'pisell2.step.controller.continue': '继续'
+  },
+  'zh-HK': {
+    'pisell2.step.controller.step': function pisell2StepControllerStep(step) {
+      return "\u6B65\u9A5F ".concat(step || 1);
+    },
+    'pisell2.step.controller.sendEmail': '發送郵件',
+    'pisell2.step.controller.copy': '複製',
+    'pisell2.step.controller.download': '下載',
+    'pisell2.step.controller.preview': '預覽',
+    'pisell2.step.controller.continue': '繼續'
+  }
+};

package/es/components/stepController/types.d.ts

@@ -0,0 +1,23 @@
+/// <reference types="react" />
+export interface Step {
+    key: string;
+    description: string;
+}
+export interface StepControllerProps extends Step {
+    steps: Step[];
+    currentStep: string;
+    isLastStep?: boolean;
+    isMobile?: boolean;
+    children?: React.ReactNode;
+    onBack?: (key: string) => void;
+    onClose?: () => void;
+    confirmCloseProps?: {
+        isConfirmClose?: boolean;
+        title?: string;
+        content?: string;
+        okText?: string;
+        cancelText?: string;
+    };
+    showFooter?: boolean;
+    footerContent?: React.ReactNode;
+}

package/es/components/stepController/types.js

@@ -0,0 +1 @@
+export {};

package/es/hooks/useComponents.js

@@ -8,7 +8,7 @@ var useComponents = function useComponents(params) {
     var _utils$getComponents;
     var _ref = appHelper || {},
       utils = _ref.utils;
-    return (utils === null || utils === void 0 || (_utils$getComponents = utils.getComponents) === null || _utils$getComponents === void 0 ? void 0 : _utils$getComponents.call(utils, components)) || [];
+    return (utils === null || utils === void 0 ? void 0 : (_utils$getComponents = utils.getComponents) === null || _utils$getComponents === void 0 ? void 0 : _utils$getComponents.call(utils, components)) || [];
   }, [components]);
   return Cpt;
 };

package/es/hooks/useWindowSize.d.ts

@@ -0,0 +1,5 @@
+interface UseWindowSizeOptions {
+    debounceMs?: number;
+}
+export declare const useWindowSize: (options?: UseWindowSizeOptions) => void;
+export {};

package/es/hooks/useWindowSize.js

@@ -0,0 +1,26 @@
+import { useEffect } from 'react';
+export var useWindowSize = function useWindowSize() {
+  var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+  var _options$debounceMs = options.debounceMs,
+    debounceMs = _options$debounceMs === void 0 ? 100 : _options$debounceMs;
+  useEffect(function () {
+    var timeoutId;
+    var setRealVH = function setRealVH() {
+      // window.innerHeight 会返回视口真实的高度（不包括工具栏）
+      var vh = window.innerHeight * 0.01;
+      document.documentElement.style.setProperty('--vh', "".concat(vh, "px"));
+    };
+    var debouncedHandleResize = function debouncedHandleResize() {
+      clearTimeout(timeoutId);
+      timeoutId = setTimeout(setRealVH, debounceMs);
+    };
+
+    // 页面加载和窗口大小变化时都重新计算
+    debouncedHandleResize();
+    window.addEventListener('resize', debouncedHandleResize);
+    return function () {
+      window.removeEventListener('resize', debouncedHandleResize);
+      clearTimeout(timeoutId);
+    };
+  }, [debounceMs]);
+};

package/es/index.d.ts

@@ -43,3 +43,4 @@ export { default as AppointmentBooking } from './components/appointmentBooking';
 export { default as AppointmentDeposit } from './components/appointmentBooking/deposit';
 export { default as TicketBooking } from './components/ticketBooking';
 export { default as SubTotal } from './components/subTotal';
+export { default as StepController } from './components/stepController';

package/es/index.js

@@ -46,4 +46,5 @@ export { default as ShoppingCart } from "./components/shoppingCart";
 export { default as AppointmentBooking } from "./components/appointmentBooking";
 export { default as AppointmentDeposit } from "./components/appointmentBooking/deposit";
 export { default as TicketBooking } from "./components/ticketBooking";
-export { default as SubTotal } from "./components/subTotal";
+export { default as SubTotal } from "./components/subTotal";
+export { default as StepController } from "./components/stepController";

package/es/utils/index.d.ts

@@ -18,6 +18,6 @@ declare let modal: Omit<ModalStaticFunctions, 'warn'>;
 export declare const setModal: (m: Omit<ModalStaticFunctions, 'warn'>) => void;
 export declare const saveConfirm: () => Promise<{
     destroy: () => void;
-    update: (configUpdate: import("antd/es/modal/interface").ModalFuncProps | ((prevConfig: import("antd/es/modal/interface").ModalFuncProps) => import("antd/es/modal/interface").ModalFuncProps)) => void;
+    update: (configUpdate: import("antd").ModalFuncProps | ((prevConfig: import("antd").ModalFuncProps) => import("antd").ModalFuncProps)) => void;
 }>;
 export { modal };

package/lib/businessModel/SalesModel/Sales/index.js

@@ -35,6 +35,7 @@ __export(Sales_exports, {
 });
 module.exports = __toCommonJS(Sales_exports);
 var import_react = __toESM(require("react"));
+var import_useEngineContext = __toESM(require("../../../hooks/useEngineContext"));
 var defaultData = {};
 var SALES_MODEL_SESSION_STORAGE_KEY = "shop_h5_sales_model_data";
 var SalesContext = (0, import_react.createContext)(
@@ -45,14 +46,13 @@ var SalesProvider = (props) => {
   const dataRef = (0, import_react.useRef)({});
   const [data, setData] = (0, import_react.useState)(defaultData);
   const [hooks, setHooks] = (0, import_react.useState)(props.hooks);
+  const context = (0, import_useEngineContext.default)();
+  const utils = context.appHelper.utils || {};
   const _setData = (newData) => {
     dataRef.current = { ...dataRef.current, ...newData };
     console.log("sales_model_newData", dataRef.current);
     if (config == null ? void 0 : config.useSessionStorage) {
-      sessionStorage.setItem(
-        SALES_MODEL_SESSION_STORAGE_KEY,
-        JSON.stringify(dataRef.current || {})
-      );
+      setSessionStorage();
     }
     setData({ ...dataRef.current });
   };
@@ -60,14 +60,28 @@ var SalesProvider = (props) => {
     return dataRef.current;
   };
   const setSessionStorage = () => {
+    var _a, _b, _c;
+    const history = ((_a = utils == null ? void 0 : utils.getHistory) == null ? void 0 : _a.call(utils)) || {};
+    const cacheId = ((_c = (_b = history == null ? void 0 : history.location) == null ? void 0 : _b.query) == null ? void 0 : _c.cacheId) || "";
+    const sessionData = { ...dataRef.current || {}, cacheId };
     sessionStorage.setItem(
-      SALES_MODEL_SESSION_STORAGE_KEY,
-      JSON.stringify(dataRef.current || {})
+      `${SALES_MODEL_SESSION_STORAGE_KEY}`,
+      JSON.stringify(sessionData || {})
     );
   };
   const getSessionStorage = () => {
-    const result = sessionStorage.getItem(SALES_MODEL_SESSION_STORAGE_KEY);
-    return JSON.parse(result || "{}");
+    var _a, _b, _c;
+    const history = ((_a = utils == null ? void 0 : utils.getHistory) == null ? void 0 : _a.call(utils)) || {};
+    const strResult = sessionStorage.getItem(SALES_MODEL_SESSION_STORAGE_KEY);
+    const result = strResult ? JSON.parse(strResult || "{}") : {};
+    const cacheId = ((_c = (_b = history == null ? void 0 : history.location) == null ? void 0 : _b.query) == null ? void 0 : _c.cacheId) || "";
+    if (!cacheId && !(result == null ? void 0 : result.cacheId)) {
+      return result;
+    }
+    if (cacheId && (result == null ? void 0 : result.cacheId) === cacheId) {
+      return result;
+    }
+    return {};
   };
   const removeSessionStorage = () => {
     sessionStorage.removeItem(SALES_MODEL_SESSION_STORAGE_KEY);

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

@@ -90,7 +90,7 @@ var ResourceProvider = ({
     resourceMap.forEach((v) => renderData.push(v));
     return renderData;
   };
-  const getResourceList = (0, import_ahooks.useRequest)(import_serve.getResourceListApi, {
+  const getResourceList = (0, import_ahooks.useRequest)(import_serve.getSpecialResourceListApi, {
     manual: true,
     onSuccess: (res) => {
       const formatData = formatResourceList(res);

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

@@ -3,3 +3,10 @@ export declare const getResourceListApi: (params: {
     shop_id: string;
     form_data_status: string;
 }) => Promise<any>;
+/**
+ * @title: 获取特殊资源列表
+ * @Author: xiangfeng.xue
+ */
+export declare const getSpecialResourceListApi: (params: {
+    event_item_ids?: string | number[];
+}) => Promise<any>;

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

@@ -19,14 +19,21 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/components/Sales/Resource/serve.ts
 var serve_exports = {};
 __export(serve_exports, {
-  getResourceListApi: () => getResourceListApi
+  getResourceListApi: () => getResourceListApi,
+  getSpecialResourceListApi: () => getSpecialResourceListApi
 });
 module.exports = __toCommonJS(serve_exports);
 var import_utils = require("../../../utils");
 var getResourceListApi = (params) => {
   return import_utils.request.getRequest().get("/h5/form/data/v1", params, { useCache: true });
 };
+var getSpecialResourceListApi = (params) => {
+  return import_utils.request.getRequest().get("/h5/eventbookingv2/item/specify-resources", params, {
+    useCache: true
+  });
+};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  getResourceListApi
+  getResourceListApi,
+  getSpecialResourceListApi
 });

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

@@ -25,7 +25,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 - 购物车商品数组

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

@@ -74,7 +74,7 @@ var Header = () => {
     return ((_c = currentStep == null ? void 0 : currentStep.step) == null ? void 0 : _c.description) || "";
   }, [(_a = currentStep == null ? void 0 : currentStep.step) == null ? void 0 : _a.key, currentSelectedResources]);
   const handleBack = async () => {
-    var _a2, _b;
+    var _a2;
     const key = (_a2 = currentStep == null ? void 0 : currentStep.step) == null ? void 0 : _a2.key;
     const types = {
       "select-time": "time",
@@ -89,8 +89,7 @@ var Header = () => {
     }
     if (key === "select-service") {
       appointmentBooking.clearCart();
-      const type = await checkProductType((_b = carts == null ? void 0 : carts[0]) == null ? void 0 : _b.id);
-      if (type === "duration") {
+      if (appointmentBooking.isCartHasDurationProduct()) {
         appointmentBooking.deleteCartItemInfo("time");
       }
     }

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

@@ -122,18 +122,27 @@ var Services = (0, import_react.forwardRef)((props, ref) => {
             );
           }
           appointmentBooking.storeProduct(product);
+          if (type === "duration") {
+            await appointmentBooking.getAvailableDate();
+          }
         }
         appointmentBooking.closeProductDetail();
         if (isDateSelectedFirst) {
           const index = (currentStep == null ? void 0 : currentStep.index) + 2;
-          if (type === "duration") {
-            const description = import_utils.locales.getText(
-              "pisell2.appointment.select.time"
-            );
-            appointmentBooking.addStep(
-              { index, key: "select-time", description },
-              "select-resource"
+          if (type === "duration" || appointmentBooking.isCartHasDurationProduct()) {
+            const { stepList } = (0, import_hooks.useAppointmentBookingStep)();
+            const hasResourceStep = stepList == null ? void 0 : stepList.find(
+              (item2) => (item2 == null ? void 0 : item2.key) === "select-resource"
             );
+            if (hasResourceStep) {
+              const description = import_utils.locales.getText(
+                "pisell2.appointment.select.time"
+              );
+              appointmentBooking.addStep(
+                { index, key: "select-time", description },
+                "select-resource"
+              );
+            }
           } else {
             removeStep("select-time");
           }

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<boolean | undefined>;
+    handleOk: (values: SendModalValues) => Promise<any>;
 };
 export default useSendModal;

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/service2/utils.d.ts

@@ -244,4 +244,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/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/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/app.d.ts

@@ -1,5 +1,5 @@
 import { PosProps, RouteType } from './const';
-declare const App: ({ action, api, device_number, terminal, tyroUrl, tyroVersion, onChangeParams, isMobile, channel, formatAmount, ...props }: Omit<PosProps, "type" | "mode" | "getApi"> & {
+declare const App: ({ action, api, device_number, terminal, tyroUrl, tyroVersion, onChangeParams, isMobile, channel, formatAmount, ...props }: Omit<PosProps, "mode" | "type" | "getApi"> & {
     action: RouteType;
     device_number: string | number;
     api: ReturnType<PosProps['getApi']>;