0038602: POS does not load xml changes

diff -r 37c06594f7de src/org/openbravo/retail/posterminal/ApplicationCacheComponent.java
--- a/src/org/openbravo/retail/posterminal/ApplicationCacheComponent.java	Fri May 18 15:27:23 2018 +0200
+++ b/src/org/openbravo/retail/posterminal/ApplicationCacheComponent.java	Tue May 22 16:01:58 2018 +0200
@@ -72,8 +72,8 @@
     // default print templates
     resources.add("../../web/org.openbravo.retail.posterminal/res/printcashup.xml");
     resources.add("../../web/org.openbravo.retail.posterminal/res/printcashmgmt.xml");
-    resources.add("../../web/org.openbravo.retail.posterminal/res/displaytotal.xml");
-    resources.add("../../web/org.openbravo.retail.posterminal/res/opendrawer.xml");
+    resources.add("../../web/org.openbravo.retail.posterminal/res/displaytotal.xml" +"?uuid="+getGenFileName());
+    resources.add("../../web/org.openbravo.retail.posterminal/res/opendrawer.xml" +"?uuid="+getGenFileName());
     resources.add("../../web/org.openbravo.retail.posterminal/res/printclosedreceipt.xml");
     resources.add("../../web/org.openbravo.retail.posterminal/res/printinvoice.xml");
     resources.add("../../web/org.openbravo.retail.posterminal/res/printlayaway.xml");
@@ -81,9 +81,9 @@
     resources.add("../../web/org.openbravo.retail.posterminal/res/printreceipt.xml");
     resources.add("../../web/org.openbravo.retail.posterminal/res/printreturn.xml");
     resources.add("../../web/org.openbravo.retail.posterminal/res/printreturninvoice.xml");
-    resources.add("../../web/org.openbravo.retail.posterminal/res/welcome.xml");
-    resources.add("../../web/org.openbravo.retail.posterminal/res/goodbye.xml");
-    resources.add("../../web/org.openbravo.retail.posterminal/res/checkdrawerstatus.xml");
+    resources.add("../../web/org.openbravo.retail.posterminal/res/welcome.xml" +"?uuid="+getGenFileName());
+    resources.add("../../web/org.openbravo.retail.posterminal/res/goodbye.xml" +"?uuid="+getGenFileName());
+    resources.add("../../web/org.openbravo.retail.posterminal/res/checkdrawerstatus.xml" +"?uuid="+getGenFileName());
 
     // App Icon
     resources.add("../../web/images/favicon.ico");
@@ -91,7 +91,7 @@
     OBContext.setAdminMode(true);
     try {
       for (PrintTemplate template : OBDal.getInstance().createCriteria(PrintTemplate.class).list()) {
-        resources.add("../../web/org.openbravo.retail.posterminal/" + template.getTemplatePath());
+        resources.add("../../web/org.openbravo.retail.posterminal/" + template.getTemplatePath() +"?uuid="+getGenFileName());
       }
     } finally {
       OBContext.restorePreviousMode();

diff -r 8d5cb7cfb649 web/org.openbravo.mobile.core/source/utils/ob-utilities.js
--- a/web/org.openbravo.mobile.core/source/utils/ob-utilities.js	Wed May 16 08:43:20 2018 +0200
+++ b/web/org.openbravo.mobile.core/source/utils/ob-utilities.js	Tue May 22 14:08:39 2018 +0200
@@ -174,7 +174,7 @@
 
   OB.UTIL.loadResource = function (res, callback, context) {
     var ajaxRequest = new enyo.Ajax({
-      url: res,
+      url: res + "?uuid=" + OB.UTIL.localStorage.getItem('SourceVersion_WebPOS'),
       cacheBust: false,
       method: 'GET',
       handleAs: 'text',

diff --git a/web/org.openbravo.mobile.core/source/model/ob-terminal-model.js b/web/org.openbravo.mobile.core/source/model/ob-terminal-model.js
--- a/web/org.openbravo.mobile.core/source/model/ob-terminal-model.js
+++ b/web/org.openbravo.mobile.core/source/model/ob-terminal-model.js
@@ -656,6 +656,9 @@
       if (inResponse.services) {
         OB.UTIL.localStorage.setItem('services', JSON.stringify(inResponse.services));
       }
+      if (inResponse.services) {
+        OB.UTIL.localStorage.setItem('templateVersion', JSON.stringify(inResponse.templateVersion));
+      }
       if (inResponse.executePerformanceTest) {
         OB.UTIL.localStorage.setItem('executePerformanceTest', inResponse.executePerformanceTest);
       }
diff --git a/web/org.openbravo.mobile.core/source/utils/ob-utilities.js b/web/org.openbravo.mobile.core/source/utils/ob-utilities.js
--- a/web/org.openbravo.mobile.core/source/utils/ob-utilities.js
+++ b/web/org.openbravo.mobile.core/source/utils/ob-utilities.js
@@ -135,9 +135,16 @@
     return str.match(RegExp('.{1,' + width + '}(\\s|$)|\\S+?(\\s|$)', 'g')).join('\n');
   };
 
-  OB.UTIL.loadResource = function (res, callback, context) {
+  OB.UTIL.loadResource = function (res, callback, context, urlParameters) {
+    var params = '?';
+    _.each(_.keys(urlParameters), function (key) {
+      params += key + '=' + urlParameters[key] + '&';
+    });
+    //if urlParameters is empty, remove ?. if not empty, remove last &
+    params = params.substring(0, params.length - 1);
+
     var ajaxRequest = new enyo.Ajax({
-      url: res,
+      url: res + params,
       cacheBust: false,
       method: 'GET',
       handleAs: 'text',

diff --git a/src/org/openbravo/retail/posterminal/ApplicationCacheComponent.java b/src/org/openbravo/retail/posterminal/ApplicationCacheComponent.java
--- a/src/org/openbravo/retail/posterminal/ApplicationCacheComponent.java
+++ b/src/org/openbravo/retail/posterminal/ApplicationCacheComponent.java
@@ -24,8 +24,10 @@
 import javax.enterprise.context.RequestScoped;
 
 import org.openbravo.dal.core.OBContext;
+import org.openbravo.dal.service.OBCriteria;
 import org.openbravo.dal.service.OBDal;
 import org.openbravo.mobile.core.MobileCoreApplicationCacheComponent;
+import org.openbravo.retail.posterminal.utility.OBPOSPrintTemplateReader;
 
 /**
  * 
@@ -72,8 +74,8 @@
     // default print templates
     resources.add("../../web/org.openbravo.retail.posterminal/res/printcashup.xml");
     resources.add("../../web/org.openbravo.retail.posterminal/res/printcashmgmt.xml");
-    resources.add("../../web/org.openbravo.retail.posterminal/res/displaytotal.xml");
-    resources.add("../../web/org.openbravo.retail.posterminal/res/opendrawer.xml");
+    resources.add("../../web/org.openbravo.retail.posterminal/res/displaytotal.xml" +"?hash="+OBPOSPrintTemplateReader.getInstance().getPrintTemplatesIdentifier());
+    resources.add("../../web/org.openbravo.retail.posterminal/res/opendrawer.xml" +"?hash="+OBPOSPrintTemplateReader.getInstance().getPrintTemplatesIdentifier());
     resources.add("../../web/org.openbravo.retail.posterminal/res/printclosedreceipt.xml");
     resources.add("../../web/org.openbravo.retail.posterminal/res/printinvoice.xml");
     resources.add("../../web/org.openbravo.retail.posterminal/res/printlayaway.xml");
@@ -81,16 +83,18 @@
     resources.add("../../web/org.openbravo.retail.posterminal/res/printreceipt.xml");
     resources.add("../../web/org.openbravo.retail.posterminal/res/printreturn.xml");
     resources.add("../../web/org.openbravo.retail.posterminal/res/printreturninvoice.xml");
-    resources.add("../../web/org.openbravo.retail.posterminal/res/welcome.xml");
-    resources.add("../../web/org.openbravo.retail.posterminal/res/goodbye.xml");
+    resources.add("../../web/org.openbravo.retail.posterminal/res/welcome.xml"+"?hash="+OBPOSPrintTemplateReader.getInstance().getPrintTemplatesIdentifier());
+    resources.add("../../web/org.openbravo.retail.posterminal/res/goodbye.xml"+"?hash="+OBPOSPrintTemplateReader.getInstance().getPrintTemplatesIdentifier());
 
     // App Icon
     resources.add("../../web/images/favicon.ico");
 
     OBContext.setAdminMode(true);
     try {
-      for (PrintTemplate template : OBDal.getInstance().createCriteria(PrintTemplate.class).list()) {
-        resources.add("../../web/org.openbravo.retail.posterminal/" + template.getTemplatePath());
+      OBCriteria<PrintTemplate> criteria = OBDal.getInstance().createCriteria(PrintTemplate.class);
+      criteria.addOrderBy(PrintTemplate.PROPERTY_ID, true);
+      for (PrintTemplate template : criteria.list()) {
+        resources.add("../../web/org.openbravo.retail.posterminal/" + template.getTemplatePath() +"?hash="+OBPOSPrintTemplateReader.getInstance().getPrintTemplatesIdentifier());
       }
     } finally {
       OBContext.restorePreviousMode();
diff --git a/src/org/openbravo/retail/posterminal/LoginUtilsServlet.java b/src/org/openbravo/retail/posterminal/LoginUtilsServlet.java
--- a/src/org/openbravo/retail/posterminal/LoginUtilsServlet.java
+++ b/src/org/openbravo/retail/posterminal/LoginUtilsServlet.java
@@ -40,6 +40,7 @@
 import org.openbravo.model.ad.access.FormAccess;
 import org.openbravo.model.ad.access.User;
 import org.openbravo.model.ad.access.UserRoles;
+import org.openbravo.retail.posterminal.utility.OBPOSPrintTemplateReader;
 
 public class LoginUtilsServlet extends MobileCoreLoginUtilsServlet {
   public static final Logger log = Logger.getLogger(LoginUtilsServlet.class);
@@ -357,7 +358,7 @@
         result.put("servers", getServers(terminal));
       }
     }
-
+    result.put("templateVersion", OBPOSPrintTemplateReader.getInstance().getPrintTemplatesIdentifier());
     String value;
     try {
       value = Preferences.getPreferenceValue("OBPOS_TerminalAuthentication", true, null, null,
diff --git a/src/org/openbravo/retail/posterminal/utility/OBPOSPrintTemplateReader.java b/src/org/openbravo/retail/posterminal/utility/OBPOSPrintTemplateReader.java
new file mode 100644
--- /dev/null
+++ b/src/org/openbravo/retail/posterminal/utility/OBPOSPrintTemplateReader.java
@@ -0,0 +1,63 @@
+/*
+ ************************************************************************************
+ * Copyright (C) 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.
+ ************************************************************************************
+ */
+
+package org.openbravo.retail.posterminal.utility;
+
+import java.io.File;
+
+import org.apache.commons.codec.digest.DigestUtils;
+import org.apache.commons.io.FileUtils;
+import org.apache.log4j.Logger;
+import org.openbravo.base.ConfigParameters;
+import org.openbravo.client.kernel.RequestContext;
+import org.openbravo.dal.service.OBCriteria;
+import org.openbravo.dal.service.OBDal;
+import org.openbravo.retail.posterminal.PrintTemplate;
+
+/**
+ * Get an identifier for template files to check changes in them
+ *
+ * @author mdj
+ */
+public class OBPOSPrintTemplateReader {
+  private static final Logger log = Logger.getLogger(OBPOSPrintTemplateReader.class);
+  String printTemplateIdentifier = null;
+  private static OBPOSPrintTemplateReader instance = new OBPOSPrintTemplateReader();
+
+  public static final OBPOSPrintTemplateReader getInstance() {
+    return instance;
+  }
+
+  public String getPrintTemplatesIdentifier() {
+    if(printTemplateIdentifier == null) {
+      final StringBuffer sb = new StringBuffer();
+      OBCriteria<PrintTemplate> criteria = OBDal.getInstance().createCriteria(PrintTemplate.class);
+      criteria.addOrderBy(PrintTemplate.PROPERTY_ID, true);
+      for (PrintTemplate template : criteria.list()) {
+        try {
+          ConfigParameters confParam = ConfigParameters
+              .retrieveFrom(RequestContext.getServletContext());
+          final File file = new File(confParam.prefix
+              + "web/org.openbravo.retail.posterminal/"+template.getTemplatePath());
+          if (!file.exists() || !file.canRead()) {
+            log.error(template.getTemplatePath() + " cannot be read");
+            continue;
+          }
+          String resourceContents = FileUtils.readFileToString(file, "UTF-8");
+          sb.append(resourceContents);
+        } catch (Exception e) {
+          log.error("Error reading file: " + template.getTemplatePath(), e);
+        }
+      }
+      printTemplateIdentifier = DigestUtils.md5Hex(sb.toString());
+    }
+    return printTemplateIdentifier;
+  }
+
+}
diff --git a/web/org.openbravo.retail.posterminal/js/datasource.js b/web/org.openbravo.retail.posterminal/js/datasource.js
--- a/web/org.openbravo.retail.posterminal/js/datasource.js
+++ b/web/org.openbravo.retail.posterminal/js/datasource.js
@@ -22,7 +22,9 @@
     OB.UTIL.loadResource(this.resource, function (data) {
       this.resourcedata = data;
       callback(this.resourcedata);
-    }, this);
+    }, this, {
+      hash: OB.UTIL.localStorage.getItem('templateVersion')
+    });
   }
 };
 
diff --git a/web/org.openbravo.retail.posterminal/js/login/model/login-model.js b/web/org.openbravo.retail.posterminal/js/login/model/login-model.js
--- a/web/org.openbravo.retail.posterminal/js/login/model/login-model.js
+++ b/web/org.openbravo.retail.posterminal/js/login/model/login-model.js
@@ -1213,6 +1213,9 @@
         if (inResponse.services) {
           OB.UTIL.localStorage.setItem('services', JSON.stringify(inResponse.services));
         }
+        if (inResponse.services) {
+          OB.UTIL.localStorage.setItem('templateVersion', JSON.stringify(inResponse.templateVersion));
+        }
         OB.RR.RequestRouter.initialize();
 
         me.setTerminalName(OB.UTIL.localStorage.getItem('terminalAuthentication') === 'Y' ? OB.UTIL.localStorage.getItem('terminalName') : OB.UTIL.getParameterByName("terminal"));

diff --git a/web/org.openbravo.retail.posterminal/js/login/model/login-model.js b/web/org.openbravo.retail.posterminal/js/login/model/login-model.js
--- a/web/org.openbravo.retail.posterminal/js/login/model/login-model.js
+++ b/web/org.openbravo.retail.posterminal/js/login/model/login-model.js
@@ -1246,7 +1246,7 @@
           OB.UTIL.localStorage.setItem('services', JSON.stringify(inResponse.services));
         }
         if (inResponse.services) {
-          OB.UTIL.localStorage.setItem('templateVersion', JSON.stringify(inResponse.templateVersion));
+          OB.UTIL.localStorage.setItem('templateVersion', inResponse.templateVersion);
         }
         OB.RR.RequestRouter.initialize();