@pisell/private-materials 3.0.16 → 3.0.18

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

@@ -32,11 +32,11 @@ var getProductAmount = (state, isEdit) => {
   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) {
-        price += Number(item._extend.price) * (item._extend.quantity || 1);
+        price += Number(item._extend.total);
         duration += import_utils.flexibleObj.getValue(item._extend.duration);
       }
       for (let item of state.addons.value) {
-        price += Number(item.price) * item.quantity;
+        price += Number(item._extend.total) * item._extend.quantity;
       }
     }
   } else {
@@ -53,7 +53,7 @@ var getProductAmount = (state, isEdit) => {
 };
 var getProductItemTax = (item, bookingDetail) => {
   let price = 0;
-  const productDiscountPrice = Number(item.price);
+  const productDiscountPrice = Number(item.total);
   const shopTax = productDiscountPrice * Number(bookingDetail.tax_rate) * Number(item.is_charge_tax);
   const shopTaxRate = 1 + bookingDetail.tax_rate * bookingDetail.is_price_include_tax;
   const res = shopTax / shopTaxRate * item.quantity;
@@ -61,10 +61,7 @@ var getProductItemTax = (item, bookingDetail) => {
   return price;
 };
 var getTotal = (item) => {
-  return item._extend.payment_price !== void 0 ? item._extend.payment_price : item._extend.price;
-};
-var getAddonsTotal = (item) => {
-  return item.payment_price !== void 0 ? item.payment_price : item.price;
+  return item._extend.payment_price !== void 0 ? item._extend.payment_price : item._extend.total;
 };
 var getTax = (state, isEdit) => {
   var _a;
@@ -80,7 +77,8 @@ var getTax = (state, isEdit) => {
       price += getProductItemTax(
         {
           ...item,
-          price: getTotal(item),
+          total: getTotal(item),
+          price: item._extend.price,
           quantity: item._extend.quantity
         },
         state.bookingDetail
@@ -89,8 +87,9 @@ var getTax = (state, isEdit) => {
     for (let item of state.addons.value) {
       price += getProductItemTax({
         ...item,
-        price: getAddonsTotal(item),
-        quantity: item.quantity
+        total: getTotal(item),
+        price: item._extend.price,
+        quantity: item._extend.quantity
       }, state.bookingDetail);
     }
   }

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

@@ -1 +1,19 @@
+/**
+ * @title: 套餐单规格信息
+ * @description:
+ * @param {any} option
+ * @return {*}
+ * @Author: zhiwei.Wang
+ * @Date: 2024-02-19 09:26
+ */
+export declare const formatProductOption: (option: any) => any;
+/**
+ * @title: 套餐信息
+ * @description:
+ * @param {any} bundle
+ * @return {*}
+ * @Author: zhiwei.Wang
+ * @Date: 2024-02-19 09:26
+ */
+export declare const formatProductBundle: (bundle: any) => any;
 export declare const formatValues: (state: any) => any;

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

@@ -19,6 +19,8 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/components/booking/components/footer/utils.ts
 var utils_exports = {};
 __export(utils_exports, {
+  formatProductBundle: () => formatProductBundle,
+  formatProductOption: () => formatProductOption,
   formatValues: () => formatValues
 });
 module.exports = __toCommonJS(utils_exports);
@@ -42,28 +44,63 @@ var formatCustomer = (data) => {
     country_calling_code: (_l = (_k = data.client) == null ? void 0 : _k.value) == null ? void 0 : _l.country_calling_code
   };
 };
+var formatProductOption = (option) => {
+  if (!option) {
+    return [];
+  }
+  return option.map((d) => {
+    return {
+      "num": d.num,
+      "option_group_item_id": d.product_option_item_id,
+      "option_group_id": d.option_group_id
+    };
+  });
+};
+var formatProductBundle = (bundle) => {
+  if (!bundle) {
+    return;
+  }
+  return bundle.map((d) => {
+    return {
+      "bundle_group_id": d.group_id,
+      "bundle_id": d.id,
+      "bundle_product_id": d._bundle_product_id,
+      "bundle_variant_id": d.bundle_variant_id,
+      "num": d.num,
+      "extension_id": d.extension_id,
+      "extension_type": d.extension_type,
+      "option": formatProductOption(d.option)
+    };
+  });
+};
 var formatBookings = (data) => {
   const list = data.service.value;
   const eventOtherParams = data.eventOtherParams;
   let bookings = [];
   bookings = list.map((item) => {
-    let start_date = item._extend.startDate.format("YYYY-MM-DD");
-    let start_time = item._extend.startDate.format("HH:mm");
-    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");
+    const start_time = item._extend.startDate.format("HH:mm");
+    const total = Number(item._extend.total);
+    const origin_total = Number(item._extend.origin_total);
+    const discount_amount = origin_total - total;
     return {
       "product": {
         "num": item._extend.quantity,
-        "price": item.price,
+        "price": item._extend.price,
         "product_id": item.id,
-        "discount_amount": Number(item.price) - Number(item._extend.price),
+        "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",
-        "order_detail_id": item._extend.order_detail_id || 0
+        "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
       },
       "id": item.booking_id || 0,
       "relation_id": item._extend.relation_id,
@@ -130,5 +167,7 @@ var formatValues = (state) => {
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  formatProductBundle,
+  formatProductOption,
   formatValues
 });

package/lib/components/booking/forms/single/index.js

@@ -37,8 +37,8 @@ var import_FileDownload02 = __toESM(require("@pisell/icon/es/FileDownload02"));
 var import_utils = require("@pisell/utils");
 var import_antd = require("antd");
 var import_customSelect = __toESM(require("../../components/customSelect"));
+var import_collapsibleList = __toESM(require("../../components/collapsibleList"));
 var import_index = require("./index.less");
-var MAX_LIMIT = 3;
 var Single = ({
   value,
   onChange,
@@ -53,7 +53,6 @@ var Single = ({
   watch
 }) => {
   var _a, _b;
-  const [maxLimit, setMaxLimit] = (0, import_react.useState)({});
   const renderFieldValue = (fieldData, field) => {
     const val = fieldData[field.key];
     if (field.filed_type === "attachment") {
@@ -107,41 +106,17 @@ var Single = ({
   const renderItem = (0, import_react.useCallback)(
     (fieldData) => {
       let _fields = form.field || [];
-      let _maxLimit = maxLimit[fieldData.form_record_id] || MAX_LIMIT;
-      if (_fields.length > _maxLimit) {
-        _fields = _fields.slice(0, _maxLimit);
-      }
-      return _fields.map((field) => {
-        return /* @__PURE__ */ import_react.default.createElement("div", { className: "pet-form-item", key: field.key }, /* @__PURE__ */ import_react.default.createElement("div", { className: "pet-form-item-label" }, field.field_column.title), /* @__PURE__ */ import_react.default.createElement("div", { className: "pet-form-item-value" }, renderFieldValue(fieldData, field)));
-      });
-    },
-    [form, maxLimit]
-  );
-  const handlePreviewAll = (d) => {
-    let _maxLimit = maxLimit[d.form_record_id] || MAX_LIMIT;
-    if (_maxLimit === MAX_LIMIT) {
-      _maxLimit = 99;
-    } else {
-      _maxLimit = MAX_LIMIT;
-    }
-    setMaxLimit({
-      ...maxLimit,
-      [d.form_record_id]: _maxLimit
-    });
-  };
-  const showAll = (0, import_react.useMemo)(() => {
-    let _field = form.field || [];
-    return _field.length > MAX_LIMIT;
-  }, [maxLimit, form]);
-  const viewAllText = (0, import_react.useCallback)(
-    (d) => {
-      let _maxLimit = maxLimit[d.form_record_id] || MAX_LIMIT;
-      if (_maxLimit === MAX_LIMIT) {
-        return import_utils.locales.getText("pisell2.text.view-all");
-      }
-      return import_utils.locales.getText("pisell2.text.view-less");
+      return /* @__PURE__ */ import_react.default.createElement(
+        import_collapsibleList.default,
+        {
+          list: _fields,
+          renderItem: (field) => {
+            return /* @__PURE__ */ import_react.default.createElement("div", { className: "pet-form-item", key: field.key }, /* @__PURE__ */ import_react.default.createElement("div", { className: "pet-form-item-label" }, field.field_column.title), /* @__PURE__ */ import_react.default.createElement("div", { className: "pet-form-item-value" }, renderFieldValue(fieldData, field)));
+          }
+        }
+      );
     },
-    [maxLimit]
+    [form]
   );
   const _optionRender = (item) => {
     if (optionRender) {
@@ -183,18 +158,7 @@ var Single = ({
       mode: _mode,
       previewItemClassName: "pisell-lowcode__booking-pet-card",
       previewItemRender: (d) => {
-        return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, renderItem(d), showAll ? /* @__PURE__ */ import_react.default.createElement(
-          "div",
-          {
-            className: "pet-form-view-all",
-            onClick: (e) => {
-              e.preventDefault();
-              e.stopPropagation();
-              handlePreviewAll(d);
-            }
-          },
-          viewAllText(d)
-        ) : null);
+        return renderItem(d);
       },
       name: ((_a = form.form) == null ? void 0 : _a.title) || "-",
       addButtonProps: _addButtonProps,

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

@@ -40,17 +40,17 @@ var import_model = require("../../model");
 var import_addButton = __toESM(require("../../../components/addButton"));
 var import_antd = require("antd");
 var import_index = require("./index.less");
-var import_utils = require("../../../utils");
-var import_utils2 = require("@pisell/utils");
 var import_useEngineContext = __toESM(require("../../../../../hooks/useEngineContext"));
 var import_serve = require("../serve");
-var import_utils3 = require("../../utils");
+var import_utils = require("../../utils");
+var import_utils2 = require("../../../utils");
+var import_utils3 = require("@pisell/utils");
 var Info = () => {
   var _a;
   const [search, setSearch] = (0, import_react.useState)("");
   const { state, dispatch } = (0, import_react.useContext)(import_model.Context);
   const context = (0, import_useEngineContext.default)();
-  import_utils.request.setRequest(context.appHelper.utils.request);
+  import_utils2.request.setRequest(context.appHelper.utils.request);
   const setDefaultService = async (list) => {
     if (state.renderType !== "eventBooking") {
       return;
@@ -69,13 +69,13 @@ var Info = () => {
     const detail = await (0, import_serve.getProductDetail)(product.id, {
       schedule_date: state.date.value.format("YYYY-MM-DD")
     });
-    const isBundleOrCombination = (0, import_utils3.getIsBundleOrCombination)(detail.data);
+    const isBundleOrCombination = (0, import_utils.getIsBundleOrCombination)(detail.data);
     if (isBundleOrCombination)
       return;
     let _item = {
       ...product,
       product_id: product.id,
-      _id: (0, import_utils2.getUniqueId)(),
+      _id: (0, import_utils3.getUniqueId)(),
       _extend: {
         start_date: state.date.value,
         startDate: state.date.value,
@@ -111,7 +111,7 @@ var Info = () => {
       // include_variant: "no",
       ids: state.renderType === "eventBooking" ? (_a2 = state.eventOtherParams) == null ? void 0 : _a2.productIds : void 0,
       open_quotation: 1,
-      with_schedule: 0
+      with_schedule: 1
     });
     setDefaultService(data == null ? void 0 : data.list);
     dispatch({
@@ -131,29 +131,50 @@ var Info = () => {
     });
   };
   const handleSelectProduct = (item) => {
-    var _a2;
-    const _isEdit = !!state.service.cacheItem;
-    let _item = {
-      ...item,
-      product_id: item.id,
-      _id: (0, import_utils2.getUniqueId)(),
-      _extend: {
-        start_date: state.date.value,
-        quantity: 1,
-        price: item.price,
-        product_name: item.title
+    state.action({
+      type: "pisell1.handleOpenProductModal",
+      data: {
+        id: item.id,
+        date: state.date.value.format("YYYY-MM-DD"),
+        showConfig: {
+          option: false,
+          session: false,
+          variant: false,
+          package: true
+        }
       },
-      new: 1
-    };
-    if (_isEdit) {
-      _item._id = (_a2 = state.service.cacheItem) == null ? void 0 : _a2._id;
-      _item.new = 0;
-    }
-    dispatch({
-      type: "setService",
-      payload: {
-        editModal: true,
-        cacheItem: _item
+      callback: (e) => {
+        var _a2;
+        let cacheItem = {
+          ...item,
+          product_id: item.id,
+          _id: (0, import_utils3.getUniqueId)(),
+          _key: e.key,
+          _extend: {
+            start_date: state.date.value,
+            quantity: 1,
+            price: item.price,
+            product_name: item.title,
+            other: e
+          },
+          new: 1
+        };
+        let _total = (0, import_utils2.getProductTotalPrice)(cacheItem);
+        console.log("_total", e);
+        cacheItem._extend.total = _total;
+        cacheItem._extend.origin_total = _total;
+        const _isEdit = !!state.service.cacheItem;
+        if (_isEdit) {
+          cacheItem._id = (_a2 = state.service.cacheItem) == null ? void 0 : _a2._id;
+          cacheItem.new = 0;
+        }
+        dispatch({
+          type: "setService",
+          payload: {
+            editModal: true,
+            cacheItem
+          }
+        });
       }
     });
   };
@@ -163,7 +184,7 @@ var Info = () => {
     const isIncludes = (str) => {
       return str.toLowerCase().indexOf(search.toLowerCase()) !== -1;
     };
-    return (0, import_utils.formatProductListByCategory)(
+    return (0, import_utils2.formatProductListByCategory)(
       _list,
       search ? (item) => isIncludes(item.title) : void 0
     );
@@ -188,8 +209,8 @@ var Info = () => {
         import_addButton.default,
         {
           showSub: false,
-          title: import_utils2.locales.getText("pisell2.text.add-a-service"),
-          subTitle: import_utils2.locales.getText("pisell2.text.add-another-service"),
+          title: import_utils3.locales.getText("pisell2.text.add-a-service"),
+          subTitle: import_utils3.locales.getText("pisell2.text.add-another-service"),
           onClick: handleSelectService
         }
       );
@@ -198,8 +219,8 @@ var Info = () => {
       import_addButton.default,
       {
         showSub: isService,
-        title: import_utils2.locales.getText("pisell2.text.add-a-service"),
-        subTitle: import_utils2.locales.getText("pisell2.text.add-another-service"),
+        title: import_utils3.locales.getText("pisell2.text.add-a-service"),
+        subTitle: import_utils3.locales.getText("pisell2.text.add-another-service"),
         onClick: handleSelectService
       }
     ) : /* @__PURE__ */ import_react.default.createElement("div", { style: { height: 20 } });
@@ -208,7 +229,7 @@ var Info = () => {
     import_drawer.default,
     {
       open: state.service.addModal,
-      title: import_utils2.locales.getText("pisell2.text.select-service"),
+      title: import_utils3.locales.getText("pisell2.text.select-service"),
       rootClassName: "booking-server-wrap",
       onClose: () => {
         dispatch({
@@ -223,7 +244,7 @@ var Info = () => {
         {
           prefix: /* @__PURE__ */ import_react.default.createElement(import_SearchLg.default, null),
           style: { marginTop: 16, height: 44 },
-          placeholder: import_utils2.locales.getText("pisell2.text.search"),
+          placeholder: import_utils3.locales.getText("pisell2.text.search"),
           allowClear: true,
           value: search,
           onChange: (e) => {