@pisell/private-materials 6.8.76 → 6.8.78

package/es/components/kioskSkuDetail/locales.js

@@ -3,24 +3,18 @@ export default {
     'pisell2.text.kiosk.sku.detail.btn.back': 'Back',
     'pisell2.text.kiosk.sku.detail.item.total': 'Item total',
     'pisell2.text.kiosk.sku.detail.btn.add.to.cart': 'Add to cart',
-    'pisell2.text.kiosk.sku.detail.btn.update': 'Update',
-    'pisell2.text.kiosk.sku.detail.loading.options': 'Loading options…',
-    'pisell2.text.kiosk.sku.detail.toast.select.variant': 'Please select a top-up option'
+    'pisell2.text.kiosk.sku.detail.loading.options': 'Loading options…'
   },
   'zh-CN': {
     'pisell2.text.kiosk.sku.detail.btn.back': '返回',
     'pisell2.text.kiosk.sku.detail.item.total': '小计',
     'pisell2.text.kiosk.sku.detail.btn.add.to.cart': '加入购物车',
-    'pisell2.text.kiosk.sku.detail.btn.update': '更新',
-    'pisell2.text.kiosk.sku.detail.loading.options': '正在加载选项…',
-    'pisell2.text.kiosk.sku.detail.toast.select.variant': '请选择充值选项'
+    'pisell2.text.kiosk.sku.detail.loading.options': '正在加载选项…'
   },
   'zh-TW': {
     'pisell2.text.kiosk.sku.detail.btn.back': '返回',
     'pisell2.text.kiosk.sku.detail.item.total': '小計',
     'pisell2.text.kiosk.sku.detail.btn.add.to.cart': '加入購物車',
-    'pisell2.text.kiosk.sku.detail.btn.update': '更新',
-    'pisell2.text.kiosk.sku.detail.loading.options': '正在載入選項…',
-    'pisell2.text.kiosk.sku.detail.toast.select.variant': '請選擇充值選項'
+    'pisell2.text.kiosk.sku.detail.loading.options': '正在載入選項…'
   }
 };

package/es/components/pay/toB/components/EFTPOS/index.js

@@ -127,14 +127,7 @@ var EFTPOS = function EFTPOS(props, ref) {
                 name: payMethod.name,
                 symbol: params.symbol,
                 amount: params.amount,
-                device_number: device_number,
-                custom_payment_id: payMethod === null || payMethod === void 0 ? void 0 : payMethod.id,
-                custom_payment_code: payMethod === null || payMethod === void 0 ? void 0 : payMethod.code,
-                custom_payment_name: payMethod === null || payMethod === void 0 ? void 0 : payMethod.name,
-                custom_payment_type: payMethod === null || payMethod === void 0 ? void 0 : payMethod.type,
-                operator_type: params === null || params === void 0 ? void 0 : params.operator_type,
-                operator_id: params === null || params === void 0 ? void 0 : params.operator_id,
-                platform: params === null || params === void 0 ? void 0 : params.platform
+                device_number: device_number
               },
               mode: mode
             };

package/es/components/pay/toB/types/index.d.ts

@@ -14,7 +14,6 @@ export interface ToBPayParams {
             symbol?: string;
             amount: string;
             surcharge?: string;
-            [key: string]: any;
         };
         mode: 'pay' | 'refund';
     };

package/es/components/pay/toC/PaymentList/serve.js

@@ -50,17 +50,6 @@ export var getPaymentList = /*#__PURE__*/function () {
     return _ref.apply(this, arguments);
   };
 }();
-// 修改当前的支付方式默认排序
-// Apple Pay / Google Pay（按设备自动显示）
-// Visa / Master（信用卡）
-// Online Payment（stripe）
-// Bank Deposit（银行转账）
-// Alipay
-// WeChat Pay
-// Offline Payment（线下支付）
-// Cash（现金）
-// Custom Payment（自定义支付）
-var sortArr = ['mw.google', 'mw.apple', 'mw.credit_card', 'stripe', 'pisell.bank_deposit', 'superpay.alipay.h5', 'superpay.wechat.h5', 'pisell.offline_payment', 'pisell.other.cashmanual', 'pisell.custom_payment'];
 
 /**
  * @title: 过滤支付列表
@@ -135,9 +124,6 @@ export var filterPaymentList = function filterPaymentList(list) {
       walletPass: walletPass
     };
   }
-  paymentList = paymentList.sort(function (a, b) {
-    return sortArr.indexOf(a.service) - sortArr.indexOf(b.service);
-  });
 
   // 将自定义支付方式的service加上custom_payment_id, 保证唯一性
   paymentList = paymentList.map(function (d) {

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

@@ -241,22 +241,22 @@ export var checkEnrollment = /*#__PURE__*/function () {
  */
 export var createThreeDSMethodIframe = /*#__PURE__*/function () {
   var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(threeDSMethodData, callback) {
-    var _threeDSMethodData$pa, _threeDSMethodData$pa2, _threeDSMethodData$pa3, _threeDSMethodData$pa4, _threeDSMethodData$pa5, _threeDSMethodData$pa6;
+    var _threeDSMethodData$pa, _threeDSMethodData$pa2, _threeDSMethodData$pa3, _threeDSMethodData$pa4, _threeDSMethodData$pa5;
     var defaultReturnParams, displayBox, iframe, form, input, timer;
     return _regeneratorRuntime().wrap(function _callee3$(_context3) {
       while (1) switch (_context3.prev = _context3.next) {
         case 0:
           defaultReturnParams = {
-            threeDSServerTransID: (threeDSMethodData === null || threeDSMethodData === void 0 || (_threeDSMethodData$pa = threeDSMethodData.pay_info) === null || _threeDSMethodData$pa === void 0 ? void 0 : _threeDSMethodData$pa.threeDSServerTransID) || (threeDSMethodData === null || threeDSMethodData === void 0 || (_threeDSMethodData$pa2 = threeDSMethodData.pay_info) === null || _threeDSMethodData$pa2 === void 0 ? void 0 : _threeDSMethodData$pa2.paReq) || '',
-            threeDSCompInd: (threeDSMethodData === null || threeDSMethodData === void 0 || (_threeDSMethodData$pa3 = threeDSMethodData.pay_info) === null || _threeDSMethodData$pa3 === void 0 ? void 0 : _threeDSMethodData$pa3.threeDSCompInd) || 'N'
+            threeDSServerTransID: (threeDSMethodData === null || threeDSMethodData === void 0 || (_threeDSMethodData$pa = threeDSMethodData.pay_info) === null || _threeDSMethodData$pa === void 0 ? void 0 : _threeDSMethodData$pa.threeDSServerTransID) || '',
+            threeDSCompInd: (threeDSMethodData === null || threeDSMethodData === void 0 || (_threeDSMethodData$pa2 = threeDSMethodData.pay_info) === null || _threeDSMethodData$pa2 === void 0 ? void 0 : _threeDSMethodData$pa2.threeDSCompInd) || ''
           }; // 有返回 threeDSServerTransID 直接走第4步
-          if (!(threeDSMethodData !== null && threeDSMethodData !== void 0 && (_threeDSMethodData$pa4 = threeDSMethodData.pay_info) !== null && _threeDSMethodData$pa4 !== void 0 && _threeDSMethodData$pa4.threeDSServerTransID && threeDSMethodData !== null && threeDSMethodData !== void 0 && (_threeDSMethodData$pa5 = threeDSMethodData.pay_info) !== null && _threeDSMethodData$pa5 !== void 0 && _threeDSMethodData$pa5.threeDSCompInd)) {
+          if (!(threeDSMethodData !== null && threeDSMethodData !== void 0 && (_threeDSMethodData$pa3 = threeDSMethodData.pay_info) !== null && _threeDSMethodData$pa3 !== void 0 && _threeDSMethodData$pa3.threeDSServerTransID && threeDSMethodData !== null && threeDSMethodData !== void 0 && (_threeDSMethodData$pa4 = threeDSMethodData.pay_info) !== null && _threeDSMethodData$pa4 !== void 0 && _threeDSMethodData$pa4.threeDSCompInd)) {
             _context3.next = 3;
             break;
           }
           return _context3.abrupt("return", defaultReturnParams);
         case 3:
-          if (!(!(threeDSMethodData !== null && threeDSMethodData !== void 0 && threeDSMethodData.pay_info.acsURL) || typeof (threeDSMethodData === null || threeDSMethodData === void 0 || (_threeDSMethodData$pa6 = threeDSMethodData.pay_info) === null || _threeDSMethodData$pa6 === void 0 ? void 0 : _threeDSMethodData$pa6.acsURL) !== 'string')) {
+          if (!(!(threeDSMethodData !== null && threeDSMethodData !== void 0 && threeDSMethodData.pay_info.acsURL) || typeof (threeDSMethodData === null || threeDSMethodData === void 0 || (_threeDSMethodData$pa5 = threeDSMethodData.pay_info) === null || _threeDSMethodData$pa5 === void 0 ? void 0 : _threeDSMethodData$pa5.acsURL) !== 'string')) {
             _context3.next = 5;
             break;
           }
@@ -292,7 +292,6 @@ export var createThreeDSMethodIframe = /*#__PURE__*/function () {
           form.submit();
           timer = null; // 返回promise
           return _context3.abrupt("return", new Promise(function (res, rej) {
-            var _threeDSMethodData$pa7;
             // 10秒内没有成功则走N逻辑
             timer = setTimeout(function () {
               res(defaultReturnParams);
@@ -300,7 +299,7 @@ export var createThreeDSMethodIframe = /*#__PURE__*/function () {
                 msg: '第三步: 10秒超时则走N逻辑',
                 data: threeDSMethodData
               });
-            }, (threeDSMethodData === null || threeDSMethodData === void 0 || (_threeDSMethodData$pa7 = threeDSMethodData.pay_info) === null || _threeDSMethodData$pa7 === void 0 ? void 0 : _threeDSMethodData$pa7.tdsMethodTimeoutMS) || 10000);
+            }, 10000);
             window.addEventListener('message', function (event) {
               // 判断域名
               if (event.origin.indexOf(postmessageUrl) !== -1 || event.origin.indexOf('securesuite') !== -1) {

package/es/plus/skuOptionsSelection/components/VariantCard/index.js

@@ -46,7 +46,7 @@ var VariantCard = function VariantCard(props) {
       fontWeight: priceConfig === null || priceConfig === void 0 ? void 0 : priceConfig.fontWeight,
       color: priceConfig === null || priceConfig === void 0 ? void 0 : priceConfig.color
     }
-  }, locales.getText('pisell2.skuOptionsSelection.variantItemCard.price'), ":", priceText) : null));
+  }, priceText) : null));
 };
 function formatPriceText(params) {
   var symbol = params.symbol || '$';

package/es/plus/skuOptionsSelection/locales.d.ts

@@ -5,7 +5,6 @@ declare const _default: {
         'pisell2.skuOptionsSelection.titleExtra.totalPrice': string;
         'pisell2.skuOptionsSelection.optionItemCard.editSelections': string;
         'pisell2.skuOptionsSelection.variantItemCard.soldOut': string;
-        'pisell2.skuOptionsSelection.variantItemCard.price': string;
         'pisell2.skuOptionsSelection.optionItemCard.typeText': string;
         'pisell2.skuOptionsSelection.optionItemCard.overSelected': string;
     };
@@ -15,7 +14,6 @@ declare const _default: {
         'pisell2.skuOptionsSelection.titleExtra.totalPrice': string;
         'pisell2.skuOptionsSelection.optionItemCard.editSelections': string;
         'pisell2.skuOptionsSelection.variantItemCard.soldOut': string;
-        'pisell2.skuOptionsSelection.variantItemCard.price': string;
         'pisell2.skuOptionsSelection.optionItemCard.typeText': string;
         'pisell2.skuOptionsSelection.optionItemCard.overSelected': string;
     };
@@ -25,7 +23,6 @@ declare const _default: {
         'pisell2.skuOptionsSelection.titleExtra.totalPrice': string;
         'pisell2.skuOptionsSelection.optionItemCard.editSelections': string;
         'pisell2.skuOptionsSelection.variantItemCard.soldOut': string;
-        'pisell2.skuOptionsSelection.variantItemCard.price': string;
         'pisell2.skuOptionsSelection.optionItemCard.typeText': string;
         'pisell2.skuOptionsSelection.optionItemCard.overSelected': string;
     };

package/es/plus/skuOptionsSelection/locales.js

@@ -5,7 +5,6 @@ export default {
     'pisell2.skuOptionsSelection.titleExtra.totalPrice': 'Subtotal: {{price}}',
     'pisell2.skuOptionsSelection.optionItemCard.editSelections': 'Edit selections',
     'pisell2.skuOptionsSelection.variantItemCard.soldOut': 'Out of stock',
-    'pisell2.skuOptionsSelection.variantItemCard.price': 'Price',
     'pisell2.skuOptionsSelection.optionItemCard.typeText': 'Type',
     'pisell2.skuOptionsSelection.optionItemCard.overSelected': 'Over selected'
   },
@@ -15,7 +14,6 @@ export default {
     'pisell2.skuOptionsSelection.titleExtra.totalPrice': '小计：{{price}}',
     'pisell2.skuOptionsSelection.optionItemCard.editSelections': '编辑选择',
     'pisell2.skuOptionsSelection.variantItemCard.soldOut': '库存不足',
-    'pisell2.skuOptionsSelection.variantItemCard.price': '价格',
     'pisell2.skuOptionsSelection.optionItemCard.typeText': '类型',
     'pisell2.skuOptionsSelection.optionItemCard.overSelected': '已达上限'
   },
@@ -25,7 +23,6 @@ export default {
     'pisell2.skuOptionsSelection.titleExtra.totalPrice': '小計：{{price}}',
     'pisell2.skuOptionsSelection.optionItemCard.editSelections': '編輯選擇',
     'pisell2.skuOptionsSelection.variantItemCard.soldOut': '庫存不足',
-    'pisell2.skuOptionsSelection.variantItemCard.price': '價格',
     'pisell2.skuOptionsSelection.optionItemCard.typeText': '類型',
     'pisell2.skuOptionsSelection.optionItemCard.overSelected': '已達上限'
   }

package/es/pro/Login2.0/components/LoginCodeInput.js

@@ -59,32 +59,7 @@ function LoginCodeInput(_ref) {
    * @param value 输入的值
    */
   var handleInputChange = function handleInputChange(index, value) {
-    // iOS「短信验证码一键填充」/ 粘贴可能会一次性塞进多位数字：
-    // - Safari 往往能正常触发
-    // - 微信 WebView 更依赖标准的 `autocomplete="one-time-code"`，并且需要允许一次性输入整串数字
-    var digitsOnly = value.replace(/\D/g, '');
-    if (digitsOnly !== value && value !== '') return; // 只允许数字（允许空字符串用于清空）
-
-    // 一次性输入多位数字时，拆分填充到后续输入框（兼容 iOS one-time-code / IME 粘贴）
-    if (digitsOnly.length > 1) {
-      var _inputRefs$current$ne;
-      if (error && onClearError) onClearError();
-      var nextCode = _toConsumableArray(code);
-      var maxFillLength = Math.min(codeLength - index, digitsOnly.length);
-      for (var offset = 0; offset < maxFillLength; offset += 1) {
-        nextCode[index + offset] = digitsOnly[offset];
-      }
-      setCode(nextCode);
-      var nextEmptyIndex = nextCode.findIndex(function (digit) {
-        return digit === '';
-      });
-      if (nextEmptyIndex === -1) {
-        onSubmit === null || onSubmit === void 0 || onSubmit(nextCode.join(''));
-        return;
-      }
-      (_inputRefs$current$ne = inputRefs.current[nextEmptyIndex]) === null || _inputRefs$current$ne === void 0 || _inputRefs$current$ne.focus();
-      return;
-    }
+    if (!/^\d*$/.test(value)) return; // 只允许数字
 
     // 如果用户开始输入且有错误，清除错误
     if (value && error && onClearError) {
@@ -189,16 +164,8 @@ function LoginCodeInput(_ref) {
         return inputRefs.current[index] = el;
       },
       type: "text",
-      inputMode: "numeric"
-      // 关键：第一个输入框需要支持 iOS one-time-code 一次性填充整串验证码
-      // 否则在微信 WebView 等环境下可能只会塞进第一位或完全不触发
-      ,
-      autoComplete: index === 0 ? 'one-time-code' : 'off',
-      autoCorrect: "off",
-      autoCapitalize: "off",
-      spellCheck: false,
-      maxLength: index === 0 ? codeLength : 1,
-      pattern: "[0-9]*",
+      inputMode: "numeric",
+      maxLength: 1,
       className: "code-input-box ".concat(digit ? 'has-value' : '', " ").concat(error ? 'has-error' : ''),
       value: digit,
       onChange: function onChange(e) {

package/es/pro/Login2.0/steps/CodeInput.js

@@ -1,3 +1,4 @@
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
@@ -57,32 +58,7 @@ function CodeInput(_ref) {
    * @param value 输入的值
    */
   var handleInputChange = function handleInputChange(index, value) {
-    // iOS「短信验证码一键填充」/ 粘贴可能会一次性塞进多位数字：
-    // - Safari 往往能正常触发
-    // - 微信 WebView 更依赖标准的 `autocomplete="one-time-code"`，并且需要允许一次性输入整串数字
-    var digitsOnly = value.replace(/\D/g, '');
-    if (digitsOnly !== value && value !== '') return; // 只允许数字（允许空字符串用于清空）
-
-    // 一次性输入多位数字时，拆分填充到后续输入框（兼容 iOS one-time-code / IME 粘贴）
-    if (digitsOnly.length > 1) {
-      var _inputRefs$current$ne;
-      if (error && onClearError) onClearError();
-      var nextCode = _toConsumableArray(code);
-      var maxFillLength = Math.min(codeLength - index, digitsOnly.length);
-      for (var offset = 0; offset < maxFillLength; offset += 1) {
-        nextCode[index + offset] = digitsOnly[offset];
-      }
-      setCode(nextCode);
-      var nextEmptyIndex = nextCode.findIndex(function (digit) {
-        return digit === '';
-      });
-      if (nextEmptyIndex === -1) {
-        onSubmit === null || onSubmit === void 0 || onSubmit(nextCode.join(''));
-        return;
-      }
-      (_inputRefs$current$ne = inputRefs.current[nextEmptyIndex]) === null || _inputRefs$current$ne === void 0 || _inputRefs$current$ne.focus();
-      return;
-    }
+    if (!/^\d*$/.test(value)) return; // 只允许数字
 
     // 如果用户开始输入且有错误，清除错误
     if (value && error && onClearError) {
@@ -160,7 +136,9 @@ function CodeInput(_ref) {
   // 根据账号类型显示不同的标题和描述
   var title = flowData.accountType === 'email' ? locales.getText('pisell-register2-check-email-title') : locales.getText('pisell-register2-check-phone-title');
   var description = flowData.accountType === 'email' ? locales.getText('pisell-register2-check-email-desc') : locales.getText('pisell-register2-check-phone-desc');
-  var displayAccount = flowData.account;
+
+  // 格式化账号显示（手机号对象需要转换为字符串）
+  var displayAccount = _typeof(flowData.account) === 'object' && 'phone' in flowData.account ? "+".concat(flowData.account.country_calling_code).concat(flowData.account.phone) : flowData.account;
 
   // 根据账号类型显示不同的"没有收到"提示
   var noReceiveText = flowData.accountType === 'email' ? locales.getText('pisell-register2-no-email-received') : locales.getText('pisell-register2-no-message-received');
@@ -188,16 +166,8 @@ function CodeInput(_ref) {
         return inputRefs.current[index] = el;
       },
       type: "text",
-      inputMode: "numeric"
-      // 关键：第一个输入框需要支持 iOS one-time-code 一次性填充整串验证码
-      // 否则在微信 WebView 等环境下可能只会塞进第一位或完全不触发
-      ,
-      autoComplete: index === 0 ? 'one-time-code' : 'off',
-      autoCorrect: "off",
-      autoCapitalize: "off",
-      spellCheck: false,
-      maxLength: index === 0 ? codeLength : 1,
-      pattern: "[0-9]*",
+      inputMode: "numeric",
+      maxLength: 1,
       className: "code-input-box ".concat(digit ? 'has-value' : '', " ").concat(error ? 'has-error' : ''),
       value: digit,
       onChange: function onChange(e) {

package/lib/components/checkout/PaymentModal.js

@@ -50,6 +50,7 @@ var import_WalletPassModule = __toESM(require("./components/WalletPassModule"));
 var import_PaymentOptionsModule = __toESM(require("./components/PaymentOptionsModule"));
 var import_CashPaymentModule = __toESM(require("./components/CashPaymentModule"));
 var import_AdditionalModule = __toESM(require("./components/AdditionalModule"));
+var import_OsKeyContext = require("../ticketBooking/context/OsKeyContext");
 var import_PaymentResultToast = require("./components/PaymentResultToast");
 var import_PaymentResultToastUtils = require("./utils/PaymentResultToastUtils");
 var import_icon = require("@pisell/icon");
@@ -125,6 +126,7 @@ var PaymentContent = (0, import_react.forwardRef)(
     const [paymentOptionsTitle, setPaymentOptionsTitle] = (0, import_react.useState)(
       import_utils.locales.getText("cards.and.digitals") || "Cards & Digitals"
     );
+    const osKey = (0, import_OsKeyContext.useOsKey)();
     const paymentOptionList = (0, import_react.useMemo)(() => {
       return paymentMethods.filter(
         (item) => !(item.type === "app" && item.code === "EFTPOS_LINKLY") && (["custom"].includes(item.type) || import_PaymentOptionsModule.SHOW_METHODS_CODE.includes(item.code))
@@ -180,24 +182,41 @@ var PaymentContent = (0, import_react.forwardRef)(
           // cash 不需要验证钱箱权限
         }
       });
-      await (checkoutModule == null ? void 0 : checkoutModule.addPaymentItemAsync({
-        amount: result.amount,
-        // /** 支付类型，跟支付列表上对应的支付方式保持一致 */
-        // code: cashPaymentMethod?.code,
-        // /** 支付类型id，跟支付列表上对应的支付方式保持一致 */
-        // custom_payment_id: cashPaymentMethod?.id,
-        // /** 支付类型名称，跟支付列表上对应的支付方式保持一致 */
-        // name: cashPaymentMethod?.name,
-        // /** 支付类型type，跟支付列表上对应的支付方式保持一致 */
-        // type: cashPaymentMethod?.type,
-        code: "CUSTOM_10361",
-        "type": "custom",
-        "name": "Cash - Cafe",
-        "custom_payment_id": 10361,
-        /** 代金券、充值卡、积分卡等wallet pass id */
-        voucher_id: 0,
-        rounding_amount: result.roundingAmount
-      }));
+      if (osKey === "food") {
+        await (checkoutModule == null ? void 0 : checkoutModule.addPaymentItemAsync({
+          amount: result.amount,
+          // /** 支付类型，跟支付列表上对应的支付方式保持一致 */
+          // code: cashPaymentMethod?.code,
+          // /** 支付类型id，跟支付列表上对应的支付方式保持一致 */
+          // custom_payment_id: cashPaymentMethod?.id,
+          // /** 支付类型名称，跟支付列表上对应的支付方式保持一致 */
+          // name: cashPaymentMethod?.name,
+          // /** 支付类型type，跟支付列表上对应的支付方式保持一致 */
+          // type: cashPaymentMethod?.type,
+          code: "CUSTOM_10361",
+          "type": "custom",
+          "name": "Cash - Cafe",
+          "custom_payment_id": 10361,
+          /** 代金券、充值卡、积分卡等wallet pass id */
+          voucher_id: 0,
+          rounding_amount: result.roundingAmount
+        }));
+      } else {
+        await (checkoutModule == null ? void 0 : checkoutModule.addPaymentItemAsync({
+          amount: result.amount,
+          /** 支付类型，跟支付列表上对应的支付方式保持一致 */
+          code: cashPaymentMethod == null ? void 0 : cashPaymentMethod.code,
+          /** 支付类型id，跟支付列表上对应的支付方式保持一致 */
+          custom_payment_id: cashPaymentMethod == null ? void 0 : cashPaymentMethod.id,
+          /** 支付类型名称，跟支付列表上对应的支付方式保持一致 */
+          name: cashPaymentMethod == null ? void 0 : cashPaymentMethod.name,
+          /** 支付类型type，跟支付列表上对应的支付方式保持一致 */
+          type: cashPaymentMethod == null ? void 0 : cashPaymentMethod.type,
+          /** 代金券、充值卡、积分卡等wallet pass id */
+          voucher_id: 0,
+          rounding_amount: result.roundingAmount
+        }));
+      }
     };
     const processSurcharge = (surcharge) => {
       if (typeof surcharge === "string") {
@@ -218,8 +237,7 @@ var PaymentContent = (0, import_react.forwardRef)(
         "EFTPOS_LINKLY",
         "EFTPOS_PAYO",
         "EFTPOS_WINDCAVE",
-        "EFTPOS_TYRO",
-        "EFTPOS_HUIFU"
+        "EFTPOS_TYRO"
       ];
       const mx51Code = "EFTPOS";
       let payType = "";
@@ -300,9 +318,7 @@ var PaymentContent = (0, import_react.forwardRef)(
               orderId: data.orderId,
               symbol: getData("shop_symbol"),
               amount: finalAmount,
-              surcharge: processSurcharge(method.surcharge),
-              operator_type: "shop",
-              platform: "pos"
+              surcharge: processSurcharge(method.surcharge)
             },
             mode: "pay"
           },
@@ -1745,7 +1761,8 @@ var PaymentModal = ({
         });
       }
       if (isWebPos2) {
-        NativePage.open({ page: "/native/order/detail", params: { order_id: orderId } });
+        const nativePage = NativePage == null ? void 0 : NativePage();
+        nativePage.open({ page: "/native/order/detail", params: { order_id: orderId } });
       }
     };
     const handlePrintReceiptClick = async () => {

package/lib/components/checkout/components/PaymentOptionsModule/index.js

@@ -47,8 +47,7 @@ var SHOW_METHODS_CODE = [
   "EFTPOS",
   "EFTPOS_TYRO",
   "EFTPOS_WINDCAVE",
-  "EFTPOS_PAYO",
-  "EFTPOS_HUIFU"
+  "EFTPOS_PAYO"
 ];
 function PaymentOptionsModule({
   amountSymbol,

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

@@ -9,7 +9,7 @@ import { PosProps } from './const';
  */
 declare const _default: ({ className, onChange, onClose, formatAmount, isMobile, net, client }: {
     className?: string | undefined;
-    onChange?: ((status: "page" | "success" | "print" | "fail" | "mark_tx_processed", params?: string | {
+    onChange?: ((status: "fail" | "success" | "page" | "print" | "mark_tx_processed", params?: string | {
         [keys: string]: unknown;
     } | undefined, other?: any) => void) | undefined;
     onClose: () => void;

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

@@ -1,6 +1,6 @@
 import React from 'react';
 import { PosProps, RouteType } from './const';
-declare const App: ({ action, api, device_number, terminal, tyroUrl, tyroVersion, onChangeParams, isMobile, channel, formatAmount, ...props }: Omit<PosProps, "type" | "mode" | "getApi"> & {
+declare const App: ({ action, api, device_number, terminal, tyroUrl, tyroVersion, onChangeParams, isMobile, channel, formatAmount, ...props }: Omit<PosProps, "getApi" | "type" | "mode"> & {
     action: RouteType;
     device_number: string | number;
     api: ReturnType<PosProps['getApi']>;

package/lib/components/eftposPay/app.js

@@ -39,8 +39,6 @@ var import_const = require("./const");
 var import_device = __toESM(require("./device"));
 var import_pay = __toESM(require("./pay"));
 var import_store = require("./store");
-var import_useEngineContext = __toESM(require("../../hooks/useEngineContext"));
-var import_utils = require("../../utils");
 var App = ({
   action,
   api,
@@ -58,9 +56,6 @@ var App = ({
   const data = (0, import_store.useContextData)();
   const dispatch = (0, import_store.useDispatch)();
   const [current, setCurrent] = (0, import_react.useState)(action);
-  const engineContext = (0, import_useEngineContext.default)();
-  const utils = engineContext.appHelper.utils || {};
-  import_utils.request.setRequest(utils == null ? void 0 : utils.request);
   const statusRef = (0, import_react.useRef)(data.status);
   const network = (0, import_react.useMemo)(
     () => typeof terminal.network === "boolean" ? terminal.network : true,

package/lib/components/eftposPay/component/fail/failCustom.js

@@ -52,31 +52,25 @@ var failCustom_default = ({ className = "", isMobile, onChange }) => {
     order_id,
     number,
     device,
-    client,
-    originalParams
+    client
   } = (0, import_store.useContextData)();
   const failCustom = custom == null ? void 0 : custom.failCustom;
   const dispatch = (0, import_store.useDispatch)();
   const onRetry = () => {
     onChange("page", "pay");
-    const params = {
-      ...originalParams || {},
-      mode,
-      name,
-      symbol,
-      amount,
-      order_id
-    };
-    if (mode === import_const.ModeEnum.Query) {
-      params.number = "";
-    }
-    dispatch((0, import_store.updateState)((0, import_manufacturer.getInitState)(eftpos, params)));
+    dispatch(
+      (0, import_store.updateState)(
+        (0, import_manufacturer.getInitState)(
+          eftpos,
+          mode === import_const.ModeEnum.Query ? { mode, name, symbol, amount, order_id } : { mode, name, symbol, amount, order_id, number: "" }
+        )
+      )
+    );
   };
   const onModify = () => {
     dispatch(
       (0, import_store.updateState)(
         (0, import_manufacturer.getInitState)(eftpos, {
-          ...originalParams || {},
           mode,
           name,
           symbol,

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

@@ -54,8 +54,7 @@ var fail_default = ({ onChange, className = "", isMobile }) => {
     order_id,
     number,
     device,
-    client,
-    originalParams
+    client
   } = (0, import_store.useContextData)();
   const isPosNetworkError = ((_b = (_a = steps[step]) == null ? void 0 : _a.custom) == null ? void 0 : _b.isPosNetworkError) || false;
   const dispatch = (0, import_store.useDispatch)();
@@ -64,7 +63,6 @@ var fail_default = ({ onChange, className = "", isMobile }) => {
     dispatch(
       (0, import_store.updateState)(
         (0, import_manufacturer.getInitState)(eftpos, {
-          ...originalParams || {},
           mode,
           name,
           symbol,
@@ -79,7 +77,6 @@ var fail_default = ({ onChange, className = "", isMobile }) => {
     dispatch(
       (0, import_store.updateState)(
         (0, import_manufacturer.getInitState)(eftpos, {
-          ...originalParams || {},
           mode,
           name,
           symbol,

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

@@ -7,12 +7,9 @@ export declare enum EftposEnum {
     /** 后端支付 - 支付 + 退款  */
     Windcave = "windcave",
     Stripe = "stripe",
-    Linkly = "linkly",
-    /** 汇付天下 */
-    Huifu = "huifu"
+    Linkly = "linkly"
 }
 export declare enum StatusEnum {
-    Init = "init",
     Loading = "loading",
     Warn = "warn",
     Fail = "fail",
@@ -163,8 +160,6 @@ export declare enum PayStatus {
     'Unknown' = "701000",
     /** 交易请求超时 */
     'Timeout' = "701001",
-    /** 支付失败（汇付天下） */
-    'PaymentFailed' = "701002",
     /** 繁忙 EFTPOS终端暂时不可用，因为EFTPOS正在处理另一个请求。 */
     'PayOtherEftposFailed' = "701003",
     /** 购物者没有出示卡片/卡片金额不足/在线拒绝/卡已过期/卡被锁定 */

package/lib/components/eftposPay/const.js

@@ -36,11 +36,9 @@ var EftposEnum = /* @__PURE__ */ ((EftposEnum2) => {
   EftposEnum2["Windcave"] = "windcave";
   EftposEnum2["Stripe"] = "stripe";
   EftposEnum2["Linkly"] = "linkly";
-  EftposEnum2["Huifu"] = "huifu";
   return EftposEnum2;
 })(EftposEnum || {});
 var StatusEnum = /* @__PURE__ */ ((StatusEnum2) => {
-  StatusEnum2["Init"] = "init";
   StatusEnum2["Loading"] = "loading";
   StatusEnum2["Warn"] = "warn";
   StatusEnum2["Fail"] = "fail";
@@ -94,7 +92,6 @@ var PayStatus = /* @__PURE__ */ ((PayStatus2) => {
   PayStatus2["PairingFailure"] = "606020";
   PayStatus2["Unknown"] = "701000";
   PayStatus2["Timeout"] = "701001";
-  PayStatus2["PaymentFailed"] = "701002";
   PayStatus2["PayOtherEftposFailed"] = "701003";
   PayStatus2["PayCardErrorFailed"] = "701004";
   PayStatus2["NoNetWork"] = "701005";

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

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

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

@@ -15,11 +15,11 @@ export declare const useStoreRef: <T extends {
     readonly numRef: React.MutableRefObject<string | number | undefined>;
     readonly orderIdRef: React.MutableRefObject<string | number>;
     readonly modeRef: React.MutableRefObject<ModeEnum>;
-    readonly statusRef: React.MutableRefObject<"loading" | "success" | "warn" | "init" | "fail" | "pedding" | "resove" | "reject" | "question">;
+    readonly statusRef: React.MutableRefObject<"loading" | "warn" | "fail" | "success" | "pedding" | "resove" | "reject" | "question">;
     readonly netRef: React.MutableRefObject<boolean | undefined>;
     readonly symbolRef: React.MutableRefObject<string>;
     readonly amountRef: React.MutableRefObject<string | number>;
-    readonly eftposRef: React.MutableRefObject<"stripe" | "payo" | "tyro" | "windcave" | "linkly" | "huifu">;
+    readonly eftposRef: React.MutableRefObject<"payo" | "tyro" | "windcave" | "stripe" | "linkly">;
     readonly clientRef: React.MutableRefObject<ClientEnum>;
     readonly dataRef: React.MutableRefObject<import("./store").State>;
 };
@@ -32,5 +32,4 @@ export declare const useStoreRef: <T extends {
  */
 export declare const useFail: (index: number) => (res: {
     code?: `${PayStatus}`;
-    message?: string;
 }, isMark?: boolean) => void;

package/lib/components/eftposPay/hooks.js

@@ -384,22 +384,6 @@ ${import_utils.locales.getText(
         );
         return;
       }
-      if (code === import_const.PayStatus.PaymentFailed) {
-        steps[index].title = import_utils.locales.getText(
-          "page.eftpos-pay.text.transaction.fail"
-        );
-        steps[index].fail = (res == null ? void 0 : res.message) || import_utils.locales.getText("page.eftpos-pay.text.failed")(modeRef.current);
-        steps[index].status = "fail";
-        dispatch((0, import_store.updateSteps)(steps));
-        dispatch((0, import_store.updateComponent)("Fail"));
-        dispatch(
-          (0, import_store.updateCustom)({
-            errorStatus: "know"
-            // unknow know
-          })
-        );
-        return;
-      }
       steps[index].title = import_utils.locales.getText("page.eftpos-pay.text.failed")(
         modeRef.current
       );