0026280: Some bluetooth bardcode reader does not work in IOS 7.1

diff -r 57e9da3efe0f web/org.openbravo.retail.posterminal/js/model/order.js
--- a/web/org.openbravo.retail.posterminal/js/model/order.js	Mon Apr 07 20:01:16 2014 +0200
+++ b/web/org.openbravo.retail.posterminal/js/model/order.js	Wed Apr 09 13:30:21 2014 +0200
@@ -888,6 +888,7 @@
     },
     //Attrs is an object of attributes that will be set in order 
     addProduct: function (p, qty, options, attrs) {
+    	  OB.warn('_addProduct');
       var me = this;
       OB.MobileApp.model.hookManager.executeHooks('OBPOS_AddProductToOrder', {
         receipt: this,
diff -r 57e9da3efe0f web/org.openbravo.retail.posterminal/js/pointofsale/view/keyboardorder.js
--- a/web/org.openbravo.retail.posterminal/js/pointofsale/view/keyboardorder.js	Mon Apr 07 20:01:16 2014 +0200
+++ b/web/org.openbravo.retail.posterminal/js/pointofsale/view/keyboardorder.js	Wed Apr 09 13:30:21 2014 +0200
@@ -476,12 +476,14 @@
 
     function successCallbackProducts(dataProducts) {
       if (dataProducts && dataProducts.length > 0) {
+    	    OB.warn('productfound');
         callback(new Backbone.Model(dataProducts.at(0)));
       } else {
         // 'UPC/EAN code not found'
         OB.UTIL.showWarning(OB.I18N.getLabel('OBPOS_KbUPCEANCodeNotFound', [txt]));
       }
     }
+    OB.warn('BarcodeActionHandler - id: '+txt);
     OB.Dal.query(OB.Model.Product, 'select * from m_product as product ' + this.addWhereFilter(txt), null, successCallbackProducts, errorCallback, this);
   },
 

diff -r b2ad379da9bd web/org.openbravo.mobile.core/source/component/ob-keyboard.js
--- a/web/org.openbravo.mobile.core/source/component/ob-keyboard.js	Fri Apr 04 13:02:25 2014 +0200
+++ b/web/org.openbravo.mobile.core/source/component/ob-keyboard.js	Wed Apr 09 13:30:11 2014 +0200
@@ -892,7 +892,7 @@
       return true;
     }
     var me = this;
-
+OB.warn("AbstractBarcodeActionHandler - txt: "+txt);
     this.findProductByBarcode(txt, function (product) {
       me.addProductToReceipt(keyboard, product);
     }, keyboard);
diff -r b2ad379da9bd web/org.openbravo.mobile.core/source/component/ob-terminal-component.js
--- a/web/org.openbravo.mobile.core/source/component/ob-terminal-component.js	Fri Apr 04 13:02:25 2014 +0200
+++ b/web/org.openbravo.mobile.core/source/component/ob-terminal-component.js	Wed Apr 09 13:30:11 2014 +0200
@@ -144,6 +144,7 @@
    * When using focus keeper for barcode scanners, keep always the focus there
    */
   keeperBlur: function (inSender, inEvent) {
+	  OB.warn('keeperBlur');
     OB.MobileApp.view.scanningFocus(this.scanMode);
   },
 
@@ -152,6 +153,7 @@
    * properly on Android Chrome 26
    */
   keeperKey: function (k) {
+	  OB.warn('keeperKey - keyCode: '+k.keyCode+ " - keyIdentifier: "+k.keyIdentifier);
     OB.MobileApp.view.waterfall('onGlobalKeypress', {
       keyboardEvent: k
     });
@@ -165,13 +167,14 @@
     if (!OB.MobileApp.model.get('useBarcode')) {
       return;
     }
-
+OB.warn('scanningfocus');
     if (scanMode !== undefined) {
       this.scanMode = scanMode;
     }
 
     // This shouldn't be done in iOS, if done the focuskeeper loses the focus
     if (this.scanMode && navigator.userAgent.match(/iPhone|iPad|iPod/i)) {
+    	OB.warn('scanningfocus. iOS. Focused');
       keeper = document.getElementById('_focusKeeper');
       keeper.disabled = false;
       keeper.focus();
@@ -200,6 +203,7 @@
    * Global key up event. Used when not using focusKeeper
    */
   keypressHandler: function (inSender, inEvent) {
+	  OB.warn('keypressHandler - keyCode: '+inEvent.keyCode+ " - keyIdentifier: "+inEvent.keyIdentifier);
     if (OB.MobileApp.model.get('useBarcode') && this.scanMode) {
       return;
     }

diff -r 5d0b10e114f7 web/org.openbravo.mobile.core/source/component/ob-terminal-component.js
--- a/web/org.openbravo.mobile.core/source/component/ob-terminal-component.js	Thu Apr 10 10:32:10 2014 +0200
+++ b/web/org.openbravo.mobile.core/source/component/ob-terminal-component.js	Thu Apr 10 11:08:15 2014 +0200
@@ -153,7 +153,7 @@
    * properly on Android Chrome 26
    */
   keeperKey: function (k) {
-	  OB.warn('keeperKey - keyCode: '+k.keyCode+ " - keyIdentifier: "+k.keyIdentifier);
+	  OB.warn('keeperKey - keyCode: '+k.keyCode+ " - keyIdentifier: "+k.keyIdentifier+" - charCode: "+k.charCode+" - which: "+k.which);
     OB.MobileApp.view.waterfall('onGlobalKeypress', {
       keyboardEvent: k
     });
@@ -203,7 +203,7 @@
    * Global key up event. Used when not using focusKeeper
    */
   keypressHandler: function (inSender, inEvent) {
-	  OB.warn('keypressHandler - keyCode: '+inEvent.keyCode+ " - keyIdentifier: "+inEvent.keyIdentifier);
+	  OB.warn('keypressHandler - keyCode: '+inEvent.keyCode+ " - keyIdentifier: "+inEvent.keyIdentifier+" - charCode: "+inEvent.charCode+" - which: "+inEvent.which);
     if (OB.MobileApp.model.get('useBarcode') && this.scanMode) {
       return;
     }
@@ -261,13 +261,13 @@
       // listening to keypress and then sending it to the standard flow.
       if (OB.UTIL.isIOS()) {
         keeper.addEventListener('keypress', function (k) {
-          if (k.keyCode === 13) {
+          if (k.keyCode === 13 || k.which === 13) {
             OB.MobileApp.view.keeperKey(k);
           }
         });
       }
       keeper.addEventListener('keyup', function (k) {
-        if (OB.UTIL.isIOS() && k.keyCode === 13) {
+        if (OB.UTIL.isIOS() && (k.keyCode === 13 || k.which === 13)) {
           return;
         }
         OB.MobileApp.view.keeperKey(k);

diff -r d02fe8f6cc71 web/org.openbravo.mobile.core/source/component/ob-terminal-component.js
--- a/web/org.openbravo.mobile.core/source/component/ob-terminal-component.js	Thu Apr 10 15:47:52 2014 +0200
+++ b/web/org.openbravo.mobile.core/source/component/ob-terminal-component.js	Thu Apr 10 15:56:42 2014 +0200
@@ -261,9 +261,14 @@
       // listening to keypress and then sending it to the standard flow.
       if (OB.UTIL.isIOS()) {
         keeper.addEventListener('keypress', function (k) {
-          if (k.keyCode === 13 || k.which === 13) {
-            OB.MobileApp.view.keeperKey(k);
-          }
+      	  OB.warn('init timeout');
+      	  if(OB.testtimeoutid){
+      		  clearTimeout(OB.testtimeoutid);
+      	  }
+      	  OB.testtimeoutid=setTimeout(function () {
+            	  OB.warn('timeout happened');
+                OB.MobileApp.view.keeperKey(k);
+            }, 200);
         });
       }
       keeper.addEventListener('keyup', function (k) {

diff -r 0c347b9c3e6c web/org.openbravo.mobile.core/source/component/ob-terminal-component.js
--- a/web/org.openbravo.mobile.core/source/component/ob-terminal-component.js	Fri Apr 11 10:58:33 2014 +0200
+++ b/web/org.openbravo.mobile.core/source/component/ob-terminal-component.js	Fri Apr 11 10:58:57 2014 +0200
@@ -263,15 +263,20 @@
         keeper.addEventListener('keypress', function (k) {
       	  OB.warn('init timeout');
       	  if(OB.testtimeoutid){
+        	  OB.warn('timeout cleared');
       		  clearTimeout(OB.testtimeoutid);
       	  }
+          //OB.MobileApp.view.keeperKey(k);
       	  OB.testtimeoutid=setTimeout(function () {
             	  OB.warn('timeout happened');
+            	  k.keyCode=13;
+            	  k.which=13;
                 OB.MobileApp.view.keeperKey(k);
-            }, 200);
+            }, 400);
         });
       }
       keeper.addEventListener('keyup', function (k) {
+    	  OB.warn('keyup happened: which:'+k.which);
         if (OB.UTIL.isIOS() && (k.keyCode === 13 || k.which === 13)) {
           return;
         }

diff -r 4a58b88363e9 web/org.openbravo.mobile.core/source/component/ob-keyboard.js
--- a/web/org.openbravo.mobile.core/source/component/ob-keyboard.js	Mon Apr 14 12:17:22 2014 +0200
+++ b/web/org.openbravo.mobile.core/source/component/ob-keyboard.js	Mon Apr 14 12:19:23 2014 +0200
@@ -415,7 +415,7 @@
 
     if (actualChar && actualChar.match(this.keyMatcher)) {
       this.writeCharacter(actualChar);
-    } else if (which === 13) { //Handle ENTER key
+    } else if ((which === 13 && !OB.UTIL.isIOS()) || (OB.UTIL.isIOS() && inEvent.enterEvent)) { //Handle ENTER key
       actualStatus = this.getStatus();
       keeper = document.getElementById('_focusKeeper');
       if (OB.MobileApp.view.scanMode) {
diff -r 4a58b88363e9 web/org.openbravo.mobile.core/source/component/ob-terminal-component.js
--- a/web/org.openbravo.mobile.core/source/component/ob-terminal-component.js	Mon Apr 14 12:17:22 2014 +0200
+++ b/web/org.openbravo.mobile.core/source/component/ob-terminal-component.js	Mon Apr 14 12:19:23 2014 +0200
@@ -158,6 +158,14 @@
       keyboardEvent: k
     });
   },
+  
+  enterEvent: function(k){
+	  OB.warn('ENTER event for iOS');
+    OB.MobileApp.view.waterfall('onGlobalKeypress', {
+        keyboardEvent: k,
+      enterEvent: true
+    });
+  },
 
   /**
    * Checks whether focus should be places on focusKeeper and puts it there if needed
@@ -269,9 +277,7 @@
           //OB.MobileApp.view.keeperKey(k);
       	  OB.testtimeoutid=setTimeout(function () {
             	  OB.warn('timeout happened');
-            	  k.keyCode=13;
-            	  k.which=13;
-                OB.MobileApp.view.keeperKey(k);
+                OB.MobileApp.view.enterEvent(k);
             }, 400);
         });
       }