@pisell/private-materials 3.2.35 → 3.2.37

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

@@ -40,7 +40,6 @@ var import_classnames = __toESM(require("classnames"));
 var import_utils = require("@pisell/utils");
 var import_icons = require("@ant-design/icons");
 var import_context = require("../../context");
-var import_hooks = require("../../hooks");
 var import_index = require("./index.less");
 import_dayjs.default.extend(import_isSameOrBefore.default);
 var CalendarDate = (props) => {
@@ -51,7 +50,6 @@ var CalendarDate = (props) => {
     return (0, import_dayjs.default)();
   });
   const { appointmentBooking } = (0, import_context.useAppointmentBookingContext)();
-  const { isDateSelectedFirst, customPageId } = (0, import_hooks.useAppointmentBookingSetting)();
   const weekListText = [
     import_utils.locales.getText("pisell2.appointment.sunday"),
     import_utils.locales.getText("pisell2.appointment.monday"),
@@ -91,18 +89,7 @@ var CalendarDate = (props) => {
     let lastDate = (0, import_dayjs.default)(newCurrentMonth).subtract(1, "month");
     return lastDate.isBefore((0, import_dayjs.default)(), "month");
   };
-  const getDateData = async (params) => {
-    console.log(isDateSelectedFirst, customPageId, "wh7868");
-    if (isDateSelectedFirst) {
-      return appointmentBooking.loadScheduleAvailableDate({
-        ...params,
-        custom_page_id: customPageId
-      });
-    }
-    return await appointmentBooking.getAvailableDate(params);
-  };
   const getDates = async (date) => {
-    var _a;
     try {
       const startDate = (0, import_dayjs.default)(date).startOf("month").format("YYYY-MM-DD");
       const endDate = (0, import_dayjs.default)(date).endOf("month").format("YYYY-MM-DD");
@@ -110,14 +97,13 @@ var CalendarDate = (props) => {
         startDate,
         endDate
       };
-      const data = await getDateData(params);
+      const data = await appointmentBooking.getAvailableDate(params);
       const selected = await appointmentBooking.getDateRange();
-      console.log(data, selected, customPageId, "getDates");
       if ((selected == null ? void 0 : selected.length) > 0) {
-        setCurrentDate((_a = selected == null ? void 0 : selected[0]) == null ? void 0 : _a.date);
+        setCurrentDate(selected[0].date);
       } else {
         if (date.format("YYYY-MM") === (0, import_dayjs.default)().format("YYYY-MM")) {
-          const firstAvailableDate = (data || []).find(
+          const firstAvailableDate = data.find(
             (d) => d.status === "available"
           );
           setCurrentDate(firstAvailableDate == null ? void 0 : firstAvailableDate.date);
@@ -140,7 +126,6 @@ var CalendarDate = (props) => {
       setDateMonthList(updatedDates);
     } catch (error) {
       setLoading(false);
-      setDateMonthList([]);
       console.log(error, "wh978968234234");
     }
   };
@@ -158,14 +143,6 @@ var CalendarDate = (props) => {
     setCurrentMonth(newNextMonth);
     setLoading(true);
   };
-  const handleClick = (day, date) => {
-    if (day == null ? void 0 : day.disabled) return;
-    setCurrentDate(date);
-    appointmentBooking.setDateRange([day]);
-    if (isDateSelectedFirst) {
-      appointmentBooking.next();
-    }
-  };
   return /* @__PURE__ */ import_react.default.createElement(
     "div",
     {
@@ -199,7 +176,11 @@ var CalendarDate = (props) => {
             ["other-month-days"]: !isCurrentMonth,
             ["loading-item"]: loading
           }),
-          onClick: () => handleClick(day, date)
+          onClick: () => {
+            if (day == null ? void 0 : day.disabled) return;
+            setCurrentDate(date);
+            appointmentBooking.setDateRange([day]);
+          }
         },
         isCurrentMonth && /* @__PURE__ */ import_react.default.createElement("div", { className: (0, import_classnames.default)("day-text") }, (0, import_dayjs.default)(day.date).format("D"))
       );

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

@@ -40,17 +40,17 @@ var import_hooks = require("../../hooks");
 var import_useEngineContext = __toESM(require("../../../../hooks/useEngineContext"));
 var import_index = require("./index.less");
 var Header = () => {
-  var _a;
+  var _a, _b;
   const { currentStep, appointmentBooking, resources, setTimes } = (0, import_context.useAppointmentBookingContext)();
   const shopDiscount = (0, import_hooks.useShopDiscount)();
   const context = (0, import_useEngineContext.default)();
   const { checkSkipResourceStep } = (0, import_hooks.useIsSkipResourceStep)();
   const { getStepIndex } = (0, import_hooks.useAppointmentBookingStep)();
   const stepName = (0, import_react.useMemo)(() => {
-    var _a2, _b, _c, _d, _e;
+    var _a2, _b2, _c, _d, _e;
     const key = (_a2 = currentStep == null ? void 0 : currentStep.step) == null ? void 0 : _a2.key;
     if (key === "select-resource") {
-      const name = ((_d = (_c = (_b = resources == null ? void 0 : resources[0]) == null ? void 0 : _b.resources) == null ? void 0 : _c[0]) == null ? void 0 : _d.title) || "";
+      const name = ((_d = (_c = (_b2 = resources == null ? void 0 : resources[0]) == null ? void 0 : _b2.resources) == null ? void 0 : _c[0]) == null ? void 0 : _d.title) || "";
       return import_utils.locales.getText("pisell2.event.select.category")(name);
     }
     return (_e = currentStep == null ? void 0 : currentStep.step) == null ? void 0 : _e.description;
@@ -81,19 +81,16 @@ var Header = () => {
     appointmentBooking.back();
   };
   const handleClose = () => {
-    var _a2, _b;
+    var _a2, _b2;
     appointmentBooking.destroy();
     (_a2 = shopDiscount == null ? void 0 : shopDiscount.destroy) == null ? void 0 : _a2.call(shopDiscount);
     const utils = context.appHelper.utils || {};
-    (_b = utils == null ? void 0 : utils.history) == null ? void 0 : _b.replace("/");
+    (_b2 = utils == null ? void 0 : utils.history) == null ? void 0 : _b2.replace("/");
   };
-  console.log(currentStep, "wh98087");
   return /* @__PURE__ */ import_react.default.createElement(
     import_progressBar.default,
     {
-      title: `${import_utils.locales.getText("pisell2.appointment.step")(
-        (currentStep == null ? void 0 : currentStep.index) + 1
-      )}`,
+      title: (_b = currentStep == null ? void 0 : currentStep.step) == null ? void 0 : _b.title,
       description: stepName,
       showBack: (currentStep == null ? void 0 : currentStep.index) > 0,
       onBack: () => handleBack(),

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

@@ -45,10 +45,8 @@ var Resource = () => {
   const [selectedResource, setSelectedResource] = (0, import_react.useState)(0);
   const { appointmentBooking, resources, carts, resourceOtherParams } = (0, import_context.useAppointmentBookingContext)();
   const { getResourceList, autoSelectAllProductResources } = (0, import_hooks.useAppointmentBookingResource)();
-  const { isDateSelectedFirst } = (0, import_hooks.useAppointmentBookingSetting)();
   (0, import_react.useEffect)(() => {
     const _resources = getResourceList();
-    if (isDateSelectedFirst) return;
     autoSelectAllProductResources();
     getResourceList();
   }, []);

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

@@ -50,44 +50,19 @@ var Services = () => {
   const { utils } = context.appHelper || {};
   const appointmentBooking = (0, import_hooks.useAppointmentBooking)();
   const { products, setProducts } = (0, import_context.useAppointmentBookingContext)();
-  const { isDateSelectedFirst } = (0, import_hooks.useAppointmentBookingSetting)();
-  const getLists = async () => {
-    var _a;
-    if (isDateSelectedFirst) {
-      const dates = await appointmentBooking.getDateRange();
-      console.log(dates, "productList11");
-      if (!dates || !dates.length) return;
-      const productList2 = await appointmentBooking.loadProductByScheduleDate(
-        (_a = dates[0]) == null ? void 0 : _a.date
-      );
-      console.log(productList2, "productList11");
-      return productList2;
-    }
-    const { productModuleParams } = appointmentBooking.otherParams || {};
-    const productList = await appointmentBooking.loadProducts(
-      productModuleParams
-    );
-    return productList;
-  };
   (0, import_react.useEffect)(() => {
-    try {
-      getLists().then((res) => {
-        console.log(res, "getLists");
-        setProducts(res || []);
-      });
-    } catch (error) {
+    const { productModuleParams } = appointmentBooking.otherParams || {};
+    appointmentBooking.loadProducts(productModuleParams).then((res) => {
+      setProducts(res || []);
+    }).catch(() => {
       setProducts([]);
-    }
+    });
   }, []);
   const handleSelectProduct = (item) => {
-    console.log(item, "wwwss");
-    if (isDateSelectedFirst && !(item == null ? void 0 : item.duration)) {
-      appointmentBooking.openProductDetail(item.id);
-    }
     utils == null ? void 0 : utils.action({
       type: "pisell1.productDetail",
       data: {
-        detail: { ...item, open_deposit: 1 }
+        detail: item
       },
       callback: (data) => {
         var _a, _b;
@@ -104,24 +79,8 @@ var Services = () => {
           ...data,
           options: (data == null ? void 0 : data.option) || []
         };
-        console.log(data, "wh987986");
         delete product.option;
-        if (isDateSelectedFirst) {
-          appointmentBooking.addProductToCart({
-            product: { ...product },
-            date: {
-              startTime: "2025-04-27 09:00",
-              endTime: "2025-04-27 11:00"
-            }
-          });
-          appointmentBooking.getAvailableDate({
-            startDate: "2025-04-27",
-            endDate: "2025-04-27"
-          });
-          appointmentBooking.closeProductDetail();
-        } else {
-          appointmentBooking.storeProduct(product);
-        }
+        appointmentBooking.storeProduct(product);
       }
     });
   };

package/lib/components/appointmentBooking/context.js

@@ -46,19 +46,15 @@ var AppointmentBookingProvider = ({
   const [summary, setSummary] = (0, import_react.useState)({});
   const [times, setTimes] = (0, import_react.useState)([]);
   const [resources, setResources] = (0, import_react.useState)([]);
-  const [currentStep, setCurrentStep] = (0, import_react.useState)();
+  const [currentStep, setCurrentStep] = (0, import_react.useState)(
+    appointmentBooking.getCurrentStep()
+  );
   const [isLastStep, setIsLastStep] = (0, import_react.useState)(false);
   const [carts, setCarts] = (0, import_react.useState)([]);
   const [resourceOtherParams, setResourceOtherParams] = (0, import_react.useState)({});
   const [selectedTime, setSelectedTime] = (0, import_react.useState)(null);
-  const [isAgreeDepositPolicy, setIsAgreeDepositPolicy] = (0, import_react.useState)(false);
-  const [currentResource, setCurrentResource] = (0, import_react.useState)(null);
   const { appHelper } = (0, import_useEngineContext.default)();
   const symbolic = (_a = appHelper == null ? void 0 : appHelper.utils) == null ? void 0 : _a.getSymbolic();
-  (0, import_react.useEffect)(() => {
-    const currentStep2 = appointmentBooking.getCurrentStep();
-    setCurrentStep(currentStep2);
-  }, []);
   console.log(3234234, times, resources);
   const value = {
     appointmentBooking,
@@ -81,11 +77,7 @@ var AppointmentBookingProvider = ({
     resourceOtherParams,
     setResourceOtherParams,
     selectedTime,
-    setSelectedTime,
-    isAgreeDepositPolicy,
-    setIsAgreeDepositPolicy,
-    currentResource,
-    setCurrentResource
+    setSelectedTime
   };
   return /* @__PURE__ */ import_react.default.createElement(AppointmentBookingContext.Provider, { value }, children);
 };

package/lib/components/appointmentBooking/hooks.js

@@ -35,7 +35,6 @@ __export(hooks_exports, {
   useAppointmentBookingLogin: () => useAppointmentBookingLogin,
   useAppointmentBookingProduct: () => useAppointmentBookingProduct,
   useAppointmentBookingResource: () => useAppointmentBookingResource,
-  useAppointmentBookingSetting: () => useAppointmentBookingSetting,
   useAppointmentBookingStep: () => useAppointmentBookingStep,
   useIsSkipResourceStep: () => useIsSkipResourceStep,
   useShopDiscount: () => useShopDiscount
@@ -60,9 +59,9 @@ var useAppointmentBookingStep = () => {
   const { appointmentBooking, setCurrentStep, setIsLastStep } = (0, import_context.useAppointmentBookingContext)();
   const stepList = ((_c = (_b = (_a = appointmentBooking == null ? void 0 : appointmentBooking.store) == null ? void 0 : _a.step) == null ? void 0 : _b.store) == null ? void 0 : _c.stepList) || [];
   const getCurrentAndLastStep = () => {
-    const currentStep = appointmentBooking.getCurrentStep();
-    setCurrentStep(currentStep);
-    setIsLastStep((currentStep == null ? void 0 : currentStep.index) === stepList.length - 1);
+    const _currentStep = appointmentBooking.getCurrentStep();
+    setCurrentStep(_currentStep);
+    setIsLastStep((_currentStep == null ? void 0 : _currentStep.index) === stepList.length - 1);
   };
   (0, import_react.useEffect)(() => {
     getCurrentAndLastStep();
@@ -87,7 +86,7 @@ var useAppointmentBookingStep = () => {
       return prevIndex < 1 ? 1 : prevIndex;
     }
   };
-  return { getStepIndex, stepList };
+  return { getStepIndex };
 };
 var useAppointmentBookingProduct = () => {
   const { appointmentBooking, setProducts } = (0, import_context.useAppointmentBookingContext)();
@@ -100,15 +99,12 @@ var useAppointmentBookingProduct = () => {
 };
 var useAppointmentBookingCart = () => {
   const pisellOS = (0, import_useEngineContext.usePisellOS)();
-  const { appointmentBooking, setCarts, setSummary, setIsAgreeDepositPolicy } = (0, import_context.useAppointmentBookingContext)();
+  const { appointmentBooking, setCarts, setSummary } = (0, import_context.useAppointmentBookingContext)();
   const getCartAndSummary = async () => {
     const carts = await appointmentBooking.getCart();
     setCarts(carts || []);
     const summary = await appointmentBooking.getSummary();
     setSummary(summary || {});
-    if (!carts.length) {
-      setIsAgreeDepositPolicy(false);
-    }
     console.log(carts, summary, "appointmentBooking_cart:changed");
   };
   (0, import_react.useEffect)(() => {
@@ -147,24 +143,6 @@ var useAppointmentBookingAccount = () => {
     console.log("appointmentBooking_accountList:changed", data);
     setAccountLists(data || []);
   };
-  const getHolders = async () => {
-    const params = {
-      url: "/form/data/v1",
-      query: {
-        customer_id: 13215,
-        form_id: 866,
-        shop_id: 9
-      }
-    };
-    const data = await appointmentBooking.fetchHolderAccountsAsync(params);
-    const newData = data == null ? void 0 : data.map((item) => {
-      return {
-        id: item == null ? void 0 : item.form_record_id,
-        label: item == null ? void 0 : item.main_field
-      };
-    });
-    return newData || [];
-  };
   (0, import_react.useEffect)(() => {
     getAccountLists();
     pisellOS.effects.on(
@@ -177,7 +155,7 @@ var useAppointmentBookingAccount = () => {
       }
     );
   }, []);
-  return { accountLists, getHolders };
+  return { accountLists };
 };
 var useAppointmentBookingResource = () => {
   const { appointmentBooking, setResources, setTimes, setResourceOtherParams, resourceOtherParams } = (0, import_context.useAppointmentBookingContext)();
@@ -194,7 +172,6 @@ var useAppointmentBookingResource = () => {
     const _resources = ((_a = resources == null ? void 0 : resources[0]) == null ? void 0 : _a.resources) || [];
     const resourceCodes = _resources.map((item) => item.code);
     setResources(resources || []);
-    console.log(resourceCodes, resources, "getResourceList");
     return { resources, resourceCodes };
   };
   const getResourceTimeSlot = async (index) => {
@@ -240,25 +217,6 @@ var useIsSkipResourceStep = () => {
   };
   return { checkSkipResourceStep };
 };
-var useAppointmentBookingSetting = () => {
-  var _a;
-  const { appointmentBooking } = (0, import_context.useAppointmentBookingContext)();
-  console.log(appointmentBooking, "appointmentBooking---");
-  const { bookingProcess, bookingSubject, customPageId } = ((_a = appointmentBooking == null ? void 0 : appointmentBooking.otherParams) == null ? void 0 : _a.productModuleParams) || {};
-  const getLoadAllSchedule = () => {
-    const res = appointmentBooking.loadAllSchedule();
-    console.log(res, "loadAllSchedule");
-  };
-  return {
-    // 是否先选择日期
-    isDateSelectedFirst: bookingProcess === "date_first",
-    // 主体是否是表单
-    isFormSubject: (bookingSubject == null ? void 0 : bookingSubject.type) === "form",
-    customPageId,
-    getLoadAllSchedule,
-    bookingSubject
-  };
-};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   useAppointmentBooking,
@@ -267,7 +225,6 @@ var useAppointmentBookingSetting = () => {
   useAppointmentBookingLogin,
   useAppointmentBookingProduct,
   useAppointmentBookingResource,
-  useAppointmentBookingSetting,
   useAppointmentBookingStep,
   useIsSkipResourceStep,
   useShopDiscount

package/lib/components/appointmentBooking/index.js

@@ -49,11 +49,6 @@ var AppointmentBooking = () => {
   const appointmentBooking = (0, import_hooks.useAppointmentBooking)();
   const currentUser = (0, import_utils2.formatCurrentUser)();
   (0, import_react.useEffect)(() => {
-    var _a2;
-    const { bookingSubject } = ((_a2 = appointmentBooking == null ? void 0 : appointmentBooking.otherParams) == null ? void 0 : _a2.productModuleParams) || {};
-    if ((bookingSubject == null ? void 0 : bookingSubject.type) === "form") {
-      return;
-    }
     appointmentBooking.getAccounts().then((data) => {
       if (!data.length) {
         appointmentBooking.addAccount([currentUser]);

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.appointment.step": (step) => `Step ${step}`,
+    "pisell2.event.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,7 +94,6 @@ 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",
@@ -112,16 +111,6 @@ var locales_default = {
     "pisell2.appointment.sunday": "Sun",
     "pisell2.appointment.any.professional": "Any professional",
     "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": (x) => `Please carefully review the items in your shopping cart and click the '${x}' button below to proceed with the payment.`,
-    "pisell2.appointment.fill-form": "Enter your details",
     "pisell2.text.apply": "Apply",
     "pisell2.text.goodpass": "GoodPass",
     "pisell2.text.goodpass.product-vouchers": "Product Vouchers",
@@ -145,7 +134,7 @@ var locales_default = {
     "pisell2.event.close.tip": "退出后将丢失所有已填写的信息，确定要退出吗？",
     "pisell2.event.close.continue": "继续",
     "pisell2.event.close.exit": "退出",
-    "pisell2.appointment.step": (step) => `步骤 ${step}`,
+    "pisell2.event.step": (step) => `步骤 ${step}`,
     "pisell2.event.select.category": (val) => `选择${val || "资源"}`,
     "pisell2.event.select.event": "选择服务",
     "pisell2.event.select.campus": (val) => `请选择${val || "资源"}`,
@@ -203,7 +192,6 @@ 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": "添加预约人",
@@ -221,16 +209,6 @@ 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": (x) => `请仔细查看购物车中的商品，然后点击下面的“${x}”按钮继续付款。`,
-    "pisell2.appointment.fill-form": "填写信息",
     "pisell2.text.apply": "应用",
     "pisell2.text.goodpass": "商品券",
     "pisell2.text.goodpass.product-vouchers": "商品兑换券",
@@ -254,7 +232,7 @@ var locales_default = {
     "pisell2.event.close.tip": "退出後將丟失所有已填寫的信息，確定要退出嗎？",
     "pisell2.event.close.continue": "繼續",
     "pisell2.event.close.exit": "退出",
-    "pisell2.appointment.step": (step) => `步驟 ${step}`,
+    "pisell2.event.step": (step) => `步驟 ${step}`,
     "pisell2.event.select.category": (val) => `選擇${val || "資源"}`,
     "pisell2.event.select.event": "選擇服務",
     "pisell2.event.select.campus": (val) => `請選擇${val || "資源"}`,
@@ -312,7 +290,6 @@ 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": "添加預約人",
@@ -330,16 +307,6 @@ 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": (x) => `請仔細查看購物車中的商品，然後點擊下面的“${x}”按鈕繼續付款。`,
-    "pisell2.appointment.fill-form": "填寫資訊",
     "pisell2.text.apply": "應用",
     "pisell2.text.goodpass": "商品券",
     "pisell2.text.goodpass.product-vouchers": "商品兌換券",

package/lib/components/appointmentBooking/utils.js

@@ -33,15 +33,12 @@ __export(utils_exports, {
   formatCarts: () => formatCarts,
   formatCurrentUser: () => formatCurrentUser,
   formatCustomer: () => formatCustomer,
-  formatForms: () => formatForms,
   formatGuest: () => formatGuest,
   formatHolder: () => formatHolder,
   formatMonthDisplay: () => formatMonthDisplay,
   getMeAccount: () => getMeAccount,
-  getPunctuationMark: () => getPunctuationMark,
   getScheduleColors: () => getScheduleColors,
   getUsableSchedules: () => getUsableSchedules,
-  hasResourceFormId: () => hasResourceFormId,
   isEmptyCartsResourceId: () => isEmptyCartsResourceId,
   isEmptyGuest: () => isEmptyGuest,
   resourceTitle: () => resourceTitle,
@@ -118,38 +115,35 @@ var formatGuest = (data, products) => {
     };
   });
 };
-var formatCarts = (data, resources, accountLists) => {
-  try {
-    const locale = "en-US";
-    const symbol = "$";
-    console.log(data, resources, "formatCartsformatCarts");
-    return data == null ? void 0 : data.map((d) => {
-      var _a, _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 = (_a = currentResource == null ? void 0 : currentResource.resources) == null ? void 0 : _a[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)
-        };
-      });
+var formatCarts = (data, resources) => {
+  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) => {
       return {
-        ...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,
-        holder_title: "",
-        holders: formatHolder(accountLists)
+        ...d2,
+        label: (d2 == null ? void 0 : d2.main_field) || (d2 == null ? void 0 : d2.id)
       };
     });
-  } catch (error) {
-    console.log(error, "formatCarts");
-    return [];
-  }
+    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: ""
+    };
+  });
 };
 var sortResources = (resources, resourceSort) => {
   try {
@@ -215,70 +209,18 @@ 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
-        };
-      }
-      return null;
-    }).filter(Boolean);
-    return mappedResources;
-  } catch (error) {
-    console.log(error, "hasResourceFormId");
-    return [];
-  }
-};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   formatBackgroundColors,
   formatCarts,
   formatCurrentUser,
   formatCustomer,
-  formatForms,
   formatGuest,
   formatHolder,
   formatMonthDisplay,
   getMeAccount,
-  getPunctuationMark,
   getScheduleColors,
   getUsableSchedules,
-  hasResourceFormId,
   isEmptyCartsResourceId,
   isEmptyGuest,
   resourceTitle,

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import "./index.less";
 interface TabProductProps {
     list: any[];

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

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

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;