@pisell/private-materials 3.3.16 → 3.3.17

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

@@ -25,7 +25,7 @@ import classNames from 'classnames';
 import React, { useEffect, useMemo, useRef, useState } from 'react';
 import useEngineContext from "../../../../hooks/useEngineContext";
 import { formatProducts } from "../../addons";
-import { isDayBooking, isHasDayAppointmentProduct } from "../../info/service2/utils";
+import { getIsSubjectRequire, isDayBooking, isHasDayAppointmentProduct } from "../../info/service2/utils";
 import { isBooking4Shop } from "../../info/utils";
 import { createBookings, editBookings } from "../../info2/serve";
 import AppointmentProductModal from "./AppointmentProductModal";
@@ -33,7 +33,7 @@ import FooterMenus from "./FooterMenus";
 import { getSumTotal, is_price_include_tax } from "./amount";
 import "./index.less";
 import { createEventBooking, editEventBooking } from "./serve";
-import { formatValues } from "./utils";
+import { checkHolderIsError, formatValues } from "./utils";
 import VoucherCard from "../voucher";
 import { SubTotal } from "../../../../index";
 /**
@@ -430,6 +430,12 @@ var Footer = function Footer(props) {
             }
             return _context4.abrupt("return");
           case 5:
+            if (!(getIsSubjectRequire(state) && checkHolderIsError(state))) {
+              _context4.next = 7;
+              break;
+            }
+            return _context4.abrupt("return");
+          case 7:
             // 区分loading, 是点击的checkout 还是save
             _setLoading = type === 'checkout' ? setCheckoutLoading : setLoading;
             _setLoading(true);
@@ -438,22 +444,22 @@ var Footer = function Footer(props) {
             createApi = state.renderType === 'eventBooking' ? createEventBooking : createBooking;
             saveOtherValue = {};
             if (!(type === 'save')) {
-              _context4.next = 18;
+              _context4.next = 20;
               break;
             }
-            _context4.next = 14;
+            _context4.next = 16;
             return state === null || state === void 0 || (_state$onSave = state.onSave) === null || _state$onSave === void 0 ? void 0 : _state$onSave.call(state, state.client);
-          case 14:
+          case 16:
             _context4.t0 = _context4.sent;
             if (_context4.t0) {
-              _context4.next = 17;
+              _context4.next = 19;
               break;
             }
             _context4.t0 = {};
-          case 17:
+          case 19:
             saveOtherValue = _context4.t0;
-          case 18:
-            _context4.prev = 18;
+          case 20:
+            _context4.prev = 20;
             callbackData = null; // 格式化提交的参数
             values = formatValues(_objectSpread(_objectSpread({}, state), saveOtherValue)); // 区分是新增还是编辑
             api = state.bookingId ? editApi : createApi; // 活动预约新建时校验重复 -- 暂不处理
@@ -485,44 +491,43 @@ var Footer = function Footer(props) {
             // }
             // 如果有addons改动, 则先保存
             if (!addonsEdit) {
-              _context4.next = 25;
+              _context4.next = 27;
               break;
             }
-            _context4.next = 25;
+            _context4.next = 27;
             return handleSaveAddons();
-          case 25:
+          case 27:
             if (!infoEdit) {
-              _context4.next = 30;
+              _context4.next = 32;
               break;
             }
-            _context4.next = 28;
+            _context4.next = 30;
             return api(values, state.bookingId);
-          case 28:
+          case 30:
             callbackData = _context4.sent;
             if (messageShow) {
               message.success(locales.getText(state.bookingId ? 'pisell2.text.appointment-updated' : 'pisell2.text.created-successfully'));
             }
-          case 30:
-            debugger;
+          case 32:
             // 回调关闭弹窗
             state === null || state === void 0 || state.callback(callbackData);
             _setLoading(false);
 
             // return数据  checkout时需要
             return _context4.abrupt("return", callbackData || values);
-          case 36:
-            _context4.prev = 36;
-            _context4.t1 = _context4["catch"](18);
+          case 37:
+            _context4.prev = 37;
+            _context4.t1 = _context4["catch"](20);
             console.log(_context4.t1);
             if ((_context4.t1 === null || _context4.t1 === void 0 ? void 0 : _context4.t1.code) === 70101) {
               message.error(_context4.t1 === null || _context4.t1 === void 0 ? void 0 : _context4.t1.message);
             }
             _setLoading(false);
-          case 41:
+          case 42:
           case "end":
             return _context4.stop();
         }
-      }, _callee4, null, [[18, 36]]);
+      }, _callee4, null, [[20, 37]]);
     }));
     return function handleSave(_x2) {
       return _ref5.apply(this, arguments);

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

@@ -28,3 +28,4 @@ export interface ResourceItem {
  */
 export declare const checkSubResourcesCapacity: (resource: ResourceItem) => void;
 export declare const formatValues: (state: any) => any;
+export declare const checkHolderIsError: (state: any) => any;

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

@@ -11,7 +11,8 @@ import { getSumCapacity } from "../../info2/utilsByBooking";
 import { getDays } from "../../utils";
 import { appointmentTypes } from "../../info/service2/status";
 import { isDaysBooking, formatDayTime, isEventBooking } from "../../info/service2/utils";
-import { sendWarningLog } from '@pisell/utils';
+import { locales, sendWarningLog } from '@pisell/utils';
+import { PisellToast } from "@pisell/materials";
 var formatNote = function formatNote(data) {
   var _data$notes;
   return ((_data$notes = data.notes) === null || _data$notes === void 0 ? void 0 : _data$notes.orderNote) || "";
@@ -468,7 +469,6 @@ var formatBookings = function formatBookings(data, values) {
       "metadata": formatMetaData(item)
     }, eventOtherParams || {}), dayParams);
   });
-  debugger;
   return bookings;
 };
 
@@ -589,4 +589,19 @@ export var formatValues = function formatValues(state) {
     // values.is_bundle_price_calculated = 1
   }
   return values;
+};
+
+// 检测预约主体是否为空
+export var checkHolderIsError = function checkHolderIsError(state) {
+  var _state$client;
+  var holderError = state.service.value.some(function (item) {
+    return !item._extend.holder_id;
+  });
+  var clientId = (_state$client = state.client) === null || _state$client === void 0 || (_state$client = _state$client.value) === null || _state$client === void 0 ? void 0 : _state$client.id;
+  if (holderError && (!clientId || clientId === 0 || clientId === 1)) {
+    PisellToast({
+      content: locales.getText('pisell2.text.please-select-the-customer-first')
+    });
+  }
+  return holderError;
 };

package/es/components/booking/components/voucher/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 declare const VoucherCard: (props: any) => JSX.Element | null;
 export default VoucherCard;

package/es/components/booking/forms/footer.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 interface FooterProps {
     state: any;
     reload: () => void;

package/es/components/booking/forms/forms.d.ts

@@ -13,6 +13,10 @@ export interface InfoProps {
     loading?: boolean;
     addButtonProps?: any;
     drawerProps?: any;
+    isMinorAndWaiver?: boolean;
+    waiverForm?: any;
+    addCallbackService?: () => void;
+    getHolders?: () => void;
 }
 /**
  * @title: 表单模块

package/es/components/booking/forms/forms.js

@@ -44,7 +44,11 @@ var Forms = Provider(function (props) {
     client = props.client,
     loading = props.loading,
     addButtonProps = props.addButtonProps,
-    drawerProps = props.drawerProps;
+    drawerProps = props.drawerProps,
+    isMinorAndWaiver = props.isMinorAndWaiver,
+    waiverForm = props.waiverForm,
+    addCallbackService = props.addCallbackService,
+    getHolders = props.getHolders;
 
   // 新增数据
   var onAction = useMemoizedFn( /*#__PURE__*/function () {
@@ -54,7 +58,9 @@ var Forms = Provider(function (props) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
             _data = {
-              formDataConfig: _objectSpread({}, formDataConfig)
+              formDataConfig: isMinorAndWaiver ? _objectSpread(_objectSpread({}, waiverForm), {}, {
+                customer_id: client === null || client === void 0 ? void 0 : client.id
+              }) : _objectSpread({}, formDataConfig)
             };
             if (formDataConfig.data_range === 'customer' && !isWalkIn(client === null || client === void 0 ? void 0 : client.id)) {
               _data.customerId = client.id;
@@ -63,6 +69,11 @@ var Forms = Provider(function (props) {
               type: 'pisell1.goCustomFormAddData',
               data: _data,
               callback: function callback(res) {
+                if (isMinorAndWaiver) {
+                  addCallbackService === null || addCallbackService === void 0 || addCallbackService();
+                  getHolders === null || getHolders === void 0 || getHolders();
+                  return;
+                }
                 var obj = {};
                 var _iterator = _createForOfIteratorHelper(res),
                   _step;
@@ -198,6 +209,6 @@ var Forms = Provider(function (props) {
         optionRender: optionRender
       })));
     }));
-  }, [forms, hideTitle, modalOpen, value, loading, client === null || client === void 0 ? void 0 : client.id, addButtonProps, customSelectProps, optionRender, drawerProps]);
+  }, [forms, hideTitle, modalOpen, value, loading, client === null || client === void 0 ? void 0 : client.id, addButtonProps, customSelectProps, optionRender, drawerProps, addCallbackService]);
 });
 export default Forms;

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { SendModalValues } from './index';
 declare const useSendModal: (bookingId?: number) => {
     open: boolean;

package/es/components/booking/forms/single/index.d.ts

@@ -1,5 +1,4 @@
-/// <reference types="react" />
-import "./index.less";
+import './index.less';
 /**
  * @title: 表单选择器
  * @description:

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

@@ -11,10 +11,10 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-import React, { useCallback, useMemo } from "react";
-import FileDownload02 from "@pisell/icon/es/FileDownload02";
-import { image, locales } from "@pisell/utils";
-import { Avatar } from "antd";
+import React, { useCallback, useMemo } from 'react';
+import FileDownload02 from '@pisell/icon/es/FileDownload02';
+import { image, locales } from '@pisell/utils';
+import { Avatar, Tag } from 'antd';
 import CustomSelect from "../../components/customSelect";
 import CollapsibleList from "../../components/collapsibleList";
 import "./index.less";
@@ -48,7 +48,7 @@ var Single = function Single(_ref) {
   // }, [field]);
 
   var _useComponents = useComponents({
-      components: ["HumanBodySelector"]
+      components: ['HumanBodySelector']
     }),
     _useComponents2 = _slicedToArray(_useComponents, 1),
     HumanBodySelector = _useComponents2[0];
@@ -66,11 +66,11 @@ var Single = function Single(_ref) {
     var val = fieldData[field.key];
 
     // 附件类型
-    if (field.filed_type === "attachment") {
+    if (field.filed_type === 'attachment') {
       if (Array.isArray(val)) {
         return val.map(function (item) {
           // 图片
-          if (item.type.indexOf("image") !== -1) {
+          if (item.type.indexOf('image') !== -1) {
             return /*#__PURE__*/React.createElement("img", {
               className: "attachment-item",
               src: image.ali(item.url, 200),
@@ -82,7 +82,7 @@ var Single = function Single(_ref) {
             href: item.url,
             key: item.url,
             style: {
-              display: "block",
+              display: 'block',
               marginTop: 8
             },
             onClick: function onClick(e) {
@@ -98,14 +98,14 @@ var Single = function Single(_ref) {
     }
 
     // 头像
-    if (field.filed_type === "customer_cover") {
+    if (field.filed_type === 'customer_cover') {
       return /*#__PURE__*/React.createElement(Avatar, {
         src: val
       });
     }
 
     // 签名
-    if (field.filed_type === "signature") {
+    if (field.filed_type === 'signature') {
       return /*#__PURE__*/React.createElement("img", {
         className: "attachment-item",
         src: image.ali(val, 200),
@@ -114,12 +114,12 @@ var Single = function Single(_ref) {
     }
 
     // 手机号
-    if (field.filed_type === "customer_phone") {
+    if (field.filed_type === 'customer_phone') {
       if (val) {
-        return "".concat(val.country_calling_code && "(+".concat(val.country_calling_code, ")"), " ").concat(val.phone || "");
+        return "".concat(val.country_calling_code && "(+".concat(val.country_calling_code, ")"), " ").concat(val.phone || '');
       }
     }
-    if (field.filed_type === "body_hotspot_image") {
+    if (field.filed_type === 'body_hotspot_image') {
       return HumanBodySelector ? /*#__PURE__*/React.createElement(HumanBodySelector, {
         value: val,
         disable: true
@@ -134,10 +134,10 @@ var Single = function Single(_ref) {
         value: val
       });
     }
-    if ((field === null || field === void 0 ? void 0 : field.filed_type) === "media") {
+    if ((field === null || field === void 0 ? void 0 : field.filed_type) === 'media') {
       return null;
     }
-    return val || "-";
+    return val || '-';
   };
 
   /**
@@ -181,9 +181,16 @@ var Single = function Single(_ref) {
     }
     return /*#__PURE__*/React.createElement("div", {
       style: {
-        flex: 1
+        flex: 1,
+        display: 'flex',
+        alignItems: 'center',
+        justifyContent: 'space-between'
       }
-    }, item["main_field"] || item[form.option_key] || "-");
+    }, item['main_field'] || item[form.option_key] || '-', item !== null && item !== void 0 && item.status ? item.status === 'valid' ? /*#__PURE__*/React.createElement(Tag, {
+      color: "#56c064"
+    }, locales.getText('pisell2.text.status.valid')) : /*#__PURE__*/React.createElement(Tag, {
+      color: "#d83963"
+    }, locales.getText('pisell2.text.status.expired')) : null);
   };
 
   /**
@@ -197,11 +204,11 @@ var Single = function Single(_ref) {
   var _addButtonProps = useMemo(function () {
     var _form$form, _form$form2;
     var obj = _objectSpread({
-      title: "".concat(locales.getText("pisell2.text.add-a"), " ").concat(((_form$form = form.form) === null || _form$form === void 0 ? void 0 : _form$form.title) || "-"),
-      subTitle: "".concat(locales.getText("pisell2.text.add-another"), " ").concat(((_form$form2 = form.form) === null || _form$form2 === void 0 ? void 0 : _form$form2.title) || "-")
+      title: "".concat(locales.getText('pisell2.text.add-a'), " ").concat(((_form$form = form.form) === null || _form$form === void 0 ? void 0 : _form$form.title) || '-'),
+      subTitle: "".concat(locales.getText('pisell2.text.add-another'), " ").concat(((_form$form2 = form.form) === null || _form$form2 === void 0 ? void 0 : _form$form2.title) || '-')
     }, addButtonProps);
     // 表单和表格点击事件触发新增弹窗
-    if (["form", "table"].includes(form.type)) {
+    if (['form', 'table'].includes(form.type)) {
       obj.onClick = onAdd;
     }
     return obj;
@@ -216,11 +223,11 @@ var Single = function Single(_ref) {
    * @Date: 2024-01-30 17:09
    */
   var _mode = useMemo(function () {
-    if (["form"].includes(mode)) {
-      return "single";
+    if (['form'].includes(mode)) {
+      return 'single';
     }
-    if (["table"].includes(mode)) {
-      return "multiple";
+    if (['table'].includes(mode)) {
+      return 'multiple';
     }
     return mode;
   }, [mode, form]);
@@ -239,10 +246,10 @@ var Single = function Single(_ref) {
     previewItemRender: function previewItemRender(d) {
       return renderItem(d);
     },
-    name: ((_form$form3 = form.form) === null || _form$form3 === void 0 ? void 0 : _form$form3.title) || "-",
+    name: ((_form$form3 = form.form) === null || _form$form3 === void 0 ? void 0 : _form$form3.title) || '-',
     addButtonProps: _addButtonProps,
     drawerProps: _objectSpread({
-      title: "".concat(locales.getText("pisell2.text.select"), " ").concat(((_form$form4 = form.form) === null || _form$form4 === void 0 ? void 0 : _form$form4.title) || "-"),
+      title: "".concat(locales.getText('pisell2.text.select'), " ").concat(((_form$form4 = form.form) === null || _form$form4 === void 0 ? void 0 : _form$form4.title) || '-'),
       destroyOnClose: true
     }, drawerProps || {}),
     optionRender: _optionRender,

package/es/components/booking/hooks/useClearCart.d.ts

@@ -1,2 +1,3 @@
+/// <reference types="react" />
 declare const useClearCart: (state: any, dispatch: any) => false | JSX.Element;
 export default useClearCart;

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

@@ -32,9 +32,10 @@ import { image, locales } from '@pisell/utils';
 import { isWalkIn as getIsWalkIn } from "../../utils";
 import { getFranchiseeCustomerInfo, getFranchiseeCustomerList } from "./serve";
 import { useMemoizedFn } from 'ahooks';
+import { getWaiverTitle } from "../clientVariant/utils";
 var isLoadClient = false;
 var Client = function Client() {
-  var _state$client$value2, _state$client$value3, _state$client$value4, _state$client$value5, _state$client$value6, _state$client$value7;
+  var _state$client$value2, _state$client$value3, _state$client$value4, _state$client$value5, _state$client$value6, _state$client$value7, _state$client$value8, _state$client$value9, _state$client$value10, _state$client$value11;
   var modalRef = useRef();
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
@@ -423,7 +424,16 @@ var Client = function Client() {
           className: ""
         }, item.email) : null, item.phone ? /*#__PURE__*/React.createElement("div", {
           className: ""
-        }, item.phone) : null)), /*#__PURE__*/React.createElement("div", {
+        }, item.phone) : null), /*#__PURE__*/React.createElement("div", {
+          className: 'pisell-lowcode__booking-client-list-item-info-waiver',
+          title: getWaiverTitle(item.waiver_form)
+        }, (item.waiver_form || []).map(function (item) {
+          return /*#__PURE__*/React.createElement("span", null, item.form_title, ":", item.is_filled ? /*#__PURE__*/React.createElement("span", {
+            className: 'pisell-lowcode__booking-client-list-item-waiver-filled'
+          }, locales.getText('pisell2.text.filled')) : /*#__PURE__*/React.createElement("span", {
+            className: 'pisell-lowcode__booking-client-list-item-waiver-not-filled'
+          }, locales.getText('pisell2.text.not-filled')), "; ");
+        }))), /*#__PURE__*/React.createElement("div", {
           className: "pisell-lowcode__booking-client-list-item-loading"
         }, /*#__PURE__*/React.createElement(Spin, {
           spinning: franchiseeLoading === item.id
@@ -468,7 +478,18 @@ var Client = function Client() {
     className: "pisell-lowcode__booking-client-info-email"
   }, (_state$client$value5 = state.client.value) === null || _state$client$value5 === void 0 ? void 0 : _state$client$value5.email) : null, (_state$client$value6 = state.client.value) !== null && _state$client$value6 !== void 0 && _state$client$value6.phone ? /*#__PURE__*/React.createElement("div", {
     className: "pisell-lowcode__booking-client-info-phone"
-  }, (_state$client$value7 = state.client.value) === null || _state$client$value7 === void 0 ? void 0 : _state$client$value7.phone) : null)), !(state !== null && state !== void 0 && state.disableEventBookingEdit) && /*#__PURE__*/React.createElement("div", {
+  }, (_state$client$value7 = state.client.value) === null || _state$client$value7 === void 0 ? void 0 : _state$client$value7.phone) : null, !!((_state$client$value8 = state.client.value) !== null && _state$client$value8 !== void 0 && (_state$client$value8 = _state$client$value8.waiver_form) !== null && _state$client$value8 !== void 0 && _state$client$value8.length) && /*#__PURE__*/React.createElement("div", {
+    className: 'pisell-lowcode__booking-client-waiver',
+    title: getWaiverTitle((_state$client$value9 = state.client.value) === null || _state$client$value9 === void 0 ? void 0 : _state$client$value9.waiver_form)
+  }, (_state$client$value10 = state.client.value) === null || _state$client$value10 === void 0 || (_state$client$value10 = _state$client$value10.waiver_form) === null || _state$client$value10 === void 0 || (_state$client$value11 = _state$client$value10.map) === null || _state$client$value11 === void 0 ? void 0 : _state$client$value11.call(_state$client$value10, function (item) {
+    return /*#__PURE__*/React.createElement("span", null, item.form_title, /*#__PURE__*/React.createElement("span", {
+      className: 'pisell-lowcode__booking-client-waiver-colon'
+    }, ":"), item.is_filled ? /*#__PURE__*/React.createElement("span", {
+      className: 'pisell-lowcode__booking-client-waiver-filled'
+    }, locales.getText('pisell2.text.filled')) : /*#__PURE__*/React.createElement("span", {
+      className: 'pisell-lowcode__booking-client-waiver-not-filled'
+    }, locales.getText('pisell2.text.not-filled')), "; ");
+  })))), !(state !== null && state !== void 0 && state.disableEventBookingEdit) && /*#__PURE__*/React.createElement("div", {
     className: "pisell-lowcode__booking-client-info-right"
   }, isWalkIn ? /*#__PURE__*/React.createElement(PlusCircle, {
     className: "pisell-lowcode__booking-client-add-icon"

package/es/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/es/components/booking/info/clientVariant/hooks/useClientFn.d.ts

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

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

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

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

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

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

@@ -0,0 +1,6 @@
+import { locales } from '@pisell/utils';
+export var getWaiverTitle = function getWaiverTitle(waiverForm) {
+  return (waiverForm || []).map(function (item) {
+    return "".concat(item.form_title || '', ":").concat(item.is_filled ? locales.getText('pisell2.text.filled') : locales.getText('pisell2.text.not-filled'));
+  }).join(';');
+};

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

@@ -30,6 +30,7 @@ import "./SelectDrawer.less";
 import { formatAddFormValues, sortFormValues } from "../../../forms/format";
 import { uniqueByField } from "../../utils";
 import PlusCircle from '@pisell/icon/es/PlusCircle';
+import { getWaiverTitle } from "../utils";
 var ActionItem = function ActionItem(props) {
   return /*#__PURE__*/React.createElement("div", {
     className: "vertical-client-select-drawer-item-wrap",
@@ -53,7 +54,11 @@ var Item = function Item(_ref) {
     coverSize = _ref.coverSize,
     checked = _ref.checked,
     style = _ref.style,
-    loading = _ref.loading;
+    loading = _ref.loading,
+    waiverForm = _ref.waiverForm;
+  var waiverTitle = useMemo(function () {
+    return getWaiverTitle(waiverForm);
+  }, [waiverForm]);
   return /*#__PURE__*/React.createElement("div", {
     className: classNames('vertical-client-select-drawer-item-wrap', _defineProperty({}, 'checked', checked)),
     onClick: onClick,
@@ -76,6 +81,15 @@ var Item = function Item(_ref) {
       className: "",
       title: d
     }, d);
+  })), /*#__PURE__*/React.createElement("div", {
+    className: 'pisell-lowcode__booking-client-list-item-info-desc-waiver',
+    title: waiverTitle
+  }, (waiverForm || []).map(function (item) {
+    return /*#__PURE__*/React.createElement("span", null, item.form_title, ":", item.is_filled ? /*#__PURE__*/React.createElement("span", {
+      className: 'pisell-lowcode__booking-client-list-item-info-desc-filled'
+    }, locales.getText('pisell2.text.filled')) : /*#__PURE__*/React.createElement("span", {
+      className: 'pisell-lowcode__booking-client-list-item-info-desc-not-filled'
+    }, locales.getText('pisell2.text.not-filled')), "; ");
   }))), /*#__PURE__*/React.createElement(Spin, {
     spinning: !!loading
   }));
@@ -376,7 +390,8 @@ var SelectDrawer = function SelectDrawer(props, ref) {
       style: showPet ? {
         marginBottom: 6
       } : {},
-      loading: franchiseeLoading === item.id
+      loading: franchiseeLoading === item.id,
+      waiverForm: item.waiver_form
     }), showPet && /*#__PURE__*/React.createElement("div", {
       className: "vertical-client-select-drawer-content-item-children"
     }, ((item === null || item === void 0 ? void 0 : item.form_record) || []).map(function (f) {

package/es/components/booking/info/clientVariant/vertical/SelectDrawer.less

@@ -30,6 +30,23 @@
   .pisell-lowcode__booking-client-list-item-info {
     overflow: hidden;
   }
+  .pisell-lowcode__booking-client-list-item-info-desc-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-info-desc-filled {
+    color: var(--Success-600, #079455);
+  }
+  .pisell-lowcode__booking-client-list-item-info-desc-not-filled {
+    color: var(--Error-600, #D92D20);
+  }
   .vertical-client-item-icon-wrap {
     display: flex;
     width: 56px;