@pisell/private-materials 6.0.25 → 6.2.1

package/lib/components/eventBooking/components/Provider/Cart/Item/Total.js

@@ -40,8 +40,9 @@ var import_useEngineContext = __toESM(require("../../../../../../hooks/useEngine
 var import_index = require("./index.less");
 var import_classnames = __toESM(require("classnames"));
 var Total = ({ className, isFooter }) => {
-  var _a, _b, _c, _d, _e, _f;
-  const { taxTitle, totalTaxFee, isPriceIncludeTax, total } = (0, import_Sales.useSummary)();
+  var _a, _b, _c, _d, _e, _f, _g, _h;
+  const { cartData } = (0, import_Sales.useCart)();
+  const { taxTitle, totalTaxFee, isPriceIncludeTax, total, deposit } = (0, import_Sales.useSummary)();
   const context = (0, import_useEngineContext.default)();
   console.log(
     taxTitle,
@@ -49,8 +50,10 @@ var Total = ({ className, isFooter }) => {
     totalTaxFee,
     total,
     (_c = (_b = (_a = context == null ? void 0 : context.appHelper) == null ? void 0 : _a.utils) == null ? void 0 : _b.getSymbolic) == null ? void 0 : _c.call(_b),
+    deposit,
     "wh97978"
   );
+  const showDeposit = ((_d = cartData == null ? void 0 : cartData.cartItems) == null ? void 0 : _d.length) > 0 && (deposit == null ? void 0 : deposit.hasDeposit);
   return /* @__PURE__ */ import_react.default.createElement("div", { className: `event-total-wrap ${className}` }, !isPriceIncludeTax && Number(totalTaxFee) > 0 ? /* @__PURE__ */ import_react.default.createElement("div", { className: "gst-wrap" }, /* @__PURE__ */ import_react.default.createElement("span", null, taxTitle, isFooter ? ": " : ""), /* @__PURE__ */ import_react.default.createElement(import_materials.PisellText.Amount, { value: totalTaxFee, showCurrencySymbol: true })) : null, /* @__PURE__ */ import_react.default.createElement(
     "div",
     {
@@ -58,16 +61,16 @@ var Total = ({ className, isFooter }) => {
         [["total-gst-wrap"]]: !isPriceIncludeTax && Number(totalTaxFee) > 0
       })
     },
-    /* @__PURE__ */ import_react.default.createElement("div", { className: "left" }, /* @__PURE__ */ import_react.default.createElement("div", null, /* @__PURE__ */ import_react.default.createElement("span", null, import_utils.locales.getText("pisell2.event.total"), isFooter ? ": " : ""), isFooter ? /* @__PURE__ */ import_react.default.createElement(
+    /* @__PURE__ */ import_react.default.createElement("div", { className: "left" }, /* @__PURE__ */ import_react.default.createElement("div", null, /* @__PURE__ */ import_react.default.createElement("span", null, isFooter && showDeposit ? import_utils.locales.getText("pisell2.appointment.deposit") : import_utils.locales.getText("pisell2.event.total"), isFooter ? ": " : ""), isFooter ? /* @__PURE__ */ import_react.default.createElement(
       import_materials.PisellText.Amount,
       {
-        value: total,
+        value: ((_e = cartData == null ? void 0 : cartData.cartItems) == null ? void 0 : _e.length) > 0 && (deposit == null ? void 0 : deposit.hasDeposit) ? deposit == null ? void 0 : deposit.total : total,
         showCurrencySymbol: true,
         className: "event-amount"
       }
     ) : null), isPriceIncludeTax && Number(totalTaxFee) > 0 ? /* @__PURE__ */ import_react.default.createElement("span", { className: "gst" }, import_utils.locales.getText("pisell2.event.total.gst")(
       `${isFooter ? `${taxTitle}: ` : taxTitle}`,
-      `${(_f = (_e = (_d = context == null ? void 0 : context.appHelper) == null ? void 0 : _d.utils) == null ? void 0 : _e.getSymbolic) == null ? void 0 : _f.call(_e)}${totalTaxFee}`
+      `${(_h = (_g = (_f = context == null ? void 0 : context.appHelper) == null ? void 0 : _f.utils) == null ? void 0 : _g.getSymbolic) == null ? void 0 : _h.call(_g)}${totalTaxFee}`
     )) : null),
     !isFooter ? /* @__PURE__ */ import_react.default.createElement(
       import_materials.PisellText.Amount,

package/lib/components/eventBooking/components/Provider/Cart/Item/index.js

@@ -39,8 +39,10 @@ var import_Sales = require("../../../../../Sales");
 var import_SelectHolderModal = __toESM(require("../../SelectHolderModal"));
 var import_ContinueButton = __toESM(require("../ContinueButton"));
 var import_Total = __toESM(require("./Total"));
+var import_Deposit = __toESM(require("../Deposit"));
 var import_index = require("./index.less");
 var CartItem = () => {
+  var _a;
   const { open, holderData, selectedHolderIds } = (0, import_Sales.useHolder)();
   const {
     deleteCartItem,
@@ -48,7 +50,7 @@ var CartItem = () => {
     cartData,
     addNoteToCartItem
   } = (0, import_Sales.useCart)();
-  const { subtotal } = (0, import_Sales.useSummary)();
+  const { deposit } = (0, import_Sales.useSummary)();
   const { isLastStep } = (0, import_Sales.useStep)();
   const handleClickCard = (e, type, key) => {
     if (type === "note") {
@@ -86,7 +88,7 @@ var CartItem = () => {
         onChange: (e, type, key) => handleClickCard(e, type, key)
       }
     )),
-    /* @__PURE__ */ import_react.default.createElement("div", { className: "event-footer" }, /* @__PURE__ */ import_react.default.createElement(import_Total.default, null), /* @__PURE__ */ import_react.default.createElement(import_ContinueButton.default, null))
+    /* @__PURE__ */ import_react.default.createElement("div", { className: "event-footer" }, /* @__PURE__ */ import_react.default.createElement(import_Total.default, null), ((_a = cartData == null ? void 0 : cartData.cartItems) == null ? void 0 : _a.length) > 0 && (deposit == null ? void 0 : deposit.hasDeposit) ? /* @__PURE__ */ import_react.default.createElement(import_Deposit.default, null) : null, /* @__PURE__ */ import_react.default.createElement(import_ContinueButton.default, null))
   ), /* @__PURE__ */ import_react.default.createElement(import_SelectHolderModal.default, { open }));
 };
 var Item_default = CartItem;

package/lib/components/eventBooking/components/Provider/Content/index.d.ts

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

package/lib/components/eventBooking/components/Provider/Event/index.js

@@ -39,25 +39,44 @@ var import_Sales = require("../../../../Sales");
 var import_bookingServiceList = __toESM(require("../../bookingServiceList"));
 var import_bookingDetailModal = __toESM(require("../../bookingDetailModal"));
 var import_index = require("./index.less");
+var import_useLoginUser = __toESM(require("../../../../../hooks/useLoginUser"));
 var Event = () => {
   var _a, _b;
   const { eventData, selectEvent, getEventList, getEventListByTitle } = (0, import_Sales.useEvent)();
   const { data } = (0, import_Sales.useSales)();
+  const { changeAutoOperate } = (0, import_Sales.useStep)();
   const { onOpenEventDetail, open } = (0, import_Sales.useEventDetail)();
   const [lists, setLists] = (0, import_react.useState)();
+  const customer = (0, import_useLoginUser.default)();
+  const { appUtils } = (0, import_Sales.useCustomer)();
   (0, import_react.useEffect)(() => {
-    setLists((eventData == null ? void 0 : eventData.eventList) || []);
+    var _a2;
+    const eventList = (eventData == null ? void 0 : eventData.eventList) || [];
+    setLists(eventList);
+    if ((eventList == null ? void 0 : eventList.length) === 1 && ((_a2 = data == null ? void 0 : data.stepData) == null ? void 0 : _a2.isAutoOperate)) {
+      selectEvent(eventList[0]);
+      onOpenEventDetail(eventList[0]);
+      changeAutoOperate(false);
+    }
   }, [eventData == null ? void 0 : eventData.eventList]);
   (0, import_react.useEffect)(() => {
-    var _a2, _b2;
+    var _a2, _b2, _c, _d, _e;
     const id = (_b2 = (_a2 = data == null ? void 0 : data.resourceData) == null ? void 0 : _a2.currentResourceItem) == null ? void 0 : _b2.id;
     if (!id) return;
-    getEventList.run({
+    const history = ((_c = appUtils == null ? void 0 : appUtils.getHistory) == null ? void 0 : _c.call(appUtils)) || {};
+    const query = (_d = history == null ? void 0 : history.location) == null ? void 0 : _d.query;
+    const params = {
       event_item_resource_id: id,
       skip: 1,
-      num: 100
-    });
-  }, [(_b = (_a = data == null ? void 0 : data.resourceData) == null ? void 0 : _a.currentResourceItem) == null ? void 0 : _b.id]);
+      num: 100,
+      customer_id: customer == null ? void 0 : customer.id,
+      open_quotation: 1
+    };
+    if (query == null ? void 0 : query.ids) {
+      params.ids = (_e = query == null ? void 0 : query.ids) == null ? void 0 : _e.split(",");
+    }
+    getEventList.run(params);
+  }, [(_b = (_a = data == null ? void 0 : data.resourceData) == null ? void 0 : _a.currentResourceItem) == null ? void 0 : _b.id, customer == null ? void 0 : customer.id]);
   const handleClick = (item) => {
     selectEvent(item);
     onOpenEventDetail(item);

package/lib/components/eventBooking/components/Provider/Header/index.d.ts

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

package/lib/components/eventBooking/components/Provider/Resource/index.js

@@ -40,11 +40,24 @@ var import_resourceDisplay = __toESM(require("../../resourceDisplay"));
 var import_utils2 = require("../../../utils");
 var import_index = require("./index.less");
 var Resource = () => {
-  var _a, _b;
+  var _a, _b, _c, _d, _e;
   const { data } = (0, import_Sales.useSales)();
   const { getResourceList, selectResource } = (0, import_Sales.useResource)();
   const { createCartItem } = (0, import_Sales.useCart)();
   const { nextStep } = (0, import_Sales.useStep)();
+  (0, import_react.useEffect)(() => {
+    var _a2, _b2, _c2;
+    const resourceList = ((_a2 = data == null ? void 0 : data.resourceData) == null ? void 0 : _a2.resourceList) || [];
+    if ((resourceList == null ? void 0 : resourceList.length) <= 0) {
+      return;
+    }
+    const resourceListChildren = ((_b2 = resourceList == null ? void 0 : resourceList[0]) == null ? void 0 : _b2.children) || [];
+    if ((resourceList == null ? void 0 : resourceList.length) === 1 && (resourceListChildren == null ? void 0 : resourceListChildren.length) === 1 && ((_c2 = data == null ? void 0 : data.stepData) == null ? void 0 : _c2.isAutoOperate)) {
+      createCartItem();
+      selectResource(resourceListChildren[0]);
+      nextStep();
+    }
+  }, [(_a = data == null ? void 0 : data.resourceData) == null ? void 0 : _a.resourceList]);
   const handleClick = (item) => {
     createCartItem();
     selectResource(item);
@@ -71,7 +84,7 @@ var Resource = () => {
       className: `event-interface-resource-wrap ${(0, import_utils.isMobile)() ? "event-interface-resource-mobile-wrap" : ""}`
     },
     /* @__PURE__ */ import_react.default.createElement("span", { className: "title" }, import_utils.locales.getText("pisell2.event.select.campus")((0, import_utils2.resourceTitle)(data))),
-    /* @__PURE__ */ import_react.default.createElement("div", { className: "content" }, (_b = (_a = data == null ? void 0 : data.resourceData) == null ? void 0 : _a.resourceList) == null ? void 0 : _b.map((item, index) => {
+    /* @__PURE__ */ import_react.default.createElement("div", { className: "content" }, !((_c = (_b = data == null ? void 0 : data.resourceData) == null ? void 0 : _b.resourceList) == null ? void 0 : _c.length) ? /* @__PURE__ */ import_react.default.createElement(import_materials.Skeleton, { loading: true, active: true, paragraph: { rows: 3 } }) : (_e = (_d = data == null ? void 0 : data.resourceData) == null ? void 0 : _d.resourceList) == null ? void 0 : _e.map((item, index) => {
       return /* @__PURE__ */ import_react.default.createElement("div", { key: index, className: "content-item" }, /* @__PURE__ */ import_react.default.createElement("span", { className: "content-title" }, item == null ? void 0 : item.title), /* @__PURE__ */ import_react.default.createElement(
         import_materials.PisellViewGrid,
         {
@@ -79,7 +92,7 @@ var Resource = () => {
           columns: (0, import_utils.isMobile)() ? 1 : 3,
           verticalGap: 20,
           horizontalGap: 20,
-          loading: getResourceList.loading,
+          loading: false,
           renderItem,
           className: "content-grid"
         }

package/lib/components/eventBooking/components/Provider/SelectHolderModal.d.ts

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

package/lib/components/eventBooking/components/bookingAvailabilityCalendar/components/CalendarDate/CalenDateStatus/index.d.ts

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

package/lib/components/eventBooking/components/bookingAvailabilityCalendar/components/CalendarDate/CalenDateWeek/CallToBook/index.less

@@ -16,7 +16,6 @@
 
   .sales-close-tip {
     color: #1b1b1b;
-    font-family: Inter;
     font-size: 14px;
     font-style: normal;
     font-weight: 400;

package/lib/components/eventBooking/components/bookingAvailabilityCalendar/components/CalendarDate/Item/DayItem/index.d.ts

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

package/lib/components/eventBooking/components/bookingAvailabilityCalendar/components/CalendarDate/Item/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 import { CalendarItemProps } from '../../../../../type';
 declare const Item: (props: CalendarItemProps) => JSX.Element;

package/lib/components/eventBooking/components/bookingAvailabilityCalendar/components/CalendarDate/Item/index.less

@@ -21,7 +21,6 @@
   //   position: absolute;
   //   bottom: 54px;
   //   left: 0;
-  //   font-family: Inter;
   //   font-size: 12px;
   //   font-style: normal;
   //   font-weight: 600;

package/lib/components/eventBooking/components/bookingAvailabilityCalendar/components/CalendarDate/Status/index.d.ts

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

package/lib/components/eventBooking/components/bookingAvailabilityCalendar/components/SelectDate/index.d.ts

@@ -1,4 +1,4 @@
-/// <reference types="react" />
+import React from 'react';
 import './index.less';
-declare const _default: import("react").ForwardRefExoticComponent<Omit<any, "ref"> & import("react").RefAttributes<unknown>>;
+declare const _default: React.ForwardRefExoticComponent<Omit<any, "ref"> & React.RefAttributes<unknown>>;
 export default _default;

package/lib/components/eventBooking/components/bookingAvailabilityCalendar/components/SelectDate/index.js

@@ -32,7 +32,7 @@ __export(SelectDate_exports, {
   default: () => SelectDate_default
 });
 module.exports = __toCommonJS(SelectDate_exports);
-var import_react = require("react");
+var import_react = __toESM(require("react"));
 var import_classnames = __toESM(require("classnames"));
 var import_dayjs = __toESM(require("dayjs"));
 var import_materials = require("@pisell/materials");
@@ -73,7 +73,7 @@ var SelectDate = ({
     }
   };
   const extraHeader = () => {
-    return /* @__PURE__ */ React.createElement(
+    return /* @__PURE__ */ import_react.default.createElement(
       "div",
       {
         onClick: (e) => {
@@ -82,7 +82,7 @@ var SelectDate = ({
           (_a = calendarDateRef == null ? void 0 : calendarDateRef.current) == null ? void 0 : _a.open(currentDate, detail == null ? void 0 : detail.id);
         }
       },
-      /* @__PURE__ */ React.createElement(
+      /* @__PURE__ */ import_react.default.createElement(
         import_materials.Iconfont,
         {
           type: "pisell2-calendar",
@@ -91,7 +91,7 @@ var SelectDate = ({
       )
     );
   };
-  return /* @__PURE__ */ React.createElement(React.Fragment, null, /* @__PURE__ */ React.createElement(
+  return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, /* @__PURE__ */ import_react.default.createElement(
     import_OpenCard.default,
     {
       title: "Select a date",
@@ -100,7 +100,7 @@ var SelectDate = ({
       isClick: false,
       extra: showCalendarPopup ? extraHeader() : null
     },
-    /* @__PURE__ */ React.createElement(
+    /* @__PURE__ */ import_react.default.createElement(
       import_CalenDateWeek.default,
       {
         currentDate,
@@ -109,8 +109,8 @@ var SelectDate = ({
         dateLimitData
       }
     ),
-    /* @__PURE__ */ React.createElement(import_Status.default, null)
-  ), /* @__PURE__ */ React.createElement(
+    /* @__PURE__ */ import_react.default.createElement(import_Status.default, null)
+  ), /* @__PURE__ */ import_react.default.createElement(
     import_CalendarDate.default,
     {
       ref: calendarDateRef,

package/lib/components/eventBooking/components/bookingDetailModal/components/BookingOptions.d.ts

@@ -1,2 +1,4 @@
-declare const BookingOptions: () => JSX.Element;
+declare const BookingOptions: (props: {
+    onChangeBookingOption?: ((bookingOption: any) => void) | undefined;
+}) => JSX.Element;
 export default BookingOptions;

package/lib/components/eventBooking/components/bookingDetailModal/components/BookingOptions.js

@@ -37,9 +37,16 @@ var import_OpenCard = __toESM(require("../../OpenCard"));
 var import_materials = require("@pisell/materials");
 var import_utils = require("@pisell/utils");
 var import_Sales = require("../../../../Sales");
-var BookingOptions = () => {
+var import_decimal = __toESM(require("decimal.js"));
+var import_pisellPriceText = __toESM(require("../../../../productSelect/components/pisellPriceText"));
+var BookingOptions = (props) => {
   var _a, _b;
   const { detail, currentBookingOption, selectEventDetailBookingOptions } = (0, import_Sales.useEventDetail)();
+  const onChange = (value, item) => {
+    var _a2;
+    selectEventDetailBookingOptions(value);
+    (_a2 = props == null ? void 0 : props.onChangeBookingOption) == null ? void 0 : _a2.call(props, item);
+  };
   return /* @__PURE__ */ import_react.default.createElement(
     import_OpenCard.default,
     {
@@ -58,16 +65,24 @@ var BookingOptions = () => {
         optionClassName: `option-item ${((_b = detail == null ? void 0 : detail.bookingOptions) == null ? void 0 : _b.length) > 1 ? "option-item-pointer" : ""}`,
         value: currentBookingOption,
         renderOption: (option) => {
-          return /* @__PURE__ */ import_react.default.createElement("div", { className: "item" }, /* @__PURE__ */ import_react.default.createElement("span", null, option.label), /* @__PURE__ */ import_react.default.createElement(
-            import_materials.PisellText.Amount,
-            {
-              value: option.price,
-              showCurrencySymbol: true,
-              className: "price"
-            }
-          ));
+          const { price, is_bundle, minimum_markup_price } = option._originData || {};
+          if (!option._originData || !is_bundle) {
+            return /* @__PURE__ */ import_react.default.createElement("div", { className: "item" }, /* @__PURE__ */ import_react.default.createElement("span", null, option.label), /* @__PURE__ */ import_react.default.createElement(
+              import_materials.PisellText.Amount,
+              {
+                value: option.price,
+                showCurrencySymbol: true,
+                className: "price"
+              }
+            ));
+          }
+          let _price = price;
+          if (is_bundle) {
+            _price = new import_decimal.default(price).plus(new import_decimal.default(minimum_markup_price)).toFixed(2);
+          }
+          return /* @__PURE__ */ import_react.default.createElement("div", { className: "item" }, /* @__PURE__ */ import_react.default.createElement("span", null, option.label), /* @__PURE__ */ import_react.default.createElement(import_pisellPriceText.default, { className: "price", value: _price, isMini: true }));
         },
-        onChange: (value) => selectEventDetailBookingOptions(value)
+        onChange
       }
     )
   );

package/lib/components/eventBooking/components/bookingDetailModal/components/Resource.d.ts

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

package/lib/components/eventBooking/components/bookingDetailModal/components/Schedule.d.ts

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

package/lib/components/eventBooking/components/bookingDetailModal/components/Schedule.js

@@ -39,6 +39,7 @@ var import_scheduleCalendar = __toESM(require("../../scheduleCalendar"));
 var import_Sales = require("../../../../Sales");
 var Schedule = () => {
   var _a;
+  const { initData } = (0, import_Sales.useInit)();
   const { detail, getEventDetailSelectDate } = (0, import_Sales.useEventDetail)();
   return /* @__PURE__ */ import_react.default.createElement(
     import_OpenCard.default,
@@ -59,9 +60,10 @@ var Schedule = () => {
           if (!id) return;
           getEventDetailSelectDate.run(id, {
             days: 366,
-            start_date: `${e}-01`
+            start_date: `${e}-01-01`
           });
-        }
+        },
+        type: initData == null ? void 0 : initData.scheduleDisplayType
       }
     )
   );

package/lib/components/eventBooking/components/bookingDetailModal/index.js

@@ -42,18 +42,33 @@ var import_Resource = __toESM(require("./components/Resource"));
 var import_BookingOptions = __toESM(require("./components/BookingOptions"));
 var import_OrderProductModal = __toESM(require("../Provider/OrderProductModal/index"));
 var import_index = require("./index.less");
+var import_useEngineContext = __toESM(require("../../../../hooks/useEngineContext"));
 var BookingDetailModal = (props) => {
-  var _a;
+  var _a, _b, _c;
   const modalContentRef = (0, import_react.useRef)(null);
+  const context = (0, import_useEngineContext.default)();
+  const { utils } = context.appHelper || {};
   const tabsRef = (0, import_react.useRef)();
   const { open = false } = props;
-  const { detail, onCloseEventDetail, onSelectEventDetail } = (0, import_Sales.useEventDetail)();
+  const {
+    detail,
+    onCloseEventDetail,
+    onSelectEventDetail,
+    selectEventDetailProductDetail,
+    checkBeforeSelectEventDetail
+  } = (0, import_Sales.useEventDetail)();
   const { addToCart, checkBeforeAddToCart, checkBeforeAddToCartResquest } = (0, import_Sales.useCart)();
+  const { initData } = (0, import_Sales.useInit)();
   const [activeTab, setActiveTab] = (0, import_react.useState)("introduction");
   const [isScrolling, setIsScrolling] = (0, import_react.useState)(false);
   const [openCheckout, setOpenCheckout] = (0, import_react.useState)(false);
   const isUserClickRef = (0, import_react.useRef)(false);
   const scrollTimeoutRef = (0, import_react.useRef)(null);
+  const buttonText = (0, import_react.useMemo)(() => {
+    var _a2, _b2, _c2;
+    const config = ((_b2 = (_a2 = initData == null ? void 0 : initData.boardSetting) == null ? void 0 : _a2.config) == null ? void 0 : _b2.product_display_setting) || {};
+    return ((_c2 = utils == null ? void 0 : utils.translation) == null ? void 0 : _c2.call(utils, config == null ? void 0 : config.booking_event_v2_product_detail_button)) || import_utils.locales.getText("pisell2.event.add.to.cart");
+  }, [(_b = (_a = initData == null ? void 0 : initData.boardSetting) == null ? void 0 : _a.config) == null ? void 0 : _b.product_display_setting]);
   const anchorOptions = (0, import_react.useMemo)(
     () => [
       {
@@ -82,7 +97,7 @@ var BookingDetailModal = (props) => {
   const images = (0, import_react.useMemo)(() => {
     var _a2;
     return ((_a2 = detail == null ? void 0 : detail.introduction) == null ? void 0 : _a2.images) || [];
-  }, [(_a = detail == null ? void 0 : detail.introduction) == null ? void 0 : _a.images]);
+  }, [(_c = detail == null ? void 0 : detail.introduction) == null ? void 0 : _c.images]);
   (0, import_react.useEffect)(() => {
     if (!modalContentRef.current) return;
     let isCurrentlyScrolling = false;
@@ -175,34 +190,80 @@ var BookingDetailModal = (props) => {
     }
   };
   const content = () => {
-    return /* @__PURE__ */ import_react.default.createElement("div", { className: "booking-detail-modal-content", style: { height: (0, import_utils.isMobile)() ? "100%" : "calc(80vh - 146px)" } }, /* @__PURE__ */ import_react.default.createElement("div", { className: "anchor-wrapper" }, /* @__PURE__ */ import_react.default.createElement(
-      import_materials.PisellAnchor,
+    return /* @__PURE__ */ import_react.default.createElement(
+      "div",
       {
-        ref: tabsRef,
-        options: anchorOptions,
-        containerRef: modalContentRef,
-        tab: activeTab,
-        onChange: (key) => {
-          handleTabChange(key);
-        },
-        onTabClick: () => {
-          isUserClickRef.current = true;
+        className: "booking-detail-modal-content",
+        style: { height: (0, import_utils.isMobile)() ? "100%" : "calc(80vh - 146px)" }
+      },
+      /* @__PURE__ */ import_react.default.createElement("div", { className: "anchor-wrapper" }, /* @__PURE__ */ import_react.default.createElement(
+        import_materials.PisellAnchor,
+        {
+          ref: tabsRef,
+          options: anchorOptions,
+          containerRef: modalContentRef,
+          tab: activeTab,
+          onChange: (key) => {
+            handleTabChange(key);
+          },
+          onTabClick: () => {
+            isUserClickRef.current = true;
+          }
         }
+      )),
+      /* @__PURE__ */ import_react.default.createElement("div", { className: "content-wrapper", ref: modalContentRef }, /* @__PURE__ */ import_react.default.createElement("div", { "data-section": "introduction", className: "content-section" }, (images == null ? void 0 : images.length) > 0 ? /* @__PURE__ */ import_react.default.createElement(
+        import_materials.PisellImageCarousels,
+        {
+          dataSource: images,
+          width: "100%",
+          height: (0, import_utils.isMobile)() ? 300 : 400,
+          showArrows: !(0, import_utils.isMobile)(),
+          showDots: (images == null ? void 0 : images.length) > 1,
+          autoplay: (images == null ? void 0 : images.length) > 1,
+          loop: false
+        }
+      ) : null, /* @__PURE__ */ import_react.default.createElement(import_eventCard.default, { data: detail == null ? void 0 : detail.introduction })), /* @__PURE__ */ import_react.default.createElement("div", { "data-section": "schedule", className: "content-section" }, /* @__PURE__ */ import_react.default.createElement(import_Schedule.default, null)), /* @__PURE__ */ import_react.default.createElement("div", { "data-section": "resource", className: "content-section" }, /* @__PURE__ */ import_react.default.createElement(import_Resource.default, null)), /* @__PURE__ */ import_react.default.createElement("div", { "data-section": "booking_options", className: "content-section" }, /* @__PURE__ */ import_react.default.createElement(
+        import_BookingOptions.default,
+        {
+          onChangeBookingOption: checkToOpenProductDetailModal
+        }
+      )))
+    );
+  };
+  const checkToOpenProductDetailModal = (bookingOption) => {
+    var _a2;
+    console.log(">>>>>>>", bookingOption);
+    if (((_a2 = bookingOption == null ? void 0 : bookingOption._originData) == null ? void 0 : _a2.is_eject) !== 1) {
+      return;
+    }
+    utils == null ? void 0 : utils.action({
+      type: "pisell1.productDetail",
+      data: {
+        detail: { ...(bookingOption == null ? void 0 : bookingOption._originData) || {}, open_deposit: 1 },
+        isOS: false
+      },
+      callback: (data) => {
+        if (data == null ? void 0 : data.isCancel) {
+          return;
+        }
+        console.log("data>>>>>>", data);
+        const product = {
+          ...data,
+          options: (data == null ? void 0 : data.option) || []
+        };
+        delete product.option;
+        selectEventDetailProductDetail(product);
+        handleOk();
       }
-    )), /* @__PURE__ */ import_react.default.createElement("div", { className: "content-wrapper", ref: modalContentRef }, /* @__PURE__ */ import_react.default.createElement("div", { "data-section": "introduction", className: "content-section" }, (images == null ? void 0 : images.length) > 0 ? /* @__PURE__ */ import_react.default.createElement(
-      import_materials.PisellImageCarousels,
-      {
-        dataSource: images,
-        width: "100%",
-        height: (0, import_utils.isMobile)() ? 300 : 400,
-        showArrows: !(0, import_utils.isMobile)(),
-        showDots: (images == null ? void 0 : images.length) > 1,
-        autoplay: (images == null ? void 0 : images.length) > 1,
-        loop: false
-      }
-    ) : null, /* @__PURE__ */ import_react.default.createElement(import_eventCard.default, { data: detail == null ? void 0 : detail.introduction })), /* @__PURE__ */ import_react.default.createElement("div", { "data-section": "schedule", className: "content-section" }, /* @__PURE__ */ import_react.default.createElement(import_Schedule.default, null)), /* @__PURE__ */ import_react.default.createElement("div", { "data-section": "resource", className: "content-section" }, /* @__PURE__ */ import_react.default.createElement(import_Resource.default, null)), /* @__PURE__ */ import_react.default.createElement("div", { "data-section": "booking_options", className: "content-section" }, /* @__PURE__ */ import_react.default.createElement(import_BookingOptions.default, null))));
+    });
   };
   const handleOk = async () => {
+    console.log(">>>>>>>", detail);
+    const result = checkBeforeSelectEventDetail();
+    if (!result) {
+      checkToOpenProductDetailModal(detail == null ? void 0 : detail.selectedProduct);
+      return;
+    }
     onSelectEventDetail();
     const checkRes = await checkBeforeAddToCart();
     if ((checkRes == null ? void 0 : checkRes.result) === false) {
@@ -228,7 +289,7 @@ var BookingDetailModal = (props) => {
       destroyOnClose: true,
       className: "booking-detail-modal",
       onCancel: onCloseEventDetail,
-      okText: import_utils.locales.getText("pisell2.event.add.to.cart"),
+      okText: buttonText,
       cancelVisible: false,
       onOk: handleOk,
       width: (0, import_utils.isMobile)() ? "100%" : 600,

package/lib/components/eventBooking/components/progressBar/index.js

@@ -37,6 +37,7 @@ var import_materials = require("@pisell/materials");
 var import_Sales = require("../../../Sales");
 var import_utils = require("@pisell/utils");
 var import_index = require("./index.less");
+var import_useEngineContext = __toESM(require("../../../../hooks/useEngineContext"));
 var ProgressBar = ({
   title,
   description,
@@ -48,8 +49,11 @@ var ProgressBar = ({
   onBack,
   onClose
 }) => {
+  var _a;
   const [open, setOpen] = (0, import_react.useState)(false);
   const { removeSessionStorage } = (0, import_Sales.useSales)();
+  const context = (0, import_useEngineContext.default)();
+  const { interaction } = ((_a = context.appHelper) == null ? void 0 : _a.utils) || {};
   const handleClose = () => {
     if (isConfirmClose) {
       setOpen(true);
@@ -58,9 +62,20 @@ var ProgressBar = ({
     }
   };
   const handleOk = () => {
+    var _a2, _b;
+    if ((_b = (_a2 = interaction == null ? void 0 : interaction.utils) == null ? void 0 : _a2.isAppEnv) == null ? void 0 : _b.call(_a2)) {
+      interaction.utils.postMessageToApp({
+        module: "global",
+        key: "paymentResultAction",
+        data: {
+          actionType: "backHome"
+        }
+      });
+      return;
+    }
     onClose == null ? void 0 : onClose();
     setOpen(false);
-    removeSessionStorage();
+    removeSessionStorage == null ? void 0 : removeSessionStorage();
   };
   return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, /* @__PURE__ */ import_react.default.createElement(
     import_materials.PisellHeaderProgressBar,

package/lib/components/eventBooking/components/resourceDisplay/index.js

@@ -65,11 +65,11 @@ var PisellResourceCard = ({
     return /* @__PURE__ */ import_react.default.createElement(
       import_materials.PisellAvatar,
       {
-        src: image,
+        src: image || void 0,
         shape,
         size,
         useTextAvatar: !image,
-        children: /* @__PURE__ */ import_react.default.createElement(import_materials.Image, { src: import_image.default, preview: false }),
+        children: (rest == null ? void 0 : rest.children) || /* @__PURE__ */ import_react.default.createElement(import_materials.Image, { src: import_image.default, preview: false }),
         className: (0, import_classnames.default)({
           "pisell-resource-card-campus-avatar": mode === "campus",
           "pisell-resource-card-empty-avatar": !image

package/lib/components/eventBooking/components/resourceDisplay/index.less

@@ -1,5 +1,6 @@
 .pisell-resource-card {
   box-shadow: none;
+  height: 100%;
   &-content {
     display: flex;
     gap: 16px;

package/lib/components/eventBooking/components/scheduleCalendar/ProductItem/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 declare type Item = any;
 interface ProductItemProps {

package/lib/components/eventBooking/components/scheduleCalendar/calendarItem.d.ts

@@ -6,6 +6,7 @@ declare type CalendarItemProps = {
     onSelect: (date: string, item?: CalendarDataItem) => void;
     onChange: (date: string, type: string) => void;
     isEdit: boolean;
+    type?: 'calendarView' | 'textList';
 };
 declare const CalendarItem: (props: CalendarItemProps) => JSX.Element;
 export default CalendarItem;