@pisell/private-materials 6.0.25 → 6.1.1

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

@@ -51,12 +51,13 @@ var import_useEngineContext = __toESM(require("../../../hooks/useEngineContext")
 var formatProducts = (values) => {
   let arr = [];
   arr = values.map((item) => {
-    var _a, _b, _c;
+    var _a, _b, _c, _d, _e, _f, _g;
     return {
       order_detail_id: item.order_detail_id || 0,
       num: item._extend.quantity,
-      price: item._extend.price,
+      price: (0, import_utils.formatProductPrice)(item),
       product_id: item.id,
+      discount_list: (item == null ? void 0 : item.discount_list) || [],
       discount_amount: 0,
       product_discount_reason: "",
       is_charge_tax: item.is_charge_tax,
@@ -64,7 +65,9 @@ var formatProducts = (values) => {
       discountway: "num",
       discount_type: "discount",
       bundle_edit: (_a = item._extend) == null ? void 0 : _a.bundle_edit,
-      product_bundle: (0, import_utils.formatProductBundle)((_c = (_b = item._extend) == null ? void 0 : _b.other) == null ? void 0 : _c.bundle)
+      product_bundle: (0, import_utils.formatProductBundle)((_c = (_b = item._extend) == null ? void 0 : _b.other) == null ? void 0 : _c.bundle),
+      "product_option_item": (0, import_utils.formatProductOption)((_e = (_d = item._extend) == null ? void 0 : _d.other) == null ? void 0 : _e.option),
+      "product_variant_id": ((_g = (_f = item._extend) == null ? void 0 : _f.other) == null ? void 0 : _g.product_variant_id) || 0
     };
   });
   return arr;
@@ -93,7 +96,7 @@ var restoreProductOtherData = (data) => {
         })
       };
     }),
-    product_variant_id: 0,
+    product_variant_id: detail.product_variant_id || 0,
     quantity: Number(detail.product_quantity)
   };
 };
@@ -103,11 +106,13 @@ var formatProductValues = (data) => {
       ...d,
       id: d.product_id,
       title: d.product_title,
+      isAddons: true,
       quantity: d.product_quantity,
       cover: d.product_cover,
       price: Number(d.source_product_price),
       _extend: {
         total: Number(d.selling_price),
+        origin_total: Number(d.selling_price),
         payment_price: Number(d.payment_price),
         price: Number(d.source_product_price),
         quantity: d.product_quantity,
@@ -209,38 +214,48 @@ var Addons = (0, import_model.Provider)((props) => {
   };
   const handleAddProduct = (item, type) => {
     let _list = [...state.addons.value];
-    const isEject = type === "detail" || item.bundle_group_count > 0;
+    const isSession = (0, import_utils2.isSessionProduct)(item);
+    const isEject = (0, import_utils2.getIsEject)(item, type);
+    const isOnlySession = (0, import_utils2.getIsOnlySession)(item);
     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
+          option: true,
+          session: isSession,
+          variant: true,
+          package: true,
+          number: true
         },
-        is_eject: isEject ? 1 : 0
+        isOnlySession,
+        is_eject: isEject ? 1 : 0,
+        isOS: isSession
       },
-      callback: (e) => {
-        console.log("e", e);
+      callback: (e, extension_type, detail) => {
+        const _detail = detail || item;
         let product = {
-          ...item,
+          ..._detail,
           _id: (0, import_utils3.getUniqueId)(),
+          isAddons: true,
           _key: e.key,
           _extend: {
-            price: item.price,
+            price: _detail.price,
             other: e,
-            quantity: 1
+            quantity: (e == null ? void 0 : e.quantity) || 1
           },
-          quantity: 1
+          quantity: (e == null ? void 0 : e.quantity) || 1
         };
         let _total = (0, import_utils2.getProductTotalPrice)(product);
         product._extend.total = _total;
-        let _item = _list.find((d) => d._extend.other.key === e.key);
+        product._extend.origin_total = _total;
+        let _item = _list.find((d) => {
+          var _a2;
+          return d._extend.other.rowKey === e.rowKey && !d.booking_id && !((_a2 = d.discount_list) == null ? void 0 : _a2.length);
+        });
         if (_item) {
-          _item._extend.quantity = _item.quantity + 1;
+          _item._extend.quantity = _item._extend.quantity + product.quantity;
         } else {
           _list.push(product);
         }
@@ -261,7 +276,7 @@ var Addons = (0, import_model.Provider)((props) => {
     let quantity = e.target.value;
     let _list = [...state.addons.value];
     if (quantity == 0) {
-      _list = _list.filter((d) => d.id !== item.id);
+      _list = _list.filter((d) => d._id !== item._id);
     } else {
       let _item = {
         ...item,
@@ -270,12 +285,10 @@ var Addons = (0, import_model.Provider)((props) => {
           quantity: Number(e.target.value)
         }
       };
-      let _total = (0, import_utils2.getProductTotalPrice)(_item);
-      _item._extend.total = _total;
       if (((_a2 = _item._extend) == null ? void 0 : _a2.bundle_edit) !== void 0) {
         _item._extend.bundle_edit = 1;
       }
-      _list = _list.map((d) => d.id === item.id ? _item : d);
+      _list = _list.map((d) => d._id === item._id ? _item : d);
     }
     dispatch({
       type: "setAddons",
@@ -355,7 +368,7 @@ var Addons = (0, import_model.Provider)((props) => {
     if (!state.bookingId) {
       return null;
     }
-    return /* @__PURE__ */ import_react.default.createElement(import_footer.default, { state, buttons: _footer, source: "addons" });
+    return /* @__PURE__ */ import_react.default.createElement(import_footer.default, { state, dispatch, buttons: _footer, source: "addons" });
   }, [state, _footer]);
   const editProductDetail = (item) => {
     if (state.disabledEdit) {
@@ -364,26 +377,35 @@ var Addons = (0, import_model.Provider)((props) => {
     if (state.channelDisabledEdit) {
       return;
     }
+    const isSession = (0, import_utils2.isSessionProduct)(item);
     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
+          option: true,
+          session: isSession,
+          variant: true,
+          package: true,
+          number: true
         },
-        value: item._extend.other
+        value: item._extend.other,
+        isOS: isSession
       },
-      callback: (e) => {
+      callback: (e, extension_type, detail) => {
         var _a2;
+        const _detail = detail || item;
         let product = {
           ...item,
+          ..._detail,
+          isAddons: true,
+          // 编辑商品时清除折扣信息
+          discount_list: [],
           _extend: {
             ...item._extend,
-            other: e
+            other: e,
+            quantity: (e == null ? void 0 : e.quantity) || 1
           }
         };
         if (((_a2 = product._extend) == null ? void 0 : _a2.bundle_edit) !== void 0) {
@@ -391,8 +413,8 @@ var Addons = (0, import_model.Provider)((props) => {
         }
         let _total = (0, import_utils2.getProductTotalPrice)(product);
         product._extend.total = _total;
+        product._extend.origin_total = _total;
         let _list = [...state.addons.value];
-        console.log("cacheItem", product);
         _list = _list.map((d) => d._id === product._id ? product : d);
         dispatch({
           type: "setAddons",

package/lib/components/booking/addons/model.js

@@ -34,6 +34,9 @@ var { Provider, Context } = (0, import_utils.miniRedux)({
     },
     setAddons(state, payload) {
       state.setGlobalState({ addons: { ...state.addons, ...payload } });
+    },
+    setService(state, payload) {
+      state.setGlobalState({ service: { ...state.service, ...payload } });
     }
   }
 });

package/lib/components/booking/components/TabProduct/productItem/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 declare const ProductItem: ({ item, onClick, amountSymbol, style, className, }: any) => JSX.Element;
 export default ProductItem;

package/lib/components/booking/components/TabProduct/productItem/index.js

@@ -36,6 +36,8 @@ var import_react = __toESM(require("react"));
 var import_utils = require("@pisell/utils");
 var import_classnames = __toESM(require("classnames"));
 var import_utils2 = require("../../../utils");
+var import_decimal = __toESM(require("decimal.js"));
+var import_pisellPriceText = __toESM(require("../../../../productSelect/components/pisellPriceText"));
 var import_index = require("./index.less");
 var ProductItem = ({
   item,
@@ -44,6 +46,11 @@ var ProductItem = ({
   style,
   className
 }) => {
+  const { price, is_bundle, minimum_markup_price } = item;
+  let _price = price;
+  if (is_bundle) {
+    _price = new import_decimal.default(price).plus(new import_decimal.default(minimum_markup_price)).toFixed(2);
+  }
   const stockText = (0, import_react.useMemo)(() => {
     if (item.is_track === 0) {
       return false;
@@ -73,7 +80,7 @@ var ProductItem = ({
         className: "server-product-title"
       },
       item.title
-    ), /* @__PURE__ */ import_react.default.createElement("div", { className: "server-product-time" }, (0, import_utils2.getDiscountTime)(item.service_times)), stockText && /* @__PURE__ */ import_react.default.createElement("div", { className: "server-product-time" }, stockText), /* @__PURE__ */ import_react.default.createElement("div", { className: "server-product-price" }, (0, import_utils.formatAmount)(item.price, 2, amountSymbol)))
+    ), /* @__PURE__ */ import_react.default.createElement("div", { className: "server-product-time" }, (0, import_utils2.getDiscountTime)(item.service_times)), stockText && /* @__PURE__ */ import_react.default.createElement("div", { className: "server-product-time" }, stockText), /* @__PURE__ */ import_react.default.createElement("div", { className: "server-product-price" }, /* @__PURE__ */ import_react.default.createElement(import_pisellPriceText.default, { value: _price, isMini: is_bundle })))
   );
 };
 var productItem_default = ProductItem;

package/lib/components/booking/components/TabProduct/selectProductItem/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import "./index.less";
 declare const SelectProductItem: ({ item, onClick, onChangeQuantity, amountSymbol, style, className, disabled, }: any) => JSX.Element;
 export default SelectProductItem;

package/lib/components/booking/components/TabProduct/selectProductItem/index.js

@@ -101,7 +101,11 @@ var SelectProductItem = ({
           disabled
         }
       ),
-      /* @__PURE__ */ import_react.default.createElement("div", { className: "server-select-product-total" }, (0, import_utils.formatAmount)(
+      /* @__PURE__ */ import_react.default.createElement("div", { className: "server-select-product-total" }, item._extend.origin_total !== item._extend.total && /* @__PURE__ */ import_react.default.createElement("span", { className: "server-select-product-origin-total" }, (0, import_utils.formatAmount)(
+        item._extend.origin_total * item._extend.quantity,
+        2,
+        amountSymbol
+      )), (0, import_utils.formatAmount)(
         item._extend.total * item._extend.quantity,
         2,
         amountSymbol

package/lib/components/booking/components/TabProduct/selectProductItem/index.less

@@ -66,6 +66,7 @@
       font-style: normal;
       font-weight: 400;
 
+
       .server-select-product-total {
         color: var(--Base-Black, #000);
         font-size: 16px;
@@ -73,6 +74,11 @@
         font-weight: 500;
         line-height: 24px;
       }
+      .server-select-product-origin-total {
+        text-decoration: line-through;
+        color: #4e4e4e;
+        margin-right: 12px;
+      }
     }
 
 

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

@@ -1,2 +1 @@
-/// <reference types="react" />
 export declare const renderBundles: (item: any, amountSymbol: string) => JSX.Element;

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

@@ -326,6 +326,7 @@ var CustomSelect = (props, ref) => {
               }
             ),
             onClick: () => {
+              if ((item == null ? void 0 : item.status) === "expired") return;
               handleSelectItem(item);
             },
             id: item[rowKey]
@@ -342,6 +343,7 @@ var CustomSelect = (props, ref) => {
           ) : /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__custom-select-card-list-item-content" }, mode === "multiple" && /* @__PURE__ */ import_react.default.createElement(
             import_antd.Checkbox,
             {
+              disabled: (item == null ? void 0 : item.status) === "expired",
               className: "custom-select-checkbox",
               checked: (0, import_utils.getItemByArray)(_value, item, rowKey)
             }

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

@@ -38,7 +38,7 @@ var import_ArrowLeft = __toESM(require("@pisell/icon/es/ArrowLeft"));
 var import_index = require("./index.less");
 var import_classnames = __toESM(require("classnames"));
 var Drawer = (props) => {
-  const { hideScrollBar = true, showGoBack = true } = props;
+  const { hideScrollBar = true, showGoBack = true, mask = false } = props;
   return /* @__PURE__ */ import_react.default.createElement(
     import_antd.Drawer,
     {
@@ -52,7 +52,7 @@ var Drawer = (props) => {
       title: false,
       bodyStyle: { padding: 0 },
       push: false,
-      mask: false
+      mask
     },
     /* @__PURE__ */ import_react.default.createElement("div", { className: (0, import_classnames.default)("pisell-lowcode__booking-drawer-title-wrap") }, /* @__PURE__ */ import_react.default.createElement(
       "div",

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 /**
  * @title: 空状态
  * @description:

package/lib/components/booking/components/footer/FooterMenus/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import "./index.less";
 declare const FooterMenus: ({ state, menuChange, items }: any) => JSX.Element | null;
 export default FooterMenus;

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

@@ -1,3 +1,4 @@
+export declare const getRelationDetailsTotal: (relation_details: any) => number;
 export declare const is_price_include_tax: (state: any) => any;
 /**
  * 总金额

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

@@ -19,6 +19,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/components/booking/components/footer/amount.ts
 var amount_exports = {};
 __export(amount_exports, {
+  getRelationDetailsTotal: () => getRelationDetailsTotal,
   getSumTotal: () => getSumTotal,
   is_price_include_tax: () => is_price_include_tax
 });
@@ -43,13 +44,14 @@ 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) {
-        if (isDay) {
+        if (isDay || (0, import_utils3.isNormalProductByDurationSchedule)(item)) {
           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);
+          const quantity = item._extend.quantity || 1;
+          price += Number(item._extend.total) * Number(quantity);
           price += getRelationDetailsTotal(item._extend.relation_details || []);
           duration += import_utils.flexibleObj.getValue(item._extend.duration);
         }
@@ -212,6 +214,7 @@ var getSumTotal = (state, isEdit) => {
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  getRelationDetailsTotal,
   getSumTotal,
   is_price_include_tax
 });

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 /**
  * @title: 底部