cordova-plugin-netcontroll-integration 1.0.65 → 1.0.68

package/README.md

@@ -1,4 +1,4 @@
-Versao 1.0.64
+Versao 1.0.68
 
 Funções internas de integração XMenu / NetControll
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cordova-plugin-netcontroll-integration",
-  "version": "1.0.65",
+  "version": "1.0.68",
   "description": "Plugin cordova de integracao para uso interno (NetControll/ XMenu)",
   "cordova": {
     "id": "cordova-plugin-netcontroll-integration",

package/plugin.xml

@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<plugin id="cordova-plugin-netcontroll-integration" version="1.0.65"
+<plugin id="cordova-plugin-netcontroll-integration" version="1.0.68"
     xmlns="http://apache.org/cordova/ns/plugins/1.0"
     xmlns:android="http://schemas.android.com/apk/res/android">
 
@@ -60,8 +60,8 @@
         <source-file src="src/android/Elgin/ElginM10Terminal.java" target-dir="src/cordova-plugin-m8/cordova-plugin-m8" />
         <source-file src="src/android/Elgin/ElginSmartPay.java" target-dir="src/cordova-plugin-m8/cordova-plugin-m8" />
         <source-file src="src/android/Cielo/CieloLioLocal.java" target-dir="src/cordova-plugin-m8/cordova-plugin-m8" />
-        <source-file src="src/android/Stone/StoneSumni.java" target-dir="src/cordova-plugin-m8/cordova-plugin-m8" />
-        <source-file src="src/android/Rede/RedeGPos700.java" target-dir="src/cordova-plugin-m8/cordova-plugin-m8" />
+		<source-file src="src/android/Stone/StoneSumni.java" target-dir="src/cordova-plugin-m8/cordova-plugin-m8" />
+		<source-file src="src/android/Rede/RedeGPos700.java" target-dir="src/cordova-plugin-m8/cordova-plugin-m8" />
         <!-- <source-file src="src/android/NetControllCordovaPluginsIntegration.java" target-dir="src/cordova/plugin/netcontroll/integration/NetControllCordovaPluginsIntegration" />
         <source-file src="src/android/Elgin/ElginM10Terminal.java" target-dir="src/cordova-plugin-m8/cordova-plugin-m8" /> -->
 
@@ -75,6 +75,9 @@
         <resource-file src="src/libs/cloudpossdk-s-1.0.2.aar" target="libs/cloudpossdk-s-1.0.2.aar" />
         <resource-file src="src/libs/InterfaceAutomacao-v2.0.0.9.aar" target="libs/InterfaceAutomacao-v2.0.0.9.aar" />
 
+        <!-- BarcodeScanner -->
+        <!-- <resource-file src="src/libs/barcodescanner-release-2.1.5.aar" target="libs/barcodescanner-release-2.1.5.aar" /> -->
+
         <!-- UseRede -->
         <resource-file src="src/libs/sdk_3.0_release.aar" target="libs/sdk_3.0_release.aar" />
         <resource-file src="src/libs/payment-1.14.10.181016.aar" target="libs/payment-1.14.10.181016.aar" />

package/src/android/Stone/StoneSumni.java

@@ -56,6 +56,8 @@ import android.graphics.Matrix;
 
 import android.util.Base64;
 import java.io.ByteArrayOutputStream;
+import java.util.Objects;
+import java.util.stream.Collectors;
 
 //Stone 
 
@@ -64,6 +66,7 @@ import stone.providers.ActiveApplicationProvider;
 import stone.providers.BaseTransactionProvider;
 import stone.providers.TransactionProvider;
 import stone.providers.CancellationProvider;
+import stone.providers.ReversalProvider;
 
 import stone.application.StoneStart;
 
@@ -88,7 +91,6 @@ import com.google.zxing.BarcodeFormat;
 import com.google.zxing.WriterException;
 import com.google.zxing.qrcode.QRCodeWriter;
 import com.google.zxing.common.BitMatrix;
-//import com.google.zxing.client.j2se.MatrixToImageWriter;
 
 
 import stone.user.UserModel;
@@ -97,7 +99,7 @@ import stone.utils.Stone;
 
 public class StoneSumni {
     private BaseTransactionProvider transactionProvider;
-
+       
     //Cordova/Java Params
     private Activity mActivity;
     private Context mContext;
@@ -201,7 +203,7 @@ public class StoneSumni {
                 transactionObject.setCapture(capturar);
                 transactionObject.setAmount(valor);
 
-                final PosTransactionProvider transactionProvider = new PosTransactionProvider(this.mContext, transactionObject, GetSelectedUserModel(0));
+                transactionProvider = new PosTransactionProvider(this.mContext, transactionObject, GetSelectedUserModel(0));
                 transactionProvider.useDefaultUI(true);
                 transactionProvider.setDialogTitle("Aguarde"); // Título do Dialog
                 transactionProvider.setDialogMessage("Enviando..."); // Mensagem do Dialog
@@ -215,19 +217,24 @@ public class StoneSumni {
                                 executeGlobalJavascript(statusChangeCallBack + "('" + transactionStatus + "')");
                             }
                         });
-                        if (transactionObject.getTransactionStatus() == TransactionStatusEnum.APPROVED) {
-                            callbackContext.success(parseObjToJsonSrtring(transactionObject));
-                        } else {
-                            String teste01 = "asdasd";
-                            callbackContext.error(parseObjToJsonSrtring(transactionObject));
-                        }
+                        callbackContext.success(parseObjToJsonSrtring(transactionObject));
+                        // if (transactionObject.getTransactionStatus() == TransactionStatusEnum.APPROVED) {
+                        //     callbackContext.success(parseObjToJsonSrtring(transactionObject));
+                        // } else {
+                        //     String msg = "Erro na transação";
+                        //     if (transactionProvider.getMessageFromAuthorize() != null) {
+                        //         msg += ":" + transactionProvider.getMessageFromAuthorize();
+                        //     } else {
+                        //         msg += "!";
+                        //     }
+                        //     callbackContext.error(msg);
+                        // }
                     }
 
                     @Override
                     public void onError() {
-                        Object teste2 = transactionObject;
-                        callbackContext.error("Erro na transação");
                         // Erro na transação
+                        callbackContext.error(transactionProvider.getListOfErrors().toString());
                     }
 
                     @Override
@@ -241,7 +248,9 @@ public class StoneSumni {
                         });
                     }
                 });
-                transactionProvider.execute();
+                new Thread(() -> {
+                    transactionProvider.execute();
+                }).start();
                 return true;
             } catch (Exception error1) {
                 callbackContext.error("Result - Stone - Sumni - IniciarTransacao: " + "Error Detail: " + error1);
@@ -249,6 +258,50 @@ public class StoneSumni {
             return false;
         }
 
+        else if (action.equals("AbortarTransacao")) {
+            try {
+                new Thread(() -> {
+                    try {
+                        transactionProvider.abortPayment();
+                        callbackContext.success("Stone - Sumni - AbortarTransacao - onSuccess");
+                    } catch (Exception e) {
+                        callbackContext.error("Result - Stone - Sumni - AbortarTransacao: " + "Error Detail: " + e.toString());
+                    }
+                }).start();
+                return true;
+            } catch (Exception error1) {
+                callbackContext.error("Result - Stone - Sumni - AbortarTransacao: " + "Error Detail: " + error1);
+            }
+            return false;
+        }
+
+        else if (action.equals("ReverterTransacaoComErro")) {
+            try {
+
+                ReversalProvider reversalProvider = new ReversalProvider(this.mContext);
+                reversalProvider.setDialogMessage("Cancelando transação com erro");
+                reversalProvider.isDefaultUI();
+                reversalProvider.setConnectionCallback(new StoneCallbackInterface() {
+                      @Override
+                      public void onSuccess() {
+                        callbackContext.success("Result - Stone - Sumni - ReverterTransacaoComErro: OK");
+                      }
+
+                      @Override
+                      public void onError() {
+                        callbackContext.success("Result - Stone - Sumni - ReverterTransacaoComErro: Error");
+                      }
+                });
+                new Thread(() -> {
+                    reversalProvider.execute();
+                }).start();
+                return true;
+            } catch (Exception error1) {
+                callbackContext.error("Result - Stone - Sumni - ReverterTransacaoComErro: " + "Error Detail: " + error1);
+            }
+            return false;
+        }
+
         else if (action.equals("ImprimirComprovanteTransacao")) {
             JSONObject params = args.getJSONObject(0);
             try {
@@ -406,12 +459,25 @@ public class StoneSumni {
                 cancellationProvider.setDialogMessage("Cancelando...");
                 cancellationProvider.setConnectionCallback(new StoneCallbackInterface() { // chamada de retorno.
                      public void onSuccess() {
-                         callbackContext.success(cancellationProvider.getMessageFromAuthorize());
+                         switch (cancellationProvider.getResponseCodeEnum()) {
+                             case Approved: case PartialApproved:
+                                 callbackContext.success(cancellationProvider.getMessageFromAuthorize());
+                                 break;
+                             case Declined:
+                                 callbackContext.error(cancellationProvider.getMessageFromAuthorize());
+                                 break;
+                             case TechnicalError:
+                                 callbackContext.error(cancellationProvider.getMessageFromAuthorize());
+                                 break;
+                             case Default:
+                                 callbackContext.error(cancellationProvider.getMessageFromAuthorize());
+                                 break;
+                         }
+
                      }
 
                      public void onError() {
-                         String teste2 = "";
-                         callbackContext.error(cancellationProvider.getMessageFromAuthorize());
+                         callbackContext.error(cancellationProvider.getListOfErrors().toString());
                      }
                 });
                 cancellationProvider.execute();
@@ -421,6 +487,57 @@ public class StoneSumni {
             }
             return false;
         }
+
+        else if (action.equals("CancelarTransacaoCompleto")) {
+            JSONObject params = args.getJSONObject(0);
+            try {
+                String transactionObjectStr = params.getString("transactionObject");
+                TransactionObject transactionObject = parseJsonStringToObj(transactionObjectStr,TransactionObject.class);
+
+                final CancellationProvider cancellationProvider = new CancellationProvider(this.mContext, transactionObject);
+                cancellationProvider.useDefaultUI(false); // para dar feedback ao usuario ou nao.
+                cancellationProvider.setDialogMessage("Cancelando...");
+                cancellationProvider.setConnectionCallback(new StoneCallbackInterface() { // chamada de retorno.
+                    public void onSuccess() {
+
+                        TransactionDAO transactionDAO = new TransactionDAO(mContext);
+                        List<TransactionObject> transactionObjects = transactionDAO.getAllTransactionsOrderByIdDesc();
+
+
+
+                        switch (cancellationProvider.getResponseCodeEnum()) {
+                            case Approved: case PartialApproved:
+                                for (TransactionObject item : transactionObjects) {
+                                    if (transactionObject.getTransactionReference().equals((item.getTransactionReference()))) {
+                                        callbackContext.success(parseObjToJsonSrtring(item));
+                                        return;
+                                    }
+                                }
+                                break;
+
+                            case Declined:
+                                callbackContext.error(cancellationProvider.getMessageFromAuthorize());
+                                break;
+                            case TechnicalError:
+                                callbackContext.error(cancellationProvider.getMessageFromAuthorize());
+                                break;
+                            case Default:
+                                callbackContext.error(cancellationProvider.getMessageFromAuthorize());
+                                break;
+                        }
+                    }
+
+                    public void onError() {
+                        callbackContext.error(cancellationProvider.getListOfErrors().toString());
+                    }
+                });
+                cancellationProvider.execute();
+                return true;
+            } catch (Exception error1) {
+                callbackContext.error("Result - Stone - Sumni - CancelarTransacao: " + "Error Detail: " + error1);
+            }
+            return false;
+        }
         return false;
     }
 
@@ -571,22 +688,9 @@ public class StoneSumni {
             AsyncTask<Void, Void, Bitmap> taskBitMap = new AsyncTask<Void, Void, Bitmap>() {
                 @Override
                 protected Bitmap doInBackground(Void... voids) {
-//                    Html2BitmapConfigurator html2BitmapConfigurator = new Html2BitmapConfigurator() {
-//
-//                        @Override
-//                        public void configureWebView(WebView webview) {
-//                            webview.setBackgroundColor(Color.MAGENTA);
-//                            webview.getSettings().setTextZoom(150);
-//                        }
-//                    };
-                    //Html2Bitmap build = new Html2Bitmap.Builder().setContext(mContext).setContent(WebViewContent.html(htmlString)).setBitmapWidth(380).setMeasureDelay(10).setScreenshotDelay(10).setStrictMode(true).setTimeout(5).setTextZoom(150).setConfigurator(html2BitmapConfigurator).build();
-                    Html2Bitmap build = new Html2Bitmap.Builder().setContext(mContext).setContent(WebViewContent.html(htmlString)).setBitmapWidth(380).setMeasureDelay(300).setScreenshotDelay(300).setStrictMode(true).setTimeout(15).setTextZoom(100).build();
+                    Html2Bitmap build = new Html2Bitmap.Builder().setContext(mContext).setContent(WebViewContent.html(htmlString)).setBitmapWidth(380).setMeasureDelay(300).setScreenshotDelay(300).setStrictMode(true).setTimeout(15).setTextZoom(96).build();
                     Bitmap bitmapResult = build.getBitmap();
                     return bitmapResult;
-
-
-//                    Bitmap  bitmapResult = new Html2Bitmap.Builder().setContext(mContext).setContent(WebViewContent.html(htmlString)).build().getBitmap();
-//                    return bitmapResult;
                 }
 
                 @Override
@@ -672,10 +776,10 @@ public class StoneSumni {
                 "\n" +
                 "\n" +
                 "        .printer-ticket {\n" +
+                "            /*border: solid 1px black;*/\n" +
                 "            /* background-color: #ffffcc; */\n" +
                 "            background-color: white;\n" +
                 "            font-size: 16px;\n" +
-
                 "            /* padding: 10px; */\n" +
                 "            max-width: 380px;\n" +
                 "            /* border: solid 1px black; */\n" +
@@ -697,6 +801,8 @@ public class StoneSumni {
                 "        }\n" +
                 "\n" +
                 "        .printer-ticket * {\n" +
+                "            /*border-left: 1px solid black;*/\n" +
+                "            /*border-right: 1px solid black;*/\n" +
                 "            font-family: monospace;\n" +
                 "            /* font-family: Consolas, Regular;*/\n" +
                 "            /* font-size: 100%; */\n" +
@@ -793,7 +899,7 @@ public class StoneSumni {
                 "        body {\n" +
                 "            margin: 0px;\n" +
                 "            width: 380px;\n" +
-                "            border: 1px solid black;\n" +
+                "            /*border: 1px solid black;*/\n" +
                 "        }\n" +
                 "\n" +
                 "\n" +
@@ -821,7 +927,7 @@ public class StoneSumni {
                 "\n" +
                 "        }\n" +
                 "\n" +
-                "        .printer-ticket * {\n" +
+             "        .printer-ticket * {\n" +
                 "            font-family: monospace;\n" +
                 "            /* font-size: 100%; */\n" +
                 "            color: black;\n" +

package/src/build.gradle

@@ -22,6 +22,10 @@ dependencies {
     implementation(name: 'InterfaceAutomacao-v2.0.0.9', ext: 'aar')
     implementation(name: 'cloudpossdk-s-1.0.2', ext: 'aar')
     implementation(name: 'minipdvm8', ext: 'aar')
+    // implementation(name: 'barcodescanner-release-2.1.5', ext: 'aar') {
+    //   exclude group: 'com.google.zxing', module: 'android-core'
+    //   transitive = false
+    // }
     
 
     //UseRede
@@ -55,4 +59,7 @@ dependencies {
     implementation "br.com.stone:stone-sdk-posandroid-sunmi:4.0.6"
 
     implementation 'com.izettle:html2bitmap:1.9'
+
+
+    // implementation 'cordova-plugin-screen-orientation:3.0.2'
 }

package/www/Stone/Sumni.js

@@ -18,6 +18,14 @@ exports.IniciarTransacao = function (params, success, error) {
     exec(success, error, 'NetControllCordovaPluginsIntegration', 'Stone.Sumni.IniciarTransacao', [params]);
 }
 
+exports.AbortarTransacao = function (params, success, error) {
+    exec(success, error, 'NetControllCordovaPluginsIntegration', 'Stone.Sumni.AbortarTransacao', [params]);
+}
+
+exports.ReverterTransacaoComErro = function (success, error) {
+    exec(success, error, 'NetControllCordovaPluginsIntegration', 'Stone.Sumni.ReverterTransacaoComErro');
+}
+
 exports.ImprimirComprovanteTransacao = function (params, success, error) {
     exec(success, error, 'NetControllCordovaPluginsIntegration', 'Stone.Sumni.ImprimirComprovanteTransacao', [params]);
 }
@@ -30,6 +38,10 @@ exports.CancelarTransacao = function (params, success, error) {
     exec(success, error, 'NetControllCordovaPluginsIntegration', 'Stone.Sumni.CancelarTransacao', [params]);
 }
 
+exports.CancelarTransacaoCompleto = function (params, success, error) {
+    exec(success, error, 'NetControllCordovaPluginsIntegration', 'Stone.Sumni.CancelarTransacaoCompleto', [params]);
+}
+