@pisell/private-materials 6.1.7 → 6.1.8

package/lib/components/booking/components/tabPane/index.less

@@ -5,7 +5,6 @@
   position: relative;
   display: flex;
   flex-direction: column;
-
 }
 
 .pisell-lowcode__booking-tab-pane-title {
@@ -30,6 +29,8 @@
   flex: 1;
   overflow: auto;
   padding: 0 32px;
+  // 为 voucher-section 预留空间
+  padding-bottom: 120px;
 
   .pisell-lowcode__booking-tab-pane-label {
     font-size: 16px;
@@ -45,6 +46,79 @@
   }
 }
 
+// Voucher 和功能按钮区域
+.pisell-lowcode__booking-tab-pane-voucher-section {
+  display: flex;
+  flex-direction: column;
+  padding: 8px 16px;
+  position: relative;
+  z-index: 3;
+  background-color: #1b1b1b;
+  box-shadow: 0 -2px 8px rgba(0, 0, 0, 0.06);
+  
+  .pisell-lowcode__booking-footer-voucher-container {
+    background: var(--base-white, #FFF);
+    padding: 4px;
+    border-radius: 8px;
+  }
+  
+  // ActionButtons 在 voucher-section 中的样式
+  .pisell-lowcode__action-buttons {
+    margin-top: 8px;
+    // 确保按钮可见
+    .action-button {
+      // 重要：确保文字颜色在深色背景下可见
+      color: white !important;
+      
+      &:hover:not(:disabled) {
+        color: white !important;
+      }
+    }
+  }
+}
+
+// 订单备注区域
+.pisell-lowcode__booking-tab-pane-notes-section {
+  background-color: #1b1b1b;
+  position: relative;
+  z-index: 3;
+  
+  .pisell-lowcode__booking-notes {
+    background: var(--base-white, #FFF);
+    padding: 12px;
+    width: 100%;
+    
+    .pisell-lowcode__booking-notes-label {
+      font-weight: 500;
+      color: #333;
+      margin-bottom: 8px;
+    }
+    
+    .pisell-lowcode__booking-notes-input {
+      .pisell-lowcode-input {
+        height: 44px !important;
+        min-height: 44px !important;
+        border-radius: 6px;
+        font-size: 16px;
+        line-height: 36px;
+      }
+      
+      // 备用选择器，以防万一
+      textarea.pisell-lowcode-input {
+        height: 44px !important;
+        min-height: 44px !important;
+        border-radius: 6px;
+        resize: none;
+      }
+      
+      // 去掉外层包装容器的边框
+      .pisell-lowcode-input-textarea-affix-wrapper {
+        border-width: 1px;
+      }
+    }
+  }
+}
+
 .pisell-lowcode__booking-tab-pane-footer {
   position: sticky;
   bottom: 0;

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

@@ -41,8 +41,9 @@ var import_useEngineContext = __toESM(require("../../../../hooks/useEngineContex
 var import_materials = require("@pisell/materials");
 var import_useIsBooking4Shop = require("../../hooks/useIsBooking4Shop");
 var import_index = require("./index.less");
-var import_utils2 = require("./utils");
 var import_ahooks = require("ahooks");
+var import_utils2 = require("./utils");
+var import_pisellos = require("../../../ticketBooking/hooks/pisellos");
 var ShopDiscountHooks = {
   onInited: "shopDiscount:onInited",
   onDestroy: "shopDiscount:onDestroy",
@@ -67,6 +68,18 @@ var VoucherCard = (props) => {
   const isBooking4Shop = (0, import_useIsBooking4Shop.useIsBooking4Shop)(state);
   const shopDiscount = pisellos.getModule("shopDiscount");
   services = state.service;
+  const changeCustomerToGlobalState = (0, import_ahooks.useMemoizedFn)((value) => {
+    dispatch({
+      type: "setClient",
+      payload: {
+        value,
+        edit: true
+      }
+    });
+  });
+  const { selectCustomer } = (0, import_pisellos.useCustomer)({
+    changeCustomerToGlobalState
+  });
   (0, import_ahooks.useDebounceEffect)(
     () => {
       if (isBooking4Shop) {
@@ -96,7 +109,8 @@ var VoucherCard = (props) => {
         price: value.price,
         total: (_a3 = value == null ? void 0 : value._extend) == null ? void 0 : _a3.total,
         discount_list: value.discount_list,
-        origin_total: (_b2 = value == null ? void 0 : value._extend) == null ? void 0 : _b2.origin_total
+        origin_total: (_b2 = value == null ? void 0 : value._extend) == null ? void 0 : _b2.origin_total,
+        quantity: value._extend.quantity
       };
     });
     return val;
@@ -158,12 +172,7 @@ var VoucherCard = (props) => {
   (0, import_react.useEffect)(() => {
     if (!isBooking4Shop) return;
     const onScanCustomerChange = (customer) => {
-      dispatch({
-        type: "setClient",
-        payload: {
-          value: customer
-        }
-      });
+      selectCustomer(customer);
     };
     const onDiscountListChange = (discount) => {
       setDisCountList(discount);
@@ -274,8 +283,8 @@ var VoucherCard = (props) => {
       import_materials.PisellGoodPassCard,
       {
         style: { width: "100%" },
-        mixedSort,
         dataSource: ((_d = (_c = state.service) == null ? void 0 : _c.value) == null ? void 0 : _d.length) ? availableData : [],
+        mixedSort,
         onChange: (val) => {
           const shopDiscount2 = pisellos.getModule("shopDiscount");
           const detail = shopDiscount2.setDiscountSelected({

package/lib/components/booking/components/voucher/index.less

@@ -4,7 +4,7 @@
     display: flex;
     align-items: center;
     justify-content: space-between;
-    margin-bottom: 10px;
+    margin-bottom: 0px;
 
     .voucher-title-left {
       color: var(--base-black, #000);

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

@@ -16,5 +16,5 @@ export interface BookingDashboardProps extends React.HTMLAttributes<HTMLDivEleme
         departed: string | number;
     }, dataList: string[]) => void;
 }
-declare const BookingDashboard: (props: BookingDashboardProps) => JSX.Element;
+declare const BookingDashboard: React.ForwardRefExoticComponent<BookingDashboardProps & React.RefAttributes<unknown>>;
 export default BookingDashboard;

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

@@ -57,7 +57,7 @@ var formatCapacityToChildrenData = (data) => {
   return Object.values(map).filter((item) => !!item.value).sort((a, b) => b.label.localeCompare(a.label));
 };
 import_utils.locales.init(import_locales.default, (0, import_locales2.getLocale)());
-var BookingDashboard = (props) => {
+var BookingDashboard = (0, import_react.forwardRef)((props, ref) => {
   const {
     otherParams = {},
     backgroundColors,
@@ -267,6 +267,11 @@ var BookingDashboard = (props) => {
       clearInterval(timer);
     };
   }, [JSON.stringify(otherParams), refreshKey]);
+  (0, import_react.useImperativeHandle)(ref, () => ({
+    refresh: () => {
+      getData();
+    }
+  }));
   return /* @__PURE__ */ import_react.default.createElement(
     import_materials.PisellStatisticList,
     {
@@ -277,5 +282,5 @@ var BookingDashboard = (props) => {
       valueColor
     }
   );
-};
+});
 var dashboard_default = BookingDashboard;

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

@@ -66,50 +66,62 @@ var EditBookingModal = (props, ref) => {
     };
   });
   const getInitData = async (params2) => {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _i;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j;
     let mockProps = params2;
     const _data = await (0, import_serve2.init)(mockProps);
     setData(_data);
     let _initResourceVal = _data.childrenBooking._extend.resource;
-    const toResourceFormId = (_a = _data.toResource) == null ? void 0 : _a.form_id;
-    if (params2.fromResourceId !== params2.toResourceId && toResourceFormId) {
+    const fromResourceFormId = (_a = _data.fromResource) == null ? void 0 : _a.form_id;
+    const toResourceFormId = (_b = _data.toResource) == null ? void 0 : _b.form_id;
+    const _form_id = toResourceFormId || fromResourceFormId;
+    if (params2.fromResourceId !== params2.toResourceId && !!_form_id) {
       const { list, maps } = (0, import_utils3.formatResources)({
         cacheItem: _data.childrenBooking,
         resourcesOrigin: _data.resourcesOrigin
       });
-      const currentForm = maps[toResourceFormId];
-      const relation_id = (_b = _data.toResource) == null ? void 0 : _b.id;
-      if (currentForm && relation_id) {
+      const currentForm = maps[_form_id];
+      const relation_id = (_c = _data.toResource) == null ? void 0 : _c.id;
+      if (currentForm && (relation_id || relation_id === 0)) {
         let _targetResource = {
-          relation_type: ((_d = (_c = currentForm.renderListMaps[relation_id]) == null ? void 0 : _c.usable) == null ? void 0 : _d.relation_type) || "form",
-          form_id: toResourceFormId,
+          relation_type: ((_e = (_d = currentForm.renderListMaps[relation_id]) == null ? void 0 : _d.usable) == null ? void 0 : _e.relation_type) || "form",
+          form_id: _form_id,
           relation_id,
           like_status: "common",
-          children: (_f = (_e = currentForm.renderListMaps) == null ? void 0 : _e[relation_id]) == null ? void 0 : _f.children,
+          children: (_g = (_f = currentForm.renderListMaps) == null ? void 0 : _f[relation_id]) == null ? void 0 : _g.children,
           metadata: {
-            ...(_h = (_g = currentForm.renderListMaps) == null ? void 0 : _g[relation_id]) == null ? void 0 : _h.metadata,
+            ...(_i = (_h = currentForm.renderListMaps) == null ? void 0 : _h[relation_id]) == null ? void 0 : _i.metadata,
             form_name: currentForm.title,
-            resource_name: (_i = currentForm.renderListMaps[relation_id]) == null ? void 0 : _i.main_field
+            resource_name: (_j = currentForm.renderListMaps[relation_id]) == null ? void 0 : _j.main_field
           }
         };
-        if (Array.isArray(_initResourceVal[toResourceFormId])) {
-          const _cloned = [..._initResourceVal[toResourceFormId]];
-          const _idx = _cloned.findIndex(
-            (rs) => rs.relation_id == params2.fromResourceId
-          );
+        if (Array.isArray(_initResourceVal[_form_id])) {
+          const _cloned = [..._initResourceVal[_form_id]];
+          const _idx = _cloned.findIndex((rs) => {
+            var _a2;
+            return rs.relation_id == params2.fromResourceId || ((_a2 = rs.children) == null ? void 0 : _a2.find(
+              (child) => child.relation_id == params2.fromResourceId
+            ));
+          });
           if (_idx !== -1) {
-            _cloned[_idx] = _targetResource;
+            const _sameResource = _cloned.find(
+              (_clonedItem) => _clonedItem.relation_id === (_targetResource == null ? void 0 : _targetResource.relation_id)
+            );
+            if (_sameResource) {
+              _cloned.splice(_idx, 1);
+            } else {
+              _cloned[_idx] = _targetResource;
+            }
           } else {
             _cloned.push(_targetResource);
           }
           _initResourceVal = {
             ..._initResourceVal,
-            [toResourceFormId]: _cloned
+            [_form_id]: _cloned
           };
         } else {
           _initResourceVal = {
             ..._initResourceVal,
-            [toResourceFormId]: [_targetResource]
+            [_form_id]: [_targetResource]
           };
         }
       }
@@ -216,8 +228,30 @@ var EditBookingModal = (props, ref) => {
       const start_time = values.toDate[0].format("HH:mm");
       const end_date = values.toDate[1].format("YYYY-MM-DD");
       const end_time = values.toDate[1].format("HH:mm");
+      console.log("extend data", _extend);
+      const {
+        id,
+        relation_id,
+        like_status,
+        relation_type,
+        is_all,
+        schedule_id,
+        sub_type,
+        select_date,
+        number,
+        metadata
+      } = _extend;
       await (0, import_serve.updateChildBooking)(order_id, {
-        ..._extend,
+        id,
+        relation_id,
+        like_status,
+        relation_type,
+        is_all,
+        schedule_id,
+        sub_type,
+        select_date,
+        number,
+        metadata,
         resources: Object.values(values.resource).reduce(
           (pre, cur) => {
             const newList = (0, import_utils4.checkResourcesFormat)(cur, cacheItem);
@@ -232,7 +266,7 @@ var EditBookingModal = (props, ref) => {
         end_time,
         duration: values.toDate[1].diff(values.toDate[0], "minutes")
       });
-      setOpen(false);
+      initState();
       props == null ? void 0 : props.onOk();
     } catch (error) {
       console.error(error);
@@ -352,6 +386,7 @@ var EditBookingModal = (props, ref) => {
           onClick: onOk,
           block: true,
           size: "large",
+          disabled: !data,
           loading: updating,
           style: { borderRadius: 20 }
         },

package/lib/components/booking/editBookingModal/serve.d.ts

@@ -46,6 +46,7 @@ export declare const init: (params: EditBookingModalParams) => Promise<{
         start_date: any;
     };
     resourcesOrigin: any[];
+    fromResource: any;
     toResource: any;
 }>;
 export declare const createCacheItem: (cacheItem: any, values?: any) => any;

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

@@ -94,6 +94,7 @@ var updateResourceErrors = (resourceMaps, cacheItem) => {
   }
 };
 var init = async (params) => {
+  var _a;
   const { toStartDate, toEndDate, event, fromResourceId, toResourceId } = params;
   let bookingOrigin = await _getBookingDetail(event.order.id);
   let booking = (0, import_ticketBooking._formatBookingDetail)(bookingOrigin, {});
@@ -102,15 +103,18 @@ var init = async (params) => {
   });
   let childrenBooking = getChildrenBookingById(booking.service.value, event.id);
   console.log("childrenBooking", childrenBooking);
+  const fromResource = resources.listMap[fromResourceId];
+  const toResource = resources.listMap[toResourceId];
   const extraParams = {
     extraResources: []
   };
-  const fromResource = resources.listMap[fromResourceId];
-  const toResource = resources.listMap[toResourceId];
-  if (fromResource) {
-    extraParams.extraResources.push({
-      form_id: fromResource.form_id,
-      id: fromResource.id
+  const _eventResources = (_a = childrenBooking._extend) == null ? void 0 : _a.event_resources;
+  if (Array.isArray(_eventResources)) {
+    _eventResources.forEach((item) => {
+      extraParams.extraResources.push({
+        id: item.relation_id,
+        form_id: item.form_id
+      });
     });
   }
   if (toResource) {
@@ -138,6 +142,8 @@ var init = async (params) => {
     },
     // 总资源列表
     resourcesOrigin,
+    // 源资源
+    fromResource,
     // 目标资源
     toResource
   };

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

@@ -1 +1 @@
-export declare const useIsBooking4Shop: (state: any) => boolean;
+export declare const useIsBooking4Shop: (state: any) => any;

package/lib/components/booking/hooks/useIsBooking4Shop.js

@@ -36,14 +36,16 @@ var import_react = require("react");
 var import_useEngineContext = __toESM(require("../../../hooks/useEngineContext"));
 var import_utils = require("../info/utils");
 var useIsBooking4Shop = (state) => {
+  var _a;
   const context = (0, import_useEngineContext.default)();
   return (0, import_react.useMemo)(() => {
-    var _a, _b, _c, _d, _e, _f, _g, _h;
+    var _a2, _b, _c, _d, _e, _f, _g, _h, _i;
     return (0, import_utils.isBooking4Shop)(
-      ((_c = (_b = (_a = context.appHelper) == null ? void 0 : _a.utils) == null ? void 0 : _b.getData) == null ? void 0 : _c.call(_b, "shop_id")) || ((_h = (_g = (_f = (_e = (_d = context.appHelper.utils.store) == null ? void 0 : _d.getState) == null ? void 0 : _e.call(_d)) == null ? void 0 : _f.global) == null ? void 0 : _g.globalConfig) == null ? void 0 : _h.id),
-      state.renderType
+      ((_c = (_b = (_a2 = context.appHelper) == null ? void 0 : _a2.utils) == null ? void 0 : _b.getData) == null ? void 0 : _c.call(_b, "shop_id")) || ((_h = (_g = (_f = (_e = (_d = context.appHelper.utils.store) == null ? void 0 : _d.getState) == null ? void 0 : _e.call(_d)) == null ? void 0 : _f.global) == null ? void 0 : _g.globalConfig) == null ? void 0 : _h.id),
+      state.renderType,
+      (_i = context.appHelper.utils) == null ? void 0 : _i.businessUtils
     );
-  }, [state.renderType]);
+  }, [state.renderType, (_a = context.appHelper.utils) == null ? void 0 : _a.businessUtils]);
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/lib/components/booking/hooks/useQuotation.js

@@ -145,8 +145,10 @@ var useQuotation = (state, dispatch) => {
   cartValueRef.current = state.service.value;
   const getCartQuotation = async (params) => {
     if (!cartValueRef.current.length) return;
+    const ids = cartValueRef.current.filter((item) => !item.isCustomItem).map((item) => item.product_id);
+    if (!ids.length) return;
     const data = await (0, import_serve.getProductPrice)({
-      ids: cartValueRef.current.map((item) => item.product_id),
+      ids,
       schedule_date: params == null ? void 0 : params.schedule_date,
       customer_id: params == null ? void 0 : params.customer_id
     });

package/lib/components/booking/info/addServiceVariant/index.js

@@ -38,7 +38,7 @@ var import_addService2 = __toESM(require("../../info2/service/addService"));
 var import_utils = require("../utils");
 var import_useEngineContext = __toESM(require("../../../../hooks/useEngineContext"));
 var AddServiceVariant = (props) => {
-  var _a, _b, _c, _d, _e, _f, _g, _h, _i;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j;
   const { globalState, setGlobalState } = props;
   const context = (0, import_useEngineContext.default)();
   const stateRef = (0, import_react.useRef)(globalState);
@@ -58,7 +58,8 @@ var AddServiceVariant = (props) => {
   let Cpt = import_addService.default;
   if ((0, import_utils.isBooking4Shop)(
     ((_c = (_b = (_a = context.appHelper) == null ? void 0 : _a.utils) == null ? void 0 : _b.getData) == null ? void 0 : _c.call(_b, "shop_id")) || ((_h = (_g = (_f = (_e = (_d = context.appHelper.utils.store) == null ? void 0 : _d.getState) == null ? void 0 : _e.call(_d)) == null ? void 0 : _f.global) == null ? void 0 : _g.globalConfig) == null ? void 0 : _h.id),
-    (_i = props == null ? void 0 : props.globalState) == null ? void 0 : _i.renderType
+    (_i = props == null ? void 0 : props.globalState) == null ? void 0 : _i.renderType,
+    (_j = context.appHelper.utils) == null ? void 0 : _j.businessUtils
   )) {
     Cpt = import_addService2.default;
   }

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

@@ -5,5 +5,6 @@ declare const useInfoHolder: (state: any, dispatch: any) => {
     dispatchService: (type: string, payload: any) => void;
     handleAction: (dataSource: any) => void;
     showAddTimeModal: boolean;
+    editNormalServiceRef: import("react").MutableRefObject<any>;
 };
 export default useInfoHolder;

package/lib/components/booking/info/hooks/useInfoHolder.js

@@ -38,9 +38,11 @@ var import_useHolderConfig = __toESM(require("./useHolderConfig"));
 var import_utils = require("../utils");
 var import_useGetHolderList = __toESM(require("./useGetHolderList"));
 var import_utils2 = require("../../info2/service/addService/utils");
+var import_utilsByBooking = require("../../info2/utilsByBooking");
 var useInfoHolder = (state, dispatch) => {
   var _a, _b, _c, _d;
   const detailRef = (0, import_react.useRef)();
+  const editNormalServiceRef = (0, import_react.useRef)(null);
   const { holder, isFormSubject, appointment_subject } = (0, import_useHolderConfig.default)(state);
   const getHolders = (0, import_useGetHolderList.default)(state, dispatch);
   (0, import_react.useEffect)(() => {
@@ -55,14 +57,17 @@ var useInfoHolder = (state, dispatch) => {
     };
   }, [(_d = (_c = state == null ? void 0 : state.bookingConfig) == null ? void 0 : _c.config) == null ? void 0 : _d.information_tab]);
   const showAddTimeModal = (0, import_react.useMemo)(() => {
-    return (0, import_utils.isOpenAddTime)(state) && !state.isBookingTicket2;
+    return (0, import_utils.isOpenAddTime)(state);
   }, [state, appointment_card.quick_time]);
-  const handleEdit = (0, import_ahooks.useMemoizedFn)((cacheItem, type) => {
-    var _a2, _b2;
-    console.time("handleEdit");
-    console.log(performance.now() - window.pp1, "打开商品4");
-    (_b2 = (_a2 = detailRef.current) == null ? void 0 : _a2.init) == null ? void 0 : _b2.call(_a2, cacheItem, false, type === "edit_product");
-  });
+  const handleEdit = (cacheItem, type) => {
+    var _a2, _b2, _c2;
+    const isNoSpecAndPackage = (0, import_utilsByBooking.getIsNoSpecAndPackage)(cacheItem);
+    if (isNoSpecAndPackage) {
+      (_a2 = editNormalServiceRef.current) == null ? void 0 : _a2.init(cacheItem);
+    } else {
+      (_c2 = (_b2 = detailRef.current) == null ? void 0 : _b2.init) == null ? void 0 : _c2.call(_b2, cacheItem, false, type === "edit_product");
+    }
+  };
   const dispatchService = (type, payload) => {
     dispatch({
       type,
@@ -87,7 +92,8 @@ var useInfoHolder = (state, dispatch) => {
     handleEdit,
     dispatchService,
     handleAction,
-    showAddTimeModal
+    showAddTimeModal,
+    editNormalServiceRef
   };
 };
 var useInfoHolder_default = useInfoHolder;

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

@@ -39,12 +39,15 @@ var import_useEngineContext = __toESM(require("../../../hooks/useEngineContext")
 var import_utils = require("./utils");
 var import_antd = require("antd");
 var APP = (props) => {
-  var _a, _b, _c, _d, _e, _f, _g, _h;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n;
   const context = (0, import_useEngineContext.default)();
   const { globalState } = props;
-  const shopId = ((_c = (_b = (_a = context.appHelper) == null ? void 0 : _a.utils) == null ? void 0 : _b.getData) == null ? void 0 : _c.call(_b, "shop_id")) || ((_h = (_g = (_f = (_e = (_d = context.appHelper.utils.store) == null ? void 0 : _d.getState) == null ? void 0 : _e.call(_d)) == null ? void 0 : _f.global) == null ? void 0 : _g.globalConfig) == null ? void 0 : _h.id);
-  const isBooking4 = (0, import_utils.isBooking4Shop)(shopId, globalState == null ? void 0 : globalState.renderType);
-  if (!shopId) {
+  const isBooking4 = (0, import_utils.isBooking4Shop)(
+    ((_c = (_b = (_a = context.appHelper) == null ? void 0 : _a.utils) == null ? void 0 : _b.getData) == null ? void 0 : _c.call(_b, "shop_id")) || ((_h = (_g = (_f = (_e = (_d = context.appHelper.utils.store) == null ? void 0 : _d.getState) == null ? void 0 : _e.call(_d)) == null ? void 0 : _f.global) == null ? void 0 : _g.globalConfig) == null ? void 0 : _h.id),
+    globalState == null ? void 0 : globalState.renderType,
+    (_i = context.appHelper.utils) == null ? void 0 : _i.businessUtils
+  );
+  if (!((_n = (_m = (_l = (_k = (_j = context.appHelper.utils.store) == null ? void 0 : _j.getState) == null ? void 0 : _k.call(_j)) == null ? void 0 : _l.global) == null ? void 0 : _m.globalConfig) == null ? void 0 : _n.id)) {
     return /* @__PURE__ */ import_react.default.createElement("div", { style: { padding: 16 } }, /* @__PURE__ */ import_react.default.createElement(import_antd.Skeleton, null));
   }
   if (isBooking4 && (!(globalState == null ? void 0 : globalState.bookingId) || (globalState == null ? void 0 : globalState.isParallelResourcesBooking))) {

package/lib/components/booking/info/index.less

@@ -4,6 +4,22 @@
   .booking-info {
     padding-bottom: 16px;
 
+    .booking-info-client-line {
+      display: flex;
+      flex-direction: row;
+      gap: 10px;
+
+      .booking-info-client-line-code {
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        width: 64px;
+        height: 64px;
+        border-radius: 8px;
+        background: #5d3f9f;
+        cursor: pointer;
+      }
+    }
   }
 
   // &::before {
@@ -22,7 +38,7 @@
   }
 }
 .create-booking-page-info-wrap-create {
-  background: var(--Success-50, #ECFDF3);
+  background: var(--Success-50, #ecfdf3);
 }
 .create-booking-page-info-wrap {
   position: initial !important;
@@ -34,4 +50,4 @@
     font-weight: 600;
     line-height: 32px;
   }
-}
+}

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

@@ -37,7 +37,6 @@ var import_react = __toESM(require("react"));
 var import_footer = __toESM(require("../components/footer"));
 var import_tabPane = __toESM(require("../components/tabPane"));
 var import_locales = __toESM(require("../locales"));
-var import_addNote = __toESM(require("../notes/addNote"));
 var import_client = __toESM(require("./client"));
 var import_date = __toESM(require("./date"));
 var import_header = __toESM(require("./header"));
@@ -126,7 +125,6 @@ var Info = (0, import_model.Provider)((props) => {
     globalState == null ? void 0 : globalState.renderType
   ]);
   const notes = (0, import_react.useMemo)(() => {
-    var _a2, _b2, _c2, _d2;
     if (!modules.note) {
       return null;
     }
@@ -134,9 +132,15 @@ var Info = (0, import_model.Provider)((props) => {
       return null;
     }
     if ((0, import_utils3.isDayBooking)(globalState)) {
-      return /* @__PURE__ */ import_react.default.createElement(import_addNote.default, { value: (_b2 = (_a2 = modal.state) == null ? void 0 : _a2.notes) == null ? void 0 : _b2.orderNote, onChange: addNote });
+      return (
+        // <AddNote value={modal.state?.notes?.orderNote} onChange={addNote} />
+        null
+      );
     }
-    return (globalState == null ? void 0 : globalState.bookingId) ? globalState.renderType === "eventBooking" || globalState.isBookingCreatePage ? /* @__PURE__ */ import_react.default.createElement(import_notes.default, null) : null : /* @__PURE__ */ import_react.default.createElement(import_addNote.default, { value: (_d2 = (_c2 = modal.state) == null ? void 0 : _c2.notes) == null ? void 0 : _d2.orderNote, onChange: addNote });
+    return (globalState == null ? void 0 : globalState.bookingId) ? globalState.renderType === "eventBooking" || globalState.isBookingCreatePage ? /* @__PURE__ */ import_react.default.createElement(import_notes.default, null) : null : (
+      // <AddNote value={modal.state?.notes?.orderNote} onChange={addNote} />
+      null
+    );
   }, [
     modules.note,
     globalState == null ? void 0 : globalState.bookingId,
@@ -162,7 +166,10 @@ var Info = (0, import_model.Provider)((props) => {
       bodyClassName: (0, import_classnames.default)("booking-info-warp", {
         ["create-booking-page-info-wrap"]: isBookingCreatePage,
         ["create-booking-page-info-wrap-create"]: isBookingCreatePageCreateMode && !(0, import_utils3.isTerminalDayBooking)(modal.state)
-      })
+      }),
+      state: modal.state,
+      dispatch: modal.dispatch,
+      source: "info"
     },
     /* @__PURE__ */ import_react.default.createElement("div", { className: "booking-info" }, createHeader, modules.client ? /* @__PURE__ */ import_react.default.createElement(import_client.default, null) : null, modules.holder && !((_i = modal.state) == null ? void 0 : _i.disabledEdit) ? /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, params.type === "form" ? /* @__PURE__ */ import_react.default.createElement(import_pet.default, null) : null) : null, modules.date ? /* @__PURE__ */ import_react.default.createElement(import_date.default, null) : null, /* @__PURE__ */ import_react.default.createElement(
       import_antd.Skeleton,

package/lib/components/booking/info/service/Lists.js

@@ -80,6 +80,7 @@ var Lists = ({ onEdit, onChange, onAction, isParallelResource }) => {
     }
   );
   const productParams = (0, import_react.useMemo)(() => {
+    var _a2, _b;
     return {
       hideAddBtn: state.isTerminalDayBookingPage || state.isBookingCreatePage,
       isShowNote: (0, import_utils.isEventBooking)(state),
@@ -91,13 +92,15 @@ var Lists = ({ onEdit, onChange, onAction, isParallelResource }) => {
       isShowChangeHolder,
       isShowChangeResource: true,
       isShowAddHolderButton: true,
-      isShowEditProduct: !state.isBookingCreatePage
+      isShowEditProduct: !state.isBookingCreatePage,
+      productCardStyleConfig: (_b = (_a2 = state.bookingConfig) == null ? void 0 : _a2.config) == null ? void 0 : _b.cart_settings_tab
     };
   }, [
     state == null ? void 0 : state.bookingId,
     state == null ? void 0 : state.disabledEdit,
     isShowChangeHolder,
-    state.isBookingCreatePage
+    state.isBookingCreatePage,
+    state.bookingConfig
   ]);
   const products = (0, import_react.useMemo)(() => {
     var _a2;
@@ -117,6 +120,7 @@ var Lists = ({ onEdit, onChange, onAction, isParallelResource }) => {
     return /* @__PURE__ */ import_react.default.createElement(import_Provider.CartContext.Provider, { value: { state } }, /* @__PURE__ */ import_react.default.createElement(
       import_shoppingCart.default,
       {
+        scenario: state.isBookingTicket2 ? "booking2" : void 0,
         isParallelResource,
         onAction,
         onChange: handleChange,

package/lib/components/booking/info/service/editService/index.js

@@ -456,6 +456,7 @@ var Info = (_, ref) => {
         const other = JSON.parse(JSON.stringify(e2));
         other.session = e2.session;
         let cacheItem = {
+          ...item,
           ..._detail,
           product_id: item.id,
           _id: item == null ? void 0 : item._id,