@pisell/private-materials 6.3.35 → 6.3.37

package/es/pro/Login2.0/Login2.js

@@ -117,17 +117,11 @@ var Login2 = function Login2(_ref) {
   // 初始化 currentLoginMethod（当 loginMethods 变化时）
   useEffect(function () {
     if (loginMethods.length > 0 && !currentLoginMethod) {
-      // 优先选择非OAuth类型的登录方式作为当前激活方式
-      var nonOAuthMethod = loginMethods.find(function (method) {
-        return method.type === 'email' || method.type === 'phone';
-      });
-      var first = nonOAuthMethod || loginMethods[0];
-      setCurrentLoginMethod(first);
-
-      // 设置默认验证方式
-      if (first.type === 'email' || first.type === 'phone') {
-        var _first$verificationMe;
-        setCurrentVerificationMethod(((_first$verificationMe = first.verificationMethods) === null || _first$verificationMe === void 0 ? void 0 : _first$verificationMe[0]) || 'password');
+      var initialMethod = loginMethods[0];
+      setCurrentLoginMethod(initialMethod);
+      if ((initialMethod === null || initialMethod === void 0 ? void 0 : initialMethod.type) === 'email' || (initialMethod === null || initialMethod === void 0 ? void 0 : initialMethod.type) === 'phone') {
+        var _initialMethod$verifi;
+        setCurrentVerificationMethod(((_initialMethod$verifi = initialMethod.verificationMethods) === null || _initialMethod$verifi === void 0 ? void 0 : _initialMethod$verifi[0]) || 'password');
       }
     }
     // 如果只有 guest 登录，则默认直接使用 guest 登录
@@ -1885,14 +1879,18 @@ var Login2 = function Login2(_ref) {
   // 渲染底部切换选项区域
   var renderSwitchOptions = function renderSwitchOptions() {
     if (!currentLoginMethod) return null;
-    var nonOauthButtons = [];
-    if (currentLoginMethod.type === 'email' || currentLoginMethod.type === 'phone') {
+    var primaryMethod = loginMethods[0];
+    var currentIsFormMethod = currentLoginMethod.type === 'email' || currentLoginMethod.type === 'phone';
+    var primaryIsFormMethod = (primaryMethod === null || primaryMethod === void 0 ? void 0 : primaryMethod.type) === 'email' || (primaryMethod === null || primaryMethod === void 0 ? void 0 : primaryMethod.type) === 'phone';
+    var shouldUseFormLayout = currentIsFormMethod || primaryIsFormMethod;
+    var verificationSwitchButtons = [];
+    if (currentIsFormMethod) {
       (currentLoginMethod.verificationMethods || []).filter(function (method) {
         return method !== currentVerificationMethod;
       }).forEach(function (method) {
         if (method === 'verification_code') {
           var text = currentLoginMethod.type === 'email' ? locales.getText('pisell-login2-switch-to-email-code') : locales.getText('pisell-login2-switch-to-sms-code');
-          nonOauthButtons.push( /*#__PURE__*/React.createElement("button", {
+          verificationSwitchButtons.push( /*#__PURE__*/React.createElement("button", {
             key: "switch-to-code",
             className: "login2-switch-option-button",
             onClick: function onClick() {
@@ -1906,7 +1904,7 @@ var Login2 = function Login2(_ref) {
             className: "option-text"
           }, text)));
         } else {
-          nonOauthButtons.push( /*#__PURE__*/React.createElement("button", {
+          verificationSwitchButtons.push( /*#__PURE__*/React.createElement("button", {
             key: "switch-to-password",
             className: "login2-switch-option-button",
             onClick: function onClick() {
@@ -1920,16 +1918,15 @@ var Login2 = function Login2(_ref) {
         }
       });
     }
+    var emailPhoneSwitchButtons = [];
     loginMethods.forEach(function (method, index) {
       if (method.type === 'email' || method.type === 'phone') {
-        if (method.type === currentLoginMethod.type) {
-          return;
-        }
+        if (method.type === currentLoginMethod.type) return;
         var isLast = isLastLoginMethod(method.type);
         var _className = classNames('login2-switch-option-button', {
           'has-last-login-badge': isLast
         });
-        nonOauthButtons.push( /*#__PURE__*/React.createElement("button", {
+        emailPhoneSwitchButtons.push( /*#__PURE__*/React.createElement("button", {
           key: "".concat(method.type, "-").concat(index),
           className: _className,
           onClick: function onClick() {
@@ -1944,7 +1941,7 @@ var Login2 = function Login2(_ref) {
         }, method.type === 'email' ? locales.getText('pisell-login2-switch-to-email') : locales.getText('pisell-login2-switch-to-phone'))));
       }
     });
-    var showDivider = nonOauthButtons.length > 0 && oauthProviders.length > 0;
+    var nonOauthButtons = [].concat(verificationSwitchButtons, emailPhoneSwitchButtons);
     var registerPrompt = onSwitchToRegister && /*#__PURE__*/React.createElement("div", {
       className: "login2-register-prompt"
     }, /*#__PURE__*/React.createElement("span", {
@@ -1956,18 +1953,72 @@ var Login2 = function Login2(_ref) {
     if (!nonOauthButtons.length && !oauthProviders.length) {
       return registerPrompt;
     }
-    return /*#__PURE__*/React.createElement(React.Fragment, null, showDivider && /*#__PURE__*/React.createElement("div", {
-      className: "login2-divider"
-    }, locales.getText('pisell-login2-or')), (nonOauthButtons.length > 0 || oauthProviders.length > 0) && /*#__PURE__*/React.createElement("div", {
+    if (shouldUseFormLayout) {
+      var groups = [];
+      if (nonOauthButtons.length > 0) {
+        groups.push( /*#__PURE__*/React.createElement("div", {
+          key: "non-oauth",
+          className: "login2-switch-options"
+        }, nonOauthButtons));
+      }
+      if (oauthProviders.length > 0) {
+        groups.push( /*#__PURE__*/React.createElement(OAuthButtonGroup, {
+          key: "oauth",
+          providers: oauthProviders,
+          wrapperClassName: "login2-oauth-buttons",
+          buttonClassName: "login2-oauth-button",
+          gap: 12
+        }));
+      }
+      if (!groups.length) {
+        return registerPrompt;
+      }
+      return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
+        className: "login2-divider"
+      }, locales.getText('pisell-login2-or')), /*#__PURE__*/React.createElement("div", {
+        className: "login2-switch-groups"
+      }, groups), registerPrompt);
+    }
+    var primaryProvider = oauthProviders.find(function (provider) {
+      return provider.key === (primaryMethod === null || primaryMethod === void 0 ? void 0 : primaryMethod.type);
+    });
+    var secondaryOauthProviders = oauthProviders.filter(function (provider) {
+      return provider.key !== (primaryMethod === null || primaryMethod === void 0 ? void 0 : primaryMethod.type);
+    });
+    var hasSecondaryButtons = nonOauthButtons.length > 0 || secondaryOauthProviders.length > 0;
+    return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
       className: "login2-switch-groups"
-    }, nonOauthButtons.length > 0 && /*#__PURE__*/React.createElement("div", {
+    }, primaryProvider ? /*#__PURE__*/React.createElement(OAuthButtonGroup, {
+      providers: [primaryProvider],
+      wrapperClassName: "login2-oauth-buttons",
+      buttonClassName: "login2-oauth-button",
+      gap: 12
+    }) : /*#__PURE__*/React.createElement("div", {
+      className: "login2-switch-options"
+    }, /*#__PURE__*/React.createElement("button", {
+      key: "primary-fallback",
+      className: "login2-switch-option-button",
+      onClick: function onClick() {
+        if ((primaryMethod === null || primaryMethod === void 0 ? void 0 : primaryMethod.type) === 'guest') {
+          handleGuestLogin();
+        } else if ((primaryMethod === null || primaryMethod === void 0 ? void 0 : primaryMethod.type) === 'google' || (primaryMethod === null || primaryMethod === void 0 ? void 0 : primaryMethod.type) === 'facebook' || (primaryMethod === null || primaryMethod === void 0 ? void 0 : primaryMethod.type) === 'apple') {
+          handleOAuthClick(primaryMethod.type);
+        }
+      }
+    }, /*#__PURE__*/React.createElement(Iconfont, {
+      type: (primaryMethod === null || primaryMethod === void 0 ? void 0 : primaryMethod.type) === 'guest' ? 'pisell2-user-01' : (primaryMethod === null || primaryMethod === void 0 ? void 0 : primaryMethod.type) === 'google' ? 'pisell2-google' : (primaryMethod === null || primaryMethod === void 0 ? void 0 : primaryMethod.type) === 'facebook' ? 'pisell2-facebook' : 'pisell2-apple'
+    }), /*#__PURE__*/React.createElement("span", {
+      className: "option-text"
+    }, (primaryMethod === null || primaryMethod === void 0 ? void 0 : primaryMethod.type) === 'guest' ? locales.getText('pisell-login2-login-as-guest') : "".concat(locales.getText('pisell-login2-continue-with'), " ").concat(primaryMethod !== null && primaryMethod !== void 0 && primaryMethod.type ? primaryMethod.type.charAt(0).toUpperCase() + primaryMethod.type.slice(1) : '')))), hasSecondaryButtons && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
+      className: "login2-divider"
+    }, locales.getText('pisell-login2-or')), nonOauthButtons.length > 0 && /*#__PURE__*/React.createElement("div", {
       className: "login2-switch-options"
-    }, nonOauthButtons), oauthProviders.length > 0 && /*#__PURE__*/React.createElement(OAuthButtonGroup, {
-      providers: oauthProviders,
+    }, nonOauthButtons), secondaryOauthProviders.length > 0 && /*#__PURE__*/React.createElement(OAuthButtonGroup, {
+      providers: secondaryOauthProviders,
       wrapperClassName: "login2-oauth-buttons",
       buttonClassName: "login2-oauth-button",
       gap: 12
-    })), registerPrompt);
+    }))), registerPrompt);
   };
 
   // 渲染 OAuth 按钮

package/lib/components/Sales/Summary/utils.d.ts

@@ -30,7 +30,7 @@ export declare const calculateSubtotal: (items: CartItem[]) => string;
  * @return {*}
  * @Author: xiangfeng.xue
  */
-export declare const calculateTaxFee: (shopInfo: any, items: CartItem[]) => Decimal | "0.00";
+export declare const calculateTaxFee: (shopInfo: any, items: CartItem[]) => "0.00" | Decimal;
 /**
  * 计算所有价格明细
  * @param items - 购物车商品数组

package/lib/components/appointmentBooking/components/ConfirmInformation/index.js

@@ -228,6 +228,11 @@ var ConfirmInformation = (0, import_react.forwardRef)((props, ref) => {
           country_code: ((_g = contacts_info == null ? void 0 : contacts_info.phone) == null ? void 0 : _g.countryCode) || ""
         };
         contacts_info.phone = newPhone;
+        if ((contacts_info == null ? void 0 : contacts_info.first_name) || (contacts_info == null ? void 0 : contacts_info.last_name)) {
+          contacts_info.display_name = `${(contacts_info == null ? void 0 : contacts_info.first_name) || ""} ${(contacts_info == null ? void 0 : contacts_info.last_name) || ""}`;
+        } else {
+          contacts_info.display_name = "";
+        }
         console.log("contacts_info", contacts_info);
       }
     } catch (error) {

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

@@ -293,7 +293,7 @@ var CustomSelect = (props, ref) => {
           ref: searchRef,
           prefix: /* @__PURE__ */ import_react.default.createElement(import_SearchLg.default, null),
           style: { marginTop: 16, height: 44 },
-          placeholder: import_utils2.locales.getText("pisell2.text.search"),
+          placeholder: import_utils2.locales.getText("pisell2.booking.text.search-placeholder"),
           value: search,
           allowClear: true,
           onChange: (e) => {

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/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

@@ -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/service2/utils.d.ts

@@ -244,4 +244,4 @@ export declare const updateAppointmentServicePrice: (state: any, { start_date, e
  * @Author: WangHan
  * @Date: 2024-12-24 11:32
  */
-export declare const updateServicePrice: (state: any) => Promise<any> | never[];
+export declare const updateServicePrice: (state: any) => never[] | Promise<any>;

package/lib/components/booking/locales.d.ts

@@ -277,6 +277,7 @@ declare const _default: {
         'pisell2.text.quotation.product.change.describe': string;
         'pisell2.text.form.link.to.another.record.more': string;
         'pisell2.booking.text.contact-info.title': string;
+        'pisell2.booking.text.search-placeholder': string;
     };
     'zh-CN': {
         'pisell2.text.refunded-amount': string;
@@ -556,6 +557,7 @@ declare const _default: {
         'pisell2.text.quotation.product.change.describe': string;
         'pisell2.text.form.link.to.another.record.more': string;
         'pisell2.booking.text.contact-info.title': string;
+        'pisell2.booking.text.search-placeholder': string;
     };
     'zh-HK': {
         'pisell2.text.refunded-amount': string;
@@ -835,6 +837,7 @@ declare const _default: {
         'pisell2.text.quotation.product.change.describe': string;
         'pisell2.text.form.link.to.another.record.more': string;
         'pisell2.booking.text.contact-info.title': string;
+        'pisell2.booking.text.search-placeholder': string;
     };
 };
 export default _default;

package/lib/components/booking/locales.js

@@ -339,7 +339,8 @@ var locales_default = {
     "pisell2.text.quotation.product.change.describe": "Product updates available: Please refresh the following items to load the latest data.",
     "pisell2.text.form.link.to.another.record.more": "View More",
     // 联系信息
-    "pisell2.booking.text.contact-info.title": "Contact info"
+    "pisell2.booking.text.contact-info.title": "Contact info",
+    "pisell2.booking.text.search-placeholder": "Search Customers / Contacts"
   },
   "zh-CN": {
     "pisell2.text.refunded-amount": "已退金额",
@@ -651,7 +652,8 @@ var locales_default = {
     "pisell2.text.quotation.product.change.describe": "以下商品信息已更新，请重新编辑相关商品以同步最新数据。",
     "pisell2.text.form.link.to.another.record.more": "查看更多",
     // 联系信息
-    "pisell2.booking.text.contact-info.title": "联系信息"
+    "pisell2.booking.text.contact-info.title": "联系信息",
+    "pisell2.booking.text.search-placeholder": "搜索客户/联系信息"
   },
   "zh-HK": {
     "pisell2.text.refunded-amount": "已退金額",
@@ -963,6 +965,7 @@ var locales_default = {
     "pisell2.text.quotation.product.change.describe": "以下商品信息已更新，请重新编辑相关商品以同步最新数据。",
     "pisell2.text.form.link.to.another.record.more": "查看更多",
     // 联系信息
-    "pisell2.booking.text.contact-info.title": "聯繫信息"
+    "pisell2.booking.text.contact-info.title": "聯繫信息",
+    "pisell2.booking.text.search-placeholder": "搜索客戶/聯系信息"
   }
 };

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

@@ -165,10 +165,10 @@ export declare const getProductTotalPrice: (item: any) => number;
 export declare const getDuration: (duration: number | {
     type: string;
     value: number;
-}) => number | {
+}) => number | "flexible" | {
     type: string;
     value: number;
-} | "flexible";
+};
 export declare const isWalkIn: (customer_id?: number | string) => boolean;
 export declare const getIsEdit: (state: any) => boolean;
 export {};

package/lib/components/eftposPay/amount.d.ts

@@ -8,7 +8,7 @@ import { PosProps } from './const';
  */
 declare const _default: ({ className, onChange, onClose, formatAmount, isMobile, net, client }: {
     className?: string | undefined;
-    onChange?: ((status: "success" | "page" | "fail" | "print" | "mark_tx_processed", params?: string | {
+    onChange?: ((status: "page" | "success" | "print" | "fail" | "mark_tx_processed", params?: string | {
         [keys: string]: unknown;
     } | undefined, other?: any) => void) | undefined;
     onClose: () => void;

package/lib/components/eftposPay/device.d.ts

@@ -10,7 +10,7 @@ import './device.less';
 declare const _default: ({ api, onChange, onClose, className, device_number, isMobile, net, client, formatAmount, }: {
     api: PayProps['api'];
     className?: string | undefined;
-    onChange?: ((status: "success" | "page" | "fail" | "print" | "mark_tx_processed", params?: string | {
+    onChange?: ((status: "page" | "success" | "print" | "fail" | "mark_tx_processed", params?: string | {
         [keys: string]: unknown;
     } | undefined, other?: any) => void) | undefined;
     onClose: () => void;

package/lib/components/eftposPay/hooks.d.ts

@@ -15,11 +15,11 @@ export declare const useStoreRef: <T extends {
     readonly numRef: React.MutableRefObject<string | number | undefined>;
     readonly orderIdRef: React.MutableRefObject<string | number>;
     readonly modeRef: React.MutableRefObject<ModeEnum>;
-    readonly statusRef: React.MutableRefObject<"success" | "warn" | "loading" | "fail" | "pedding" | "resove" | "reject" | "question">;
+    readonly statusRef: React.MutableRefObject<"loading" | "warn" | "success" | "fail" | "pedding" | "resove" | "reject" | "question">;
     readonly netRef: React.MutableRefObject<boolean | undefined>;
     readonly symbolRef: React.MutableRefObject<string>;
     readonly amountRef: React.MutableRefObject<string | number>;
-    readonly eftposRef: React.MutableRefObject<"payo" | "tyro" | "windcave" | "stripe" | "linkly">;
+    readonly eftposRef: React.MutableRefObject<"stripe" | "payo" | "tyro" | "windcave" | "linkly">;
     readonly clientRef: React.MutableRefObject<ClientEnum>;
     readonly dataRef: React.MutableRefObject<import("./store").State>;
 };

package/lib/components/eftposPay/store/index.d.ts

@@ -174,7 +174,7 @@ export declare const updateCustom: (payload: {
 export declare const updateStatus: (status: 'loading' | 'warn' | 'fail' | 'success' | 'question') => {
     type: EActionTypes;
     payload: {
-        status: "success" | "warn" | "loading" | "fail" | "question";
+        status: "loading" | "warn" | "success" | "fail" | "question";
     };
 };
 /**
@@ -295,20 +295,20 @@ export declare const backUpFree: (payload: Partial<State>) => {
         name?: string | undefined;
         symbol?: string | undefined;
         amount?: string | number | undefined;
-        mode?: "pay" | "fullPay" | "refund" | "query" | undefined;
+        mode?: "refund" | "pay" | "fullPay" | "query" | undefined;
         order_id?: string | number | undefined;
-        eftpos?: "payo" | "tyro" | "windcave" | "stripe" | "linkly" | undefined;
-        action?: "amount" | "deviceList" | "pay" | undefined;
+        eftpos?: "stripe" | "payo" | "tyro" | "windcave" | "linkly" | undefined;
+        action?: "amount" | "pay" | "deviceList" | undefined;
         key?: number | undefined;
         step?: number | undefined;
         title?: string | undefined;
         subTitle?: string | undefined;
-        type?: "step" | "unset" | undefined;
+        type?: "unset" | "step" | undefined;
         render?: boolean | undefined;
         net?: boolean | undefined;
         component?: string | undefined;
         form?: string | undefined;
-        status?: "success" | "warn" | "loading" | "fail" | "pedding" | "resove" | "reject" | "question" | undefined;
+        status?: "loading" | "warn" | "success" | "fail" | "pedding" | "resove" | "reject" | "question" | undefined;
         warn?: string | undefined;
         steps?: {
             /** 用于重置当前步骤 */

package/lib/plus/contactInfoModal/index.d.ts

@@ -10,6 +10,7 @@ interface ContactInfoModalProps {
     dataSource?: {
         first_name?: string;
         last_name?: string;
+        display_name?: string;
         email?: string;
         phone?: {
             phone: string;

package/lib/plus/contactInfoModal/index.js

@@ -107,6 +107,7 @@ var ContactInfoModalContent = (props) => {
       onSave({
         first_name: (values == null ? void 0 : values.first_name) || "",
         last_name: (values == null ? void 0 : values.last_name) || "",
+        display_name: (values == null ? void 0 : values.first_name) || (values == null ? void 0 : values.last_name) ? `${(values == null ? void 0 : values.first_name) || ""} ${(values == null ? void 0 : values.last_name) || ""}` : "",
         phone: {
           phone: ((_c = values == null ? void 0 : values.phone) == null ? void 0 : _c.phone) || "",
           country_calling_code: ((_d = values == null ? void 0 : values.phone) == null ? void 0 : _d.countryCallingCode) || "",