@pisell/private-materials 3.0.197 → 3.0.199

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

@@ -22,7 +22,6 @@ __export(utils_exports, {
   formatServiceListByTime: () => formatServiceListByTime,
   getIsBundleOrCombination: () => getIsBundleOrCombination,
   isBooking4Shop: () => isBooking4Shop,
-  isDayBooking: () => isDayBooking,
   isInterval: () => isInterval,
   moveItemToFront: () => moveItemToFront,
   uniqueByField: () => uniqueByField
@@ -87,16 +86,11 @@ var isBooking4Shop = (shopId, renderType) => {
   const booking4Shops = [1350, 1401, 3013, 7154, 7572, 7007, 8119, 7320, 7362, 6497, 6087, 6303, 6726, 8191];
   return booking4Shops.includes(shopId);
 };
-var isDayBooking = (shopId) => {
-  const dayBookingShops = [9];
-  return dayBookingShops.includes(shopId);
-};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   formatServiceListByTime,
   getIsBundleOrCombination,
   isBooking4Shop,
-  isDayBooking,
   isInterval,
   moveItemToFront,
   uniqueByField

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

@@ -33,11 +33,6 @@ declare const _default: {
         'pisell2.text.start_time': string;
         'pisell2.text.duration': string;
         'pisell2.text.resource': string;
-        'pisell2.text.end_time': string;
-        'pisell2.text.start_date': string;
-        'pisell2.text.end_date': string;
-        'pisell2.text.quantity': string;
-        'pisell2.text.holder': string;
         'pisell2.text.warnings': string;
         'pisell2.text.order-notes': string;
         'pisell2.text.add-order-notes': string;
@@ -53,7 +48,6 @@ declare const _default: {
         'pisell2.text.updated': string;
         'pisell2.text.appointment-updated': string;
         'pisell2.text.please-create-an-appointment-first': string;
-        'pisell2.text.day': (val: number) => string;
         'pisell2.text.min': string;
         'pisell2.text.h': string;
         'pisell2.text.other': string;
@@ -224,20 +218,6 @@ declare const _default: {
         'pisell2.booking.info.text.create-new': string;
         'pisell2.booking.info.text.form-agreement-yes': string;
         'pisell2.booking.info.text.form-agreement-no': string;
-        'pisell2.text.open.items': string;
-        'pisell2.text.cart.of': (val: any) => string;
-        'pisell2.text.no.selected': string;
-        'pisell2.text.select.items': string;
-        'pisell2.text.edit-select-service': string;
-        'pisell2.text.missing.reservation.title': string;
-        'pisell2.text.missing.reservation.content': string;
-        'pisell2.text.confirm': string;
-        'pisell2.text.cancel': string;
-        'pisell2.text.change.pet.title': string;
-        'pisell2.text.change.pet.content': string;
-        'pisell2.text.change.pet.content1': string;
-        'pisell2.text.change.pet.confirm': string;
-        'pisell2.text.change.pet.cancel': string;
     };
     'zh-CN': {
         'pisell2.text.refunded-amount': string;
@@ -276,11 +256,6 @@ declare const _default: {
         'pisell2.text.discount': string;
         'pisell2.text.discount-reason': string;
         'pisell2.text.start_time': string;
-        'pisell2.text.end_time': string;
-        'pisell2.text.start_date': string;
-        'pisell2.text.end_date': string;
-        'pisell2.text.quantity': string;
-        'pisell2.text.holder': string;
         'pisell2.text.duration': string;
         'pisell2.text.resource': string;
         'pisell2.text.warnings': string;
@@ -300,7 +275,6 @@ declare const _default: {
         'pisell2.text.appointment-updated': string;
         'pisell2.text.updated': string;
         'pisell2.text.please-create-an-appointment-first': string;
-        'pisell2.text.day': (val: number) => string;
         'pisell2.text.min': string;
         'pisell2.text.h': string;
         'pisell2.text.other': string;
@@ -464,20 +438,6 @@ declare const _default: {
         'pisell2.booking.info.text.create-new': string;
         'pisell2.booking.info.text.form-agreement-yes': string;
         'pisell2.booking.info.text.form-agreement-no': string;
-        'pisell2.text.open.items': string;
-        'pisell2.text.cart.of': (val: any) => string;
-        'pisell2.text.no.selected': string;
-        'pisell2.text.select.items': string;
-        'pisell2.text.edit-select-service': string;
-        'pisell2.text.missing.reservation.title': string;
-        'pisell2.text.missing.reservation.content': string;
-        'pisell2.text.confirm': string;
-        'pisell2.text.cancel': string;
-        'pisell2.text.change.pet.title': string;
-        'pisell2.text.change.pet.content': string;
-        'pisell2.text.change.pet.content1': string;
-        'pisell2.text.change.pet.confirm': string;
-        'pisell2.text.change.pet.cancel': string;
     };
     'zh-HK': {
         'pisell2.text.refunded-amount': string;
@@ -516,11 +476,6 @@ declare const _default: {
         'pisell2.text.discount': string;
         'pisell2.text.discount-reason': string;
         'pisell2.text.start_time': string;
-        'pisell2.text.end_time': string;
-        'pisell2.text.start_date': string;
-        'pisell2.text.end_date': string;
-        'pisell2.text.quantity': string;
-        'pisell2.text.holder': string;
         'pisell2.text.duration': string;
         'pisell2.text.resource': string;
         'pisell2.text.warnings': string;
@@ -538,7 +493,6 @@ declare const _default: {
         'pisell2.text.appointment-updated': string;
         'pisell2.text.updated': string;
         'pisell2.text.please-create-an-appointment-first': string;
-        'pisell2.text.day': (val: number) => string;
         'pisell2.text.min': string;
         'pisell2.text.h': string;
         'pisell2.text.other': string;
@@ -704,20 +658,6 @@ declare const _default: {
         'pisell2.booking.info.text.create-new': string;
         'pisell2.booking.info.text.form-agreement-yes': string;
         'pisell2.booking.info.text.form-agreement-no': string;
-        'pisell2.text.open.items': string;
-        'pisell2.text.cart.of': (val: any) => string;
-        'pisell2.text.no.selected': string;
-        'pisell2.text.select.items': string;
-        'pisell2.text.edit-select-service': string;
-        'pisell2.text.missing.reservation.title': string;
-        'pisell2.text.missing.reservation.content': string;
-        'pisell2.text.confirm': string;
-        'pisell2.text.cancel': string;
-        'pisell2.text.change.pet.title': string;
-        'pisell2.text.change.pet.content': string;
-        'pisell2.text.change.pet.content1': string;
-        'pisell2.text.change.pet.confirm': string;
-        'pisell2.text.change.pet.cancel': string;
     };
 };
 export default _default;

package/lib/components/booking/locales.js

@@ -68,11 +68,6 @@ var locales_default = {
     "pisell2.text.start_time": "Start time",
     "pisell2.text.duration": "Duration",
     "pisell2.text.resource": "Resource",
-    "pisell2.text.end_time": "End time",
-    "pisell2.text.start_date": "Start date",
-    "pisell2.text.end_date": "End date",
-    "pisell2.text.quantity": "Quantity",
-    "pisell2.text.holder": "Holder",
     "pisell2.text.warnings": "Warnings",
     "pisell2.text.order-notes": "Order notes",
     "pisell2.text.add-order-notes": "Add Order note",
@@ -88,7 +83,6 @@ var locales_default = {
     "pisell2.text.updated": " updated",
     "pisell2.text.appointment-updated": "Appointment updated",
     "pisell2.text.please-create-an-appointment-first": "Please create an appointment first",
-    "pisell2.text.day": (val) => `${val > 1 ? "days" : "day"}`,
     "pisell2.text.min": "min",
     "pisell2.text.h": "h",
     "pisell2.text.other": "Other",
@@ -279,21 +273,7 @@ var locales_default = {
     "pisell2.booking.info.text.clear-all": "Clear all",
     "pisell2.booking.info.text.create-new": "Create new",
     "pisell2.booking.info.text.form-agreement-yes": "Yes",
-    "pisell2.booking.info.text.form-agreement-no": "No",
-    "pisell2.text.open.items": "Open items",
-    "pisell2.text.cart.of": (val) => `Cart of ${val}`,
-    "pisell2.text.no.selected": "No items selected",
-    "pisell2.text.select.items": "Select items",
-    "pisell2.text.edit-select-service": "Edit items",
-    "pisell2.text.missing.reservation.title": "Missing Reservation Type",
-    "pisell2.text.missing.reservation.content": "You have not selected a reservation type, Please select one before proceeding.",
-    "pisell2.text.confirm": "Confirm",
-    "pisell2.text.cancel": "Cancel",
-    "pisell2.text.change.pet.title": "You have changed the holder information. Do you want to keep the items under their name?",
-    "pisell2.text.change.pet.content": "Selecting “Keep” will move the items to Open Items. Selecting “Discard” will clear all items under the holder’s name.",
-    "pisell2.text.change.pet.content1": "Reservation-type items cannot be added to the Open Items cart and will be removed.",
-    "pisell2.text.change.pet.confirm": "Keep (Add to open items)",
-    "pisell2.text.change.pet.cancel": "Discard (Clear items)"
+    "pisell2.booking.info.text.form-agreement-no": "No"
   },
   "zh-CN": {
     "pisell2.text.refunded-amount": "已退金额",
@@ -332,11 +312,6 @@ var locales_default = {
     "pisell2.text.discount": "折扣",
     "pisell2.text.discount-reason": "折扣原因",
     "pisell2.text.start_time": "开始时间",
-    "pisell2.text.end_time": "结束时间",
-    "pisell2.text.start_date": "开始日期",
-    "pisell2.text.end_date": "结束日期",
-    "pisell2.text.quantity": "数量",
-    "pisell2.text.holder": "预约主体",
     "pisell2.text.duration": "时长",
     "pisell2.text.resource": "资源",
     "pisell2.text.warnings": "个警告",
@@ -357,7 +332,6 @@ var locales_default = {
     "pisell2.text.appointment-updated": "预约已更新",
     "pisell2.text.updated": "已更新",
     "pisell2.text.please-create-an-appointment-first": "请先创建预约",
-    "pisell2.text.day": (val) => "天",
     "pisell2.text.min": "分钟",
     "pisell2.text.h": "小时",
     "pisell2.text.other": "未分类",
@@ -545,21 +519,7 @@ var locales_default = {
     "pisell2.booking.info.text.clear-all": "清空",
     "pisell2.booking.info.text.create-new": "新建",
     "pisell2.booking.info.text.form-agreement-yes": "是",
-    "pisell2.booking.info.text.form-agreement-no": "否",
-    "pisell2.text.open.items": "公共购物车",
-    "pisell2.text.cart.of": (val) => `${val}的购物车`,
-    "pisell2.text.no.selected": "未选择任何项目",
-    "pisell2.text.select.items": "选择项目",
-    "pisell2.text.edit-select-service": "编辑项目",
-    "pisell2.text.missing.reservation.title": "缺少预约类型",
-    "pisell2.text.missing.reservation.content": "您尚未选择预约类型，请在继续操作前选择。",
-    "pisell2.text.confirm": "确定",
-    "pisell2.text.cancel": "取消",
-    "pisell2.text.change.pet.title": "您已变更持有人信息，是否保留该持有人名下的商品？",
-    "pisell2.text.change.pet.content": "选择“保留”将商品添加到未分配商品（公共购物车）中；选择“不保留”将清空该持有人名下的所有商品。",
-    "pisell2.text.change.pet.content1": "预约类商品无法添加到公共购物车，将会被删除。",
-    "pisell2.text.change.pet.confirm": "保留（添加到未分配中）",
-    "pisell2.text.change.pet.cancel": "不保留（清空商品）"
+    "pisell2.booking.info.text.form-agreement-no": "否"
   },
   "zh-HK": {
     "pisell2.text.refunded-amount": "已退金額",
@@ -598,11 +558,6 @@ var locales_default = {
     "pisell2.text.discount": "折扣",
     "pisell2.text.discount-reason": "折扣原因",
     "pisell2.text.start_time": "開始時間",
-    "pisell2.text.end_time": "結束時間",
-    "pisell2.text.start_date": "開始日期",
-    "pisell2.text.end_date": "結束日期",
-    "pisell2.text.quantity": "數量",
-    "pisell2.text.holder": "預約主體",
     "pisell2.text.duration": "時長",
     "pisell2.text.resource": "資源",
     "pisell2.text.warnings": "個警告",
@@ -621,7 +576,6 @@ var locales_default = {
     "pisell2.text.appointment-updated": "預約已更新",
     "pisell2.text.updated": "已更新",
     "pisell2.text.please-create-an-appointment-first": "請先創建預約",
-    "pisell2.text.day": (val) => "天",
     "pisell2.text.min": "分鍾",
     "pisell2.text.h": "小時",
     "pisell2.text.other": "未分類",
@@ -811,20 +765,6 @@ var locales_default = {
     "pisell2.booking.info.text.clear-all": "清空",
     "pisell2.booking.info.text.create-new": "新建",
     "pisell2.booking.info.text.form-agreement-yes": "是",
-    "pisell2.booking.info.text.form-agreement-no": "否",
-    "pisell2.text.open.items": "公共購物車",
-    "pisell2.text.cart.of": (val) => `${val}的購物車`,
-    "pisell2.text.no.selected": "未選擇任何項目",
-    "pisell2.text.select.items": "選擇項目",
-    "pisell2.text.edit-select-service": "編輯項目",
-    "pisell2.text.missing.reservation.title": "缺少預約類型",
-    "pisell2.text.missing.reservation.content": "您尚未選擇預約類型，請在繼續操作前選擇。",
-    "pisell2.text.confirm": "確定",
-    "pisell2.text.cancel": "取消",
-    "pisell2.text.change.pet.title": "您已變更持有人信息，是否保留該持有人名下的商品？",
-    "pisell2.text.change.pet.content": "選擇“保留”將商品添加到未分配商品（公共購物車）中；選擇“不保留”將清空該持有人名下的所有商品。",
-    "pisell2.text.change.pet.content1": "預約類商品無法添加到公共購物車，將會被刪除。",
-    "pisell2.text.change.pet.confirm": "保留（添加到未分配中）",
-    "pisell2.text.change.pet.cancel": "不保留（清空商品）"
+    "pisell2.booking.info.text.form-agreement-no": "否"
   }
 };

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

@@ -29,7 +29,6 @@ export interface FormState {
     };
     date: {
         value: any;
-        end_date: any;
         edit: boolean;
     };
     service: {
@@ -76,7 +75,7 @@ export interface FormState {
     bookingId: string | number;
     bookingDetail: any;
     channelDisabledEdit: boolean;
-    renderType?: 'eventBooking' | 'dayBooking';
+    renderType?: 'eventBooking';
     modalOpen?: boolean;
     isTerminal?: boolean;
     isFranchisee?: boolean;
@@ -97,8 +96,6 @@ export interface FormState {
     /** 是否terminal创建booking页面 */
     isBookingCreatePage?: boolean;
     loading: boolean;
-    isTerminalDayBookingPage?: boolean;
-    activeCartId?: any[];
 }
 export declare const walkInData: {
     id: number;

package/lib/components/booking/model.js

@@ -72,8 +72,7 @@ var defaultState = {
     value: walkInData
   },
   date: {
-    value: (0, import_dayjs.default)(),
-    end_date: (0, import_dayjs.default)().add(1, "days")
+    value: (0, import_dayjs.default)()
   },
   service: {
     addModal: false,
@@ -124,8 +123,7 @@ var defaultState = {
   action: (props) => {
     console.log(props);
   },
-  bookingId: 0,
-  activeCartId: [0]
+  bookingId: 0
 };
 var { Provider, Context } = (0, import_utils.miniRedux)({
   namespace: "state",

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

@@ -21,7 +21,7 @@ export declare const request: Request;
  * @Author: zhiwei.Wang
  * @Date: 2024-04-26 14:00
  */
-export declare const getDiscountTime: (service_times: number, isDay?: boolean) => string;
+export declare const getDiscountTime: (service_times: number) => string;
 /**
  * @title: 时间切片
  * @description:
@@ -31,7 +31,7 @@ export declare const getDiscountTime: (service_times: number, isDay?: boolean) =
  * @Author: zhiwei.Wang
  * @Date: 2024-04-26 13:59
  */
-export declare const sliceDayIntoFiveMinutes: (config: any, locale: string, isDay?: boolean) => {
+export declare const sliceDayIntoFiveMinutes: (config: any, locale: string) => {
     timeSlices: {
         label: string;
         value: string;
@@ -115,7 +115,7 @@ export declare const getServiceTimes: (service: any) => {
     startDate: dayjs.Dayjs;
     endDate: dayjs.Dayjs;
 };
-export declare const getErrorList: (resource: any, cacheItem: any, isDay?: boolean) => {
+export declare const getErrorList: (resource: any, cacheItem: any) => {
     label: any;
     type: string;
 }[];
@@ -131,15 +131,6 @@ export declare const formatResource: (resourceItem: any, cacheItem?: any, format
 export declare const getLastServer: (list: any) => any;
 export declare const getCacheParams: () => any;
 export declare const deleteCacheParams: () => void;
-/**
- * @title: 获取跨日预约的时长
- * @description:
- * @param {any} cacheItem
- * @return {*}
- * @Author: WangHan
- * @Date: 2024-12-01 22:43
- */
-export declare const getDays: (cacheItem: any, type: 'minutes' | 'days') => any;
 /**
  * @title: 创建一个服务商品
  * @description:

package/lib/components/booking/utils.js

@@ -37,7 +37,6 @@ __export(utils_exports, {
   formatResource: () => formatResource,
   formatTimes: () => formatTimes,
   getCacheParams: () => getCacheParams,
-  getDays: () => getDays,
   getDiscountTime: () => getDiscountTime,
   getDuration: () => getDuration,
   getEndDate: () => getEndDate,
@@ -60,7 +59,6 @@ __export(utils_exports, {
 module.exports = __toCommonJS(utils_exports);
 var import_dayjs = __toESM(require("dayjs"));
 var import_utils = require("@pisell/utils");
-var import_utils2 = require("./info/service2/utils");
 var import_lodash = require("lodash");
 var Request = class {
   constructor() {
@@ -74,13 +72,10 @@ var Request = class {
   }
 };
 var request = new Request();
-var getDiscountTime = (service_times, isDay) => {
-  if (!service_times || service_times < 0) {
+var getDiscountTime = (service_times) => {
+  if (!service_times) {
     return "";
   }
-  if (isDay) {
-    return `${service_times} ${import_utils.locales.getText("pisell2.text.day")(service_times)}`;
-  }
   if (service_times < 60) {
     return `${service_times} ${import_utils.locales.getText("pisell2.text.min")}`;
   } else {
@@ -94,7 +89,7 @@ var getDiscountTime = (service_times, isDay) => {
     return str;
   }
 };
-var sliceDayIntoFiveMinutes = (config, locale, isDay) => {
+var sliceDayIntoFiveMinutes = (config, locale) => {
   let _locale = locale;
   let dayjsLocale = _locale === "en-US" || _locale === "en" ? "en" : "zh-cn";
   import_dayjs.default.locale(dayjsLocale);
@@ -104,20 +99,6 @@ var sliceDayIntoFiveMinutes = (config, locale, isDay) => {
   let timeSlices = [];
   let durationSlicesBasedOnTime = [];
   let currentTime = startTime;
-  if (isDay) {
-    let currentDay = 1;
-    while (currentDay <= 30) {
-      const timeLabel = currentTime.format("hh:mm A");
-      const timeValue = currentTime.format("HH:mm");
-      timeSlices.push({ label: timeLabel, value: timeValue });
-      durationSlicesBasedOnTime.push({
-        label: `${currentDay} ${import_utils.locales.getText("pisell2.text.day")(currentDay)}`,
-        value: currentDay
-      });
-      currentDay++;
-    }
-    return { timeSlices, durationSlicesBasedOnTime };
-  }
   while (currentTime.isBefore(endTime)) {
     const timeLabel = currentTime.format("hh:mm A");
     const timeValue = currentTime.format("HH:mm");
@@ -270,23 +251,6 @@ var getResourceTimeIsUsable = (item, cacheItem) => {
   return time;
 };
 var formatTimes = (resourceItem, cacheItem) => {
-  var _a;
-  if (((_a = cacheItem == null ? void 0 : cacheItem._extend) == null ? void 0 : _a.sub_type) === "days") {
-    const isResourceItem = (resourceItem == null ? void 0 : resourceItem.form_record_id) > 0;
-    let isMaxLimitRange = (resourceItem == null ? void 0 : resourceItem.sold_out) === 1;
-    let isDateRange = (resourceItem == null ? void 0 : resourceItem.available_status) === 1;
-    const isUsable = isDateRange && !isMaxLimitRange;
-    const usableTime = {
-      isMaxLimitRange,
-      isDateRange,
-      isUsable: isResourceItem ? isUsable : true
-    };
-    resourceItem._extend = {
-      ...resourceItem._extend,
-      usableTime
-    };
-    return resourceItem;
-  }
   let usableTimes = [];
   let _resourceItem = { ...resourceItem };
   _resourceItem.times = _resourceItem.times.map((time) => {
@@ -407,8 +371,8 @@ var getServiceTimes = (service) => {
     endDate
   };
 };
-var getErrorList = (resource, cacheItem, isDay) => {
-  var _a, _b, _c, _d, _e, _f, _g, _h, _i;
+var getErrorList = (resource, cacheItem) => {
+  var _a, _b, _c;
   if (!(cacheItem == null ? void 0 : cacheItem.id)) {
     return [
       {
@@ -431,21 +395,13 @@ var getErrorList = (resource, cacheItem, isDay) => {
         type: "product"
       });
     }
-    let startText = "";
-    let endText = "";
-    if (isDay) {
-      const { start_date, end_date } = cacheItem == null ? void 0 : cacheItem._extend;
-      startText = start_date == null ? void 0 : start_date.format("YYYY-MM-DD");
-      endText = end_date ? end_date == null ? void 0 : end_date.format("YYYY-MM-DD") : "";
-    } else {
-      const { startDate, endDate } = getServiceTimes(cacheItem);
-      startText = startDate.format("hh:mm A");
-      endText = endDate.format("hh:mm A");
-      if ((0, import_dayjs.default)(endDate).isAfter(startDate, "day")) {
-        endText = import_utils.locales.getText("pisell1.text.tomorrow") + endText;
-      }
+    const { startDate, endDate } = getServiceTimes(cacheItem);
+    const startText = startDate.format("hh:mm A");
+    let endText = endDate.format("hh:mm A");
+    if ((0, import_dayjs.default)(endDate).isAfter(startDate, "day")) {
+      endText = import_utils.locales.getText("pisell1.text.tomorrow") + endText;
     }
-    if (isDay ? !((_c = (_b = resource._extend) == null ? void 0 : _b.usableTime) == null ? void 0 : _c.isDateRange) : !((_d = resource._extend) == null ? void 0 : _d.usableTime)) {
+    if (!((_b = resource._extend) == null ? void 0 : _b.usableTime)) {
       list.push({
         label: import_utils.locales.getText("pisell1.text.resource-error-message-2")(
           resource.labelText,
@@ -455,7 +411,7 @@ var getErrorList = (resource, cacheItem, isDay) => {
         type: "time"
       });
     } else {
-      if (isDay ? (_f = (_e = resource._extend) == null ? void 0 : _e.usableTime) == null ? void 0 : _f.isMaxLimitRange : !((_i = (_h = (_g = resource._extend) == null ? void 0 : _g.usableTime) == null ? void 0 : _h._extend) == null ? void 0 : _i.isMaxLimitRange)) {
+      if (!((_c = resource._extend) == null ? void 0 : _c.usableTime._extend.isMaxLimitRange)) {
         list.push({
           label: import_utils.locales.getText("pisell1.text.resource-error-message-3")(
             resource.labelText,
@@ -470,15 +426,11 @@ var getErrorList = (resource, cacheItem, isDay) => {
   return list;
 };
 var formatResource = (resourceItem, cacheItem, formatLabel) => {
-  var _a, _b, _c, _d;
   let _resourceItem = { ...resourceItem };
   _resourceItem = formatTimes(_resourceItem, cacheItem);
   _resourceItem = formatResourceProducts(_resourceItem, cacheItem);
   _resourceItem.labelText = _resourceItem.room_name || _resourceItem.name;
-  let usable = _resourceItem._extend.usableTime && _resourceItem._extend.usableProduct;
-  if (((_a = cacheItem == null ? void 0 : cacheItem._extend) == null ? void 0 : _a.sub_type) === "days") {
-    usable = ((_c = (_b = _resourceItem._extend) == null ? void 0 : _b.usableTime) == null ? void 0 : _c.isUsable) && ((_d = _resourceItem._extend) == null ? void 0 : _d.usableProduct);
-  }
+  const usable = _resourceItem._extend.usableTime && _resourceItem._extend.usableProduct;
   _resourceItem.usable = usable;
   if (formatLabel) {
     _resourceItem.label = formatLabel(_resourceItem);
@@ -496,25 +448,14 @@ var getCacheParams = () => {
 var deleteCacheParams = () => {
   sessionStorage.removeItem("pisell2.booking.serviceParams");
 };
-var getDays = (cacheItem, type) => {
-  var _a, _b;
-  if (type === "days") {
-    const { start_date, end_date } = (0, import_utils2.formatDayDate)(cacheItem._extend);
-    return end_date.diff(start_date, "day");
-  }
-  let startDate = (0, import_dayjs.default)((_a = cacheItem._extend) == null ? void 0 : _a.start_date);
-  let endDate = (0, import_dayjs.default)((_b = cacheItem._extend) == null ? void 0 : _b.end_date);
-  return endDate.diff(startDate, type);
-};
 var getServerItemExtend = (state, cacheItem, timeObj) => {
   var _a;
   if (!cacheItem.new && cacheItem._extend.endDate) {
     return cacheItem._extend;
   }
-  const isDay = (0, import_utils2.isDayBooking)(state);
-  let lastServer = isDay ? false : getLastServer(state.service.value);
+  let lastServer = getLastServer(state.service.value);
   let _extend = {
-    duration: isDay ? getDays(cacheItem, "days") : findNextDuration(
+    duration: findNextDuration(
       cacheItem.duration,
       timeObj.durationSlicesBasedOnTime,
       (_a = cacheItem == null ? void 0 : cacheItem.duration) == null ? void 0 : _a.value
@@ -560,10 +501,6 @@ var getServerItemExtend = (state, cacheItem, timeObj) => {
     ..._extend,
     ...cacheItem._extend
   };
-  if (isDay) {
-    const { start_date, end_date } = (0, import_utils2.formatDayDate)(_extend);
-    _extend = { ..._extend, start_date, end_date };
-  }
   return _extend;
 };
 var getProductTotalPrice = (item) => {
@@ -640,7 +577,6 @@ var getIsEdit = (state) => {
   formatResource,
   formatTimes,
   getCacheParams,
-  getDays,
   getDiscountTime,
   getDuration,
   getEndDate,

package/lib/components/eftpos/form/index.js

@@ -37,6 +37,7 @@ var import_react = __toESM(require("react"));
 var import_antd = require("antd");
 var import_group = require("../group");
 var import_surcharge = __toESM(require("../surcharge"));
+var import_receipt = __toESM(require("../receipt"));
 var import_deviceList = __toESM(require("../deviceList"));
 var Mapping = {
   Input: import_antd.Input,
@@ -58,7 +59,8 @@ var Mapping = {
 };
 var CustomMapping = {
   Surcharge: import_surcharge.default,
-  DeviceList: import_deviceList.default
+  DeviceList: import_deviceList.default,
+  Receipt: import_receipt.default
 };
 var CustomFormItem = ({
   formItemList,
@@ -72,27 +74,27 @@ var CustomFormItem = ({
         {
           formItemList: item.children,
           onChange,
-          key: item.name ? item.name + level : Component + index + level,
+          key: item.name ? `${item.name}${level}` : `${Component}${index}${level}`,
           level: level + 1
         }
       );
     }
     if (typeof Component === "object") {
-      return /* @__PURE__ */ import_react.default.createElement(Component, { ...item, key: item.name + level });
+      return /* @__PURE__ */ import_react.default.createElement(Component, { ...item, key: `${item.name}${level}` });
     }
     if (Mapping[Component]) {
       const Comm = Mapping[Component];
       const { input, ...formItemProps } = item;
-      return /* @__PURE__ */ import_react.default.createElement(import_antd.Form.Item, { ...formItemProps, key: item.name + level }, /* @__PURE__ */ import_react.default.createElement(Comm, { ...input }));
+      return /* @__PURE__ */ import_react.default.createElement(import_antd.Form.Item, { ...formItemProps, key: `${item.name}${level}` }, /* @__PURE__ */ import_react.default.createElement(Comm, { ...input }));
     }
     if (Mapping[Component]) {
       const Comm = Mapping[Component];
       const { input, ...formItemProps } = item;
-      return /* @__PURE__ */ import_react.default.createElement(import_antd.Form.Item, { ...formItemProps, key: item.name + level }, /* @__PURE__ */ import_react.default.createElement(Comm, { ...input }));
+      return /* @__PURE__ */ import_react.default.createElement(import_antd.Form.Item, { ...formItemProps, key: `${item.name}${level}` }, /* @__PURE__ */ import_react.default.createElement(Comm, { ...input }));
     }
     if (CustomMapping[Component]) {
       const Comm = CustomMapping[Component];
-      return /* @__PURE__ */ import_react.default.createElement(Comm, { ...item, key: item.name + level });
+      return /* @__PURE__ */ import_react.default.createElement(Comm, { ...item, key: `${item.name}${level}` });
     }
     throw TypeError(
       `pos物料库 输入组件类型 ${Component} 无法映射,请正确传入组件类型`
@@ -104,6 +106,10 @@ var helpMapping = {
   Surcharge: {
     getCommName: import_surcharge.getCommName,
     getCommDefaultVal: import_surcharge.getCommDefaultVal
+  },
+  Receipt: {
+    getCommName: import_receipt.getCommName,
+    getCommDefaultVal: import_receipt.getCommDefaultVal
   }
 };
 // Annotate the CommonJS export names for ESM import in node:

package/lib/components/eftpos/group/index.d.ts

@@ -1,7 +1,6 @@
 import React from 'react';
 import { RadioGroupProps } from 'antd';
 export declare const CheckboxGroup: ({ direction, options, ...props }: any) => React.JSX.Element;
-export declare const RadioGroup: ({ direction, options, component, ...props }: RadioGroupProps & {
+export declare const RadioGroup: ({ direction, options, ...props }: RadioGroupProps & {
     direction?: "vertical" | undefined;
-    component: string;
 }) => React.JSX.Element;

package/lib/components/eftpos/group/index.js

@@ -54,7 +54,6 @@ var CheckboxGroup = ({
 var RadioGroup = ({
   direction,
   options,
-  component,
   ...props
 }) => {
   if (direction === "vertical") {

package/lib/components/eftpos/index.js

@@ -73,7 +73,7 @@ var PosTabs = (0, import_react.forwardRef)(
           {
             className: `pisell-lowcode__pos_circle ${active2 ? "active" : ""}`
           },
-          /* @__PURE__ */ import_react.default.createElement(import_device2.default, { color: active2 ? "#fff" : "#98A2B3" })
+          /* @__PURE__ */ import_react.default.createElement(import_apiKey.default, { color: active2 ? "#fff" : "#98A2B3" })
         ), /* @__PURE__ */ import_react.default.createElement(
           "span",
           {
@@ -90,7 +90,7 @@ var PosTabs = (0, import_react.forwardRef)(
           {
             className: `pisell-lowcode__pos_circle ${active2 ? "active" : ""}`
           },
-          /* @__PURE__ */ import_react.default.createElement(import_apiKey.default, { color: active2 ? "#fff" : "#98A2B3" })
+          /* @__PURE__ */ import_react.default.createElement(import_device2.default, { color: active2 ? "#fff" : "#98A2B3" })
         ), /* @__PURE__ */ import_react.default.createElement(
           "span",
           {