@pisell/private-materials 3.0.28 → 3.0.30

package/lib/components/booking/locales.js

@@ -154,7 +154,25 @@ var locales_default = {
     "pisell2.text.order.sales.channel.boxcocal": "Boxlocal",
     "pisell2.text.order.sales.channel.tableorder": "Table Order",
     "pisell2.text.order.sales.channel.reserve": "Google Reservation",
-    "pisell2.text.rebook": "Rebook"
+    "pisell2.text.rebook": "Rebook",
+    "pisell2.text.now": "Now",
+    "pisell2.text.deposit-list": "Deposit List",
+    "pisell2.text.deposit-item-status-paid": "Paid",
+    "pisell2.text.deposit-item-status-unpaid": "Unpaid",
+    "pisell2.text.deposit-order-total": "Order Total",
+    "pisell2.text.deposit-order-detail": "Order Details",
+    "pisell2.text.deposit-collect-deposit": "Collect Deposit",
+    "pisell2.text.deposit-order-no": "Order No",
+    "pisell2.text.deposit-amount": "Amount",
+    "pisell2.text.deposit-deposit-amount": "Deposit Amount",
+    "pisell2.text.deposit-generate-payment-link": "Generate Payment Link",
+    "pisell2.text.deposit-list-empty": "Please add a deposit",
+    "pisell2.text.deposit-amount-message": "Amount must be greater than 0",
+    "pisell2.text.deposit-amount-message2": "The deposit amount cannot be greater than the total order amount",
+    "pisell2.text.deposit-amount-message3": "Please enter the deposit amount",
+    "pisell2.text.deposit-delete": "Delete deposit",
+    "pisell2.text.deposit-delete-message-title": "Prompt",
+    "pisell2.text.deposit-delete-message": "It cannot be restored after deletion. Please confirm the operation."
   },
   "zh-CN": {
     "pisell2.text.refunded-amount": "已退金额",
@@ -292,7 +310,25 @@ var locales_default = {
     "pisell2.text.order.sales.channel.boxcocal": "Boxlocal",
     "pisell2.text.order.sales.channel.tableorder": "扫码点餐",
     "pisell2.text.order.sales.channel.reserve": "谷歌预约",
-    "pisell2.text.rebook": "再次预约"
+    "pisell2.text.rebook": "再次预约",
+    "pisell2.text.now": "现在",
+    "pisell2.text.deposit-list": "定金列表",
+    "pisell2.text.deposit-item-status-paid": "已支付",
+    "pisell2.text.deposit-item-status-unpaid": "未支付",
+    "pisell2.text.deposit-order-total": "订单总额",
+    "pisell2.text.deposit-order-detail": "订单详情",
+    "pisell2.text.deposit-collect-deposit": "收定金",
+    "pisell2.text.deposit-order-no": "订单编号",
+    "pisell2.text.deposit-amount": "金额",
+    "pisell2.text.deposit-deposit-amount": "定金金额",
+    "pisell2.text.deposit-generate-payment-link": "生成支付链接",
+    "pisell2.text.deposit-list-empty": "请添加定金",
+    "pisell2.text.deposit-amount-message": "金额必须大于0",
+    "pisell2.text.deposit-amount-message2": "定金金额不能大于订单总额",
+    "pisell2.text.deposit-amount-message3": "请输入定金金额",
+    "pisell2.text.deposit-delete": "删除定金",
+    "pisell2.text.deposit-delete-message-title": "提示",
+    "pisell2.text.deposit-delete-message": "删除后不可恢复，请确认操作"
   },
   "zh-HK": {
     "pisell2.text.refunded-amount": "已退金額",
@@ -430,6 +466,24 @@ var locales_default = {
     "pisell2.text.order.sales.channel.boxcocal": "Boxlocal",
     "pisell2.text.order.sales.channel.tableorder": "掃碼點餐",
     "pisell2.text.order.sales.channel.reserve": "谷歌預約",
-    "pisell2.text.rebook": "再次預約"
+    "pisell2.text.rebook": "再次預約",
+    "pisell2.text.now": "現在",
+    "pisell2.text.deposit-list": "定金列表",
+    "pisell2.text.deposit-item-status-paid": "已支付",
+    "pisell2.text.deposit-item-status-unpaid": "未支付",
+    "pisell2.text.deposit-order-total": "訂單總額",
+    "pisell2.text.deposit-order-detail": "訂單詳情",
+    "pisell2.text.deposit-collect-deposit": "收定金",
+    "pisell2.text.deposit-order-no": "訂單編號",
+    "pisell2.text.deposit-amount": "金額",
+    "pisell2.text.deposit-deposit-amount": "定金金額",
+    "pisell2.text.deposit-generate-payment-link": "生成支付鏈接",
+    "pisell2.text.deposit-list-empty": "請添加定金",
+    "pisell2.text.deposit-amount-message": "金額必須大於0",
+    "pisell2.text.deposit-amount-message2": "定金金額不能大於訂單總額",
+    "pisell2.text.deposit-amount-message3": "請輸入定金金額",
+    "pisell2.text.deposit-delete": "刪除定金",
+    "pisell2.text.deposit-delete-message-title": "提示",
+    "pisell2.text.deposit-delete-message": "刪除後不可恢復，請確認操作"
   }
 };

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

@@ -13,7 +13,24 @@ declare class Request {
     };
 }
 export declare const request: Request;
+/**
+ * @title: 格式化持续时长用于展示
+ * @description:
+ * @param {number} service_times
+ * @return {*}
+ * @Author: zhiwei.Wang
+ * @Date: 2024-04-26 14:00
+ */
 export declare const getDiscountTime: (service_times: number) => string;
+/**
+ * @title: 时间切片
+ * @description:
+ * @param {any} config
+ * @param {string} locale
+ * @return {*}
+ * @Author: zhiwei.Wang
+ * @Date: 2024-04-26 13:59
+ */
 export declare const sliceDayIntoFiveMinutes: (config: any, locale: string) => {
     timeSlices: {
         label: string;
@@ -24,6 +41,26 @@ export declare const sliceDayIntoFiveMinutes: (config: any, locale: string) => {
         value: number;
     }[];
 };
+export declare const getNowTime: () => string;
+export declare const isNowTime: (time: string) => boolean;
+/**
+ * @title: 获取服务的开始时间, 如果是now 转换为当前的时间
+ * @description:
+ * @param {string} start_time
+ * @return {*}
+ * @Author: zhiwei.Wang
+ * @Date: 2024-04-26 14:03
+ */
+export declare const getServeStartTime: (start_time: string) => string;
+/**
+ * @title: 格式化服务的 开始时间-结束时间-时长, 用于展示
+ * @description:
+ * @param {any} item
+ * @param {any} currentDate
+ * @return {*}
+ * @Author: zhiwei.Wang
+ * @Date: 2024-04-26 14:04
+ */
 export declare const getServiceTime: (item: any, currentDate: any) => string;
 export declare const findNextSlice: ({ timeSlices, index, date }: {
     timeSlices: any[];

package/lib/components/booking/utils.js

@@ -41,11 +41,14 @@ __export(utils_exports, {
   getEndDate: () => getEndDate,
   getErrorList: () => getErrorList,
   getLastServer: () => getLastServer,
+  getNowTime: () => getNowTime,
   getProductTotalPrice: () => getProductTotalPrice,
+  getServeStartTime: () => getServeStartTime,
   getServerItemExtend: () => getServerItemExtend,
   getServiceTime: () => getServiceTime,
   getServiceTimes: () => getServiceTimes,
   getShopOpeningHours: () => getShopOpeningHours,
+  isNowTime: () => isNowTime,
   isWalkIn: () => isWalkIn,
   request: () => request,
   sliceDayIntoFiveMinutes: () => sliceDayIntoFiveMinutes
@@ -90,8 +93,8 @@ var sliceDayIntoFiveMinutes = (config, locale) => {
   const startTime = (0, import_dayjs.default)().startOf("day");
   const endTime = (0, import_dayjs.default)().endOf("day");
   const timeSlice = (config == null ? void 0 : config.value) || 5;
-  const timeSlices = [];
-  const durationSlicesBasedOnTime = [];
+  let timeSlices = [];
+  let durationSlicesBasedOnTime = [];
   let currentTime = startTime;
   while (currentTime.isBefore(endTime)) {
     const timeLabel = currentTime.format("hh:mm A");
@@ -116,8 +119,20 @@ var sliceDayIntoFiveMinutes = (config, locale) => {
   }
   return { timeSlices, durationSlicesBasedOnTime };
 };
+var getNowTime = () => {
+  return (0, import_dayjs.default)().format("HH:mm");
+};
+var isNowTime = (time) => {
+  return time === "now";
+};
+var getServeStartTime = (start_time) => {
+  if (isNowTime(start_time)) {
+    return getNowTime();
+  }
+  return start_time;
+};
 var getServiceTime = (item, currentDate) => {
-  const startDate = (0, import_dayjs.default)(currentDate.format("YYYY-MM-DD") + " " + item._extend.start_time);
+  const startDate = (0, import_dayjs.default)(currentDate.format("YYYY-MM-DD") + " " + getServeStartTime(item._extend.start_time));
   const startTime = startDate.format("HH:mm");
   const endTime = startDate.add(flexibleObj.getValue(item._extend.duration), "minute").format("HH:mm");
   const duration = getDiscountTime(flexibleObj.getValue(item._extend.duration));
@@ -130,8 +145,10 @@ var findNextSlice = ({
 }) => {
   const currentTimeValue = date || (0, import_dayjs.default)().format("HH:mm");
   for (let i = 0; i < timeSlices.length; i++) {
-    if (timeSlices[i].value >= currentTimeValue) {
-      return timeSlices[i].value;
+    if (timeSlices[i].value !== "now") {
+      if (timeSlices[i].value >= currentTimeValue) {
+        return timeSlices[i].value;
+      }
     }
   }
   return timeSlices[index].value;
@@ -190,7 +207,7 @@ var formatProductListByCategory = (list, filterItem) => {
 var formatTimes = (resourceItem, cacheItem) => {
   let usableTimes = [];
   let _resourceItem = { ...resourceItem };
-  const startDate = (0, import_dayjs.default)(cacheItem._extend.start_date.format("YYYY-MM-DD") + " " + cacheItem._extend.start_time);
+  const startDate = (0, import_dayjs.default)(cacheItem._extend.start_date.format("YYYY-MM-DD") + " " + getServeStartTime(cacheItem._extend.start_time));
   const isFlexible = flexibleObj.isFlexible(cacheItem._extend.duration);
   _resourceItem.times = _resourceItem.times.map((d) => {
     let isMaxLimitRange = false;
@@ -311,7 +328,7 @@ var getEndDate = (startDate, duration, endDate) => {
   return startDate.add(duration, "minute");
 };
 var getServiceTimes = (service) => {
-  const startDate = (0, import_dayjs.default)((0, import_dayjs.default)(service._extend.start_date).format("YYYY-MM-DD ") + service._extend.start_time);
+  const startDate = (0, import_dayjs.default)((0, import_dayjs.default)(service._extend.start_date).format("YYYY-MM-DD ") + getServeStartTime(service._extend.start_time));
   const endDate = startDate.add(flexibleObj.getValue(service._extend.duration), "minute");
   return {
     startDate,
@@ -357,7 +374,6 @@ var getErrorList = (resource, cacheItem) => {
       }
     }
   }
-  console.log(cacheItem, "cacheItem");
   return list;
 };
 var formatResource = (resourceItem, cacheItem, formatLabel) => {
@@ -404,7 +420,6 @@ var getServerItemExtend = (state, cacheItem, timeObj) => {
       _extend.start_time = lastServerEndDate.format("HH:mm");
     }
   } else {
-    _extend.resource = 0;
     let findNextSliceProps = {
       timeSlices: timeObj.timeSlices,
       index: 0,
@@ -421,7 +436,12 @@ var getServerItemExtend = (state, cacheItem, timeObj) => {
         _extend.resource = Number(resourceId);
       }
     }
-    _extend.start_time = findNextSlice(findNextSliceProps);
+    console.log("_extend", findNextSliceProps);
+    if (findNextSliceProps.date && findNextSliceProps.date !== "00:00") {
+      _extend.start_time = findNextSlice(findNextSliceProps);
+    } else {
+      _extend.start_time = "now";
+    }
   }
   _extend = {
     ..._extend,
@@ -479,11 +499,14 @@ var isWalkIn = (customer_id) => {
   getEndDate,
   getErrorList,
   getLastServer,
+  getNowTime,
   getProductTotalPrice,
+  getServeStartTime,
   getServerItemExtend,
   getServiceTime,
   getServiceTimes,
   getShopOpeningHours,
+  isNowTime,
   isWalkIn,
   request,
   sliceDayIntoFiveMinutes

package/lib/index.d.ts

@@ -12,3 +12,4 @@ export { default as BookingStartTime } from './components/booking/materiels/star
 export { default as BookingDuration } from './components/booking/materiels/duration';
 export { default as BookingContacts } from './components/booking/materiels/contacts';
 export { default as ProductExtension } from './components/productExtension';
+export { default as BookingDeposit } from './components/booking/deposit';

package/lib/index.js

@@ -32,6 +32,7 @@ __export(src_exports, {
   Booking: () => import_booking.default,
   BookingAddons: () => import_addons.default,
   BookingContacts: () => import_contacts.default,
+  BookingDeposit: () => import_deposit.default,
   BookingDuration: () => import_duration.default,
   BookingForms: () => import_forms.default,
   BookingInfo: () => import_info.default,
@@ -60,6 +61,7 @@ var import_startTime = __toESM(require("./components/booking/materiels/startTime
 var import_duration = __toESM(require("./components/booking/materiels/duration"));
 var import_contacts = __toESM(require("./components/booking/materiels/contacts"));
 var import_productExtension = __toESM(require("./components/productExtension"));
+var import_deposit = __toESM(require("./components/booking/deposit"));
 import_dayjs.default.extend(import_weekday.default);
 import_dayjs.default.extend(import_localeData.default);
 // Annotate the CommonJS export names for ESM import in node:
@@ -67,6 +69,7 @@ import_dayjs.default.extend(import_localeData.default);
   Booking,
   BookingAddons,
   BookingContacts,
+  BookingDeposit,
   BookingDuration,
   BookingForms,
   BookingInfo,

package/lowcode/booking-deposit/meta.ts

@@ -0,0 +1,93 @@
+
+import { ComponentMetadata, Snippet } from '@alilc/lowcode-types';
+
+const BookingDepositMeta: ComponentMetadata = {
+  "componentName": "BookingDeposit",
+  "title": "BookingDeposit",
+  "docUrl": "",
+  "screenshot": "",
+  "devMode": "proCode",
+  "npm": {
+    "package": "@pisell/private-materials",
+    "version": "1.0.4",
+    "exportName": "BookingDeposit",
+    "main": "src/index.ts",
+    "destructuring": true,
+    "subName": ""
+  },
+  "configure": {
+    "props": [
+      {
+        "title": {
+          "label": {
+            "type": "i18n",
+            "en-US": "style",
+            "zh-CN": "style"
+          }
+        },
+        "name": "style",
+        "setter": {
+          "componentName": "MixedSetter",
+          "isRequired": true,
+          "props": {}
+        }
+      },
+      {
+        "title": {
+          "label": {
+            "type": "i18n",
+            "en-US": "globalState",
+            "zh-CN": "globalState"
+          }
+        },
+        "name": "globalState",
+        "setter": ["JsonSetter", "VariableSetter"],
+      },
+      {
+        "title": {
+          "label": {
+            "type": "i18n",
+            "en-US": "setGlobalState",
+            "zh-CN": "setGlobalState"
+          }
+        },
+        "name": "setGlobalState",
+        "setter": {
+          "componentName": "FunctionSetter",
+          "isRequired": true
+        }
+      },
+      {
+        "title": {
+          "label": {
+            "type": "i18n",
+            "en-US": "setState",
+            "zh-CN": "setState"
+          }
+        },
+        "name": "setState",
+        "setter": {
+          "componentName": "FunctionSetter",
+          "isRequired": true
+        }
+      },
+    ],
+    "supports": {},
+    "component": {}
+  }
+};
+const snippets: Snippet[] = [
+  {
+    "title": "BookingDeposit",
+    "screenshot": "",
+    "schema": {
+      "componentName": "BookingDeposit",
+      "props": {}
+    }
+  }
+];
+
+export default {
+  ...BookingDepositMeta,
+  snippets
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/private-materials",
-  "version": "3.0.28",
+  "version": "3.0.30",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",
@@ -58,9 +58,9 @@
     "ahooks": "^3.7.6",
     "react-infinite-scroll-component": "^6.1.0",
     "rc-virtual-list": "^3.11.3",
-    "@pisell/date-picker": "1.0.68",
+    "@pisell/icon": "0.0.8",
     "@pisell/utils": "1.0.23",
-    "@pisell/icon": "0.0.8"
+    "@pisell/date-picker": "1.0.68"
   },
   "peerDependencies": {
     "react": "^18.0.0",