fix(server): getting matched transaction transformer

packages/server/src/lib/Transformer/Transformer.ts

@@ -169,8 +169,8 @@ export class Transformer {
    * @param number
    * @returns
    */
-  protected formatNumber(number) {
+  protected formatNumber(number, props?) {
-    return formatNumber(number, { money: false });
+    return formatNumber(number, { money: false, ...props });
   }
 
   /**

packages/server/src/services/Banking/Matching/GetMatchedTransactionBillsTransformer.ts

@@ -12,7 +12,7 @@ export class GetMatchedTransactionBillsTransformer extends Transformer {
       'amountFormatted',
       'transactionNo',
       'date',
-      'dateFromatted',
+      'dateFormatted',
       'transactionId',
       'transactionNo',
       'transactionType',
@@ -52,8 +52,9 @@ export class GetMatchedTransactionBillsTransformer extends Transformer {
    * @returns {string}
    */
   protected amountFormatted(bill) {
-    return this.formatNumber(bill.totalAmount, {
+    return this.formatNumber(bill.amount, {
       currencyCode: bill.currencyCode,
+      money: true,
     });
   }
 
@@ -63,7 +64,7 @@ export class GetMatchedTransactionBillsTransformer extends Transformer {
    * @returns {string}
    */
   protected date(bill) {
-    return bill.date;
+    return bill.billDate;
   }
 
   /**
@@ -71,8 +72,8 @@ export class GetMatchedTransactionBillsTransformer extends Transformer {
    * @param {Object} bill - The bill object.
    * @returns {string}
    */
-  protected dateFromatted(bill) {
+  protected dateFormatted(bill) {
-    return this.formatDate(bill.date);
+    return this.formatDate(bill.billDate);
   }
 
   /**
@@ -83,4 +84,20 @@ export class GetMatchedTransactionBillsTransformer extends Transformer {
   protected transactionId(bill) {
     return bill.id;
   }
+
+  /**
+   * Retrieve the manual journal transaction type.
+   * @returns {string}
+   */
+  protected transactionType() {
+    return 'Bill';
+  }
+
+  /**
+   * Retrieves the manual journal formatted transaction type.
+   * @returns {string}
+   */
+  protected transsactionTypeFormatted() {
+    return 'Bill';
+  }
 }

packages/server/src/services/Banking/Matching/GetMatchedTransactionExpensesTransformer.ts

@@ -12,7 +12,7 @@ export class GetMatchedTransactionExpensesTransformer extends Transformer {
       'amountFormatted',
       'transactionNo',
       'date',
-      'dateFromatted',
+      'dateFormatted',
       'transactionId',
       'transactionNo',
       'transactionType',
@@ -54,6 +54,7 @@ export class GetMatchedTransactionExpensesTransformer extends Transformer {
   protected amountFormatted(expense) {
     return this.formatNumber(expense.totalAmount, {
       currencyCode: expense.currencyCode,
+      money: true,
     });
   }
 
@@ -71,7 +72,7 @@ export class GetMatchedTransactionExpensesTransformer extends Transformer {
    * @param expense
    * @returns {string}
    */
-  protected dateFromatted(expense) {
+  protected dateFormatted(expense) {
     return this.formatDate(expense.paymentDate);
   }
 

packages/server/src/services/Banking/Matching/GetMatchedTransactionInvoicesTransformer.ts

@@ -12,7 +12,7 @@ export class GetMatchedTransactionInvoicesTransformer extends Transformer {
       'amountFormatted',
       'transactionNo',
       'date',
-      'dateFromatted',
+      'dateFormatted',
       'transactionId',
       'transactionNo',
       'transactionType',
@@ -52,6 +52,7 @@ export class GetMatchedTransactionInvoicesTransformer extends Transformer {
   protected formatAmount(invoice) {
     return this.formatNumber(invoice.dueAmount, {
       currencyCode: invoice.currencyCode,
+      money: true,
     });
   }
 
@@ -60,7 +61,7 @@ export class GetMatchedTransactionInvoicesTransformer extends Transformer {
    * @param invoice
    * @returns {Date}
    */
-  protected getDate(invoice) {
+  protected date(invoice) {
     return invoice.invoiceDate;
   }
 
@@ -69,7 +70,7 @@ export class GetMatchedTransactionInvoicesTransformer extends Transformer {
    * @param invoice
    * @returns {string}
    */
-  protected formatDate(invoice) {
+  protected dateFormatted(invoice) {
     return this.formatDate(invoice.invoiceDate);
   }
 

packages/server/src/services/Banking/Matching/GetMatchedTransactionManualJournalsTransformer.ts

@@ -12,7 +12,7 @@ export class GetMatchedTransactionManualJournalsTransformer extends Transformer
       'amountFormatted',
       'transactionNo',
       'date',
-      'dateFromatted',
+      'dateFormatted',
       'transactionId',
       'transactionNo',
       'transactionType',
@@ -54,6 +54,7 @@ export class GetMatchedTransactionManualJournalsTransformer extends Transformer
   protected amountFormatted(manualJournal) {
     return this.formatNumber(manualJournal.amount, {
       currencyCode: manualJournal.currencyCode,
+      money: true,
     });
   }
 
@@ -71,7 +72,7 @@ export class GetMatchedTransactionManualJournalsTransformer extends Transformer
    * @param manualJournal
    * @returns {string}
    */
-  protected dateFromatted(manualJournal) {
+  protected dateFormatted(manualJournal) {
     return this.formatDate(manualJournal.date);
   }
 
@@ -107,3 +108,4 @@ export class GetMatchedTransactionManualJournalsTransformer extends Transformer
     return 'Manual Journal';
   }
 }
+