@pisell/private-materials 6.5.26 → 6.6.1

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

@@ -51,6 +51,7 @@ var import_index = require("./index.less");
 var import_serve2 = require("./serve");
 var import_utils3 = require("./utils");
 var import_noteModal = __toESM(require("../../../../plus/noteModal"));
+var import_confirmHolderModal = require("../../utils/confirmHolderModal");
 var import__ = require("../../../../index");
 var import_useIsBooking4Shop = require("../../hooks/useIsBooking4Shop");
 var import_utils4 = require("@pisell/utils");
@@ -61,6 +62,7 @@ var import_useCustomer = require("../../../ticketBooking/hooks/pisellos/useCusto
 var import_ahooks = require("ahooks");
 var import_lodash = require("lodash");
 var import_useShopDiscountModule = require("../../../ticketBooking/hooks/pisellos/useShopDiscountModule");
+var import_utils5 = require("../../utils");
 var Footer = (props) => {
   var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p;
   const { state, buttons, dispatch, source } = props;
@@ -205,7 +207,7 @@ var Footer = (props) => {
     return false;
   }, [(_h = state.addons) == null ? void 0 : _h.edit]);
   const infoEdit = (0, import_react.useMemo)(() => {
-    var _a2, _b2, _c2, _d2, _e2, _f2;
+    var _a2, _b2, _c2, _d2, _e2, _f2, _g2;
     if (!state.bookingId) {
       return true;
     }
@@ -227,6 +229,9 @@ var Footer = (props) => {
     if ((_f2 = state.contacts) == null ? void 0 : _f2.edit) {
       return true;
     }
+    if ((_g2 = state.contacts_info) == null ? void 0 : _g2.edit) {
+      return true;
+    }
     return false;
   }, [state]);
   const isEdit = (0, import_react.useMemo)(() => {
@@ -593,12 +598,19 @@ var Footer = (props) => {
     messageShow = true,
     noSubmit = false
   }) => {
-    var _a2, _b2, _c2, _d2, _e2;
+    var _a2, _b2, _c2, _d2, _e2, _f2, _g2, _h2;
     (0, import_PaymentResultToast.closeAllPaymentResultToasts)();
     if ((0, import_utils2.isDayBooking)(state)) {
       const isHasDayProducts = handleDaySubmit();
       if (isHasDayProducts) return;
     }
+    const hasUnspecifiedHolderProduct = (_a2 = state.service.value) == null ? void 0 : _a2.some((item) => {
+      var _a3, _b3, _c3;
+      return (!((_a3 = item._extend) == null ? void 0 : _a3.holder_id) || ((_c3 = (_b3 = item._extend) == null ? void 0 : _b3.holder_id) == null ? void 0 : _c3.length) === 0) && !(0, import_utils2.isNormalProductByDurationSchedule)(item);
+    });
+    if (!(0, import_utils5.isWalkIn)((_c2 = (_b2 = state.client) == null ? void 0 : _b2.value) == null ? void 0 : _c2.id) && (0, import_utils2.getIsSubjectRequire)(state) && hasUnspecifiedHolderProduct) {
+      await (0, import_confirmHolderModal.showConfirmHolderModal)(state, dispatch);
+    }
     if (isBooking4Shop && (0, import_utils2.getIsSubjectRequire)(state) && (0, import_utils3.checkHolderIsError)(state)) {
       return;
     }
@@ -609,7 +621,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;
@@ -655,7 +667,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",
@@ -1241,6 +1253,7 @@ var Footer = (props) => {
     }
   };
   const changeCustomerToGlobalState = (0, import_ahooks.useMemoizedFn)((value) => {
+    var _a2, _b2;
     dispatch({
       type: "setClient",
       payload: {
@@ -1248,6 +1261,14 @@ var Footer = (props) => {
         edit: true
       }
     });
+    if ((_b2 = (_a2 = state == null ? void 0 : state.service) == null ? void 0 : _a2.value) == null ? void 0 : _b2.length) {
+      dispatch({
+        type: "setService",
+        payload: {
+          value: state.service.value.map((item) => ({ ...item, _extend: { ...item._extend, holder_id: [] } }))
+        }
+      });
+    }
   });
   const { selectCustomer } = (0, import_useCustomer.useCustomer)({
     changeCustomerToGlobalState
@@ -1430,6 +1451,6 @@ var Footer = (props) => {
         }
       }
     }
-  ));
+  ), /* @__PURE__ */ import_react.default.createElement(import_confirmHolderModal.ConfirmHolderModal, null));
 };
 var footer_default = Footer;

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

@@ -37,5 +37,12 @@ export declare const checkResourcesFormat: (resources: any[], service: any, isCh
  * @Date: 2024-12-23 12:05
  */
 export declare const formatProductPrice: (item: any) => number;
+/**
+ * @title: 是否包含跨日预约商品
+ * @description:
+ * @param {any} data
+ * @return {*}
+ */
+export declare const getHasMultiDayProduct: (data: any) => any;
 export declare const formatValues: (state: any) => any;
 export declare const checkHolderIsError: (state: any) => any;

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

@@ -35,7 +35,8 @@ __export(utils_exports, {
   formatProductBundle: () => formatProductBundle,
   formatProductOption: () => formatProductOption,
   formatProductPrice: () => formatProductPrice,
-  formatValues: () => formatValues
+  formatValues: () => formatValues,
+  getHasMultiDayProduct: () => getHasMultiDayProduct
 });
 module.exports = __toCommonJS(utils_exports);
 var import_dayjs = __toESM(require("dayjs"));
@@ -74,10 +75,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)
     };
   });
 };
@@ -95,7 +96,9 @@ var formatProductBundle = (bundle) => {
     return;
   }
   try {
-    const errorBundles = bundle == null ? void 0 : bundle.filter((d) => !(d == null ? void 0 : d.group_id) || !(d == null ? void 0 : d.id) || !(d == null ? void 0 : d._bundle_product_id));
+    const errorBundles = bundle == null ? void 0 : bundle.filter(
+      (d) => !(d == null ? void 0 : d.group_id) || !(d == null ? void 0 : d.id) || !(d == null ? void 0 : d._bundle_product_id)
+    );
     if ((errorBundles == null ? void 0 : errorBundles.length) > 0) {
       log(errorBundles);
     }
@@ -118,7 +121,7 @@ var formatProductBundle = (bundle) => {
       // checkout 2.0 新增
       "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),
+      "custom_price": Math.abs(new import_decimal.default(d == null ? void 0 : d.price).sub(option_price).toNumber()).toFixed(2),
       "custom_price_type": d == null ? void 0 : d.price_type,
       "option": option
     };
@@ -179,11 +182,14 @@ var formatResource = (service) => {
     return void 0;
   }
   try {
-    return Object.values(service._extend.resource).reduce((pre, cur) => {
-      const newList = checkResourcesFormat(cur, service);
-      pre = pre.concat(newList);
-      return pre;
-    }, []);
+    return Object.values(service._extend.resource).reduce(
+      (pre, cur) => {
+        const newList = checkResourcesFormat(cur, service);
+        pre = pre.concat(newList);
+        return pre;
+      },
+      []
+    );
   } catch (err) {
     return void 0;
   }
@@ -210,7 +216,9 @@ var formatProductPrice = (item) => {
   const other = (_a = item._extend) == null ? void 0 : _a.other;
   let price = Number((_b = item._extend) == null ? void 0 : _b.price);
   if ((other == null ? void 0 : other.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));
+    const variant = item.variant.find(
+      (d) => d.id === (other == null ? void 0 : other.product_variant_id)
+    );
     if (variant) {
       price = Number(variant == null ? void 0 : variant.price) || 0;
     }
@@ -255,7 +263,9 @@ var getSourceProductPrice = (item) => {
   const other = (_a = item._extend) == null ? void 0 : _a.other;
   let price = Number((_b = item._extend) == null ? void 0 : _b.price);
   if ((other == null ? void 0 : other.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));
+    const variant = item.variant.find(
+      (d) => d.id === (other == null ? void 0 : other.product_variant_id)
+    );
     if (variant) {
       price = Number(variant == null ? void 0 : variant.price) || 0;
     }
@@ -275,45 +285,49 @@ var formatProducts = (item, quantity) => {
       unique_identification_number: `${item._extend.unique_identification_number}_${d.discount.resource_id}`
     };
   });
-  const notManualDiscount = discount_list.filter((item2) => item2.type !== "product");
+  const notManualDiscount = discount_list.filter(
+    (item2) => item2.type !== "product"
+  );
   if (item.isCustomItem) {
     item.product_id = 0;
   }
   return {
-    "name": item.name,
-    "num": quantity || item._extend.quantity,
-    "price": 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) || "",
-    "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,
-    "discount_list": notManualDiscount,
+    name: item.name,
+    num: quantity || item._extend.quantity,
+    price: 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) || "",
+    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,
+    discount_list: notManualDiscount,
     metadata: formatMetaData(item),
     // checkout 需求新增字段
-    "calculated_original_price": formatOriginalPrice(item),
-    "calculated_selling_price": formatSellingPrice(item),
-    "tax_fee": item._extend.tax_fee,
-    "custom_deposit_data": item.custom_deposit_data
+    calculated_original_price: formatOriginalPrice(item),
+    calculated_selling_price: formatSellingPrice(item),
+    tax_fee: item._extend.tax_fee,
+    custom_deposit_data: item.custom_deposit_data
   };
 };
 var formatAppointmentProductLists = (data) => {
   var _a;
   try {
     let list = data.service.value;
-    list = list.filter((item) => {
-      var _a2;
-      return ((_a2 = item._extend) == null ? void 0 : _a2.holder_id) && !(0, import_utils4.isNormalProductByDurationSchedule)(item);
-    });
+    list = list.filter(
+      (item) => {
+        var _a2;
+        return ((_a2 = item._extend) == null ? void 0 : _a2.holder_id) && !(0, import_utils4.isNormalProductByDurationSchedule)(item);
+      }
+    );
     const groupMap = /* @__PURE__ */ new Map();
     list.forEach((item) => {
       var _a2;
@@ -323,7 +337,10 @@ var formatAppointmentProductLists = (data) => {
       }
       groupMap.get(key).push(item);
     });
-    const result = (_a = Array.from(groupMap.values())) == null ? void 0 : _a.reduce((acc, group) => acc.concat(group), []);
+    const result = (_a = Array.from(groupMap.values())) == null ? void 0 : _a.reduce(
+      (acc, group) => acc.concat(group),
+      []
+    );
     return list || [];
   } catch (error) {
   }
@@ -335,6 +352,14 @@ var getHolderByIndex = (holder, index) => {
     form_record: [(_a = holder == null ? void 0 : holder.form_record) == null ? void 0 : _a[index]].filter(Boolean)
   };
 };
+var getHasMultiDayProduct = (data) => {
+  const list = data.service.value;
+  const isHas = list.some((item) => {
+    var _a;
+    return (_a = item._extend) == null ? void 0 : _a.groupId;
+  });
+  return isHas;
+};
 var formatBookings = (data, values) => {
   const isDay = (0, import_utils4.isDaysBooking)(data);
   const isEvent = (0, import_utils4.isEventBooking)(data);
@@ -355,7 +380,7 @@ var formatBookings = (data, values) => {
   const eventOtherParams = data.eventOtherParams;
   let bookings = [];
   list.forEach((item) => {
-    var _a, _b, _c, _d, _e;
+    var _a, _b, _c, _d, _e, _f;
     if (item.isCustomItem) {
       bookings.push({
         ...item._extend,
@@ -364,6 +389,7 @@ var formatBookings = (data, values) => {
       });
       return;
     }
+    const isMultiDay = (_a = item._extend) == null ? void 0 : _a.groupId;
     let start_date = item._extend.startDate.format("YYYY-MM-DD");
     let end_date = item._extend.endDate.format("YYYY-MM-DD");
     let end_time = item._extend.endDate.format("HH:mm");
@@ -373,45 +399,51 @@ var formatBookings = (data, values) => {
     }
     dayParams.holder = formatHolders(data, item, values);
     if (isDay) {
-      const startDate = ((_a = item._extend) == null ? void 0 : _a.startDate) || ((_b = item._extend) == null ? void 0 : _b.start_date);
-      const endDate = ((_c = item._extend) == null ? void 0 : _c.endDate) || ((_d = item._extend) == null ? void 0 : _d.end_date);
-      const { startDateTime, endDateTime } = (0, import_utils4.formatDayTime)({ startDate, endDate });
+      const startDate = ((_b = item._extend) == null ? void 0 : _b.startDate) || ((_c = item._extend) == null ? void 0 : _c.start_date);
+      const endDate = ((_d = item._extend) == null ? void 0 : _d.endDate) || ((_e = item._extend) == null ? void 0 : _e.end_date);
+      const { startDateTime, endDateTime } = (0, import_utils4.formatDayTime)({
+        startDate,
+        endDate
+      });
       start_date = (0, import_dayjs.default)(startDateTime).format("YYYY-MM-DD");
       start_time = (0, import_dayjs.default)(startDateTime).format("HH:mm");
       end_date = (0, import_dayjs.default)(endDateTime).format("YYYY-MM-DD");
       end_time = (0, import_dayjs.default)(endDateTime).format("HH:mm");
       dayParams.relation_products = (item == null ? void 0 : item.relation_products) || [];
       dayParams.holder = formatHolders(data, item, values);
-      dayParams.duration = (0, import_utils3.getDays)({ _extend: { start_date: startDateTime, end_date: endDateTime } }, "minutes");
+      dayParams.duration = (0, import_utils3.getDays)(
+        { _extend: { start_date: startDateTime, end_date: endDateTime } },
+        "minutes"
+      );
     }
-    if (!((_e = item._extend) == null ? void 0 : _e.unique_identification_number)) {
+    if (!((_f = item._extend) == null ? void 0 : _f.unique_identification_number)) {
       const unique_identification_number = (0, import_utils5.getUniqueId)();
       item._extend.unique_identification_number = unique_identification_number;
     }
     const booking = {
-      "product": formatProducts(item),
-      "metadata": formatMetaData(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": 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,
+      product: formatProducts(item),
+      metadata: formatMetaData(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 || isMultiDay ? 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,
       ...eventOtherParams || {},
       ...dayParams
     };
-    if (isDay) {
+    if (isDay || isMultiDay) {
       bookings.push(booking);
       return;
     }
@@ -420,10 +452,10 @@ var formatBookings = (data, values) => {
       newItem._extend.unique_identification_number = `${item._extend.unique_identification_number}_${i}`;
       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)
+        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)
       });
     }
   });
@@ -485,7 +517,7 @@ var formatHolder = (state, values) => {
   return obj;
 };
 var formatValues = (state) => {
-  var _a, _b, _c, _d, _e, _f, _g;
+  var _a, _b, _c, _d, _e, _f, _g, _h;
   let values = {
     type: state.renderType === "eventBooking" ? "event_booking_v2" : "appointment_booking",
     platform: state.isBookingTicket2 ? "pos" : "shop",
@@ -499,6 +531,7 @@ var formatValues = (state) => {
     metadata: {}
   };
   const isDay = (0, import_utils4.isDaysBooking)(state);
+  const isHasMultiDay = getHasMultiDayProduct(state);
   const isEvent = (0, import_utils4.isEventBooking)(state);
   if (!state.bookingId || isDay) {
     values.shop_note = formatNote(state);
@@ -516,8 +549,11 @@ var formatValues = (state) => {
     ...customer
   };
   values.holder = formatHolder(state, values);
-  if (isDay || isEvent) {
-    values.relation_products = formatRelationProducts(state, isDay ? "day" : "event");
+  if (isEvent) {
+    values.relation_products = formatRelationProducts(
+      state,
+      "event"
+    );
   } else {
     values.relation_products = formatNormalProducts(state);
     if (!((_b = values.relation_products) == null ? void 0 : _b.length)) {
@@ -530,28 +566,29 @@ var formatValues = (state) => {
     startTime = `${startTime || "00:00"}:00`;
     values.schedule_date = `${values.bookings[0].select_date} ${startTime}`;
   }
-  if (isDay) {
+  if (isDay || isHasMultiDay) {
     values.metadata.is_multiday_appointment = 1;
   }
   if (!((_g = values == null ? void 0 : values.bookings) == null ? void 0 : _g.length)) {
     values.type = "virtual";
   }
+  values.contacts_info = ((_h = state.contacts_info) == null ? void 0 : _h.value) || null;
   return values;
 };
 var checkHolderIsError = (state) => {
   var _a, _b;
   let errorRowKey = "";
   const holderError = state.service.value.some((item) => {
-    var _a2, _b2, _c, _d, _e, _f;
+    var _a2, _b2, _c, _d, _e, _f, _g;
     if ((0, import_utils4.isNormalProductByDurationSchedule)(item)) {
       return false;
     }
-    if (item._extend.quantity === 1 && !item._extend.holder_id) {
-      errorRowKey = (0, import_utils4.genRowKey)((_b2 = (_a2 = item == null ? void 0 : item._extend) == null ? void 0 : _a2.other) == null ? void 0 : _b2.rowKey);
+    if (item._extend.quantity === 1 && (!item._extend.holder_id || ((_a2 = item._extend.holder_id) == null ? void 0 : _a2.length) === 0)) {
+      errorRowKey = (0, import_utils4.genRowKey)((_c = (_b2 = item == null ? void 0 : item._extend) == null ? void 0 : _b2.other) == null ? void 0 : _c.rowKey);
       return true;
     }
-    if (item._extend.quantity > 1 && ((_d = (_c = item._extend) == null ? void 0 : _c.holder_id) == null ? void 0 : _d.length) !== item._extend.quantity) {
-      errorRowKey = (0, import_utils4.genRowKey)((_f = (_e = item == null ? void 0 : item._extend) == null ? void 0 : _e.other) == null ? void 0 : _f.rowKey);
+    if (item._extend.quantity > 1 && ((_e = (_d = item._extend) == null ? void 0 : _d.holder_id) == null ? void 0 : _e.length) !== item._extend.quantity) {
+      errorRowKey = (0, import_utils4.genRowKey)((_g = (_f = item == null ? void 0 : item._extend) == null ? void 0 : _f.other) == null ? void 0 : _g.rowKey);
       return true;
     }
     return false;
@@ -581,5 +618,6 @@ var checkHolderIsError = (state) => {
   formatProductBundle,
   formatProductOption,
   formatProductPrice,
-  formatValues
+  formatValues,
+  getHasMultiDayProduct
 });

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

@@ -62,6 +62,7 @@ var VoucherCard = (props) => {
   const { executeIfActive } = (0, import_pisellos.useActiveExecute)();
   services = state.service;
   const changeCustomerToGlobalState = (0, import_ahooks.useMemoizedFn)((value) => {
+    var _a2, _b2;
     dispatch({
       type: "setClient",
       payload: {
@@ -69,6 +70,14 @@ var VoucherCard = (props) => {
         edit: true
       }
     });
+    if ((_b2 = (_a2 = state == null ? void 0 : state.service) == null ? void 0 : _a2.value) == null ? void 0 : _b2.length) {
+      dispatch({
+        type: "setService",
+        payload: {
+          value: state.service.value.map((item) => ({ ...item, _extend: { ...item._extend, holder_id: [] } }))
+        }
+      });
+    }
   });
   const { selectCustomer } = (0, import_pisellos.useCustomer)({
     changeCustomerToGlobalState
@@ -163,7 +172,7 @@ var VoucherCard = (props) => {
         productListToValue(val.productList);
       }
     },
-    { wait: 1e3 }
+    { wait: 500 }
   );
   (0, import_react.useEffect)(() => {
     run();

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

@@ -24,12 +24,7 @@ __export(serve_exports, {
 module.exports = __toCommonJS(serve_exports);
 var import_utils = require("../utils");
 var getBookingList = async (params) => {
-  let { data } = await import_utils.request.getRequest().get(`/shop/schedule/booking`, params, {
-    cache: {
-      mode: "remote_local",
-      type: "indexDB"
-    }
-  });
+  let { data } = await import_utils.request.getRequest().get(`/shop/schedule/booking`, params);
   return data;
 };
 // Annotate the CommonJS export names for ESM import in node:

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

@@ -39,31 +39,49 @@ var import_useSendModal = __toESM(require("./sendModal/useSendModal"));
 var import_sendModal = __toESM(require("./sendModal"));
 var import_utils = require("@pisell/utils");
 var Footer = ({ state, reload }) => {
-  var _a, _b, _c, _d;
+  var _a, _b, _c, _d, _e;
   const { open, setOpen, handleOpen, handleValuesChange, handleOk } = (0, import_useSendModal.default)(state == null ? void 0 : state.bookingId);
   const handleReload = async () => {
     await reload();
     import_materials.message.success(import_utils.locales.getText("pisell2.text.send-form-reminder-refresh"));
   };
   const defaultValues = (0, import_react.useMemo)(() => {
-    var _a2, _b2, _c2, _d2, _e, _f, _g, _h, _i, _j;
+    var _a2, _b2;
+    const { email: contactsEmail, phone: contactsPhone } = ((_a2 = state.contacts_info) == null ? void 0 : _a2.value) || {};
+    const {
+      email: clientEmail,
+      phone: clientPhone,
+      country_calling_code: clientCode
+    } = ((_b2 = state.client) == null ? void 0 : _b2.value) || {};
+    let email = contactsEmail || clientEmail;
+    let phone = (contactsPhone == null ? void 0 : contactsPhone.phone) || clientPhone;
+    let code = (contactsPhone == null ? void 0 : contactsPhone.country_calling_code) || clientCode || "+61";
+    if (!code.startsWith("+")) {
+      code = `+${code}`;
+    }
     return {
-      sendSms: !!((_b2 = (_a2 = state.client) == null ? void 0 : _a2.value) == null ? void 0 : _b2.phone),
-      sendEmail: !!((_d2 = (_c2 = state.client) == null ? void 0 : _c2.value) == null ? void 0 : _d2.email),
-      email: (_f = (_e = state.client) == null ? void 0 : _e.value) == null ? void 0 : _f.email,
+      sendSms: !!phone,
+      sendEmail: !!email,
+      email,
       phone: {
-        code: (_h = (_g = state.client) == null ? void 0 : _g.value) == null ? void 0 : _h.country_calling_code,
-        phone: (_j = (_i = state.client) == null ? void 0 : _i.value) == null ? void 0 : _j.phone
+        code,
+        phone
       }
     };
-  }, [(_a = state.client) == null ? void 0 : _a.value]);
-  if (!state.bookingId || !((_b = state == null ? void 0 : state.form) == null ? void 0 : _b.forms.length)) {
+  }, [(_a = state.client) == null ? void 0 : _a.value, (_b = state.contacts_info) == null ? void 0 : _b.value]);
+  if (!state.bookingId || !((_c = state == null ? void 0 : state.form) == null ? void 0 : _c.forms.length)) {
     return null;
   }
-  return /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-form-footer" }, /* @__PURE__ */ import_react.default.createElement(import_materials.Tooltip, { title: import_utils.locales.getText("pisell2.text.send-form-reminder-tooltip") }, /* @__PURE__ */ import_react.default.createElement(import_materials.Button, { size: "large", icon: /* @__PURE__ */ import_react.default.createElement(import_icons.ReloadOutlined, null), onClick: handleReload })), /* @__PURE__ */ import_react.default.createElement(import_materials.Button, { size: "large", block: true, type: "primary", onClick: handleOpen }, import_utils.locales.getText("pisell2.text.send-form-reminder")), /* @__PURE__ */ import_react.default.createElement(
+  return /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-form-footer" }, /* @__PURE__ */ import_react.default.createElement(
+    import_materials.Tooltip,
+    {
+      title: import_utils.locales.getText("pisell2.text.send-form-reminder-tooltip")
+    },
+    /* @__PURE__ */ import_react.default.createElement(import_materials.Button, { size: "large", icon: /* @__PURE__ */ import_react.default.createElement(import_icons.ReloadOutlined, null), onClick: handleReload })
+  ), /* @__PURE__ */ import_react.default.createElement(import_materials.Button, { size: "large", block: true, type: "primary", onClick: handleOpen }, import_utils.locales.getText("pisell2.text.send-form-reminder")), open && /* @__PURE__ */ import_react.default.createElement(
     import_sendModal.default,
     {
-      refreshKey: (_d = (_c = state.client) == null ? void 0 : _c.value) == null ? void 0 : _d.id,
+      refreshKey: (_e = (_d = state.client) == null ? void 0 : _d.value) == null ? void 0 : _e.id,
       open,
       onCancel: () => setOpen(false),
       onOk: handleOk,

package/lib/components/booking/forms/sendModal/useSendModal.d.ts

@@ -4,6 +4,6 @@ declare const useSendModal: (bookingId?: number) => {
     setOpen: import("react").Dispatch<import("react").SetStateAction<boolean>>;
     handleOpen: () => void;
     handleValuesChange: (val: any) => void;
-    handleOk: (values: SendModalValues) => Promise<boolean | undefined>;
+    handleOk: (values: SendModalValues) => Promise<any>;
 };
 export default useSendModal;

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

@@ -24,18 +24,8 @@ __export(serve_exports, {
 });
 module.exports = __toCommonJS(serve_exports);
 var import_utils = require("../utils");
-var getFormData = async (params) => import_utils.request.getRequest().get(`/shop/form/data/v1`, params, {
-  cache: {
-    mode: "remote_local",
-    type: "indexDB"
-  }
-});
-var sendFormReminder = async (params) => import_utils.request.getRequest().post(`/shop/form/form-reminder`, params, {
-  cache: {
-    mode: "remote_local",
-    type: "indexDB"
-  }
-});
+var getFormData = async (params) => import_utils.request.getRequest().get(`/shop/form/data/v1`, params);
+var sendFormReminder = async (params) => import_utils.request.getRequest().post(`/shop/form/form-reminder`, params);
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   getFormData,