@pisell/private-materials 6.0.25 → 6.1.1

package/lib/components/booking/forms/single/index.js

@@ -41,6 +41,8 @@ var import_collapsibleList = __toESM(require("../../components/collapsibleList")
 var import_index = require("./index.less");
 var import_RenderValueById = __toESM(require("./RenderValueById"));
 var import_useComponents = __toESM(require("../../../../hooks/useComponents"));
+var import_dayjs = __toESM(require("dayjs"));
+var import_date = require("../../../../utils/date");
 var queryValueById = ["checkbox", "radioButton", "select", "form_to_form"];
 var Single = ({
   value,
@@ -138,11 +140,43 @@ var Single = ({
     },
     [form]
   );
+  console.log("fff", form);
+  const ignoreValidity = (0, import_react.useMemo)(() => {
+    var _a2, _b2;
+    return !((_b2 = (_a2 = form == null ? void 0 : form.form) == null ? void 0 : _a2.setting) == null ? void 0 : _b2.validity) || form.form.setting.validity.type === "no_expiry";
+  }, [form == null ? void 0 : form.form]);
+  const getExpireStatus = (expiredAt) => {
+    if (ignoreValidity || !expiredAt) return null;
+    const now = (0, import_dayjs.default)();
+    const expireDate = (0, import_dayjs.default)(expiredAt).endOf("day");
+    const diffDays = expireDate.diff(now, "day");
+    let cnDate = "YYYY-MM-DD";
+    let enDate = "DD/MM/YYYY";
+    const formattedDate = (0, import_date.formatDate)(expireDate, cnDate, enDate);
+    if (now.isAfter(expireDate)) {
+      return /* @__PURE__ */ import_react.default.createElement("div", { style: { color: "#999999", fontSize: "14px", lineHeight: "20px" } }, /* @__PURE__ */ import_react.default.createElement(import_antd.Tag, { color: "red", style: { borderRadius: 16, marginRight: 8 } }, import_utils.locales.getText("pisell2.text.status.expired")), import_utils.locales.getText("pisell2.text.validity.expired")(formattedDate));
+    }
+    if (diffDays < 7) {
+      return /* @__PURE__ */ import_react.default.createElement("div", { style: { color: "#FFA940", fontSize: "14px", lineHeight: "20px" } }, import_utils.locales.getText("pisell2.text.validity.expiring_soon")(
+        formattedDate
+      ));
+    }
+    return /* @__PURE__ */ import_react.default.createElement("div", { style: { color: "#999999", fontSize: "14px", lineHeight: "20px" } }, import_utils.locales.getText("pisell2.text.validity.valid_through")(formattedDate));
+  };
   const _optionRender = (item) => {
     if (optionRender) {
       return optionRender(item);
     }
-    return /* @__PURE__ */ import_react.default.createElement("div", { style: { flex: 1 } }, item["main_field"] || item[form.option_key] || "-");
+    return /* @__PURE__ */ import_react.default.createElement(
+      "div",
+      {
+        style: {
+          flex: 1
+        }
+      },
+      /* @__PURE__ */ import_react.default.createElement("div", { style: { color: "#1B1B1B", fontSize: 16, fontWeight: 600, lineHeight: "22px" } }, item["main_field"] || item[form.option_key] || "-"),
+      /* @__PURE__ */ import_react.default.createElement("div", null, getExpireStatus(item.expired_at))
+    );
   };
   const _addButtonProps = (0, import_react.useMemo)(() => {
     var _a2, _b2;

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

@@ -36,6 +36,9 @@ var import_react = __toESM(require("react"));
 var import_utils = require("@pisell/utils");
 var useCreateBookingPageHeader = (state) => {
   const createHeader = (0, import_react.useMemo)(() => {
+    if (state.hideCreateText) {
+      return null;
+    }
     return state.isBookingCreatePage && !state.bookingId && /* @__PURE__ */ import_react.default.createElement("div", { className: "booking-info-create-new" }, import_utils.locales.getText("pisell2.booking.info.text.create-new"));
   }, [state.isBookingCreatePage, state.bookingId]);
   const isBookingCreatePage = (0, import_react.useMemo)(() => {

package/lib/components/booking/hooks/useIsBooking4Shop.d.ts

@@ -0,0 +1 @@
+export declare const useIsBooking4Shop: (state: any) => boolean;

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

@@ -0,0 +1,51 @@
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/components/booking/hooks/useIsBooking4Shop.tsx
+var useIsBooking4Shop_exports = {};
+__export(useIsBooking4Shop_exports, {
+  useIsBooking4Shop: () => useIsBooking4Shop
+});
+module.exports = __toCommonJS(useIsBooking4Shop_exports);
+var import_react = require("react");
+var import_useEngineContext = __toESM(require("../../../hooks/useEngineContext"));
+var import_utils = require("../info/utils");
+var useIsBooking4Shop = (state) => {
+  const context = (0, import_useEngineContext.default)();
+  return (0, import_react.useMemo)(() => {
+    var _a, _b, _c, _d, _e, _f, _g, _h;
+    return (0, import_utils.isBooking4Shop)(
+      ((_c = (_b = (_a = context.appHelper) == null ? void 0 : _a.utils) == null ? void 0 : _b.getData) == null ? void 0 : _c.call(_b, "shop_id")) || ((_h = (_g = (_f = (_e = (_d = context.appHelper.utils.store) == null ? void 0 : _d.getState) == null ? void 0 : _e.call(_d)) == null ? void 0 : _f.global) == null ? void 0 : _g.globalConfig) == null ? void 0 : _h.id),
+      state.renderType
+    );
+  }, [state.renderType]);
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  useIsBooking4Shop
+});

package/lib/components/booking/hooks/useQuotation.d.ts

@@ -0,0 +1,5 @@
+export declare const calculateTotalPrice: (data: any) => number;
+declare const useQuotation: (state: any, dispatch: any) => {
+    dom: JSX.Element;
+};
+export default useQuotation;

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

@@ -0,0 +1,214 @@
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/components/booking/hooks/useQuotation.tsx
+var useQuotation_exports = {};
+__export(useQuotation_exports, {
+  calculateTotalPrice: () => calculateTotalPrice,
+  default: () => useQuotation_default
+});
+module.exports = __toCommonJS(useQuotation_exports);
+var import_react = __toESM(require("react"));
+var import_utils = require("../utils");
+var import_useEngineContext = __toESM(require("../../../../es/hooks/useEngineContext"));
+var import_utils2 = require("@pisell/utils");
+var import_materials = require("@pisell/materials");
+var import_serve = require("../info/service/serve");
+var import_decimal = __toESM(require("decimal.js"));
+var formatBundleItemMap = (product) => {
+  return product.bundle_group.reduce((pre, cur) => {
+    const curObj = {};
+    cur.bundle_item.forEach((item) => {
+      curObj[item.id] = item;
+    });
+    return {
+      ...pre,
+      ...curObj
+    };
+  }, {});
+};
+var calculateTotalPrice = (data) => {
+  const _price = data.reduce((total, item) => {
+    const _price2 = (item == null ? void 0 : item.price) || (item == null ? void 0 : item.add_price);
+    return total + _price2 * item.num;
+  }, 0);
+  return parseFloat(_price);
+};
+var setNewCartValue = (cartValue, newProducts) => {
+  if (!newProducts.length) {
+    return {
+      isChange: false,
+      value: cartValue
+    };
+  }
+  let isChange = false;
+  let isBundleChange = false;
+  let isNotFoundBundle = false;
+  const notFoundProducts = [];
+  const value = cartValue.map((item) => {
+    var _a, _b, _c, _d;
+    const newProduct = newProducts.find((newItem2) => newItem2.id === item.product_id);
+    if (!newProduct) {
+      return item;
+    }
+    let isChangePrice = newProduct.price != item.price;
+    const bundleItemMap = formatBundleItemMap(newProduct);
+    const newBundle = (((_b = (_a = item._extend) == null ? void 0 : _a.other) == null ? void 0 : _b.bundle) || []).map((bundle) => {
+      if (!bundleItemMap[bundle.id]) {
+        isNotFoundBundle = true;
+        if (!notFoundProducts.some((p) => p._id === bundle._id)) {
+          notFoundProducts.push(item);
+        }
+        return bundle;
+      }
+      if (bundle.price != bundleItemMap[bundle.id].price) {
+        isChangePrice = true;
+        isBundleChange = true;
+      }
+      if (bundleItemMap[bundle.id].price_type === "markdown") {
+        bundleItemMap[bundle.id].price = new import_decimal.default(bundleItemMap[bundle.id].price || 0).mul(-1).toNumber();
+      }
+      const selectBundleInfo = item._extend.other.bundle.find((item2) => item2.id === bundle.id);
+      const optionPrice = calculateTotalPrice((selectBundleInfo == null ? void 0 : selectBundleInfo.option) || []);
+      return {
+        ...bundle,
+        base_price: bundleItemMap[bundle.id].base_price,
+        price: new import_decimal.default(bundleItemMap[bundle.id].price || 0).add(optionPrice).toNumber()
+        // product_price: bundleItemMap[item.id].product_price,
+      };
+    });
+    if (!isChangePrice) {
+      return item;
+    } else {
+      isChange = true;
+    }
+    const newItem = {
+      ...item,
+      original_price: newProduct.original_price,
+      price: newProduct.price,
+      base_price: newProduct.base_price,
+      _extend: {
+        ...item._extend,
+        price: newProduct.price,
+        // total: newProduct.total,
+        bundle_edit: isBundleChange ? 1 : item._extend.bundle_edit,
+        other: {
+          ...item._extend.other,
+          option: (_d = (_c = item._extend) == null ? void 0 : _c.other) == null ? void 0 : _d.option,
+          bundle: newBundle
+        }
+      }
+    };
+    const total = (0, import_utils.getProductTotalPrice)(newItem);
+    newItem._extend.total = total;
+    newItem._extend.origin_total = total;
+    return newItem;
+  });
+  return {
+    isChange,
+    value,
+    isNotFoundBundle,
+    notFoundProducts
+  };
+};
+var useQuotation = (state, dispatch) => {
+  var _a, _b;
+  const context = (0, import_useEngineContext.default)();
+  const [open, setOpen] = (0, import_react.useState)(false);
+  const [products, setProducts] = (0, import_react.useState)([]);
+  const cartValueRef = (0, import_react.useRef)(state.service.value || []);
+  cartValueRef.current = state.service.value;
+  const getCartQuotation = async (params) => {
+    if (!cartValueRef.current.length) return;
+    const data = await (0, import_serve.getProductPrice)({
+      ids: cartValueRef.current.map((item) => item.product_id),
+      schedule_date: params == null ? void 0 : params.schedule_date,
+      customer_id: params == null ? void 0 : params.customer_id
+    });
+    return data;
+  };
+  const currentDate = (0, import_react.useMemo)(() => {
+    return state.date.value.format("YYYY-MM-DD");
+  }, [state.date.value]);
+  const updateCartQuotation = async (params) => {
+    const data = await getCartQuotation(params);
+    if (!(data == null ? void 0 : data.data)) return;
+    const { isChange, value: newCartValue, isNotFoundBundle, notFoundProducts } = setNewCartValue(cartValueRef.current, data.data);
+    if (isNotFoundBundle) {
+      setProducts(notFoundProducts);
+      setOpen(true);
+      return;
+    }
+    if (!isChange) return;
+    dispatch({
+      type: "setService",
+      payload: {
+        value: newCartValue,
+        edit: true
+      }
+    });
+  };
+  const isEditClientOrDate = (0, import_react.useMemo)(() => {
+    var _a2, _b2;
+    return ((_a2 = state == null ? void 0 : state.client) == null ? void 0 : _a2.edit) || ((_b2 = state == null ? void 0 : state.date) == null ? void 0 : _b2.edit);
+  }, [state]);
+  (0, import_react.useEffect)(() => {
+    var _a2, _b2, _c, _d, _e, _f, _g, _h, _i, _j;
+    const isQuotation = (_d = (_c = (_b2 = (_a2 = context == null ? void 0 : context.appHelper) == null ? void 0 : _a2.utils) == null ? void 0 : _b2.businessUtils) == null ? void 0 : _c.getAppByModal) == null ? void 0 : _d.call(_c, "quotation");
+    const isHolidayQuotation = (_h = (_g = (_f = (_e = context == null ? void 0 : context.appHelper) == null ? void 0 : _e.utils) == null ? void 0 : _f.businessUtils) == null ? void 0 : _g.getAppByModal) == null ? void 0 : _h.call(_g, "holidayquotation");
+    if (!isQuotation && !isHolidayQuotation || !isEditClientOrDate) return;
+    updateCartQuotation({
+      customer_id: (_j = (_i = state.client) == null ? void 0 : _i.value) == null ? void 0 : _j.id,
+      schedule_date: currentDate
+    });
+  }, [(_b = (_a = state.client) == null ? void 0 : _a.value) == null ? void 0 : _b.id, currentDate, isEditClientOrDate]);
+  const dom = (0, import_react.useMemo)(() => {
+    return /* @__PURE__ */ import_react.default.createElement(
+      import_materials.PisellModal.Information,
+      {
+        open,
+        platform: "pc",
+        title: import_utils2.locales.getText("pisell2.text.quotation.product.change.title"),
+        describe: /* @__PURE__ */ import_react.default.createElement("div", null, import_utils2.locales.getText("pisell2.text.quotation.product.change.describe"), products.map((item) => /* @__PURE__ */ import_react.default.createElement("div", null, item == null ? void 0 : item.product_title))),
+        okText: import_utils2.locales.getText("pisell2.text.ok"),
+        closable: true,
+        cancelVisible: false,
+        onOk: () => setOpen(false),
+        onCancel: () => setOpen(false)
+      }
+    );
+  }, [open, products]);
+  return {
+    dom
+  };
+};
+var useQuotation_default = useQuotation;
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  calculateTotalPrice
+});

package/lib/components/booking/info/addServiceVariant/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 interface AddServiceVariantProps {
     globalState: any;
     setGlobalState: any;

package/lib/components/booking/info/addServiceVariant/index.js

@@ -38,7 +38,7 @@ var import_addService2 = __toESM(require("../../info2/service/addService"));
 var import_utils = require("../utils");
 var import_useEngineContext = __toESM(require("../../../../hooks/useEngineContext"));
 var AddServiceVariant = (props) => {
-  var _a, _b, _c, _d, _e, _f;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _i;
   const { globalState, setGlobalState } = props;
   const context = (0, import_useEngineContext.default)();
   const stateRef = (0, import_react.useRef)(globalState);
@@ -57,8 +57,8 @@ var AddServiceVariant = (props) => {
   };
   let Cpt = import_addService.default;
   if ((0, import_utils.isBooking4Shop)(
-    (_e = (_d = (_c = (_b = (_a = context.appHelper.utils.store) == null ? void 0 : _a.getState) == null ? void 0 : _b.call(_a)) == null ? void 0 : _c.global) == null ? void 0 : _d.globalConfig) == null ? void 0 : _e.id,
-    (_f = props == null ? void 0 : props.globalState) == null ? void 0 : _f.renderType
+    ((_c = (_b = (_a = context.appHelper) == null ? void 0 : _a.utils) == null ? void 0 : _b.getData) == null ? void 0 : _c.call(_b, "shop_id")) || ((_h = (_g = (_f = (_e = (_d = context.appHelper.utils.store) == null ? void 0 : _d.getState) == null ? void 0 : _e.call(_d)) == null ? void 0 : _f.global) == null ? void 0 : _g.globalConfig) == null ? void 0 : _h.id),
+    (_i = props == null ? void 0 : props.globalState) == null ? void 0 : _i.renderType
   )) {
     Cpt = import_addService2.default;
   }

package/lib/components/booking/info/client/index.js

@@ -44,14 +44,17 @@ var import_utils = require("@pisell/utils");
 var import_utils2 = require("../../utils");
 var import_serve = require("./serve");
 var import_ahooks = require("ahooks");
+var import_utils3 = require("../clientVariant/utils");
+var import_useGetHolderList = __toESM(require("../hooks/useGetHolderList"));
 var isLoadClient = false;
 var Client = () => {
-  var _a, _b, _c, _d, _e, _f;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l;
   const modalRef = (0, import_react.useRef)();
   const [loadLoading, setLoadLoading] = (0, import_react.useState)(false);
   const [loading, setLoading] = (0, import_react.useState)(false);
   const { state, dispatch } = (0, import_react.useContext)(import_model.Context);
   const [franchiseeLoading, setFranchiseeLoading] = (0, import_react.useState)(0);
+  const getHolders = (0, import_useGetHolderList.default)(state, dispatch);
   const [params, setParams] = (0, import_react.useState)({
     skip: 1,
     num: 10,
@@ -201,11 +204,13 @@ var Client = () => {
         if (data) {
           handleSelectClient([data]);
         }
+        getHolders();
         getClients({
           ...state.client.clientsParams,
           search: "",
           customer_id: data == null ? void 0 : data.id,
-          skip: 1
+          skip: 1,
+          sort_by: "id"
         });
       }
     });
@@ -218,13 +223,23 @@ var Client = () => {
         showAcceptsMarketing: false
       },
       callback: (customer_id, params2) => {
-        var _a2, _b2, _c2;
+        var _a2, _b2, _c2, _d2, _e2, _f2, _g2;
+        const waiverForm = ((_d2 = (_c2 = (_b2 = (_a2 = state.client) == null ? void 0 : _a2.clients) == null ? void 0 : _b2[0].waiver_form) == null ? void 0 : _c2.map) == null ? void 0 : _d2.call(_c2, (item) => ({
+          ...item,
+          is_filled: 0
+        }))) || [];
         dispatch({
           type: "setClient",
           payload: {
             clients: [
-              ...((_a2 = params2 == null ? void 0 : params2[0]) == null ? void 0 : _a2.customer) ? [{ ...(_b2 = params2 == null ? void 0 : params2[0]) == null ? void 0 : _b2.customer, id: customer_id }] : [],
-              ...((_c2 = state.client) == null ? void 0 : _c2.clients) || []
+              ...((_e2 = params2 == null ? void 0 : params2[0]) == null ? void 0 : _e2.customer) ? [
+                {
+                  ...(_f2 = params2 == null ? void 0 : params2[0]) == null ? void 0 : _f2.customer,
+                  id: customer_id,
+                  waiver_form: waiverForm
+                }
+              ] : [],
+              ...((_g2 = state.client) == null ? void 0 : _g2.clients) || []
             ]
           }
         });
@@ -304,7 +319,8 @@ var Client = () => {
         isPreview: false,
         drawerProps: {
           title: import_utils.locales.getText("pisell2.text.select-customer"),
-          destroyOnClose: true
+          destroyOnClose: true,
+          mask: state.drawerMask
         },
         mode: "single",
         createItemText: import_utils.locales.getText("pisell2.text.create-new-customer"),
@@ -318,7 +334,28 @@ 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-loading" }, /* @__PURE__ */ import_react.default.createElement(import_antd.Spin, { spinning: franchiseeLoading === item.id })));
+          ), /* @__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) => {
+              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 })));
         },
         searchChange,
         searchValue: params.search,
@@ -349,7 +386,34 @@ var Client = () => {
         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-info" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-client-info-left" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-client-info-name" }, getNickname(state.client.value)), isWalkIn ? /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-client-info-desc" }, import_utils.locales.getText("pisell2.text.leave-empty-for-walk-in")) : /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, ((_c = state.client.value) == null ? void 0 : _c.email) ? /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-client-info-email" }, (_d = state.client.value) == null ? void 0 : _d.email) : null, ((_e = state.client.value) == null ? void 0 : _e.phone) ? /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-client-info-phone" }, (_f = state.client.value) == null ? void 0 : _f.phone) : null)), !(state == null ? void 0 : state.disableEventBookingEdit) && /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-client-info-right" }, isWalkIn ? /* @__PURE__ */ import_react.default.createElement(import_PlusCircle.default, { className: "pisell-lowcode__booking-client-add-icon" }) : /* @__PURE__ */ import_react.default.createElement(
+    /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-client-info" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-client-info-left" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-client-info-name" }, getNickname(state.client.value)), isWalkIn ? /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-client-info-desc" }, import_utils.locales.getText("pisell2.text.leave-empty-for-walk-in")) : /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, ((_c = state.client.value) == null ? void 0 : _c.email) ? /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-client-info-email" }, (_d = state.client.value) == null ? void 0 : _d.email) : null, ((_e = state.client.value) == null ? void 0 : _e.phone) ? /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-client-info-phone" }, (_f = state.client.value) == null ? void 0 : _f.phone) : null, !!((_h = (_g = state.client.value) == null ? void 0 : _g.waiver_form) == null ? void 0 : _h.length) && /* @__PURE__ */ import_react.default.createElement(
+      "div",
+      {
+        className: "pisell-lowcode__booking-client-waiver",
+        title: (0, import_utils3.getWaiverTitle)((_i = state.client.value) == null ? void 0 : _i.waiver_form)
+      },
+      (_l = (_k = (_j = state.client.value) == null ? void 0 : _j.waiver_form) == null ? void 0 : _k.map) == null ? void 0 : _l.call(_k, (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")
+        ), `; `);
+      })
+    ))), !(state == null ? void 0 : state.disableEventBookingEdit) && /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-client-info-right" }, isWalkIn ? /* @__PURE__ */ import_react.default.createElement(import_PlusCircle.default, { className: "pisell-lowcode__booking-client-add-icon" }) : /* @__PURE__ */ import_react.default.createElement(
       import_antd.Dropdown,
       {
         menu: {

package/lib/components/booking/info/client/index.less

@@ -60,6 +60,26 @@
         line-height: 20px;
         margin-top: 4px;
       }
+      .pisell-lowcode__booking-client-waiver {
+        color: var(--Gray-400, #98A2B3);
+        font-size: 14px;
+        font-style: normal;
+        font-weight: 400;
+        line-height: 20px; /* 142.857% */
+        text-align: left;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+        .pisell-lowcode__booking-client-waiver-colon {
+          margin: 0 2px;
+        }
+        .pisell-lowcode__booking-client-waiver-filled {
+          color: var(--Success-600, #079455);
+        }
+        .pisell-lowcode__booking-client-waiver-not-filled {
+          color: var(--Error-600, #D92D20);
+        }
+      }
     }
 
     .pisell-lowcode__booking-client-info-right {
@@ -106,6 +126,7 @@
   align-items: center;
   justify-content: center;
   background: var(--gray-100, #F2F4F7);
+  flex-shrink: 0;
 
   .pisell-lowcode__booking-client-list-item-avatar-icon {
     font-size: 24px;
@@ -118,6 +139,7 @@
   flex: 1;
   flex-direction: column;
   justify-content: center;
+  overflow: hidden;
 
   .pisell-lowcode__booking-client-list-item-info-name {
     color: var(--text-text-1, #1B1B1B);
@@ -142,4 +164,21 @@
     line-height: 20px;
     /* 142.857% */
   }
+  .pisell-lowcode__booking-client-list-item-info-waiver {
+    color: var(--Gray-400, #98A2B3);
+    font-size: 14px;
+    font-style: normal;
+    font-weight: 400;
+    line-height: 20px; /* 142.857% */
+    text-overflow: ellipsis;
+    overflow: hidden;
+    height: 20px;
+    white-space: nowrap;
+    .pisell-lowcode__booking-client-list-item-waiver-filled {
+      color: var(--Success-600, #079455);
+    }
+    .pisell-lowcode__booking-client-list-item-waiver-not-filled {
+      color: var(--Error-600, #D92D20);
+    }
+  }
 }

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { FormState } from '../../../model';
 interface useClientFnParams {
     state: any;

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

@@ -127,7 +127,14 @@ var useClientFn = (_params) => {
     if (resetParams.skip === 1) {
       totalList = list;
     } else {
-      totalList = totalList.concat(list);
+      list.forEach((item) => {
+        const index = totalList.findIndex((old) => old.id === item.id);
+        if (index > -1) {
+          totalList[index] = item;
+        } else {
+          totalList.push(item);
+        }
+      });
     }
     _payload.clients = totalList;
     setParams({

package/lib/components/booking/info/clientVariant/utils.d.ts

@@ -0,0 +1 @@
+export declare const getWaiverTitle: (waiverForm: any[]) => string;

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

@@ -0,0 +1,34 @@
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/components/booking/info/clientVariant/utils.ts
+var utils_exports = {};
+__export(utils_exports, {
+  getWaiverTitle: () => getWaiverTitle
+});
+module.exports = __toCommonJS(utils_exports);
+var import_utils = require("@pisell/utils");
+var getWaiverTitle = (waiverForm) => {
+  return (waiverForm || []).map((item) => {
+    return `${item.form_title || ""}:${item.is_filled ? import_utils.locales.getText("pisell2.text.filled") : import_utils.locales.getText("pisell2.text.not-filled")}`;
+  }).join(";");
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  getWaiverTitle
+});