@pisell/private-materials 6.5.27 → 6.7.1

package/es/components/authentication/admin/SaaSAdminAuth/locales.js

@@ -0,0 +1,74 @@
+export default {
+  en: {
+    // Page title and description
+    'saas.admin.auth.title': 'SaaS Platform Admin Authentication',
+    'saas.admin.auth.description': 'Configure authentication methods for your SaaS platform admin portal and other administrative channels.',
+    // Auth Methods section
+    'saas.admin.auth.methods.title': 'Auth Methods',
+    'saas.admin.auth.methods.description': 'Configure authentication methods that will be available for SaaS platform admins. Drag to reorder by priority.',
+    // Password Settings section
+    'saas.admin.password.settings.title': 'Password Settings',
+    'saas.admin.password.settings.description': 'Configure password requirements specifically for SaaS platform admin accounts. These rules apply to all platform administrative users.',
+    // Buttons
+    'auth.button.cancel': 'Cancel',
+    'auth.button.save': 'Save',
+    'auth.button.settings': 'Settings',
+    // Messages
+    'auth.save.success': 'Settings saved successfully',
+    'auth.save.error': 'Failed to save settings',
+    // OAuth configuration
+    'auth.oauth.config.message': 'Configure OAuth settings in Auth Configuration page first',
+    'auth.oauth.config.link': 'click to config',
+    // Category badges
+    'auth.category.general': 'General',
+    'auth.category.oauth': 'OAuth'
+  },
+  'zh-CN': {
+    // Page title and description
+    'saas.admin.auth.title': 'SaaS平台管理员认证',
+    'saas.admin.auth.description': '为您的SaaS平台管理员门户和其他管理渠道配置认证方法。',
+    // Auth Methods section
+    'saas.admin.auth.methods.title': '认证方法',
+    'saas.admin.auth.methods.description': '配置SaaS平台管理员可用的认证方法。拖动以调整优先级。',
+    // Password Settings section
+    'saas.admin.password.settings.title': '密码设置',
+    'saas.admin.password.settings.description': '专门为SaaS平台管理员账户配置密码要求。这些规则适用于所有平台管理用户。',
+    // Buttons
+    'auth.button.cancel': '取消',
+    'auth.button.save': '保存',
+    'auth.button.settings': '设置',
+    // Messages
+    'auth.save.success': '保存成功',
+    'auth.save.error': '保存失败',
+    // OAuth configuration
+    'auth.oauth.config.message': '请先在OAuth配置页面中配置OAuth设置',
+    'auth.oauth.config.link': '点击配置',
+    // Category badges
+    'auth.category.general': '通用',
+    'auth.category.oauth': 'OAuth'
+  },
+  'zh-HK': {
+    // Page title and description
+    'saas.admin.auth.title': 'SaaS平台管理員認證',
+    'saas.admin.auth.description': '為您的SaaS平台管理員門戶和其他管理渠道配置認證方法。',
+    // Auth Methods section
+    'saas.admin.auth.methods.title': '認證方法',
+    'saas.admin.auth.methods.description': '配置SaaS平台管理員可用的認證方法。拖動以調整優先級。',
+    // Password Settings section
+    'saas.admin.password.settings.title': '密碼設置',
+    'saas.admin.password.settings.description': '專門為SaaS平台管理員賬戶配置密碼要求。這些規則適用於所有平台管理用戶。',
+    // Buttons
+    'auth.button.cancel': '取消',
+    'auth.button.save': '保存',
+    'auth.button.settings': '設置',
+    // Messages
+    'auth.save.success': '保存成功',
+    'auth.save.error': '保存失敗',
+    // OAuth configuration
+    'auth.oauth.config.message': '請先在OAuth配置頁面中配置OAuth設置',
+    'auth.oauth.config.link': '點擊配置',
+    // Category badges
+    'auth.category.general': '通用',
+    'auth.category.oauth': 'OAuth'
+  }
+};

package/es/components/authentication/admin/SaaSAdminAuth/types.d.ts

@@ -0,0 +1,16 @@
+/// <reference types="react" />
+import { AuthMethod } from '../AuthMethods/types';
+export interface SaaSAdminAuthProps {
+    /**
+     * 自定义类名
+     */
+    className?: string;
+    /**
+     * 自定义样式
+     */
+    style?: React.CSSProperties;
+    /**
+     * 保存回调
+     */
+    onSave?: (authMethods: AuthMethod[], passwordRules: any) => void;
+}

package/es/components/authentication/admin/SaaSAdminAuth/types.js

@@ -0,0 +1 @@
+export {};

package/es/components/authentication/admin/index.d.ts

@@ -0,0 +1,26 @@
+export type { AuthMethodsProps, AuthMethod } from './AuthMethods';
+export { AuthMethodType, AuthMethodCategory } from './AuthMethods';
+export { default as ChannelAuthSetting } from './ChannelAuthSetting';
+export type { ChannelAuthSettingProps, ChannelAuthSettingValue, TabKey } from './ChannelAuthSetting';
+export { default as PageSetting } from './ChannelAuthSetting/PageSetting';
+export { default as PageSettingItem } from './ChannelAuthSetting/PageSettingItem';
+export { default as AuthenticationMethods } from './ChannelAuthSetting/AuthenticationMethods';
+export { default as CollectInfo } from './ChannelAuthSetting/CollectInfo';
+export type { PageSettingProps, PageSettingValue, } from './ChannelAuthSetting/PageSetting/types';
+export type { PageSettingItemProps, PageSettingItemValue, TermsCondition, TranslationValue as PageTranslationValue, } from './ChannelAuthSetting/PageSettingItem/types';
+export type { AuthenticationMethodsProps, AuthenticationMethodsValue, GlobalAuthMethod, AuthenticationMethod, AuthenticationSettingsMode, } from './ChannelAuthSetting/AuthenticationMethods/types';
+export type { CollectInfoProps, CollectInfoValue, AccountField, CustomerFormItem, TranslationValue as CollectInfoTranslationValue, } from './ChannelAuthSetting/CollectInfo/types';
+export type { SaaSAdminAuthProps } from './SaaSAdminAuth';
+export type { OrgAdminAuthProps } from './OrgAdminAuth';
+export type { DeviceAuthProps } from './DeviceAuth';
+export type { POSOperatorAuthProps } from './POSOperatorAuth';
+export type { CustomerOAuthConfigProps } from './CustomerOAuthConfig';
+export { default as SaaSAdminAuth } from './SaaSAdminAuth';
+export { default as OrgAdminAuth } from './OrgAdminAuth';
+export { default as OAuthConfig } from './OAuthConfig';
+export { default as CustomerAuth } from './CustomerAuth';
+export { default as CustomerOAuthConfig } from './CustomerOAuthConfig';
+export { default as DeviceAuth } from './DeviceAuth';
+export { default as POSOperatorAuth } from './POSOperatorAuth';
+export { default as OnlineShopAuth } from './ChannelAuthSetting/OnlineShopAuth';
+export { default as SaaSManagermentAuth } from './ChannelAuthSetting/SaaSManagermentAuth';

package/es/components/authentication/admin/index.js

@@ -0,0 +1,23 @@
+// export { default as AuthMethods, SettingList } from './AuthMethods';
+
+export { AuthMethodType, AuthMethodCategory } from "./AuthMethods";
+
+// ChannelAuthSetting 主组件
+export { default as ChannelAuthSetting } from "./ChannelAuthSetting";
+// ChannelAuthSetting 子组件
+export { default as PageSetting } from "./ChannelAuthSetting/PageSetting";
+export { default as PageSettingItem } from "./ChannelAuthSetting/PageSettingItem";
+export { default as AuthenticationMethods } from "./ChannelAuthSetting/AuthenticationMethods";
+export { default as CollectInfo } from "./ChannelAuthSetting/CollectInfo";
+
+// ChannelAuthSetting 类型
+
+export { default as SaaSAdminAuth } from "./SaaSAdminAuth";
+export { default as OrgAdminAuth } from "./OrgAdminAuth";
+export { default as OAuthConfig } from "./OAuthConfig";
+export { default as CustomerAuth } from "./CustomerAuth";
+export { default as CustomerOAuthConfig } from "./CustomerOAuthConfig";
+export { default as DeviceAuth } from "./DeviceAuth";
+export { default as POSOperatorAuth } from "./POSOperatorAuth";
+export { default as OnlineShopAuth } from "./ChannelAuthSetting/OnlineShopAuth";
+export { default as SaaSManagermentAuth } from "./ChannelAuthSetting/SaaSManagermentAuth";

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

@@ -270,15 +270,34 @@ var CustomSelect = function CustomSelect(props, ref) {
   var renderList = useMemo(function () {
     var _list = _toConsumableArray(options);
     if (search) {
-      var isIncludes = function isIncludes(str) {
-        return str.toLowerCase().indexOf(search.toLowerCase()) !== -1;
+      var isIncludes = function isIncludes(item) {
+        try {
+          var q = search.toLowerCase();
+          var numericKeys = Object.keys(item).filter(function (k) {
+            return /^\d+$/.test(k);
+          });
+          var customerKeys = ['customer_nickname', 'customer_first_name', 'customer_last_name', 'customer_phone', 'customer_email'];
+          var allKeys = [].concat(_toConsumableArray(numericKeys), customerKeys);
+          return allKeys.some(function (k) {
+            var val = item[k];
+            if (val === null || val === undefined) return false;
+            try {
+              var str = JSON.stringify(val);
+              return str.includes(q) || str.toLocaleLowerCase().includes(q);
+            } catch (error) {
+              return false;
+            }
+          });
+        } catch (e) {
+          return false;
+        }
       };
       _list = _list.filter(function (d) {
         // 自定义搜索
         if (filterItem) {
           return filterItem(d, search);
         }
-        return isIncludes(d.main_field || '');
+        return isIncludes(d);
       });
     }
     return _list;
@@ -424,7 +443,7 @@ var CustomSelect = function CustomSelect(props, ref) {
         marginTop: 16,
         height: 44
       },
-      placeholder: locales.getText('pisell2.text.search'),
+      placeholder: locales.getText('pisell2.booking.text.search-placeholder'),
       value: search,
       allowClear: true,
       onChange: function onChange(e) {

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

@@ -261,7 +261,7 @@ var Footer = function Footer(props) {
 
   // info 是否有编辑
   var infoEdit = useMemo(function () {
-    var _state$client, _state$date, _state$pet, _state$service3, _state$notes, _state$contacts;
+    var _state$client, _state$date, _state$pet, _state$service3, _state$notes, _state$contacts, _state$contacts_info;
     if (!state.bookingId) {
       return true;
     }
@@ -283,6 +283,9 @@ var Footer = function Footer(props) {
     if ((_state$contacts = state.contacts) !== null && _state$contacts !== void 0 && _state$contacts.edit) {
       return true;
     }
+    if ((_state$contacts_info = state.contacts_info) !== null && _state$contacts_info !== void 0 && _state$contacts_info.edit) {
+      return true;
+    }
     return false;
   }, [state]);
 

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

@@ -4,7 +4,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
-import dayjs from "dayjs";
+import dayjs from 'dayjs';
 import { flexibleObj, isNowTime, getNowTime } from "../../utils";
 import { isWalkIn } from "../../utils";
 import { getSumCapacity } from "../../info2/utilsByBooking";
@@ -18,7 +18,7 @@ import { cloneDeep } from 'lodash';
 import Decimal from 'decimal.js';
 var formatNote = function formatNote(data) {
   var _data$notes;
-  return ((_data$notes = data.notes) === null || _data$notes === void 0 ? void 0 : _data$notes.orderNote) || "";
+  return ((_data$notes = data.notes) === null || _data$notes === void 0 ? void 0 : _data$notes.orderNote) || '';
 };
 var formatCustomer = function formatCustomer(data) {
   var _data$client, _data$client2, _data$client3, _data$client4, _data$client5, _data$client6;
@@ -37,7 +37,7 @@ var formatCustomer = function formatCustomer(data) {
 
 /**
  * @title: 套餐单规格信息
- * @description: 
+ * @description:
  * @param {any} option
  * @return {*}
  * @Author: zhiwei.Wang
@@ -59,7 +59,7 @@ export var formatProductOption = function formatProductOption(option) {
 
 /**
  * @title: 添加套餐警告
- * @description: 
+ * @description:
  * @param {any} data
  * @return {*}
  * @Author: WangHan
@@ -80,7 +80,7 @@ var log = function log(data) {
 
 /**
  * @title: 套餐信息
- * @description: 
+ * @description:
  * @param {any} bundle
  * @return {*}
  * @Author: zhiwei.Wang
@@ -200,7 +200,7 @@ var formatResource = function formatResource(service) {
 
 /**
  * @title: 格式化子预约的holder数据
- * @description: 
+ * @description:
  * @param {any} state
  * @param {any} item
  * @param {any} values
@@ -231,7 +231,7 @@ var formatHolders = function formatHolders(state, item, values) {
 
 /**
  * @title: 格式化商品单价
- * @description: 
+ * @description:
  * @param {any} item
  * @return {*}
  * @Author: WangHan
@@ -261,11 +261,10 @@ export var formatProductPrice = function formatProductPrice(item) {
   }
   return price;
 };
-
 /**
  * checkout2.0: 单个数量商品总价（原价）,包含所有套餐子商品金额、报价单等等
- * @param item 
- * @returns 
+ * @param item
+ * @returns
  */
 var formatOriginalPrice = function formatOriginalPrice(item) {
   var _item$_extend8;
@@ -274,14 +273,14 @@ var formatOriginalPrice = function formatOriginalPrice(item) {
 
 /**
  * checkout2.0: 商品维度折扣后价格, original_price - 商品折扣金额（商品手动折扣等等）
- * @param item 
- * @returns 
+ * @param item
+ * @returns
  */
 var formatSellingPrice = function formatSellingPrice(item) {
   var _item$_extend9;
   return Number((_item$_extend9 = item._extend) === null || _item$_extend9 === void 0 ? void 0 : _item$_extend9.total);
 };
-var formatMetaData = function formatMetaData(item) {
+var formatMetaData = function formatMetaData(item, isMultiDayPrices) {
   var _item$_extend10, _item$_extend11, _item$_extend13, _item$_extend15;
   var metadata = {};
   if ((_item$_extend10 = item._extend) !== null && _item$_extend10 !== void 0 && _item$_extend10.capacity) {
@@ -294,7 +293,7 @@ var formatMetaData = function formatMetaData(item) {
     var _item$_extend12;
     metadata.holder_id = (_item$_extend12 = item._extend) === null || _item$_extend12 === void 0 ? void 0 : _item$_extend12.holder_id;
   }
-  if ((_item$_extend13 = item._extend) !== null && _item$_extend13 !== void 0 && _item$_extend13.multiDayPrices) {
+  if (isMultiDayPrices && (_item$_extend13 = item._extend) !== null && _item$_extend13 !== void 0 && _item$_extend13.multiDayPrices) {
     var _item$_extend14;
     metadata.multiDayPrices = (_item$_extend14 = item._extend) === null || _item$_extend14 === void 0 ? void 0 : _item$_extend14.multiDayPrices;
   }
@@ -339,7 +338,7 @@ var getSourceProductPrice = function getSourceProductPrice(item) {
 
 /**
  * @title: 格式化商品数据
- * @description: 
+ * @description:
  * @param {any} item
  * @return {*}
  * @Author: WangHan
@@ -386,7 +385,7 @@ var formatProducts = function formatProducts(item, quantity) {
     "product_option_item": formatProductOption((_item$_extend21 = item._extend) === null || _item$_extend21 === void 0 || (_item$_extend21 = _item$_extend21.other) === null || _item$_extend21 === void 0 ? void 0 : _item$_extend21.option),
     "product_variant_id": ((_item$_extend22 = item._extend) === null || _item$_extend22 === void 0 || (_item$_extend22 = _item$_extend22.other) === null || _item$_extend22 === void 0 ? void 0 : _item$_extend22.product_variant_id) || 0,
     "discount_list": notManualDiscount,
-    metadata: formatMetaData(item),
+    metadata: formatMetaData(item, false),
     // checkout 需求新增字段
     "calculated_original_price": formatOriginalPrice(item),
     "calculated_selling_price": formatSellingPrice(item),
@@ -397,7 +396,7 @@ var formatProducts = function formatProducts(item, quantity) {
 
 /**
  * @title: 格式化跨日预约下的普通商品
- * @description: 
+ * @description:
  * @param {any} data
  * @param {any} booking_item
  * @return {*}
@@ -423,7 +422,7 @@ var formatDayRelationProducts = function formatDayRelationProducts(data, booking
 
 /**
  * @title: 格式化跨日预约商品列表
- * @description: 
+ * @description:
  * @param {any} data
  * @return {*}
  * @Author: WangHan
@@ -473,7 +472,7 @@ var getHolderByIndex = function getHolderByIndex(holder, index) {
 
 /**
  * @title: 预约商品信息
- * @description: 
+ * @description:
  * @param {any} data
  * @return {*}
  * @Author: zhiwei.Wang
@@ -504,8 +503,9 @@ var formatBookings = function formatBookings(data, values) {
   var dayParams = {};
   var eventOtherParams = data.eventOtherParams;
   var bookings = [];
+  var obj = {};
   list.forEach(function (item) {
-    var _item$_extend30;
+    var _item$_extend30, _item$_extend31;
     // 自定义商品直接使用 _extend 中的数据，并将 id 转换为 0 提交给后端
     if (item.isCustomItem) {
       bookings.push(_objectSpread(_objectSpread({}, item._extend), {}, {
@@ -515,8 +515,8 @@ var formatBookings = function formatBookings(data, values) {
     }
     var start_date = item._extend.startDate.format('YYYY-MM-DD');
     var end_date = item._extend.endDate.format('YYYY-MM-DD');
-    var end_time = item._extend.endDate.format("HH:mm");
-    var start_time = item._extend.startDate.format("HH:mm");
+    var end_time = item._extend.endDate.format('HH:mm');
+    var start_time = item._extend.startDate.format('HH:mm');
 
     // 更新当前时间
     if (isNowTime(item._extend.start_time)) {
@@ -554,9 +554,14 @@ var formatBookings = function formatBookings(data, values) {
       var unique_identification_number = getUniqueId();
       item._extend.unique_identification_number = unique_identification_number;
     }
+
+    // 跨日预约处理： 跨日预约所有数据都在list中， 每一组预约通过groupId进行分组
+    // 通过obj 记录下每个GroupId第一次出现的时机，  第一次出现需要设置 metadata.multiDayPrices
+    // 后续出现不需要设置 metadata.multiDayPrices. 节省体积
+    var isSetGroupId = obj[item === null || item === void 0 || (_item$_extend31 = item._extend) === null || _item$_extend31 === void 0 ? void 0 : _item$_extend31.groupId];
     var booking = _objectSpread(_objectSpread({
       "product": formatProducts(item),
-      "metadata": formatMetaData(item),
+      "metadata": formatMetaData(item, !isSetGroupId),
       "relation_products": formatRelationDetails(item._extend.relation_details),
       'id': item.booking_id || 0,
       "relation_id": item._extend.relation_id || 0,
@@ -577,6 +582,11 @@ var formatBookings = function formatBookings(data, values) {
       "resources": formatResource(item),
       "note": item._extend.note
     }, eventOtherParams || {}), dayParams);
+
+    // 记录下每个GroupId第一次出现的时机
+    if (!isSetGroupId) {
+      obj[item._extend.groupId] = true;
+    }
     if (isDay) {
       bookings.push(booking);
       return;
@@ -599,7 +609,7 @@ var formatBookings = function formatBookings(data, values) {
 
 /**
  * @title: 普通商品
- * @description: 
+ * @description:
  * @param {any} data
  * @return {*}
  * @Author: WangHan
@@ -610,16 +620,16 @@ var formatRelationProducts = function formatRelationProducts(data, type) {
   var list = ((_data$service = data.service) === null || _data$service === void 0 ? void 0 : _data$service.value) || [];
   // open items 下的商品
   list = list.filter(function (item) {
-    var _item$_extend31;
+    var _item$_extend32;
     return (
       // 跨日预约把普通商品加在relationProducts 活动预约按之前逻辑
-      type === 'day' ? isNormalProductByDurationSchedule(item) : ((_item$_extend31 = item._extend) === null || _item$_extend31 === void 0 ? void 0 : _item$_extend31.holder_id) && appointmentTypes.includes(item.extension_type)
+      type === 'day' ? isNormalProductByDurationSchedule(item) : ((_item$_extend32 = item._extend) === null || _item$_extend32 === void 0 ? void 0 : _item$_extend32.holder_id) && appointmentTypes.includes(item.extension_type)
     );
   });
   var relationProducts = [];
   relationProducts = list.map(function (item) {
-    var _item$_extend32;
-    if (!((_item$_extend32 = item._extend) !== null && _item$_extend32 !== void 0 && _item$_extend32.unique_identification_number)) {
+    var _item$_extend33;
+    if (!((_item$_extend33 = item._extend) !== null && _item$_extend33 !== void 0 && _item$_extend33.unique_identification_number)) {
       var unique_identification_number = getUniqueId();
       item._extend.unique_identification_number = unique_identification_number;
     }
@@ -638,8 +648,8 @@ var formatNormalProducts = function formatNormalProducts(data) {
   });
   var relationProducts = [];
   relationProducts = list.map(function (item) {
-    var _item$_extend33;
-    if (!((_item$_extend33 = item._extend) !== null && _item$_extend33 !== void 0 && _item$_extend33.unique_identification_number)) {
+    var _item$_extend34;
+    if (!((_item$_extend34 = item._extend) !== null && _item$_extend34 !== void 0 && _item$_extend34.unique_identification_number)) {
       var unique_identification_number = getUniqueId();
       item._extend.unique_identification_number = unique_identification_number;
     }
@@ -650,7 +660,7 @@ var formatNormalProducts = function formatNormalProducts(data) {
 
 /**
  * @title: 预约主体信息
- * @description: 
+ * @description:
  * @param {any} state
  * @param {any} values
  * @return {*}
@@ -683,15 +693,15 @@ var formatHolder = function formatHolder(state, values) {
 
 // https://menutech.w.eolink.com/home/api-studio/inside/K2bI3n465fe7244b3dbd6679d87caedfbb0636bf8c29eda/api/2778666/detail/53001549?spaceKey=menutech
 export var formatValues = function formatValues(state) {
-  var _values, _values3;
+  var _values, _values3, _state$contacts_info;
   var values = {
-    type: state.renderType === 'eventBooking' ? "event_booking_v2" : "appointment_booking",
-    platform: state.isBookingTicket2 ? "pos" : "shop",
-    sales_channel: "my_pisel",
-    order_sales_channel: state.isBookingTicket2 ? "pos" : "online_store",
+    type: state.renderType === 'eventBooking' ? 'event_booking_v2' : 'appointment_booking',
+    platform: state.isBookingTicket2 ? 'pos' : 'shop',
+    sales_channel: 'my_pisel',
+    order_sales_channel: state.isBookingTicket2 ? 'pos' : 'online_store',
     bookings: [],
     customer_id: 1,
-    customer_name: "",
+    customer_name: '',
     holder: {},
     relation_products: [],
     metadata: {}
@@ -720,7 +730,7 @@ export var formatValues = function formatValues(state) {
   values.holder = formatHolder(state, values);
   // todo
   if (isDay || isEvent) {
-    values.relation_products = formatRelationProducts(state, isDay ? "day" : "event");
+    values.relation_products = formatRelationProducts(state, isDay ? 'day' : 'event');
   } else {
     var _values$relation_prod;
     values.relation_products = formatNormalProducts(state);
@@ -749,6 +759,9 @@ export var formatValues = function formatValues(state) {
   if (!((_values3 = values) !== null && _values3 !== void 0 && (_values3 = _values3.bookings) !== null && _values3 !== void 0 && _values3.length)) {
     values.type = 'virtual';
   }
+
+  // 联系信息
+  values.contacts_info = ((_state$contacts_info = state.contacts_info) === null || _state$contacts_info === void 0 ? void 0 : _state$contacts_info.value) || null;
   return values;
 };
 
@@ -757,19 +770,19 @@ export var checkHolderIsError = function checkHolderIsError(state) {
   var _state$client;
   var errorRowKey = "";
   var holderError = state.service.value.some(function (item) {
-    var _item$_extend35;
+    var _item$_extend36;
     // 普通商品不需要检测holder
     if (isNormalProductByDurationSchedule(item)) {
       return false;
     }
     if (item._extend.quantity === 1 && !item._extend.holder_id) {
-      var _item$_extend34;
-      errorRowKey = genRowKey(item === null || item === void 0 || (_item$_extend34 = item._extend) === null || _item$_extend34 === void 0 || (_item$_extend34 = _item$_extend34.other) === null || _item$_extend34 === void 0 ? void 0 : _item$_extend34.rowKey);
+      var _item$_extend35;
+      errorRowKey = genRowKey(item === null || item === void 0 || (_item$_extend35 = item._extend) === null || _item$_extend35 === void 0 || (_item$_extend35 = _item$_extend35.other) === null || _item$_extend35 === void 0 ? void 0 : _item$_extend35.rowKey);
       return true;
     }
-    if (item._extend.quantity > 1 && ((_item$_extend35 = item._extend) === null || _item$_extend35 === void 0 || (_item$_extend35 = _item$_extend35.holder_id) === null || _item$_extend35 === void 0 ? void 0 : _item$_extend35.length) !== item._extend.quantity) {
-      var _item$_extend36;
-      errorRowKey = genRowKey(item === null || item === void 0 || (_item$_extend36 = item._extend) === null || _item$_extend36 === void 0 || (_item$_extend36 = _item$_extend36.other) === null || _item$_extend36 === void 0 ? void 0 : _item$_extend36.rowKey);
+    if (item._extend.quantity > 1 && ((_item$_extend36 = item._extend) === null || _item$_extend36 === void 0 || (_item$_extend36 = _item$_extend36.holder_id) === null || _item$_extend36 === void 0 ? void 0 : _item$_extend36.length) !== item._extend.quantity) {
+      var _item$_extend37;
+      errorRowKey = genRowKey(item === null || item === void 0 || (_item$_extend37 = item._extend) === null || _item$_extend37 === void 0 || (_item$_extend37 = _item$_extend37.other) === null || _item$_extend37 === void 0 ? void 0 : _item$_extend37.rowKey);
       return true;
     }
     return false;

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

@@ -9,7 +9,7 @@ import useSendModal from "./sendModal/useSendModal";
 import SendModal from "./sendModal";
 import { locales } from '@pisell/utils';
 var Footer = function Footer(_ref) {
-  var _state$client6, _state$form, _state$client7;
+  var _state$client2, _state$contacts_info2, _state$form, _state$client3;
   var state = _ref.state,
     reload = _ref.reload;
   var _useSendModal = useSendModal(state === null || state === void 0 ? void 0 : state.bookingId),
@@ -38,17 +38,31 @@ var Footer = function Footer(_ref) {
     };
   }();
   var defaultValues = useMemo(function () {
-    var _state$client, _state$client2, _state$client3, _state$client4, _state$client5;
+    var _state$contacts_info, _state$client;
+    // 优先取contacts_info中的phone和email，如果不存在则取客户信息中的phone和email
+    var _ref3 = ((_state$contacts_info = state.contacts_info) === null || _state$contacts_info === void 0 ? void 0 : _state$contacts_info.value) || {},
+      contactsEmail = _ref3.email,
+      contactsPhone = _ref3.phone;
+    var _ref4 = ((_state$client = state.client) === null || _state$client === void 0 ? void 0 : _state$client.value) || {},
+      clientEmail = _ref4.email,
+      clientPhone = _ref4.phone,
+      clientCode = _ref4.country_calling_code;
+    var email = contactsEmail || clientEmail;
+    var phone = (contactsPhone === null || contactsPhone === void 0 ? void 0 : contactsPhone.phone) || clientPhone;
+    var code = (contactsPhone === null || contactsPhone === void 0 ? void 0 : contactsPhone.country_calling_code) || clientCode || '+61';
+    if (!code.startsWith('+')) {
+      code = "+".concat(code);
+    }
     return {
-      sendSms: !!((_state$client = state.client) !== null && _state$client !== void 0 && (_state$client = _state$client.value) !== null && _state$client !== void 0 && _state$client.phone),
-      sendEmail: !!((_state$client2 = state.client) !== null && _state$client2 !== void 0 && (_state$client2 = _state$client2.value) !== null && _state$client2 !== void 0 && _state$client2.email),
-      email: (_state$client3 = state.client) === null || _state$client3 === void 0 || (_state$client3 = _state$client3.value) === null || _state$client3 === void 0 ? void 0 : _state$client3.email,
+      sendSms: !!phone,
+      sendEmail: !!email,
+      email: email,
       phone: {
-        code: (_state$client4 = state.client) === null || _state$client4 === void 0 || (_state$client4 = _state$client4.value) === null || _state$client4 === void 0 ? void 0 : _state$client4.country_calling_code,
-        phone: (_state$client5 = state.client) === null || _state$client5 === void 0 || (_state$client5 = _state$client5.value) === null || _state$client5 === void 0 ? void 0 : _state$client5.phone
+        code: code,
+        phone: phone
       }
     };
-  }, [(_state$client6 = state.client) === null || _state$client6 === void 0 ? void 0 : _state$client6.value]);
+  }, [(_state$client2 = state.client) === null || _state$client2 === void 0 ? void 0 : _state$client2.value, (_state$contacts_info2 = state.contacts_info) === null || _state$contacts_info2 === void 0 ? void 0 : _state$contacts_info2.value]);
   if (!state.bookingId || !(state !== null && state !== void 0 && (_state$form = state.form) !== null && _state$form !== void 0 && _state$form.forms.length)) {
     return null;
   }
@@ -65,8 +79,8 @@ var Footer = function Footer(_ref) {
     block: true,
     type: "primary",
     onClick: handleOpen
-  }, locales.getText('pisell2.text.send-form-reminder')), /*#__PURE__*/React.createElement(SendModal, {
-    refreshKey: (_state$client7 = state.client) === null || _state$client7 === void 0 || (_state$client7 = _state$client7.value) === null || _state$client7 === void 0 ? void 0 : _state$client7.id,
+  }, locales.getText('pisell2.text.send-form-reminder')), open && /*#__PURE__*/React.createElement(SendModal, {
+    refreshKey: (_state$client3 = state.client) === null || _state$client3 === void 0 || (_state$client3 = _state$client3.value) === null || _state$client3 === void 0 ? void 0 : _state$client3.id,
     open: open,
     onCancel: function onCancel() {
       return setOpen(false);