add return account fields

cityssm · Oct 3, 2024 · a91abb8 · a91abb8
1 parent 6299244
commit a91abb8
Show file tree

Hide file tree

Showing 8 changed files with 15,185 additions and 8,592 deletions.
diff --git a/database/getBatchTransactions.js b/database/getBatchTransactions.js
@@ -7,7 +7,9 @@ export const getBatchTransactions = (batchDate, includeOutstandingOnly = false)
         readonly: true
     });
     database.function('userFn_dateIntegerToString', dateTimeFunctions.dateIntegerToString);
-    database.function('userFn_getCanadianBankName', getCanadianBankName);
+    database.function('userFn_getCanadianBankName', (institutionNumber, transitNumber) => {
+        return getCanadianBankName(institutionNumber, transitNumber);
+    });
     const rows = database
         .prepare(`select l.licenceId, l.licenceNumber,
         c.licenceCategory, l.licenseeName, l.licenseeBusinessName,

diff --git a/database/getBatchTransactions.ts b/database/getBatchTransactions.ts
@@ -17,7 +17,12 @@ export const getBatchTransactions = (
     'userFn_dateIntegerToString',
     dateTimeFunctions.dateIntegerToString
   )
-  database.function('userFn_getCanadianBankName', getCanadianBankName)
+  database.function(
+    'userFn_getCanadianBankName',
+    (institutionNumber: string, transitNumber?: string) => {
+      return getCanadianBankName(institutionNumber, transitNumber)
+    }
+  )
 
   const rows = database
     .prepare(

diff --git a/exports/batches/cpa005.js b/exports/batches/cpa005.js
@@ -12,7 +12,10 @@ export default function getBatchExport(outstandingBatchTransactions) {
         originatorId: batchExportConfig.config.originatorId,
         originatorLongName: batchExportConfig.config.originatorLongName,
         originatorShortName: batchExportConfig.config.originatorShortName,
-        destinationDataCentre: batchExportConfig.config.dataCentre
+        destinationDataCentre: batchExportConfig.config.dataCentre,
+        returnInstitutionNumber: batchExportConfig.config.returnInstitutionNumber,
+        returnTransitNumber: batchExportConfig.config.returnTransitNumber,
+        returnAccountNumber: batchExportConfig.config.returnAccountNumber
     });
     for (const transaction of outstandingBatchTransactions) {
         eftGenerator.addDebitTransaction({

diff --git a/exports/batches/cpa005.ts b/exports/batches/cpa005.ts
@@ -30,7 +30,10 @@ export default function getBatchExport(
     originatorId: batchExportConfig.config.originatorId,
     originatorLongName: batchExportConfig.config.originatorLongName,
     originatorShortName: batchExportConfig.config.originatorShortName,
-    destinationDataCentre: batchExportConfig.config.dataCentre
+    destinationDataCentre: batchExportConfig.config.dataCentre,
+    returnInstitutionNumber: batchExportConfig.config.returnInstitutionNumber,
+    returnTransitNumber: batchExportConfig.config.returnTransitNumber,
+    returnAccountNumber: batchExportConfig.config.returnAccountNumber
   })
 
   for (const transaction of outstandingBatchTransactions) {