@pisell/private-materials 3.0.139 → 3.0.141

package/es/components/eftposPay/payo/const.js

@@ -111,6 +111,7 @@ export function getAmonunt(store) {
       useOriginSurcharge: (pay === null || pay === void 0 ? void 0 : pay.useOriginSurcharge) || false
     };
   }
+
   // 原始支付总额
   if (!setting) {
     return {
@@ -125,11 +126,13 @@ export function getAmonunt(store) {
       useOriginSurcharge: false
     };
   }
+  var useOriginSurcharge = setting.useOriginSurcharge || false;
+
   // 直接设备中手续费金额 + 原始支付总额
-  var surRate = setting.useOriginSurcharge ? 0 : setting.constant_rate || 0;
-  var surMoney = setting.useOriginSurcharge ? 0 : setting.constant_money || 0;
+
+  var surRate = setting.constant_rate || 0;
+  var surMoney = setting.constant_money || 0;
   var surcharge = setting.surcharge;
-  var useOriginSurcharge = setting.useOriginSurcharge || false;
   return {
     name: name,
     symbol: symbol,

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

@@ -1,5 +1,10 @@
 function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
 function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return exports; }; var exports = {}, Op = Object.prototype, hasOwn = Op.hasOwnProperty, defineProperty = Object.defineProperty || function (obj, key, desc) { obj[key] = desc.value; }, $Symbol = "function" == typeof Symbol ? Symbol : {}, iteratorSymbol = $Symbol.iterator || "@@iterator", asyncIteratorSymbol = $Symbol.asyncIterator || "@@asyncIterator", toStringTagSymbol = $Symbol.toStringTag || "@@toStringTag"; function define(obj, key, value) { return Object.defineProperty(obj, key, { value: value, enumerable: !0, configurable: !0, writable: !0 }), obj[key]; } try { define({}, ""); } catch (err) { define = function define(obj, key, value) { return obj[key] = value; }; } function wrap(innerFn, outerFn, self, tryLocsList) { var protoGenerator = outerFn && outerFn.prototype instanceof Generator ? outerFn : Generator, generator = Object.create(protoGenerator.prototype), context = new Context(tryLocsList || []); return defineProperty(generator, "_invoke", { value: makeInvokeMethod(innerFn, self, context) }), generator; } function tryCatch(fn, obj, arg) { try { return { type: "normal", arg: fn.call(obj, arg) }; } catch (err) { return { type: "throw", arg: err }; } } exports.wrap = wrap; var ContinueSentinel = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var IteratorPrototype = {}; define(IteratorPrototype, iteratorSymbol, function () { return this; }); var getProto = Object.getPrototypeOf, NativeIteratorPrototype = getProto && getProto(getProto(values([]))); NativeIteratorPrototype && NativeIteratorPrototype !== Op && hasOwn.call(NativeIteratorPrototype, iteratorSymbol) && (IteratorPrototype = NativeIteratorPrototype); var Gp = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(IteratorPrototype); function defineIteratorMethods(prototype) { ["next", "throw", "return"].forEach(function (method) { define(prototype, method, function (arg) { return this._invoke(method, arg); }); }); } function AsyncIterator(generator, PromiseImpl) { function invoke(method, arg, resolve, reject) { var record = tryCatch(generator[method], generator, arg); if ("throw" !== record.type) { var result = record.arg, value = result.value; return value && "object" == _typeof(value) && hasOwn.call(value, "__await") ? PromiseImpl.resolve(value.__await).then(function (value) { invoke("next", value, resolve, reject); }, function (err) { invoke("throw", err, resolve, reject); }) : PromiseImpl.resolve(value).then(function (unwrapped) { result.value = unwrapped, resolve(result); }, function (error) { return invoke("throw", error, resolve, reject); }); } reject(record.arg); } var previousPromise; defineProperty(this, "_invoke", { value: function value(method, arg) { function callInvokeWithMethodAndArg() { return new PromiseImpl(function (resolve, reject) { invoke(method, arg, resolve, reject); }); } return previousPromise = previousPromise ? previousPromise.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(innerFn, self, context) { var state = "suspendedStart"; return function (method, arg) { if ("executing" === state) throw new Error("Generator is already running"); if ("completed" === state) { if ("throw" === method) throw arg; return doneResult(); } for (context.method = method, context.arg = arg;;) { var delegate = context.delegate; if (delegate) { var delegateResult = maybeInvokeDelegate(delegate, context); if (delegateResult) { if (delegateResult === ContinueSentinel) continue; return delegateResult; } } if ("next" === context.method) context.sent = context._sent = context.arg;else if ("throw" === context.method) { if ("suspendedStart" === state) throw state = "completed", context.arg; context.dispatchException(context.arg); } else "return" === context.method && context.abrupt("return", context.arg); state = "executing"; var record = tryCatch(innerFn, self, context); if ("normal" === record.type) { if (state = context.done ? "completed" : "suspendedYield", record.arg === ContinueSentinel) continue; return { value: record.arg, done: context.done }; } "throw" === record.type && (state = "completed", context.method = "throw", context.arg = record.arg); } }; } function maybeInvokeDelegate(delegate, context) { var methodName = context.method, method = delegate.iterator[methodName]; if (undefined === method) return context.delegate = null, "throw" === methodName && delegate.iterator.return && (context.method = "return", context.arg = undefined, maybeInvokeDelegate(delegate, context), "throw" === context.method) || "return" !== methodName && (context.method = "throw", context.arg = new TypeError("The iterator does not provide a '" + methodName + "' method")), ContinueSentinel; var record = tryCatch(method, delegate.iterator, context.arg); if ("throw" === record.type) return context.method = "throw", context.arg = record.arg, context.delegate = null, ContinueSentinel; var info = record.arg; return info ? info.done ? (context[delegate.resultName] = info.value, context.next = delegate.nextLoc, "return" !== context.method && (context.method = "next", context.arg = undefined), context.delegate = null, ContinueSentinel) : info : (context.method = "throw", context.arg = new TypeError("iterator result is not an object"), context.delegate = null, ContinueSentinel); } function pushTryEntry(locs) { var entry = { tryLoc: locs[0] }; 1 in locs && (entry.catchLoc = locs[1]), 2 in locs && (entry.finallyLoc = locs[2], entry.afterLoc = locs[3]), this.tryEntries.push(entry); } function resetTryEntry(entry) { var record = entry.completion || {}; record.type = "normal", delete record.arg, entry.completion = record; } function Context(tryLocsList) { this.tryEntries = [{ tryLoc: "root" }], tryLocsList.forEach(pushTryEntry, this), this.reset(!0); } function values(iterable) { if (iterable) { var iteratorMethod = iterable[iteratorSymbol]; if (iteratorMethod) return iteratorMethod.call(iterable); if ("function" == typeof iterable.next) return iterable; if (!isNaN(iterable.length)) { var i = -1, next = function next() { for (; ++i < iterable.length;) if (hasOwn.call(iterable, i)) return next.value = iterable[i], next.done = !1, next; return next.value = undefined, next.done = !0, next; }; return next.next = next; } } return { next: doneResult }; } function doneResult() { return { value: undefined, done: !0 }; } return GeneratorFunction.prototype = GeneratorFunctionPrototype, defineProperty(Gp, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), defineProperty(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, toStringTagSymbol, "GeneratorFunction"), exports.isGeneratorFunction = function (genFun) { var ctor = "function" == typeof genFun && genFun.constructor; return !!ctor && (ctor === GeneratorFunction || "GeneratorFunction" === (ctor.displayName || ctor.name)); }, exports.mark = function (genFun) { return Object.setPrototypeOf ? Object.setPrototypeOf(genFun, GeneratorFunctionPrototype) : (genFun.__proto__ = GeneratorFunctionPrototype, define(genFun, toStringTagSymbol, "GeneratorFunction")), genFun.prototype = Object.create(Gp), genFun; }, exports.awrap = function (arg) { return { __await: arg }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, asyncIteratorSymbol, function () { return this; }), exports.AsyncIterator = AsyncIterator, exports.async = function (innerFn, outerFn, self, tryLocsList, PromiseImpl) { void 0 === PromiseImpl && (PromiseImpl = Promise); var iter = new AsyncIterator(wrap(innerFn, outerFn, self, tryLocsList), PromiseImpl); return exports.isGeneratorFunction(outerFn) ? iter : iter.next().then(function (result) { return result.done ? result.value : iter.next(); }); }, defineIteratorMethods(Gp), define(Gp, toStringTagSymbol, "Generator"), define(Gp, iteratorSymbol, function () { return this; }), define(Gp, "toString", function () { return "[object Generator]"; }), exports.keys = function (val) { var object = Object(val), keys = []; for (var key in object) keys.push(key); return keys.reverse(), function next() { for (; keys.length;) { var key = keys.pop(); if (key in object) return next.value = key, next.done = !1, next; } return next.done = !0, next; }; }, exports.values = values, Context.prototype = { constructor: Context, reset: function reset(skipTempReset) { if (this.prev = 0, this.next = 0, this.sent = this._sent = undefined, this.done = !1, this.delegate = null, this.method = "next", this.arg = undefined, this.tryEntries.forEach(resetTryEntry), !skipTempReset) for (var name in this) "t" === name.charAt(0) && hasOwn.call(this, name) && !isNaN(+name.slice(1)) && (this[name] = undefined); }, stop: function stop() { this.done = !0; var rootRecord = this.tryEntries[0].completion; if ("throw" === rootRecord.type) throw rootRecord.arg; return this.rval; }, dispatchException: function dispatchException(exception) { if (this.done) throw exception; var context = this; function handle(loc, caught) { return record.type = "throw", record.arg = exception, context.next = loc, caught && (context.method = "next", context.arg = undefined), !!caught; } for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i], record = entry.completion; if ("root" === entry.tryLoc) return handle("end"); if (entry.tryLoc <= this.prev) { var hasCatch = hasOwn.call(entry, "catchLoc"), hasFinally = hasOwn.call(entry, "finallyLoc"); if (hasCatch && hasFinally) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } else if (hasCatch) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); } else { if (!hasFinally) throw new Error("try statement without catch or finally"); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } } } }, abrupt: function abrupt(type, arg) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc <= this.prev && hasOwn.call(entry, "finallyLoc") && this.prev < entry.finallyLoc) { var finallyEntry = entry; break; } } finallyEntry && ("break" === type || "continue" === type) && finallyEntry.tryLoc <= arg && arg <= finallyEntry.finallyLoc && (finallyEntry = null); var record = finallyEntry ? finallyEntry.completion : {}; return record.type = type, record.arg = arg, finallyEntry ? (this.method = "next", this.next = finallyEntry.finallyLoc, ContinueSentinel) : this.complete(record); }, complete: function complete(record, afterLoc) { if ("throw" === record.type) throw record.arg; return "break" === record.type || "continue" === record.type ? this.next = record.arg : "return" === record.type ? (this.rval = this.arg = record.arg, this.method = "return", this.next = "end") : "normal" === record.type && afterLoc && (this.next = afterLoc), ContinueSentinel; }, finish: function finish(finallyLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.finallyLoc === finallyLoc) return this.complete(entry.completion, entry.afterLoc), resetTryEntry(entry), ContinueSentinel; } }, catch: function _catch(tryLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc === tryLoc) { var record = entry.completion; if ("throw" === record.type) { var thrown = record.arg; resetTryEntry(entry); } return thrown; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(iterable, resultName, nextLoc) { return this.delegate = { iterator: values(iterable), resultName: resultName, nextLoc: nextLoc }, "next" === this.method && (this.arg = undefined), ContinueSentinel; } }, exports; }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
+function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
 /* eslint-disable @typescript-eslint/no-unused-expressions */
@@ -16,10 +21,11 @@ import { sleep } from "../helper";
 export var useValidate = function useValidate(timeout) {
   var controllerRef = useRef();
   var ref = useRef(true);
+  var isTimeoutCloseRef = useRef(false);
   var TimeoutRef = useRef();
   var checkApi = useCallback( /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(check, number, time) {
-      var res, start, diff;
+      var res, start, diff, _ref2, code;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
@@ -61,8 +67,29 @@ export var useValidate = function useValidate(timeout) {
             _context.next = 4;
             break;
           case 16:
+            if (!isTimeoutCloseRef.current) {
+              _context.next = 22;
+              break;
+            }
+            if (res) {
+              _context.next = 19;
+              break;
+            }
+            return _context.abrupt("return", {
+              code: PayStatus.Timeout
+            });
+          case 19:
+            _ref2 = res, code = _ref2.code;
+            if (!("".concat(code) === "200")) {
+              _context.next = 22;
+              break;
+            }
+            return _context.abrupt("return", _objectSpread(_objectSpread({}, res), {}, {
+              code: PayStatus.Timeout
+            }));
+          case 22:
             return _context.abrupt("return", res);
-          case 17:
+          case 23:
           case "end":
             return _context.stop();
         }
@@ -84,9 +111,11 @@ export var useValidate = function useValidate(timeout) {
     (_controllerRef$curren = controllerRef.current) === null || _controllerRef$curren === void 0 ? void 0 : _controllerRef$curren.abort();
   }, []);
   var run = function run() {
+    isTimeoutCloseRef.current = false;
     TimeoutRef.current && clearTimeout(TimeoutRef.current);
     // 开启计时
     TimeoutRef.current = setTimeout(function () {
+      isTimeoutCloseRef.current = true;
       close();
     }, timeout);
     return checkApi.apply(void 0, arguments);

package/es/components/eftposPay/tyro/const.js

@@ -102,11 +102,13 @@ export function getAmonunt(store) {
       useOriginSurcharge: false
     };
   }
+  var useOriginSurcharge = setting.useOriginSurcharge || false;
+
   // 直接设备中手续费金额
+
   var surRate = setting.constant_rate || 0;
   var surMoney = setting.constant_money || 0;
   var surcharge = setting.surcharge;
-  var useOriginSurcharge = setting.useOriginSurcharge || false;
   return {
     name: name,
     symbol: symbol,

package/es/components/eftposPay/windcave/const.js

@@ -111,11 +111,12 @@ export function getAmonunt(store) {
       useOriginSurcharge: false
     };
   }
+  var useOriginSurcharge = setting.useOriginSurcharge || false;
+
   // 直接设备中手续费金额 + 原始支付总额
   var surRate = setting.constant_rate || 0;
   var surMoney = setting.constant_money || 0;
   var surcharge = setting.surcharge;
-  var useOriginSurcharge = setting.useOriginSurcharge || false;
   return {
     name: name,
     symbol: symbol,

package/lib/components/booking/info/header/index.js

@@ -40,7 +40,7 @@ var import_useEngineContext = __toESM(require("../../../../hooks/useEngineContex
 var import_index = require("./index.less");
 var import_classnames = __toESM(require("classnames"));
 var header = ({ state, dispatch }) => {
-  var _a, _b, _c, _d, _e, _f, _g, _h;
+  var _a, _b, _c, _d, _e, _f;
   const context = (0, import_useEngineContext.default)();
   const [modalContent, setModalContent] = (0, import_react.useState)({
     open: false,
@@ -169,14 +169,25 @@ var header = ({ state, dispatch }) => {
       )
     );
   }, [(_c = state.service) == null ? void 0 : _c.value]);
-  const isPaymentProcessingPayments = (0, import_react.useMemo)(() => {
+  const paymentProcessingPayment = (type) => {
     var _a2;
-    return !!((_a2 = state.bookingDetail) == null ? void 0 : _a2.payment_processing_payment_nums);
-  }, [(_e = (_d = state.bookingDetail) == null ? void 0 : _d.payment_processing_payments) == null ? void 0 : _e.length]);
+    const payments = ((_a2 = state == null ? void 0 : state.bookingDetail) == null ? void 0 : _a2.payments) || [];
+    const status = ["payment_processing"];
+    const payment_method = ["BANK_DEPOSIT"];
+    if (type === "bank") {
+      return !!(payments == null ? void 0 : payments.find(
+        (item) => status.includes(item == null ? void 0 : item.status) && payment_method.includes(item == null ? void 0 : item.payment_method)
+      ));
+    }
+    return !!(payments == null ? void 0 : payments.find((item) => status.includes(item == null ? void 0 : item.status)));
+  };
   const handleCancel = () => {
-    if (isPaymentProcessingPayments) {
+    if (paymentProcessingPayment("bank")) {
       return showPaymentModal();
     }
+    if (paymentProcessingPayment()) {
+      return showCancelCalendarModal();
+    }
     return showCancelledModal();
   };
   const handleRefund = () => {
@@ -235,6 +246,40 @@ var header = ({ state, dispatch }) => {
       footer: null
     });
   };
+  const showCancelCalendarModal = () => {
+    setModalContentState({
+      className: "go-payments-modal-wrap",
+      open: true,
+      width: 480,
+      onCancel: () => {
+        setModalContentState({ open: false });
+      },
+      children: /* @__PURE__ */ import_react.default.createElement("div", { className: "go-payments-modal-content" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "go-payments-modal-content-title" }, import_utils.locales.getText("page.booking.text.cancel-booking")), /* @__PURE__ */ import_react.default.createElement("div", { className: "go-payments-modal-content-desc" }, import_utils.locales.getText("page.booking.text.cancel.calendar.msg")), /* @__PURE__ */ import_react.default.createElement("div", { className: "go-payments-footer" }, /* @__PURE__ */ import_react.default.createElement(
+        import_antd.Button,
+        {
+          className: "go-payments-footer-btn",
+          size: "large",
+          onClick: () => {
+            setModalContentState({ open: false });
+          }
+        },
+        import_utils.locales.getText("page.booking.text.go-back")
+      ), /* @__PURE__ */ import_react.default.createElement(
+        import_antd.Button,
+        {
+          className: "go-payments-footer-btn",
+          type: "primary",
+          size: "large",
+          onClick: () => {
+            setBookingStatus("cancelled");
+            setModalContentState({ open: false });
+          }
+        },
+        import_utils.locales.getText("page.booking.text.cancel-booking")
+      ))),
+      footer: null
+    });
+  };
   const showCancelledModal = () => {
     const cancelBtn = /* @__PURE__ */ import_react.default.createElement(
       import_antd.Button,
@@ -316,8 +361,8 @@ var header = ({ state, dispatch }) => {
       className: "booking-header",
       style: { backgroundColor: currentStatus.color }
     },
-    /* @__PURE__ */ import_react.default.createElement("div", { className: "booking-order-sales-channel" }, orderSalesChannel[(_f = state.bookingDetail) == null ? void 0 : _f.order_sales_channel] || ""),
-    /* @__PURE__ */ import_react.default.createElement("div", { className: "booking-header-line-2" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "booking-header-left" }, import_utils.locales.getText("pisell2.text.status.booking_id"), ":", " ", ((_h = (_g = state.bookingDetail) == null ? void 0 : _g.bookings) == null ? void 0 : _h.booking_id) || "-"), /* @__PURE__ */ import_react.default.createElement("div", { className: "booking-header-right" }, /* @__PURE__ */ import_react.default.createElement(
+    /* @__PURE__ */ import_react.default.createElement("div", { className: "booking-order-sales-channel" }, orderSalesChannel[(_d = state.bookingDetail) == null ? void 0 : _d.order_sales_channel] || ""),
+    /* @__PURE__ */ import_react.default.createElement("div", { className: "booking-header-line-2" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "booking-header-left" }, import_utils.locales.getText("pisell2.text.status.booking_id"), ":", " ", ((_f = (_e = state.bookingDetail) == null ? void 0 : _e.bookings) == null ? void 0 : _f.booking_id) || "-"), /* @__PURE__ */ import_react.default.createElement("div", { className: "booking-header-right" }, /* @__PURE__ */ import_react.default.createElement(
       import_antd.Dropdown,
       {
         menu: { items, onClick: onSelect },

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

@@ -181,6 +181,7 @@ declare const _default: {
         'page.event.booking.text.duplicate-enrollment-confirm': string;
         'page.booking.text.unconfirmed-payments': string;
         'page.booking.text.unconfirmed-payments.msg': string;
+        'page.booking.text.cancel.calendar.msg': string;
         'page.booking.text.go-to-payments': string;
         'page.booking.text.cancel-only': string;
         'page.booking.text.refund': string;
@@ -376,6 +377,7 @@ declare const _default: {
         'page.event.booking.text.duplicate-enrollment-confirm': string;
         'page.booking.text.unconfirmed-payments': string;
         'page.booking.text.unconfirmed-payments.msg': string;
+        'page.booking.text.cancel.calendar.msg': string;
         'page.booking.text.go-to-payments': string;
         'page.booking.text.cancel-only': string;
         'page.booking.text.refund': string;
@@ -571,6 +573,7 @@ declare const _default: {
         'page.event.booking.text.duplicate-enrollment-confirm': string;
         'page.booking.text.unconfirmed-payments': string;
         'page.booking.text.unconfirmed-payments.msg': string;
+        'page.booking.text.cancel.calendar.msg': string;
         'page.booking.text.go-to-payments': string;
         'page.booking.text.cancel-only': string;
         'page.booking.text.refund': string;

package/lib/components/booking/locales.js

@@ -237,6 +237,7 @@ var locales_default = {
     "page.event.booking.text.duplicate-enrollment-confirm": "Confirm",
     "page.booking.text.unconfirmed-payments": "Unconfirmed payments",
     "page.booking.text.unconfirmed-payments.msg": "There are unconfirmed payments,  please confirm or void the payments first.",
+    "page.booking.text.cancel.calendar.msg": "Are you sure you want to cancel the appointment? This appointment will be removed from the calendar.",
     "page.booking.text.go-to-payments": "Go to payments",
     "page.booking.text.cancel-only": "Cancel only",
     "page.booking.text.refund": "Refund",
@@ -458,6 +459,7 @@ var locales_default = {
     "page.event.booking.text.duplicate-enrollment-confirm": "确认",
     "page.booking.text.unconfirmed-payments": "未确认的付款",
     "page.booking.text.unconfirmed-payments.msg": "存在未确认的付款，请先确认收款或作废。",
+    "page.booking.text.cancel.calendar.msg": "确定要取消预约吗？此预约将从日历中移除。",
     "page.booking.text.go-to-payments": "前往收款界面",
     "page.booking.text.cancel-only": "仅取消",
     "page.booking.text.refund": "退款",
@@ -679,6 +681,7 @@ var locales_default = {
     "page.event.booking.text.duplicate-enrollment-confirm": "確認",
     "page.booking.text.unconfirmed-payments": "未確認的付款",
     "page.booking.text.unconfirmed-payments.msg": "存在未確認的付款，請先確認收款或作廢。",
+    "page.booking.text.cancel.calendar.msg": "確定要取消預約嗎？此預約將從日曆中移除。",
     "page.booking.text.go-to-payments": "前往收款界面",
     "page.booking.text.cancel-only": "僅取消",
     "page.booking.text.refund": "退款",

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

@@ -0,0 +1,3 @@
+import React from 'react';
+declare const _default: ({ input, ...formItemProps }: any) => React.JSX.Element;
+export default _default;

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

@@ -0,0 +1,70 @@
+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/eftpos/deviceList/index.tsx
+var deviceList_exports = {};
+__export(deviceList_exports, {
+  default: () => deviceList_default
+});
+module.exports = __toCommonJS(deviceList_exports);
+var import_react = __toESM(require("react"));
+var import_antd = require("antd");
+var import_group = require("../group");
+var DeviceList = (props) => {
+  const [form] = import_antd.Form.useForm();
+  const { list, onChange } = props;
+  console.log(list);
+  const onValuesChange = () => {
+    const val = Object.values(form.getFieldsValue()).flat();
+    onChange(val);
+  };
+  const initialValues = (0, import_react.useMemo)(() => {
+    return list.reduce((target, item) => {
+      var _a, _b;
+      return {
+        ...target,
+        [item.name]: ((_a = item == null ? void 0 : item.input) == null ? void 0 : _a.value) || ((_b = item == null ? void 0 : item.input) == null ? void 0 : _b.defaultValue)
+      };
+    }, {});
+  }, [list]);
+  return /* @__PURE__ */ import_react.default.createElement(
+    import_antd.Form,
+    {
+      layout: "vertical",
+      onValuesChange,
+      form,
+      initialValues
+    },
+    list.map(({ input, ...formItemProps }) => {
+      return /* @__PURE__ */ import_react.default.createElement(import_antd.Form.Item, { ...formItemProps }, /* @__PURE__ */ import_react.default.createElement(import_group.CheckboxGroup, { ...input }));
+    })
+  );
+};
+var deviceList_default = ({ input, ...formItemProps }) => {
+  return /* @__PURE__ */ import_react.default.createElement(import_antd.Form.Item, { ...formItemProps }, /* @__PURE__ */ import_react.default.createElement(DeviceList, { ...input }));
+};

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

@@ -35,44 +35,16 @@ __export(form_exports, {
 module.exports = __toCommonJS(form_exports);
 var import_react = __toESM(require("react"));
 var import_antd = require("antd");
+var import_group = require("../group");
 var import_surcharge = __toESM(require("../surcharge"));
+var import_deviceList = __toESM(require("../deviceList"));
 var Mapping = {
   Input: import_antd.Input,
   InputNumber: import_antd.InputNumber,
   Checkbox: import_antd.Checkbox,
-  "Checkbox.Group": ({
-    direction,
-    options,
-    ...props
-  }) => {
-    if (direction === "vertical") {
-      return /* @__PURE__ */ import_react.default.createElement(import_antd.Checkbox.Group, { ...props }, /* @__PURE__ */ import_react.default.createElement(import_antd.Space, { direction }, options == null ? void 0 : options.map((item) => {
-        if (typeof item === "object") {
-          const { label, value, ...other } = item;
-          return /* @__PURE__ */ import_react.default.createElement(import_antd.Checkbox, { ...other, value, key: `${item.value}` }, label);
-        }
-        return /* @__PURE__ */ import_react.default.createElement(import_antd.Checkbox, { value: item, key: `${item}` }, item);
-      })));
-    }
-    return /* @__PURE__ */ import_react.default.createElement(import_antd.Checkbox.Group, { ...props, options });
-  },
+  "Checkbox.Group": import_group.CheckboxGroup,
   Radio: import_antd.Radio,
-  "Radio.Group": ({
-    direction,
-    options,
-    ...props
-  }) => {
-    if (direction === "vertical") {
-      return /* @__PURE__ */ import_react.default.createElement(import_antd.Radio.Group, { ...props }, /* @__PURE__ */ import_react.default.createElement(import_antd.Space, { direction: "vertical" }, options == null ? void 0 : options.map((item) => {
-        if (typeof item === "object") {
-          const { label, value, ...other } = item;
-          return /* @__PURE__ */ import_react.default.createElement(import_antd.Radio, { ...other, value, key: `${item.value}` }, label);
-        }
-        return /* @__PURE__ */ import_react.default.createElement(import_antd.Radio, { value: item, key: `${item}` }, item);
-      })));
-    }
-    return /* @__PURE__ */ import_react.default.createElement(import_antd.Radio.Group, { ...props, options });
-  },
+  "Radio.Group": import_group.RadioGroup,
   "Radio.Button": import_antd.Radio.Button,
   Cascader: import_antd.Cascader,
   DatePicker: import_antd.DatePicker,
@@ -85,7 +57,8 @@ var Mapping = {
   Upload: import_antd.Upload
 };
 var CustomMapping = {
-  Surcharge: import_surcharge.default
+  Surcharge: import_surcharge.default,
+  DeviceList: import_deviceList.default
 };
 var CustomFormItem = ({
   formItemList,

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

@@ -0,0 +1,7 @@
+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 & {
+    direction?: "vertical" | undefined;
+    component: string;
+}) => React.JSX.Element;

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

@@ -0,0 +1,75 @@
+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/eftpos/group/index.tsx
+var group_exports = {};
+__export(group_exports, {
+  CheckboxGroup: () => CheckboxGroup,
+  RadioGroup: () => RadioGroup
+});
+module.exports = __toCommonJS(group_exports);
+var import_react = __toESM(require("react"));
+var import_antd = require("antd");
+var CheckboxGroup = ({
+  direction,
+  options,
+  ...props
+}) => {
+  if (direction === "vertical") {
+    return /* @__PURE__ */ import_react.default.createElement(import_antd.Checkbox.Group, { ...props }, /* @__PURE__ */ import_react.default.createElement(import_antd.Space, { direction }, options == null ? void 0 : options.map((item) => {
+      if (typeof item === "object") {
+        const { label, value, ...other } = item;
+        return /* @__PURE__ */ import_react.default.createElement(import_antd.Checkbox, { ...other, value, key: `${item.value}` }, label);
+      }
+      return /* @__PURE__ */ import_react.default.createElement(import_antd.Checkbox, { value: item, key: `${item}` }, item);
+    })));
+  }
+  return /* @__PURE__ */ import_react.default.createElement(import_antd.Checkbox.Group, { ...props, options });
+};
+var RadioGroup = ({
+  direction,
+  options,
+  component,
+  ...props
+}) => {
+  if (direction === "vertical") {
+    return /* @__PURE__ */ import_react.default.createElement(import_antd.Radio.Group, { ...props }, /* @__PURE__ */ import_react.default.createElement(import_antd.Space, { direction: "vertical" }, options == null ? void 0 : options.map((item) => {
+      if (typeof item === "object") {
+        const { label, value, ...other } = item;
+        return /* @__PURE__ */ import_react.default.createElement(import_antd.Radio, { ...other, value, key: `${item.value}` }, label);
+      }
+      return /* @__PURE__ */ import_react.default.createElement(import_antd.Radio, { value: item, key: `${item}` }, item);
+    })));
+  }
+  return /* @__PURE__ */ import_react.default.createElement(import_antd.Radio.Group, { ...props, options });
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  CheckboxGroup,
+  RadioGroup
+});

package/lib/components/eftposPay/component/manual/index.js

@@ -45,11 +45,11 @@ var manual_default = ({ onChange, className = "", formatAmount }) => {
   const dispatch = (0, import_store.useDispatch)();
   const { symbol, manual, order_id, mode, device, number, pay, amount } = (0, import_store.useContextData)();
   const start = (0, import_react.useMemo)(() => {
-    if (typeof (manual == null ? void 0 : manual.money) === "number") {
-      return manual == null ? void 0 : manual.money;
+    if (typeof (manual == null ? void 0 : manual.money) === "number" || typeof (manual == null ? void 0 : manual.money) === "string") {
+      return Number(manual == null ? void 0 : manual.money);
     }
-    if (typeof (pay == null ? void 0 : pay.total) === "number") {
-      return pay == null ? void 0 : pay.total;
+    if (typeof (pay == null ? void 0 : pay.total) === "number" || typeof (pay == null ? void 0 : pay.total) === "string") {
+      return Number(pay == null ? void 0 : pay.total);
     }
     return amount;
   }, [manual == null ? void 0 : manual.money, pay == null ? void 0 : pay.total, amount]);
@@ -61,17 +61,6 @@ var manual_default = ({ onChange, className = "", formatAmount }) => {
     if (disabled) {
       return;
     }
-    if (mode === import_const.ModeEnum.Pay) {
-      setDisabled(true);
-      const obj = pay || {};
-      onChange("success", {
-        ...obj,
-        number,
-        device,
-        order_id
-      });
-      return;
-    }
     if (mode === import_const.ModeEnum.Refund) {
       setDisabled(true);
       onChange("success", {

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

@@ -1,4 +1,5 @@
 import { State } from './store';
+import { Amount } from './const';
 export declare function getUuid(): string;
 /**
  * @title: Promise化 setTimeout
@@ -54,4 +55,12 @@ export declare const getPayParams: (data: Partial<Omit<State, key>> & Pick<State
     device?: undefined;
 };
 export declare const limitDecimals: (value: any) => any;
+/**
+ * @title:  通用获取 金额信息
+ * @description: 在 amount 页面设置则使用 pay ,如果有 setting 则使用 setting 信息 ,都没有则设置0
+ * @param {State} store : 全局store数据管理
+ * @Author: hongbing.wang
+ * @Date: 2024-08-12 10:24
+ */
+export declare function getAmonunt(store: State): Amount;
 export {};

package/lib/components/eftposPay/helper.js

@@ -20,6 +20,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var helper_exports = {};
 __export(helper_exports, {
   cloneDeep: () => cloneDeep,
+  getAmonunt: () => getAmonunt,
   getPayParams: () => getPayParams,
   getUuid: () => getUuid,
   limitDecimals: () => limitDecimals,
@@ -116,9 +117,57 @@ var limitDecimals = (value) => {
   }
   return "";
 };
+function getAmonunt(store) {
+  const { device, pay, custom, name, symbol, amount } = store;
+  if (!device || !custom) {
+    throw Error("device or custom is not defined");
+  }
+  const setting = device.setting;
+  if (pay) {
+    return {
+      name,
+      symbol,
+      // format,
+      money: Number(amount),
+      amount: Number(pay.amount),
+      surRate: Number(pay.surRate),
+      surMoney: Number(pay.surMoney),
+      surcharge: (setting == null ? void 0 : setting.surcharge) || false,
+      useOriginSurcharge: (pay == null ? void 0 : pay.useOriginSurcharge) || false
+    };
+  }
+  if (!setting) {
+    return {
+      name,
+      symbol,
+      // format,
+      money: Number(amount),
+      amount: Number(amount),
+      surRate: 0,
+      surMoney: 0,
+      surcharge: false,
+      useOriginSurcharge: false
+    };
+  }
+  const useOriginSurcharge = setting.useOriginSurcharge || false;
+  const surRate = setting.constant_rate || 0;
+  const surMoney = setting.constant_money || 0;
+  const surcharge = setting.surcharge;
+  return {
+    name,
+    symbol,
+    money: Number(amount),
+    amount: Number(amount),
+    surRate: useOriginSurcharge ? 0 : surcharge ? surRate : 0,
+    surMoney: useOriginSurcharge ? 0 : surcharge ? surMoney : 0,
+    surcharge,
+    useOriginSurcharge
+  };
+}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   cloneDeep,
+  getAmonunt,
   getPayParams,
   getUuid,
   limitDecimals,

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

@@ -1,6 +1,6 @@
 import { State } from './store';
+export { getAmonunt } from './helper';
 export { default as Payo } from './payo';
 export { default as Windcave } from './windcave/windcave';
 export { default as Tyro } from './tyro';
 export declare const getInitState: (type: string, params?: any) => State;
-export declare const getAmonunt: (store: State) => import("./const").Amount;