@pisell/private-materials 6.0.25 → 6.1.2

package/lib/components/booking/materiels/duration/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { SelectProps } from 'antd';
 interface DurationProps extends SelectProps {
     locale?: string;

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

@@ -49,6 +49,7 @@ var Duration = (props) => {
     timeObj,
     ...resetProps
   } = props;
+  const startDateStr = (0, import_react.useMemo)(() => (0, import_dayjs.default)(startDate).format("YYYY-MM-DD HH:mm:ss"), [startDate]);
   const times = (0, import_react.useMemo)(() => {
     if (timeObj) {
       return timeObj.durationSlicesBasedOnTime;
@@ -76,7 +77,7 @@ var Duration = (props) => {
       });
     }
     return durationSlicesBasedOnTime;
-  }, [timeObj, slice, locale, duration, startDate, usableTime]);
+  }, [timeObj.durationSlicesBasedOnTime, slice, locale, duration, startDateStr, usableTime == null ? void 0 : usableTime.end_at]);
   (0, import_react.useEffect)(() => {
     timeObjChange == null ? void 0 : timeObjChange(times);
   }, [times]);
@@ -88,6 +89,10 @@ var Duration = (props) => {
     },
     []
   );
-  return /* @__PURE__ */ import_react.default.createElement(import_antd.Select, { ...selectProps, ...resetProps }, renderOptions(times));
+  const options = (0, import_react.useMemo)(() => {
+    console.log("render form options");
+    return renderOptions(times);
+  }, [times]);
+  return /* @__PURE__ */ import_react.default.createElement(import_antd.Select, { ...selectProps, ...resetProps }, options);
 };
 var duration_default = Duration;

package/lib/components/booking/materiels/holder/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { SelectProps } from 'antd';
 interface HolderProps extends SelectProps {
     selectProps?: SelectProps;

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

@@ -42,11 +42,11 @@ var Holder = (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) > 0);
+    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,
+        value: (d == null ? void 0 : d.id) || (d == null ? void 0 : d.form_record_id),
         label: d == null ? void 0 : d.main_field
       };
     });

package/lib/components/booking/materiels/startTime/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { SelectProps } from "antd";
 interface StartTimeProps extends SelectProps {
     locale?: string;

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

@@ -140,6 +140,9 @@ export declare const deleteCacheParams: () => void;
  * @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:

package/lib/components/booking/utils.js

@@ -43,6 +43,8 @@ __export(utils_exports, {
   getEndDate: () => getEndDate,
   getErrorList: () => getErrorList,
   getIsEdit: () => getIsEdit,
+  getIsEject: () => getIsEject,
+  getIsOnlySession: () => getIsOnlySession,
   getLastServer: () => getLastServer,
   getNowTime: () => getNowTime,
   getProductTotalPrice: () => getProductTotalPrice,
@@ -53,6 +55,7 @@ __export(utils_exports, {
   getServiceTimes: () => getServiceTimes,
   getShopOpeningHours: () => getShopOpeningHours,
   isNowTime: () => isNowTime,
+  isSessionProduct: () => isSessionProduct,
   isWalkIn: () => isWalkIn,
   request: () => request,
   sliceDayIntoFiveMinutes: () => sliceDayIntoFiveMinutes
@@ -62,6 +65,7 @@ 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() {
@@ -228,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)
   );
@@ -238,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,
@@ -395,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)
   );
@@ -402,6 +411,13 @@ 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
@@ -470,14 +486,14 @@ var getErrorList = (resource, cacheItem, isDay) => {
   return list;
 };
 var formatResource = (resourceItem, cacheItem, formatLabel) => {
-  var _a, _b, _c, _d;
+  var _a, _b, _c, _d, _e;
   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);
+  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) {
@@ -506,28 +522,54 @@ var getDays = (cacheItem, type) => {
   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;
   }
+  const appointmentTimingPreference = (0, import_utilsByBooking.getAppointmentTimingPreference)(state);
+  const isSession = isSessionProduct(cacheItem);
   const isDay = (0, import_utils2.isDayBooking)(state);
-  let lastServer = isDay ? false : getLastServer(state.service.value);
-  let _extend = {
-    duration: isDay ? getDays(cacheItem, "days") : findNextDuration(
+  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 = {
@@ -653,6 +695,8 @@ var getIsEdit = (state) => {
   getEndDate,
   getErrorList,
   getIsEdit,
+  getIsEject,
+  getIsOnlySession,
   getLastServer,
   getNowTime,
   getProductTotalPrice,
@@ -663,6 +707,7 @@ var getIsEdit = (state) => {
   getServiceTimes,
   getShopOpeningHours,
   isNowTime,
+  isSessionProduct,
   isWalkIn,
   request,
   sliceDayIntoFiveMinutes

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

@@ -1,3 +1,2 @@
-/// <reference types="react" />
 declare const _default: ({ input, ...formItemProps }: any) => JSX.Element;
 export default _default;

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 /**
  * @title: 递归循环表单数据
  * @Author: hongbing.wang

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { RadioGroupProps } from 'antd';
 export declare const CheckboxGroup: ({ direction, options, ...props }: any) => JSX.Element;
 export declare const RadioGroup: ({ direction, options, ...props }: RadioGroupProps & {

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { Eftpos } from './const';
 /**
  * @title: tyro 设备连接

package/lib/components/eftpos/icon/apiKey.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 declare const _default: ({ color }: {
     color?: string | undefined;
 }) => JSX.Element;

package/lib/components/eftpos/icon/device.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 declare const _default: ({ color }: {
     color?: string | undefined;
 }) => JSX.Element;

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

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

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/eftpos/receipt/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 /**
  * @title: 自定义组件设置
  * @description: 自定义组件设置

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.css';
 /**
  * @title: 自定义组件设置

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" | "fail" | "print" | "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/alert/warn.d.ts

@@ -1,3 +1,2 @@
-/// <reference types="react" />
 declare const _default: () => 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/header/titlebar.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './titlebar.less';
 declare enum EPopupTitleBarVariantType {
     BackTitleClose = "back-title-cancel",

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { StatusType } from '../../const';
 declare const _default: (props: {
     status: StatusType;

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 declare const _default: (props: {
     status: string;
     pedding?: string;

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { PayProps, PosProps } from './const';
 import './device.less';
 /**
@@ -11,7 +10,7 @@ import './device.less';
 declare const _default: ({ api, onChange, onClose, className, device_number, isMobile, net, client, formatAmount, }: {
     api: PayProps['api'];
     className?: string | undefined;
-    onChange?: ((status: "page" | "success" | "fail" | "print" | "mark_tx_processed", params?: string | {
+    onChange?: ((status: "success" | "page" | "fail" | "print" | "mark_tx_processed", params?: string | {
         [keys: string]: unknown;
     } | undefined, other?: any) => void) | undefined;
     onClose: () => void;

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

@@ -15,11 +15,11 @@ export declare const useStoreRef: <T extends {
     readonly numRef: React.MutableRefObject<string | number | undefined>;
     readonly orderIdRef: React.MutableRefObject<string | number>;
     readonly modeRef: React.MutableRefObject<ModeEnum>;
-    readonly statusRef: React.MutableRefObject<"loading" | "success" | "warn" | "fail" | "pedding" | "resove" | "reject" | "question">;
+    readonly statusRef: React.MutableRefObject<"success" | "warn" | "loading" | "fail" | "pedding" | "resove" | "reject" | "question">;
     readonly netRef: React.MutableRefObject<boolean | undefined>;
     readonly symbolRef: React.MutableRefObject<string>;
     readonly amountRef: React.MutableRefObject<string | number>;
-    readonly eftposRef: React.MutableRefObject<"tyro" | "windcave" | "payo" | "stripe">;
+    readonly eftposRef: React.MutableRefObject<"payo" | "tyro" | "windcave" | "stripe">;
     readonly clientRef: React.MutableRefObject<ClientEnum>;
     readonly dataRef: React.MutableRefObject<import("./store").State>;
 };

package/lib/components/eftposPay/payo/config.js

@@ -46,7 +46,7 @@ var POS = ({
   api,
   onChange
 }) => {
-  const { steps } = (0, import_store.useContextData)();
+  const { steps, custom } = (0, import_store.useContextData)();
   const {
     deviceRef,
     payRef,
@@ -147,6 +147,17 @@ var POS = ({
     controllerRef.current = new AbortController();
     const resultPromise = modeRef.current === import_const.ModeEnum.Pay || modeRef.current === import_const.ModeEnum.FullPay ? api.pay(
       {
+        ...(custom == null ? void 0 : custom.platform) ? {
+          "operator_id": custom.operator_id,
+          "operator_type": custom.operator_type,
+          "platform": custom.platform,
+          "custom_payment_id": custom.custom_payment_id,
+          "service_charge": {
+            "amount": payRef.current.surMoney,
+            "percentage": payRef.current.surPercentRate
+          },
+          "original_amount": payRef.current.amount
+        } : {},
         order_id: orderIdRef.current,
         amount: payRef.current.total,
         card_reader_type: eftposRef.current,
@@ -226,7 +237,16 @@ var POS = ({
 };
 var Action = ({ onChange }) => {
   const dispatch = (0, import_store.useDispatch)();
-  const { mode, client } = (0, import_store.useContextData)();
+  const { mode, client, order_id, number, device } = (0, import_store.useContextData)();
+  const [isShowCancel, setIsShowCancel] = (0, import_react.useState)(false);
+  (0, import_react.useEffect)(() => {
+    const timer = setTimeout(() => {
+      setIsShowCancel(true);
+    }, 30 * 1e3);
+    return () => {
+      clearTimeout(timer);
+    };
+  }, []);
   const onManually = () => {
     dispatch(
       (0, import_store.updateState)({
@@ -238,7 +258,18 @@ var Action = ({ onChange }) => {
     );
     dispatch((0, import_store.updateComponent)("Manual", true));
   };
-  return /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__eft-pay-step-item-btns" }, client === import_const.ClientEnum.Merchant ? /* @__PURE__ */ import_react.default.createElement(
+  const onCancel = () => {
+    onChange("fail", { number, uniquePaymentNumber: number, device, order_id });
+  };
+  return /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__eft-pay-step-item-btns" }, client !== import_const.ClientEnum.Merchant && isShowCancel && /* @__PURE__ */ import_react.default.createElement(
+    import_antd.Button,
+    {
+      block: true,
+      className: "pisell-lowcode__eft-pay-step-item-btn",
+      onClick: onCancel
+    },
+    import_utils.locales.getText("page.eftpos-pay.text.cancel")
+  ), client === import_const.ClientEnum.Merchant ? /* @__PURE__ */ import_react.default.createElement(
     import_antd.Button,
     {
       block: true,

package/lib/components/eftposPay/payo/hooks.js

@@ -25,6 +25,7 @@ module.exports = __toCommonJS(hooks_exports);
 var import_react = require("react");
 var import_const = require("../const");
 var import_helper = require("../helper");
+var import_utils = require("@pisell/utils");
 var useValidate = (timeout) => {
   const controllerRef = (0, import_react.useRef)();
   const ref = (0, import_react.useRef)(true);
@@ -78,6 +79,15 @@ var useValidate = (timeout) => {
     TimeoutRef.current && clearTimeout(TimeoutRef.current);
     TimeoutRef.current = setTimeout(() => {
       isTimeoutCloseRef.current = true;
+      (0, import_utils.sendWarningLog)({
+        title: "支付状态查询超时",
+        content: [
+          {
+            key: "params",
+            value: JSON.stringify(params)
+          }
+        ]
+      });
       close();
     }, timeout);
     return checkApi(...params);

package/lib/components/eftposPay/store/index.d.ts

@@ -174,7 +174,7 @@ export declare const updateCustom: (payload: {
 export declare const updateStatus: (status: 'loading' | 'warn' | 'fail' | 'success' | 'question') => {
     type: EActionTypes;
     payload: {
-        status: "loading" | "success" | "warn" | "fail" | "question";
+        status: "success" | "warn" | "loading" | "fail" | "question";
     };
 };
 /**
@@ -295,9 +295,9 @@ export declare const backUpFree: (payload: Partial<State>) => {
         name?: string | undefined;
         symbol?: string | undefined;
         amount?: string | number | undefined;
-        mode?: "refund" | "pay" | "fullPay" | "query" | undefined;
+        mode?: "pay" | "fullPay" | "refund" | "query" | undefined;
         order_id?: string | number | undefined;
-        eftpos?: "tyro" | "windcave" | "payo" | "stripe" | undefined;
+        eftpos?: "payo" | "tyro" | "windcave" | "stripe" | undefined;
         action?: "amount" | "deviceList" | "pay" | undefined;
         key?: number | undefined;
         step?: number | undefined;
@@ -308,7 +308,7 @@ export declare const backUpFree: (payload: Partial<State>) => {
         net?: boolean | undefined;
         component?: string | undefined;
         form?: string | undefined;
-        status?: "loading" | "success" | "warn" | "fail" | "pedding" | "resove" | "reject" | "question" | undefined;
+        status?: "success" | "warn" | "loading" | "fail" | "pedding" | "resove" | "reject" | "question" | undefined;
         warn?: string | undefined;
         steps?: {
             /** 用于重置当前步骤 */

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

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

package/lib/components/eftposPay/tyro/hooks.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 /**
  * @title: 获取 Tyro 资源
  * @description:

package/lib/components/eftposPay/windcave/receiptAction.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 /**
  * @title: 按钮操作区
  * @description: 仅包含签名

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 declare const _default: ({ api, onChange, formatAmount, }: {
     api: any;
     onChange: any;

package/lib/components/eftposPay/windcave/windcave.js

@@ -166,6 +166,17 @@ var windcave_default = ({
     let _params = {};
     if (isPay) {
       _params = {
+        ...(custom == null ? void 0 : custom.platform) ? {
+          "operator_id": custom.operator_id,
+          "operator_type": custom.operator_type,
+          "platform": custom.platform,
+          "custom_payment_id": custom.custom_payment_id,
+          "service_charge": {
+            "amount": payRef.current.surMoney,
+            "percentage": payRef.current.surPercentRate
+          },
+          "original_amount": payRef.current.amount
+        } : {},
         order_id: orderIdRef.current,
         amount: payRef.current.total,
         card_reader_type: eftposRef.current,