@pisell/private-materials 3.3.84 → 3.3.85

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

@@ -114,6 +114,7 @@ declare const _default: {
         'pisell2.text.goodpass.code': string;
         'pisell2.text.goodpass.enter-code': string;
         'pisell2.text.goodpass.code-invalid': string;
+        'pisell2.text.goodpass.code-invalid-cart': string;
         'pisell2.text.goodpass.login': string;
         'pisell2.text.goodpass.login-tip': string;
     };
@@ -232,6 +233,7 @@ declare const _default: {
         'pisell2.text.goodpass.code': string;
         'pisell2.text.goodpass.enter-code': string;
         'pisell2.text.goodpass.code-invalid': string;
+        'pisell2.text.goodpass.code-invalid-cart': string;
         'pisell2.text.goodpass.login': string;
         'pisell2.text.goodpass.login-tip': string;
     };
@@ -350,6 +352,7 @@ declare const _default: {
         'pisell2.text.goodpass.code': string;
         'pisell2.text.goodpass.enter-code': string;
         'pisell2.text.goodpass.code-invalid': string;
+        'pisell2.text.goodpass.code-invalid-cart': string;
         'pisell2.text.goodpass.login': string;
         'pisell2.text.goodpass.login-tip': string;
     };

package/lib/components/appointmentBooking/locales.js

@@ -138,6 +138,7 @@ var locales_default = {
     "pisell2.text.goodpass.code": "Code",
     "pisell2.text.goodpass.enter-code": "Enter Code",
     "pisell2.text.goodpass.code-invalid": "Current code is invalid",
+    "pisell2.text.goodpass.code-invalid-cart": "No eligible items in the cart",
     "pisell2.text.goodpass.login": "Login",
     "pisell2.text.goodpass.login-tip": " for member benefit Or use account credit"
   },
@@ -256,6 +257,7 @@ var locales_default = {
     "pisell2.text.goodpass.code": "券码",
     "pisell2.text.goodpass.enter-code": "请输入券码",
     "pisell2.text.goodpass.code-invalid": "当前券码不可用",
+    "pisell2.text.goodpass.code-invalid-cart": "当前购物车中无可用商品",
     "pisell2.text.goodpass.login": "登录",
     "pisell2.text.goodpass.login-tip": "以获取会员福利或使用账户积分"
   },
@@ -374,6 +376,7 @@ var locales_default = {
     "pisell2.text.goodpass.code": "券碼",
     "pisell2.text.goodpass.enter-code": "請輸入券碼",
     "pisell2.text.goodpass.code-invalid": "當前券碼不可用",
+    "pisell2.text.goodpass.code-invalid-cart": "當前購物車中無可用商品",
     "pisell2.text.goodpass.login": "登錄",
     "pisell2.text.goodpass.login-tip": "以獲取會員福利或使用賬戶積分"
   }

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

@@ -27,7 +27,6 @@ export interface ResourceItem {
  * @Author: jinglin.tan
  */
 export declare const checkSubResourcesCapacity: (resource: ResourceItem) => void;
-export declare const checkResourcesFormat: (resources: any[], service: any, isChild?: boolean) => any[];
 /**
  * @title: 格式化商品单价
  * @description:

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

@@ -30,7 +30,6 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var utils_exports = {};
 __export(utils_exports, {
   checkHolderIsError: () => checkHolderIsError,
-  checkResourcesFormat: () => checkResourcesFormat,
   checkSubResourcesCapacity: () => checkSubResourcesCapacity,
   formatProductBundle: () => formatProductBundle,
   formatProductOption: () => formatProductOption,
@@ -477,7 +476,6 @@ var checkHolderIsError = (state) => {
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   checkHolderIsError,
-  checkResourcesFormat,
   checkSubResourcesCapacity,
   formatProductBundle,
   formatProductOption,

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

@@ -41,8 +41,8 @@ var import_useEngineContext = __toESM(require("../../../../hooks/useEngineContex
 var import_materials = require("@pisell/materials");
 var import_useIsBooking4Shop = require("../../hooks/useIsBooking4Shop");
 var import_index = require("./index.less");
-var import_ahooks = require("ahooks");
 var import_utils2 = require("./utils");
+var import_ahooks = require("ahooks");
 var ShopDiscountHooks = {
   onInited: "shopDiscount:onInited",
   onDestroy: "shopDiscount:onDestroy",
@@ -67,13 +67,17 @@ var VoucherCard = (props) => {
   const isBooking4Shop = (0, import_useIsBooking4Shop.useIsBooking4Shop)(state);
   const shopDiscount = pisellos.getModule("shopDiscount");
   services = state.service;
-  (0, import_ahooks.useDebounceEffect)(() => {
-    if (isBooking4Shop) {
-      shopDiscount.setCustomer(state.client.value);
+  (0, import_ahooks.useDebounceEffect)(
+    () => {
+      if (isBooking4Shop) {
+        shopDiscount.setCustomer(state.client.value);
+      }
+    },
+    [(_b = state.client.value) == null ? void 0 : _b.id, isBooking4Shop],
+    {
+      wait: 200
     }
-  }, [(_b = state.client.value) == null ? void 0 : _b.id, isBooking4Shop], {
-    wait: 200
-  });
+  );
   (0, import_react.useEffect)(() => {
     if (isBooking4Shop) {
       shopDiscount.setProductList([
@@ -116,7 +120,9 @@ var VoucherCard = (props) => {
   }, [state.addons.value]);
   const disabled = (0, import_react.useMemo)(() => {
     var _a2;
-    if (["paid", "partially_paid"].includes((_a2 = state.bookingDetail) == null ? void 0 : _a2.payment_status) && [...addonsMemo, ...serviceMemo].every((item) => item.booking_id)) {
+    if (["paid", "partially_paid"].includes(
+      (_a2 = state.bookingDetail) == null ? void 0 : _a2.payment_status
+    ) && [...addonsMemo, ...serviceMemo].every((item) => item.booking_id)) {
       return true;
     }
     return false;
@@ -173,9 +179,15 @@ var VoucherCard = (props) => {
     );
     return () => {
       shopDiscount.clear();
-      pisellos.effects.off(ShopDiscountHooks.onCustomerChange, onScanCustomerChange);
+      pisellos.effects.off(
+        ShopDiscountHooks.onCustomerChange,
+        onScanCustomerChange
+      );
       pisellos.effects.off(ShopDiscountHooks.onLoadPrepareCalcResult, fn);
-      pisellos.effects.off(ShopDiscountHooks.onDiscountListChange, onDiscountListChange);
+      pisellos.effects.off(
+        ShopDiscountHooks.onDiscountListChange,
+        onDiscountListChange
+      );
     };
   }, [state.bookingId, isBooking4Shop, fn]);
   const productListToValue = (0, import_ahooks.useMemoizedFn)((list, edit) => {
@@ -262,8 +274,8 @@ var VoucherCard = (props) => {
       import_materials.PisellGoodPassCard,
       {
         style: { width: "100%" },
-        dataSource: ((_d = (_c = state.service) == null ? void 0 : _c.value) == null ? void 0 : _d.length) ? availableData : [],
         mixedSort,
+        dataSource: ((_d = (_c = state.service) == null ? void 0 : _c.value) == null ? void 0 : _d.length) ? availableData : [],
         onChange: (val) => {
           const shopDiscount2 = pisellos.getModule("shopDiscount");
           const detail = shopDiscount2.setDiscountSelected({

package/lib/components/booking/info/service2/utils.js

@@ -422,7 +422,7 @@ var getErrorMessageInfo2 = (errorList) => {
 };
 var getAllErrorList = (item) => {
   const { resourceMaps } = item._data || {};
-  const { resource = {} } = item._extend || {};
+  const { resource } = item._extend || {};
   const errorList = [];
   Object.entries(resource).forEach(([key, value]) => {
     value.forEach((val) => {
@@ -437,7 +437,7 @@ var getAllErrorList = (item) => {
 var mapListItems = (items) => items.map((item) => ({
   id: item.id || item.form_record_id,
   label: item.labelText,
-  isError: !item.usable || item.unbound
+  isError: !item.usable
 }));
 var getIsSubjectRequire = (state) => {
   var _a, _b, _c, _d, _e, _f, _g;

package/lib/components/booking/info2/service/addService/utils.d.ts

@@ -69,16 +69,6 @@ export declare const setDefaultResource: ({ cacheItem, resources }: any) => any;
  * @Date: 2024-09-19 20:26
  */
 export declare const setDefaultCapacitys: ({ capacitys, cacheItem }: any) => any;
-/**
- * @title: 将商品内关联的资源id还原成数据
- * @description:
- * @param {any} resourcesOriginMap
- * @param {any} cacheItem
- * @return {*}
- * @Author: zhiwei.Wang
- * @Date: 2024-09-19 20:23
- */
-export declare const getResourceByIds: (resourcesOriginMap: any, cacheItem: any, extraParams?: any) => any[];
 /**
  * @title: 预生成服务的 extend
  * @description:

package/lib/components/booking/info2/service/addService/utils.js

@@ -33,7 +33,6 @@ __export(utils_exports, {
   getDurationProps: () => getDurationProps,
   getFlexibleOption: () => getFlexibleOption,
   getProductExtend: () => getProductExtend,
-  getResourceByIds: () => getResourceByIds,
   getTimeObj: () => getTimeObj,
   getTimeSlices: () => getTimeSlices,
   getUsableTime: () => getUsableTime,
@@ -178,12 +177,8 @@ var formatResources = ({ cacheItem, resourcesOrigin, id }) => {
       let _item = (0, import_lodash.cloneDeep)(item);
       _item.renderList = _item.renderList.map((d) => {
         let res = (0, import_utilsByBooking.formatResource)(d, _cacheItem, (newData) => {
-          let unbound = !item.optional_resource.includes(newData.id) && !item.default_resource.includes(newData.id) && newData.id !== 0;
-          return /* @__PURE__ */ import_react.default.createElement("div", { className: "resource-option" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "like-wrap" }), /* @__PURE__ */ import_react.default.createElement("span", { className: "resource-option-label-text" }, newData.labelText), (!newData.usable || unbound) && /* @__PURE__ */ import_react.default.createElement(import_AlertTriangle.default, { className: "resource-option-alert-icon" }));
+          return /* @__PURE__ */ import_react.default.createElement("div", { className: "resource-option" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "like-wrap" }), newData.labelText, !newData.usable && /* @__PURE__ */ import_react.default.createElement(import_AlertTriangle.default, { className: "resource-option-alert-icon" }));
         });
-        if (!item.optional_resource.includes(d.id) && !item.default_resource.includes(d.id) && d.id !== 0) {
-          res.unbound = true;
-        }
         renderListMaps[res.id] = res;
         return res;
       }).sort((a, b) => b.usable ? 1 : -1);
@@ -285,17 +280,12 @@ var setDefaultCapacitys = ({ capacitys, cacheItem }) => {
   }
   return [{ id: 0, value: 1, name: "" }];
 };
-var getResourceByIds = (resourcesOriginMap, cacheItem, extraParams) => {
+var getResourceByIds = (resourcesOriginMap, cacheItem) => {
   var _a;
   let _resources = [...((_a = cacheItem == null ? void 0 : cacheItem.product_resource) == null ? void 0 : _a.resources) || []];
-  const { extraResources = [] } = extraParams || {};
   _resources = _resources.filter((d) => d.status == 1);
   for (let item of _resources) {
     const form_id = item.id;
-    let extraResourceIds = extraResources.filter((_extraItem) => {
-      return _extraItem.form_id === form_id && !item.optional_resource.includes(_extraItem.id) && !item.default_resource.includes(_extraItem.id);
-    }).map((_extraItem) => _extraItem.id);
-    extraResourceIds = Array.from(new Set(extraResourceIds));
     item.optional_resource = (item.optional_resource || []).filter(
       (d) => item.default_resource.indexOf(d) == -1
     );
@@ -318,7 +308,7 @@ var getResourceByIds = (resourcesOriginMap, cacheItem, extraParams) => {
         }
       };
     };
-    let optional_resource = [...item.optional_resource, ...extraResourceIds].map((d) => {
+    let optional_resource = item.optional_resource.map((d) => {
       if (!resourcesOriginMap[d]) {
         return null;
       }
@@ -427,21 +417,9 @@ var getProductExtend = ({ cacheItem, state, isDisabledTime }) => {
       _cacheItem._data.capacitys = cacheItem.capacity;
     }
     if (!_cacheItem._data.resourcesOrigin) {
-      const extraResources = [];
-      if (Array.isArray(_cacheItem._extend.event_resources)) {
-        _cacheItem._extend.event_resources.forEach((_item) => {
-          extraResources.push({
-            form_id: _item.form_id,
-            id: _item.relation_id
-          });
-        });
-      }
       _cacheItem._data.resourcesOrigin = getResourceByIds(
         resourcesOriginMap,
-        cacheItem,
-        {
-          extraResources
-        }
+        cacheItem
       );
     }
     if (!_cacheItem._data.resources) {
@@ -480,7 +458,6 @@ var transServiceList = (list) => {
   getDurationProps,
   getFlexibleOption,
   getProductExtend,
-  getResourceByIds,
   getTimeObj,
   getTimeSlices,
   getUsableTime,

package/lib/components/booking/info2/service/editService/Resources/index.js

@@ -43,20 +43,7 @@ var import_lodash = require("lodash");
 var import_utils2 = require("../utils");
 var import_ahooks = require("ahooks");
 var import_icons = require("@ant-design/icons");
-var Resources = ({
-  state,
-  cacheItem,
-  getCurrentCacheItem,
-  onChange,
-  value,
-  config = {
-    // 是否显示自动分配
-    autoAllocation: true,
-    // 是否显示资源错误图标
-    resourceErrorIcon: true,
-    disabled: false
-  }
-}, ref) => {
+var Resources = ({ state, cacheItem, getCurrentCacheItem, onChange, value }, ref) => {
   var _a, _b;
   const [showError, setShowError] = (0, import_react.useState)(false);
   const update = (0, import_ahooks.useUpdate)();
@@ -147,7 +134,7 @@ var Resources = ({
         );
       });
     },
-    [config == null ? void 0 : config.resourceErrorIcon]
+    []
   );
   const check = () => {
     var _a2;
@@ -179,7 +166,6 @@ var Resources = ({
       {
         label: item.title,
         required: true,
-        labelCol: config == null ? void 0 : config.labelCol,
         extra: showError && item.select_type.min > (cur == null ? void 0 : cur.length) ? /* @__PURE__ */ import_react.default.createElement("span", { style: { color: "#ff4d4f" } }, import_utils.locales.getText(
           "page.booking.text.resource.min-length-error"
         )(item.select_type.min, item.title)) : void 0
@@ -187,12 +173,9 @@ var Resources = ({
       /* @__PURE__ */ import_react.default.createElement("div", { className: "resource-col" }, item.select_type.type === "multiple" ? null : /* @__PURE__ */ import_react.default.createElement(
         import_antd.Button,
         {
-          className: `resource-col-like-wrap ${(config == null ? void 0 : config.disabled) ? "resource-col-like-wrap-disabled" : ""}`,
+          className: "resource-col-like-wrap",
           onClick: () => {
             var _a3;
-            if (config == null ? void 0 : config.disabled) {
-              return;
-            }
             setLikeStatus(
               ((_a3 = cur == null ? void 0 : cur[0]) == null ? void 0 : _a3.like_status) === "like" ? "common" : "like",
               item.form_id,
@@ -200,13 +183,7 @@ var Resources = ({
             );
           }
         },
-        /* @__PURE__ */ import_react.default.createElement(
-          import_like.default,
-          {
-            status: (_a2 = cur == null ? void 0 : cur[0]) == null ? void 0 : _a2.like_status,
-            className: `${(config == null ? void 0 : config.disabled) ? "like-icon-disabled" : ""}`
-          }
-        )
+        /* @__PURE__ */ import_react.default.createElement(import_like.default, { status: (_a2 = cur == null ? void 0 : cur[0]) == null ? void 0 : _a2.like_status })
       ), /* @__PURE__ */ import_react.default.createElement(
         import_MaxLengthSelect.default,
         {
@@ -227,35 +204,14 @@ var Resources = ({
           showSearch: true,
           filterOption: (str, option) => {
             return ((option == null ? void 0 : option.labelText) || "").toLowerCase().includes((str || "").toLowerCase());
-          },
-          disabled: config == null ? void 0 : config.disabled
-        },
-        renderOptions(
-          item.renderList,
-          "id",
-          (config == null ? void 0 : config.resourceErrorIcon) ? "label" : "labelText",
-          "resource"
-        )
-      ), (config == null ? void 0 : config.autoAllocation) ? /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, /* @__PURE__ */ import_react.default.createElement(
-        import_antd.Checkbox,
-        {
-          checked: getIsAutoAllocation(item.form_id),
-          onChange: (e) => {
-            handleCheckAutoAllocation(
-              item.form_id,
-              e.target.checked
-            );
           }
-        }
-      ), /* @__PURE__ */ import_react.default.createElement(
-        import_antd.Tooltip,
-        {
-          title: import_utils.locales.getText(
-            "page.booking.text.resource.check-auto-allocation-tip"
-          )
         },
-        /* @__PURE__ */ import_react.default.createElement(import_icons.QuestionCircleOutlined, null)
-      )) : null)
+        renderOptions(item.renderList, "id", "label", "resource")
+      ), /* @__PURE__ */ import_react.default.createElement(import_antd.Checkbox, { checked: getIsAutoAllocation(item.form_id), onChange: (e) => {
+        handleCheckAutoAllocation(item.form_id, e.target.checked);
+      } }), /* @__PURE__ */ import_react.default.createElement(import_antd.Tooltip, { title: import_utils.locales.getText(
+        "page.booking.text.resource.check-auto-allocation-tip"
+      ) }, /* @__PURE__ */ import_react.default.createElement(import_icons.QuestionCircleOutlined, null)))
     ), state.renderType !== "eventBooking" && (errors || []).map((d) => {
       return /* @__PURE__ */ import_react.default.createElement(
         import_antd.Alert,

package/lib/components/booking/info2/service/editService/Resources/index.less

@@ -15,12 +15,6 @@
     .like-resource {}
   }
 
-  .resource-col-like-wrap-disabled,
-  .like-icon-disabled {
-    opacity: 0.5;
-    cursor: not-allowed;
-  }
-
   .resource-col-select {
     flex: 1;
   }

package/lib/components/booking/info2/utilsByBooking.js

@@ -180,12 +180,6 @@ var getErrorList = (resource, cacheItem) => {
       }
     }
   }
-  if (resource.unbound) {
-    list.push({
-      label: import_utils.locales.getText("pisell1.text.resource-error-message-unbound"),
-      type: "time"
-    });
-  }
   return list;
 };
 var formatResource = (resourceItem, cacheItem, formatLabel) => {

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

@@ -110,7 +110,6 @@ declare const _default: {
         'pisell1.text.resource-error-message-1': (x: string, y: string) => string;
         'pisell1.text.resource-error-message-2': (x: string, y: string, z: string) => string;
         'pisell1.text.resource-error-message-3': (x: string, y: string, z: string) => string;
-        'pisell1.text.resource-error-message-unbound': string;
         'pisell1.text.no-addons': string;
         'pisell1.text.no-resource': string;
         'pisell1.text.no-payments': string;
@@ -390,7 +389,6 @@ declare const _default: {
         'pisell1.text.resource-error-message-1': (x: string, y: string) => string;
         'pisell1.text.resource-error-message-2': (x: string, y: string, z: string) => string;
         'pisell1.text.resource-error-message-3': (x: string, y: string, z: string) => string;
-        'pisell1.text.resource-error-message-unbound': string;
         'pisell2.text.flexible': string;
         'pisell2.text.order-discount': string;
         'pisell2.text.no-product-added': string;
@@ -662,7 +660,6 @@ declare const _default: {
         'pisell1.text.resource-error-message-1': (x: string, y: string) => string;
         'pisell1.text.resource-error-message-2': (x: string, y: string, z: string) => string;
         'pisell1.text.resource-error-message-3': (x: string, y: string, z: string) => string;
-        'pisell1.text.resource-error-message-unbound': string;
         'pisell2.text.flexible': string;
         'pisell2.text.order-discount': string;
         'pisell2.text.no-product-added': string;

package/lib/components/booking/locales.js

@@ -154,7 +154,6 @@ var locales_default = {
     "pisell1.text.resource-error-message-1": (x, y) => `${x} doesn't provide ${y}, but your team member can still book appointments.`,
     "pisell1.text.resource-error-message-2": (x, y, z) => `${x} isn't available between ${y} and ${z}, but your team member can still book appointments.`,
     "pisell1.text.resource-error-message-3": (x, y, z) => `${x} is fully booked between ${y} and ${z}, but your team member can still book appointments.`,
-    "pisell1.text.resource-error-message-unbound": "This booking product is not associated with the target resource.",
     "pisell1.text.no-addons": "No addons",
     "pisell1.text.no-resource": "No resource",
     "pisell1.text.no-payments": "No payments",
@@ -466,7 +465,6 @@ var locales_default = {
     "pisell1.text.resource-error-message-1": (x, y) => `${x} 不提供 ${y}，但您的团队成员仍然可以预约。`,
     "pisell1.text.resource-error-message-2": (x, y, z) => `${x}在${y}到${z}之间不提供服务，但您的团队成员仍然可以预约。`,
     "pisell1.text.resource-error-message-3": (x, y, z) => `${x}在${y}到${z}之间已约满，但您的团队成员仍然可以预约。`,
-    "pisell1.text.resource-error-message-unbound": "该预约商品未关联目标资源。",
     "pisell2.text.flexible": "灵活",
     "pisell2.text.order-discount": "折扣",
     "pisell2.text.no-product-added": "未添加商品",
@@ -770,7 +768,6 @@ var locales_default = {
     "pisell1.text.resource-error-message-1": (x, y) => `${x} 不提供 ${y}，但您的團隊成員仍然可以預約。`,
     "pisell1.text.resource-error-message-2": (x, y, z) => `${x}在${y}到${z}之間不提供服務，但您的團隊成員仍然可以預約。`,
     "pisell1.text.resource-error-message-3": (x, y, z) => `${x}在${y}到${z}之間已約滿，但您的團隊成員仍然可以預約。`,
-    "pisell1.text.resource-error-message-unbound": "該預約商品未關聯目標資源。",
     "pisell2.text.flexible": "靈活",
     "pisell2.text.order-discount": "折扣",
     "pisell2.text.no-product-added": "未添加商品",

package/lib/components/eventBooking/components/Provider/Event/index.js

@@ -48,7 +48,6 @@ var Event = () => {
   const { onOpenEventDetail, open } = (0, import_Sales.useEventDetail)();
   const [lists, setLists] = (0, import_react.useState)();
   const customer = (0, import_useLoginUser.default)();
-  const { appUtils } = (0, import_Sales.useCustomer)();
   (0, import_react.useEffect)(() => {
     var _a2;
     const eventList = (eventData == null ? void 0 : eventData.eventList) || [];
@@ -60,22 +59,16 @@ var Event = () => {
     }
   }, [eventData == null ? void 0 : eventData.eventList]);
   (0, import_react.useEffect)(() => {
-    var _a2, _b2, _c, _d, _e;
+    var _a2, _b2;
     const id = (_b2 = (_a2 = data == null ? void 0 : data.resourceData) == null ? void 0 : _a2.currentResourceItem) == null ? void 0 : _b2.id;
     if (!id) return;
-    const history = ((_c = appUtils == null ? void 0 : appUtils.getHistory) == null ? void 0 : _c.call(appUtils)) || {};
-    const query = (_d = history == null ? void 0 : history.location) == null ? void 0 : _d.query;
-    const params = {
+    getEventList.run({
       event_item_resource_id: id,
       skip: 1,
       num: 100,
       customer_id: customer == null ? void 0 : customer.id,
       open_quotation: 1
-    };
-    if (query == null ? void 0 : query.ids) {
-      params.ids = (_e = query == null ? void 0 : query.ids) == null ? void 0 : _e.split(",");
-    }
-    getEventList.run(params);
+    });
   }, [(_b = (_a = data == null ? void 0 : data.resourceData) == null ? void 0 : _a.currentResourceItem) == null ? void 0 : _b.id, customer == null ? void 0 : customer.id]);
   const handleClick = (item) => {
     selectEvent(item);

package/lib/components/eventBooking/components/bookingDetailModal/index.js

@@ -44,7 +44,7 @@ var import_OrderProductModal = __toESM(require("../Provider/OrderProductModal/in
 var import_index = require("./index.less");
 var import_useEngineContext = __toESM(require("../../../../hooks/useEngineContext"));
 var BookingDetailModal = (props) => {
-  var _a, _b, _c;
+  var _a;
   const modalContentRef = (0, import_react.useRef)(null);
   const context = (0, import_useEngineContext.default)();
   const { utils } = context.appHelper || {};
@@ -58,17 +58,11 @@ var BookingDetailModal = (props) => {
     checkBeforeSelectEventDetail
   } = (0, import_Sales.useEventDetail)();
   const { addToCart, checkBeforeAddToCart, checkBeforeAddToCartResquest } = (0, import_Sales.useCart)();
-  const { initData } = (0, import_Sales.useInit)();
   const [activeTab, setActiveTab] = (0, import_react.useState)("introduction");
   const [isScrolling, setIsScrolling] = (0, import_react.useState)(false);
   const [openCheckout, setOpenCheckout] = (0, import_react.useState)(false);
   const isUserClickRef = (0, import_react.useRef)(false);
   const scrollTimeoutRef = (0, import_react.useRef)(null);
-  const buttonText = (0, import_react.useMemo)(() => {
-    var _a2, _b2, _c2;
-    const config = ((_b2 = (_a2 = initData == null ? void 0 : initData.boardSetting) == null ? void 0 : _a2.config) == null ? void 0 : _b2.product_display_setting) || {};
-    return ((_c2 = utils == null ? void 0 : utils.translation) == null ? void 0 : _c2.call(utils, config == null ? void 0 : config.booking_event_v2_product_detail_button)) || import_utils.locales.getText("pisell2.event.add.to.cart");
-  }, [(_b = (_a = initData == null ? void 0 : initData.boardSetting) == null ? void 0 : _a.config) == null ? void 0 : _b.product_display_setting]);
   const anchorOptions = (0, import_react.useMemo)(
     () => [
       {
@@ -97,7 +91,7 @@ var BookingDetailModal = (props) => {
   const images = (0, import_react.useMemo)(() => {
     var _a2;
     return ((_a2 = detail == null ? void 0 : detail.introduction) == null ? void 0 : _a2.images) || [];
-  }, [(_c = detail == null ? void 0 : detail.introduction) == null ? void 0 : _c.images]);
+  }, [(_a = detail == null ? void 0 : detail.introduction) == null ? void 0 : _a.images]);
   (0, import_react.useEffect)(() => {
     if (!modalContentRef.current) return;
     let isCurrentlyScrolling = false;
@@ -289,7 +283,7 @@ var BookingDetailModal = (props) => {
       destroyOnClose: true,
       className: "booking-detail-modal",
       onCancel: onCloseEventDetail,
-      okText: buttonText,
+      okText: import_utils.locales.getText("pisell2.event.add.to.cart"),
       cancelVisible: false,
       onOk: handleOk,
       width: (0, import_utils.isMobile)() ? "100%" : 600,

package/lib/components/eventBooking/index.js

@@ -55,17 +55,13 @@ var Content = () => {
     getBoardSetting.run({ item_type: "event_booking_v2" });
   }, []);
   (0, import_react.useEffect)(() => {
-    var _a2, _b, _c;
-    const history = ((_a2 = utils == null ? void 0 : utils.getHistory) == null ? void 0 : _a2.call(utils)) || {};
-    const query = (_b = history == null ? void 0 : history.location) == null ? void 0 : _b.query;
-    const params = {
-      front_end_cache_id: (query == null ? void 0 : query.cacheId) || ""
-    };
-    if (query == null ? void 0 : query.ids) {
-      params.event_item_ids = (_c = query == null ? void 0 : query.ids) == null ? void 0 : _c.split(",");
-    }
-    getResourceList.run(params);
-  }, []);
+    if (!form_id) return;
+    getResourceList.run({
+      form_id,
+      shop_id,
+      form_data_status: "active"
+    });
+  }, [form_id]);
   return /* @__PURE__ */ import_react.default.createElement(
     "div",
     {

package/lib/components/eventBooking/locales.js

@@ -51,7 +51,7 @@ var locales_default = {
     "pisell2.event.campus": "Campus",
     "pisell2.event.resource": "Location",
     "pisell2.event.booking.options": "Booking options",
-    "pisell2.event.add.to.cart": "Add to Cart",
+    "pisell2.event.add.to.cart": "Add to cart",
     "pisell2.event.description": "Description",
     "pisell2.event.view.more": "View more",
     "pisell2.event.view.less": "View less",
@@ -124,7 +124,7 @@ var locales_default = {
     "pisell2.event.campus": "校区",
     "pisell2.event.resource": "资源",
     "pisell2.event.booking.options": "预约选项",
-    "pisell2.event.add.to.cart": "加入购物车",
+    "pisell2.event.add.to.cart": "添加到购物车",
     "pisell2.event.description": "描述",
     "pisell2.event.view.more": "查看更多",
     "pisell2.event.view.less": "收起",
@@ -197,7 +197,7 @@ var locales_default = {
     "pisell2.event.campus": "校區",
     "pisell2.event.resource": "資源",
     "pisell2.event.booking.options": "預約選項",
-    "pisell2.event.add.to.cart": "加入購物車",
+    "pisell2.event.add.to.cart": "添加到購物車",
     "pisell2.event.description": "描述",
     "pisell2.event.view.more": "查看更多",
     "pisell2.event.view.less": "收起",

package/lib/components/index.d.ts

@@ -15,6 +15,4 @@ import WorkspaceListDetail from './workSpaceListDetail/';
 import WorkspaceList from './workSpaceList';
 import PisellSelectCustomerModal from './pisellSelectCustomerModal';
 import SubTotal from './subTotal';
-import StepController from './stepController';
-import EditBookingModal from './booking/editBookingModal';
-export { Login, BookingInfo, Booking, BookingNotes, BookingAddons, BookingForms, Schedules, ProductExtension, RuleSetting, TaxSelect, ToCPay, PisellSelectCustomerModal, Wallet, WalletList, WorkspaceList, WorkspaceListDetail, SubTotal, StepController, EditBookingModal };
+export { Login, BookingInfo, Booking, BookingNotes, BookingAddons, BookingForms, Schedules, ProductExtension, RuleSetting, TaxSelect, ToCPay, PisellSelectCustomerModal, Wallet, WalletList, WorkspaceList, WorkspaceListDetail, SubTotal, };

package/lib/components/index.js

@@ -34,13 +34,11 @@ __export(components_exports, {
   BookingForms: () => import_forms.default,
   BookingInfo: () => import_info.default,
   BookingNotes: () => import_notes.default,
-  EditBookingModal: () => import_editBookingModal.default,
   Login: () => import_login.default,
   PisellSelectCustomerModal: () => import_pisellSelectCustomerModal.default,
   ProductExtension: () => import_productExtension.default,
   RuleSetting: () => import_ruleSetting.default,
   Schedules: () => import_schedules.default,
-  StepController: () => import_stepController.default,
   SubTotal: () => import_subTotal.default,
   TaxSelect: () => import_taxSelect.default,
   ToCPay: () => import_toC.default,
@@ -67,8 +65,6 @@ var import_workSpaceListDetail = __toESM(require("./workSpaceListDetail/"));
 var import_workSpaceList = __toESM(require("./workSpaceList"));
 var import_pisellSelectCustomerModal = __toESM(require("./pisellSelectCustomerModal"));
 var import_subTotal = __toESM(require("./subTotal"));
-var import_stepController = __toESM(require("./stepController"));
-var import_editBookingModal = __toESM(require("./booking/editBookingModal"));
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   Booking,
@@ -76,13 +72,11 @@ var import_editBookingModal = __toESM(require("./booking/editBookingModal"));
   BookingForms,
   BookingInfo,
   BookingNotes,
-  EditBookingModal,
   Login,
   PisellSelectCustomerModal,
   ProductExtension,
   RuleSetting,
   Schedules,
-  StepController,
   SubTotal,
   TaxSelect,
   ToCPay,