0037709: Offline login is not working if "Enable Remote for Customer" preference is active

# HG changeset patch
# User Ranjith S R <ranjith@qualiantech.com>
# Date 1517896555 -19800
#      Tue Feb 06 11:25:55 2018 +0530
# Node ID 60d9ddd28d4fe30fb9a91cc605cb039200573b59
# Parent  77363b563aee01450253db52d856acae105db4db
Verifies issue 37709 : Added automated test 'I37709_VerifyCustomerOnReload'

diff -r 77363b563aee -r 60d9ddd28d4f src-test/org/openbravo/test/mobile/core/utils/AllowedErrorsHelper.java
--- a/src-test/org/openbravo/test/mobile/core/utils/AllowedErrorsHelper.java	Mon Feb 05 14:03:36 2018 +0530
+++ b/src-test/org/openbravo/test/mobile/core/utils/AllowedErrorsHelper.java	Tue Feb 06 11:25:55 2018 +0530
@@ -148,6 +148,7 @@
     testsAllowedToHaveTomcatErrors.add("CheckAlwaysShowStockSearchProductOffline");
     testsAllowedToHaveTomcatErrors.add("EditShippingInvoicingAddressQuotation");
     testsAllowedToHaveTomcatErrors.add("I37600_VerifyNewCustomerReceipt");
+    testsAllowedToHaveTomcatErrors.add("I37709_VerifyCustomerOnReload");
     // multiserver offline test
     testsAllowedToHaveTomcatErrors.add("OfflineMS001_SalesFlow");
     testsAllowedToHaveTomcatErrors.add("OfflineMS002_SaleWithTwentyLines");
@@ -308,6 +309,7 @@
     testsAllowedToHaveJavascriptErrors.add("CheckAlwaysShowStockOffline");
     testsAllowedToHaveJavascriptErrors.add("CheckAlwaysShowStockSearchProductOffline");
     testsAllowedToHaveJavascriptErrors.add("I37600_VerifyNewCustomerReceipt");
+    testsAllowedToHaveJavascriptErrors.add("I37709_VerifyCustomerOnReload");
     // multiserver offline test
     testsAllowedToHaveJavascriptErrors.add("OfflineMS001_SalesFlow");
     testsAllowedToHaveJavascriptErrors.add("OfflineMS002_SaleWithTwentyLines");
@@ -436,7 +438,7 @@
     testsAllowedToHaveLogclientErrors.add("I35829_VerifyOrderLineNotTaxes");
     testsAllowedToHaveLogclientErrors.add("I37186_VerifyCustomerSave");
     testsAllowedToHaveLogclientErrors.add("I37600_VerifyNewCustomerReceipt");
-
+    testsAllowedToHaveLogclientErrors.add("I37709_VerifyCustomerOnReload");
     // illegal allowed tests:
     testsAllowedToHaveLogclientErrors.add("I27554_SwitchToERPAndBackToWebPOSDifferentAccount");
     testsAllowedToHaveLogclientErrors.add("SVBSChangePricelistInLayaway");
diff -r 77363b563aee -r 60d9ddd28d4f src-test/org/openbravo/test/mobile/retail/pack/selenium/tests/offline/I37600_VerifyNewCustomerReceipt.java
--- a/src-test/org/openbravo/test/mobile/retail/pack/selenium/tests/offline/I37600_VerifyNewCustomerReceipt.java	Mon Feb 05 14:03:36 2018 +0530
+++ b/src-test/org/openbravo/test/mobile/retail/pack/selenium/tests/offline/I37600_VerifyNewCustomerReceipt.java	Tue Feb 06 11:25:55 2018 +0530
@@ -93,8 +93,6 @@
   }
 
   private void enablePrefernece(String pref, boolean enable) {
-    System.out.println(String.format("OB.MobileApp.model.attributes.permissions['%s'] = %s;", pref,
-        enable));
     SeleniumHelper.executeScript(String.format(
         "OB.MobileApp.model.attributes.permissions['%s'] = %s;", pref, enable));
   }
diff -r 77363b563aee -r 60d9ddd28d4f src-test/org/openbravo/test/mobile/retail/pack/selenium/tests/offline/I37709_VerifyCustomerOnReload.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src-test/org/openbravo/test/mobile/retail/pack/selenium/tests/offline/I37709_VerifyCustomerOnReload.java	Tue Feb 06 11:25:55 2018 +0530
@@ -0,0 +1,54 @@
+/*
+ *************************************************************************
+ * 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) 2018 Openbravo S.L.U.
+ * All Rights Reserved.
+ * Contributor(s):
+ ************************************************************************
+ *
+ * @author RAN
+ *
+ */
+
+package org.openbravo.test.mobile.retail.pack.selenium.tests.offline;
+
+import org.junit.Test;
+import org.openbravo.test.mobile.core.selenium.SeleniumHelper;
+import org.openbravo.test.mobile.core.utils.OBUtils;
+import org.openbravo.test.mobile.retail.pack.selenium.TestIdPack;
+
+public class I37709_VerifyCustomerOnReload extends WebPOSOfflineCustomTerminalHelper {
+
+  private final String prefRemoteCustomer = "OBPOS_remote.customer";
+
+  @Test
+  public void test() {
+    enablePrefernece(prefRemoteCustomer, true);
+
+    goOffline();
+    logout();
+    login();
+
+    verify(TestIdPack.LABEL_TOTALTOPAY, "0.00");
+    goOnline(false, false);
+    flushData();
+    OBUtils.pause(1000);
+
+    enablePrefernece(prefRemoteCustomer, false);
+  }
+
+  private void enablePrefernece(String pref, boolean enable) {
+    SeleniumHelper.executeScript(String.format(
+        "OB.MobileApp.model.attributes.permissions['%s'] = %s;", pref, enable));
+  }
+}
diff -r 77363b563aee -r 60d9ddd28d4f src-test/org/openbravo/test/mobile/retail/pack/selenium/tests/system/I37709_VerfiyRemoteProductWithDiffPrice.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src-test/org/openbravo/test/mobile/retail/pack/selenium/tests/system/I37709_VerfiyRemoteProductWithDiffPrice.java	Tue Feb 06 11:25:55 2018 +0530
@@ -0,0 +1,121 @@
+/*
+ *************************************************************************
+ * 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) 2018 Openbravo S.L.U.
+ * All Rights Reserved.
+ * Contributor(s):
+ ************************************************************************
+ *
+ * @author RAN
+ *
+ */
+
+package org.openbravo.test.mobile.retail.pack.selenium.tests.system;
+
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.MatcherAssert.assertThat;
+
+import java.sql.ResultSet;
+import java.sql.SQLException;
+
+import org.junit.Test;
+import org.openbravo.test.mobile.core.utils.OBNumber;
+import org.openbravo.test.mobile.retail.mobilecore.database.DatabaseHelperInsertUpdateOrDelete;
+import org.openbravo.test.mobile.retail.mobilecore.database.DatabaseHelperSelect;
+import org.openbravo.test.mobile.retail.mobilecore.javascript.BackboneHelper;
+import org.openbravo.test.mobile.retail.mobilecore.utils.RetailUtils;
+import org.openbravo.test.mobile.retail.pack.selenium.TestIdPack;
+import org.openbravo.test.mobile.retail.pack.selenium.terminals.WebPOSTerminalHelper;
+
+public class I37709_VerfiyRemoteProductWithDiffPrice extends WebPOSTerminalHelper {
+
+  private final String prefRemoteProduct = "OBPOS_remote.product";
+  private String preferenceId1 = null;
+  private final String originalPrice = "230.50", newPrice = "240.50";
+
+  @Test
+  public void test() {
+    tap(TestIdPack.BUTTON_SEARCH);
+    write(TestIdPack.FIELD_SEARCH_TEXT, TestIdPack.BUTTON_SEARCHPRODUCT_ALPINESKIBOOT.getRowName());
+    tap(TestIdPack.BUTTON_SEARCH_EXECUTE);
+    tap(TestIdPack.BUTTON_SEARCHPRODUCT_ALPINESKIBOOT);
+    verify(TestIdPack.LABEL_TOTALTOPAY, originalPrice);
+    final String receiptNo = BackboneHelper.getDocumentNo();
+    tap(TestIdPack.BUTTON_PAY);
+    tap(TestIdPack.BUTTON_PAY_EXACT);
+    tap(TestIdPack.BUTTON_PAY_DONE);
+    verify(TestIdPack.LABEL_TOTALTOPAY, "0.00");
+    verifyOrderLinePrice(receiptNo, originalPrice);
+
+    updateProductPrice(true);
+    reload();
+    verify(TestIdPack.LABEL_TOTALTOPAY, "0.00");
+
+    tap(TestIdPack.BUTTON_SEARCH);
+    write(TestIdPack.FIELD_SEARCH_TEXT, TestIdPack.BUTTON_SEARCHPRODUCT_ALPINESKIBOOT.getRowName());
+    tap(TestIdPack.BUTTON_SEARCH_EXECUTE);
+    tap(TestIdPack.BUTTON_SEARCHPRODUCT_ALPINESKIBOOT);
+    verify(TestIdPack.LABEL_TOTALTOPAY, newPrice);
+    final String receiptNo2 = BackboneHelper.getDocumentNo();
+    tap(TestIdPack.BUTTON_PAY);
+    tap(TestIdPack.BUTTON_PAY_EXACT);
+    tap(TestIdPack.BUTTON_PAY_DONE);
+    verify(TestIdPack.LABEL_TOTALTOPAY, "0.00");
+    verifyOrderLinePrice(receiptNo2, newPrice);
+
+    updateProductPrice(false);
+    reload();
+    verify(TestIdPack.LABEL_TOTALTOPAY, "0.00");
+  }
+
+  @Override
+  public void beforeWithReload() {
+    preferenceId1 = RetailUtils.getRandomUUID();
+    final String clientId = BackboneHelper.getTerminalValue("client");
+    final String sqlInsertPreference = "INSERT INTO ad_preference(ad_preference_id, ad_client_id, ad_org_id, createdby, updatedby, value, property, "
+        + "ispropertylist, selected, ad_user_id, visibleat_role_id) "
+        + "VALUES ('%s', '%s', '0', '100', '100', 'Y', '%s', to_char('Y'), to_char('Y'), null, null)";
+    // Add Preference - Remote Product
+    new DatabaseHelperInsertUpdateOrDelete().execute(
+        String.format(sqlInsertPreference, preferenceId1, clientId, prefRemoteProduct), 1);
+  }
+
+  @Override
+  public void afterWithReload() {
+    // Delete Preference
+    new DatabaseHelperInsertUpdateOrDelete().execute(String.format("delete from ad_preference "
+        + "where ad_preference_id = '%s'", preferenceId1), 1);
+  }
+
+  private void updateProductPrice(final boolean isForTest) {
+    new DatabaseHelperInsertUpdateOrDelete().execute(String.format(
+        "update m_productprice set pricestd = %s, pricelist = %s, pricelimit = %s "
+            + "where m_productprice_id = '8EF045011DD649DDA850D83A81A5DDE4'", isForTest ? newPrice
+            : originalPrice, isForTest ? newPrice : originalPrice, isForTest ? newPrice
+            : originalPrice), 1);
+  }
+
+  private void verifyOrderLinePrice(final String receiptNo, final String price) {
+    final String sql = String.format(
+        "select co.grandtotal as headeramount, col.line_gross_amount as lineamount from c_orderline col "
+            + "join c_order co on co.c_order_id = col.c_order_id "
+            + "where co.documentno = '%s' order by col.line", receiptNo);
+    new DatabaseHelperSelect() {
+      @Override
+      protected void yieldResultSet(final ResultSet rs) throws SQLException {
+        assertThat(new OBNumber(price), equalTo(new OBNumber(rs.getBigDecimal("headeramount"))));
+        assertThat(new OBNumber(price), equalTo(new OBNumber(rs.getBigDecimal("lineamount"))));
+      }
+    }.execute(sql, 1);
+  }
+}
\ No newline at end of file

# HG changeset patch
# User Ranjith S R <ranjith@qualiantech.com>
# Date 1517900997 -19800
#      Tue Feb 06 12:39:57 2018 +0530
# Node ID 10e3524e47956dac406eac480e71fed8dc179b70
# Parent  770275460b9d2a3b40881869dfe9313930ab529d
Related to issue 37709 : Remote model should not be removed while logout

diff -r 770275460b9d -r 10e3524e4795 web/org.openbravo.mobile.core/source/data/ob-dal.js
--- a/web/org.openbravo.mobile.core/source/data/ob-dal.js	Thu Feb 01 15:31:28 2018 +0100
+++ b/web/org.openbravo.mobile.core/source/data/ob-dal.js	Tue Feb 06 12:39:57 2018 +0530
@@ -1,6 +1,6 @@
 /*
  ************************************************************************************
- * Copyright (C) 2012-2017 Openbravo S.L.U.
+ * Copyright (C) 2012-2018 Openbravo S.L.U.
  * Licensed under the Openbravo Commercial License version 1.0
  * You may obtain a copy of the License at http://www.openbravo.com/legal/obcl.html
  * or in the legal folder of this module distribution.
@@ -1578,7 +1578,7 @@
         if (item && item.generatedModel) {
           item = OB.Model[item.modelName];
         }
-        if (item && ((online && item.prototype.online) || (!online && !item.prototype.online)) && !item.prototype.local) {
+        if (item && ((online && item.prototype.online) || (!online && !item.prototype.online)) && !item.prototype.local && (!item.prototype.remote || (item.prototype.remote && !OB.MobileApp.model.hasPermission(item.prototype.remote, true)))) {
           models._LoadQueue = models._LoadQueue || {};
           models._LoadQueue[item.prototype.modelName] = false;
         }
diff -r 770275460b9d -r 10e3524e4795 web/org.openbravo.mobile.core/source/model/ob-terminal-model.js
--- a/web/org.openbravo.mobile.core/source/model/ob-terminal-model.js	Thu Feb 01 15:31:28 2018 +0100
+++ b/web/org.openbravo.mobile.core/source/model/ob-terminal-model.js	Tue Feb 06 12:39:57 2018 +0530
@@ -2155,7 +2155,6 @@
 
     function callback() {
       OB.UTIL.showLoggingOut(true);
-      OB.Dal.removeRemoteModels();
 
       OB.UTIL.localStorage.removeItem('authenticationClient');
       OB.UTIL.localStorage.removeItem('authenticationToken');