@pisell/private-materials 6.3.181 → 6.3.182

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

@@ -31,6 +31,25 @@ import { useDispatch, updateStatus, updateCustom, updateState } from "../store";
 import { useFail } from "../hooks";
 import { getInitState } from "../manufacturer";
 import { getPayParams } from "../helper";
+/**
+ * @title 是否需要使用 POS 打印收据
+ * @param setting 设置
+ */
+var shouldPrintReceiptOnPos = function shouldPrintReceiptOnPos(setting) {
+  // 兼容老数据，明确为false才表示使用POS打印
+  if (typeof setting === 'boolean') {
+    return setting === false;
+  }
+  // 数字0表示使用POS打印
+  if (typeof setting === 'number') {
+    return setting === 0;
+  }
+  // 兼容：字符串0表示使用POS打印
+  if (typeof setting === 'string') {
+    return setting === '0';
+  }
+  return false;
+};
 var AggregatePayment = function AggregatePayment(_ref) {
   var onChange = _ref.onChange;
   // 设置request
@@ -244,14 +263,14 @@ var AggregatePayment = function AggregatePayment(_ref) {
     // 刷卡机的手续费
     var card_reader_surcharge = external_service_fee || 0;
     var deviceSetting = (_deviceRef$current = deviceRef.current) === null || _deviceRef$current === void 0 ? void 0 : _deviceRef$current.setting;
-    // 设备是否打印商家小票
-    var isEftposPrintMerchantReceipt = deviceSetting === null || deviceSetting === void 0 ? void 0 : deviceSetting.print_merchant_receipt;
-    // 设备是否打印客户小票
-    var isEftposPrintCustomerReceipt = deviceSetting === null || deviceSetting === void 0 ? void 0 : deviceSetting.prompt_customer_receipt;
-    if (!isEftposPrintMerchantReceipt && merchant_receipt) {
+    // 商家小票是否需要使用 POS 打印
+    var shouldPrintMerchantReceiptOnPos = shouldPrintReceiptOnPos(deviceSetting === null || deviceSetting === void 0 ? void 0 : deviceSetting.print_merchant_receipt);
+    // 客户小票是否需要使用 POS 打印
+    var shouldPrintCustomerReceiptOnPos = shouldPrintReceiptOnPos(deviceSetting === null || deviceSetting === void 0 ? void 0 : deviceSetting.prompt_customer_receipt);
+    if (shouldPrintMerchantReceiptOnPos && merchant_receipt) {
       receipt.push(merchant_receipt);
     }
-    if (!isEftposPrintCustomerReceipt && customer_receipt) {
+    if (shouldPrintCustomerReceiptOnPos && customer_receipt) {
       receipt.push(customer_receipt);
     }
     dispatch(updateNextStep());
@@ -362,14 +381,14 @@ var AggregatePayment = function AggregatePayment(_ref) {
       // 刷卡机的手续费
       var card_reader_surcharge = (response === null || response === void 0 || (_response$data = response.data) === null || _response$data === void 0 || (_response$data = _response$data.external_unified_response) === null || _response$data === void 0 ? void 0 : _response$data.external_service_fee) || 0;
       var deviceSetting = (_deviceRef$current2 = deviceRef.current) === null || _deviceRef$current2 === void 0 ? void 0 : _deviceRef$current2.setting;
-      // 设备是否打印商家小票
-      var isEftposPrintMerchantReceipt = deviceSetting === null || deviceSetting === void 0 ? void 0 : deviceSetting.print_merchant_receipt;
-      // 设备是否打印客户小票
-      var isEftposPrintCustomerReceipt = deviceSetting === null || deviceSetting === void 0 ? void 0 : deviceSetting.prompt_customer_receipt;
-      if (!isEftposPrintMerchantReceipt && merchantReceipt) {
+      // 商家小票是否需要使用 POS 打印
+      var shouldPrintMerchantReceiptOnPos = shouldPrintReceiptOnPos(deviceSetting === null || deviceSetting === void 0 ? void 0 : deviceSetting.print_merchant_receipt);
+      // 客户小票是否需要使用 POS 打印
+      var shouldPrintCustomerReceiptOnPos = shouldPrintReceiptOnPos(deviceSetting === null || deviceSetting === void 0 ? void 0 : deviceSetting.prompt_customer_receipt);
+      if (shouldPrintMerchantReceiptOnPos && merchantReceipt) {
         receipt.push(merchantReceipt);
       }
-      if (!isEftposPrintCustomerReceipt && customerReceipt) {
+      if (shouldPrintCustomerReceiptOnPos && customerReceipt) {
         receipt.push(customerReceipt);
       }
       var _params2 = getPayParams({

package/lib/components/eftposPay/mx51/index.js

@@ -50,6 +50,18 @@ var import_store2 = require("../store");
 var import_hooks2 = require("../hooks");
 var import_manufacturer = require("../manufacturer");
 var import_helper = require("../helper");
+var shouldPrintReceiptOnPos = (setting) => {
+  if (typeof setting === "boolean") {
+    return setting === false;
+  }
+  if (typeof setting === "number") {
+    return setting === 0;
+  }
+  if (typeof setting === "string") {
+    return setting === "0";
+  }
+  return false;
+};
 var AggregatePayment = ({ onChange }) => {
   const context = (0, import_useEngineContext.default)();
   const utils = context.appHelper.utils || {};
@@ -200,12 +212,16 @@ var AggregatePayment = ({ onChange }) => {
     const { merchant_receipt, customer_receipt } = transaction || {};
     const card_reader_surcharge = external_service_fee || 0;
     const deviceSetting = (_b = deviceRef.current) == null ? void 0 : _b.setting;
-    const isEftposPrintMerchantReceipt = deviceSetting == null ? void 0 : deviceSetting.print_merchant_receipt;
-    const isEftposPrintCustomerReceipt = deviceSetting == null ? void 0 : deviceSetting.prompt_customer_receipt;
-    if (!isEftposPrintMerchantReceipt && merchant_receipt) {
+    const shouldPrintMerchantReceiptOnPos = shouldPrintReceiptOnPos(
+      deviceSetting == null ? void 0 : deviceSetting.print_merchant_receipt
+    );
+    const shouldPrintCustomerReceiptOnPos = shouldPrintReceiptOnPos(
+      deviceSetting == null ? void 0 : deviceSetting.prompt_customer_receipt
+    );
+    if (shouldPrintMerchantReceiptOnPos && merchant_receipt) {
       receipt.push(merchant_receipt);
     }
-    if (!isEftposPrintCustomerReceipt && customer_receipt) {
+    if (shouldPrintCustomerReceiptOnPos && customer_receipt) {
       receipt.push(customer_receipt);
     }
     dispatch((0, import_store.updateNextStep)());
@@ -291,12 +307,16 @@ var AggregatePayment = ({ onChange }) => {
       const receipt = [];
       const card_reader_surcharge = ((_b = (_a = response == null ? void 0 : response.data) == null ? void 0 : _a.external_unified_response) == null ? void 0 : _b.external_service_fee) || 0;
       const deviceSetting = (_c = deviceRef.current) == null ? void 0 : _c.setting;
-      const isEftposPrintMerchantReceipt = deviceSetting == null ? void 0 : deviceSetting.print_merchant_receipt;
-      const isEftposPrintCustomerReceipt = deviceSetting == null ? void 0 : deviceSetting.prompt_customer_receipt;
-      if (!isEftposPrintMerchantReceipt && merchantReceipt) {
+      const shouldPrintMerchantReceiptOnPos = shouldPrintReceiptOnPos(
+        deviceSetting == null ? void 0 : deviceSetting.print_merchant_receipt
+      );
+      const shouldPrintCustomerReceiptOnPos = shouldPrintReceiptOnPos(
+        deviceSetting == null ? void 0 : deviceSetting.prompt_customer_receipt
+      );
+      if (shouldPrintMerchantReceiptOnPos && merchantReceipt) {
         receipt.push(merchantReceipt);
       }
-      if (!isEftposPrintCustomerReceipt && customerReceipt) {
+      if (shouldPrintCustomerReceiptOnPos && customerReceipt) {
         receipt.push(customerReceipt);
       }
       const params = (0, import_helper.getPayParams)(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/private-materials",
-  "version": "6.3.181",
+  "version": "6.3.182",
   "scripts": {
     "dev": "father dev",
     "build": "father build",