@pisell/private-materials 3.0.149 → 3.0.150

package/es/components/eftposPay/index.js

@@ -277,6 +277,8 @@ export default (function (props) {
     onChangeParams: props.onChangeParams,
     action: action,
     source: props.source,
+    tyroUrl: props.tyroUrl,
+    tyroVersion: props.tyroVersion,
     device_number: props === null || props === void 0 ? void 0 : (_props$params2 = props.params) === null || _props$params2 === void 0 ? void 0 : _props$params2.device_number
   }));
 });

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

@@ -235,12 +235,12 @@ 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);
-    }
+    // if (signatureRequired) {
+    var receipt = [merchantReceipt].filter(function (item) {
+      return typeof item === 'string';
+    }).filter(Boolean);
+    onChange('print', receipt);
+    // }
     merchantReceiptRef.current = {
       signatureRequired: signatureRequired,
       merchantReceipt: merchantReceipt
@@ -344,7 +344,7 @@ export default (function (_ref) {
       card_reader_id: (_deviceRef$current5 = deviceRef.current) === null || _deviceRef$current5 === void 0 ? void 0 : _deviceRef$current5.id,
       card_reader_type: eftpos,
       amount: requestParams.current.amount,
-      action: modeRef.current,
+      action: modeRef.current === ModeEnum.FullPay ? ModeEnum.Pay : modeRef.current,
       status: response.result === 'APPROVED' ? 'succeed' : 'failed',
       request: requestParams.current,
       response: _objectSpread(_objectSpread({}, response), {}, {
@@ -413,7 +413,8 @@ export default (function (_ref) {
       failCustom: {
         isPosNetworkError: false,
         status: 'fail',
-        fail: locales.getText('page.eftpos-pay.text.transaction.fail'),
+        fail: response.result,
+        //locales.getText('page.eftpos-pay.text.transaction.fail'),
         warn: null,
         title: locales.getText('page.eftpos-pay.text.failed')(modeRef.current)
       }
@@ -427,7 +428,9 @@ export default (function (_ref) {
     if (load && TyroRef.current) {
       var _IClient = TyroRef.current.IClient;
       if (_IClient) {
+        console.log('apiKey = ', apiKey, 'posProductData = ', posProductData);
         var iclient = new _IClient(apiKey, posProductData);
+        console.log(iclient.posProductData);
         iClientRef.current = iclient;
         if (isCancelRef.current) {
           return;

package/lib/components/eftposPay/index.js

@@ -241,6 +241,8 @@ var eftposPay_default = (props) => {
       onChangeParams: props.onChangeParams,
       action,
       source: props.source,
+      tyroUrl: props.tyroUrl,
+      tyroVersion: props.tyroVersion,
       device_number: (_f = props == null ? void 0 : props.params) == null ? void 0 : _f.device_number
     }
   ));

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

@@ -197,10 +197,8 @@ var tyro_default = ({
   const receiptCallbackImpl = ({ signatureRequired, merchantReceipt }) => {
     console.log("商家小票 客户端是否打印小票 = ", signatureRequired);
     console.log("商家小票 小票内容 = \n", merchantReceipt);
-    if (signatureRequired) {
-      const receipt = [merchantReceipt].filter((item) => typeof item === "string").filter(Boolean);
-      onChange("print", receipt);
-    }
+    const receipt = [merchantReceipt].filter((item) => typeof item === "string").filter(Boolean);
+    onChange("print", receipt);
     merchantReceiptRef.current = { signatureRequired, merchantReceipt };
   };
   const statusMessageCallbackImpl = (message) => {
@@ -308,7 +306,7 @@ var tyro_default = ({
       card_reader_id: (_a = deviceRef.current) == null ? void 0 : _a.id,
       card_reader_type: eftpos,
       amount: requestParams.current.amount,
-      action: modeRef.current,
+      action: modeRef.current === import_const.ModeEnum.FullPay ? import_const.ModeEnum.Pay : modeRef.current,
       status: response.result === "APPROVED" ? "succeed" : "failed",
       request: requestParams.current,
       response: { ...response, merchantReceipt: merchantReceiptRef.current },
@@ -382,7 +380,8 @@ var tyro_default = ({
         failCustom: {
           isPosNetworkError: false,
           status: "fail",
-          fail: import_utils.locales.getText("page.eftpos-pay.text.transaction.fail"),
+          fail: response.result,
+          //locales.getText('page.eftpos-pay.text.transaction.fail'),
           warn: null,
           title: import_utils.locales.getText("page.eftpos-pay.text.failed")(
             modeRef.current
@@ -398,7 +397,9 @@ var tyro_default = ({
     if (load && TyroRef.current) {
       const IClient = TyroRef.current.IClient;
       if (IClient) {
+        console.log("apiKey = ", apiKey, "posProductData = ", posProductData);
         const iclient = new IClient(apiKey, posProductData);
+        console.log(iclient.posProductData);
         iClientRef.current = iclient;
         if (isCancelRef.current) {
           return;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/private-materials",
-  "version": "3.0.149",
+  "version": "3.0.150",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",
@@ -59,10 +59,10 @@
     "react-infinite-scroll-component": "^6.1.0",
     "rc-virtual-list": "^3.11.3",
     "decimal.js": "^10.4.3",
-    "@pisell/materials": "3.0.48",
     "@pisell/utils": "1.0.42",
     "@pisell/icon": "0.0.11",
-    "@pisell/date-picker": "1.0.100"
+    "@pisell/date-picker": "1.0.100",
+    "@pisell/materials": "3.0.48"
   },
   "peerDependencies": {
     "react": "^18.0.0",