refactor: Add multi currency support

Third-Culture-Software · Jan 26, 2022 · 2b79fd7 · 2b79fd7
1 parent 4f6c561
commit 2b79fd7
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 13 deletions.
diff --git a/client/src/modules/reports/generate/recovery_capacity/recovery_capacity.config.js b/client/src/modules/reports/generate/recovery_capacity/recovery_capacity.config.js
@@ -3,21 +3,25 @@ angular.module('bhima.controllers')
 
 recoveryCapacityController.$inject = [
   '$sce', 'NotifyService', 'BaseReportService',
-  'AppCache', 'reportData', '$state',
+  'AppCache', 'reportData', '$state', 'SessionService',
 ];
 
-function recoveryCapacityController($sce, Notify, SavedReports, AppCache, reportData, $state) {
+function recoveryCapacityController($sce, Notify, SavedReports, AppCache, reportData, $state, Session) {
   const vm = this;
   const cache = new AppCache('recovery_capacity');
   const reportUrl = 'reports/finance/recovery_capacity';
 
   vm.previewGenerated = false;
-  vm.reportDetails = { includeUnpostedValues : 0 };
+  vm.reportDetails = { includeUnpostedValues : 0, currencyId : Session.enterprise.currency_id };
 
   vm.onChangeUnpostedValues = value => {
     vm.reportDetails.includeUnpostedValues = value;
   };
 
+  vm.onSelectCurrency = currency => {
+    vm.reportDetails.currencyId = currency.id;
+  };
+
   vm.clearPreview = function clearPreview() {
     vm.previewGenerated = false;
     vm.previewResult = null;

diff --git a/client/src/modules/reports/generate/recovery_capacity/recovery_capacity.html b/client/src/modules/reports/generate/recovery_capacity/recovery_capacity.html
@@ -29,6 +29,11 @@ <h3 class="text-capitalize" translate>REPORT.RECOVERY_CAPACITY.TITLE</h3>
               limit-min-fiscal>
             </bh-date-interval>
 
+            <bh-currency-select
+              currency-id="ReportConfigCtrl.reportDetails.currencyId"
+              on-change="ReportConfigCtrl.onSelectCurrency(currency)">
+            </bh-currency-select>
+
             <bh-yes-no-radios
               value="ReportConfigCtrl.reportDetails.includeUnpostedValues"
               name="includeUnpostedValues"

diff --git a/client/src/modules/reports/generate/unpaid_invoice_payments/unpaid_invoice_payments.html b/client/src/modules/reports/generate/unpaid_invoice_payments/unpaid_invoice_payments.html
@@ -39,7 +39,6 @@ <h3 class="text-capitalize" translate>REPORT.UNPAID_INVOICE_PAYMENTS_REPORT.TITL
               <bh-clear on-clear="ReportConfigCtrl.onClear()"></bh-clear>
             </bh-debtor-group-select>
 
-
             <!-- service -->
             <bh-service-select
               service-uuid="ReportConfigCtrl.reportDetails.serviceUuid"
@@ -52,7 +51,6 @@ <h3 class="text-capitalize" translate>REPORT.UNPAID_INVOICE_PAYMENTS_REPORT.TITL
               on-change="ReportConfigCtrl.onSelectCurrency(currency)">
             </bh-currency-select>
 
-
             <bh-loading-button loading-state="ConfigForm.$loading">
               <span translate>REPORT.UTIL.PREVIEW</span>
             </bh-loading-button>

diff --git a/server/controllers/finance/reports/recovery_capacity/index.js b/server/controllers/finance/reports/recovery_capacity/index.js
@@ -7,6 +7,7 @@ const moment = require('moment');
 
 const ReportManager = require('../../../../lib/ReportManager');
 const db = require('../../../../lib/db');
+const Exchange = require('../../exchange');
 
 module.exports.report = report;
 
@@ -29,6 +30,9 @@ async function report(req, res, next) {
     const { dateFrom, dateTo } = req.query;
     const metadata = _.clone(req.session);
 
+    const { enterprise } = req.session;
+    const currencyId = Number(req.query.currencyId);
+
     const rpt = new ReportManager(TEMPLATE, metadata, qs);
 
     const CASH_PAYMENT_TRANSACTION_TYPE = 2;
@@ -158,10 +162,14 @@ async function report(req, res, next) {
 
     const rows = await db.exec(query, parameters);
     const totals = await db.one(queryTotals, parameters);
+    const getExchangeRateData = await Exchange.getExchangeRate(enterprise.id, currencyId, new Date(dateTo));
+    const exchangeRate = getExchangeRateData.rate || 1;
 
     const result = await rpt.render({
       dateFrom,
       dateTo,
+      currencyId,
+      exchangeRate,
       rows,
       totals,
       includeUnpostedValues,

diff --git a/server/controllers/finance/reports/recovery_capacity/report.handlebars b/server/controllers/finance/reports/recovery_capacity/report.handlebars
@@ -19,6 +19,8 @@
         {{date dateFrom}} - {{date dateTo}}
       </h4>
 
+      {{> exchangeRate rate=exchangeRate currencyId=currencyId date=dateTo}}
+
       <table class="table table-condensed" style="margin-bottom:16px; border:0px;">
         <tr>
           <td style="border: 0px;">
@@ -52,9 +54,9 @@
           <tr>
             <td>{{date row.date}}</td>
             <td style="width: 10em;" class="text-right">{{row.registrations}}</td>
-            <td class="text-right">{{debcred row.total_invoiced ../metadata.enterprise.currency_id}}</td>
-            <td class="text-right">{{debcred row.avg_cost ../metadata.enterprise.currency_id}}</td>
-            <td class="text-right">{{debcred row.total_paid ../metadata.enterprise.currency_id}}</td>
+            <td class="text-right">{{debcred (multiply row.total_invoiced ../exchangeRate) ../currencyId}}</td>
+            <td class="text-right">{{debcred (multiply row.avg_cost ../exchangeRate) ../currencyId}}</td>
+            <td class="text-right">{{debcred (multiply row.total_paid ../exchangeRate) ../currencyId}}</td>
             <td
               style="width: 15em;"
               {{#if row.has_data}}
@@ -73,9 +75,9 @@
           <tr>
             <th>{{translate 'TABLE.COLUMNS.TOTAL'}}</th>
             <th style="width: 10em;" class="text-right">{{totals.registrations}}</th>
-            <th class="text-right">{{debcred totals.total_invoiced metadata.enterprise.currency_id}}</th>
-            <th class="text-right">{{debcred totals.avg_cost metadata.enterprise.currency_id}}</th>
-            <th class="text-right">{{debcred totals.total_paid metadata.enterprise.currency_id}}</th>
+            <th class="text-right">{{debcred (multiply totals.total_invoiced exchangeRate) currencyId}}</th>
+            <th class="text-right">{{debcred (multiply totals.avg_cost exchangeRate) currencyId}}</th>
+            <th class="text-right">{{debcred (multiply totals.total_paid exchangeRate) currencyId}}</th>
             <th
               style="width: 15em;"
               {{#gt totals.recovery_capacity 0.71}} class="bg-success text-success text-right" {{/gt}}
@@ -86,9 +88,7 @@
           </tr>
         </tfoot>
       </table>
-
     </div>
   </div>
-
 </div>
 </body>