@pisell/private-materials 3.3.107 → 3.4.1

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

@@ -5,9 +5,6 @@ interface PayProps {
     order_id: string;
     amount: number;
     sale_channel?: string;
-    is_deposit?: number;
-    deposit_amount?: number;
-    total_amount?: number;
 }
 interface CheckoutContextType {
     onCheckBeforeBooking: (data: any) => Promise<{
@@ -18,7 +15,6 @@ interface CheckoutContextType {
     onPay: (payProps: PayProps) => void;
     createBooking: any;
     checkBeforeBooking: any;
-    freePay: any;
 }
 interface CheckoutProviderProps {
     children: React.ReactNode;

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

@@ -41,7 +41,6 @@ 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
@@ -55,7 +54,6 @@ 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) => {
@@ -78,17 +76,6 @@ 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) => {
@@ -107,40 +94,21 @@ 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) => {
-    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;
+    utils.action({
+      type: "pisell1.payment",
+      data: payProps,
+      callback: (e) => {
+        checkoutCallback.current && checkoutCallback.current(e);
       }
-      freePay.runAsync(payProps.order_id);
-    }
+    });
   };
   const contextValue = {
     onCheckBeforeBooking,
     onCheckout,
     onPay,
     createBooking,
-    checkBeforeBooking,
-    freePay
+    checkBeforeBooking
   };
   return /* @__PURE__ */ import_react.default.createElement(CheckoutContext.Provider, { value: contextValue }, children);
 };

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

@@ -1,15 +1,2 @@
-/**
- * @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,8 +20,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var serve_exports = {};
 __export(serve_exports, {
   checkBeforeBookingApi: () => checkBeforeBookingApi,
-  createBookingApi: () => createBookingApi,
-  freePayApi: () => freePayApi
+  createBookingApi: () => createBookingApi
 });
 module.exports = __toCommonJS(serve_exports);
 var import_utils = require("../../../utils");
@@ -31,12 +30,8 @@ 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,
-  freePayApi
+  createBookingApi
 });

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

@@ -24,7 +24,12 @@ export declare const formatProductBundle: (bundle: any) => any;
  * @Author: xiangfeng.xue
  * @Date: 2025-01-21 17:57
  */
-export declare const formatValues: (state: any, excludeDisabled?: boolean, otherValue?: Record<string, any>) => any;
+export declare const formatValues: (params: {
+    state: any;
+    platform: 'h5' | 'pc';
+    excludeDisabled?: boolean;
+    extra?: Record<string, any>;
+}) => any;
 /**
  * @title: 获取拉开表单弹窗参数
  * @param state

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

@@ -61,26 +61,26 @@ var formatBookings = (list) => {
   });
   return bookings;
 };
-var formatValues = (state, excludeDisabled, otherValue) => {
+var formatValues = (params) => {
   var _a, _b;
+  const { state, platform, excludeDisabled, extra } = params;
   let values = {
     type: "event_booking_v2",
-    platform: "H5",
+    platform: platform === "pc" ? "PC" : "H5",
     sales_channel: "my_pisel",
     order_sales_channel: "online_store",
     bookings: [],
     shop_note: "",
     schedule_date: "",
-    ...otherValue || {}
+    ...extra || {}
   };
+  console.log("values", values);
   let data = [];
   if (excludeDisabled) {
     data = (_b = (_a = state.cartData.cartItems) == null ? void 0 : _a.filter) == null ? void 0 : _b.call(_a, (v) => v.disabled !== true);
   } 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/Customer/index.d.ts

@@ -2,6 +2,7 @@ import React from 'react';
 interface CustomerData {
 }
 interface CustomerContextType {
+    appContext: any;
     appUtils: any;
     isLogin: () => boolean;
     openLoginModal: (params: any) => void;

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

@@ -67,6 +67,7 @@ var CustomerProvider = ({
     return (userInfo == null ? void 0 : userInfo.id) ? userInfo : localUserInfo;
   };
   const contextValue = {
+    appContext: context,
     appUtils: utils,
     isLogin,
     openLoginModal,

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

@@ -7,16 +7,6 @@ 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,7 +39,6 @@ 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
@@ -49,7 +48,6 @@ 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) || {},
@@ -63,11 +61,7 @@ var SummaryProvider = ({
     total: summaryData.total,
     taxTitle: summaryData.taxTitle,
     totalTaxFee: summaryData.totalTaxFee,
-    isPriceIncludeTax: summaryData.isPriceIncludeTax,
-    deposit: summaryData.deposit,
-    isAgreeDepositPolicy,
-    setIsAgreeDepositPolicy,
-    getDepositProtocol: import_serve.getDepositProtocolApi
+    isPriceIncludeTax: summaryData.isPriceIncludeTax
   };
   return /* @__PURE__ */ import_react.default.createElement(SummaryContext.Provider, { value: contextValue }, children);
 };

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

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

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

@@ -1,32 +0,0 @@
-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,11 +10,6 @@ interface PriceDetail {
     taxTitle?: string;
     totalTaxFee?: string;
     isPriceIncludeTax?: 0 | 1;
-    deposit?: {
-        total: string;
-        protocols: any[];
-        hasDeposit: boolean;
-    };
 }
 /**
  * 计算商品小计（不含其他费用）
@@ -38,14 +33,4 @@ 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,7 +29,6 @@ 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
@@ -66,44 +65,16 @@ 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,
-    deposit
+    isPriceIncludeTax: shopInfo == null ? void 0 : shopInfo.is_price_include_tax
   };
 };
-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/Cart/Item/index.js

@@ -98,7 +98,6 @@ var CartItem = ({ onNext }) => {
         ...resourceOtherParams,
         errorList: null
       });
-      val.like_status = "like";
       appointmentBooking.updateCart({
         _id: e == null ? void 0 : e._id,
         resources: (0, import_utils2.updateCartResources)(e, val, currentSelectedResources)

package/lib/components/appointmentBooking/components/Cart/Item/index.less

@@ -1,5 +1,5 @@
 .appointment-cart-item-wrap {
-  height: calc(var(--vh, 1vh) * 100 - 100px);
+  height: calc(100vh - 100px);
   display: flex;
   flex-direction: column;
 
@@ -39,7 +39,7 @@
   flex-direction: column;
   align-items: start;
 
-  > div {
+  >div {
     display: flex;
     align-items: center;
     justify-content: space-between;
@@ -105,4 +105,4 @@
     flex: none;
     z-index: 10;
   }
-}
+}

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

@@ -190,10 +190,6 @@ 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",
     {
@@ -218,8 +214,7 @@ var Layout = () => {
       onConfirm: () => closePolicy(true),
       item: policyParams == null ? void 0 : policyParams.content,
       onChange: () => setLoading(false),
-      isHideCheckout: false,
-      depositProtocolRequest
+      isHideCheckout: false
     }
   ) : null);
 };

package/lib/components/appointmentBooking/components/Content/index.less

@@ -107,7 +107,7 @@
     margin-top: 0;
 
     .appointment-cart-item-wrap {
-      height: calc(var(--vh, 1vh) * 100 - 16px) !important;
+      height: calc(100vh - 16px) !important;
     }
   }
 }

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

@@ -1,9 +1,3 @@
 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,7 +29,6 @@ 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);
@@ -39,13 +38,9 @@ var import_deposit = __toESM(require("../../deposit"));
 var import_context = require("../../context");
 var import_utils = require("@pisell/utils");
 var import_index = require("./index.less");
-var DepositContent = (props) => {
-  const {
-    isAgreeDepositPolicy,
-    setIsAgreeDepositPolicy,
-    deposit,
-    depositProtocolRequest
-  } = props;
+var Deposit = () => {
+  const { setIsAgreeDepositPolicy, isAgreeDepositPolicy, summary } = (0, import_context.useAppointmentBookingContext)();
+  const { deposit } = summary;
   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,
     {
@@ -59,35 +54,8 @@ var DepositContent = (props) => {
       total: deposit == null ? void 0 : deposit.total,
       protocols: deposit == null ? void 0 : deposit.protocols,
       isAgreePolicy: isAgreeDepositPolicy,
-      onChange: (value) => setIsAgreeDepositPolicy(value),
-      depositProtocolRequest
+      onChange: (value) => setIsAgreeDepositPolicy(value)
     }
   ));
 };
-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/Form/index.js

@@ -87,7 +87,12 @@ var Form = (0, import_react.forwardRef)((props, ref) => {
     setOtherData(key, { ...newData });
     appointmentBooking.updateCart({
       _id: appointmentBoard == null ? void 0 : appointmentBoard.cart_id,
-      relationForms: (0, import_utils2.updateRelationForms)(carts, appointmentBoard, values)
+      relationForms: (0, import_utils2.updateRelationForms)(
+        carts,
+        appointmentBoard,
+        values,
+        currentStepParams == null ? void 0 : currentStepParams.key
+      )
     });
   };
   const handleFormFinish = (status, values) => {

package/lib/components/appointmentBooking/components/Form/utils.d.ts

@@ -5,4 +5,4 @@
  * @Author: WangHan
  * @Date: 2025-05-26 16:58
  */
-export declare const updateRelationForms: (carts: any[], currentCart: any, values: any) => any;
+export declare const updateRelationForms: (carts: any[], currentCart: any, values: any, currentStepKey?: string) => any;

package/lib/components/appointmentBooking/components/Form/utils.js

@@ -22,24 +22,21 @@ __export(utils_exports, {
   updateRelationForms: () => updateRelationForms
 });
 module.exports = __toCommonJS(utils_exports);
-var updateRelationForms = (carts, currentCart, values) => {
-  var _a, _b;
+var updateRelationForms = (carts, currentCart, values, currentStepKey) => {
+  var _a;
   if (!(currentCart == null ? void 0 : currentCart.cart_id)) return [];
   const cartItem = carts == null ? void 0 : carts.find(
     (item) => (item == null ? void 0 : item._id) === (currentCart == null ? void 0 : currentCart.cart_id)
   );
   let oldLists = ((_a = cartItem == null ? void 0 : cartItem._origin) == null ? void 0 : _a.relation_forms) || [];
-  const newData = { form_id: Number(values == null ? void 0 : values.form_id), form_record_id: values == null ? void 0 : values.form_record_id };
-  const exist = oldLists.find((item) => item.form_id === (newData == null ? void 0 : newData.form_id));
-  if (exist) {
-    if (!((_b = exist == null ? void 0 : exist.form_record_ids) == null ? void 0 : _b.includes(newData.form_record_id))) {
-      exist.form_record_ids.push(newData.form_record_id);
-    }
+  const newData = { form_id: Number(values == null ? void 0 : values.form_id), form_record_ids: [values == null ? void 0 : values.form_record_id], cartId: currentCart == null ? void 0 : currentCart.cart_id, currentStepKey };
+  const existIndex = oldLists.findIndex(
+    (item) => item.cartId === newData.cartId && item.form_id === newData.form_id && item.currentStepKey === newData.currentStepKey
+  );
+  if (existIndex > -1) {
+    oldLists[existIndex].form_record_ids = newData.form_record_ids;
   } else {
-    oldLists.push({
-      form_id: newData.form_id,
-      form_record_ids: [newData.form_record_id]
-    });
+    oldLists = oldLists.concat(newData);
   }
   return oldLists;
 };

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

@@ -99,6 +99,7 @@ var Header = () => {
     if (key.startsWith("fill-form")) {
       const form_key = "booking_form";
       let booking_form = getOtherData(form_key);
+      removeStep(key);
       setOtherData(form_key, { ...booking_form, [key]: {} });
     }
     appointmentBooking.back();

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

@@ -154,7 +154,6 @@ var Resource = (0, import_react.forwardRef)((props, ref) => {
       const index = carts.findIndex(
         (n) => !(appointmentBooking == null ? void 0 : appointmentBooking.isTargetCartIdNormalProduct(n._id))
       );
-      e.like_status = "like";
       return appointmentBooking.updateCart({
         _id: (_a = carts == null ? void 0 : carts[index]) == null ? void 0 : _a._id,
         resources: (0, import_utils.updateCartResources)(carts == null ? void 0 : carts[index], e)

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

@@ -74,7 +74,9 @@ var Services = (0, import_react.forwardRef)((props, ref) => {
     let type = "";
     if (!isRetailTemplate) {
       type = await checkProductType(item == null ? void 0 : item.id);
-      appointmentBooking.openProductDetail(item.id);
+      if (type === "session") {
+        appointmentBooking.openProductDetail(item.id);
+      }
     }
     utils == null ? void 0 : utils.action({
       type: "pisell1.productDetail",
@@ -84,10 +86,6 @@ var Services = (0, import_react.forwardRef)((props, ref) => {
       },
       callback: async (data) => {
         var _a, _b;
-        if (data.isCancel) {
-          appointmentBooking.closeProductDetail();
-          return;
-        }
         const product = {
           ...data,
           options: (data == null ? void 0 : data.option) || []
@@ -98,6 +96,13 @@ var Services = (0, import_react.forwardRef)((props, ref) => {
           appointmentBooking.storeProduct(product);
           return;
         }
+        if (data == null ? void 0 : data.isCancel) {
+          if (type === "session") {
+            appointmentBooking.closeProductDetail();
+            appointmentBooking.getAvailableDate();
+          }
+          return;
+        }
         const session = data == null ? void 0 : data.session;
         if (session) {
           const startDate = (0, import_dayjs.default)(session == null ? void 0 : session.start_at).format("YYYY-MM-DD");
@@ -109,6 +114,7 @@ var Services = (0, import_react.forwardRef)((props, ref) => {
               endTime: `${endDate} ${session == null ? void 0 : session.end_time}`
             }
           });
+          appointmentBooking.closeProductDetail();
           await appointmentBooking.getAvailableDate({
             startDate,
             endDate
@@ -126,7 +132,6 @@ var Services = (0, import_react.forwardRef)((props, ref) => {
             await appointmentBooking.getAvailableDate();
           }
         }
-        appointmentBooking.closeProductDetail();
         if (isDateSelectedFirst) {
           const index = (currentStep == null ? void 0 : currentStep.index) + 2;
           if (type === "duration" || appointmentBooking.isCartHasDurationProduct()) {