Merge branch 'master' into RG-3435

android/app/build.gradle

@@ -110,5 +110,5 @@ dependencies {
     compile 'com.android.support:appcompat-v7:25.3.1'
     compile 'com.squareup.okhttp3:okhttp:3.8.1'
     compile 'com.squareup.okio:okio:1.13.0'
-    compile 'me.dm7.barcodescanner:zxing:1.9.7'
+    compile 'me.dm7.barcodescanner:zxing:1.9.8'
 }

android/app/src/main/java/com/dinect/checker/zxing/ScannerActivity.java

@@ -17,12 +17,16 @@ package com.dinect.checker.zxing;
 
 import android.os.Bundle;
 import android.os.Handler;
+import android.util.Log;
 import android.view.View;
 
 import com.dinect.checker.AbstractScannerActivity;
 import com.dinect.checker.R;
+import com.google.zxing.BarcodeFormat;
 import com.google.zxing.Result;
 
+import java.util.ArrayList;
+
 import me.dm7.barcodescanner.zxing.ZXingScannerView;
 
 /**
@@ -45,6 +49,9 @@ public class ScannerActivity extends AbstractScannerActivity
         initToolbar(R.id.zxingToolbar, getString(R.string.scanner_title));
 
         scannerView = (ZXingScannerView) initScanner();
+        ArrayList<BarcodeFormat> formats = new ArrayList<>();
+        formats.add(BarcodeFormat.UPC_EAN_EXTENSION);
+        scannerView.setFormats(formats);
         addScanner(scannerView, R.id.zxingRoot);
     }
 

lib/consts.dart

@@ -3,8 +3,8 @@ import 'package:flutter/material.dart';
 // Serious constants
 const String appName = "AutoBonus";
 
-const String url = 'https://pos-api-int.dinect.com/20130701/';
+const String url = 'https://pos-api-autoclub.dinect.com/20130701/';
-const String appToken = '9fec83cdca38c357e6b65dbb17514cdd36bf2a08';
+const String appToken = 'bdea0f3ba9034b688019a7cac753d1209e2b227f';
 
 // Assets
 const String logout_png = 'assets/logout.png';