@pisell/private-materials 3.0.186 → 3.0.188

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

@@ -19,7 +19,7 @@ import { useTyro } from "./hooks";
 import { locales } from '@pisell/utils';
 import { Button } from 'antd';
 import { useDispatch, useContextData, updateState, updateCustom, updateComponent } from "../store";
-import { ModeEnum } from "../const";
+import { ModeEnum, ClientEnum } from "../const";
 import { Decimal } from 'decimal.js';
 import { getUuid, getPayParams } from "../helper";
 import Step from "../component/step/step";
@@ -35,7 +35,8 @@ export default (function (_ref) {
     eftpos = _useContextData.eftpos,
     custom = _useContextData.custom,
     mode = _useContextData.mode,
-    payStatus = _useContextData.status;
+    payStatus = _useContextData.status,
+    client = _useContextData.client;
   var dispatch = useDispatch();
   var _useState = useState(-1),
     _useState2 = _slicedToArray(_useState, 2),
@@ -64,11 +65,15 @@ export default (function (_ref) {
   var requestParams = useRef(custom === null || custom === void 0 ? void 0 : custom.requestParams);
   var listRef = useRef((custom === null || custom === void 0 ? void 0 : custom.list) || []);
   var iClientRef = useRef();
+  var requestIdRef = useRef((custom === null || custom === void 0 ? void 0 : custom.requestId) || '');
   var unloadRef = useRef(false);
   var clearRef = useRef();
   useEffect(function () {
     listRef.current = (custom === null || custom === void 0 ? void 0 : custom.list) || [];
   }, [custom === null || custom === void 0 ? void 0 : custom.list]);
+  useEffect(function () {
+    requestIdRef.current = (custom === null || custom === void 0 ? void 0 : custom.requestId) || '';
+  }, [custom === null || custom === void 0 ? void 0 : custom.requestId]);
   useEffect(function () {
     requestParams.current = custom === null || custom === void 0 ? void 0 : custom.requestParams;
   }, [custom === null || custom === void 0 ? void 0 : custom.requestParams]);
@@ -112,7 +117,7 @@ export default (function (_ref) {
    * @Date: 2024-08-19 11:32
    */
   var refundOrder = function refundOrder() {
-    var _deviceRef$current, _deviceRef$current$se;
+    var _deviceRef$current, _deviceRef$current$se, _deviceRef$current2;
     var iClient = iClientRef.current;
     if (!iClient) {
       return;
@@ -142,6 +147,26 @@ export default (function (_ref) {
     }));
     setStatus(Date.now());
     merchantReceiptRef.current = {};
+    // 退款 记录
+    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_type: eftpos,
+      amount: requestParams.current.amount,
+      action: modeRef.current === ModeEnum.FullPay ? ModeEnum.Pay : modeRef.current,
+      status: 'pending',
+      request: requestParams.current,
+      response: {},
+      metadata: {
+        receipt: []
+      }
+    }).then(function (res) {
+      requestIdRef.current = res.data.id;
+      dispatch(updateCustom({
+        requestId: res.data.id
+      }));
+    });
     iClient.initiateRefund(requestParams.current, {
       receiptCallback: receiptCallbackImpl,
       transactionCompleteCallback: transactionCompleteCallbackImpl,
@@ -158,7 +183,7 @@ export default (function (_ref) {
    * @Date: 2024-08-19 11:33
    */
   var payOrder = function payOrder() {
-    var _deviceRef$current2, _deviceRef$current2$s, _payRef$current, _deviceRef$current3, _deviceRef$current3$s, _deviceRef$current4, _deviceRef$current4$s;
+    var _deviceRef$current3, _deviceRef$current3$s, _payRef$current, _deviceRef$current4, _deviceRef$current4$s, _deviceRef$current5, _deviceRef$current5$s, _deviceRef$current6;
     var iClient = iClientRef.current;
     if (!iClient) {
       return;
@@ -174,14 +199,14 @@ export default (function (_ref) {
     dispatch(updateState({
       number: numRef.current
     }));
-    console.log('deviceRef.current?.settings?.useOriginSurcharge = ', (_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.useOriginSurcharge);
+    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);
     // (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$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) || 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,
       // 打印小票 true 打印到系统上 false 打印到pos机上
-      integratedReceipt: !((_deviceRef$current4 = deviceRef.current) !== null && _deviceRef$current4 !== void 0 && (_deviceRef$current4$s = _deviceRef$current4.setting) !== null && _deviceRef$current4$s !== void 0 && _deviceRef$current4$s.receipts),
+      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),
       integrationKey: integrationKey,
       transactionId: numRef.current,
       mid: mid,
@@ -192,6 +217,26 @@ export default (function (_ref) {
     }));
     setStatus(Date.now());
     merchantReceiptRef.current = {};
+    // 支付 记录
+    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_type: eftpos,
+      amount: requestParams.current.amount,
+      action: modeRef.current === ModeEnum.FullPay ? ModeEnum.Pay : modeRef.current,
+      status: 'pending',
+      request: requestParams.current,
+      response: {},
+      metadata: {
+        receipt: []
+      }
+    }).then(function (res) {
+      requestIdRef.current = res.data.id;
+      dispatch(updateCustom({
+        requestId: res.data.id
+      }));
+    });
     iClient.initiatePurchase(requestParams.current, {
       receiptCallback: receiptCallbackImpl,
       transactionCompleteCallback: transactionCompleteCallbackImpl,
@@ -215,6 +260,7 @@ export default (function (_ref) {
     }
     setStatus(Date.now());
     merchantReceiptRef.current = {};
+    // 恢复 记录
     iClient.continueLastTransaction({
       receiptCallback: receiptCallbackImpl,
       transactionCompleteCallback: transactionCompleteCallbackImpl,
@@ -235,12 +281,10 @@ export default (function (_ref) {
       merchantReceipt = _ref3.merchantReceipt;
     console.log('商家小票 客户端是否打印小票 = ', signatureRequired);
     console.log('商家小票 小票内容 = \n', merchantReceipt);
-    // if (signatureRequired) {
     var receipt = [merchantReceipt].filter(function (item) {
       return typeof item === 'string';
     }).filter(Boolean);
     onChange('print', receipt);
-    // }
     merchantReceiptRef.current = {
       signatureRequired: signatureRequired,
       merchantReceipt: merchantReceipt
@@ -329,7 +373,7 @@ export default (function (_ref) {
    * @Date: 2024-08-19 11:35
    */
   var transactionCompleteCallbackImpl = function transactionCompleteCallbackImpl(response) {
-    var _deviceRef$current5;
+    var _deviceRef$current7;
     setStatus(-1);
     setManually(false);
     console.log('Response = ' + JSON.stringify(response), ', Request =  ', JSON.stringify(requestParams.current));
@@ -338,15 +382,15 @@ export default (function (_ref) {
     response === null || response === void 0 ? void 0 : response.customerReceipt].filter(function (item) {
       return typeof item === 'string';
     }).filter(Boolean);
-    api.addTransaction({
+    api.editTransaction(requestIdRef.current, {
       order_id: orderIdRef.current,
       number: numRef.current,
-      card_reader_id: (_deviceRef$current5 = deviceRef.current) === null || _deviceRef$current5 === void 0 ? void 0 : _deviceRef$current5.id,
+      card_reader_id: (_deviceRef$current7 = deviceRef.current) === null || _deviceRef$current7 === void 0 ? void 0 : _deviceRef$current7.id,
       card_reader_type: eftpos,
       amount: requestParams.current.amount,
       action: modeRef.current === ModeEnum.FullPay ? ModeEnum.Pay : modeRef.current,
-      status: response.result === 'APPROVED' ? 'succeed' : 'failed',
       request: requestParams.current,
+      status: response.result === 'APPROVED' ? 'succeed' : 'failed',
       response: _objectSpread(_objectSpread({}, response), {}, {
         merchantReceipt: merchantReceiptRef.current
       }),
@@ -369,7 +413,7 @@ export default (function (_ref) {
         card_reader_surcharge: response.surchargeAmount || 0
       }));
       clearRef.current = setTimeout(function () {
-        var _deviceRef$current6;
+        var _deviceRef$current8;
         var params = getPayParams({
           mode: modeRef.current,
           amount: amountRef.current,
@@ -382,13 +426,13 @@ export default (function (_ref) {
           }
         }, 'success');
         onChange('success', _objectSpread(_objectSpread({}, params), {}, {
-          receipt: (_deviceRef$current6 = deviceRef.current) !== null && _deviceRef$current6 !== void 0 && _deviceRef$current6.setting.receipts ? [] : receipt
+          receipt: (_deviceRef$current8 = deviceRef.current) !== null && _deviceRef$current8 !== void 0 && _deviceRef$current8.setting.receipts ? [] : receipt
         }));
       }, 1000);
       return;
     } else {
-      var _deviceRef$current7;
-      var current = (_deviceRef$current7 = deviceRef.current) !== null && _deviceRef$current7 !== void 0 && _deviceRef$current7.setting.receipts ? [] : receipt;
+      var _deviceRef$current9;
+      var current = (_deviceRef$current9 = deviceRef.current) !== null && _deviceRef$current9 !== void 0 && _deviceRef$current9.setting.receipts ? [] : receipt;
       if (current.length > 0) {
         onChange('print', current);
       }
@@ -447,6 +491,9 @@ export default (function (_ref) {
       }
     }
   }, [load]);
+  var onNotin = function onNotin() {
+    onChange('print', [], 'print_on_timeout');
+  };
   useEffect(function () {
     var clear;
     if (status === -1) {
@@ -485,7 +532,6 @@ export default (function (_ref) {
       }
       console.log('倒计时到了');
       setManually(true);
-      // iClient.cancelCurrentTransaction();
     }, Minute);
     return function () {
       if (clear) {
@@ -559,11 +605,15 @@ export default (function (_ref) {
     });
   })), isManually ? /*#__PURE__*/React.createElement("div", {
     className: "pisell-lowcode__eft-pay-step-item-btns"
-  }, /*#__PURE__*/React.createElement(Button, {
+  }, client === ClientEnum.Merchant ? /*#__PURE__*/React.createElement(Button, {
     block: true,
     className: "pisell-lowcode__eft-pay-step-item-btn",
     onClick: onManually
-  }, locales.getText('page.eftpos-pay.text.manual.marking'))) : null, /*#__PURE__*/React.createElement("div", {
+  }, locales.getText('page.eftpos-pay.text.manual.marking')) : /*#__PURE__*/React.createElement(Button, {
+    block: true,
+    className: "pisell-lowcode__eft-pay-step-item-btn",
+    onClick: onNotin
+  }, locales.getText('page.eftpos-pay.text.manual.print_receipt'))) : null, /*#__PURE__*/React.createElement("div", {
     className: "pisell-lowcode__eft-pay-step-item-btns",
     style: {
       flexWrap: 'wrap'

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

@@ -1,5 +1,5 @@
 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); }
-var _excluded = ["order_id", "name", "symbol", "amount", "mode", "number", "pay", "device", "net"];
+var _excluded = ["order_id", "name", "symbol", "amount", "mode", "number", "pay", "device", "net", "client"];
 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; }
@@ -8,7 +8,7 @@ function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input ==
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 import { locales } from '@pisell/utils';
-import { EftposEnum, StatusEnum, PayRouteEnum, ModeEnum } from "../const";
+import { EftposEnum, StatusEnum, PayRouteEnum, ModeEnum, ClientEnum } from "../const";
 /**
  * @title: 初始化 windcave 数据
  * @return store 全局数据管理
@@ -28,6 +28,7 @@ export default (function (params) {
     pay = _ref.pay,
     device = _ref.device,
     net = _ref.net,
+    client = _ref.client,
     other = _objectWithoutProperties(_ref, _excluded);
   return _objectSpread(_objectSpread(_objectSpread(_objectSpread({
     order_id: order_id,
@@ -45,6 +46,7 @@ export default (function (params) {
     status: StatusEnum.Loading,
     steps: [],
     render: true,
+    client: client !== 'undefined' ? client : ClientEnum.Merchant,
     custom: other ? _objectSpread(_objectSpread({}, other), {}, {
       list: [],
       step: StepStatusEnum.Free

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

@@ -7,7 +7,7 @@ function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input ==
 /* eslint-disable @typescript-eslint/no-unused-expressions */
 import { locales } from '@pisell/utils';
 import { useCallback, useEffect, useRef } from 'react';
-import { StatusEnum, PayStatus } from "../const";
+import { StatusEnum, PayStatus, ClientEnum } from "../const";
 import { useContextData, useDispatch, updateComponent, updateState, updateStatus, updateCustom, updateKey } from "../store";
 import { StepStatusEnum, getStepMapping, StemTypeEnum } from "./const";
 import { useStoreRef } from "../hooks";
@@ -26,7 +26,8 @@ export var useFail = function useFail() {
   var _useContextData = useContextData(),
     custom = _useContextData.custom;
   var _useStoreRef = useStoreRef(),
-    modeRef = _useStoreRef.modeRef;
+    modeRef = _useStoreRef.modeRef,
+    clientRef = _useStoreRef.clientRef;
   var ref = useRef((custom === null || custom === void 0 ? void 0 : custom.retry) || 0);
   useEffect(function () {
     ref.current = (custom === null || custom === void 0 ? void 0 : custom.retry) || 0;
@@ -103,6 +104,19 @@ export var useFail = function useFail() {
     }
     if (code === PayStatus.Timeout) {
       if (isMark) {
+        if (clientRef.current === ClientEnum.User) {
+          dispatch(updateCustom({
+            failCustom: {
+              isPosNetworkError: true,
+              status: 'warn',
+              fail: null,
+              title: locales.getText('page.eftpos-pay.text.timedout.title'),
+              warn: locales.getText('page.eftpos-pay.text.transaction.eftpos.fail.other')
+            }
+          }));
+          dispatch(updateComponent('FailCustom'));
+          return;
+        }
         // 超时 前往标记页
         dispatch(updateState({
           manual: {
@@ -161,33 +175,9 @@ export var useFail = function useFail() {
           status: 'warn',
           fail: null,
           title: locales.getText('page.eftpos-pay.text.interrupted'),
-          warn: "".concat(locales.getText('page.eftpos-pay.text.transaction.eftpos.fail.title'), "\n").concat(locales.getText('page.eftpos-pay.text.transaction.eftpos.fail.power'), "\n ").concat(locales.getText('page.eftpos-pay.text.transaction.eftpos.fail.device'), "\n").concat(locales.getText('page.eftpos-pay.text.transaction.eftpos.fail.network'), "\n").concat(locales.getText('page.eftpos-pay.text.transaction.eftpos.fail.if')(modeRef.current), "\n              ")
-          // warn: (
-          //   <>
-          //     {locales.getText(
-          //       'page.eftpos-pay.text.transaction.eftpos.fail.title'
-          //     )}
-          //     <br />
-          //     {locales.getText(
-          //       'page.eftpos-pay.text.transaction.eftpos.fail.power'
-          //     )}
-          //     . <br />
-          //     {locales.getText(
-          //       'page.eftpos-pay.text.transaction.eftpos.fail.device'
-          //     )}
-          //     <br />
-          //     {locales.getText(
-          //       'page.eftpos-pay.text.transaction.eftpos.fail.network'
-          //     )}
-          //     <br />
-          //     {locales.getText(
-          //       'page.eftpos-pay.text.transaction.eftpos.fail.if'
-          //     )(modeRef.current)}
-          //   </>
-          // ),
+          warn: clientRef.current === ClientEnum.Merchant ? "".concat(locales.getText('page.eftpos-pay.text.transaction.eftpos.fail.title'), "\n").concat(locales.getText('page.eftpos-pay.text.transaction.eftpos.fail.power'), "\n ").concat(locales.getText('page.eftpos-pay.text.transaction.eftpos.fail.device'), "\n").concat(locales.getText('page.eftpos-pay.text.transaction.eftpos.fail.network'), "\n").concat(locales.getText('page.eftpos-pay.text.transaction.eftpos.fail.if')(modeRef.current)) : locales.getText('page.eftpos-pay.text.transaction.eftpos.fail.other')
         }
       }));
-
       dispatch(updateComponent('FailCustom'));
       return;
     }
@@ -260,7 +250,8 @@ export var useValidate = function useValidate(check, num, onChange) {
     netRef = _useStoreRef2.netRef,
     payRef = _useStoreRef2.payRef,
     numRef = _useStoreRef2.numRef,
-    modeRef = _useStoreRef2.modeRef;
+    modeRef = _useStoreRef2.modeRef,
+    clientRef = _useStoreRef2.clientRef;
   var stepRef = useRef(custom === null || custom === void 0 ? void 0 : custom.step);
   var listRef = useRef(custom === null || custom === void 0 ? void 0 : custom.list);
   useEffect(function () {

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

@@ -50,7 +50,8 @@ export default (function (_ref) {
     netRef = _useStoreRef.netRef,
     symbolRef = _useStoreRef.symbolRef,
     amountRef = _useStoreRef.amountRef,
-    eftposRef = _useStoreRef.eftposRef;
+    eftposRef = _useStoreRef.eftposRef,
+    clientRef = _useStoreRef.clientRef;
   var dispatch = useDispatch();
   var fail = useFail();
   var failRef = useRef(fail);

package/es/components/pay/toC/PaymentMethods/MWCreditCard/tds2.js

@@ -186,9 +186,15 @@ export var checkEnrollment = /*#__PURE__*/function () {
           _yield$request$getReq = _context2.sent;
           data = _yield$request$getReq.data;
           setPayNumber(orderId, data === null || data === void 0 ? void 0 : data.pay_number);
+          if (data !== null && data !== void 0 && data.pay_info) {
+            _context2.next = 8;
+            break;
+          }
+          return _context2.abrupt("return", null);
+        case 8:
           return _context2.abrupt("return", data);
-        case 9:
-          _context2.prev = 9;
+        case 11:
+          _context2.prev = 11;
           _context2.t0 = _context2["catch"](0);
           // 记录卡失败的原因
           log({
@@ -208,11 +214,11 @@ export var checkEnrollment = /*#__PURE__*/function () {
           });
           console.log('error', _context2.t0);
           return _context2.abrupt("return", 0);
-        case 17:
+        case 19:
         case "end":
           return _context2.stop();
       }
-    }, _callee2, null, [[0, 9]]);
+    }, _callee2, null, [[0, 11]]);
   }));
   return function checkEnrollment(_x3, _x4, _x5) {
     return _ref3.apply(this, arguments);

package/es/components/pisellSelectCustomerModal/RightPanel/index.js

@@ -80,12 +80,14 @@ var RightPanel = function RightPanel(props) {
     if (page === 'list') {
       return /*#__PURE__*/React.createElement("div", {
         className: "select-customer-right-panel-header"
-      }, /*#__PURE__*/React.createElement("span", null, phone ? locales.getText('pisell2.text.result-found') : locales.getText('pisell2.text.personnel-list')), /*#__PURE__*/React.createElement(PlusCircle, {
-        className: "select-customer-right-panel-header-icon",
+      }, /*#__PURE__*/React.createElement("span", null, phone ? locales.getText('pisell2.text.result-found') : locales.getText('pisell2.text.personnel-list')), /*#__PURE__*/React.createElement("span", {
+        className: "select-customer-right-panel-header-create-btn",
         onClick: function onClick() {
           setPage('create');
         }
-      }));
+      }, /*#__PURE__*/React.createElement(PlusCircle, {
+        className: "select-customer-right-panel-header-icon"
+      }), locales.getText('pisell2.text.create')));
     }
     return /*#__PURE__*/React.createElement("div", {
       className: classNames('select-customer-right-panel-header', {

package/es/components/pisellSelectCustomerModal/RightPanel/index.less

@@ -25,6 +25,13 @@
       justify-content: flex-start;
     }
 
+    .select-customer-right-panel-header-create-btn {
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      cursor: pointer;
+    }
+
     .select-customer-right-panel-header-icon {
       display: flex;
       align-items: center;

package/es/components/pisellSelectCustomerModal/index.js

@@ -146,6 +146,10 @@ var PisellSelectCustomerModal = function PisellSelectCustomerModal(props) {
 
   // 动态计算input的字体大小
   var adjustFontSize = useMemo(function () {
+    // 没有内容固定位30px,  因为placeholder的字体大小是30px 太大会展示不全
+    if (!phone) {
+      return 30;
+    }
     var maxFontSize = 60; // 最大字体大小
     var minFontSize = 10; // 最小字体大小
     var defaultFontSize = maxFontSize;
@@ -194,10 +198,12 @@ var PisellSelectCustomerModal = function PisellSelectCustomerModal(props) {
         onChange: function onChange(e) {
           setPhone(e.target.value);
         },
+        placeholder: locales.getText('pisell2.text.search-customer-by-phone-number'),
         style: {
           textAlign: 'left',
           fontSize: adjustFontSize
-        }
+        },
+        className: 'pisell-select-customer-modal-input'
       }, virtualKeyInputProps),
       rightPanel: /*#__PURE__*/React.createElement(RightPanel, {
         value: _value,

package/es/components/pisellSelectCustomerModal/index.less

@@ -13,4 +13,10 @@ body {
       display: none;
     }
   }
+}
+
+.pisell-select-customer-modal-input {
+  &::placeholder {
+    font-size: 30px;
+  }
 }

package/es/components/pisellSelectCustomerModal/locales.d.ts

@@ -22,6 +22,8 @@ declare const _default: {
         'pisell2.text.personnel-list': string;
         'pisell2.text.load-more': string;
         'pisell2.text.add-client.confirm': string;
+        'pisell2.text.search-customer-by-phone-number': string;
+        'pisell2.text.create': string;
     };
     'zh-CN': {
         'pisell2.text.leave-empty-for-walk-in': string;
@@ -46,6 +48,8 @@ declare const _default: {
         'pisell2.text.personnel-list': string;
         'pisell2.text.add-client.confirm': string;
         'pisell2.text.load-more': string;
+        'pisell2.text.search-customer-by-phone-number': string;
+        'pisell2.text.create': string;
     };
     'zh-HK': {
         'pisell2.text.leave-empty-for-walk-in': string;
@@ -70,6 +74,8 @@ declare const _default: {
         'pisell2.text.personnel-list': string;
         'pisell2.text.add-client.confirm': string;
         'pisell2.text.load-more': string;
+        'pisell2.text.search-customer-by-phone-number': string;
+        'pisell2.text.create': string;
     };
 };
 export default _default;

package/es/components/pisellSelectCustomerModal/locales.js

@@ -21,7 +21,9 @@ export default {
     'pisell2.text.result-found': 'Result found',
     'pisell2.text.personnel-list': 'Personnel list',
     'pisell2.text.load-more': 'Load more',
-    'pisell2.text.add-client.confirm': 'Fill in at least one name, phone number and email address'
+    'pisell2.text.add-client.confirm': 'Fill in at least one name, phone number and email address',
+    'pisell2.text.search-customer-by-phone-number': 'Search by phone number',
+    'pisell2.text.create': 'Create'
   },
   'zh-CN': {
     'pisell2.text.leave-empty-for-walk-in': '未选择表示 Walk-In',
@@ -45,7 +47,9 @@ export default {
     'pisell2.text.result-found': '搜索结果',
     'pisell2.text.personnel-list': '客户列表',
     'pisell2.text.add-client.confirm': '姓名,电话,邮箱至少填一个',
-    'pisell2.text.load-more': '加载更多'
+    'pisell2.text.load-more': '加载更多',
+    'pisell2.text.search-customer-by-phone-number': '输入手机号搜索客户',
+    'pisell2.text.create': '创建'
   },
   'zh-HK': {
     'pisell2.text.leave-empty-for-walk-in': '未選擇表示 Walk-In',
@@ -69,6 +73,8 @@ export default {
     'pisell2.text.result-found': '搜索結果',
     'pisell2.text.personnel-list': '客戶列表',
     'pisell2.text.add-client.confirm': '姓名，電話，郵箱至少填一個',
-    'pisell2.text.load-more': '加載更多'
+    'pisell2.text.load-more': '加載更多',
+    'pisell2.text.search-customer-by-phone-number': '輸入手機號搜索客戶',
+    'pisell2.text.create': '創建'
   }
 };

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

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

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { CalendarDataItem, ScheduleItem } from "./type";
 import dayjs from "dayjs";
 export interface FormState {
@@ -69,7 +68,7 @@ export interface FormState {
     };
     setGlobalState: Function | null;
 }
-export declare const Provider: (ComponentUi: any) => (props: any) => any, Context: import("react").Context<{
+export declare const Provider: (ComponentUi: any) => (props: any) => JSX.Element, Context: import("react").Context<{
     state: FormState;
 } & {
     dispatch: (params: {

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

@@ -1,6 +1,5 @@
-/// <reference types="react" />
 import { FormState } from "../model";
-export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
+export declare const Provider: (ComponentUi: any) => (props: any) => JSX.Element, Context: import("react").Context<{
     state: FormState;
 } & {
     dispatch: (params: {

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

@@ -1,6 +1,5 @@
-/// <reference types="react" />
 import { FormState } from "../model";
-export declare const Provider: (ComponentUi: any) => (props: any) => any, Context: import("react").Context<{
+export declare const Provider: (ComponentUi: any) => (props: any) => JSX.Element, Context: import("react").Context<{
     state: FormState;
 } & {
     dispatch: (params: {

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

@@ -4,5 +4,5 @@ export interface InfoProps {
     globalState: any;
     setGlobalState: any;
 }
-declare const Notes: (props: any) => any;
+declare const Notes: any;
 export default Notes;

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

@@ -1,6 +1,5 @@
-/// <reference types="react" />
 import { FormState } from "../model";
-export declare const Provider: (ComponentUi: any) => (props: any) => any, Context: import("react").Context<{
+export declare const Provider: (ComponentUi: any) => (props: any) => JSX.Element, Context: import("react").Context<{
     state: FormState;
 } & {
     dispatch: (params: {

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

@@ -1,6 +1,5 @@
-/// <reference types="react" />
 import { FormState } from "../model";
-export declare const Provider: (ComponentUi: any) => (props: any) => any, Context: import("react").Context<{
+export declare const Provider: (ComponentUi: any) => (props: any) => JSX.Element, Context: import("react").Context<{
     state: FormState;
 } & {
     dispatch: (params: {

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

@@ -7,14 +7,15 @@ import { PosProps } from './const';
  * @Author: hongbing.wang
  * @Date: 2024-08-12 11:35
  */
-declare const _default: ({ className, onChange, onClose, formatAmount, isIpad, net, }: {
+declare const _default: ({ className, onChange, onClose, formatAmount, isMobile, net, client }: {
     className?: string | undefined;
     onChange?: ((status: "page" | "success" | "fail", params?: string | {
         [keys: string]: unknown;
-    } | undefined) => void) | undefined;
+    } | undefined, other?: any) => void) | undefined;
     onClose: () => void;
     formatAmount(amount: number | string, precision: number, symbol: string): string;
-    isIpad: boolean;
+    isMobile: boolean;
     net: boolean;
+    client: string;
 }) => React.JSX.Element;
 export default _default;

package/lib/components/eftposPay/amount.js

@@ -46,8 +46,9 @@ var amount_default = ({
   onChange,
   onClose,
   formatAmount = (number, precision, symbol) => `${symbol}${number}`,
-  isIpad,
-  net
+  isMobile,
+  net,
+  client
 }) => {
   const dispatch = (0, import_store.useDispatch)();
   const [status, setStatus] = (0, import_react.useState)(true);
@@ -131,7 +132,7 @@ var amount_default = ({
     setTempSurRate(curSurRate);
     setTempSurMoney(curSurMoney);
   };
-  return /* @__PURE__ */ import_react.default.createElement("div", { className: `pisell-lowcode__eft-pay-amount ${className}` }, isIpad ? null : /* @__PURE__ */ import_react.default.createElement(import_titlebar.default, { type: "left-title-close", onClose }, status ? name : import_utils.locales.getText("page.eftpos-pay.text.surcharge.edit.title")), status ? /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__eft-pay-amount-body" }, /* @__PURE__ */ import_react.default.createElement(
+  return /* @__PURE__ */ import_react.default.createElement("div", { className: `pisell-lowcode__eft-pay-amount ${className}` }, isMobile ? null : /* @__PURE__ */ import_react.default.createElement(import_titlebar.default, { type: "left-title-close", onClose }, status ? name : import_utils.locales.getText("page.eftpos-pay.text.surcharge.edit.title")), status ? /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__eft-pay-amount-body" }, /* @__PURE__ */ import_react.default.createElement(
     "div",
     {
       className: "pisell-lowcode__eft-pay-cash",

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

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