0039165: JRXML templates are not loaded in APP Cache, Offline printing is not working

diff -r 03e84062dacb src/org/openbravo/retail/posterminal/ApplicationCacheComponent.java
--- a/src/org/openbravo/retail/posterminal/ApplicationCacheComponent.java	Tue Aug 21 13:30:24 2018 +0200
+++ b/src/org/openbravo/retail/posterminal/ApplicationCacheComponent.java	Wed Aug 22 13:37:37 2018 +0200
@@ -79,7 +79,15 @@
       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());
+        resources.add("../../web/org.openbravo.retail.posterminal/" + template.getTemplatePath()
+            + "?hash=" + OBPOSPrintTemplateReader.getInstance().getPrintTemplatesIdentifier());
+        if (template.isPdf()) {
+          for (PrintTemplateSubrep subreport : template.getOBPOSPrintTemplateSubrepList()) {
+            resources.add("../../web/org.openbravo.retail.posterminal/"
+                + subreport.getTemplatePath() + "?hash="
+                + OBPOSPrintTemplateReader.getInstance().getPrintTemplatesIdentifier());
+          }
+        }
       }
     } finally {
       OBContext.restorePreviousMode();
diff -r 03e84062dacb src/org/openbravo/retail/posterminal/utility/OBPOSPrintTemplateReader.java
--- a/src/org/openbravo/retail/posterminal/utility/OBPOSPrintTemplateReader.java	Tue Aug 21 13:30:24 2018 +0200
+++ b/src/org/openbravo/retail/posterminal/utility/OBPOSPrintTemplateReader.java	Wed Aug 22 13:37:37 2018 +0200
@@ -10,6 +10,7 @@
 package org.openbravo.retail.posterminal.utility;
 
 import java.io.File;
+import java.io.IOException;
 
 import org.apache.commons.codec.digest.DigestUtils;
 import org.apache.commons.io.FileUtils;
@@ -19,6 +20,7 @@
 import org.openbravo.dal.service.OBCriteria;
 import org.openbravo.dal.service.OBDal;
 import org.openbravo.retail.posterminal.PrintTemplate;
+import org.openbravo.retail.posterminal.PrintTemplateSubrep;
 
 /**
  * Get an identifier for template files to check changes in them
@@ -35,22 +37,18 @@
   }
 
   public String getPrintTemplatesIdentifier() {
-    if(printTemplateIdentifier == null) {
+    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;
+          sb.append(readTemplateFile(template.getTemplatePath()));
+          if (template.isPdf()) {
+            for (PrintTemplateSubrep subreport : template.getOBPOSPrintTemplateSubrepList()) {
+              sb.append(readTemplateFile(subreport.getTemplatePath()));
+            }
           }
-          String resourceContents = FileUtils.readFileToString(file, "UTF-8");
-          sb.append(resourceContents);
         } catch (Exception e) {
           log.error("Error reading file: " + template.getTemplatePath(), e);
         }
@@ -60,4 +58,15 @@
     return printTemplateIdentifier;
   }
 
+  private String readTemplateFile(String templatePath) throws IOException {
+    ConfigParameters confParam = ConfigParameters.retrieveFrom(RequestContext.getServletContext());
+    final File file = new File(confParam.prefix + "web/org.openbravo.retail.posterminal/"
+        + templatePath);
+    if (!file.exists() || !file.canRead()) {
+      log.error(templatePath + " cannot be read");
+      return "";
+    }
+    return FileUtils.readFileToString(file, "UTF-8");
+  }
+
 }