@pisell/private-materials 3.4.43 → 3.4.44

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

@@ -71,9 +71,9 @@ 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
+      num: d.num,
+      option_group_item_id: d.product_option_item_id || d.option_group_item_id,
+      option_group_id: d.option_group_id
       // "add_price": Number(d?.add_price),
     };
   });
@@ -92,7 +92,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);
     }
@@ -100,16 +102,16 @@ var formatProductBundle = (bundle) => {
   }
   return bundle.map((d) => {
     return {
-      "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),
-      "bundle_variant_id": d.bundle_variant_id,
-      "num": d.num,
-      "extension_id": d.extension_id,
-      "extension_type": d.extension_type,
+      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),
+      bundle_variant_id: d.bundle_variant_id,
+      num: d.num,
+      extension_id: d.extension_id,
+      extension_type: d.extension_type,
       // "price": Number(d?.price),
       // "price_type": d?.price_type,
-      "option": formatProductOption(d.option)
+      option: formatProductOption(d.option)
     };
   });
 };
@@ -168,11 +170,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;
   }
@@ -199,7 +204,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;
     }
@@ -233,7 +240,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;
     }
@@ -247,25 +256,27 @@ var formatProducts = (item, quantity) => {
   const discount_amount = origin_total - total;
   const discount_list = (item == null ? void 0 : item.discount_list) || [];
   const discount_type = discount_amount < 0 ? "change_price" : "discount";
-  const notManualDiscount = discount_list.filter((item2) => item2.type !== "product");
+  const notManualDiscount = discount_list.filter(
+    (item2) => item2.type !== "product"
+  );
   return {
-    "num": quantity || item._extend.quantity,
-    "price": formatProductPrice(item),
-    "source_product_price": getSourceProductPrice(item),
-    "product_id": (item == null ? void 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": (item == null ? void 0 : item.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((_b = (_a = item._extend) == null ? void 0 : _a.other) == null ? void 0 : _b.bundle),
-    "bundle_edit": item._extend.bundle_edit,
-    "product_option_item": formatProductOption((_d = (_c = item._extend) == null ? void 0 : _c.other) == null ? void 0 : _d.option),
-    "product_variant_id": ((_f = (_e = item._extend) == null ? void 0 : _e.other) == null ? void 0 : _f.product_variant_id) || 0,
-    "discount_list": notManualDiscount,
+    num: quantity || item._extend.quantity,
+    price: formatProductPrice(item),
+    source_product_price: getSourceProductPrice(item),
+    product_id: (item == null ? void 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: (item == null ? void 0 : item.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((_b = (_a = item._extend) == null ? void 0 : _a.other) == null ? void 0 : _b.bundle),
+    bundle_edit: item._extend.bundle_edit,
+    product_option_item: formatProductOption((_d = (_c = item._extend) == null ? void 0 : _c.other) == null ? void 0 : _d.option),
+    product_variant_id: ((_f = (_e = item._extend) == null ? void 0 : _e.other) == null ? void 0 : _f.product_variant_id) || 0,
+    discount_list: notManualDiscount,
     metadata: formatMetaData(item, false)
   };
 };
@@ -273,10 +284,12 @@ 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;
@@ -286,7 +299,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) {
   }
@@ -318,7 +334,7 @@ var formatBookings = (data, values) => {
   const eventOtherParams = data.eventOtherParams;
   let bookings = [];
   let obj = {};
-  list.forEach((item, index) => {
+  list.forEach((item) => {
     var _a, _b, _c, _d, _e;
     let start_date = item._extend.startDate.format("YYYY-MM-DD");
     let end_date = item._extend.endDate.format("YYYY-MM-DD");
@@ -331,35 +347,40 @@ var formatBookings = (data, 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 { 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"
+      );
     }
     const isSetGroupId = obj[(_e = item == null ? void 0 : item._extend) == null ? void 0 : _e.groupId];
     const booking = {
-      "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": 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),
-      // 当groupId第一次出现时，需要设置metadata.multiDayPrices， 否则不用
+      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),
       "metadata": formatMetaData(item, !isSetGroupId),
       ...eventOtherParams || {},
       ...dayParams
@@ -374,9 +395,9 @@ var formatBookings = (data, values) => {
     for (let i = 0; i < (item._extend.quantity || 1); i++) {
       bookings.push({
         ...booking,
-        "product": formatProducts(item, 1),
-        "number": item._extend.capacity ? (0, import_utilsByBooking.getSumCapacity)({ cacheItem: item }, false) : item._extend.number || 1,
-        "holder": getHolderByIndex(booking.holder, i)
+        product: formatProducts(item, 1),
+        number: item._extend.capacity ? (0, import_utilsByBooking.getSumCapacity)({ cacheItem: item }, false) : item._extend.number || 1,
+        holder: getHolderByIndex(booking.holder, i)
       });
     }
   });
@@ -428,7 +449,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",
@@ -460,7 +481,10 @@ var formatValues = (state) => {
   };
   values.holder = formatHolder(state, values);
   if (isDay || isEvent) {
-    values.relation_products = formatRelationProducts(state, isDay ? "day" : "event");
+    values.relation_products = formatRelationProducts(
+      state,
+      isDay ? "day" : "event"
+    );
   } else {
     values.relation_products = formatNormalProducts(state);
     if (!((_b = values.relation_products) == null ? void 0 : _b.length)) {
@@ -479,6 +503,7 @@ var formatValues = (state) => {
   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) => {

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/info/client/index.js

@@ -91,8 +91,13 @@ var Client = () => {
     }
     _setLoading(true);
     const api = state.isFranchisee ? import_serve.getFranchiseeCustomerList : state.apis.getClientsEs;
+    const withKey = [...(resetParams == null ? void 0 : resetParams.with) || []];
+    if (!withKey.includes("contactsInfo")) {
+      withKey.push("contactsInfo");
+    }
     const data = await api({
       ...resetParams,
+      with: withKey,
       ...!state.isFranchisee ? { _config: { abort: true } } : {}
     });
     const list = ((data == null ? void 0 : data.list) || []).map((d) => {
@@ -322,6 +327,14 @@ var Client = () => {
         closeCallback: () => {
         },
         optionRender: (item) => {
+          var _a2, _b2, _c2, _d2, _e2;
+          console.log("render_optionRender", item);
+          let displayEmail = item == null ? void 0 : item.email;
+          let displayPhone = item == null ? void 0 : item.phone;
+          if (!displayEmail && !displayPhone) {
+            displayEmail = (_b2 = (_a2 = item == null ? void 0 : item.contacts_info) == null ? void 0 : _a2.value) == null ? void 0 : _b2.email;
+            displayPhone = (_e2 = (_d2 = (_c2 = item == null ? void 0 : item.contacts_info) == null ? void 0 : _c2.value) == null ? void 0 : _d2.phone) == null ? void 0 : _e2.phone;
+          }
           return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, /* @__PURE__ */ import_react.default.createElement(
             import_antd.Avatar,
             {
@@ -329,7 +342,7 @@ var Client = () => {
               src: import_utils.image.ali(item.cover, 100) || void 0,
               icon: /* @__PURE__ */ import_react.default.createElement(import_User01.default, { className: "pisell-lowcode__booking-client-list-item-avatar-icon" })
             }
-          ), /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-client-list-item-info" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-client-list-item-info-name" }, getNickname(item)), /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-client-list-item-info-desc" }, item.email ? /* @__PURE__ */ import_react.default.createElement("div", { className: "" }, item.email) : null, item.phone ? /* @__PURE__ */ import_react.default.createElement("div", { className: "" }, item.phone) : null), /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-client-list-item-info-waiver", title: (0, import_utils3.getWaiverTitle)(item.waiver_form) }, (item.waiver_form || []).map((item2) => {
+          ), /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-client-list-item-info" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-client-list-item-info-name" }, getNickname(item)), /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-client-list-item-info-desc" }, displayEmail ? /* @__PURE__ */ import_react.default.createElement("div", { className: "" }, displayEmail) : null, displayPhone ? /* @__PURE__ */ import_react.default.createElement("div", { className: "" }, displayPhone) : null), /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-client-list-item-info-waiver", title: (0, import_utils3.getWaiverTitle)(item.waiver_form) }, (item.waiver_form || []).map((item2) => {
             return /* @__PURE__ */ import_react.default.createElement("span", null, item2.form_title, ":", item2.is_filled ? /* @__PURE__ */ import_react.default.createElement("span", { className: "pisell-lowcode__booking-client-list-item-waiver-filled" }, import_utils.locales.getText("pisell2.text.filled")) : /* @__PURE__ */ import_react.default.createElement("span", { className: "pisell-lowcode__booking-client-list-item-waiver-not-filled" }, import_utils.locales.getText("pisell2.text.not-filled")), "; ");
           }))), /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-client-list-item-loading" }, /* @__PURE__ */ import_react.default.createElement(import_antd.Spin, { spinning: franchiseeLoading === item.id })));
         },

package/lib/components/booking/info/clientVariant/hooks/useClientFn.js

@@ -52,7 +52,7 @@ var useClientFn = (_params) => {
     num: 5,
     total: 0,
     search: "",
-    with: ["formRecord"],
+    with: ["formRecord", "contactsInfo"],
     relation_form_id: (_d = (_c = (_b = (_a = state == null ? void 0 : state.bookingConfig) == null ? void 0 : _a.config) == null ? void 0 : _b.basic) == null ? void 0 : _c.appointment_subject) == null ? void 0 : _d.form_id
   });
   const paramsRef = (0, import_react.useRef)(params);
@@ -91,11 +91,16 @@ var useClientFn = (_params) => {
     }
     _setLoading(true);
     const api = state.isFranchisee ? import_serve.getFranchiseeCustomerList : state.apis.getClients;
+    const withKey = [...(resetParams == null ? void 0 : resetParams.with) || []];
+    if (!withKey.includes("contactsInfo")) {
+      withKey.push("contactsInfo");
+    }
     const data = await api({
       ...resetParams,
       ...resetParams.search ? { num: 10 } : {},
       ...state.isFranchisee ? { franchisee_customer_ids: customer_ids } : { customer_ids },
-      ...!state.isFranchisee && !returnResult ? { _config: { abort: true } } : {}
+      ...!state.isFranchisee && !returnResult ? { _config: { abort: true } } : {},
+      with: withKey
     });
     const list = ((data == null ? void 0 : data.list) || []).map((d) => {
       var _a3;

package/lib/components/booking/info/clientVariant/vertical/SelectDrawer.js

@@ -279,6 +279,7 @@ var SelectDrawer = (props, ref) => {
     }
     closeDrawer();
   };
+  console.log("options7777", options);
   return /* @__PURE__ */ import_react.default.createElement(
     import_drawer.default,
     {
@@ -292,7 +293,7 @@ var SelectDrawer = (props, ref) => {
           ref: searchRef,
           prefix: /* @__PURE__ */ import_react.default.createElement(import_SearchLg.default, null),
           style: { margin: "16px 0", height: 44 },
-          placeholder: import_utils.locales.getText("pisell2.text.search"),
+          placeholder: import_utils.locales.getText("pisell2.booking.text.search-placeholder"),
           value: search,
           allowClear: true,
           onChange: (e) => {
@@ -335,7 +336,13 @@ var SelectDrawer = (props, ref) => {
         }
       }
     ) : null), /* @__PURE__ */ import_react.default.createElement(import_antd.Spin, { spinning: !!loading, delay: 500 }, !!options.length ? options.map((item) => {
-      var _a;
+      var _a, _b, _c, _d, _e, _f;
+      let displayEmail = item == null ? void 0 : item.email;
+      let displayPhone = item == null ? void 0 : item.phone;
+      if (!displayEmail && !displayPhone) {
+        displayEmail = (_b = (_a = item == null ? void 0 : item.contacts_info) == null ? void 0 : _a.value) == null ? void 0 : _b.email;
+        displayPhone = (_e = (_d = (_c = item == null ? void 0 : item.contacts_info) == null ? void 0 : _c.value) == null ? void 0 : _d.phone) == null ? void 0 : _e.phone;
+      }
       return /* @__PURE__ */ import_react.default.createElement(
         "div",
         {
@@ -348,7 +355,7 @@ var SelectDrawer = (props, ref) => {
             onClick: () => handleClientClick(item),
             cover: item.cover,
             title: getNickname(item),
-            desc: [item.email, item.phone],
+            desc: [displayEmail, displayPhone],
             checked: item.id === client.id,
             style: showPet ? { marginBottom: 6 } : {},
             loading: franchiseeLoading === item.id,
@@ -396,7 +403,7 @@ var SelectDrawer = (props, ref) => {
             },
             style: { padding: 16 }
           },
-          /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, /* @__PURE__ */ import_react.default.createElement(import_PlusCircle.default, { className: "pisell-lowcode__custom-select-create-icon" }), /* @__PURE__ */ import_react.default.createElement("span", { className: "pisell-lowcode__custom-select-create-txt" }, `${import_utils.locales.getText("pisell2.text.create-new")} ${((_a = holder.form) == null ? void 0 : _a.title) || "-"}`))
+          /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, /* @__PURE__ */ import_react.default.createElement(import_PlusCircle.default, { className: "pisell-lowcode__custom-select-create-icon" }), /* @__PURE__ */ import_react.default.createElement("span", { className: "pisell-lowcode__custom-select-create-txt" }, `${import_utils.locales.getText("pisell2.text.create-new")} ${((_f = holder.form) == null ? void 0 : _f.title) || "-"}`))
         ), /* @__PURE__ */ import_react.default.createElement("div", null))
       );
     }) : /* @__PURE__ */ import_react.default.createElement(import_antd.Empty, { image: import_antd.Empty.PRESENTED_IMAGE_SIMPLE }), /* @__PURE__ */ import_react.default.createElement("div", null, loadMore)))

package/lib/components/booking/info/clientVariant/vertical/index.js

@@ -173,7 +173,11 @@ var VerticalClient = (0, import_react.forwardRef)((props, ref) => {
   const handleAddPet = (_client, cb) => {
     var _a2, _b2, _c2;
     let _data = {
-      formDataConfig: isMinorAndWaiver ? { ...waiverForm, customer_id: _client.id, is_franchisor: (_b2 = (_a2 = state.pet.formData) == null ? void 0 : _a2[0]) == null ? void 0 : _b2.is_franchisor } : { ...((_c2 = state.pet.formData) == null ? void 0 : _c2[0]) || {} }
+      formDataConfig: isMinorAndWaiver ? {
+        ...waiverForm,
+        customer_id: _client.id,
+        is_franchisor: (_b2 = (_a2 = state.pet.formData) == null ? void 0 : _a2[0]) == null ? void 0 : _b2.is_franchisor
+      } : { ...((_c2 = state.pet.formData) == null ? void 0 : _c2[0]) || {} }
     };
     _data.customerId = _client.id;
     state.action({
@@ -278,7 +282,7 @@ var VerticalClient = (0, import_react.forwardRef)((props, ref) => {
         } else {
           const val = await getClients(
             {
-              with: ["formRecord"],
+              with: ["formRecord", "contactsInfo"],
               relation_form_id: boardConfig == null ? void 0 : boardConfig.form_id,
               skip: 1,
               num: 20,
@@ -448,21 +452,34 @@ var VerticalClient = (0, import_react.forwardRef)((props, ref) => {
           size: 64,
           icon: /* @__PURE__ */ import_react.default.createElement(import_User01.default, { className: "pisell-lowcode__booking-client-list-item-avatar-icon" })
         }
-      ), isWalkIn ? /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-client-info-desc" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-client-title" }, import_utils.locales.getText("pisell2.text.add-client")), /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-client-desc-item" }, import_utils.locales.getText("pisell2.text.leave-empty-for-walk-in"))) : /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-client-title" }, getNickname(state.client.value)), ((_A = state.client.value) == null ? void 0 : _A.email) ? /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-client-desc-item" }, (_B = state.client.value) == null ? void 0 : _B.email) : null, ((_C = state.client.value) == null ? void 0 : _C.phone) ? /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-client-desc-item" }, (_D = state.client.value) == null ? void 0 : _D.phone) : null, !!((_F = (_E = state.client.value) == null ? void 0 : _E.waiver_form) == null ? void 0 : _F.length) && /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-client-waiver", title: (0, import_utils5.getWaiverTitle)((_G = state.client.value) == null ? void 0 : _G.waiver_form) }, (_J = (_I = (_H = state.client.value) == null ? void 0 : _H.waiver_form) == null ? void 0 : _I.map) == null ? void 0 : _J.call(_I, (item) => {
-        return /* @__PURE__ */ import_react.default.createElement("span", null, item.form_title, /* @__PURE__ */ import_react.default.createElement("span", { className: "pisell-lowcode__booking-client-waiver-colon" }, ":"), item.is_filled ? /* @__PURE__ */ import_react.default.createElement(
-          "span",
-          {
-            className: "pisell-lowcode__booking-client-waiver-filled"
-          },
-          import_utils.locales.getText("pisell2.text.filled")
-        ) : /* @__PURE__ */ import_react.default.createElement(
-          "span",
-          {
-            className: "pisell-lowcode__booking-client-waiver-not-filled"
-          },
-          import_utils.locales.getText("pisell2.text.not-filled")
-        ), ` ; `);
-      }))), !isWalkIn && /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-client-action-wrap" }, !state.disabledEdit && /* @__PURE__ */ import_react.default.createElement(
+      ), isWalkIn ? /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-client-info-desc" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-client-title" }, import_utils.locales.getText("pisell2.text.add-client")), /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-client-desc-item" }, import_utils.locales.getText("pisell2.text.leave-empty-for-walk-in"))) : /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-client-title" }, getNickname(state.client.value)), ((_A = state.client.value) == null ? void 0 : _A.email) ? /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-client-desc-item" }, (_B = state.client.value) == null ? void 0 : _B.email) : null, ((_C = state.client.value) == null ? void 0 : _C.phone) ? /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-client-desc-item" }, (_D = state.client.value) == null ? void 0 : _D.phone) : null, !!((_F = (_E = state.client.value) == null ? void 0 : _E.waiver_form) == null ? void 0 : _F.length) && /* @__PURE__ */ import_react.default.createElement(
+        "div",
+        {
+          className: "pisell-lowcode__booking-client-waiver",
+          title: (0, import_utils5.getWaiverTitle)((_G = state.client.value) == null ? void 0 : _G.waiver_form)
+        },
+        (_J = (_I = (_H = state.client.value) == null ? void 0 : _H.waiver_form) == null ? void 0 : _I.map) == null ? void 0 : _J.call(_I, (item) => {
+          return /* @__PURE__ */ import_react.default.createElement("span", null, item.form_title, /* @__PURE__ */ import_react.default.createElement(
+            "span",
+            {
+              className: "pisell-lowcode__booking-client-waiver-colon"
+            },
+            ":"
+          ), item.is_filled ? /* @__PURE__ */ import_react.default.createElement(
+            "span",
+            {
+              className: "pisell-lowcode__booking-client-waiver-filled"
+            },
+            import_utils.locales.getText("pisell2.text.filled")
+          ) : /* @__PURE__ */ import_react.default.createElement(
+            "span",
+            {
+              className: "pisell-lowcode__booking-client-waiver-not-filled"
+            },
+            import_utils.locales.getText("pisell2.text.not-filled")
+          ), ` ; `);
+        })
+      )), !isWalkIn && /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-client-action-wrap" }, !state.disabledEdit && /* @__PURE__ */ import_react.default.createElement(
         import_antd.Dropdown.Button,
         {
           menu: {

package/lib/components/booking/info/main.js

@@ -55,6 +55,7 @@ var import_index = require("./index.less");
 var import_notes = __toESM(require("./notes"));
 var import_service2 = require("./service2");
 var import_utils3 = require("./service2/utils");
+var import_contactInfoMode = __toESM(require("../info2/service/contactInfoMode"));
 var defaultModules = {
   client: 1,
   date: 1,
@@ -65,7 +66,7 @@ var defaultModules = {
 };
 import_utils.locales.init(import_locales.default, (0, import_locales2.getLocale)());
 var Info = (0, import_model.Provider)((props) => {
-  var _a, _b, _c, _d, _e, _f, _g, _h, _i;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n;
   const { style, globalState, modules = defaultModules, slot } = props;
   const modal = (0, import_react.useContext)(import_model.Context);
   const context = (0, import_useEngineContext.default)();
@@ -91,7 +92,7 @@ var Info = (0, import_model.Provider)((props) => {
     }
   }, []);
   (0, import_react.useEffect)(() => {
-    var _a2, _b2, _c2, _d2, _e2, _f2, _g2, _h2, _i2, _j, _k, _l, _m;
+    var _a2, _b2, _c2, _d2, _e2, _f2, _g2, _h2, _i2, _j2, _k2, _l2, _m2;
     const isFranchisee = (_d2 = (_c2 = (_b2 = (_a2 = context == null ? void 0 : context.appHelper) == null ? void 0 : _a2.utils) == null ? void 0 : _b2.businessUtils) == null ? void 0 : _c2.getAppByModal) == null ? void 0 : _d2.call(_c2, "franchisee");
     modal.dispatch({
       type: "setState",
@@ -100,7 +101,7 @@ var Info = (0, import_model.Provider)((props) => {
         ...globalState,
         isTerminal: (_g2 = (_f2 = (_e2 = context == null ? void 0 : context.appHelper) == null ? void 0 : _e2.utils) == null ? void 0 : _f2.isTerminal) == null ? void 0 : _g2.call(_f2),
         isFranchisee,
-        timezone: (_m = (_l = (_k = (_j = (_i2 = (_h2 = context == null ? void 0 : context.appHelper) == null ? void 0 : _h2.utils) == null ? void 0 : _i2.store) == null ? void 0 : _j.getState()) == null ? void 0 : _k.global) == null ? void 0 : _l.globalConfig) == null ? void 0 : _m.timezone,
+        timezone: (_m2 = (_l2 = (_k2 = (_j2 = (_i2 = (_h2 = context == null ? void 0 : context.appHelper) == null ? void 0 : _h2.utils) == null ? void 0 : _i2.store) == null ? void 0 : _j2.getState()) == null ? void 0 : _k2.global) == null ? void 0 : _l2.globalConfig) == null ? void 0 : _m2.timezone,
         isDayBooking: (globalState == null ? void 0 : globalState.renderType) === "dayBooking"
       }
     });
@@ -164,7 +165,7 @@ var Info = (0, import_model.Provider)((props) => {
         ["create-booking-page-info-wrap-create"]: isBookingCreatePageCreateMode && !(0, import_utils3.isTerminalDayBooking)(modal.state)
       })
     },
-    /* @__PURE__ */ import_react.default.createElement("div", { className: "booking-info" }, createHeader, modules.client ? /* @__PURE__ */ import_react.default.createElement(import_client.default, null) : null, modules.holder && !((_i = modal.state) == null ? void 0 : _i.disabledEdit) ? /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, params.type === "form" ? /* @__PURE__ */ import_react.default.createElement(import_pet.default, null) : null) : null, modules.date ? /* @__PURE__ */ import_react.default.createElement(import_date.default, null) : null, /* @__PURE__ */ import_react.default.createElement(
+    /* @__PURE__ */ import_react.default.createElement("div", { className: "booking-info" }, createHeader, modules.client ? /* @__PURE__ */ import_react.default.createElement(import_client.default, null) : null, ((_m = (_l = (_k = (_j = (_i = modal == null ? void 0 : modal.state) == null ? void 0 : _i.bookingConfig) == null ? void 0 : _j.config) == null ? void 0 : _k.cart_settings_tab) == null ? void 0 : _l.display_contact_info) == null ? void 0 : _m.show_contact_info) === true ? /* @__PURE__ */ import_react.default.createElement(import_contactInfoMode.default, null) : null, modules.holder && !((_n = modal.state) == null ? void 0 : _n.disabledEdit) ? /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, params.type === "form" ? /* @__PURE__ */ import_react.default.createElement(import_pet.default, null) : null) : null, modules.date ? /* @__PURE__ */ import_react.default.createElement(import_date.default, null) : null, /* @__PURE__ */ import_react.default.createElement(
       import_antd.Skeleton,
       {
         loading: globalState.loading,

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

@@ -38,6 +38,11 @@ var { Provider, Context } = (0, import_utils.miniRedux)({
     setClient(state, payload) {
       state.setGlobalState({ client: { ...state.client, ...payload } });
     },
+    setContactsInfo(state, payload) {
+      state.setGlobalState({
+        contacts_info: { ...state.contacts_info, ...payload }
+      });
+    },
     setService(state, payload) {
       let obj = {};
       if (payload.value) {