# HG changeset patch
# User Ranjith S R <ranjith@qualiantech.com>
# Date 1588065364 -19800
#      Tue Apr 28 14:46:04 2020 +0530
# Node ID 6c8b1b7d3d3d65e0743cb083cca754aa1b052fd3
# Parent  d98b94db37a7015b8ba95bd3b00a92070fd8df31
42074 DKT 19Q3 : RFID should be disabled when HM protocol is defined as http

* If POS is opened with https and HM protocol is defined as http, then RFID should be disabled

diff -r d98b94db37a7 -r 6c8b1b7d3d3d web/org.openbravo.retail.posterminal/js/components/menu.js
--- a/web/org.openbravo.retail.posterminal/js/components/menu.js	Wed Aug 21 05:42:53 2019 +0000
+++ b/web/org.openbravo.retail.posterminal/js/components/menu.js	Tue Apr 28 14:46:04 2020 +0530
@@ -847,33 +847,27 @@
   },
   pointOfSaleLoad: function(inSender, inEvent) {
     if (OB.UTIL.RfidController.isRfidConfigured()) {
-      var protocol = OB.POS.hwserver.url.split('/')[0];
-      if (window.location.protocol === protocol) {
-        if (
-          OB.UTIL.RfidController.get('connectionLost') ||
-          !OB.UTIL.RfidController.get('connected')
-        ) {
-          this.addClass('btn-icon-switchoffline');
-          return;
-        } else {
-          this.removeClass('btn-icon-switchoffline');
-        }
-        if (
-          !OB.UTIL.RfidController.get('isRFIDEnabled') ||
-          !OB.UTIL.RfidController.get('reconnectOnScanningFocus')
-        ) {
-          this.addClass('btn-icon-switchoff');
-          this.removeClass('btn-icon-switchon');
-        } else {
-          this.addClass('btn-icon-switchon');
-          this.removeClass('btn-icon-switchoffline');
-        }
+      if (
+        OB.UTIL.RfidController.get('connectionLost') ||
+        !OB.UTIL.RfidController.get('connected')
+      ) {
+        this.addClass('obUiMenuDisableEnableRFIDReader_switchOffline');
+        return;
       } else {
-        this.hide();
-        OB.UTIL.showConfirmation.display(
-          OB.I18N.getLabel('OBPOS_POSHWMProtocolMismatch')
-        );
+        this.removeClass('obUiMenuDisableEnableRFIDReader_switchOffline');
       }
+      if (
+        !OB.UTIL.RfidController.get('isRFIDEnabled') ||
+        !OB.UTIL.RfidController.get('reconnectOnScanningFocus')
+      ) {
+        this.addClass('obUiMenuDisableEnableRFIDReader_switchOff');
+        this.removeClass('obUiMenuDisableEnableRFIDReader_switchOn');
+      } else {
+        this.addClass('obUiMenuDisableEnableRFIDReader_switchOn');
+        this.removeClass('obUiMenuDisableEnableRFIDReader_switchOffline');
+      }
+    } else {
+      this.hide();
     }
   }
 });
diff -r d98b94db37a7 -r 6c8b1b7d3d3d web/org.openbravo.retail.posterminal/js/utils/rfidWebsocket.js
--- a/web/org.openbravo.retail.posterminal/js/utils/rfidWebsocket.js	Wed Aug 21 05:42:53 2019 +0000
+++ b/web/org.openbravo.retail.posterminal/js/utils/rfidWebsocket.js	Tue Apr 28 14:46:04 2020 +0530
@@ -14,12 +14,20 @@
 });
 
 OB.UTIL.RfidController.isRfidConfigured = function() {
-  if (OB.POS.hwserver && OB.POS.modelterminal.get('terminal')) {
-    return (
-      OB.POS.hwserver.url &&
-      OB.POS.modelterminal.get('terminal').terminalType.useRfid &&
-      window.location.protocol === OB.POS.hwserver.url.split('/')[0]
-    );
+  if (
+    OB.POS.hwserver &&
+    OB.POS.modelterminal.get('terminal') &&
+    OB.POS.hwserver.url &&
+    OB.POS.modelterminal.get('terminal').terminalType.useRfid
+  ) {
+    if (OB.UTIL.isHTTPSAvailable()) {
+      return OB.POS.hwserver.url.split('/')[0] === 'http:'
+        ? OB.POS.hwserver.url.indexOf('localhost') !== -1 ||
+            OB.POS.hwserver.url.indexOf('127.') !== -1
+        : true;
+    } else {
+      return OB.POS.hwserver.url.split('/')[0] === 'http:';
+    }
   } else {
     return false;
   }