0031715: Allow, by preference, to show the messages in the bubble or in a modal popup

# HG changeset patch
# User Silambarasan Sekar <silambarasan@qualiantech.com>
# Date 1451385255 -19800
#      Tue Dec 29 16:04:15 2015 +0530
# Node ID 90acb4e756ee3ab04a1591147fd4afc3686c11ba
# Parent  d66464f1df978d21ecfa9f5461c68b9ae8bc3b9c
Enable Popup for Showerror method

diff --git a/web/org.openbravo.mobile.core/source/utils/ob-utilitiesui.js b/web/org.openbravo.mobile.core/source/utils/ob-utilitiesui.js
--- a/web/org.openbravo.mobile.core/source/utils/ob-utilitiesui.js
+++ b/web/org.openbravo.mobile.core/source/utils/ob-utilitiesui.js
@@ -427,7 +427,11 @@
 
 OB.UTIL.showError = function (s) {
   OB.error(s);
-  return OB.UTIL.showAlert.display(s, OB.I18N.getLabel('OBMOBC_LblError'), 'alert-error');
+  if (OB.MobileApp.model.hasPermission('OBPOS_EnableErrorPopup', false)) {
+    return OB.UTIL.showConfirmation.display("", s);
+  } else {
+    return OB.UTIL.showAlert.display(s, OB.I18N.getLabel('OBMOBC_LblError'), 'alert-error');
+  }
 };
 
 OB.UTIL.showStatus = function (s) {

# HG changeset patch
# User Silambarasan Sekar <silambarasan@qualiantech.com>
# Date 1451385194 -19800
#      Tue Dec 29 16:03:14 2015 +0530
# Node ID 2e77a8dc592f4d5f9b76220ee0e7edb965f35796
# Parent  10c80200bcefa48cdd7550276945ee55d808bcde
Enable popup for showerror method

diff --git a/src-db/database/sourcedata/AD_REF_LIST.xml b/src-db/database/sourcedata/AD_REF_LIST.xml
--- a/src-db/database/sourcedata/AD_REF_LIST.xml
+++ b/src-db/database/sourcedata/AD_REF_LIST.xml
@@ -1152,6 +1152,17 @@
 <!--F193D432B87541D3AF1B49BF2D56F6A9-->  <AD_MODULE_ID><![CDATA[FF808181326CC34901326D53DBCF0018]]></AD_MODULE_ID>
 <!--F193D432B87541D3AF1B49BF2D56F6A9--></AD_REF_LIST>
 
+<!--F3612469EBC744CF9A40A9E02C99E7A1--><AD_REF_LIST>
+<!--F3612469EBC744CF9A40A9E02C99E7A1-->  <AD_REF_LIST_ID><![CDATA[F3612469EBC744CF9A40A9E02C99E7A1]]></AD_REF_LIST_ID>
+<!--F3612469EBC744CF9A40A9E02C99E7A1-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--F3612469EBC744CF9A40A9E02C99E7A1-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--F3612469EBC744CF9A40A9E02C99E7A1-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--F3612469EBC744CF9A40A9E02C99E7A1-->  <VALUE><![CDATA[OBPOS_EnableErrorPopup]]></VALUE>
+<!--F3612469EBC744CF9A40A9E02C99E7A1-->  <NAME><![CDATA[Enable Popup for Error message]]></NAME>
+<!--F3612469EBC744CF9A40A9E02C99E7A1-->  <AD_REFERENCE_ID><![CDATA[A26BA480E2014707B47257024C3CBFF7]]></AD_REFERENCE_ID>
+<!--F3612469EBC744CF9A40A9E02C99E7A1-->  <AD_MODULE_ID><![CDATA[FF808181326CC34901326D53DBCF0018]]></AD_MODULE_ID>
+<!--F3612469EBC744CF9A40A9E02C99E7A1--></AD_REF_LIST>
+
 <!--F361E0B95E0F42A6A9C18A81F96D0868--><AD_REF_LIST>
 <!--F361E0B95E0F42A6A9C18A81F96D0868-->  <AD_REF_LIST_ID><![CDATA[F361E0B95E0F42A6A9C18A81F96D0868]]></AD_REF_LIST_ID>
 <!--F361E0B95E0F42A6A9C18A81F96D0868-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>

# HG changeset patch
# User Silambarasan Sekar <silambarasan@qualiantech.com>
# Date 1450953341 -19800
#      Thu Dec 24 16:05:41 2015 +0530
# Node ID 15eaa55daa760969c6935c2bcc6b1c5ecc67889f
# Parent  b7f50c3294cd13c8a3090e724d45e6b6d2d0f2f8
Verifies issue 31715: Added automated test 'I31715_CheckPopupError'

diff --git a/src-test/org/openbravo/test/mobile/common/selenium/javascript/TestId.java b/src-test/org/openbravo/test/mobile/common/selenium/javascript/TestId.java
--- a/src-test/org/openbravo/test/mobile/common/selenium/javascript/TestId.java
+++ b/src-test/org/openbravo/test/mobile/common/selenium/javascript/TestId.java
@@ -996,6 +996,7 @@
 
   // Stock Validation
   CONFIRMATION_POPUP("confirmationContainer_dynamicConfirmationPopup"), //
+  ERROR_POPUP("terminal_alertQueue"), //
   BUTTON_POPUP_PROCEED("confirmationPopup_btnProceed", EnyoKind.BUTTON), //
   BUTTON_PRODUCT_BACKPACKSANDTRAVEL_BACKPACKSV1("WVG/SV0001 - Water Bottle SV 0.75L",
       EnyoKind.PRODUCT), //
diff --git a/src-test/org/openbravo/test/mobile/common/selenium/utils/AllowedErrorsHelper.java b/src-test/org/openbravo/test/mobile/common/selenium/utils/AllowedErrorsHelper.java
--- a/src-test/org/openbravo/test/mobile/common/selenium/utils/AllowedErrorsHelper.java
+++ b/src-test/org/openbravo/test/mobile/common/selenium/utils/AllowedErrorsHelper.java
@@ -113,6 +113,7 @@
     testsAllowedToHaveJavascriptErrors.add("TerminalChangeAllowed");
     testsAllowedToHaveJavascriptErrors.add("TerminalChangeAllowedII");
     testsAllowedToHaveJavascriptErrors.add("TerminalChangeAllowedAfterCashup");
+    testsAllowedToHaveJavascriptErrors.add("I31715_CheckPopupError");
     return testsAllowedToHaveJavascriptErrors;
   }
 
@@ -142,6 +143,7 @@
     javascriptAllowedErrors.add("Data Synchronization is not complete. Wait a moment.");
     javascriptAllowedErrors.add("class org.openbravo.mobile.core.utils.LogClientLoader:");
     javascriptAllowedErrors.add("The creationDate cannot be null");
+    javascriptAllowedErrors.add("I31715_CheckPopupError");
 
     javascriptAllowedErrors.add("[dev]");
     return javascriptAllowedErrors;
@@ -163,6 +165,7 @@
     // illegal allowed tests:
     testsAllowedToHaveLogclientErrors.add("I27554_SwitchToERPAndBackToWebPOSDifferentAccount");
     testsAllowedToHaveLogclientErrors.add("SVBSChangePricelistInLayaway");
+    testsAllowedToHaveLogclientErrors.add("I31715_CheckPopupError");
     return testsAllowedToHaveLogclientErrors;
   }
 
diff --git a/src-test/org/openbravo/test/mobile/retail/pack/selenium/tests/system/I31715_CheckPopupError.java b/src-test/org/openbravo/test/mobile/retail/pack/selenium/tests/system/I31715_CheckPopupError.java
new file mode 100644
--- /dev/null
+++ b/src-test/org/openbravo/test/mobile/retail/pack/selenium/tests/system/I31715_CheckPopupError.java
@@ -0,0 +1,111 @@
+/*
+ *************************************************************************
+ * The contents of this file are subject to the Openbravo  Public  License
+ * Version  1.0  (the  "License"),  being   the  Mozilla   Public  License
+ * Version 1.1  with a permitted attribution clause; you may not  use this
+ * file except in compliance with the License. You  may  obtain  a copy of
+ * the License at http://www.openbravo.com/legal/license.html
+ * Software distributed under the License  is  distributed  on  an "AS IS"
+ * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+ * License for the specific  language  governing  rights  and  limitations
+ * under the License.
+ * The Original Code is Openbravo ERP.
+ * The Initial Developer of the Original Code is Openbravo S.L.U.
+ * All portions are Copyright (C) 2008-2015 Openbravo S.L.U.
+ * All Rights Reserved.
+ * Contributor(s):
+ ************************************************************************
+ *
+ * @author = Silambarasan Sekar
+ *
+ */
+
+package org.openbravo.test.mobile.retail.pack.selenium.tests.system;
+
+import java.util.UUID;
+
+import org.junit.Test;
+import org.openbravo.test.mobile.common.selenium.SeleniumHelper;
+import org.openbravo.test.mobile.common.selenium.database.DatabaseHelperInsertUpdateOrDelete;
+import org.openbravo.test.mobile.common.selenium.javascript.TestId;
+import org.openbravo.test.mobile.common.selenium.terminals.WebPOSTerminalHelper;
+
+/**
+ * 
+ * Verifying Popup while Error
+ * 
+ */
+public class I31715_CheckPopupError extends WebPOSTerminalHelper {
+
+  private String arrPaymentTypePreference;
+
+  @Test
+  public void test() {
+    boolean isTestSuccessful = false;
+    try {
+      final String clientId = (String) SeleniumHelper
+          .executeScriptWithReturn("OB.POS.modelterminal.get('terminal').client");
+      final String orgId = (String) SeleniumHelper
+          .executeScriptWithReturn("OB.POS.modelterminal.get('terminal').organization");
+      final String userId = (String) SeleniumHelper
+          .executeScriptWithReturn("OB.POS.modelterminal.get('context').user.id");
+
+      // Create database changes
+      createDatabaseChanges(clientId, orgId, userId);
+
+      // Update Terminal with Database Changes
+      updateTerminalAfterDatabaseChange();
+
+      // Verify Popup for error
+      verifyPopup();
+
+      restoreDatabaseChanges();
+      isTestSuccessful = true;
+    } finally {
+      if (!isTestSuccessful) {
+        restoreDatabaseChanges();
+      }
+    }
+  }
+
+  private void createDatabaseChanges(final String clientId, final String orgId, final String userId) {
+
+    arrPaymentTypePreference = getUUID();
+
+    final String insertSQL = String
+        .format(
+            "INSERT INTO ad_preference(ad_preference_id, ad_client_id, ad_org_id, createdby, updatedby, value, property, ispropertylist, selected, ad_user_id) "
+                + "VALUES ('%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s')",
+            arrPaymentTypePreference, clientId, orgId, "100", "100", "N",
+            "Enable Popup for Error message", "Y", "Y", userId);
+    new DatabaseHelperInsertUpdateOrDelete().execute(insertSQL, 1);
+
+  }
+
+  private void restoreDatabaseChanges() {
+    // Delete Preference
+    new DatabaseHelperInsertUpdateOrDelete().execute(String.format(
+        "delete from ad_preference where ad_preference_id = '%s'", arrPaymentTypePreference), 1);
+
+  }
+
+  private void verifyPopup() {
+
+    SeleniumHelper.executeScriptWithReturn("OB.MobileApp.model.get('context').role.manual=false");
+    SeleniumHelper.executeScriptWithReturn("OB.UTIL.showError('I31715_CheckPopupError')");
+
+    isVisible(TestId.CONFIRMATION_POPUP, true);
+    tap(TestId.BUTTON_POPUP_CONFIRMATION_OK);
+
+    SeleniumHelper.executeScriptWithReturn("OB.MobileApp.model.get('context').role.manual=true");
+    SeleniumHelper.executeScript("OB.UTIL.showError('I31715_CheckPopupError')");
+
+    isVisible(TestId.ERROR_POPUP, true);
+  }
+
+  private String getUUID() {
+    String randomUUID = UUID.randomUUID().toString();
+    randomUUID = randomUUID.toUpperCase();
+    return randomUUID.replace("-", "");
+  }
+}