@pisell/private-materials 3.2.38 → 3.3.0

package/lib/components/appointmentBooking/locales.js

@@ -36,7 +36,7 @@ var locales_default = {
     "pisell2.event.close.tip": "All entered information will be lost. Are you sure you want to exit?",
     "pisell2.event.close.continue": "Continue",
     "pisell2.event.close.exit": "Exit",
-    "pisell2.event.step": (step) => `Step ${step}`,
+    "pisell2.appointment.step": (step) => `Step ${step}`,
     "pisell2.event.select.category": (val) => `Select ${val || "resource"}`,
     "pisell2.event.select.campus": (val) => `Please select ${val || "resource"}`,
     "pisell2.event.select.event": "Select service",
@@ -94,6 +94,7 @@ var locales_default = {
     "pisell2.event.capacity.limit.reached.title": "Capacity limit reached",
     "pisell2.event.capacity.limit.reached.tip": "One or more events in your cart are no longer available due to full capacity. Please remove unavailable events from your cart to complete checkout.",
     "pisell2.appointment.booking.empty.service": "No service",
+    "pisell2.appointment.booking.empty.data": "No data",
     "pisell2.appointment.booking.empty.time": "No time",
     "pisell2.appointment.service.title": (val) => `${val} ${val > 1 ? "services" : "service"}`,
     "pisell2.appointment.add.guest": "Add guest",
@@ -109,8 +110,23 @@ var locales_default = {
     "pisell2.appointment.friday": "Fri",
     "pisell2.appointment.saturday": "Sat",
     "pisell2.appointment.sunday": "Sun",
-    "pisell2.appointment.any.professional": "Any professional",
+    "pisell2.appointment.any.professional": "No preference",
     "pisell2.appointment.for.maximum.availability": "for maximum availability",
+    "pisell2.appointment.deposit": "Deposit",
+    "pisell2.appointment.deposit.agreed": "I have read and agree to the ",
+    "pisell2.appointment.deposit.agree.policy": "You need to agree the policy to proceed",
+    "pisell2.appointment.deposit.and": " & ",
+    "pisell2.appointment.deposit.amount.tip1": " needs to be paid as deposit.",
+    "pisell2.appointment.deposit.amount.tip2": " ",
+    "pisell2.appointment.deposit.close": "Close",
+    "pisell2.appointment.tips": "Tips",
+    "pisell2.appointment.tips.content": `Please carefully review the items in your shopping cart and click the "Checkout" button below to proceed with the payment.`,
+    "pisell2.appointment.fill-form": "Enter your details",
+    "pisell2.appointment.select.holder": (val) => `Please select ${val}`,
+    "pisell2.appointment.select.time": "Select time",
+    "pisell2.appointment.unselect.time": "No times available. Go back",
+    "pisell2.appointment.unselect.date": "Please select date",
+    "pisell2.appointment.add-guests": "Add guests",
     "pisell2.text.apply": "Apply",
     "pisell2.text.goodpass": "GoodPass",
     "pisell2.text.goodpass.product-vouchers": "Product Vouchers",
@@ -134,7 +150,7 @@ var locales_default = {
     "pisell2.event.close.tip": "退出后将丢失所有已填写的信息，确定要退出吗？",
     "pisell2.event.close.continue": "继续",
     "pisell2.event.close.exit": "退出",
-    "pisell2.event.step": (step) => `步骤 ${step}`,
+    "pisell2.appointment.step": (step) => `步骤 ${step}`,
     "pisell2.event.select.category": (val) => `选择${val || "资源"}`,
     "pisell2.event.select.event": "选择服务",
     "pisell2.event.select.campus": (val) => `请选择${val || "资源"}`,
@@ -192,6 +208,7 @@ var locales_default = {
     "pisell2.event.capacity.limit.reached.title": "活动名额已满",
     "pisell2.event.capacity.limit.reached.tip": "购物车中有一个或多个活动已达预约上限，请将已满额的活动从购物车中移除后再完成结算。",
     "pisell2.appointment.booking.empty.service": "暂无服务",
+    "pisell2.appointment.booking.empty.data": "暂无数据",
     "pisell2.appointment.booking.empty.time": "暂无时间",
     "pisell2.appointment.service.title": (val) => `${val}个服务`,
     "pisell2.appointment.add.guest": "添加预约人",
@@ -209,6 +226,21 @@ var locales_default = {
     "pisell2.appointment.sunday": "周日",
     "pisell2.appointment.any.professional": "随机分配",
     "pisell2.appointment.for.maximum.availability": "立即匹配",
+    "pisell2.appointment.deposit": "定金",
+    "pisell2.appointment.deposit.agreed": "我已阅读并同意 ",
+    "pisell2.appointment.deposit.agree.policy": "您需要同意协议才能继续",
+    "pisell2.appointment.deposit.and": " 和 ",
+    "pisell2.appointment.deposit.amount.tip1": "请支付 ",
+    "pisell2.appointment.deposit.amount.tip2": " 定金。",
+    "pisell2.appointment.deposit.close": "关闭",
+    "pisell2.appointment.tips": "提示",
+    "pisell2.appointment.tips.content": `请仔细查看购物车中的商品，然后点击下面的“结算”按钮继续付款。`,
+    "pisell2.appointment.fill-form": "填写信息",
+    "pisell2.appointment.select.holder": (val) => `请选择${val}`,
+    "pisell2.appointment.select.time": "选择时间",
+    "pisell2.appointment.unselect.time": "无可用时间，请返回",
+    "pisell2.appointment.unselect.date": "请选择日期",
+    "pisell2.appointment.add-guests": "添加预约人",
     "pisell2.text.apply": "应用",
     "pisell2.text.goodpass": "商品券",
     "pisell2.text.goodpass.product-vouchers": "商品兑换券",
@@ -232,7 +264,7 @@ var locales_default = {
     "pisell2.event.close.tip": "退出後將丟失所有已填寫的信息，確定要退出嗎？",
     "pisell2.event.close.continue": "繼續",
     "pisell2.event.close.exit": "退出",
-    "pisell2.event.step": (step) => `步驟 ${step}`,
+    "pisell2.appointment.step": (step) => `步驟 ${step}`,
     "pisell2.event.select.category": (val) => `選擇${val || "資源"}`,
     "pisell2.event.select.event": "選擇服務",
     "pisell2.event.select.campus": (val) => `請選擇${val || "資源"}`,
@@ -290,6 +322,7 @@ var locales_default = {
     "pisell2.event.capacity.limit.reached.title": "活動名額已滿",
     "pisell2.event.capacity.limit.reached.tip": "購物車中有一個或多個活動已達預約上限，請將已滿額的活動從購物車中移除後再完成結算。",
     "pisell2.appointment.booking.empty.service": "暫無服務",
+    "pisell2.appointment.booking.empty.data": "暫無數據",
     "pisell2.appointment.booking.empty.time": "暫無時間",
     "pisell2.appointment.service.title": (val) => `${val}个服務`,
     "pisell2.appointment.add.guest": "添加預約人",
@@ -307,6 +340,21 @@ var locales_default = {
     "pisell2.appointment.sunday": "周日",
     "pisell2.appointment.any.professional": "隨機分配",
     "pisell2.appointment.for.maximum.availability": "立即匹配",
+    "pisell2.appointment.deposit": "定金",
+    "pisell2.appointment.deposit.agreed": "我已閱讀並同意 ",
+    "pisell2.appointment.deposit.agree.policy": "您需要同意協議才能繼續",
+    "pisell2.appointment.deposit.and": " 和 ",
+    "pisell2.appointment.deposit.amount.tip1": "請支付 ",
+    "pisell2.appointment.deposit.amount.tip2": " 定金。",
+    "pisell2.appointment.deposit.close": "关闭",
+    "pisell2.appointment.tips": "提示",
+    "pisell2.appointment.tips.content": `請仔細查看購物車中的商品，然後點擊下面的"結算"按鈕繼續付款。`,
+    "pisell2.appointment.fill-form": "填寫資訊",
+    "pisell2.appointment.select.holder": (val) => `請選擇${val}`,
+    "pisell2.appointment.select.time": "選擇時間",
+    "pisell2.appointment.unselect.time": "無可用時間，請返回",
+    "pisell2.appointment.unselect.date": "請選擇日期",
+    "pisell2.appointment.add-guests": "添加預約人",
     "pisell2.text.apply": "應用",
     "pisell2.text.goodpass": "商品券",
     "pisell2.text.goodpass.product-vouchers": "商品兌換券",

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

@@ -45,7 +45,7 @@ export declare const formatMonthDisplay: (dateString: string) => string;
 export declare const resourceTitle: (data: any) => any;
 export declare const formatHolder: (data: any[]) => any[];
 export declare const formatGuest: (data: any[], products: any) => any[];
-export declare const formatCarts: (data: any[], resources: any[]) => any[];
+export declare const formatCarts: (data: any[], resources: any[], accountLists?: any) => any[];
 /**
  * @title: 对资源进行排序
  * @description:
@@ -57,6 +57,7 @@ export declare const formatCarts: (data: any[], resources: any[]) => any[];
  */
 export declare const sortResources: (resources: any[], resourceSort: any[]) => any[] | undefined;
 export declare const getMeAccount: (val: any[]) => any;
+export declare const getCustomer: () => any;
 export declare const formatCustomer: (val: any) => {
     id: any;
     username: string;
@@ -84,3 +85,67 @@ export declare const isEmptyGuest: (carts: any[], accounts: any[]) => boolean;
  * @Date: 2025-04-15 21:51
  */
 export declare const isEmptyCartsResourceId: (carts: any[]) => boolean;
+/**
+ * @title: 定金合并的标点符号
+ * @description:
+ * @return {*}
+ * @Author: WangHan
+ * @Date: 2025-04-21 17:52
+ */
+export declare const getPunctuationMark: (index: number, totalLength: number, isEn: boolean) => any;
+/**
+ * @title: 判断当前选中的资源中是否有 resource_form_id 表单id，如果有表单则下一步是选择表单
+ * @description:
+ * @param {any} array
+ * @param {any} resources
+ * @return {*}
+ * @Author: WangHan
+ * @Date: 2025-04-25 19:05
+ */
+export declare const hasResourceFormId: (array: any[]) => boolean | undefined;
+export declare const formatForms: (array: any[]) => ({
+    form_id: any;
+    policy_id: any;
+    id: any;
+    cart_id: any;
+} | null)[];
+/**
+ * @title: 打开表单
+ * @description:
+ * @param {string} title
+ * @param {any} callback
+ * @return {*}
+ * @Author: WangHan
+ * @Date: 2025-04-26 15:26
+ */
+export declare const openForm: ({ form_id, title, callback, utils }: any) => void;
+/**
+ * @title: 更新数组
+ * @description:
+ * @return {*}
+ * @Author: WangHan
+ * @Date: 2025-04-26 18:13
+ */
+export declare function updateLists<T extends Record<string, any>>(list: T[], key: string, value: any, newData: Partial<T>): T[];
+/**
+ * @title: 检查表单是否有未完成或错误
+ * @description:
+ * @param {any} formStatus
+ * @param {any} formLists
+ * @return {*}
+ * @Author: WangHan
+ * @Date: 2025-04-26 18:52
+ */
+export declare function hasFormError(formStatus: any[], formLists: any[]): boolean;
+/**
+ * @title: 更新表单存储
+ * @description:
+ * @param {any} bookingForm
+ * @param {number} id
+ * @param {any} newData
+ * @return {*}
+ * @Author: WangHan
+ * @Date: 2025-04-27 17:27
+ */
+export declare const updateBookingFormStorage: (bookingForm: any, id: number, newData: any) => any;
+export declare const Toast: (text: string) => void;

package/lib/components/appointmentBooking/utils.js

@@ -29,24 +29,34 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/components/appointmentBooking/utils.ts
 var utils_exports = {};
 __export(utils_exports, {
+  Toast: () => Toast,
   formatBackgroundColors: () => formatBackgroundColors,
   formatCarts: () => formatCarts,
   formatCurrentUser: () => formatCurrentUser,
   formatCustomer: () => formatCustomer,
+  formatForms: () => formatForms,
   formatGuest: () => formatGuest,
   formatHolder: () => formatHolder,
   formatMonthDisplay: () => formatMonthDisplay,
+  getCustomer: () => getCustomer,
   getMeAccount: () => getMeAccount,
+  getPunctuationMark: () => getPunctuationMark,
   getScheduleColors: () => getScheduleColors,
   getUsableSchedules: () => getUsableSchedules,
+  hasFormError: () => hasFormError,
+  hasResourceFormId: () => hasResourceFormId,
   isEmptyCartsResourceId: () => isEmptyCartsResourceId,
   isEmptyGuest: () => isEmptyGuest,
+  openForm: () => openForm,
   resourceTitle: () => resourceTitle,
-  sortResources: () => sortResources
+  sortResources: () => sortResources,
+  updateBookingFormStorage: () => updateBookingFormStorage,
+  updateLists: () => updateLists
 });
 module.exports = __toCommonJS(utils_exports);
 var import_dayjs = __toESM(require("dayjs"));
 var import_utils = require("@pisell/utils");
+var import_materials = require("@pisell/materials");
 var import_useEngineContext = __toESM(require("../../hooks/useEngineContext"));
 var formatBackgroundColors = (colors) => {
   let _colors = Array.from(new Set(colors.map((color) => color == null ? void 0 : color.toLocaleLowerCase()) || [])).filter((d) => !!d);
@@ -115,35 +125,42 @@ var formatGuest = (data, products) => {
     };
   });
 };
-var formatCarts = (data, resources) => {
+var formatCarts = (data, resources, accountLists) => {
   var _a;
-  const context = (0, import_useEngineContext.default)();
-  const utils = context.appHelper.utils || {};
-  const locale = ((_a = utils == null ? void 0 : utils.storage) == null ? void 0 : _a.get("umi_locale")) || "en-US";
-  const symbol = (utils == null ? void 0 : utils.getSymbolic()) || "$";
-  console.log(data, resources, "formatCartsformatCarts");
-  return data == null ? void 0 : data.map((d) => {
-    var _a2, _b;
-    const currentResource = resources.find((r) => (d == null ? void 0 : d._id) === (r == null ? void 0 : r._id));
-    let currentResources = (_b = (_a2 = currentResource == null ? void 0 : currentResource.resources) == null ? void 0 : _a2[0]) == null ? void 0 : _b.renderList;
-    currentResources = currentResources == null ? void 0 : currentResources.map((d2) => {
+  try {
+    const context = (0, import_useEngineContext.default)();
+    const utils = context.appHelper.utils || {};
+    const locale = ((_a = utils == null ? void 0 : utils.storage) == null ? void 0 : _a.get("umi_locale")) || "en-US";
+    const symbol = (utils == null ? void 0 : utils.getSymbolic()) || "$";
+    console.log(data, resources, "wh9786876");
+    return data == null ? void 0 : data.map((d) => {
+      var _a2, _b, _c;
+      const currentResource = resources == null ? void 0 : resources.find((r) => (d == null ? void 0 : d._id) === (r == null ? void 0 : r._id));
+      let currentResources = (_b = (_a2 = currentResource == null ? void 0 : currentResource.resources) == null ? void 0 : _a2[0]) == null ? void 0 : _b.renderList;
+      currentResources = currentResources == null ? void 0 : currentResources.map((d2) => {
+        return {
+          ...d2,
+          label: (d2 == null ? void 0 : d2.main_field) || (d2 == null ? void 0 : d2.id)
+        };
+      });
       return {
-        ...d2,
-        label: (d2 == null ? void 0 : d2.main_field) || (d2 == null ? void 0 : d2.id)
+        ...d,
+        format: ["HH:mm", "HH:mm"],
+        show_time: true,
+        duration_type: ((_c = d == null ? void 0 : d.duration) == null ? void 0 : _c.type) || "minutes",
+        locale,
+        symbol,
+        resources: currentResources,
+        is_hide_like: true,
+        holders: formatHolder(accountLists),
+        allowClearHolder: true,
+        allowClearResource: true
       };
     });
-    return {
-      ...d,
-      format: ["HH:mm", "HH:mm"],
-      show_time: true,
-      duration_type: d.duration.type,
-      locale,
-      symbol,
-      resources: currentResources,
-      is_hide_like: true,
-      holder_title: ""
-    };
-  });
+  } catch (error) {
+    console.log(error, "formatCarts");
+    return [];
+  }
 };
 var sortResources = (resources, resourceSort) => {
   try {
@@ -177,6 +194,15 @@ var sortResources = (resources, resourceSort) => {
 var getMeAccount = (val) => {
   return val == null ? void 0 : val.find((d) => !(d == null ? void 0 : d.isGuest));
 };
+var getCustomer = () => {
+  var _a, _b;
+  const context = (0, import_useEngineContext.default)();
+  const utils = context.appHelper.utils || {};
+  let userInfo = (_b = (_a = utils.getStore().getState()) == null ? void 0 : _a.global) == null ? void 0 : _b.userInfo;
+  const localUserInfo = JSON.parse(utils.storage.get("customer") || "{}");
+  userInfo = (userInfo == null ? void 0 : userInfo.id) ? userInfo : localUserInfo;
+  return userInfo;
+};
 var formatCustomer = (val) => {
   let currentUserName = `${(val == null ? void 0 : val.first_name) || ""}${(val == null ? void 0 : val.last_name) ? ` ${val == null ? void 0 : val.last_name}` : ""}`;
   currentUserName = currentUserName || (val == null ? void 0 : val.nickname) || "Me";
@@ -186,12 +212,7 @@ var formatCustomer = (val) => {
   };
 };
 var formatCurrentUser = () => {
-  var _a, _b;
-  const context = (0, import_useEngineContext.default)();
-  const utils = context.appHelper.utils || {};
-  let userInfo = (_b = (_a = utils.getStore().getState()) == null ? void 0 : _a.global) == null ? void 0 : _b.userInfo;
-  const localUserInfo = JSON.parse(utils.storage.get("customer") || "{}");
-  userInfo = (userInfo == null ? void 0 : userInfo.id) ? userInfo : localUserInfo;
+  let userInfo = getCustomer();
   const customer = formatCustomer(userInfo);
   return customer;
 };
@@ -209,20 +230,124 @@ var isEmptyCartsResourceId = (carts) => {
   console.log(isEmptyResourceId, "isEmptyResourceId");
   return isEmptyResourceId;
 };
+var getPunctuationMark = (index, totalLength, isEn) => {
+  const isLastItem = index === totalLength - 1;
+  const isSecondLastItem = index === totalLength - 2;
+  if (isLastItem) {
+    return isEn ? "." : "。";
+  }
+  if (isSecondLastItem) {
+    return import_utils.locales.getText("pisell2.appointment.deposit.and");
+  }
+  return isEn ? ", " : "、";
+};
+var hasResourceFormId = (array) => {
+  try {
+    if (!(array == null ? void 0 : array.length)) {
+      return false;
+    }
+    return array.some((item) => {
+      var _a;
+      const resourceId = item.resource_id;
+      const foundResource = (_a = item == null ? void 0 : item.resources) == null ? void 0 : _a.find((resource) => resource.id === resourceId);
+      console.log(foundResource, item, "foundResource");
+      return foundResource && foundResource.resource_form_id;
+    });
+  } catch (error) {
+    console.log(error, "hasResourceFormId");
+  }
+};
+var formatForms = (array) => {
+  try {
+    if (!(array == null ? void 0 : array.length)) {
+      return [];
+    }
+    const mappedResources = array.map((item) => {
+      var _a;
+      const foundResource = (_a = item == null ? void 0 : item.resources) == null ? void 0 : _a.find((resource) => resource.id === item.resource_id);
+      if (foundResource && ((foundResource == null ? void 0 : foundResource.resource_form_id) || (foundResource == null ? void 0 : foundResource.policy_id))) {
+        return {
+          form_id: foundResource.resource_form_id,
+          policy_id: foundResource.policy_id,
+          id: foundResource == null ? void 0 : foundResource.id,
+          cart_id: item == null ? void 0 : item._id
+        };
+      }
+      return null;
+    }).filter(Boolean);
+    return mappedResources;
+  } catch (error) {
+    console.log(error, "hasResourceFormId");
+    return [];
+  }
+};
+var openForm = ({ form_id, title, callback, utils }) => {
+  utils.action({
+    type: "pisell1.form",
+    data: {
+      form_id,
+      form_title: title,
+      isV2API: true
+    },
+    callback
+  });
+};
+function updateLists(list, key, value, newData) {
+  const idx = list.findIndex((item) => item[key] === value);
+  if (idx > -1) {
+    const updated = { ...list[idx], ...newData };
+    const newList = [...list];
+    newList[idx] = updated;
+    return newList;
+  } else {
+    return [...list, { ...newData, [key]: value }];
+  }
+}
+function hasFormError(formStatus, formLists) {
+  if (formStatus.length !== formLists.length) return true;
+  return formStatus.some((item) => item.status === "error");
+}
+var updateBookingFormStorage = (bookingForm, id, newData) => {
+  const newBookingForm = { ...bookingForm };
+  if (newBookingForm[id]) {
+    newBookingForm[id] = { ...newBookingForm[id], ...newData };
+  } else {
+    newBookingForm[id] = { ...newData };
+  }
+  return newBookingForm;
+};
+var Toast = (text) => {
+  try {
+    (0, import_materials.PisellToast)({
+      content: text
+    });
+  } catch (error) {
+    window == null ? void 0 : window.alert(text);
+  }
+};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  Toast,
   formatBackgroundColors,
   formatCarts,
   formatCurrentUser,
   formatCustomer,
+  formatForms,
   formatGuest,
   formatHolder,
   formatMonthDisplay,
+  getCustomer,
   getMeAccount,
+  getPunctuationMark,
   getScheduleColors,
   getUsableSchedules,
+  hasFormError,
+  hasResourceFormId,
   isEmptyCartsResourceId,
   isEmptyGuest,
+  openForm,
   resourceTitle,
-  sortResources
+  sortResources,
+  updateBookingFormStorage,
+  updateLists
 });

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

@@ -209,7 +209,8 @@ var Addons = (0, import_model.Provider)((props) => {
   };
   const handleAddProduct = (item, type) => {
     let _list = [...state.addons.value];
-    const isEject = type === "detail" || item.bundle_group_count > 0;
+    const isSession = (0, import_utils2.isSessionProduct)(item);
+    const isEject = type === "detail" || item.bundle_group_count > 0 || isSession;
     state.action({
       type: "pisell1.handleOpenProductModal",
       data: {
@@ -217,11 +218,12 @@ var Addons = (0, import_model.Provider)((props) => {
         date: state.date.value.format("YYYY-MM-DD"),
         showConfig: {
           option: false,
-          session: false,
+          session: isSession,
           variant: false,
           package: true
         },
-        is_eject: isEject ? 1 : 0
+        is_eject: isEject ? 1 : 0,
+        isOS: isSession
       },
       callback: (e, extension_type, detail) => {
         console.log("e", e);
@@ -365,6 +367,7 @@ var Addons = (0, import_model.Provider)((props) => {
     if (state.channelDisabledEdit) {
       return;
     }
+    const isSession = (0, import_utils2.isSessionProduct)(item);
     state.action({
       type: "pisell1.handleOpenProductModal",
       data: {
@@ -372,11 +375,12 @@ var Addons = (0, import_model.Provider)((props) => {
         date: state.date.value.format("YYYY-MM-DD"),
         showConfig: {
           option: false,
-          session: false,
+          session: isSession,
           variant: false,
           package: true
         },
-        value: item._extend.other
+        value: item._extend.other,
+        isOS: isSession
       },
       callback: (e, extension_type, detail) => {
         var _a2;

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 /**
  * @title: 底部