@pisell/private-materials 6.5.27 → 6.5.28

package/lib/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/lib/components/authentication/admin/index.js

@@ -0,0 +1,83 @@
+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/authentication/admin/index.ts
+var admin_exports = {};
+__export(admin_exports, {
+  AuthMethodCategory: () => import_AuthMethods.AuthMethodCategory,
+  AuthMethodType: () => import_AuthMethods.AuthMethodType,
+  AuthenticationMethods: () => import_AuthenticationMethods.default,
+  ChannelAuthSetting: () => import_ChannelAuthSetting.default,
+  CollectInfo: () => import_CollectInfo.default,
+  CustomerAuth: () => import_CustomerAuth.default,
+  CustomerOAuthConfig: () => import_CustomerOAuthConfig.default,
+  DeviceAuth: () => import_DeviceAuth.default,
+  OAuthConfig: () => import_OAuthConfig.default,
+  OnlineShopAuth: () => import_OnlineShopAuth.default,
+  OrgAdminAuth: () => import_OrgAdminAuth.default,
+  POSOperatorAuth: () => import_POSOperatorAuth.default,
+  PageSetting: () => import_PageSetting.default,
+  PageSettingItem: () => import_PageSettingItem.default,
+  SaaSAdminAuth: () => import_SaaSAdminAuth.default,
+  SaaSManagermentAuth: () => import_SaaSManagermentAuth.default
+});
+module.exports = __toCommonJS(admin_exports);
+var import_AuthMethods = require("./AuthMethods");
+var import_ChannelAuthSetting = __toESM(require("./ChannelAuthSetting"));
+var import_PageSetting = __toESM(require("./ChannelAuthSetting/PageSetting"));
+var import_PageSettingItem = __toESM(require("./ChannelAuthSetting/PageSettingItem"));
+var import_AuthenticationMethods = __toESM(require("./ChannelAuthSetting/AuthenticationMethods"));
+var import_CollectInfo = __toESM(require("./ChannelAuthSetting/CollectInfo"));
+var import_SaaSAdminAuth = __toESM(require("./SaaSAdminAuth"));
+var import_OrgAdminAuth = __toESM(require("./OrgAdminAuth"));
+var import_OAuthConfig = __toESM(require("./OAuthConfig"));
+var import_CustomerAuth = __toESM(require("./CustomerAuth"));
+var import_CustomerOAuthConfig = __toESM(require("./CustomerOAuthConfig"));
+var import_DeviceAuth = __toESM(require("./DeviceAuth"));
+var import_POSOperatorAuth = __toESM(require("./POSOperatorAuth"));
+var import_OnlineShopAuth = __toESM(require("./ChannelAuthSetting/OnlineShopAuth"));
+var import_SaaSManagermentAuth = __toESM(require("./ChannelAuthSetting/SaaSManagermentAuth"));
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  AuthMethodCategory,
+  AuthMethodType,
+  AuthenticationMethods,
+  ChannelAuthSetting,
+  CollectInfo,
+  CustomerAuth,
+  CustomerOAuthConfig,
+  DeviceAuth,
+  OAuthConfig,
+  OnlineShopAuth,
+  OrgAdminAuth,
+  POSOperatorAuth,
+  PageSetting,
+  PageSettingItem,
+  SaaSAdminAuth,
+  SaaSManagermentAuth
+});

package/lib/components/booking/components/TabProduct/selectProductItem/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import "./index.less";
 declare const SelectProductItem: ({ item, onClick, onChangeQuantity, amountSymbol, style, className, disabled, }: any) => JSX.Element;
 export default SelectProductItem;

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

@@ -1 +1,2 @@
+/// <reference types="react" />
 export declare const renderBundles: (item: any, amountSymbol: string) => JSX.Element;

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

@@ -165,14 +165,37 @@ var CustomSelect = (props, ref) => {
   const renderList = (0, import_react.useMemo)(() => {
     let _list = [...options];
     if (search) {
-      const isIncludes = (str) => {
-        return str.toLowerCase().indexOf(search.toLowerCase()) !== -1;
+      const isIncludes = (item) => {
+        try {
+          const q = search.toLowerCase();
+          const numericKeys = Object.keys(item).filter((k) => /^\d+$/.test(k));
+          const customerKeys = [
+            "customer_nickname",
+            "customer_first_name",
+            "customer_last_name",
+            "customer_phone",
+            "customer_email"
+          ];
+          const allKeys = [...numericKeys, ...customerKeys];
+          return allKeys.some((k) => {
+            const val = item[k];
+            if (val === null || val === void 0) return false;
+            try {
+              const str = JSON.stringify(val);
+              return str.includes(q) || str.toLocaleLowerCase().includes(q);
+            } catch (error) {
+              return false;
+            }
+          });
+        } catch (e) {
+          return false;
+        }
       };
       _list = _list.filter((d) => {
         if (filterItem) {
           return filterItem(d, search);
         }
-        return isIncludes(d.main_field || "");
+        return isIncludes(d);
       });
     }
     return _list;
@@ -274,7 +297,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/components/emptyBooking/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 /**
  * @title: 空状态
  * @description:

package/lib/components/booking/components/footer/FooterMenus/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import "./index.less";
 declare const FooterMenus: ({ state, menuChange, items }: any) => JSX.Element | null;
 export default FooterMenus;

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

@@ -205,7 +205,7 @@ var Footer = (props) => {
     return false;
   }, [(_h = state.addons) == null ? void 0 : _h.edit]);
   const infoEdit = (0, import_react.useMemo)(() => {
-    var _a2, _b2, _c2, _d2, _e2, _f2;
+    var _a2, _b2, _c2, _d2, _e2, _f2, _g2;
     if (!state.bookingId) {
       return true;
     }
@@ -227,6 +227,9 @@ var Footer = (props) => {
     if ((_f2 = state.contacts) == null ? void 0 : _f2.edit) {
       return true;
     }
+    if ((_g2 = state.contacts_info) == null ? void 0 : _g2.edit) {
+      return true;
+    }
     return false;
   }, [state]);
   const isEdit = (0, import_react.useMemo)(() => {
@@ -464,7 +467,11 @@ var Footer = (props) => {
     (_l = (_k = state.client) == null ? void 0 : _k.value) == null ? void 0 : _l.id
   ]);
   const handleCheckoutInternal = async () => {
-    (0, import_PaymentResultToast.closeAllPaymentResultToasts)();
+    var _a2, _b2, _c2;
+    const isToastMode = ((_c2 = (_b2 = (_a2 = state == null ? void 0 : state.bookingConfig) == null ? void 0 : _a2.config) == null ? void 0 : _b2.payment_setting) == null ? void 0 : _c2.payment_result_display_mode) !== "modal";
+    if (isToastMode) {
+      (0, import_PaymentResultToast.closeAllPaymentResultToasts)();
+    }
     const isNewOrder = !state.bookingId;
     if (isEdit) {
       if ((0, import_utils2.isDayBooking)(state)) {
@@ -491,18 +498,18 @@ var Footer = (props) => {
         setIsPaymentModalOpen(true);
         setCheckoutLoading(false);
         setPaymentCallback(() => (paymentResult) => {
-          var _a2, _b2, _c2, _d2;
+          var _a3, _b3, _c3, _d2;
           console.log("Payment result:", paymentResult);
           setIsPaymentModalOpen(false);
           if ((paymentResult == null ? void 0 : paymentResult.status) === "success") {
             console.log("Payment completed successfully");
-            (_b2 = (_a2 = window == null ? void 0 : window.shopApi) == null ? void 0 : _a2.bookingTicket) == null ? void 0 : _b2.clearAllCart();
+            (_b3 = (_a3 = window == null ? void 0 : window.shopApi) == null ? void 0 : _a3.bookingTicket) == null ? void 0 : _b3.clearAllCart();
             setPaymentModalData(null);
             setPaymentCallback(null);
           } else if ((paymentResult == null ? void 0 : paymentResult.status) === "cancelled") {
             console.log("Payment cancelled");
             if (res == null ? void 0 : res.order_id) {
-              (_d2 = (_c2 = window == null ? void 0 : window.shopApi) == null ? void 0 : _c2.booking) == null ? void 0 : _d2.voidBooking(res.order_id);
+              (_d2 = (_c3 = window == null ? void 0 : window.shopApi) == null ? void 0 : _c3.booking) == null ? void 0 : _d2.voidBooking(res.order_id);
             }
             setPaymentModalData(null);
             setPaymentCallback(null);
@@ -593,8 +600,11 @@ var Footer = (props) => {
     messageShow = true,
     noSubmit = false
   }) => {
-    var _a2, _b2, _c2, _d2, _e2;
-    (0, import_PaymentResultToast.closeAllPaymentResultToasts)();
+    var _a2, _b2, _c2, _d2, _e2, _f2, _g2, _h2;
+    const isToastMode = ((_c2 = (_b2 = (_a2 = state == null ? void 0 : state.bookingConfig) == null ? void 0 : _a2.config) == null ? void 0 : _b2.payment_setting) == null ? void 0 : _c2.payment_result_display_mode) !== "modal";
+    if (isToastMode) {
+      (0, import_PaymentResultToast.closeAllPaymentResultToasts)();
+    }
     if ((0, import_utils2.isDayBooking)(state)) {
       const isHasDayProducts = handleDaySubmit();
       if (isHasDayProducts) return;
@@ -609,7 +619,7 @@ var Footer = (props) => {
     const createApi = state.renderType === "eventBooking" ? import_serve2.createEventBooking : createBooking;
     let saveOtherValue = {};
     if (type === "save") {
-      saveOtherValue = await ((_a2 = state == null ? void 0 : state.onSave) == null ? void 0 : _a2.call(state, state.client)) || {};
+      saveOtherValue = await ((_d2 = state == null ? void 0 : state.onSave) == null ? void 0 : _d2.call(state, state.client)) || {};
     }
     try {
       let callbackData = null;
@@ -655,7 +665,7 @@ var Footer = (props) => {
           { key: "日期", value: (0, import_dayjs.default)().format("YYYY-MM-DD HH:mm") },
           {
             key: "店铺id",
-            value: (_e2 = (_d2 = (_c2 = (_b2 = store == null ? void 0 : store.getState) == null ? void 0 : _b2.call(store)) == null ? void 0 : _c2.global) == null ? void 0 : _d2.globalConfig) == null ? void 0 : _e2.id
+            value: (_h2 = (_g2 = (_f2 = (_e2 = store == null ? void 0 : store.getState) == null ? void 0 : _e2.call(store)) == null ? void 0 : _f2.global) == null ? void 0 : _g2.globalConfig) == null ? void 0 : _h2.id
           },
           {
             key: "shopApi",

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

@@ -74,10 +74,10 @@ var formatProductOption = (option) => {
   }
   return option.map((d) => {
     return {
-      "num": d.num,
-      "option_group_item_id": d.product_option_item_id || d.option_group_item_id,
-      "option_group_id": d.option_group_id,
-      "custom_add_price": Number(d == null ? void 0 : d.add_price)
+      num: d.num,
+      option_group_item_id: d.product_option_item_id || d.option_group_item_id,
+      option_group_id: d.option_group_id,
+      custom_add_price: Number(d == null ? void 0 : d.add_price)
     };
   });
 };
@@ -95,7 +95,9 @@ var formatProductBundle = (bundle) => {
     return;
   }
   try {
-    const errorBundles = bundle == null ? void 0 : bundle.filter((d) => !(d == null ? void 0 : d.group_id) || !(d == null ? void 0 : d.id) || !(d == null ? void 0 : d._bundle_product_id));
+    const errorBundles = bundle == null ? void 0 : bundle.filter(
+      (d) => !(d == null ? void 0 : d.group_id) || !(d == null ? void 0 : d.id) || !(d == null ? void 0 : d._bundle_product_id)
+    );
     if ((errorBundles == null ? void 0 : errorBundles.length) > 0) {
       log(errorBundles);
     }
@@ -118,7 +120,7 @@ var formatProductBundle = (bundle) => {
       // checkout 2.0 新增
       "price_type": d == null ? void 0 : d.price_type,
       // checkout 2.0 新增
-      "custom_price": new import_decimal.default(d == null ? void 0 : d.price).sub(option_price).toNumber().toFixed(2),
+      "custom_price": Math.abs(new import_decimal.default(d == null ? void 0 : d.price).sub(option_price).toNumber()).toFixed(2),
       "custom_price_type": d == null ? void 0 : d.price_type,
       "option": option
     };
@@ -179,11 +181,14 @@ var formatResource = (service) => {
     return void 0;
   }
   try {
-    return Object.values(service._extend.resource).reduce((pre, cur) => {
-      const newList = checkResourcesFormat(cur, service);
-      pre = pre.concat(newList);
-      return pre;
-    }, []);
+    return Object.values(service._extend.resource).reduce(
+      (pre, cur) => {
+        const newList = checkResourcesFormat(cur, service);
+        pre = pre.concat(newList);
+        return pre;
+      },
+      []
+    );
   } catch (err) {
     return void 0;
   }
@@ -210,7 +215,9 @@ var formatProductPrice = (item) => {
   const other = (_a = item._extend) == null ? void 0 : _a.other;
   let price = Number((_b = item._extend) == null ? void 0 : _b.price);
   if ((other == null ? void 0 : other.product_variant_id) > 0 && ((_c = item == null ? void 0 : item.variant) == null ? void 0 : _c.length) > 0) {
-    const variant = item.variant.find((d) => d.id === (other == null ? void 0 : other.product_variant_id));
+    const variant = item.variant.find(
+      (d) => d.id === (other == null ? void 0 : other.product_variant_id)
+    );
     if (variant) {
       price = Number(variant == null ? void 0 : variant.price) || 0;
     }
@@ -230,7 +237,7 @@ var formatSellingPrice = (item) => {
   var _a;
   return Number((_a = item._extend) == null ? void 0 : _a.total);
 };
-var formatMetaData = (item) => {
+var formatMetaData = (item, isMultiDayPrices) => {
   var _a, _b, _c, _d, _e, _f, _g;
   let metadata = {};
   if ((_a = item._extend) == null ? void 0 : _a.capacity) {
@@ -242,7 +249,7 @@ var formatMetaData = (item) => {
   if ((_b = item._extend) == null ? void 0 : _b.holder_id) {
     metadata.holder_id = (_c = item._extend) == null ? void 0 : _c.holder_id;
   }
-  if ((_d = item._extend) == null ? void 0 : _d.multiDayPrices) {
+  if (isMultiDayPrices && ((_d = item._extend) == null ? void 0 : _d.multiDayPrices)) {
     metadata.multiDayPrices = (_e = item._extend) == null ? void 0 : _e.multiDayPrices;
   }
   if ((_f = item._extend) == null ? void 0 : _f.unique_identification_number) {
@@ -255,7 +262,9 @@ var getSourceProductPrice = (item) => {
   const other = (_a = item._extend) == null ? void 0 : _a.other;
   let price = Number((_b = item._extend) == null ? void 0 : _b.price);
   if ((other == null ? void 0 : other.product_variant_id) > 0 && ((_c = item == null ? void 0 : item.variant) == null ? void 0 : _c.length) > 0) {
-    const variant = item.variant.find((d) => d.id === (other == null ? void 0 : other.product_variant_id));
+    const variant = item.variant.find(
+      (d) => d.id === (other == null ? void 0 : other.product_variant_id)
+    );
     if (variant) {
       price = Number(variant == null ? void 0 : variant.price) || 0;
     }
@@ -275,45 +284,49 @@ var formatProducts = (item, quantity) => {
       unique_identification_number: `${item._extend.unique_identification_number}_${d.discount.resource_id}`
     };
   });
-  const notManualDiscount = discount_list.filter((item2) => item2.type !== "product");
+  const notManualDiscount = discount_list.filter(
+    (item2) => item2.type !== "product"
+  );
   if (item.isCustomItem) {
     item.product_id = 0;
   }
   return {
-    "name": item.name,
-    "num": quantity || item._extend.quantity,
-    "price": formatProductPrice(item),
-    "source_product_price": getSourceProductPrice(item),
-    "product_id": (item == null ? void 0 : item.product_id) || item.product_id === 0 ? item.product_id : item.id,
-    "discount_amount": notManualDiscount.length > 0 ? 0 : discount_amount,
-    "product_discount_reason": item._extend.discount_reason || "",
-    "is_charge_tax": item.is_charge_tax,
-    "note": ((_a = item._extend) == null ? void 0 : _a.note) || "",
-    "discountway": item._extend.discountway || "num",
-    "discount_per": item._extend.discount_per,
-    "discount_type": item._extend.discount_type || discount_type,
-    "order_detail_id": item._extend.order_detail_id || 0,
-    "product_bundle": formatProductBundle((_c = (_b = item._extend) == null ? void 0 : _b.other) == null ? void 0 : _c.bundle),
-    "bundle_edit": item._extend.bundle_edit,
-    "product_option_item": formatProductOption((_e = (_d = item._extend) == null ? void 0 : _d.other) == null ? void 0 : _e.option),
-    "product_variant_id": ((_g = (_f = item._extend) == null ? void 0 : _f.other) == null ? void 0 : _g.product_variant_id) || 0,
-    "discount_list": notManualDiscount,
-    metadata: formatMetaData(item),
+    name: item.name,
+    num: quantity || item._extend.quantity,
+    price: formatProductPrice(item),
+    source_product_price: getSourceProductPrice(item),
+    product_id: (item == null ? void 0 : item.product_id) || item.product_id === 0 ? item.product_id : item.id,
+    discount_amount: notManualDiscount.length > 0 ? 0 : discount_amount,
+    product_discount_reason: item._extend.discount_reason || "",
+    is_charge_tax: item.is_charge_tax,
+    note: ((_a = item._extend) == null ? void 0 : _a.note) || "",
+    discountway: item._extend.discountway || "num",
+    discount_per: item._extend.discount_per,
+    discount_type: item._extend.discount_type || discount_type,
+    order_detail_id: item._extend.order_detail_id || 0,
+    product_bundle: formatProductBundle((_c = (_b = item._extend) == null ? void 0 : _b.other) == null ? void 0 : _c.bundle),
+    bundle_edit: item._extend.bundle_edit,
+    product_option_item: formatProductOption((_e = (_d = item._extend) == null ? void 0 : _d.other) == null ? void 0 : _e.option),
+    product_variant_id: ((_g = (_f = item._extend) == null ? void 0 : _f.other) == null ? void 0 : _g.product_variant_id) || 0,
+    discount_list: notManualDiscount,
+    metadata: formatMetaData(item, false),
     // checkout 需求新增字段
-    "calculated_original_price": formatOriginalPrice(item),
-    "calculated_selling_price": formatSellingPrice(item),
-    "tax_fee": item._extend.tax_fee,
-    "custom_deposit_data": item.custom_deposit_data
+    calculated_original_price: formatOriginalPrice(item),
+    calculated_selling_price: formatSellingPrice(item),
+    tax_fee: item._extend.tax_fee,
+    custom_deposit_data: item.custom_deposit_data
   };
 };
 var formatAppointmentProductLists = (data) => {
   var _a;
   try {
     let list = data.service.value;
-    list = list.filter((item) => {
-      var _a2;
-      return ((_a2 = item._extend) == null ? void 0 : _a2.holder_id) && !(0, import_utils4.isNormalProductByDurationSchedule)(item);
-    });
+    list = list.filter(
+      (item) => {
+        var _a2;
+        return ((_a2 = item._extend) == null ? void 0 : _a2.holder_id) && !(0, import_utils4.isNormalProductByDurationSchedule)(item);
+      }
+    );
     const groupMap = /* @__PURE__ */ new Map();
     list.forEach((item) => {
       var _a2;
@@ -323,7 +336,10 @@ var formatAppointmentProductLists = (data) => {
       }
       groupMap.get(key).push(item);
     });
-    const result = (_a = Array.from(groupMap.values())) == null ? void 0 : _a.reduce((acc, group) => acc.concat(group), []);
+    const result = (_a = Array.from(groupMap.values())) == null ? void 0 : _a.reduce(
+      (acc, group) => acc.concat(group),
+      []
+    );
     return list || [];
   } catch (error) {
   }
@@ -354,8 +370,9 @@ var formatBookings = (data, values) => {
   let dayParams = {};
   const eventOtherParams = data.eventOtherParams;
   let bookings = [];
+  let obj = {};
   list.forEach((item) => {
-    var _a, _b, _c, _d, _e;
+    var _a, _b, _c, _d, _e, _f;
     if (item.isCustomItem) {
       bookings.push({
         ...item._extend,
@@ -375,22 +392,29 @@ var formatBookings = (data, values) => {
     if (isDay) {
       const startDate = ((_a = item._extend) == null ? void 0 : _a.startDate) || ((_b = item._extend) == null ? void 0 : _b.start_date);
       const endDate = ((_c = item._extend) == null ? void 0 : _c.endDate) || ((_d = item._extend) == null ? void 0 : _d.end_date);
-      const { startDateTime, endDateTime } = (0, import_utils4.formatDayTime)({ startDate, endDate });
+      const { startDateTime, endDateTime } = (0, import_utils4.formatDayTime)({
+        startDate,
+        endDate
+      });
       start_date = (0, import_dayjs.default)(startDateTime).format("YYYY-MM-DD");
       start_time = (0, import_dayjs.default)(startDateTime).format("HH:mm");
       end_date = (0, import_dayjs.default)(endDateTime).format("YYYY-MM-DD");
       end_time = (0, import_dayjs.default)(endDateTime).format("HH:mm");
       dayParams.relation_products = (item == null ? void 0 : item.relation_products) || [];
       dayParams.holder = formatHolders(data, item, values);
-      dayParams.duration = (0, import_utils3.getDays)({ _extend: { start_date: startDateTime, end_date: endDateTime } }, "minutes");
+      dayParams.duration = (0, import_utils3.getDays)(
+        { _extend: { start_date: startDateTime, end_date: endDateTime } },
+        "minutes"
+      );
     }
     if (!((_e = item._extend) == null ? void 0 : _e.unique_identification_number)) {
       const unique_identification_number = (0, import_utils5.getUniqueId)();
       item._extend.unique_identification_number = unique_identification_number;
     }
+    const isSetGroupId = obj[(_f = item == null ? void 0 : item._extend) == null ? void 0 : _f.groupId];
     const booking = {
       "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,
@@ -411,6 +435,9 @@ var formatBookings = (data, values) => {
       ...eventOtherParams || {},
       ...dayParams
     };
+    if (!isSetGroupId) {
+      obj[item._extend.groupId] = true;
+    }
     if (isDay) {
       bookings.push(booking);
       return;
@@ -423,7 +450,7 @@ var formatBookings = (data, values) => {
         "product": formatProducts(newItem, 1),
         "number": item._extend.capacity ? (0, import_utilsByBooking.getSumCapacity)({ cacheItem: newItem }, false) : newItem._extend.number || 1,
         "holder": getHolderByIndex(booking.holder, i),
-        "metadata": formatMetaData(newItem)
+        "metadata": formatMetaData(newItem, false)
       });
     }
   });
@@ -485,7 +512,7 @@ var formatHolder = (state, values) => {
   return obj;
 };
 var formatValues = (state) => {
-  var _a, _b, _c, _d, _e, _f, _g;
+  var _a, _b, _c, _d, _e, _f, _g, _h;
   let values = {
     type: state.renderType === "eventBooking" ? "event_booking_v2" : "appointment_booking",
     platform: state.isBookingTicket2 ? "pos" : "shop",
@@ -517,7 +544,10 @@ var formatValues = (state) => {
   };
   values.holder = formatHolder(state, values);
   if (isDay || isEvent) {
-    values.relation_products = formatRelationProducts(state, isDay ? "day" : "event");
+    values.relation_products = formatRelationProducts(
+      state,
+      isDay ? "day" : "event"
+    );
   } else {
     values.relation_products = formatNormalProducts(state);
     if (!((_b = values.relation_products) == null ? void 0 : _b.length)) {
@@ -536,6 +566,7 @@ var formatValues = (state) => {
   if (!((_g = values == null ? void 0 : values.bookings) == null ? void 0 : _g.length)) {
     values.type = "virtual";
   }
+  values.contacts_info = ((_h = state.contacts_info) == null ? void 0 : _h.value) || null;
   return values;
 };
 var checkHolderIsError = (state) => {

package/lib/components/booking/components/formItemChildrenWrap/index.d.ts

@@ -1,2 +1,3 @@
+/// <reference types="react" />
 declare const FormItemChildrenWrap: (props: any) => JSX.Element;
 export default FormItemChildrenWrap;

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

@@ -39,31 +39,49 @@ var import_useSendModal = __toESM(require("./sendModal/useSendModal"));
 var import_sendModal = __toESM(require("./sendModal"));
 var import_utils = require("@pisell/utils");
 var Footer = ({ state, reload }) => {
-  var _a, _b, _c, _d;
+  var _a, _b, _c, _d, _e;
   const { open, setOpen, handleOpen, handleValuesChange, handleOk } = (0, import_useSendModal.default)(state == null ? void 0 : state.bookingId);
   const handleReload = async () => {
     await reload();
     import_materials.message.success(import_utils.locales.getText("pisell2.text.send-form-reminder-refresh"));
   };
   const defaultValues = (0, import_react.useMemo)(() => {
-    var _a2, _b2, _c2, _d2, _e, _f, _g, _h, _i, _j;
+    var _a2, _b2;
+    const { email: contactsEmail, phone: contactsPhone } = ((_a2 = state.contacts_info) == null ? void 0 : _a2.value) || {};
+    const {
+      email: clientEmail,
+      phone: clientPhone,
+      country_calling_code: clientCode
+    } = ((_b2 = state.client) == null ? void 0 : _b2.value) || {};
+    let email = contactsEmail || clientEmail;
+    let phone = (contactsPhone == null ? void 0 : contactsPhone.phone) || clientPhone;
+    let code = (contactsPhone == null ? void 0 : contactsPhone.country_calling_code) || clientCode || "+61";
+    if (!code.startsWith("+")) {
+      code = `+${code}`;
+    }
     return {
-      sendSms: !!((_b2 = (_a2 = state.client) == null ? void 0 : _a2.value) == null ? void 0 : _b2.phone),
-      sendEmail: !!((_d2 = (_c2 = state.client) == null ? void 0 : _c2.value) == null ? void 0 : _d2.email),
-      email: (_f = (_e = state.client) == null ? void 0 : _e.value) == null ? void 0 : _f.email,
+      sendSms: !!phone,
+      sendEmail: !!email,
+      email,
       phone: {
-        code: (_h = (_g = state.client) == null ? void 0 : _g.value) == null ? void 0 : _h.country_calling_code,
-        phone: (_j = (_i = state.client) == null ? void 0 : _i.value) == null ? void 0 : _j.phone
+        code,
+        phone
       }
     };
-  }, [(_a = state.client) == null ? void 0 : _a.value]);
-  if (!state.bookingId || !((_b = state == null ? void 0 : state.form) == null ? void 0 : _b.forms.length)) {
+  }, [(_a = state.client) == null ? void 0 : _a.value, (_b = state.contacts_info) == null ? void 0 : _b.value]);
+  if (!state.bookingId || !((_c = state == null ? void 0 : state.form) == null ? void 0 : _c.forms.length)) {
     return null;
   }
-  return /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-form-footer" }, /* @__PURE__ */ import_react.default.createElement(import_materials.Tooltip, { title: import_utils.locales.getText("pisell2.text.send-form-reminder-tooltip") }, /* @__PURE__ */ import_react.default.createElement(import_materials.Button, { size: "large", icon: /* @__PURE__ */ import_react.default.createElement(import_icons.ReloadOutlined, null), onClick: handleReload })), /* @__PURE__ */ import_react.default.createElement(import_materials.Button, { size: "large", block: true, type: "primary", onClick: handleOpen }, import_utils.locales.getText("pisell2.text.send-form-reminder")), /* @__PURE__ */ import_react.default.createElement(
+  return /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-form-footer" }, /* @__PURE__ */ import_react.default.createElement(
+    import_materials.Tooltip,
+    {
+      title: import_utils.locales.getText("pisell2.text.send-form-reminder-tooltip")
+    },
+    /* @__PURE__ */ import_react.default.createElement(import_materials.Button, { size: "large", icon: /* @__PURE__ */ import_react.default.createElement(import_icons.ReloadOutlined, null), onClick: handleReload })
+  ), /* @__PURE__ */ import_react.default.createElement(import_materials.Button, { size: "large", block: true, type: "primary", onClick: handleOpen }, import_utils.locales.getText("pisell2.text.send-form-reminder")), open && /* @__PURE__ */ import_react.default.createElement(
     import_sendModal.default,
     {
-      refreshKey: (_d = (_c = state.client) == null ? void 0 : _c.value) == null ? void 0 : _d.id,
+      refreshKey: (_e = (_d = state.client) == null ? void 0 : _d.value) == null ? void 0 : _e.id,
       open,
       onCancel: () => setOpen(false),
       onOk: handleOk,

package/lib/components/booking/forms/table/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import "./index.less";
 declare const Table: ({ value, onChange, field, mode, onAdd }: any) => JSX.Element;
 export default Table;

package/lib/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;