@pisell/private-materials 6.7.9 → 6.8.1

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

@@ -62,7 +62,7 @@ var import_ahooks = require("ahooks");
 var import_lodash = require("lodash");
 var import_useShopDiscountModule = require("../../../ticketBooking/hooks/pisellos/useShopDiscountModule");
 var Footer = (props) => {
-  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s, _t;
   const { state, buttons, dispatch, source } = props;
   const [showDetail, setShowDetail] = (0, import_react.useState)(false);
   const [loading, setLoading] = (0, import_react.useState)(false);
@@ -467,7 +467,11 @@ var Footer = (props) => {
     (_l = (_k = state.client) == null ? void 0 : _k.value) == null ? void 0 : _l.id
   ]);
   const handleCheckoutInternal = async () => {
-    (0, import_PaymentResultToast.closeAllPaymentResultToasts)();
+    var _a2, _b2, _c2;
+    const isToastMode = ((_c2 = (_b2 = (_a2 = state == null ? void 0 : state.bookingConfig) == null ? void 0 : _a2.config) == null ? void 0 : _b2.payment_setting) == null ? void 0 : _c2.payment_result_display_mode) !== "modal";
+    if (isToastMode) {
+      (0, import_PaymentResultToast.closeAllPaymentResultToasts)();
+    }
     const isNewOrder = !state.bookingId;
     if (isEdit) {
       if ((0, import_utils2.isDayBooking)(state)) {
@@ -494,18 +498,18 @@ var Footer = (props) => {
         setIsPaymentModalOpen(true);
         setCheckoutLoading(false);
         setPaymentCallback(() => (paymentResult) => {
-          var _a2, _b2, _c2, _d2;
+          var _a3, _b3, _c3, _d2;
           console.log("Payment result:", paymentResult);
           setIsPaymentModalOpen(false);
           if ((paymentResult == null ? void 0 : paymentResult.status) === "success") {
             console.log("Payment completed successfully");
-            (_b2 = (_a2 = window == null ? void 0 : window.shopApi) == null ? void 0 : _a2.bookingTicket) == null ? void 0 : _b2.clearAllCart();
+            (_b3 = (_a3 = window == null ? void 0 : window.shopApi) == null ? void 0 : _a3.bookingTicket) == null ? void 0 : _b3.clearAllCart();
             setPaymentModalData(null);
             setPaymentCallback(null);
           } else if ((paymentResult == null ? void 0 : paymentResult.status) === "cancelled") {
             console.log("Payment cancelled");
             if (res == null ? void 0 : res.order_id) {
-              (_d2 = (_c2 = window == null ? void 0 : window.shopApi) == null ? void 0 : _c2.booking) == null ? void 0 : _d2.voidBooking(res.order_id);
+              (_d2 = (_c3 = window == null ? void 0 : window.shopApi) == null ? void 0 : _c3.booking) == null ? void 0 : _d2.voidBooking(res.order_id);
             }
             setPaymentModalData(null);
             setPaymentCallback(null);
@@ -596,8 +600,11 @@ var Footer = (props) => {
     messageShow = true,
     noSubmit = false
   }) => {
-    var _a2, _b2, _c2, _d2, _e2;
-    (0, import_PaymentResultToast.closeAllPaymentResultToasts)();
+    var _a2, _b2, _c2, _d2, _e2, _f2, _g2, _h2;
+    const isToastMode = ((_c2 = (_b2 = (_a2 = state == null ? void 0 : state.bookingConfig) == null ? void 0 : _a2.config) == null ? void 0 : _b2.payment_setting) == null ? void 0 : _c2.payment_result_display_mode) !== "modal";
+    if (isToastMode) {
+      (0, import_PaymentResultToast.closeAllPaymentResultToasts)();
+    }
     if ((0, import_utils2.isDayBooking)(state)) {
       const isHasDayProducts = handleDaySubmit();
       if (isHasDayProducts) return;
@@ -612,7 +619,7 @@ var Footer = (props) => {
     const createApi = state.renderType === "eventBooking" ? import_serve2.createEventBooking : createBooking;
     let saveOtherValue = {};
     if (type === "save") {
-      saveOtherValue = await ((_a2 = state == null ? void 0 : state.onSave) == null ? void 0 : _a2.call(state, state.client)) || {};
+      saveOtherValue = await ((_d2 = state == null ? void 0 : state.onSave) == null ? void 0 : _d2.call(state, state.client)) || {};
     }
     try {
       let callbackData = null;
@@ -658,7 +665,7 @@ var Footer = (props) => {
           { key: "日期", value: (0, import_dayjs.default)().format("YYYY-MM-DD HH:mm") },
           {
             key: "店铺id",
-            value: (_e2 = (_d2 = (_c2 = (_b2 = store == null ? void 0 : store.getState) == null ? void 0 : _b2.call(store)) == null ? void 0 : _c2.global) == null ? void 0 : _d2.globalConfig) == null ? void 0 : _e2.id
+            value: (_h2 = (_g2 = (_f2 = (_e2 = store == null ? void 0 : store.getState) == null ? void 0 : _e2.call(store)) == null ? void 0 : _f2.global) == null ? void 0 : _g2.globalConfig) == null ? void 0 : _h2.id
           },
           {
             key: "shopApi",
@@ -1413,8 +1420,20 @@ var Footer = (props) => {
       data: paymentModalData,
       callback: paymentCallback || void 0,
       setEditCartMode,
-      state,
-      dispatch,
+      paymentResultDisplayMode: (_s = (_r = (_q = state == null ? void 0 : state.bookingConfig) == null ? void 0 : _q.config) == null ? void 0 : _r.payment_setting) == null ? void 0 : _s.payment_result_display_mode,
+      shopDiscount: state.shop_discount,
+      client: (_t = state.client) == null ? void 0 : _t.value,
+      currentTotalPrice: total.productAmount,
+      onChangeShopDiscount: (discount) => {
+        dispatch({
+          type: "setState",
+          payload: {
+            shop_discount: discount
+          }
+        });
+      },
+      onChangeOrderNote: handleNoteConfirm,
+      onDeleteOrderNote: handleNoteDelete,
       onClose: (reset) => {
         setIsPaymentModalOpen(false);
         setPaymentModalData(null);

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

@@ -16,6 +16,11 @@ export declare const formatProductOption: (option: any) => any;
  * @Date: 2024-02-19 09:26
  */
 export declare const formatProductBundle: (bundle: any) => any;
+/**
+ * 获取子商品折扣信息
+ * @param item
+ */
+export declare const getBundleDiscountList: (bundle: any[]) => any[];
 export interface ResourceItem {
     [key: string]: any;
 }
@@ -37,5 +42,19 @@ export declare const checkResourcesFormat: (resources: any[], service: any, isCh
  * @Date: 2024-12-23 12:05
  */
 export declare const formatProductPrice: (item: any) => number;
+/**
+ * checkout2.0: 单个数量商品总价（原价）,包含所有套餐子商品金额、报价单等等
+ * @param item
+ * @returns
+ */
+export declare const formatOriginalPrice: (item: any) => number;
+/**
+ * checkout2.0: 商品维度折扣后价格, original_price - 商品折扣金额（商品手动折扣等等）
+ * @param item
+ * @returns
+ */
+export declare const formatSellingPrice: (item: any) => number;
+export declare const getSourceProductPrice: (item: any) => number;
+export declare const getMainProductSellingPrice: (item: any) => number | undefined;
 export declare const formatValues: (state: any) => any;
 export declare const checkHolderIsError: (state: any) => any;

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

@@ -32,10 +32,15 @@ __export(utils_exports, {
   checkHolderIsError: () => checkHolderIsError,
   checkResourcesFormat: () => checkResourcesFormat,
   checkSubResourcesCapacity: () => checkSubResourcesCapacity,
+  formatOriginalPrice: () => formatOriginalPrice,
   formatProductBundle: () => formatProductBundle,
   formatProductOption: () => formatProductOption,
   formatProductPrice: () => formatProductPrice,
-  formatValues: () => formatValues
+  formatSellingPrice: () => formatSellingPrice,
+  formatValues: () => formatValues,
+  getBundleDiscountList: () => getBundleDiscountList,
+  getMainProductSellingPrice: () => getMainProductSellingPrice,
+  getSourceProductPrice: () => getSourceProductPrice
 });
 module.exports = __toCommonJS(utils_exports);
 var import_dayjs = __toESM(require("dayjs"));
@@ -74,10 +79,10 @@ var formatProductOption = (option) => {
   }
   return option.map((d) => {
     return {
-      "num": d.num,
-      "option_group_item_id": d.product_option_item_id || d.option_group_item_id,
-      "option_group_id": d.option_group_id,
-      "custom_add_price": Number(d == null ? void 0 : d.add_price)
+      num: d.num,
+      option_group_item_id: d.product_option_item_id || d.option_group_item_id,
+      option_group_id: d.option_group_id,
+      custom_add_price: Number(d == null ? void 0 : d.add_price)
     };
   });
 };
@@ -109,6 +114,8 @@ var formatProductBundle = (bundle) => {
       return temp + Number(item.num) * item.custom_add_price;
     }, 0);
     return {
+      "is_charge_tax": d.is_charge_tax,
+      "tax_fee": d.tax_fee,
       "bundle_group_id": d.group_id,
       "bundle_id": d.id,
       "bundle_product_id": (d == null ? void 0 : d._bundle_product_id) || (d == null ? void 0 : d.product_id),
@@ -116,16 +123,42 @@ var formatProductBundle = (bundle) => {
       "num": d.num,
       "extension_id": d.extension_id,
       "extension_type": d.extension_type,
-      "price": Number(d == null ? void 0 : d.price),
-      // checkout 2.0 新增
+      "price": Number(d == null ? void 0 : d.product_price),
       "price_type": d == null ? void 0 : d.price_type,
-      // checkout 2.0 新增
-      "custom_price": new import_decimal.default(d == null ? void 0 : d.price).sub(option_price).toNumber().toFixed(2),
+      "price_type_ext": d == null ? void 0 : d.price_type_ext,
+      "custom_price": (d == null ? void 0 : d.custom_price) || Math.abs(new import_decimal.default((d == null ? void 0 : d.original_price) || (d == null ? void 0 : d.product_price)).sub(option_price).toNumber()).toFixed(2),
       "custom_price_type": d == null ? void 0 : d.price_type,
-      "option": option
+      "option": option,
+      "bundle_selling_price": Math.abs(d == null ? void 0 : d.price),
+      // "bundle_sum_price": d?.original_price || d?.original_total,
+      "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 || []
+      }
     };
   });
 };
+var getBundleDiscountList = (bundle) => {
+  if (!bundle) {
+    return [];
+  }
+  let discountList = [];
+  bundle.forEach((d) => {
+    if (d.discount_list && (0, import_utils5.isArr)(d.discount_list)) {
+      d.discount_list.forEach((item) => {
+        if (item == null ? void 0 : item.id) {
+          item.order_discount_id = item.id;
+        }
+      });
+      discountList.push(...d.discount_list.filter((item) => !item.id));
+    }
+  });
+  return discountList;
+};
 var getSubType = (item) => {
   var _a;
   const _type = (_a = item.duration) == null ? void 0 : _a.type;
@@ -213,7 +246,7 @@ var formatHolders = (state, item, values) => {
 var formatProductPrice = (item) => {
   var _a, _b, _c, _d;
   const other = (_a = item._extend) == null ? void 0 : _a.other;
-  let price = Number((_b = item._extend) == null ? void 0 : _b.price);
+  let price = Number((item == null ? void 0 : item.price) ?? ((_b = item == null ? void 0 : item._extend) == null ? void 0 : _b.price));
   if ((other == null ? void 0 : other.product_variant_id) > 0 && ((_c = item == null ? void 0 : item.variant) == null ? void 0 : _c.length) > 0) {
     const variant = item.variant.find(
       (d) => d.id === (other == null ? void 0 : other.product_variant_id)
@@ -257,6 +290,26 @@ var formatMetaData = (item, isMultiDayPrices) => {
   }
   return metadata;
 };
+var formatProductMetadata = (item) => {
+  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j;
+  let metadata = {};
+  if ((_a = item._extend) == null ? void 0 : _a.surcharge_fee) {
+    metadata.main_product_attached_bundle_surcharge_fee = (_b = item._extend) == null ? void 0 : _b.surcharge_fee;
+  }
+  if ((_c = item._extend) == null ? void 0 : _c.main_product_attached_bundle_tax_fee) {
+    metadata.main_product_attached_bundle_tax_fee = (_d = item._extend) == null ? void 0 : _d.main_product_attached_bundle_tax_fee;
+  }
+  if ((_e = item._extend) == null ? void 0 : _e.surcharge_rounding_remainder) {
+    metadata.surcharge_rounding_remainder = (_f = item._extend) == null ? void 0 : _f.surcharge_rounding_remainder;
+  }
+  if ((_g = item._extend) == null ? void 0 : _g.relation_surcharge_ids) {
+    metadata.relation_surcharge_ids = (_h = item._extend) == null ? void 0 : _h.relation_surcharge_ids;
+  }
+  if ((_i = item._extend) == null ? void 0 : _i.unique_identification_number) {
+    metadata.unique_identification_number = (_j = item._extend) == null ? void 0 : _j.unique_identification_number;
+  }
+  return metadata;
+};
 var getSourceProductPrice = (item) => {
   var _a, _b, _c;
   const other = (_a = item._extend) == null ? void 0 : _a.other;
@@ -271,12 +324,36 @@ var getSourceProductPrice = (item) => {
   }
   return price;
 };
+var getMainProductSellingPrice = (item) => {
+  var _a, _b, _c, _d, _e, _f;
+  if (!(0, import_utils5.isNumber)((_a = item._extend) == null ? void 0 : _a.main_product_selling_price) && !(0, import_utils5.isString)((_b = item._extend) == null ? void 0 : _b.main_product_selling_price)) {
+    return void 0;
+  }
+  let optionPrice = new import_decimal.default(0);
+  if (((_c = item._extend.other) == null ? void 0 : _c.option) && Array.isArray((_d = item._extend.other) == null ? void 0 : _d.option)) {
+    optionPrice = (_e = item._extend.other) == null ? void 0 : _e.option.reduce((accumulator, currentValue) => {
+      const currentPrice = new import_decimal.default(currentValue.price || 0);
+      const currentNum = new import_decimal.default(currentValue.num || 0);
+      return accumulator.add(currentPrice.mul(currentNum));
+    }, optionPrice);
+  }
+  return new import_decimal.default((_f = item._extend) == null ? void 0 : _f.main_product_selling_price).add(optionPrice).toNumber();
+};
 var formatProducts = (item, quantity) => {
-  var _a, _b, _c, _d, _e, _f, _g;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _i;
+  if (item == null ? void 0 : item.discount_list) {
+    item == null ? void 0 : item.discount_list.forEach((d) => {
+      if (d == null ? void 0 : d.id) {
+        d.order_discount_id = d.id;
+      }
+    });
+  }
   const total = Number(item._extend.total);
   const origin_total = Number(item._extend.origin_total);
   const discount_amount = origin_total - total;
-  const discount_list = (item == null ? void 0 : item.discount_list) || [];
+  const bundleDiscountList = getBundleDiscountList(((_b = (_a = item._extend) == null ? void 0 : _a.other) == null ? void 0 : _b.bundle) || []);
+  const discount_list = [...(item == null ? void 0 : item.discount_list) || []];
+  discount_list.push(...bundleDiscountList);
   const discount_type = discount_amount < 0 ? "change_price" : "discount";
   discount_list.forEach((d) => {
     d.metadata = {
@@ -294,22 +371,23 @@ var formatProducts = (item, quantity) => {
     "name": item.name,
     "num": quantity || item._extend.quantity,
     "price": formatProductPrice(item),
+    "main_product_selling_price": getMainProductSellingPrice(item) ?? formatProductPrice(item),
     "source_product_price": getSourceProductPrice(item),
     "product_id": (item == null ? void 0 : item.product_id) || item.product_id === 0 ? item.product_id : item.id,
     "discount_amount": notManualDiscount.length > 0 ? 0 : discount_amount,
     "product_discount_reason": item._extend.discount_reason || "",
     "is_charge_tax": item.is_charge_tax,
-    "note": ((_a = item._extend) == null ? void 0 : _a.note) || "",
+    "note": ((_c = item._extend) == null ? void 0 : _c.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((_c = (_b = item._extend) == null ? void 0 : _b.other) == null ? void 0 : _c.bundle),
-    "bundle_edit": item._extend.bundle_edit,
-    "product_option_item": 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,
+    "product_bundle": formatProductBundle((_e = (_d = item._extend) == null ? void 0 : _d.other) == null ? void 0 : _e.bundle),
+    "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,
     "discount_list": notManualDiscount,
-    metadata: formatMetaData(item, false),
+    metadata: formatProductMetadata(item),
     // checkout 需求新增字段
     "calculated_original_price": formatOriginalPrice(item),
     "calculated_selling_price": formatSellingPrice(item),
@@ -372,7 +450,7 @@ var formatBookings = (data, values) => {
   let bookings = [];
   let obj = {};
   list.forEach((item) => {
-    var _a, _b, _c, _d, _e, _f;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j;
     if (item.isCustomItem) {
       bookings.push({
         ...item._extend,
@@ -412,26 +490,32 @@ var formatBookings = (data, values) => {
       item._extend.unique_identification_number = unique_identification_number;
     }
     const isSetGroupId = obj[(_f = item == null ? void 0 : item._extend) == null ? void 0 : _f.groupId];
+    if (!((_g = item._extend) == null ? void 0 : _g.unique_identification_number)) {
+      const unique_identification_number = (0, import_utils5.getUniqueId)();
+      item._extend.unique_identification_number = unique_identification_number;
+    }
+    debugger;
     const booking = {
-      "product": formatProducts(item),
-      "metadata": formatMetaData(item, !isSetGroupId),
-      "relation_products": formatRelationDetails(item._extend.relation_details),
-      "id": item.booking_id || 0,
-      "relation_id": item._extend.relation_id || 0,
-      "like_status": item._extend.like_status || "common",
-      "relation_type": item._extend.relation_type || "",
-      "is_all": false,
-      "schedule_id": item._extend.schedule_id || 0,
-      "end_time": end_time,
-      "sub_type": isDay ? "days" : 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),
-      "number": item._extend.capacity ? (0, import_utilsByBooking.getSumCapacity)({ cacheItem: item }) : item._extend.number || 1,
-      "resources": formatResource(item),
-      "note": item._extend.note,
+      schedule_event_id: item == null ? void 0 : item.booking_id,
+      product: formatProducts(item),
+      relation_products: formatRelationDetails(item._extend.relation_details),
+      id: item.booking_id || 0,
+      relation_id: item._extend.relation_id || 0,
+      like_status: item._extend.like_status || "common",
+      relation_type: item._extend.relation_type || "",
+      is_all: false,
+      schedule_id: item._extend.schedule_id || 0,
+      end_time,
+      sub_type: isDay ? "days" : getSubType(item),
+      select_date: start_date,
+      start_time,
+      end_date,
+      start_date,
+      duration: isDay ? 0 : import_utils.flexibleObj.getValue(item._extend.duration),
+      number: item._extend.capacity ? (0, import_utilsByBooking.getSumCapacity)({ cacheItem: item }) : item._extend.number || 1,
+      resources: formatResource(item),
+      note: item._extend.note,
+      metadata: formatMetaData(item, !isSetGroupId),
       ...eventOtherParams || {},
       ...dayParams
     };
@@ -445,12 +529,20 @@ var formatBookings = (data, values) => {
     for (let i = 0; i < (item._extend.quantity || 1); i++) {
       const newItem = (0, import_lodash.cloneDeep)(item);
       newItem._extend.unique_identification_number = `${item._extend.unique_identification_number}_${i}`;
+      if (i > 0) {
+        newItem._extend.surcharge_rounding_remainder = void 0;
+        if (((_j = (_i = (_h = newItem._extend) == null ? void 0 : _h.other) == null ? void 0 : _i.bundle) == null ? void 0 : _j.length) > 0) {
+          newItem._extend.other.bundle.forEach((bundleItem) => {
+            bundleItem.surcharge_rounding_remainder = void 0;
+          });
+        }
+      }
       bookings.push({
         ...booking,
         "product": formatProducts(newItem, 1),
         "number": item._extend.capacity ? (0, import_utilsByBooking.getSumCapacity)({ cacheItem: newItem }, false) : newItem._extend.number || 1,
         "holder": getHolderByIndex(booking.holder, i),
-        "metadata": formatMetaData(newItem)
+        "metadata": formatMetaData(newItem, false)
       });
     }
   });
@@ -609,8 +701,13 @@ var checkHolderIsError = (state) => {
   checkHolderIsError,
   checkResourcesFormat,
   checkSubResourcesCapacity,
+  formatOriginalPrice,
   formatProductBundle,
   formatProductOption,
   formatProductPrice,
-  formatValues
+  formatSellingPrice,
+  formatValues,
+  getBundleDiscountList,
+  getMainProductSellingPrice,
+  getSourceProductPrice
 });

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

@@ -60,6 +60,8 @@ var VoucherCard = (props) => {
   const isBooking4Shop = (0, import_useIsBooking4Shop.useIsBooking4Shop)(state);
   const shopDiscount = (0, import_useShopDiscountModule.useShopDiscountModule)();
   const { executeIfActive } = (0, import_pisellos.useActiveExecute)();
+  const stateRef = (0, import_react.useRef)(state);
+  stateRef.current = state;
   services = state.service;
   const changeCustomerToGlobalState = (0, import_ahooks.useMemoizedFn)((value) => {
     dispatch({
@@ -103,11 +105,17 @@ 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,
-        quantity: value._extend.quantity
+        quantity: value._extend.quantity,
+        startDate: value._extend.startDate
       };
     });
     return val;
   }, [state.service.value]);
+  const serviceTotal = (0, import_react.useMemo)(() => {
+    return serviceMemo.reduce((total, item) => {
+      return total + (item.total || 0);
+    }, 0);
+  }, [serviceMemo]);
   const onScanWallPassCode = (0, import_ahooks.useMemoizedFn)((e) => {
     if (!e.detail.code) {
       return;
@@ -155,8 +163,8 @@ var VoucherCard = (props) => {
       }
       if (isBooking4Shop) {
         const val = shopDiscount.calcDiscount([
-          ...state.service.value,
-          ...state.addons.value
+          ...stateRef.current.service.value,
+          ...stateRef.current.addons.value
         ]);
         console.log("input: ", state.service.value);
         console.log("output: ", val);
@@ -227,6 +235,12 @@ var VoucherCard = (props) => {
   const productListToValue = (0, import_ahooks.useMemoizedFn)((list, edit) => {
     var _a2;
     const { serviceList, addonsList } = (0, import_utils2.getServiceAddons)(list);
+    const newTotal = serviceList.reduce((total, item) => {
+      return total + (item._extend.total || 0);
+    }, 0);
+    if (newTotal !== serviceTotal) {
+      edit = true;
+    }
     serviceValueRef.current = serviceList;
     addonsValueRef.current = addonsList;
     let other = {};
@@ -243,12 +257,14 @@ var VoucherCard = (props) => {
       }
     });
     if (!((_a2 = props == null ? void 0 : props.state) == null ? void 0 : _a2.isBookingTicket2)) {
-      dispatch({
-        type: "setAddons",
-        payload: {
-          value: addonsList,
-          ...other
-        }
+      setTimeout(() => {
+        dispatch({
+          type: "setAddons",
+          payload: {
+            value: addonsList,
+            ...other
+          }
+        });
       });
     }
   });

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

@@ -95,10 +95,11 @@ var setNewCartValue = (cartValue, newProducts) => {
       }
       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 {
         ...bundle,
         base_price: bundleItemMap[bundle.id].base_price,
-        price: new import_decimal.default(bundleItemMap[bundle.id].price || 0).add(optionPrice).toNumber()
+        price: isEditDiscount ? bundle.price : new import_decimal.default(bundleItemMap[bundle.id].price || 0).add(optionPrice).toNumber()
         // product_price: bundleItemMap[item.id].product_price,
       };
     });

package/lib/components/booking/info/clientVariant/hooks/useIsLowSpeedNetwork.d.ts

@@ -1,3 +1,2 @@
-/// <reference types="react" />
 declare const useIsLowSpeedNetwork: () => import("react").MutableRefObject<boolean>;
 export default useIsLowSpeedNetwork;

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { EditServiceRef } from "../service/editService";
 declare const useInfoHolder: (state: any, dispatch: any) => {
     detailRef: import("react").MutableRefObject<EditServiceRef | undefined>;

package/lib/components/booking/info/service2/utils.js

@@ -378,6 +378,7 @@ var formatBundle = (bundle) => {
       num: item == null ? void 0 : item.num,
       price: item == null ? void 0 : item.price,
       total: item == null ? void 0 : item.price,
+      origin_total: item.original_total,
       price_type: item == null ? void 0 : item.price_type,
       bundle_sum_price: item == null ? void 0 : item.bundle_sum_price,
       bundle_sum_type: item == null ? void 0 : item.bundle_sum_type,

package/lib/components/booking/info2/cartClientCard/index.js

@@ -36,6 +36,7 @@ var import_react = __toESM(require("react"));
 var import_ahooks = require("ahooks");
 var import_materials = require("@pisell/materials");
 var import_utils = require("@pisell/utils");
+var import_lodash = require("lodash");
 var import_locales = __toESM(require("./locales"));
 var import_clientCard = __toESM(require("../../../../plus/clientCard"));
 var import_clinetSearch = __toESM(require("../../../../plus/clinetSearch"));
@@ -148,10 +149,34 @@ var CartClientCard = (0, import_react.forwardRef)(({
     selectCustomer(null);
   };
   const handleViewClient = (data) => {
+    const newSelectedCustomer = (0, import_lodash.cloneDeep)(selectedCustomer);
     state.action({
       type: "pisell1.handleOpenCustomerModal",
       data: { id: state.client.value.id },
       callback: (data2) => {
+        console.log("data>>>>>", data2);
+        const _selectedCustomer = {
+          ...newSelectedCustomer || {},
+          display_name: (data2 == null ? void 0 : data2.display_name) || "",
+          email: (data2 == null ? void 0 : data2.email) || "",
+          phone: (data2 == null ? void 0 : data2.phone) || "",
+          nickname: (data2 == null ? void 0 : data2.nickname) || "",
+          country_calling_code: (data2 == null ? void 0 : data2.country_calling_code) || "",
+          first_name: (data2 == null ? void 0 : data2.first_name) || "",
+          last_name: (data2 == null ? void 0 : data2.last_name) || "",
+          contacts_info: (data2 == null ? void 0 : data2.contacts_info) || null
+        };
+        selectCustomer(_selectedCustomer);
+        if (JSON.stringify((newSelectedCustomer == null ? void 0 : newSelectedCustomer.contacts_info) || {}) !== JSON.stringify((data2 == null ? void 0 : data2.contacts_info) || {})) {
+          dispatch({
+            type: "setContactsInfo",
+            payload: {
+              value: (data2 == null ? void 0 : data2.contacts_info) || {},
+              client_id: data2 == null ? void 0 : data2.id
+            }
+          });
+        }
+        handleSearchClient("");
       }
     });
   };
@@ -237,11 +262,6 @@ var CartClientCard = (0, import_react.forwardRef)(({
       (0, import_utils3.setHandleSetClient)(handleSetClient);
     }
   }, [isActive]);
-  (0, import_react.useEffect)(() => {
-    return () => {
-      (0, import_utils3.setHandleSetClient)(null);
-    };
-  }, [isActive]);
   const tags = (0, import_react.useMemo)(() => {
     var _a2;
     if (!selectedCustomer) return;

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

@@ -58,9 +58,9 @@ var import_classnames = __toESM(require("classnames"));
 var import_useCreateBookingPageHeader = __toESM(require("../hooks/useCreateBookingPageHeader"));
 var import_locales2 = require("../../../utils/locales");
 var import_ahooks = require("ahooks");
-var import_contactInfoMode = __toESM(require("./service/contactInfoMode"));
 var import_cartClientCard = __toESM(require("./cartClientCard"));
 var import_materials = require("@pisell/materials");
+var import_contactInfoMode = __toESM(require("./service/contactInfoMode"));
 var defaultModules = {
   client: 1,
   date: 1,
@@ -299,7 +299,12 @@ var Info = (0, import_model.Provider)((props) => {
       dispatch: modal.dispatch,
       source: "info"
     },
-    /* @__PURE__ */ import_react.default.createElement("div", { className: "booking-info" }, createHeader, /* @__PURE__ */ import_react.default.createElement("div", { className: "booking-info-client-line" }, modules.client ? (globalState == null ? void 0 : globalState.isBookingTicket2) ? /* @__PURE__ */ import_react.default.createElement("div", { style: { flex: 1, overflow: "hidden" } }, /* @__PURE__ */ import_react.default.createElement(import_cartClientCard.default, { clientCardProps: { dropdown: dropdownProps } })) : /* @__PURE__ */ import_react.default.createElement(import_client.default, null) : null, (globalState == null ? void 0 : globalState.isBookingTicket2) ? /* @__PURE__ */ import_react.default.createElement(
+    /* @__PURE__ */ import_react.default.createElement("div", { className: "booking-info" }, createHeader, /* @__PURE__ */ import_react.default.createElement("div", { className: "booking-info-client-line" }, modules.client ? (globalState == null ? void 0 : globalState.isBookingTicket2) ? /* @__PURE__ */ import_react.default.createElement("div", { style: { flex: 1, overflow: "hidden" } }, /* @__PURE__ */ import_react.default.createElement(
+      import_cartClientCard.default,
+      {
+        clientCardProps: { dropdown: dropdownProps }
+      }
+    )) : /* @__PURE__ */ import_react.default.createElement(import_client.default, null) : null, (globalState == null ? void 0 : globalState.isBookingTicket2) ? /* @__PURE__ */ import_react.default.createElement(
       "div",
       {
         className: "booking-info-client-line-code",

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

@@ -243,13 +243,12 @@ var Info = (props) => {
           _extend: {
             start_date: state.date.value,
             quantity: (e == null ? void 0 : e.quantity) || 1,
-            price: _detail.price,
             product_name: item.title,
             other
           },
           new: 1
         };
-        console.log(cacheItem, "cacheItem", e);
+        cacheItem._extend.price = (0, import_utils3.getMainPrice)(cacheItem, _detail.price);
         let _total = (0, import_utils3.getProductTotalPrice)(cacheItem);
         cacheItem._extend.total = _total;
         cacheItem._extend.origin_total = _total;

package/lib/components/booking/info2/service/editNormalService/index.js

@@ -36,6 +36,7 @@ var import_react = __toESM(require("react"));
 var import_ahooks = require("ahooks");
 var import_skuDetailModal = __toESM(require("../../../../../pro/skuDetailModal"));
 var import_model = require("../../../info/model");
+var import_utils = require("../editService/utils");
 var EditNormalService = (0, import_react.forwardRef)((props, ref) => {
   const { state, dispatch } = (0, import_react.useContext)(import_model.Context);
   const modalRef = (0, import_react.useRef)(null);
@@ -62,7 +63,12 @@ var EditNormalService = (0, import_react.forwardRef)((props, ref) => {
   const handleConfirm = (0, import_ahooks.useMemoizedFn)((data) => {
     var _a, _b;
     const newProducts = (_b = ((_a = state == null ? void 0 : state.service) == null ? void 0 : _a.value) || []) == null ? void 0 : _b.map((item) => {
+      var _a2, _b2;
       if (item._id == data._id) {
+        data = (0, import_utils.setProductPrice)(data, {
+          newTotal: (_a2 = data._extend) == null ? void 0 : _a2.total,
+          origin_total: (_b2 = data._extend) == null ? void 0 : _b2.origin_total
+        });
         return data;
       }
       return item;