cordova-plugin-netcontroll-integration 1.0.89 → 1.0.92

package/README.md

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cordova-plugin-netcontroll-integration",
-  "version": "1.0.89",
+  "version": "1.0.92",
   "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.89"
+<plugin id="cordova-plugin-netcontroll-integration" version="1.0.92"
     xmlns="http://apache.org/cordova/ns/plugins/1.0"
     xmlns:android="http://schemas.android.com/apk/res/android">
 
@@ -7,30 +7,41 @@
     <js-module name="NetControllCordovaPluginsIntegration" src="www/NetControllCordovaPluginsIntegration.js">
         <clobbers target="cordova.plugins.NetControllCordovaPluginsIntegration" />
     </js-module>
+
+
+    <js-module name="CieloLioLocal" src="www/Cielo/LioLocal.js">
+        <clobbers target="cordova.plugins.NetControllCordovaPluginsIntegration.CieloLioLocal" />
+    </js-module>    
+
+
+
     <js-module name="ElginM10Terminal" src="www/Elgin/M10Terminal.js">
-        <!-- <clobbers target="window.ElginM10Terminal" /> -->
         <clobbers target="cordova.plugins.NetControllCordovaPluginsIntegration.ElginM10Terminal" />
     </js-module>
-
     <js-module name="ElginPay" src="www/Elgin/ElginSmartPay.js">
-        <!-- <clobbers target="window.ElginM10Terminal" /> -->
         <clobbers target="cordova.plugins.NetControllCordovaPluginsIntegration.ElginSmartPay" />
-    </js-module>
+    </js-module>    
 
-    <js-module name="CieloLioLocal" src="www/Cielo/LioLocal.js">
-        <!-- <clobbers target="window.ElginM10Terminal" /> -->
-        <clobbers target="cordova.plugins.NetControllCordovaPluginsIntegration.CieloLioLocal" />
-    </js-module>
 
+    
     <js-module name="StoneSumni" src="www/Stone/Sumni.js">
-        <!-- <clobbers target="window.ElginM10Terminal" /> -->
-        <clobbers target="cordova.plugins.NetControllCordovaPluginsIntegration.StoneSumni" />
+       <clobbers target="cordova.plugins.NetControllCordovaPluginsIntegration.StoneSumni" />
     </js-module>
 
     <js-module name="RedeGPos700" src="www/Rede/RedeGpos700.js">
-        <clobbers target="cordova.plugins.NetControllCordovaPluginsIntegration.RedeGPos700" />
+       <clobbers target="cordova.plugins.NetControllCordovaPluginsIntegration.RedeGPos700" />
+    </js-module>
+    
+    <js-module name="SafraPayIngenico" src="www/Safra/SafraPayIngenico.js">
+        <clobbers target="cordova.plugins.NetControllCordovaPluginsIntegration.SafraPayIngenico" />
+    </js-module>
+
+    <js-module name="PagSeguroPax" src="www/PagSeguro/PagSeguroPax.js">
+        <clobbers target="cordova.plugins.NetControllCordovaPluginsIntegration.PagSeguroPax" />
     </js-module>
 
+
+
     <js-module src="www/alice.js" name="alice">
         <clobbers target="cordova.plugins.NetControllCordovaPluginsIntegration.alice" />
         <!-- <runs/> -->
@@ -56,40 +67,60 @@
         </config-file>
 
         <!-- executable source code > -->
-        <source-file src="src/android/NetControllCordovaPluginsIntegration.java" target-dir="src/cordova-plugin-m8/cordova-plugin-m8" />
-        <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/NetControllCordovaPluginsIntegration.java" target-dir="src/cordova-plugin-netcontroll-integration" />
+        <source-file src="src/android/Utils/NetControllHelpers.java" target-dir="src/cordova-plugin-netcontroll-integration/Utils" />
+        <source-file src="src/android/Utils/NetControllPrinter.java" target-dir="src/cordova-plugin-netcontroll-integration/Utils" />
+        
         <!-- <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" /> -->
 
-        <framework src="src/build.gradle" custom="true" type="gradleReference" />
-        <framework src="src/android/netcontroll.gradle" custom="true" type="gradleReference" />
 
-        <!-- Lib Files -->
+        <!--______________________________Cielo______________________________-->
+        <source-file src="src/android/Cielo/CieloLioLocal.java"                  target-dir="src/cordova-plugin-netcontroll-integration/Cielo" />
+
+        <!--______________________________Elgin______________________________-->
+        <source-file src="src/android/Elgin/ElginM10Terminal.java"               target-dir="src/cordova-plugin-netcontroll-integration/Elgin" />
+        <source-file src="src/android/Elgin/ElginSmartPay.java"                  target-dir="src/cordova-plugin-netcontroll-integration/Elgin" />
+
         <resource-file src="src/libs/minipdvm8.aar" target="libs/minipdvm8.aar" />
         <!-- <resource-file src="src/libs/e1-v1.0.16-release.aar" target="libs/e1-v1.0.16-release.aar" /> -->
         <resource-file src="src/libs/e1-v2.0.4-release.aar" target="libs/e1-v2.0.4-release.aar" />
         <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 -->
+        <!--______________________________Stone______________________________-->
+        <source-file src="src/android/Stone/StoneSumni.java"                     target-dir="src/cordova-plugin-netcontroll-integration/Stone" />
+
+        <!--_____________________________UseRede_____________________________-->
+        <source-file src="src/android/Rede/RedeGPos700.java"                     target-dir="src/cordova-plugin-netcontroll-integration/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" />
         <!-- <resource-file src="src/libs/libgedi-0.190121.gpos800.aar" target="libs/libgedi-0.190121.gpos800.aar" /> -->
 
+
         <resource-file src="src/libs/Development_GertecDeveloper_CustomerAPP.jks" target="libs/Development_GertecDeveloper_CustomerAPP.jks" />
         <resource-file src="src/libs/Development_GertecDeveloper_EnhancedAPP.jks" target="libs/Development_GertecDeveloper_EnhancedAPP.jks" />
         <!-- <resource-file src="src/libs/development_gertecdeveloper_customer_app_29_19.jks" target="libs/development_gertecdeveloper_customer_app_29_19.jks" /> -->
+
+
+        <!--______________________________Safra______________________________-->
+		<source-file src="src/android/Safra/SafraPayIngenico.java"               target-dir="src/cordova-plugin-netcontroll-integration/Safra" />
+
+        <resource-file src="src/libs/IntegracaoSafra-v2.0.aar" target="libs/IntegracaoSafra-v2.0.aar" />
+
+        <!--______________________________PagSeguro___________________________-->
+        <source-file src="src/android/PagSeguro/PagSeguroPax.java"               target-dir="src/cordova-plugin-netcontroll-integration/PagSeguro" />
+
+
+        <!--______________________________Other______________________________-->
         
+        <!-- BarcodeScanner -->
+        <!-- <resource-file src="src/libs/barcodescanner-release-2.1.5.aar" target="libs/barcodescanner-release-2.1.5.aar" /> -->
 
-        <!--
-        <source-file src="src/android/NetControllCordovaPluginsIntegration.java" target-dir="src/cordova/plugin/netcontroll/integration/NetControllCordovaPluginsIntegration" />
-         -->
+      
+        <framework src="src/build.gradle" custom="true" type="gradleReference" />
+        <framework src="src/android/netcontroll.gradle" custom="true" type="gradleReference" />
     </platform>
 </plugin>

package/src/android/Cielo/CieloLioLocal.java

@@ -1,6 +1,7 @@
 package cordova.plugin.netcontroll.integration;
+import cordova.plugin.netcontroll.integration.NetControllHelpers;
 
-import org.apache.cordova.CordovaPlugin;
+// import org.apache.cordova.CordovaPlugin;
 import org.apache.cordova.CallbackContext;
 import org.apache.cordova.CordovaInterface;
 import org.apache.cordova.CordovaWebView;
@@ -20,31 +21,55 @@ import com.izettle.html2bitmap.Html2Bitmap;
 import com.izettle.html2bitmap.content.WebViewContent;
 
 
-// import androidx.annotation.NonNull;
 import androidx.annotation.NonNull;
 import android.app.Activity;
-import android.graphics.Bitmap;
+// import android.graphics.Bitmap;
 import android.content.Context;
-import android.util.Log;
-import android.widget.Toast;
-import android.net.Uri;
-import android.content.Intent;
-import android.provider.MediaStore;
+// import android.util.Log;
+// import android.widget.Toast;
+// import android.net.Uri;
+// import android.content.Intent;
+// import android.provider.MediaStore;
 import android.os.Build;
 
-import static android.app.Activity.RESULT_OK;
+// import static android.app.Activity.RESULT_OK;
 
 import java.util.HashMap;
 import java.util.Map;
 
-import javax.security.auth.callback.Callback;
+// import javax.security.auth.callback.Callback;
 
 import java.util.List;
 
 //Json Serialize
 import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
+// import com.google.gson.GsonBuilder;
+
+
+
+
 
+import com.google.zxing.BarcodeFormat;
+import com.google.zxing.WriterException;
+// import com.google.zxing.qrcode.QRCodeWriter;
+import com.google.zxing.common.BitMatrix;
+
+//Bitmap
+// import android.graphics.Bitmap;
+// import android.graphics.BitmapFactory;
+// import android.graphics.Matrix;
+
+import android.util.Base64;
+import java.io.ByteArrayOutputStream;
+// import java.util.Objects;
+// import java.util.stream.Collectors;
+
+
+// import java.lang.reflect.Type;
+import java.util.ArrayList;
+import java.util.EnumMap;
+// import java.util.HashMap;
+// import java.util.Map;
 
 //Cielo Package Sdk
 
@@ -68,35 +93,10 @@ import cielo.sdk.order.payment.PaymentCode;
 import cielo.sdk.order.payment.PaymentListener;
 import cielo.sdk.order.payment.PaymentError;
 import cielo.sdk.order.PrinterListener;
+
 import cielo.sdk.printer.PrinterManager;
 import cielo.sdk.info.InfoManager;
 
-
-import com.google.zxing.BarcodeFormat;
-import com.google.zxing.WriterException;
-import com.google.zxing.qrcode.QRCodeWriter;
-import com.google.zxing.common.BitMatrix;
-
-//Bitmap
-import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
-import android.graphics.Matrix;
-
-import android.util.Base64;
-import java.io.ByteArrayOutputStream;
-import java.util.Objects;
-import java.util.stream.Collectors;
-
-
-import java.lang.reflect.Type;
-import java.util.ArrayList;
-import java.util.EnumMap;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * This class echoes a string called from JavaScript.
- */
 public class CieloLioLocal {
 
     //Cielo Package Sdk
@@ -420,7 +420,7 @@ public class CieloLioLocal {
         }
         order = orderManager.createDraftOrder(orderReference);
         if (order != null) {
-            callbackContext.success(this.parseObjToJsonSrtring(order));
+            callbackContext.success(NetControllHelpers.parseObjToJsonSrtring(order));
             return true;
         }
         return false;
@@ -437,7 +437,7 @@ public class CieloLioLocal {
             return false;
         }
         order.addItem(sku, name, unitPrice, quantity, unityOfMeasure);
-        callbackContext.success(this.parseObjToJsonSrtring(order));
+        callbackContext.success(NetControllHelpers.parseObjToJsonSrtring(order));
         return true;
     }
 
@@ -493,7 +493,7 @@ public class CieloLioLocal {
                      order = paidOrder;
                      order.markAsPaid();
                      orderManager.updateOrder(order);
-                     callbackContext.success(parseObjToJsonSrtring(order));
+                     callbackContext.success(NetControllHelpers.parseObjToJsonSrtring(order));
                      resetState();
                 }
 
@@ -528,7 +528,7 @@ public class CieloLioLocal {
         try {
             ResultOrders resultOrders = orderManager.retrieveOrders(pageSize, page);
             if (resultOrders != null) {
-                String resultOrdersStr = parseObjToJsonSrtring(resultOrders);
+                String resultOrdersStr = NetControllHelpers.parseObjToJsonSrtring(resultOrders);
                 callbackContext.success(resultOrdersStr);    
             } else {
                 callbackContext.success("null");  
@@ -570,7 +570,7 @@ public class CieloLioLocal {
                             cancelledOrder.cancel();
                             orderManager.updateOrder(cancelledOrder);
                             order = cancelledOrder;
-                            callbackContext.success(parseObjToJsonSrtring(order));
+                            callbackContext.success(NetControllHelpers.parseObjToJsonSrtring(order));
                         }
 
                         @Override
@@ -804,12 +804,6 @@ public class CieloLioLocal {
 
 
     // Cielo Global
-    protected String parseObjToJsonSrtring(Object obj) {
-        Gson gson = new Gson();
-        String result = gson.toJson(obj);
-        return result;
-    }
-
     protected void resetState() {
         order = null;
     }

package/src/android/Elgin/ElginM10Terminal.java

@@ -1,6 +1,7 @@
 package cordova.plugin.netcontroll.integration;
+import cordova.plugin.netcontroll.integration.NetControllHelpers;
 
-import org.apache.cordova.CordovaPlugin;
+// import org.apache.cordova.CordovaPlugin;
 import org.apache.cordova.CallbackContext;
 import org.apache.cordova.CordovaInterface;
 import org.apache.cordova.CordovaWebView;
@@ -9,40 +10,73 @@ import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 
-import android.app.Activity;
+
 import android.graphics.Bitmap;
+import android.os.AsyncTask;
+
+import com.google.zxing.EncodeHintType;
+import com.google.zxing.MultiFormatWriter;
+import com.google.zxing.qrcode.decoder.ErrorCorrectionLevel;
+import com.izettle.html2bitmap.Html2Bitmap;
+import com.izettle.html2bitmap.content.WebViewContent;
+
+
+import androidx.annotation.NonNull;
+import android.app.Activity;
+// import android.graphics.Bitmap;
 import android.content.Context;
-import android.util.Log;
-import android.widget.Toast;
-import android.net.Uri;
-import android.content.Intent;
-import android.provider.MediaStore;
+// import android.util.Log;
+// import android.widget.Toast;
+// import android.net.Uri;
+// import android.content.Intent;
+// import android.provider.MediaStore;
+import android.os.Build;
 
-import android.graphics.Bitmap;
+// import static android.app.Activity.RESULT_OK;
+
+import java.util.HashMap;
+import java.util.Map;
+
+// import javax.security.auth.callback.Callback;
+
+import java.util.List;
+
+//Json Serialize
+import com.google.gson.Gson;
+// import com.google.gson.GsonBuilder;
+
+
+
+
+
+import com.google.zxing.BarcodeFormat;
+import com.google.zxing.WriterException;
+// import com.google.zxing.qrcode.QRCodeWriter;
+import com.google.zxing.common.BitMatrix;
+
+//Bitmap
+// import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
-import android.graphics.Matrix;
+// import android.graphics.Matrix;
 
 import android.util.Base64;
-// import android.util.Base64.Encoder;
-// import android.util.Base64.Decoder;
+import java.io.ByteArrayOutputStream;
+// import java.util.Objects;
+// import java.util.stream.Collectors;
 
-// import java.util.Base64;
-// import java.util.Base64.Encoder;
-// import java.util.Base64.Decoder;
 
-import static android.app.Activity.RESULT_OK;
+// import java.lang.reflect.Type;
+import java.util.ArrayList;
+import java.util.EnumMap;
+// import java.util.HashMap;
+// import java.util.Map;
 
-import java.util.HashMap;
-import java.util.Map;
+//Elgin M10 Sdk
 
-//Elgin Plugins
 import com.elgin.e1.Impressora.Termica;
 
 import javax.security.auth.callback.Callback;
 
-/**
- * This class echoes a string called from JavaScript.
- */
 public class ElginM10Terminal {
     //Cordova/Java Params
     private Activity mActivity;

package/src/android/Elgin/ElginSmartPay.java

@@ -1,4 +1,5 @@
 package cordova.plugin.netcontroll.integration;
+import cordova.plugin.netcontroll.integration.NetControllHelpers;
 
 import org.apache.cordova.CordovaPlugin;
 import org.apache.cordova.CallbackContext;
@@ -62,9 +63,6 @@ public class ElginSmartPay {
     private static final int ERRO_IMPRESSAO = 3;
     private static final int TRANSACAO_PENDENTE = 4;
 
-
-
-
     //Cordova/Java Params
     private Activity mActivity;
     private Context mContext;

package/src/android/NetControllCordovaPluginsIntegration.java

@@ -1,40 +1,16 @@
 package cordova.plugin.netcontroll.integration;
 
 import org.apache.cordova.CordovaPlugin;
-import org.apache.cordova.PluginResult;
 import org.apache.cordova.CallbackContext;
 import org.apache.cordova.CordovaInterface;
 import org.apache.cordova.CordovaWebView;
 
 import org.json.JSONArray;
 import org.json.JSONException;
-import org.json.JSONObject;
 
 import android.app.Activity;
-import android.graphics.Bitmap;
 import android.content.Context;
-import android.os.AsyncTask;
-import android.util.Base64;
-import android.util.Log;
-import android.widget.Toast;
-import android.net.Uri;
-import android.content.Intent;
-import android.provider.MediaStore;
 
-import static android.app.Activity.RESULT_OK;
-
-import com.izettle.html2bitmap.Html2Bitmap;
-import com.izettle.html2bitmap.content.WebViewContent;
-
-import java.io.ByteArrayOutputStream;
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.security.auth.callback.Callback;
-
-/**
- * This class echoes a string called from JavaScript.
- */
 public class NetControllCordovaPluginsIntegration extends CordovaPlugin {
     //Elgin
     public ElginM10Terminal elginM10Terminal;
@@ -49,6 +25,12 @@ public class NetControllCordovaPluginsIntegration extends CordovaPlugin {
     //Rede
     public RedeGPos700 redeGPos700;
 
+    //SafraPay
+    public SafraPayIngenico safraPayIngenico;
+
+     //PagSeguro
+    public PagSeguroPax pagSeguroPax;
+
     //Cordova/Java Params
     private Activity mActivity;
     private Context mContext;
@@ -62,9 +44,6 @@ public class NetControllCordovaPluginsIntegration extends CordovaPlugin {
         this.webView = webView;
         mActivity = cordova.getActivity();
         mContext = cordova.getActivity().getApplicationContext();
-
-//        cordova.setActivityResultCallback(this);
-
         mCordova = cordova;
     }
 
@@ -103,6 +82,20 @@ public class NetControllCordovaPluginsIntegration extends CordovaPlugin {
         }
     }
 
+    private void initializeSafraPayIngenico() {
+        if (this.safraPayIngenico == null) {
+            this.safraPayIngenico = new SafraPayIngenico();
+            this.safraPayIngenico.initialize(this.cordova, this.webView);
+        }
+    }
+
+    private void initializePagSeguroPax() {
+        if (this.pagSeguroPax == null) {
+            this.pagSeguroPax = new PagSeguroPax();
+            this.pagSeguroPax.initialize(this.cordova, this.webView);
+        }
+    }
+
     @Override
     public boolean execute(String action, JSONArray args, CallbackContext callbackContext) throws JSONException {
         try {
@@ -173,6 +166,28 @@ public class NetControllCordovaPluginsIntegration extends CordovaPlugin {
                         default:
                             break;
                     }
+                case "safra":
+                    String safraProduct = actionProviderList[1];
+                    switch (safraProduct.toLowerCase()) {
+                        case "safrapayingenico":
+                            this.initializeSafraPayIngenico();
+                            String safraAction = actionProviderList[2];
+                            boolean resultSafraExecute = this.safraPayIngenico.execute(safraAction, args, callbackContext);
+                            return resultSafraExecute;
+                        default:
+                            break;
+                    }
+                case "pagseguro":
+                    String pagSeguroProduct = actionProviderList[1];
+                    switch (pagSeguroProduct.toLowerCase()) {
+                        case "pagseguropax":
+                            this.initializePagSeguroPax();
+                            String pagSeguroAction = actionProviderList[2];
+                            boolean resultPagSeguroExecute = this.pagSeguroPax.execute(pagSeguroAction, args, callbackContext);
+                            return resultPagSeguroExecute;
+                        default:
+                            break;
+                    }
                 default:
                     break;
             }