@pisell/private-materials 3.0.203 → 3.0.205

package/es/components/eftposPay/tip.js

@@ -0,0 +1,177 @@
+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 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 _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
+function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+/* eslint-disable no-nested-ternary */
+import { locales } from '@pisell/utils';
+import { Button } from 'antd';
+import React, { useEffect, useRef, useState } from 'react';
+import { getPayParams } from "./helper";
+import { RestoreEumn, EftposEnum } from "./const";
+import dayjs from 'dayjs';
+import { useDispatch, useContextData, updateState, updateCustom, updateNextStep } from "./store";
+import { useStoreRef } from "./hooks";
+import "./tip.less";
+function formatDateUtils(date, format) {
+  if (!date) {
+    return date;
+  }
+  if (date.includes('undefined')) {
+    return '';
+  }
+  var lang = localStorage.getItem('umi_locale') || 'en-US';
+  var _format = format || ['HH:mm:ss DD/MM/YYYY', 'YYYY年MM月DD日 HH:mm:ss'];
+  var type = lang === 'en-US' || lang === 'en' ? _format[0] : _format[1];
+  return dayjs(date).locale(lang).format(type);
+}
+
+/**
+ * @title: 支付状态未知页面
+ * @description:
+ * @Author: hongbing.wang
+ * @Date: 2024-08-20 11:42
+ */
+export default (function (_ref) {
+  var onChangeStatus = _ref.onChangeStatus,
+    _ref$className = _ref.className,
+    className = _ref$className === void 0 ? '' : _ref$className,
+    formatAmount = _ref.formatAmount,
+    cardSurcharge = _ref.cardSurcharge,
+    receipts = _ref.receipts,
+    successTime = _ref.successTime,
+    onChangeParams = _ref.onChangeParams;
+  var _useState = useState(true),
+    _useState2 = _slicedToArray(_useState, 2),
+    disabled = _useState2[0],
+    setDisabled = _useState2[1];
+  var _useState3 = useState(''),
+    _useState4 = _slicedToArray(_useState3, 2),
+    amount = _useState4[0],
+    setAmount = _useState4[1];
+  var _useState5 = useState(''),
+    _useState6 = _slicedToArray(_useState5, 2),
+    surcharge = _useState6[0],
+    setSurcharge = _useState6[1];
+  var _useState7 = useState(''),
+    _useState8 = _slicedToArray(_useState7, 2),
+    surMoney = _useState8[0],
+    setSurMoney = _useState8[1];
+  var _useState9 = useState(''),
+    _useState10 = _slicedToArray(_useState9, 2),
+    rate = _useState10[0],
+    setRate = _useState10[1];
+  var _useState11 = useState(''),
+    _useState12 = _slicedToArray(_useState11, 2),
+    total = _useState12[0],
+    setTotal = _useState12[1];
+  var _useState13 = useState(''),
+    _useState14 = _slicedToArray(_useState13, 2),
+    time = _useState14[0],
+    setTime = _useState14[1];
+  var data = useContextData();
+  var symbol = data.symbol,
+    custom = data.custom;
+  var ref = useRef();
+  var dispatch = useDispatch();
+  var listRef = useRef(custom === null || custom === void 0 ? void 0 : custom.list);
+  var _useStoreRef = useStoreRef(),
+    deviceRef = _useStoreRef.deviceRef,
+    payRef = _useStoreRef.payRef,
+    numRef = _useStoreRef.numRef,
+    orderIdRef = _useStoreRef.orderIdRef,
+    modeRef = _useStoreRef.modeRef,
+    amountRef = _useStoreRef.amountRef,
+    eftposRef = _useStoreRef.eftposRef;
+  var onConfirm = function onConfirm() {
+    onChangeStatus('success', _objectSpread({}, ref.current || {}));
+  };
+
+  /**
+   * @title: 手动标记
+   * @description: 前往手动标记
+   * @Author: hongbing.wang
+   * @Date: 2024-08-20 11:31
+   */
+  useEffect(function () {
+    // 将所有步骤状态设为完成 resolve
+    if (eftposRef.current === EftposEnum.Payo) {
+      dispatch(updateNextStep());
+      dispatch(updateCustom({
+        card_reader_surcharge: cardSurcharge || 0,
+        receipt: receipts
+      }));
+    } else if (eftposRef.current === EftposEnum.Windcave) {
+      dispatch(updateCustom({
+        list: listRef.current.map(function (item) {
+          return _objectSpread(_objectSpread({}, item), {}, {
+            status: 'resolve'
+          });
+        }),
+        card_reader_surcharge: cardSurcharge || 0,
+        receipt: receipts
+      }));
+    }
+    var params = getPayParams({
+      mode: modeRef.current,
+      amount: amountRef.current,
+      order_id: orderIdRef.current,
+      number: numRef.current,
+      device: deviceRef.current,
+      pay: payRef.current,
+      custom: {
+        card_reader_surcharge: cardSurcharge,
+        receipt: receipts
+      }
+    }, 'success');
+    ref.current = params;
+    setAmount("".concat((params === null || params === void 0 ? void 0 : params.amount) || ''));
+    setSurcharge("".concat((params === null || params === void 0 ? void 0 : params.surcharge) || ''));
+    setSurMoney("".concat((params === null || params === void 0 ? void 0 : params.surMoney) || ''));
+    setRate("".concat((params === null || params === void 0 ? void 0 : params.surRate) || ''));
+    setTotal("".concat((params === null || params === void 0 ? void 0 : params.total) || ''));
+    setTime(formatDateUtils(successTime));
+    setDisabled(false);
+
+    // 更新支付状态与文案
+    dispatch(updateState({
+      status: 'success',
+      title: locales.getText('page.eftpos-pay.text.successful')(modeRef.current)
+    }));
+  }, []);
+  useEffect(function () {
+    onChangeParams && onChangeParams(_objectSpread(_objectSpread({}, data), {}, {
+      form: RestoreEumn.Restore
+    }));
+  }, [data, onChangeParams]);
+  return /*#__PURE__*/React.createElement("div", {
+    className: "pisell-lowcode__eft-pay-box ".concat(className)
+  }, /*#__PURE__*/React.createElement("div", {
+    className: "pisell-lowcode__eft-pay-fail-title"
+  }, locales.getText('page.eftpos-pay.text.latest.success')), /*#__PURE__*/React.createElement("div", {
+    className: "pisell-lowcode__eft-pay-body pisell-lowcode__eft-pay-tip-body"
+  }, /*#__PURE__*/React.createElement("div", {
+    className: "pisell-lowcode__eft-pay-tip-text"
+  }, locales.getText('page.eftpos-pay.text.latest.amount'), ":", ' ', formatAmount("".concat(amount), 2, symbol)), /*#__PURE__*/React.createElement("div", {
+    className: "pisell-lowcode__eft-pay-tip-text"
+  }, locales.getText('page.eftpos-pay.text.latest.surcharge'), ":", ' ', formatAmount("".concat(surcharge), 2, symbol), " (", rate, "% +", ' ', formatAmount("".concat(surMoney), 2, symbol), ")"), /*#__PURE__*/React.createElement("div", {
+    className: "pisell-lowcode__eft-pay-tip-text"
+  }, locales.getText('page.eftpos-pay.text.surcharge.edit.actual.pay'), ":", ' ', formatAmount("".concat(total), 2, symbol)), /*#__PURE__*/React.createElement("div", {
+    className: "pisell-lowcode__eft-pay-tip-text"
+  }, locales.getText('page.eftpos-pay.text.latest.time'), ": ", time)), /*#__PURE__*/React.createElement("div", {
+    className: "pisell-lowcode__eft-pay-step-item-btns"
+  }, /*#__PURE__*/React.createElement(Button, {
+    disabled: disabled,
+    block: true,
+    className: "pisell-lowcode__eft-pay-step-item-btn",
+    type: "primary",
+    onClick: onConfirm
+  }, locales.getText('page.eftpos-pay.text.latest.confirm'))));
+});

package/es/components/eftposPay/tip.less

@@ -0,0 +1,9 @@
+.pisell-lowcode__eft-pay-tip-body{
+    display: flex;
+    flex-direction: column;
+    gap: 16px;
+    margin: 20px 0 0 0;
+}
+.pisell-lowcode__eft-pay-tip-text{
+    color: var(--Gray-700, #344054);
+}

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

@@ -9,6 +9,6 @@
  * @Date: 2024-08-19 18:36
  */
 export declare const useTyro: (params: {
-    url?: string;
-    version?: string;
+    url?: string | undefined;
+    version?: string | undefined;
 }) => readonly [import("react").MutableRefObject<any>, boolean];

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

@@ -21,7 +21,7 @@ import { Button } from 'antd';
 import { useDispatch, useContextData, updateState, updateCustom, updateComponent } from "../store";
 import { ModeEnum, ClientEnum } from "../const";
 import { Decimal } from 'decimal.js';
-import { getUuid, getPayParams } from "../helper";
+import { getUuid, getPayParams, getBrowserVersion } from "../helper";
 import Step from "../component/step/step";
 import { useStoreRef } from "../hooks";
 var Minute = 1000 * 60;
@@ -68,6 +68,22 @@ export default (function (_ref) {
   var requestIdRef = useRef((custom === null || custom === void 0 ? void 0 : custom.requestId) || '');
   var unloadRef = useRef(false);
   var clearRef = useRef();
+  var isPrint = function isPrint(key) {
+    var _deviceRef$current, _deviceRef$current$se, _deviceRef$current2, _deviceRef$current2$s;
+    if ((_deviceRef$current = deviceRef.current) !== null && _deviceRef$current !== void 0 && (_deviceRef$current$se = _deviceRef$current.setting) !== null && _deviceRef$current$se !== void 0 && _deviceRef$current$se.receipts) {
+      return false;
+    }
+    var receiptList = (_deviceRef$current2 = deviceRef.current) === null || _deviceRef$current2 === void 0 ? void 0 : (_deviceRef$current2$s = _deviceRef$current2.setting) === null || _deviceRef$current2$s === void 0 ? void 0 : _deviceRef$current2$s.receiptList;
+    if (!Array.isArray(receiptList)) {
+      return true;
+    }
+    if (Array.isArray(receiptList) && receiptList.some(function (item) {
+      return item === key;
+    })) {
+      return true;
+    }
+    return false;
+  };
   useEffect(function () {
     listRef.current = (custom === null || custom === void 0 ? void 0 : custom.list) || [];
   }, [custom === null || custom === void 0 ? void 0 : custom.list]);
@@ -117,7 +133,7 @@ export default (function (_ref) {
    * @Date: 2024-08-19 11:32
    */
   var refundOrder = function refundOrder() {
-    var _deviceRef$current, _deviceRef$current$se, _deviceRef$current2;
+    var _deviceRef$current3, _deviceRef$current3$s, _deviceRef$current4;
     var iClient = iClientRef.current;
     if (!iClient) {
       return;
@@ -135,12 +151,16 @@ export default (function (_ref) {
     }));
     requestParams.current = {
       amount: new Decimal(amountRef.current || 0).mul(100).toFixed(0, Decimal.ROUND_HALF_UP),
-      // 打印小票 true 打印到系统上 false 打印到pos机上
-      integratedReceipt: !((_deviceRef$current = deviceRef.current) !== null && _deviceRef$current !== void 0 && (_deviceRef$current$se = _deviceRef$current.setting) !== null && _deviceRef$current$se !== void 0 && _deviceRef$current$se.receipts),
+      // 打印小票 true 打印到Pisell系统上 false 打印到pos机上
+      integratedReceipt: !((_deviceRef$current3 = deviceRef.current) !== null && _deviceRef$current3 !== void 0 && (_deviceRef$current3$s = _deviceRef$current3.setting) !== null && _deviceRef$current3$s !== void 0 && _deviceRef$current3$s.receipts),
       integrationKey: integrationKey,
       transactionId: numRef.current,
       mid: mid,
-      tid: tid
+      tid: tid,
+      device: JSON.stringify(deviceRef.current),
+      isPrintMerchant: isPrint('merchant'),
+      isPrintCustomer: isPrint('customer'),
+      browserVersion: getBrowserVersion()
     };
     dispatch(updateCustom({
       requestParams: requestParams.current
@@ -151,7 +171,7 @@ export default (function (_ref) {
     api.addTransaction({
       order_id: orderIdRef.current,
       number: numRef.current,
-      card_reader_id: (_deviceRef$current2 = deviceRef.current) === null || _deviceRef$current2 === void 0 ? void 0 : _deviceRef$current2.id,
+      card_reader_id: (_deviceRef$current4 = deviceRef.current) === null || _deviceRef$current4 === void 0 ? void 0 : _deviceRef$current4.id,
       card_reader_type: eftpos,
       amount: requestParams.current.amount,
       action: modeRef.current === ModeEnum.FullPay ? ModeEnum.Pay : modeRef.current,
@@ -183,7 +203,7 @@ export default (function (_ref) {
    * @Date: 2024-08-19 11:33
    */
   var payOrder = function payOrder() {
-    var _deviceRef$current3, _deviceRef$current3$s, _payRef$current, _deviceRef$current4, _deviceRef$current4$s, _deviceRef$current5, _deviceRef$current5$s, _deviceRef$current6;
+    var _deviceRef$current5, _deviceRef$current5$s, _payRef$current, _deviceRef$current6, _deviceRef$current6$s, _deviceRef$current7, _deviceRef$current7$s, _deviceRef$current8;
     var iClient = iClientRef.current;
     if (!iClient) {
       return;
@@ -199,18 +219,22 @@ export default (function (_ref) {
     dispatch(updateState({
       number: numRef.current
     }));
-    console.log('deviceRef.current?.settings?.useOriginSurcharge = ', (_deviceRef$current3 = deviceRef.current) === null || _deviceRef$current3 === void 0 ? void 0 : (_deviceRef$current3$s = _deviceRef$current3.setting) === null || _deviceRef$current3$s === void 0 ? void 0 : _deviceRef$current3$s.useOriginSurcharge);
+    console.log('deviceRef.current?.settings?.useOriginSurcharge = ', (_deviceRef$current5 = deviceRef.current) === null || _deviceRef$current5 === void 0 ? void 0 : (_deviceRef$current5$s = _deviceRef$current5.setting) === null || _deviceRef$current5$s === void 0 ? void 0 : _deviceRef$current5$s.useOriginSurcharge);
     // (deviceRef.current?.setting as { receipts?: boolean })
     requestParams.current = {
       amount: new Decimal((_payRef$current = payRef.current) === null || _payRef$current === void 0 ? void 0 : _payRef$current.total).mul(100).toFixed(0, Decimal.ROUND_HALF_UP),
       // 手续费 true tyro 手续费, false 系统手续费
-      enableSurcharge: ((_deviceRef$current4 = deviceRef.current) === null || _deviceRef$current4 === void 0 ? void 0 : (_deviceRef$current4$s = _deviceRef$current4.setting) === null || _deviceRef$current4$s === void 0 ? void 0 : _deviceRef$current4$s.useOriginSurcharge) || false,
+      enableSurcharge: ((_deviceRef$current6 = deviceRef.current) === null || _deviceRef$current6 === void 0 ? void 0 : (_deviceRef$current6$s = _deviceRef$current6.setting) === null || _deviceRef$current6$s === void 0 ? void 0 : _deviceRef$current6$s.useOriginSurcharge) || false,
       // 打印小票 true 打印到系统上 false 打印到pos机上
-      integratedReceipt: !((_deviceRef$current5 = deviceRef.current) !== null && _deviceRef$current5 !== void 0 && (_deviceRef$current5$s = _deviceRef$current5.setting) !== null && _deviceRef$current5$s !== void 0 && _deviceRef$current5$s.receipts),
+      integratedReceipt: !((_deviceRef$current7 = deviceRef.current) !== null && _deviceRef$current7 !== void 0 && (_deviceRef$current7$s = _deviceRef$current7.setting) !== null && _deviceRef$current7$s !== void 0 && _deviceRef$current7$s.receipts),
       integrationKey: integrationKey,
       transactionId: numRef.current,
       mid: mid,
-      tid: tid
+      tid: tid,
+      device: JSON.stringify(deviceRef.current),
+      isPrintMerchant: isPrint('merchant'),
+      isPrintCustomer: isPrint('customer'),
+      browserVersion: getBrowserVersion()
     };
     dispatch(updateCustom({
       requestParams: requestParams.current
@@ -221,7 +245,7 @@ export default (function (_ref) {
     api.addTransaction({
       order_id: orderIdRef.current,
       number: numRef.current,
-      card_reader_id: (_deviceRef$current6 = deviceRef.current) === null || _deviceRef$current6 === void 0 ? void 0 : _deviceRef$current6.id,
+      card_reader_id: (_deviceRef$current8 = deviceRef.current) === null || _deviceRef$current8 === void 0 ? void 0 : _deviceRef$current8.id,
       card_reader_type: eftpos,
       amount: requestParams.current.amount,
       action: modeRef.current === ModeEnum.FullPay ? ModeEnum.Pay : modeRef.current,
@@ -284,11 +308,17 @@ export default (function (_ref) {
     var receipt = [merchantReceipt].filter(function (item) {
       return typeof item === 'string';
     }).filter(Boolean);
-    onChange('print', receipt);
     merchantReceiptRef.current = {
       signatureRequired: signatureRequired,
       merchantReceipt: merchantReceipt
     };
+    if (signatureRequired) {
+      onChange('print', receipt);
+      return;
+    }
+    if (isPrint('merchant')) {
+      onChange('print', receipt);
+    }
   };
 
   /**
@@ -373,7 +403,7 @@ export default (function (_ref) {
    * @Date: 2024-08-19 11:35
    */
   var transactionCompleteCallbackImpl = function transactionCompleteCallbackImpl(response) {
-    var _deviceRef$current7;
+    var _deviceRef$current9;
     setStatus(-1);
     setManually(false);
     console.log('Response = ' + JSON.stringify(response), ', Request =  ', JSON.stringify(requestParams.current));
@@ -385,7 +415,7 @@ export default (function (_ref) {
     api.editTransaction(requestIdRef.current, {
       order_id: orderIdRef.current,
       number: numRef.current,
-      card_reader_id: (_deviceRef$current7 = deviceRef.current) === null || _deviceRef$current7 === void 0 ? void 0 : _deviceRef$current7.id,
+      card_reader_id: (_deviceRef$current9 = deviceRef.current) === null || _deviceRef$current9 === void 0 ? void 0 : _deviceRef$current9.id,
       card_reader_type: eftpos,
       amount: requestParams.current.amount,
       action: modeRef.current === ModeEnum.FullPay ? ModeEnum.Pay : modeRef.current,
@@ -410,10 +440,10 @@ export default (function (_ref) {
         subTitle: ''
       }));
       dispatch(updateCustom({
-        card_reader_surcharge: response.surchargeAmount || 0
+        card_reader_surcharge: response.surchargeAmount || 0,
+        receipt: receipt
       }));
       clearRef.current = setTimeout(function () {
-        var _deviceRef$current8;
         var params = getPayParams({
           mode: modeRef.current,
           amount: amountRef.current,
@@ -422,19 +452,22 @@ export default (function (_ref) {
           device: deviceRef.current,
           pay: payRef.current,
           custom: {
-            card_reader_surcharge: response.surchargeAmount || 0
+            card_reader_surcharge: response.surchargeAmount || 0,
+            receipt: receipt
           }
         }, 'success');
         onChange('success', _objectSpread(_objectSpread({}, params), {}, {
-          receipt: (_deviceRef$current8 = deviceRef.current) !== null && _deviceRef$current8 !== void 0 && _deviceRef$current8.setting.receipts ? [] : receipt
+          receipt: isPrint('customer') ? receipt : []
         }));
       }, 1000);
       return;
     } else {
-      var _deviceRef$current9;
-      var current = (_deviceRef$current9 = deviceRef.current) !== null && _deviceRef$current9 !== void 0 && _deviceRef$current9.setting.receipts ? [] : receipt;
+      var _deviceRef$current10;
+      var current = (_deviceRef$current10 = deviceRef.current) !== null && _deviceRef$current10 !== void 0 && _deviceRef$current10.setting.receipts ? [] : receipt;
       if (current.length > 0) {
-        onChange('print', current);
+        if (isPrint('customer')) {
+          onChange('print', receipt);
+        }
       }
     }
     if (response.result === 'UNKNOWN') {

package/es/components/eftposPay/windcave/helper.d.ts

@@ -9,7 +9,7 @@ import XhrTimer from './timer';
  * @Date: 2024-08-12 10:29
  */
 export declare const useFail: () => (res: {
-    code?: `${PayStatus}`;
+    code?: "200" | "4004" | "701000" | "701001" | "701003" | "701004" | "701005" | "701006" | "701007" | "701008" | "701009" | "701010" | undefined;
 }, isMark?: boolean) => void;
 /**
  * @title: 轮询 check 接口

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

@@ -51,7 +51,7 @@ export default (function (_ref) {
     symbolRef = _useStoreRef.symbolRef,
     amountRef = _useStoreRef.amountRef,
     eftposRef = _useStoreRef.eftposRef,
-    clientRef = _useStoreRef.clientRef;
+    dataRef = _useStoreRef.dataRef;
   var dispatch = useDispatch();
   var fail = useFail();
   var failRef = useRef(fail);
@@ -92,6 +92,10 @@ export default (function (_ref) {
    * @Date: 2024-08-12 11:02
    */
   var _useValidate = useValidate(api.check, Minute, function (res) {
+      var receipt = Array.isArray(res === null || res === void 0 ? void 0 : res.receipt) ? res.receipt : [res.receipt];
+      receipt = receipt.filter(function (item) {
+        return typeof item === 'string';
+      }).filter(Boolean);
       // 将所有步骤状态设为完成 resolve
       dispatch(updateCustom({
         list: listRef.current.map(function (item) {
@@ -99,7 +103,8 @@ export default (function (_ref) {
             status: 'resolve'
           });
         }),
-        card_reader_surcharge: (res === null || res === void 0 ? void 0 : res.card_reader_surcharge) || 0
+        card_reader_surcharge: (res === null || res === void 0 ? void 0 : res.card_reader_surcharge) || 0,
+        receipt: receipt
       }));
 
       // 更新支付状态与文案
@@ -117,10 +122,10 @@ export default (function (_ref) {
           device: deviceRef.current,
           pay: payRef.current,
           custom: {
-            card_reader_surcharge: (res === null || res === void 0 ? void 0 : res.card_reader_surcharge) || 0
+            card_reader_surcharge: (res === null || res === void 0 ? void 0 : res.card_reader_surcharge) || 0,
+            receipt: receipt
           }
         }, 'success');
-        var receipt = Array.isArray(res.receipt) ? res.receipt : [res.receipt];
         onChange('success', _objectSpread(_objectSpread({}, params), {}, {
           receipt: (_deviceRef$current = deviceRef.current) !== null && _deviceRef$current !== void 0 && (_deviceRef$current$se = _deviceRef$current.setting) !== null && _deviceRef$current$se !== void 0 && _deviceRef$current$se.receipts ? [] : receipt
         }));
@@ -170,7 +175,10 @@ export default (function (_ref) {
       amount: payRef.current.total,
       card_reader_type: eftposRef.current,
       card_reader_id: (_deviceRef$current2 = deviceRef.current) === null || _deviceRef$current2 === void 0 ? void 0 : _deviceRef$current2.id,
-      number: numRef.current
+      number: numRef.current,
+      pay_param_base64: encodeURIComponent(btoa(encodeURIComponent(JSON.stringify(_objectSpread(_objectSpread({}, dataRef.current), {}, {
+        number: numRef.current
+      })))))
     }, {
       signal: controllerRef.current.signal
     }) : api.refund({
@@ -178,7 +186,10 @@ export default (function (_ref) {
       amount: amountRef.current,
       card_reader_type: eftposRef.current,
       card_reader_id: (_deviceRef$current3 = deviceRef.current) === null || _deviceRef$current3 === void 0 ? void 0 : _deviceRef$current3.id,
-      number: numRef.current
+      number: numRef.current,
+      pay_param_base64: encodeURIComponent(btoa(encodeURIComponent(JSON.stringify(_objectSpread(_objectSpread({}, dataRef.current), {}, {
+        number: numRef.current
+      })))))
     }, {
       signal: controllerRef.current.signal
     });

package/es/components/schedules/index.d.ts

@@ -1,3 +1,3 @@
 import "./index.less";
-declare const Schedules: any;
+declare const Schedules: (props: any) => any;
 export default Schedules;

package/es/components/schedules/model.d.ts

@@ -69,7 +69,7 @@ export interface FormState {
     };
     setGlobalState: Function | null;
 }
-export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
+export declare const Provider: (ComponentUi: any) => (props: any) => any, Context: import("react").Context<{
     state: FormState;
 } & {
     dispatch: (params: {

package/es/index.d.ts

@@ -22,4 +22,3 @@ export { default as Eftpos } from './components/eftpos';
 export { default as EftposPay } from './components/eftposPay';
 export { default as BookingDashboard } from './components/booking/dashboard';
 export { default as PisellSelectCustomerModal } from './components/pisellSelectCustomerModal';
-export { default as ShoppingCart } from './components/shoppingCart';

package/es/index.js

@@ -25,5 +25,4 @@ export { default as ToCPay } from "./components/pay/toC";
 export { default as Eftpos } from "./components/eftpos";
 export { default as EftposPay } from "./components/eftposPay";
 export { default as BookingDashboard } from "./components/booking/dashboard";
-export { default as PisellSelectCustomerModal } from "./components/pisellSelectCustomerModal";
-export { default as ShoppingCart } from "./components/shoppingCart";
+export { default as PisellSelectCustomerModal } from "./components/pisellSelectCustomerModal";

package/lib/components/booking/components/customSelect/index.d.ts

@@ -32,7 +32,6 @@ interface CustomSelectProps {
     autoFocus?: boolean;
     showDropDown?: boolean;
     handleOpenModal?: () => void;
-    handleDayChange?: (value: any) => void;
 }
 declare const _default: React.ForwardRefExoticComponent<CustomSelectProps & React.RefAttributes<unknown>>;
 export default _default;

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

@@ -75,8 +75,7 @@ var CustomSelect = (props, ref) => {
     closeCallback,
     autoFocus,
     showDropDown = true,
-    handleOpenModal: propsHandleOpenModal,
-    handleDayChange
+    handleOpenModal: propsHandleOpenModal
   } = props;
   const searchRef = (0, import_react.useRef)();
   const [_value, set_value] = (0, import_react.useState)([]);
@@ -112,7 +111,7 @@ var CustomSelect = (props, ref) => {
     }
     closeCallback == null ? void 0 : closeCallback();
   };
-  const handleOpenModal = (item) => {
+  const handleOpenModal = () => {
     if (disabled) {
       return;
     }
@@ -146,9 +145,6 @@ var CustomSelect = (props, ref) => {
     handleViewItem == null ? void 0 : handleViewItem(item);
   };
   const handleRemoveItem = (item) => {
-    if (handleDayChange) {
-      handleDayChange(item);
-    }
     let _arr = (0, import_utils.changeArray)(_value, item, rowKey);
     _onValueChange(_arr);
     set_value(_arr);

package/lib/components/booking/components/footer/amount.js

@@ -25,7 +25,6 @@ __export(amount_exports, {
 module.exports = __toCommonJS(amount_exports);
 var import_utils = require("../../utils");
 var import_utils2 = require("@pisell/utils");
-var import_utils3 = require("../../info/service2/utils");
 var getRelationDetailsTotal = (relation_details) => {
   let total = 0;
   for (let item of relation_details) {
@@ -39,45 +38,27 @@ var getProductAmount = (state, isEdit) => {
   var _a, _b;
   let price = 0;
   let duration = 0;
-  const isDay = (0, import_utils3.isDayBooking)(state);
   if (isEdit) {
     if ((state == null ? void 0 : state.service) || (state == null ? void 0 : state.addons)) {
       for (let item of state == null ? void 0 : state.service.value) {
-        if (isDay) {
-          const quantity = item._extend.quantity || 1;
-          price += Number(item._extend.total) * Number(quantity);
-          const _duration = (0, import_utils3.isDayBookingProduct)(item, state) ? item._extend.duration : 0;
-          duration += _duration;
-        } else {
-          price += Number(item._extend.total);
-          price += getRelationDetailsTotal(item._extend.relation_details || []);
-          duration += import_utils.flexibleObj.getValue(item._extend.duration);
-        }
+        price += Number(item._extend.total);
+        price += getRelationDetailsTotal(item._extend.relation_details || []);
+        duration += import_utils.flexibleObj.getValue(item._extend.duration);
       }
-      if (!isDay) {
-        for (let item of state.addons.value) {
-          price += Number(item._extend.total) * item._extend.quantity;
-        }
+      for (let item of state.addons.value) {
+        price += Number(item._extend.total) * item._extend.quantity;
       }
     }
   } else {
     price = Number((_a = state.bookingDetail) == null ? void 0 : _a.product_expect_amount);
-    let services = ((_b = state == null ? void 0 : state.service) == null ? void 0 : _b.value) || [];
-    duration = services.reduce((pre, cur) => {
+    duration = (((_b = state == null ? void 0 : state.service) == null ? void 0 : _b.value) || []).reduce((pre, cur) => {
       var _a2;
-      let current = 0;
-      if (isDay) {
-        const _duration = (0, import_utils3.isDayBookingProduct)(cur, state) ? cur._extend.duration : 0;
-        current = _duration || 0;
-      } else {
-        current = import_utils.flexibleObj.getValue(((_a2 = cur._extend) == null ? void 0 : _a2.duration) || 0);
-      }
-      return pre + current;
+      return pre + import_utils.flexibleObj.getValue(((_a2 = cur._extend) == null ? void 0 : _a2.duration) || 0);
     }, 0);
   }
   return {
     price: Number(price),
-    duration: (0, import_utils.getDiscountTime)(duration, isDay)
+    duration: (0, import_utils.getDiscountTime)(duration)
   };
 };
 var getProductItemTax = (item, bookingDetail) => {