@pisell/private-materials 6.0.24 → 6.1.1

package/lib/components/booking/materiels/holder/index.js

@@ -0,0 +1,64 @@
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/components/booking/materiels/holder/index.tsx
+var holder_exports = {};
+__export(holder_exports, {
+  default: () => holder_default
+});
+module.exports = __toCommonJS(holder_exports);
+var import_antd = require("antd");
+var import_model = require("../../info/model");
+var import_react = __toESM(require("react"));
+var import_useSelectPet = __toESM(require("../../info/service2/hooks/useSelectPet"));
+var Holder = (props) => {
+  var _a;
+  const { selectProps, ...resetProps } = props;
+  const { state } = (0, import_react.useContext)(import_model.Context);
+  const { holderLists } = (0, import_useSelectPet.default)(state);
+  const holders = (0, import_react.useMemo)(() => {
+    const lists = holderLists == null ? void 0 : holderLists.filter((d) => ((d == null ? void 0 : d.id) || (d == null ? void 0 : d.form_record_id)) > 0);
+    if (!(lists == null ? void 0 : lists.length)) return [];
+    return lists.map((d) => {
+      return {
+        value: (d == null ? void 0 : d.id) || (d == null ? void 0 : d.form_record_id),
+        label: d == null ? void 0 : d.main_field
+      };
+    });
+  }, [(_a = state == null ? void 0 : state.pet) == null ? void 0 : _a.value]);
+  const renderOptions = (0, import_react.useCallback)(
+    (array, value = "value", label = "label") => {
+      return array.map((d) => {
+        return /* @__PURE__ */ import_react.default.createElement(import_antd.Select.Option, { value: d[value], key: d[value], disabled: d.disabled }, d[label]);
+      });
+    },
+    []
+  );
+  return /* @__PURE__ */ import_react.default.createElement(import_antd.Select, { ...selectProps, ...resetProps }, renderOptions(holders));
+};
+var holder_default = Holder;

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

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

package/lib/components/booking/model.js

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

package/lib/components/booking/notes/NoteBlock/NoteItem/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import "./index.less";
 export interface InfoProps {
     isEdit: boolean;

package/lib/components/booking/notes/NoteBlock/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import "./index.less";
 export interface InfoProps {
     title?: string;

package/lib/components/booking/notes/addNote/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import "./index.less";
 declare const AddNote: ({ value, onChange, wait, title, placeholder }: any) => JSX.Element;
 export default AddNote;

package/lib/components/booking/notes/addNote/index.js

@@ -51,7 +51,7 @@ var AddNote = ({ value, onChange, wait = 200, title, placeholder }) => {
       onChange(debouncedValue);
     }
   }, [debouncedValue]);
-  return /* @__PURE__ */ import_react.default.createElement("div", { className: "" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-notes-label" }, title), /* @__PURE__ */ import_react.default.createElement(
+  return /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-notes" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-notes-label" }, title), /* @__PURE__ */ import_react.default.createElement(
     "div",
     {
       className: "pisell-lowcode__booking-notes-input",

package/lib/components/booking/notes/addNote/index.less

@@ -1,3 +1,6 @@
+.pisell-lowcode__booking-notes {
+  padding: 20px 0;
+}
 .pisell-lowcode__booking-notes-label {
   font-size: 16px;
   font-weight: 500;

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

@@ -112,7 +112,7 @@ var Payments = (0, import_model.Provider)((props) => {
     import_tabPane.default,
     {
       header: import_utils.locales.getText("pisell2.text.payments"),
-      footer: state.bookingId && /* @__PURE__ */ import_react.default.createElement(import_footer.default, { state, source: "payment" }),
+      footer: state.bookingId && /* @__PURE__ */ import_react.default.createElement(import_footer.default, { state, dispatch, source: "payment" }),
       loading: loading && state.bookingId
     },
     /* @__PURE__ */ import_react.default.createElement("div", { className: "payment-customer-pay-title" }, import_utils.locales.getText("pisell2.text.customerpay")),
@@ -134,7 +134,7 @@ var Payments = (0, import_model.Provider)((props) => {
           item.service_fee,
           2,
           (state == null ? void 0 : state.amountSymbol) || "$"
-        ), ")") : null, /* @__PURE__ */ import_react.default.createElement("div", { className: "payment-list-item-date" }, (0, import_dayjs.default)("2024-01-17 16:56:41").format(
+        ), ")") : null, /* @__PURE__ */ import_react.default.createElement("div", { className: "payment-list-item-date" }, (0, import_dayjs.default)(item.payment_time).format(
           "HH:mm YYYY/MM/DD"
         ), /* @__PURE__ */ import_react.default.createElement("span", { className: "payment-list-item-platform-type" }, item.platform && import_utils.locales.getText("pisell2.text.platform.type")(
           item.platform

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) => string;
+export declare const getDiscountTime: (service_times: number, isDay?: boolean) => string;
 /**
  * @title: 时间切片
  * @description:
@@ -31,7 +31,7 @@ export declare const getDiscountTime: (service_times: number) => string;
  * @Author: zhiwei.Wang
  * @Date: 2024-04-26 13:59
  */
-export declare const sliceDayIntoFiveMinutes: (config: any, locale: string) => {
+export declare const sliceDayIntoFiveMinutes: (config: any, locale: string, isDay?: boolean) => {
     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) => {
+export declare const getErrorList: (resource: any, cacheItem: any, isDay?: boolean) => {
     label: any;
     type: string;
 }[];
@@ -131,6 +131,18 @@ 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;
+export declare const isSessionProduct: (cacheItem: any) => boolean;
+export declare const getIsEject: (item: any, type: 'select' | 'detail') => boolean;
+export declare const getIsOnlySession: (item: any) => boolean;
 /**
  * @title: 创建一个服务商品
  * @description:
@@ -153,10 +165,10 @@ export declare const getProductTotalPrice: (item: any) => number;
 export declare const getDuration: (duration: number | {
     type: string;
     value: number;
-}) => number | {
+}) => number | "flexible" | {
     type: string;
     value: number;
-} | "flexible";
+};
 export declare const isWalkIn: (customer_id?: number | string) => boolean;
 export declare const getIsEdit: (state: any) => boolean;
 export {};

package/lib/components/booking/utils.js

@@ -37,11 +37,14 @@ __export(utils_exports, {
   formatResource: () => formatResource,
   formatTimes: () => formatTimes,
   getCacheParams: () => getCacheParams,
+  getDays: () => getDays,
   getDiscountTime: () => getDiscountTime,
   getDuration: () => getDuration,
   getEndDate: () => getEndDate,
   getErrorList: () => getErrorList,
   getIsEdit: () => getIsEdit,
+  getIsEject: () => getIsEject,
+  getIsOnlySession: () => getIsOnlySession,
   getLastServer: () => getLastServer,
   getNowTime: () => getNowTime,
   getProductTotalPrice: () => getProductTotalPrice,
@@ -52,6 +55,7 @@ __export(utils_exports, {
   getServiceTimes: () => getServiceTimes,
   getShopOpeningHours: () => getShopOpeningHours,
   isNowTime: () => isNowTime,
+  isSessionProduct: () => isSessionProduct,
   isWalkIn: () => isWalkIn,
   request: () => request,
   sliceDayIntoFiveMinutes: () => sliceDayIntoFiveMinutes
@@ -59,7 +63,9 @@ __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 import_utilsByBooking = require("./info2/utilsByBooking");
 var Request = class {
   request = {};
   constructor() {
@@ -72,10 +78,13 @@ var Request = class {
   }
 };
 var request = new Request();
-var getDiscountTime = (service_times) => {
-  if (!service_times) {
+var getDiscountTime = (service_times, isDay) => {
+  if (!service_times || service_times < 0) {
     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 {
@@ -89,7 +98,7 @@ var getDiscountTime = (service_times) => {
     return str;
   }
 };
-var sliceDayIntoFiveMinutes = (config, locale) => {
+var sliceDayIntoFiveMinutes = (config, locale, isDay) => {
   let _locale = locale;
   let dayjsLocale = _locale === "en-US" || _locale === "en" ? "en" : "zh-cn";
   import_dayjs.default.locale(dayjsLocale);
@@ -99,6 +108,20 @@ var sliceDayIntoFiveMinutes = (config, locale) => {
   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");
@@ -209,6 +232,9 @@ var formatProductListByCategory = (list, filterItem) => {
   return Object.values(categoryObject).sort((a, b) => b.sort - a.sort);
 };
 var getResourceTimeIsUsable = (item, cacheItem) => {
+  var _a;
+  const isEdit = !!cacheItem.booking_id;
+  const isCurrentRelation = item.item_id === ((_a = cacheItem == null ? void 0 : cacheItem._extend) == null ? void 0 : _a.relation_id);
   const startDate = (0, import_dayjs.default)(
     cacheItem._extend.start_date.format("YYYY-MM-DD") + " " + getServeStartTime(cacheItem._extend.start_time)
   );
@@ -219,7 +245,8 @@ var getResourceTimeIsUsable = (item, cacheItem) => {
   if (time.max_participants_limit == 0) {
     isMaxLimitRange = true;
   } else {
-    isMaxLimitRange = "unknown";
+    const orderEventCount = isEdit && isCurrentRelation ? time.order_event_count - 1 : time.order_event_count;
+    isMaxLimitRange = orderEventCount < time.max_participants_limit;
   }
   const timeStartDate = (0, import_dayjs.default)(time.start_date + " " + time.start_time).subtract(
     1,
@@ -251,6 +278,23 @@ 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) => {
@@ -359,6 +403,7 @@ var getEndDate = (startDate, duration, endDate) => {
   return startDate.add(duration, "minute");
 };
 var getServiceTimes = (service) => {
+  var _a, _b;
   const startDate = (0, import_dayjs.default)(
     (0, import_dayjs.default)(service._extend.start_date).format("YYYY-MM-DD ") + getServeStartTime(service._extend.start_time)
   );
@@ -366,13 +411,20 @@ var getServiceTimes = (service) => {
     flexibleObj.getValue(service._extend.duration),
     "minute"
   );
+  const session = (_b = (_a = service == null ? void 0 : service._extend) == null ? void 0 : _a.other) == null ? void 0 : _b.session;
+  if (isSessionProduct(service) && session) {
+    return {
+      startDate: (0, import_dayjs.default)(session.start_at),
+      endDate: (0, import_dayjs.default)(session.end_at)
+    };
+  }
   return {
     startDate,
     endDate
   };
 };
-var getErrorList = (resource, cacheItem) => {
-  var _a, _b, _c;
+var getErrorList = (resource, cacheItem, isDay) => {
+  var _a, _b, _c, _d, _e, _f, _g, _h, _i;
   if (!(cacheItem == null ? void 0 : cacheItem.id)) {
     return [
       {
@@ -395,13 +447,21 @@ var getErrorList = (resource, cacheItem) => {
         type: "product"
       });
     }
-    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;
+    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;
+      }
     }
-    if (!((_b = resource._extend) == null ? void 0 : _b.usableTime)) {
+    if (isDay ? !((_c = (_b = resource._extend) == null ? void 0 : _b.usableTime) == null ? void 0 : _c.isDateRange) : !((_d = resource._extend) == null ? void 0 : _d.usableTime)) {
       list.push({
         label: import_utils.locales.getText("pisell1.text.resource-error-message-2")(
           resource.labelText,
@@ -411,7 +471,7 @@ var getErrorList = (resource, cacheItem) => {
         type: "time"
       });
     } else {
-      if (!((_c = resource._extend) == null ? void 0 : _c.usableTime._extend.isMaxLimitRange)) {
+      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)) {
         list.push({
           label: import_utils.locales.getText("pisell1.text.resource-error-message-3")(
             resource.labelText,
@@ -426,11 +486,15 @@ var getErrorList = (resource, cacheItem) => {
   return list;
 };
 var formatResource = (resourceItem, cacheItem, formatLabel) => {
+  var _a, _b, _c, _d, _e;
   let _resourceItem = { ...resourceItem };
   _resourceItem = formatTimes(_resourceItem, cacheItem);
   _resourceItem = formatResourceProducts(_resourceItem, cacheItem);
   _resourceItem.labelText = _resourceItem.room_name || _resourceItem.name;
-  const usable = _resourceItem._extend.usableTime && _resourceItem._extend.usableProduct;
+  let usable = _resourceItem._extend.usableTime && ((_a = _resourceItem._extend.usableTime._extend) == null ? void 0 : _a.isMaxLimitRange) && _resourceItem._extend.usableProduct;
+  if (((_b = cacheItem == null ? void 0 : cacheItem._extend) == null ? void 0 : _b.sub_type) === "days") {
+    usable = ((_d = (_c = _resourceItem._extend) == null ? void 0 : _c.usableTime) == null ? void 0 : _d.isUsable) && ((_e = _resourceItem._extend) == null ? void 0 : _e.usableProduct);
+  }
   _resourceItem.usable = usable;
   if (formatLabel) {
     _resourceItem.label = formatLabel(_resourceItem);
@@ -448,27 +512,64 @@ 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 isSessionProduct = (cacheItem) => {
+  return ["session_product", "session_ticket"].includes(cacheItem.extension_type);
+};
+var getIsEject = (item, type) => {
+  const isSession = isSessionProduct(item);
+  return type === "detail" || item.bundle_group_count > 0 || item.option_group_count > 0 || item.is_variant > 0 || isSession;
+};
+var getIsOnlySession = (item) => {
+  const isSession = isSessionProduct(item);
+  return !(item.bundle_group_count > 0 || item.option_group_count > 0 || item.is_variant > 0) && isSession;
+};
 var getServerItemExtend = (state, cacheItem, timeObj) => {
-  var _a;
   if (!cacheItem.new && cacheItem._extend.endDate) {
     return cacheItem._extend;
   }
-  let lastServer = getLastServer(state.service.value);
-  let _extend = {
-    duration: findNextDuration(
+  const appointmentTimingPreference = (0, import_utilsByBooking.getAppointmentTimingPreference)(state);
+  const isSession = isSessionProduct(cacheItem);
+  const isDay = (0, import_utils2.isDayBooking)(state);
+  const setDuration = () => {
+    var _a;
+    if (isDay) {
+      return getDays(cacheItem, "days");
+    }
+    if (isSession) {
+      return getDays(cacheItem, "minutes");
+    }
+    return findNextDuration(
       cacheItem.duration,
       timeObj.durationSlicesBasedOnTime,
       (_a = cacheItem == null ? void 0 : cacheItem.duration) == null ? void 0 : _a.value
-    )
+    );
+  };
+  let lastServer = isDay ? false : getLastServer(state.service.value);
+  let _extend = {
+    duration: setDuration()
   };
   if (lastServer) {
     _extend.resource = lastServer._extend.resource;
     let lastServerStartDate = lastServer._extend.startDate;
     let lastServerEndDate = lastServer._extend.endDate;
-    if ((0, import_dayjs.default)(lastServerEndDate).isAfter(lastServerStartDate, "day")) {
-      _extend.start_time = timeObj.timeSlices[timeObj.timeSlices.length - 1].value;
+    if (appointmentTimingPreference === "parallel") {
+      _extend.start_time = lastServerStartDate.format("HH:mm");
     } else {
-      _extend.start_time = lastServerEndDate.format("HH:mm");
+      if ((0, import_dayjs.default)(lastServerEndDate).isAfter(lastServerStartDate, "day")) {
+        _extend.start_time = timeObj.timeSlices[timeObj.timeSlices.length - 1].value;
+      } else {
+        _extend.start_time = lastServerEndDate.format("HH:mm");
+      }
     }
   } else {
     let findNextSliceProps = {
@@ -501,19 +602,30 @@ var getServerItemExtend = (state, cacheItem, timeObj) => {
     ..._extend,
     ...cacheItem._extend
   };
+  if (isDay) {
+    _extend.end_date = (0, import_dayjs.default)(_extend.start_date).add(_extend.duration, "day");
+    const { start_date, end_date } = (0, import_utils2.formatDayDate)(_extend);
+    _extend = { ..._extend, start_date, startDate: start_date, end_date, endDate: end_date };
+  }
   return _extend;
 };
 var getProductTotalPrice = (item) => {
   var _a;
-  let price = 0;
-  price += Number(item._extend.price);
+  let price = Number(item._extend.price);
   let other = (_a = item._extend) == null ? void 0 : _a.other;
+  if (other == null ? void 0 : other.product_variant_id) {
+    price = Number(other == null ? void 0 : other.price);
+  }
   if (other == null ? void 0 : other.bundle) {
     price = other == null ? void 0 : other.bundle.reduce((accumulator, currentValue) => {
       return accumulator + Number(currentValue.price) * Number(currentValue.num);
     }, price);
   }
-  price = price;
+  if (other == null ? void 0 : other.option) {
+    price = other == null ? void 0 : other.option.reduce((accumulator, currentValue) => {
+      return accumulator + Number(currentValue.price) * Number(currentValue.num);
+    }, price);
+  }
   return price;
 };
 var getDuration = (duration) => {
@@ -577,11 +689,14 @@ var getIsEdit = (state) => {
   formatResource,
   formatTimes,
   getCacheParams,
+  getDays,
   getDiscountTime,
   getDuration,
   getEndDate,
   getErrorList,
   getIsEdit,
+  getIsEject,
+  getIsOnlySession,
   getLastServer,
   getNowTime,
   getProductTotalPrice,
@@ -592,6 +707,7 @@ var getIsEdit = (state) => {
   getServiceTimes,
   getShopOpeningHours,
   isNowTime,
+  isSessionProduct,
   isWalkIn,
   request,
   sliceDayIntoFiveMinutes

package/lib/components/eftpos/hooks.d.ts

@@ -6,8 +6,8 @@ import { Eftpos } from './const';
  * @Date: 2024-08-20 13:23
  */
 export declare const usePairTerminalo: (type: Eftpos, params: {
-    url?: string | undefined;
-    version?: string | undefined;
+    url?: string;
+    version?: string;
 }) => ({ mid, tid, apiKey, posProductData, }: {
     mid: string;
     tid: string;
@@ -29,6 +29,6 @@ export declare const usePairTerminalo: (type: Eftpos, params: {
  * @Date: 2024-08-19 18:36
  */
 export declare const useTyro: (params: {
-    url?: string | undefined;
-    version?: string | undefined;
+    url?: string;
+    version?: string;
 }) => readonly [import("react").MutableRefObject<any>, boolean];

package/lib/components/eftpos/pos.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { DeviceProp } from "./const";
 interface PosProps {
     eftposName: string;

package/lib/components/eftposPay/amount.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { PosProps } from './const';
 /**
  * @title: 支付金额信息配置页
@@ -9,7 +8,7 @@ import { PosProps } from './const';
  */
 declare const _default: ({ className, onChange, onClose, formatAmount, isMobile, net, client }: {
     className?: string | undefined;
-    onChange?: ((status: "page" | "success" | "fail" | "print" | "mark_tx_processed", params?: string | {
+    onChange?: ((status: "success" | "page" | "print" | "fail" | "mark_tx_processed", params?: string | {
         [keys: string]: unknown;
     } | undefined, other?: any) => void) | undefined;
     onClose: () => void;

package/lib/components/eftposPay/app.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { PosProps, RouteType } from './const';
 declare const App: ({ action, api, device_number, terminal, tyroUrl, tyroVersion, onChangeParams, isMobile, channel, formatAmount, ...props }: Omit<PosProps, "type" | "mode" | "getApi"> & {
     action: RouteType;

package/lib/components/eftposPay/component/fail/failCustom.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { ActionProps } from '../../const';
 declare const _default: ({ className, isMobile, onChange }: ActionProps) => JSX.Element;
 export default _default;

package/lib/components/eftposPay/component/fail/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { ActionProps } from '../../const';
 declare const _default: ({ onChange, className, isMobile }: ActionProps) => JSX.Element;
 export default _default;

package/lib/components/eftposPay/component/fail/network.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { ActionProps } from '../../const';
 /**
  * @title: 断网(客户端)提示页

package/lib/components/eftposPay/component/fail/unknow.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { ActionProps } from '../../const';
 /**
  * @title: 支付状态未知页面

package/lib/components/eftposPay/component/manual/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { ActionProps } from '../../const';
 import './index.less';
 /**

package/lib/components/eftposPay/component/signature/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { ActionProps } from '../../const';
 /**
  * @title: 取消签名确认页

package/lib/components/eftposPay/component/step/index.d.ts

@@ -2,11 +2,11 @@
 import { StatusType } from '../../const';
 declare const _default: (props: {
     status: StatusType;
-    warn?: string | undefined;
-    text?: string | undefined;
-    tip?: string | undefined;
-    loading?: string | undefined;
-    success?: string | undefined;
-    fail?: string | undefined;
+    warn?: string;
+    text?: string;
+    tip?: string;
+    loading?: string;
+    success?: string;
+    fail?: string;
 }) => JSX.Element;
 export default _default;