@pisell/private-materials 3.0.74 → 3.0.75

package/lib/components/booking/info/service/addTimeModal/utils.d.ts

@@ -1,12 +1,31 @@
-export declare const getAddTimeSplits: (config: any, price: number) => ({
-    label: string;
-    value: number;
-    readonly: boolean;
-    price?: undefined;
-} | {
-    label: string;
-    value: number;
-    price: number;
-    readonly?: undefined;
-})[];
-export declare const isUsableProduct: (relationProduct: any, currentItem: any) => any;
+/**
+ * @title: 根据商品生成加时列表
+ * @description:
+ * @param {any} config
+ * @param {number} price
+ * @return {*}
+ * @Author: zhiwei.Wang
+ * @Date: 2024-07-01 09:34
+ */
+export declare const getAddTimeSplits: (product: any, cacheItem: any, currentResourceTimeEndDate: any) => {
+    label: any;
+    value: any;
+    price: any;
+}[];
+/**
+ * @title: 判断当前商品是否可用
+ * @description:
+ * @param {any} relationProduct
+ * @param {any} currentItem
+ * @return {*}
+ * @Author: zhiwei.Wang
+ * @Date: 2024-07-01 09:33
+ */
+export declare const isUsableProduct: (addTime: any, currentItem: any) => any;
+export declare const addTimeRowKey: {
+    create: (product_id: number, time: number) => string;
+    getValue: (str: string) => {
+        product_id: number;
+        time: number | string;
+    };
+};

package/lib/components/booking/info/service/addTimeModal/utils.js

@@ -29,6 +29,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/components/booking/info/service/addTimeModal/utils.ts
 var utils_exports = {};
 __export(utils_exports, {
+  addTimeRowKey: () => addTimeRowKey,
   getAddTimeSplits: () => getAddTimeSplits,
   isUsableProduct: () => isUsableProduct
 });
@@ -37,66 +38,74 @@ var import_dayjs = __toESM(require("dayjs"));
 var import_utils = require("../../../utils");
 var import_utils2 = require("@pisell/utils");
 var import_lodash = require("lodash");
-var getIsAddH = (pre, current) => {
-  if (current < 60) {
-    return "";
-  }
-  let preH = Math.floor(pre / 60);
-  let currentH = Math.floor(current / 60);
-  if (current % 60 !== 0) {
-    return "";
+var getAddTimeSplits = (product, cacheItem, currentResourceTimeEndDate) => {
+  const { add_time = {
+    calculate_type: "select_quantity",
+    // 最大时长
+    max_add_time: 30,
+    // 最小时长
+    min_add_time: 30,
+    // 关联产品
+    relation_product: { type: "product_all", products: [] },
+    // 单位切片
+    unit_duration: 30
+  }, price = 0 } = product;
+  if (add_time.additional_time_options === "unlimited") {
+    let maxEndDate = (0, import_utils.getEndDate)(cacheItem._extend.startDate, "flexible", currentResourceTimeEndDate);
+    let _value = maxEndDate.diff(cacheItem._extend.endDate, "minute");
+    if (_value > 0) {
+      return [
+        {
+          label: import_utils2.locales.getText("page.booking.text.unlimited"),
+          value: _value,
+          price
+        }
+      ];
+    } else {
+      return [];
+    }
   }
-  return (0, import_utils.getDiscountTime)(currentH * 60);
-};
-var getAddTimeSplits = (config, price) => {
   const startTime = (0, import_dayjs.default)().startOf("day");
-  const endTime = startTime.add(config.max_add_time, "minute");
-  const timeSlice = (config == null ? void 0 : config.unit_duration) || 5;
+  const endTime = startTime.add(add_time.max_add_time, "minute");
+  const timeSlice = (add_time == null ? void 0 : add_time.unit_duration) || 5;
   let arr = [];
   let currentTime = startTime;
   let lastDuration = 0;
   while (currentTime.isBefore(endTime)) {
     let nextTime = currentTime;
     if (lastDuration === 0) {
-      nextTime = nextTime.add(config.min_add_time, "minute");
+      nextTime = nextTime.add(add_time.min_add_time, "minute");
     } else {
       nextTime = currentTime.add(timeSlice, "minute");
     }
     const durationValue = nextTime.diff(startTime, "minute");
-    const isAddH = getIsAddH(lastDuration, durationValue);
-    console.log("isAddH", isAddH);
-    if (isAddH) {
-      arr.push({
-        label: isAddH,
-        value: 0,
-        readonly: true
-      });
-    }
+    let durationLabel = `${durationValue} ${import_utils2.locales.getText("pisell2.text.min")}`;
     if (durationValue >= 60) {
-      const durationLabel = (0, import_utils.getDiscountTime)(durationValue);
-      arr.push({
-        label: durationLabel,
-        value: durationValue,
-        price: durationValue / timeSlice * price
-      });
-    } else {
-      const durationLabel = `${durationValue} ${import_utils2.locales.getText("pisell2.text.min")}`;
-      arr.push({
-        label: durationLabel,
-        value: durationValue,
-        price: durationValue / timeSlice * price
-      });
+      durationLabel = (0, import_utils.getDiscountTime)(durationValue);
     }
+    arr.push({
+      label: durationLabel,
+      value: durationValue,
+      price: durationValue / timeSlice * price
+    });
     lastDuration = durationValue;
     currentTime = nextTime;
   }
   return arr;
 };
-var isUsableProduct = (relationProduct, currentItem) => {
-  const type = relationProduct.type;
+var isUsableProduct = (addTime, currentItem) => {
+  var _a;
+  const type = (_a = addTime.relation_product) == null ? void 0 : _a.type;
+  const relationProduct = addTime.relation_product || [];
   if (!currentItem) {
     return false;
   }
+  if (addTime.additional_time_options === "unlimited") {
+    let maxEndDate = (0, import_utils.getEndDate)(currentItem._extend.startDate, "flexible", "");
+    if (currentItem._extend.endDate.isAfter(maxEndDate)) {
+      return false;
+    }
+  }
   if (type === "product_all") {
     return true;
   } else {
@@ -122,8 +131,25 @@ var isUsableProduct = (relationProduct, currentItem) => {
     }
   }
 };
+var addTimeRowKey = {
+  // 创建, 增加前缀
+  create: (product_id, time) => {
+    return `${product_id}_${time}`;
+  },
+  // 格式化, 去除前缀
+  getValue: (str) => {
+    let arr = str.split("_");
+    let id = arr[0] || 0;
+    let time = arr[1] || 0;
+    return {
+      product_id: Number(id),
+      time: time === "flexible" ? time : Number(arr[1] || 0)
+    };
+  }
+};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  addTimeRowKey,
   getAddTimeSplits,
   isUsableProduct
 });

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

@@ -154,6 +154,7 @@ declare const _default: {
         'page.booking.text.unavailable': string;
         'page.booking.text.available': string;
         'page.booking.text.fully-booked': string;
+        'page.booking.text.unlimited': string;
         'pisell2.text.terminal-edit-message': string;
     };
     'zh-CN': {
@@ -312,6 +313,7 @@ declare const _default: {
         'page.booking.text.unavailable': string;
         'page.booking.text.available': string;
         'page.booking.text.fully-booked': string;
+        'page.booking.text.unlimited': string;
     };
     'zh-HK': {
         'pisell2.text.refunded-amount': string;
@@ -469,6 +471,7 @@ declare const _default: {
         'page.booking.text.unavailable': string;
         'page.booking.text.available': string;
         'page.booking.text.fully-booked': string;
+        'page.booking.text.unlimited': string;
     };
 };
 export default _default;

package/lib/components/booking/locales.js

@@ -187,6 +187,7 @@ var locales_default = {
     "page.booking.text.unavailable": "Unavailable",
     "page.booking.text.available": "Available",
     "page.booking.text.fully-booked": "Fully booked",
+    "page.booking.text.unlimited": "Unlimited",
     "pisell2.text.terminal-edit-message": "This operation cannot be performed. To proceed, please use the Pisell Terminal."
   },
   "zh-CN": {
@@ -358,7 +359,8 @@ var locales_default = {
     "page.booking.text.add-time-success": "加时成功",
     "page.booking.text.unavailable": "不可用",
     "page.booking.text.available": "可用",
-    "page.booking.text.fully-booked": "已约满"
+    "page.booking.text.fully-booked": "已约满",
+    "page.booking.text.unlimited": "无限制"
   },
   "zh-HK": {
     "pisell2.text.refunded-amount": "已退金額",
@@ -529,6 +531,7 @@ var locales_default = {
     "page.booking.text.add-time-success": "加時成功!",
     "page.booking.text.unavailable": "不可用",
     "page.booking.text.available": "可用",
-    "page.booking.text.fully-booked": "已約滿"
+    "page.booking.text.fully-booked": "已約滿",
+    "page.booking.text.unlimited": "無限制"
   }
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/private-materials",
-  "version": "3.0.74",
+  "version": "3.0.75",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",
@@ -59,8 +59,8 @@
     "react-infinite-scroll-component": "^6.1.0",
     "rc-virtual-list": "^3.11.3",
     "@pisell/utils": "1.0.25",
-    "@pisell/icon": "0.0.8",
-    "@pisell/date-picker": "1.0.74"
+    "@pisell/date-picker": "1.0.74",
+    "@pisell/icon": "0.0.8"
   },
   "peerDependencies": {
     "react": "^18.0.0",