@pisell/private-materials 6.9.1 → 6.9.3

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

@@ -96,7 +96,7 @@ var log = (data) => {
     ]
   });
 };
-var formatProductBundle = (bundle) => {
+var formatProductBundle = (bundle, is_price_include_tax) => {
   if (!bundle) {
     return;
   }
@@ -114,6 +114,10 @@ var formatProductBundle = (bundle) => {
     const option_price = option.reduce((temp, item) => {
       return temp + Number(item.num) * item.custom_add_price;
     }, 0);
+    const product_discount_difference = ((d == null ? void 0 : d.discount_list) || []).reduce((pre, cur) => {
+      var _a;
+      return pre + (((_a = cur == null ? void 0 : cur.metadata) == null ? void 0 : _a.product_discount_difference) || 0);
+    }, 0);
     return {
       "is_charge_tax": d.is_charge_tax,
       "tax_fee": d.tax_fee,
@@ -132,13 +136,17 @@ var formatProductBundle = (bundle) => {
       "option": option,
       "bundle_selling_price": Math.abs(d == null ? void 0 : d.price),
       // "bundle_sum_price": d?.original_price || d?.original_total,
+      is_price_include_tax,
       "metadata": {
         custom_product_bundle_map_id: d._id,
         // 子商品单数量附加费
         "surcharge_fee": d.surcharge_fee,
         // 可选，附加费均摊舍入金额
         "surcharge_rounding_remainder": d.surcharge_rounding_remainder,
-        relation_surcharge_ids: d.relation_surcharge_ids || []
+        // 可选，税费均摊舍入金额（折后税费）
+        "tax_fee_rounding_remainder": d.tax_fee_rounding_remainder,
+        relation_surcharge_ids: d.relation_surcharge_ids || [],
+        product_discount_difference
       }
     };
   });
@@ -175,7 +183,12 @@ var formatRelationDetails = (list) => {
       price: item.original_price || 0,
       product_id: item.product_id,
       is_charge_tax: item.is_charge_tax,
-      order_detail_id: item.order_detail_id
+      order_detail_id: item.order_detail_id,
+      tax_fee: item.tax_fee,
+      metadata: {
+        // 可选，税费均摊舍入金额（折后税费）
+        tax_fee_rounding_remainder: item.tax_fee_rounding_remainder
+      }
     };
   });
 };
@@ -272,7 +285,7 @@ var formatSellingPrice = (item) => {
   return Number((_a = item._extend) == null ? void 0 : _a.total);
 };
 var formatMetaData = (item, isMultiDayPrices) => {
-  var _a, _b, _c, _d, _e, _f, _g;
+  var _a, _b, _c, _d, _e, _f;
   let metadata = {};
   if ((_a = item._extend) == null ? void 0 : _a.capacity) {
     metadata.capacity = item._extend.capacity;
@@ -280,19 +293,26 @@ var formatMetaData = (item, isMultiDayPrices) => {
   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;
+  metadata.holder_id = ((_b = item._extend) == null ? void 0 : _b.holder_id) ?? null;
+  if (isMultiDayPrices && ((_c = item._extend) == null ? void 0 : _c.multiDayPrices)) {
+    metadata.multiDayPrices = (_d = item._extend) == null ? void 0 : _d.multiDayPrices;
   }
-  if (isMultiDayPrices && ((_d = item._extend) == null ? void 0 : _d.multiDayPrices)) {
-    metadata.multiDayPrices = (_e = item._extend) == null ? void 0 : _e.multiDayPrices;
+  if ((_e = item._extend) == null ? void 0 : _e.unique_identification_number) {
+    metadata.unique_identification_number = (_f = item._extend) == null ? void 0 : _f.unique_identification_number;
   }
-  if ((_f = item._extend) == null ? void 0 : _f.unique_identification_number) {
-    metadata.unique_identification_number = (_g = item._extend) == null ? void 0 : _g.unique_identification_number;
+  if (item.discount_list && (0, import_utils5.isArr)(item.discount_list)) {
+    metadata.product_discount_difference = item.discount_list.filter((item2) => {
+      var _a2;
+      return !((_a2 = item2 == null ? void 0 : item2.metadata) == null ? void 0 : _a2.custom_product_bundle_map_id);
+    }).reduce((pre, cur) => {
+      var _a2;
+      return pre + (((_a2 = cur == null ? void 0 : cur.metadata) == null ? void 0 : _a2.product_discount_difference) || 0);
+    }, 0);
   }
   return metadata;
 };
 var formatProductMetadata = (item) => {
-  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s, _t;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s, _t, _u, _v;
   let metadata = {};
   if (((_a = item._extend) == null ? void 0 : _a.surcharge_fee) || ((_b = item.metadata) == null ? void 0 : _b.main_product_attached_bundle_surcharge_fee)) {
     metadata.main_product_attached_bundle_surcharge_fee = ((_c = item._extend) == null ? void 0 : _c.surcharge_fee) || ((_d = item.metadata) == null ? void 0 : _d.main_product_attached_bundle_surcharge_fee);
@@ -303,11 +323,23 @@ var formatProductMetadata = (item) => {
   if (((_i = item._extend) == null ? void 0 : _i.surcharge_rounding_remainder) || ((_j = item.metadata) == null ? void 0 : _j.surcharge_rounding_remainder)) {
     metadata.surcharge_rounding_remainder = ((_k = item._extend) == null ? void 0 : _k.surcharge_rounding_remainder) || ((_l = item.metadata) == null ? void 0 : _l.surcharge_rounding_remainder);
   }
-  if (((_m = item._extend) == null ? void 0 : _m.relation_surcharge_ids) || ((_n = item.metadata) == null ? void 0 : _n.relation_surcharge_ids)) {
-    metadata.relation_surcharge_ids = ((_o = item._extend) == null ? void 0 : _o.relation_surcharge_ids) || ((_p = item.metadata) == null ? void 0 : _p.relation_surcharge_ids);
+  if ((_m = item._extend) == null ? void 0 : _m.tax_fee_rounding_remainder) {
+    metadata.tax_fee_rounding_remainder = (_n = item._extend) == null ? void 0 : _n.tax_fee_rounding_remainder;
+  }
+  if (((_o = item._extend) == null ? void 0 : _o.relation_surcharge_ids) || ((_p = item.metadata) == null ? void 0 : _p.relation_surcharge_ids)) {
+    metadata.relation_surcharge_ids = ((_q = item._extend) == null ? void 0 : _q.relation_surcharge_ids) || ((_r = item.metadata) == null ? void 0 : _r.relation_surcharge_ids);
+  }
+  if (((_s = item._extend) == null ? void 0 : _s.unique_identification_number) || ((_t = item.metadata) == null ? void 0 : _t.unique_identification_number)) {
+    metadata.unique_identification_number = ((_u = item._extend) == null ? void 0 : _u.unique_identification_number) || ((_v = item.metadata) == null ? void 0 : _v.unique_identification_number);
   }
-  if (((_q = item._extend) == null ? void 0 : _q.unique_identification_number) || ((_r = item.metadata) == null ? void 0 : _r.unique_identification_number)) {
-    metadata.unique_identification_number = ((_s = item._extend) == null ? void 0 : _s.unique_identification_number) || ((_t = item.metadata) == null ? void 0 : _t.unique_identification_number);
+  if (item.discount_list && (0, import_utils5.isArr)(item.discount_list)) {
+    metadata.product_discount_difference = item.discount_list.filter((item2) => {
+      var _a2;
+      return !((_a2 = item2 == null ? void 0 : item2.metadata) == null ? void 0 : _a2.custom_product_bundle_map_id);
+    }).reduce((pre, cur) => {
+      var _a2;
+      return pre + (((_a2 = cur == null ? void 0 : cur.metadata) == null ? void 0 : _a2.product_discount_difference) || 0);
+    }, 0);
   }
   return metadata;
 };
@@ -383,7 +415,7 @@ var formatProducts = (item, quantity) => {
     "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((_e = (_d = item._extend) == null ? void 0 : _d.other) == null ? void 0 : _e.bundle),
+    "product_bundle": formatProductBundle((_e = (_d = item._extend) == null ? void 0 : _d.other) == null ? void 0 : _e.bundle, item.is_price_include_tax),
     "bundle_edit": item._extend.bundle_edit || bundleDiscountList.length ? 1 : 0,
     "product_option_item": formatProductOption((_g = (_f = item._extend) == null ? void 0 : _f.other) == null ? void 0 : _g.option),
     "product_variant_id": ((_i = (_h = item._extend) == null ? void 0 : _h.other) == null ? void 0 : _i.product_variant_id) || 0,
@@ -393,7 +425,8 @@ var formatProducts = (item, quantity) => {
     "calculated_original_price": formatOriginalPrice(item),
     "calculated_selling_price": formatSellingPrice(item),
     "tax_fee": item._extend.tax_fee ?? ((_j = item.metadata) == null ? void 0 : _j.main_product_attached_bundle_tax_fee),
-    "custom_deposit_data": item.custom_deposit_data
+    "custom_deposit_data": item.custom_deposit_data,
+    is_price_include_tax: item.is_price_include_tax
   };
 };
 var formatAppointmentProductLists = (data) => {
@@ -624,7 +657,8 @@ var formatValues = (state) => {
     customer_name: "",
     holder: {},
     relation_products: [],
-    metadata: {}
+    metadata: {},
+    business_code: (state == null ? void 0 : state.businessCode) || void 0
   };
   const isDay = (0, import_utils4.isDaysBooking)(state);
   const isHasMultiDay = getHasMultiDayProduct(state);

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

@@ -95,9 +95,9 @@ var VoucherCard = (props) => {
         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,
+        holder_id: (_c2 = value == null ? void 0 : value._extend) == null ? void 0 : _c2.holder_id,
         quantity: value._extend.quantity,
-        startDate: value._extend.startDate,
-        holder_id: (_c2 = value == null ? void 0 : value._extend) == null ? void 0 : _c2.holder_id
+        startDate: value._extend.startDate
       };
     });
     return val;
@@ -113,11 +113,20 @@ var VoucherCard = (props) => {
     }
     onScanCode(e.detail.code);
   });
+  const onOriginExpectAmountWithoutDiscountChange = (0, import_ahooks.useMemoizedFn)((e) => {
+    var _a2;
+    (_a2 = shopDiscount == null ? void 0 : shopDiscount.setOriginTotalAmount) == null ? void 0 : _a2.call(shopDiscount, e.detail.originExpectAmountWithoutDiscount);
+  });
   (0, import_react.useEffect)(() => {
     const wrappedOnScanWallPassCode = executeIfActive(onScanWallPassCode);
     window.addEventListener("onScanWallPassCode", wrappedOnScanWallPassCode);
+    window.addEventListener("onOriginExpectAmountWithoutDiscountChange", onOriginExpectAmountWithoutDiscountChange);
     return () => {
-      window.removeEventListener("onScanWallPassCode", wrappedOnScanWallPassCode);
+      window.removeEventListener(
+        "onScanWallPassCode",
+        wrappedOnScanWallPassCode
+      );
+      window.removeEventListener("onOriginExpectAmountWithoutDiscountChange", onOriginExpectAmountWithoutDiscountChange);
     };
   }, []);
   const addonsMemo = (0, import_react.useMemo)(() => {
@@ -300,8 +309,13 @@ var VoucherCard = (props) => {
       productListToValue(val.productList, true);
       setCode("");
     } else {
+      const content = {
+        time_limit: import_utils.locales.getText(
+          "pisell2.text.goodpass.code-invalid-expired"
+        )
+      };
       (0, import_materials.PisellToast)({
-        content: val.type === "server" ? import_utils.locales.getText("pisell2.text.goodpass.code-invalid") : import_utils.locales.getText("pisell2.text.goodpass.code-invalid-cart")
+        content: val.type === "server" ? import_utils.locales.getText("pisell2.text.goodpass.code-invalid") : content[val == null ? void 0 : val.unavailableReason] || import_utils.locales.getText("pisell2.text.goodpass.code-invalid-cart")
       });
     }
   };

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

@@ -1,5 +1,8 @@
 .pisell-lowcode__booking-footer-voucher-container {
   margin-bottom: 8px;
+  width: 100%;
+  display: flex;
+  flex-direction: column;
   .voucher-title {
     display: flex;
     align-items: center;
@@ -47,9 +50,9 @@
     width: 100%;
     transition: 0.2s;
     max-height: 0;
-    overflow: hidden;
     display: flex;
     flex-direction: column;
+    overflow: auto;
 
     &.show {
       max-height: unset;

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

@@ -6,6 +6,7 @@
   .pisell-voucher-modal-content {
     max-height: 70vh;
     overflow-y: auto;
+    display: flex;
   }
 
   // 隐藏状态下的样式优化

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

@@ -45,19 +45,20 @@ var translationOriginal = (text) => "";
 var formatCapacityToChildrenData = (data) => {
   const map = {};
   data.forEach((item) => {
-    const name = translationOriginal(item.name) || "default";
+    const name = translationOriginal(item.label) || "default";
     if (!map[name]) {
       map[name] = {
-        label: !item.id ? import_utils.locales.getText("pisell2.booking.dashboard.default") : translationOriginal(item.name) || "",
+        label: !item.label ? import_utils.locales.getText("pisell2.booking.dashboard.default") : item.label,
         value: 0
       };
     }
-    map[name].value = (map[name].value || 0) + (item.value || 0);
+    map[name].value = (map[name].value || 0) + (item.num || 0);
   });
   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 = (0, import_react.forwardRef)((props, ref) => {
+  var _a, _b;
   const {
     otherParams = {},
     backgroundColors,
@@ -70,6 +71,8 @@ var BookingDashboard = (0, import_react.forwardRef)((props, ref) => {
   const context = (0, import_useEngineContext.default)();
   import_utils2.request.setRequest(context.appHelper.utils.request);
   translationOriginal = context.appHelper.utils.translationOriginal;
+  const { businessUtils } = ((_a = context.appHelper) == null ? void 0 : _a.utils) || {};
+  const hasTurnstileApp = !!((_b = businessUtils == null ? void 0 : businessUtils.getAppByModal) == null ? void 0 : _b.call(businessUtils, "turnstile"));
   const [data, setData] = (0, import_react.useState)([
     // 当前在场团体
     {
@@ -122,55 +125,38 @@ var BookingDashboard = (0, import_react.forwardRef)((props, ref) => {
       tip: import_utils.locales.getText("pisell2.booking.dashboard.departed-visitors-tip")
     }
   ]);
-  const [bookingData, setBookingData] = (0, import_react.useState)([]);
+  const [statisticData, setStatisticData] = (0, import_react.useState)({});
   const getData = async () => {
-    const data2 = await (0, import_serve.getBookingList)({
-      ...otherParams,
-      item_type: "appointment_booking",
-      parent_id: 0,
-      with: ["children"],
-      child_booking: 0,
-      skip: 1,
-      num: 1e3
+    var _a2;
+    console.log("otherParams", otherParams);
+    let statisticsTime = ((_a2 = otherParams == null ? void 0 : otherParams.booking_time_start_between) == null ? void 0 : _a2[1]) || (0, import_dayjs.default)().format("YYYY-MM-DD HH:mm:ss");
+    const statisticsDay = (0, import_dayjs.default)(statisticsTime);
+    const now = (0, import_dayjs.default)();
+    if (statisticsDay.isValid()) {
+      if (statisticsDay.isSame(now, "day")) statisticsTime = now.format("YYYY-MM-DD HH:mm:ss");
+      if (statisticsDay.isBefore(now, "day")) statisticsTime = statisticsDay.endOf("day").format("YYYY-MM-DD HH:mm:ss");
+      if (statisticsDay.isAfter(now, "day")) statisticsTime = statisticsDay.startOf("day").format("YYYY-MM-DD HH:mm:ss");
+    }
+    const res = await (0, import_serve.getStatistic)({
+      statistics_time: statisticsTime
     });
-    setBookingData(data2.list);
+    setStatisticData(res);
+    calcBookingDataCount();
   };
-  const calcBookingDataCount = (data2) => {
-    let groupsOnSiteNow = "-";
-    let peopleOnSiteNow = "-";
-    let totalVisitorsToday = 0;
-    let totalVisitorsTodayChildren = [];
-    let ongoing = 0;
-    let ongoingChildren = [];
-    let upcoming = 0;
-    let upcomingChildren = [];
-    let overdue = "-";
-    let completed = 0;
-    let completedChildren = [];
-    let departed = "-";
-    data2.forEach((item) => {
-      if ((0, import_utils.isArr)(item.children)) {
-        item.children.forEach((child) => {
-          var _a, _b, _c, _d;
-          const start = (0, import_dayjs.default)(`${child.start_date} ${child.start_time}`);
-          const end = (0, import_dayjs.default)(`${child.end_date} ${child.end_time}`);
-          totalVisitorsToday += child.number;
-          totalVisitorsTodayChildren.push(...((_a = child.metadata) == null ? void 0 : _a.capacity) || []);
-          if (start < (0, import_dayjs.default)() && end > (0, import_dayjs.default)()) {
-            ongoing += child.number || 1;
-            ongoingChildren.push(...((_b = child.metadata) == null ? void 0 : _b.capacity) || []);
-          }
-          if ((0, import_dayjs.default)() < start) {
-            upcoming += child.number || 1;
-            upcomingChildren.push(...((_c = child.metadata) == null ? void 0 : _c.capacity) || []);
-          }
-          if ((0, import_dayjs.default)() > end) {
-            completed += child.number || 1;
-            completedChildren.push(...((_d = child.metadata) == null ? void 0 : _d.capacity) || []);
-          }
-        });
-      }
-    });
+  const calcBookingDataCount = () => {
+    var _a2, _b2, _c, _d, _e, _f, _g, _h;
+    let groupsOnSiteNow = statisticData.groups_today_num || 0;
+    let peopleOnSiteNow = statisticData.people_on_site_now_num || (hasTurnstileApp ? 0 : "-");
+    let totalVisitorsToday = ((_a2 = statisticData.total_visitors_today) == null ? void 0 : _a2.num) || 0;
+    let totalVisitorsTodayChildren = ((_b2 = statisticData.total_visitors_today) == null ? void 0 : _b2.statistics) || [];
+    let ongoing = ((_c = statisticData.ongoing_visitors) == null ? void 0 : _c.num) || 0;
+    let ongoingChildren = ((_d = statisticData.ongoing_visitors) == null ? void 0 : _d.statistics) || [];
+    let upcoming = ((_e = statisticData.upcoming_visitors) == null ? void 0 : _e.num) || 0;
+    let upcomingChildren = ((_f = statisticData.upcoming_visitors) == null ? void 0 : _f.statistics) || [];
+    let overdue = statisticData.overdue_visitors_num || (hasTurnstileApp ? 0 : "-");
+    let completed = ((_g = statisticData.completed_visitors) == null ? void 0 : _g.num) || 0;
+    let completedChildren = ((_h = statisticData.completed_visitors) == null ? void 0 : _h.statistics) || [];
+    let departed = statisticData.departed_visitors_num || (hasTurnstileApp ? 0 : "-");
     onDataChange == null ? void 0 : onDataChange(
       {
         groupsOnSiteNow,
@@ -182,7 +168,7 @@ var BookingDashboard = (0, import_react.forwardRef)((props, ref) => {
         completed,
         departed
       },
-      data2
+      []
     );
     setData([
       // 当前在场团体
@@ -250,22 +236,15 @@ var BookingDashboard = (0, import_react.forwardRef)((props, ref) => {
     ]);
   };
   (0, import_react.useEffect)(() => {
-    calcBookingDataCount(bookingData);
     const timer = setInterval(() => {
-      calcBookingDataCount(bookingData);
+      getData();
     }, 60 * 1e3);
     return () => {
       clearInterval(timer);
     };
-  }, [bookingData]);
+  }, []);
   (0, import_react.useEffect)(() => {
     getData();
-    const timer = setInterval(() => {
-      getData();
-    }, 10 * 60 * 1e3);
-    return () => {
-      clearInterval(timer);
-    };
   }, [JSON.stringify(otherParams), refreshKey]);
   (0, import_react.useImperativeHandle)(ref, () => ({
     refresh: () => {

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

@@ -1 +1,2 @@
 export declare const getBookingList: (params: any) => Promise<any>;
+export declare const getStatistic: (params: any) => Promise<any>;

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

@@ -19,7 +19,8 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/components/booking/dashboard/serve.ts
 var serve_exports = {};
 __export(serve_exports, {
-  getBookingList: () => getBookingList
+  getBookingList: () => getBookingList,
+  getStatistic: () => getStatistic
 });
 module.exports = __toCommonJS(serve_exports);
 var import_utils = require("../utils");
@@ -32,7 +33,12 @@ var getBookingList = async (params) => {
   });
   return data;
 };
+var getStatistic = async (params) => {
+  let { data } = await import_utils.request.getRequest().get(`/shop/schedule/ticket/statistics`, params);
+  return data;
+};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  getBookingList
+  getBookingList,
+  getStatistic
 });

package/lib/components/booking/forms/model.d.ts

@@ -1,10 +1 @@
-/// <reference types="react" />
-import { FormState } from "../model";
-export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
-    state: FormState;
-} & {
-    dispatch: (params: {
-        type: string;
-        payload: any;
-    }) => void;
-}>;
+export declare const Provider: any, Context: any;

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

@@ -54,6 +54,12 @@ var formatBundleItemMap = (product) => {
     };
   }, {});
 };
+var formatVariantItemMap = (product) => {
+  return ((product == null ? void 0 : product.variants) || []).reduce((pre, cur) => {
+    pre[cur.id] = cur;
+    return pre;
+  }, {});
+};
 var calculateTotalPrice = (data) => {
   const _price = data.reduce((total, item) => {
     const _price2 = (item == null ? void 0 : item.price) || (item == null ? void 0 : item.add_price);
@@ -74,9 +80,9 @@ var setNewCartValue = (cartValue, newProducts) => {
   const notFoundProducts = [];
   const multiDayPricesCache = /* @__PURE__ */ new Map();
   const value = cartValue.map((item) => {
-    var _a, _b, _c, _d, _e, _f;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m;
     const itemScheduleDate = ((_a = item._extend) == null ? void 0 : _a.startDate) ? (0, import_dayjs.default)(item._extend.startDate).format("YYYY-MM-DD") : "";
-    const newProduct = newProducts.find(
+    let newProduct = newProducts.find(
       (newItem2) => newItem2.id === item.product_id && newItem2.schedule_date === itemScheduleDate
     );
     if (!newProduct) {
@@ -84,6 +90,7 @@ var setNewCartValue = (cartValue, newProducts) => {
     }
     let isChangePrice = newProduct.price != item.price;
     const bundleItemMap = formatBundleItemMap(newProduct);
+    const variantItemMap = formatVariantItemMap(newProduct);
     const newBundle = (((_c = (_b = item._extend) == null ? void 0 : _b.other) == null ? void 0 : _c.bundle) || []).map((bundle) => {
       if (!bundleItemMap[bundle.id]) {
         isNotFoundBundle = true;
@@ -97,9 +104,13 @@ var setNewCartValue = (cartValue, newProducts) => {
         isBundleChange = true;
       }
       if (bundleItemMap[bundle.id].price_type === "markdown") {
-        bundleItemMap[bundle.id].price = new import_decimal.default(bundleItemMap[bundle.id].price || 0).mul(-1).toNumber();
+        bundleItemMap[bundle.id].price = new import_decimal.default(
+          bundleItemMap[bundle.id].price || 0
+        ).mul(-1).toNumber();
       }
-      const selectBundleInfo = item._extend.other.bundle.find((item2) => item2.id === bundle.id);
+      const selectBundleInfo = item._extend.other.bundle.find(
+        (item2) => item2.id === bundle.id
+      );
       const optionPrice = calculateTotalPrice((selectBundleInfo == null ? void 0 : selectBundleInfo.option) || []);
       const isEditDiscount = item.booking_id && (bundle.discount_list || []).length;
       return {
@@ -109,9 +120,23 @@ var setNewCartValue = (cartValue, newProducts) => {
         // product_price: bundleItemMap[item.id].product_price,
       };
     });
-    if ((_d = item._extend) == null ? void 0 : _d.groupId) {
+    const newVariant = (((_e = (_d = item._extend) == null ? void 0 : _d.other) == null ? void 0 : _e.variant) || []).map(
+      (variant) => {
+        if (!variantItemMap[variant.id]) {
+          return variant;
+        }
+        return {
+          ...variant,
+          price: variantItemMap[variant.id].price,
+          base_price: variantItemMap[variant.id].base_price
+        };
+      }
+    );
+    if ((_f = item._extend) == null ? void 0 : _f.groupId) {
       if (!multiDayPricesCache.has(item._extend.groupId)) {
-        const productPrices = newProducts.filter((p) => p.id === item.product_id);
+        const productPrices = newProducts.filter(
+          (p) => p.id === item.product_id
+        );
         const multiDayPrices = {};
         productPrices.forEach((priceItem) => {
           multiDayPrices[priceItem.schedule_date] = {
@@ -125,17 +150,23 @@ var setNewCartValue = (cartValue, newProducts) => {
         });
         multiDayPricesCache.set(item._extend.groupId, multiDayPrices);
       }
-      item._extend.multiDayPrices = multiDayPricesCache.get(item._extend.groupId);
+      item._extend.multiDayPrices = multiDayPricesCache.get(
+        item._extend.groupId
+      );
     }
     if (!isChangePrice) {
       return item;
     } else {
       isChange = true;
     }
+    let price = newProduct.price;
+    if ((_h = (_g = item._extend) == null ? void 0 : _g.other) == null ? void 0 : _h.product_variant_id) {
+      price = ((_k = variantItemMap[(_j = (_i = item._extend) == null ? void 0 : _i.other) == null ? void 0 : _j.product_variant_id]) == null ? void 0 : _k.price) ?? newProduct.price;
+    }
     const newItem = {
       ...item,
       original_price: newProduct.original_price,
-      price: newProduct.price,
+      price,
       base_price: newProduct.base_price,
       _extend: {
         ...item._extend,
@@ -144,8 +175,9 @@ var setNewCartValue = (cartValue, newProducts) => {
         bundle_edit: isBundleChange ? 1 : item._extend.bundle_edit,
         other: {
           ...item._extend.other,
-          option: (_f = (_e = item._extend) == null ? void 0 : _e.other) == null ? void 0 : _f.option,
-          bundle: newBundle
+          option: (_m = (_l = item._extend) == null ? void 0 : _l.other) == null ? void 0 : _m.option,
+          bundle: newBundle,
+          variant: newVariant || []
         }
       }
     };
@@ -194,7 +226,12 @@ var useQuotation = (state, dispatch) => {
   const updateCartQuotation = async (params) => {
     const data = await getCartQuotation(params);
     if (!data || !data.length) return;
-    const { isChange, value: newCartValue, isNotFoundBundle, notFoundProducts } = setNewCartValue(cartValueRef.current, data);
+    const {
+      isChange,
+      value: newCartValue,
+      isNotFoundBundle,
+      notFoundProducts
+    } = setNewCartValue(cartValueRef.current, data);
     if (isNotFoundBundle) {
       setProducts(notFoundProducts);
       setOpen(true);
@@ -213,16 +250,23 @@ var useQuotation = (state, dispatch) => {
     var _a2, _b2;
     return ((_a2 = state == null ? void 0 : state.client) == null ? void 0 : _a2.edit) || ((_b2 = state == null ? void 0 : state.date) == null ? void 0 : _b2.edit);
   }, [state]);
-  (0, import_ahooks.useDebounceEffect)(() => {
-    var _a2, _b2, _c, _d, _e, _f, _g, _h, _i, _j;
-    const isQuotation = (_d = (_c = (_b2 = (_a2 = context == null ? void 0 : context.appHelper) == null ? void 0 : _a2.utils) == null ? void 0 : _b2.businessUtils) == null ? void 0 : _c.getAppByModal) == null ? void 0 : _d.call(_c, "quotation");
-    const isHolidayQuotation = (_h = (_g = (_f = (_e = context == null ? void 0 : context.appHelper) == null ? void 0 : _e.utils) == null ? void 0 : _f.businessUtils) == null ? void 0 : _g.getAppByModal) == null ? void 0 : _h.call(_g, "holidayquotation");
-    if (!isQuotation && !isHolidayQuotation || !isEditClientOrDate) return;
-    updateCartQuotation({
-      customer_id: (_j = (_i = state.client) == null ? void 0 : _i.value) == null ? void 0 : _j.id,
-      schedule_date: currentDate
-    });
-  }, [(_b = (_a = state.client) == null ? void 0 : _a.value) == null ? void 0 : _b.id, currentDate, isEditClientOrDate], { wait: 200 });
+  (0, import_ahooks.useDebounceEffect)(
+    () => {
+      var _a2, _b2, _c, _d, _e, _f, _g, _h, _i, _j;
+      const isQuotation = (_d = (_c = (_b2 = (_a2 = context == null ? void 0 : context.appHelper) == null ? void 0 : _a2.utils) == null ? void 0 : _b2.businessUtils) == null ? void 0 : _c.getAppByModal) == null ? void 0 : _d.call(_c, "quotation");
+      const isHolidayQuotation = (_h = (_g = (_f = (_e = context == null ? void 0 : context.appHelper) == null ? void 0 : _e.utils) == null ? void 0 : _f.businessUtils) == null ? void 0 : _g.getAppByModal) == null ? void 0 : _h.call(
+        _g,
+        "holidayquotation"
+      );
+      if (!isQuotation && !isHolidayQuotation || !isEditClientOrDate) return;
+      updateCartQuotation({
+        customer_id: (_j = (_i = state.client) == null ? void 0 : _i.value) == null ? void 0 : _j.id,
+        schedule_date: currentDate
+      });
+    },
+    [(_b = (_a = state.client) == null ? void 0 : _a.value) == null ? void 0 : _b.id, currentDate, isEditClientOrDate],
+    { wait: 200 }
+  );
   const dom = (0, import_react.useMemo)(() => {
     return /* @__PURE__ */ import_react.default.createElement(
       import_materials.PisellModal.Information,