Update enterprise details on receipts

Third-Culture-Software · Aug 19, 2020 · f5c7c33 · f5c7c33
1 parent 9ae0f0e
commit f5c7c33
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/server/controllers/auth.js b/server/controllers/auth.js
@@ -28,7 +28,6 @@ exports.reload = reload;
 // expose session locally
 exports.loadSessionInformation = loadSessionInformation;
 
-
 function loginRoute(req, res, next) {
   const { username, password, project } = req.body;
   login(username, password, project)
@@ -183,7 +182,7 @@ async function loadSessionInformation(user) {
   //   the current enterprise
   //   the current project
   sql = `
-    SELECT e.id, e.name, e.abbr, e.phone, e.email, BUID(e.location_id) as location_id, e.currency_id,
+    SELECT e.id, e.name, e.abbr, e.phone, e.email, e.address, BUID(e.location_id) as location_id, e.currency_id,
       c.symbol AS currencySymbol, c.name AS currencyName, e.po_box, e.logo,
       CONCAT_WS(' / ', village.name, sector.name, province.name) AS location
     FROM enterprise AS e

diff --git a/server/lib/template/partials/enterpriseDetails.handlebars b/server/lib/template/partials/enterpriseDetails.handlebars
@@ -14,7 +14,7 @@
 
   <h3 style="margin: 0px;">{{metadata.enterprise.name}}</h3>
   <strong>{{metadata.project.name}} ({{metadata.project.abbr}})</strong> <br>
-  <span class="text-capitalize">{{translate 'FORM.LABELS.ADDRESS'}}</span>: {{metadata.enterprise.location}} <br>
-  <span class="text-capitalize">{{translate 'FORM.LABELS.PHONE'}}</span>: {{metadata.enterprise.phone}} <br>
-  <span class="text-capitalize">{{translate 'FORM.LABELS.EMAIL'}}</span>: {{metadata.enterprise.email}}
+  {{#if metadata.enterprise.phone}}<span class="text-capitalize">{{translate 'FORM.LABELS.PHONE'}}</span>: {{metadata.enterprise.phone}} <br>{{/if}}
+  {{#if metadata.enterprise.email}}<span class="text-capitalize">{{translate 'FORM.LABELS.EMAIL'}}</span>: {{metadata.enterprise.email}} <br>{{/if}}
+  {{#if metadata.enterprise.address}}<span class="text-capitalize">{{translate 'FORM.LABELS.ADDRESS'}}</span>: {{metadata.enterprise.address}}{{/if}}
 </div>