@pisell/private-materials 3.0.214 → 3.1.2

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

@@ -25,7 +25,6 @@ __export(amount_exports, {
 module.exports = __toCommonJS(amount_exports);
 var import_utils = require("../../utils");
 var import_utils2 = require("@pisell/utils");
-var import_utils3 = require("../../info/service2/utils");
 var getRelationDetailsTotal = (relation_details) => {
   let total = 0;
   for (let item of relation_details) {
@@ -39,45 +38,27 @@ var getProductAmount = (state, isEdit) => {
   var _a, _b;
   let price = 0;
   let duration = 0;
-  const isDay = (0, import_utils3.isDayBooking)(state);
   if (isEdit) {
     if ((state == null ? void 0 : state.service) || (state == null ? void 0 : state.addons)) {
       for (let item of state == null ? void 0 : state.service.value) {
-        if (isDay) {
-          const quantity = item._extend.quantity || 1;
-          price += Number(item._extend.total) * Number(quantity);
-          const _duration = (0, import_utils3.isDayBookingProduct)(item, state) ? item._extend.duration : 0;
-          duration += _duration;
-        } else {
-          price += Number(item._extend.total);
-          price += getRelationDetailsTotal(item._extend.relation_details || []);
-          duration += import_utils.flexibleObj.getValue(item._extend.duration);
-        }
+        price += Number(item._extend.total);
+        price += getRelationDetailsTotal(item._extend.relation_details || []);
+        duration += import_utils.flexibleObj.getValue(item._extend.duration);
       }
-      if (!isDay) {
-        for (let item of state.addons.value) {
-          price += Number(item._extend.total) * item._extend.quantity;
-        }
+      for (let item of state.addons.value) {
+        price += Number(item._extend.total) * item._extend.quantity;
       }
     }
   } else {
     price = Number((_a = state.bookingDetail) == null ? void 0 : _a.product_expect_amount);
-    let services = ((_b = state == null ? void 0 : state.service) == null ? void 0 : _b.value) || [];
-    duration = services.reduce((pre, cur) => {
+    duration = (((_b = state == null ? void 0 : state.service) == null ? void 0 : _b.value) || []).reduce((pre, cur) => {
       var _a2;
-      let current = 0;
-      if (isDay) {
-        const _duration = (0, import_utils3.isDayBookingProduct)(cur, state) ? cur._extend.duration : 0;
-        current = _duration || 0;
-      } else {
-        current = import_utils.flexibleObj.getValue(((_a2 = cur._extend) == null ? void 0 : _a2.duration) || 0);
-      }
-      return pre + current;
+      return pre + import_utils.flexibleObj.getValue(((_a2 = cur._extend) == null ? void 0 : _a2.duration) || 0);
     }, 0);
   }
   return {
     price: Number(price),
-    duration: (0, import_utils.getDiscountTime)(duration, isDay)
+    duration: (0, import_utils.getDiscountTime)(duration)
   };
 };
 var getProductItemTax = (item, bookingDetail) => {

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

@@ -32,23 +32,22 @@ __export(footer_exports, {
   default: () => footer_default
 });
 module.exports = __toCommonJS(footer_exports);
-var import_icons = require("@ant-design/icons");
+var import_react = __toESM(require("react"));
 var import_ChevronDown = __toESM(require("@pisell/icon/es/ChevronDown"));
-var import_utils = require("@pisell/utils");
-var import_antd = require("antd");
 var import_classnames = __toESM(require("classnames"));
-var import_react = __toESM(require("react"));
-var import_useEngineContext = __toESM(require("../../../../hooks/useEngineContext"));
+var import_antd = require("antd");
+var import_utils = require("@pisell/utils");
+var import_antd2 = require("antd");
 var import_addons = require("../../addons");
-var import_utils2 = require("../../info/service2/utils");
-var import_utils3 = require("../../info/utils");
-var import_serve = require("../../info2/serve");
-var import_AppointmentProductModal = __toESM(require("./AppointmentProductModal"));
-var import_FooterMenus = __toESM(require("./FooterMenus"));
+var import_utils2 = require("./utils");
 var import_amount = require("./amount");
+var import_FooterMenus = __toESM(require("./FooterMenus"));
 var import_index = require("./index.less");
-var import_serve2 = require("./serve");
-var import_utils4 = require("./utils");
+var import_useEngineContext = __toESM(require("../../../../hooks/useEngineContext"));
+var import_icons = require("@ant-design/icons");
+var import_serve = require("./serve");
+var import_serve2 = require("../../info2/serve");
+var import_utils3 = require("../../info/utils");
 var Footer = (props) => {
   var _a, _b, _c, _d, _e, _f, _g, _h, _i;
   const { state, buttons, dispatch, source } = props;
@@ -56,7 +55,6 @@ var Footer = (props) => {
   const [loading, setLoading] = (0, import_react.useState)(false);
   const [checkoutLoading, setCheckoutLoading] = (0, import_react.useState)(false);
   const [isShowPaymentLink, setIsShowPaymentLink] = (0, import_react.useState)(false);
-  const appointmentProductRef = (0, import_react.useRef)(null);
   const context = (0, import_useEngineContext.default)();
   const { isTerminal, interaction, store, storage } = (_a = context.appHelper) == null ? void 0 : _a.utils;
   (0, import_react.useEffect)(() => {
@@ -212,11 +210,6 @@ var Footer = (props) => {
   };
   const handleCheckout = async () => {
     if (isEdit) {
-      if ((0, import_utils2.isDayBooking)(state)) {
-        const isHasDayProducts = handleDaySubmit();
-        if (isHasDayProducts)
-          return;
-      }
       const res = await handleSave({ type: "checkout" });
       goCheckout((res == null ? void 0 : res.order_id) || state.bookingId);
       return;
@@ -243,10 +236,10 @@ var Footer = (props) => {
     if ((0, import_utils3.isBooking4Shop)(
       (_e2 = (_d2 = (_c2 = (_b2 = (_a2 = context.appHelper.utils.store) == null ? void 0 : _a2.getState) == null ? void 0 : _b2.call(_a2)) == null ? void 0 : _c2.global) == null ? void 0 : _d2.globalConfig) == null ? void 0 : _e2.id,
       state.renderType
-    ) || state.renderType === "dayBooking") {
+    )) {
       return {
-        editBooking: import_serve.editBookings,
-        createBooking: import_serve.createBookings
+        editBooking: import_serve2.editBookings,
+        createBooking: import_serve2.createBookings
       };
     }
     return {
@@ -254,37 +247,50 @@ var Footer = (props) => {
       createBooking: state.apis.createBooking
     };
   };
-  const handleDaySubmit = () => {
-    var _a2;
-    const _isHasDayProducts = (0, import_utils2.isHasDayAppointmentProduct)(state);
-    if (_isHasDayProducts) {
-      (_a2 = appointmentProductRef == null ? void 0 : appointmentProductRef.current) == null ? void 0 : _a2.open();
-    }
-    return _isHasDayProducts;
-  };
   const handleSave = async ({
     type,
     messageShow = true
   }) => {
     var _a2;
-    if ((0, import_utils2.isDayBooking)(state)) {
-      const isHasDayProducts = handleDaySubmit();
-      if (isHasDayProducts)
-        return;
-    }
     let _setLoading = type === "checkout" ? setCheckoutLoading : setLoading;
     _setLoading(true);
     const { createBooking, editBooking } = getApis();
-    const editApi = state.renderType === "eventBooking" ? import_serve2.editEventBooking : editBooking;
-    const createApi = state.renderType === "eventBooking" ? import_serve2.createEventBooking : createBooking;
+    const editApi = state.renderType === "eventBooking" ? state.apis.editEventBooking : editBooking;
+    const createApi = state.renderType === "eventBooking" ? state.apis.createEventBooking : createBooking;
     let saveOtherValue = {};
     if (type === "save") {
       saveOtherValue = await ((_a2 = state == null ? void 0 : state.onSave) == null ? void 0 : _a2.call(state, state.client)) || {};
     }
     try {
       let callbackData = null;
-      let values = (0, import_utils4.formatValues)({ ...state, ...saveOtherValue });
+      let values = (0, import_utils2.formatValues)({ ...state, ...saveOtherValue });
       const api = state.bookingId ? editApi : createApi;
+      if (!state.bookingId && state.renderType === "eventBooking") {
+        const { data } = await (0, import_serve.eventBookingCheck)(values);
+        if (data.list.length) {
+          const confirmed = await modal.confirm({
+            icon: null,
+            title: import_utils.locales.getText(
+              "page.event.booking.text.duplicate-enrollment"
+            ),
+            content: import_utils.locales.getText(
+              "page.event.booking.text.duplicate-enrollment-content"
+            )({
+              customerName: data.customer_name,
+              title: data.title,
+              list: data.list
+            }),
+            width: 480,
+            okText: import_utils.locales.getText(
+              "page.event.booking.text.duplicate-enrollment-confirm"
+            )
+          });
+          if (!confirmed) {
+            _setLoading(false);
+            return;
+          }
+        }
+      }
       if (addonsEdit) {
         await handleSaveAddons();
       }
@@ -298,7 +304,6 @@ var Footer = (props) => {
           );
         }
       }
-      debugger;
       state == null ? void 0 : state.callback(callbackData);
       _setLoading(false);
       return callbackData || values;
@@ -356,7 +361,7 @@ var Footer = (props) => {
       buttonType = "primary";
     }
     return /* @__PURE__ */ import_react.default.createElement(
-      import_antd.Button,
+      import_antd2.Button,
       {
         className: "pisell-lowcode__booking-footer-buttons-item",
         type: buttonType,
@@ -458,7 +463,7 @@ var Footer = (props) => {
       { label: import_utils.locales.getText("pisell2.text.send-mail"), key: "sendMail" },
       { label: import_utils.locales.getText("pisell2.text.copy-to-clipboard"), key: "copy" }
     ];
-    return /* @__PURE__ */ import_react.default.createElement(import_antd.Dropdown, { menu: { items, onClick: handleMenuClick } }, /* @__PURE__ */ import_react.default.createElement(import_antd.Button, { className: "pisell-lowcode__booking-footer-buttons-item" }, /* @__PURE__ */ import_react.default.createElement(import_antd.Space, null, import_utils.locales.getText("pisell2.text.payment-link"), /* @__PURE__ */ import_react.default.createElement(import_icons.DownOutlined, null))));
+    return /* @__PURE__ */ import_react.default.createElement(import_antd.Dropdown, { menu: { items, onClick: handleMenuClick } }, /* @__PURE__ */ import_react.default.createElement(import_antd2.Button, { className: "pisell-lowcode__booking-footer-buttons-item" }, /* @__PURE__ */ import_react.default.createElement(import_antd.Space, null, import_utils.locales.getText("pisell2.text.payment-link"), /* @__PURE__ */ import_react.default.createElement(import_icons.DownOutlined, null))));
   }, [handleMenuClick]);
   const saveButton = (0, import_react.useMemo)(() => {
     let buttonType = "default";
@@ -466,7 +471,7 @@ var Footer = (props) => {
       buttonType = "primary";
     }
     return /* @__PURE__ */ import_react.default.createElement(
-      import_antd.Button,
+      import_antd2.Button,
       {
         className: "pisell-lowcode__booking-footer-buttons-item",
         type: buttonType,
@@ -481,7 +486,7 @@ var Footer = (props) => {
   }, [loading, isDisabled, isEdit, infoEdit, addonsEdit, state]);
   const completeButton = (0, import_react.useMemo)(() => {
     return /* @__PURE__ */ import_react.default.createElement(
-      import_antd.Button,
+      import_antd2.Button,
       {
         className: "pisell-lowcode__booking-footer-buttons-item",
         type: "primary",
@@ -493,7 +498,7 @@ var Footer = (props) => {
   }, [state.appointment_status]);
   const rebookButton = (0, import_react.useMemo)(() => {
     return /* @__PURE__ */ import_react.default.createElement(
-      import_antd.Button,
+      import_antd2.Button,
       {
         className: "pisell-lowcode__booking-footer-buttons-item",
         onClick: handleRebook
@@ -503,7 +508,7 @@ var Footer = (props) => {
   }, [state == null ? void 0 : state.onRebook]);
   const refundButton = (0, import_react.useMemo)(() => {
     return /* @__PURE__ */ import_react.default.createElement(
-      import_antd.Button,
+      import_antd2.Button,
       {
         className: "pisell-lowcode__booking-footer-buttons-item",
         type: "default",
@@ -518,7 +523,7 @@ var Footer = (props) => {
   };
   const clearAllButton = (0, import_react.useMemo)(() => {
     return /* @__PURE__ */ import_react.default.createElement(
-      import_antd.Button,
+      import_antd2.Button,
       {
         className: "pisell-lowcode__booking-footer-buttons-item",
         type: "default",
@@ -642,7 +647,7 @@ var Footer = (props) => {
     }
     if (transaction_habit_selection.button_rows == 1) {
       if (state.appointment_status !== "cancelled") {
-        if (!state.disabledEdit && !state.isBookingCreatePage && !(0, import_utils2.isDayBooking)(state)) {
+        if (!state.disabledEdit && !state.isBookingCreatePage) {
           arr.push(actionMap.sale);
         }
       }
@@ -856,8 +861,8 @@ var Footer = (props) => {
       className: "pisell-lowcode__booking-footer-buttons",
       style: { marginTop: 12 }
     },
-    state.appointment_status !== "cancelled" && !state.isBookingCreatePage && !(0, import_utils2.isDayBooking)(state) ? /* @__PURE__ */ import_react.default.createElement(
-      import_antd.Button,
+    state.appointment_status !== "cancelled" && !state.isBookingCreatePage ? /* @__PURE__ */ import_react.default.createElement(
+      import_antd2.Button,
       {
         onClick: () => handleSale(),
         size: "large",
@@ -866,7 +871,7 @@ var Footer = (props) => {
       actionMap.sale.label
     ) : null,
     isTeam ? null : /* @__PURE__ */ import_react.default.createElement(
-      import_antd.Button,
+      import_antd2.Button,
       {
         onClick: () => handleOrderDetail(),
         size: "large",
@@ -874,6 +879,6 @@ var Footer = (props) => {
       },
       actionMap.orderDetail.label
     )
-  ) : null, contextHolder, /* @__PURE__ */ import_react.default.createElement(import_AppointmentProductModal.default, { ref: appointmentProductRef }));
+  ) : null, contextHolder);
 };
 var footer_default = Footer;

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

@@ -1,3 +1 @@
 export declare const eventBookingCheck: (params: any) => Promise<any>;
-export declare const editEventBooking: (params: any, bookingId: string) => Promise<any>;
-export declare const createEventBooking: (params: any) => Promise<any>;

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

@@ -19,24 +19,12 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/components/booking/components/footer/serve.ts
 var serve_exports = {};
 __export(serve_exports, {
-  createEventBooking: () => createEventBooking,
-  editEventBooking: () => editEventBooking,
   eventBookingCheck: () => eventBookingCheck
 });
 module.exports = __toCommonJS(serve_exports);
 var import_utils = require("../../utils");
 var eventBookingCheck = async (params) => import_utils.request.getRequest().post(`/shop/eventbookingv2/order/check`, params);
-var editEventBooking = async (params, bookingId) => {
-  const { data } = await import_utils.request.getRequest().put(`/shop/v1.1/eventbookingv2/order/${bookingId}`, params);
-  return data;
-};
-var createEventBooking = async (params) => {
-  const { data } = await import_utils.request.getRequest().post(`/shop/v1.1/eventbookingv2/order`, params);
-  return data;
-};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  createEventBooking,
-  editEventBooking,
   eventBookingCheck
 });

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

@@ -38,9 +38,7 @@ var import_dayjs = __toESM(require("dayjs"));
 var import_utils = require("../../utils");
 var import_utils2 = require("../../utils");
 var import_utilsByBooking = require("../../info2/utilsByBooking");
-var import_utils3 = require("../../utils");
-var import_status = require("../../info/service2/status");
-var import_utils4 = require("../../info/service2/utils");
+var import_utils3 = require("@pisell/utils");
 var formatNote = (data) => {
   var _a;
   return ((_a = data.notes) == null ? void 0 : _a.orderNote) || "";
@@ -68,25 +66,38 @@ var formatProductOption = (option) => {
       "num": d.num,
       "option_group_item_id": d.product_option_item_id,
       "option_group_id": d.option_group_id
-      // "add_price": Number(d?.add_price),
     };
   });
 };
+var log = (data) => {
+  (0, import_utils3.sendWarningLog)({
+    title: "预约2.0下单无效的套餐商品数据",
+    content: [
+      { key: "bundle", value: JSON.stringify(data) },
+      { key: "日期", value: (0, import_dayjs.default)().format("YYYY-MM-DD HH:mm") }
+    ]
+  });
+};
 var formatProductBundle = (bundle) => {
   if (!bundle) {
     return;
   }
+  try {
+    const errorBundles = bundle == null ? void 0 : bundle.filter((d) => !(d == null ? void 0 : d.group_id) || !(d == null ? void 0 : d.id) || !(d == null ? void 0 : d._bundle_product_id));
+    if ((errorBundles == null ? void 0 : errorBundles.length) > 0) {
+      log(errorBundles);
+    }
+  } catch (error) {
+  }
   return bundle.map((d) => {
     return {
       "bundle_group_id": d.group_id,
       "bundle_id": d.id,
-      "bundle_product_id": d._bundle_product_id,
+      "bundle_product_id": (d == null ? void 0 : d._bundle_product_id) || (d == null ? void 0 : d.product_id),
       "bundle_variant_id": d.bundle_variant_id,
       "num": d.num,
       "extension_id": d.extension_id,
       "extension_type": d.extension_type,
-      // "price": Number(d?.price),
-      // "price_type": d?.price_type,
       "option": formatProductOption(d.option)
     };
   });
@@ -94,7 +105,7 @@ var formatProductBundle = (bundle) => {
 var getSubType = (item) => {
   var _a;
   const _type = (_a = item.duration) == null ? void 0 : _a.type;
-  if (_type) {
+  if (_type && _type !== "days") {
     return _type;
   }
   return "minutes";
@@ -130,138 +141,39 @@ var formatResource = (service) => {
     return void 0;
   }
 };
-var formatHolders = (state, item, values) => {
-  var _a, _b, _c, _d, _e;
-  const form_id = ((_d = (_c = (_b = (_a = state == null ? void 0 : state.bookingConfig) == null ? void 0 : _a.config) == null ? void 0 : _b.basic) == null ? void 0 : _c.appointment_subject) == null ? void 0 : _d.form_id) || 0;
-  let obj = {
-    customer_id: values.customer_id,
-    form_id,
-    form_record: [((_e = item._extend) == null ? void 0 : _e.holder_id) || 0]
-  };
-  if (state.isFranchisee) {
-    obj.is_source_shop = 1;
-  }
-  return obj;
-};
-var formatProductPrice = (item) => {
-  var _a, _b, _c;
-  const other = (_a = item._extend) == null ? void 0 : _a.other;
-  let price = Number((_b = item._extend) == null ? void 0 : _b.price);
-  if (other == null ? void 0 : other.option) {
-    price = (_c = other == null ? void 0 : other.option) == null ? void 0 : _c.reduce((pre, cur) => {
-      return pre + Number(cur.price) * Number(cur.num);
-    }, price);
-  }
-  return price;
-};
-var formatMetaData = (item) => {
-  var _a, _b, _c, _d, _e;
-  let metadata = {};
-  if ((_a = item._extend) == null ? void 0 : _a.capacity) {
-    metadata.capacity = item._extend.capacity;
-  }
-  if (item._extend.groupId) {
-    metadata.groupId = item._extend.groupId;
-  }
-  if ((_b = item._extend) == null ? void 0 : _b.holder_id) {
-    metadata.holder_id = (_c = item._extend) == null ? void 0 : _c.holder_id;
-  }
-  if ((_d = item._extend) == null ? void 0 : _d.multiDayPrices) {
-    metadata.multiDayPrices = (_e = item._extend) == null ? void 0 : _e.multiDayPrices;
-  }
-  return metadata;
-};
-var formatProducts = (item) => {
-  var _a, _b, _c, _d, _e, _f;
-  const total = Number(item._extend.total);
-  const origin_total = Number(item._extend.origin_total);
-  const discount_amount = origin_total - total;
-  const discount_type = discount_amount < 0 ? "change_price" : "discount";
-  return {
-    "num": item._extend.quantity,
-    "price": formatProductPrice(item),
-    "product_id": (item == null ? void 0 : item.product_id) || item.id,
-    "discount_amount": discount_amount,
-    "product_discount_reason": item._extend.discount_reason || "",
-    "is_charge_tax": item.is_charge_tax,
-    "note": (item == null ? void 0 : item.note) || "",
-    "discountway": item._extend.discountway || "num",
-    "discount_per": item._extend.discount_per,
-    "discount_type": item._extend.discount_type || discount_type,
-    "order_detail_id": item._extend.order_detail_id || 0,
-    "product_bundle": formatProductBundle((_b = (_a = item._extend) == null ? void 0 : _a.other) == null ? void 0 : _b.bundle),
-    "bundle_edit": item._extend.bundle_edit,
-    "product_option_item": formatProductOption((_d = (_c = item._extend) == null ? void 0 : _c.other) == null ? void 0 : _d.option),
-    "product_variant_id": ((_f = (_e = item._extend) == null ? void 0 : _e.other) == null ? void 0 : _f.product_variant_id) || 0,
-    metadata: formatMetaData(item)
-  };
-};
-var formatAppointmentProductLists = (data) => {
-  var _a;
-  try {
-    let list = data.service.value;
-    list = list.filter((item) => {
-      var _a2;
-      return ((_a2 = item._extend) == null ? void 0 : _a2.holder_id) && import_status.appointmentTypes.includes(item.extension_type);
-    });
-    const groupMap = /* @__PURE__ */ new Map();
-    list.forEach((item) => {
-      var _a2;
-      const key = (_a2 = item._extend) == null ? void 0 : _a2.holder_id;
-      if (!groupMap.has(key)) {
-        groupMap.set(key, []);
-      }
-      groupMap.get(key).push(item);
-    });
-    const result = (_a = Array.from(groupMap.values())) == null ? void 0 : _a.reduce((acc, group) => acc.concat(group), []);
-    return list || [];
-  } catch (error) {
-  }
-};
-var formatBookings = (data, values) => {
-  const isDay = (0, import_utils4.isDaysBooking)(data);
-  const isEvent = (0, import_utils4.isEventBooking)(data);
-  let list = data.service.value;
-  if (isDay) {
-    list = formatAppointmentProductLists(data);
-  }
-  if (isEvent) {
-    list = list.filter((d) => {
-      var _a;
-      return (_a = d._extend) == null ? void 0 : _a.holder_id;
-    });
-  }
-  let dayParams = {
-    relation_products: []
-  };
+var formatBookings = (data) => {
+  const list = data.service.value;
   const eventOtherParams = data.eventOtherParams;
   let bookings = [];
   bookings = list.map((item) => {
-    var _a, _b, _c, _d;
-    let start_date = item._extend.startDate.format("YYYY-MM-DD");
-    let end_date = item._extend.endDate.format("YYYY-MM-DD");
-    let end_time = item._extend.endDate.format("HH:mm");
+    var _a, _b;
+    const start_date = item._extend.startDate.format("YYYY-MM-DD");
+    const end_date = item._extend.endDate.format("YYYY-MM-DD");
+    const end_time = item._extend.endDate.format("HH:mm");
     let start_time = item._extend.startDate.format("HH:mm");
     if ((0, import_utils.isNowTime)(item._extend.start_time)) {
       start_time = (0, import_utils.getNowTime)();
     }
-    if (isDay) {
-      const startDate = ((_a = item._extend) == null ? void 0 : _a.startDate) || ((_b = item._extend) == null ? void 0 : _b.start_date);
-      const endDate = ((_c = item._extend) == null ? void 0 : _c.endDate) || ((_d = item._extend) == null ? void 0 : _d.end_date);
-      const { startDateTime, endDateTime } = (0, import_utils4.formatDayTime)({ startDate, endDate });
-      start_date = (0, import_dayjs.default)(startDateTime).format("YYYY-MM-DD");
-      start_time = (0, import_dayjs.default)(startDateTime).format("HH:mm");
-      end_date = (0, import_dayjs.default)(endDateTime).format("YYYY-MM-DD");
-      end_time = (0, import_dayjs.default)(endDateTime).format("HH:mm");
-      dayParams.relation_products = (item == null ? void 0 : item.relation_products) || [];
-      dayParams.holder = formatHolders(data, item, values);
-      dayParams.duration = (0, import_utils3.getDays)({ _extend: { start_date: startDateTime, end_date: endDateTime } }, "minutes");
-    }
-    if (isEvent) {
-      dayParams.holder = formatHolders(data, item, values);
-    }
+    const total = Number(item._extend.total);
+    const origin_total = Number(item._extend.origin_total);
+    const discount_amount = origin_total - total;
+    const discount_type = discount_amount < 0 ? "change_price" : "discount";
     return {
-      "product": formatProducts(item),
+      "product": {
+        "num": item._extend.quantity,
+        "price": item._extend.price,
+        "product_id": item.id,
+        "discount_amount": discount_amount,
+        "product_discount_reason": item._extend.discount_reason || "",
+        "is_charge_tax": item.is_charge_tax,
+        "note": "",
+        "discountway": item._extend.discountway || "num",
+        "discount_per": item._extend.discount_per,
+        "discount_type": item._extend.discount_type || discount_type,
+        "order_detail_id": item._extend.order_detail_id || 0,
+        "product_bundle": formatProductBundle((_b = (_a = item._extend) == null ? void 0 : _a.other) == null ? void 0 : _b.bundle),
+        "bundle_edit": item._extend.bundle_edit
+      },
       "relation_products": formatRelationDetails(item._extend.relation_details),
       "id": item.booking_id || 0,
       "relation_id": item._extend.relation_id || 0,
@@ -270,35 +182,22 @@ var formatBookings = (data, values) => {
       "is_all": false,
       "schedule_id": item._extend.schedule_id || 0,
       "end_time": end_time,
-      "sub_type": isDay ? "days" : getSubType(item),
+      "sub_type": getSubType(item),
       "select_date": start_date,
       "start_time": start_time,
       "end_date": end_date,
       "start_date": start_date,
-      "duration": isDay ? 0 : import_utils.flexibleObj.getValue(item._extend.duration),
+      "duration": import_utils.flexibleObj.getValue(item._extend.duration),
       "number": item._extend.capacity ? (0, import_utilsByBooking.getSumCapacity)({ cacheItem: item }) : item._extend.number || 1,
       "resources": formatResource(item),
-      "metadata": formatMetaData(item),
-      ...eventOtherParams || {},
-      ...dayParams
+      "metadata": item._extend.capacity ? {
+        capacity: item._extend.capacity
+      } : void 0,
+      ...eventOtherParams || {}
     };
   });
-  debugger;
   return bookings;
 };
-var formatRelationProducts = (data) => {
-  var _a;
-  let list = ((_a = data.service) == null ? void 0 : _a.value) || [];
-  list = list.filter((item) => {
-    var _a2;
-    return !((_a2 = item._extend) == null ? void 0 : _a2.holder_id);
-  });
-  let relationProducts = [];
-  relationProducts = list.map((item) => {
-    return formatProducts(item);
-  });
-  return relationProducts || [];
-};
 var formatHolder = (state, values) => {
   var _a, _b, _c, _d, _e, _f, _g, _h;
   const form_id = ((_d = (_c = (_b = (_a = state == null ? void 0 : state.bookingConfig) == null ? void 0 : _a.config) == null ? void 0 : _b.basic) == null ? void 0 : _c.appointment_subject) == null ? void 0 : _d.form_id) || 0;
@@ -325,13 +224,9 @@ var formatValues = (state) => {
     bookings: [],
     customer_id: 1,
     customer_name: "",
-    holder: {},
-    relation_products: [],
-    metadata: {}
+    holder: {}
   };
-  const isDay = (0, import_utils4.isDaysBooking)(state);
-  const isEvent = (0, import_utils4.isEventBooking)(state);
-  if (!state.bookingId || isDay) {
+  if (!state.bookingId) {
     values.shop_note = formatNote(state);
   }
   if (state.bookingId) {
@@ -347,21 +242,12 @@ var formatValues = (state) => {
     ...customer
   };
   values.holder = formatHolder(state, values);
-  if (isDay) {
-    values.relation_products = formatRelationProducts(state);
-  }
-  if (isEvent) {
-    values.relation_products = formatRelationProducts(state);
-  }
-  values.bookings = formatBookings(state, values);
+  values.bookings = formatBookings(state);
   if (((_c = (_b = values == null ? void 0 : values.bookings) == null ? void 0 : _b[0]) == null ? void 0 : _c.select_date) && !(state == null ? void 0 : state.bookingId)) {
     let startTime = `${(_e = (_d = values == null ? void 0 : values.bookings) == null ? void 0 : _d[0]) == null ? void 0 : _e.start_time}`;
     startTime = `${startTime || "00:00"}:00`;
     values.schedule_date = `${values.bookings[0].select_date} ${startTime}`;
   }
-  if (isDay) {
-    values.metadata.is_multiday_appointment = 1;
-  }
   return values;
 };
 // Annotate the CommonJS export names for ESM import in node:

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

@@ -49,11 +49,6 @@ var AddServiceVariant = (props) => {
         service: { ...stateRef.current.service, ...payload }
       });
     }
-    if (type === "setDate") {
-      setGlobalState({
-        date: { ...stateRef.current.date, ...payload }
-      });
-    }
   };
   let Cpt = import_addService.default;
   if ((0, import_utils.isBooking4Shop)(

package/lib/components/booking/info/clientVariant/vertical/SelectDrawer.d.ts

@@ -19,7 +19,6 @@ interface SelectDrawerProps {
     modalOpen: boolean;
     franchiseeLoading?: number;
     showHeader?: boolean;
-    showWalkIn?: boolean;
 }
 declare const _default: React.ForwardRefExoticComponent<SelectDrawerProps & React.RefAttributes<unknown>>;
 export default _default;