diff --git a/server/src/interfaces/Bill.ts b/server/src/interfaces/Bill.ts index 7c8c20ffa..815ef3aef 100644 --- a/server/src/interfaces/Bill.ts +++ b/server/src/interfaces/Bill.ts @@ -41,6 +41,7 @@ export interface IBill { note: string, amount: number, paymentAmount: number, + currencyCode: string, dueAmount: number, overdueDays: number, diff --git a/server/src/interfaces/BillPayment.ts b/server/src/interfaces/BillPayment.ts index 25da133fd..e7227b6cc 100644 --- a/server/src/interfaces/BillPayment.ts +++ b/server/src/interfaces/BillPayment.ts @@ -43,5 +43,6 @@ export interface IBillReceivePageEntry { amount: number, totalPaymentAmount: number, paymentAmount: number, + currencyCode: string, date: Date|string, }; \ No newline at end of file diff --git a/server/src/interfaces/PaymentReceive.ts b/server/src/interfaces/PaymentReceive.ts index 3e2063e88..1359ced52 100644 --- a/server/src/interfaces/PaymentReceive.ts +++ b/server/src/interfaces/PaymentReceive.ts @@ -61,6 +61,7 @@ export interface IPaymentReceivePageEntry { amount: number, totalPaymentAmount: number, paymentAmount: number, + currencyCode: string, date: Date|string, }; diff --git a/server/src/services/Purchases/BillPayments/BillPaymentsPages.ts b/server/src/services/Purchases/BillPayments/BillPaymentsPages.ts index 2a7420690..73bc839a3 100644 --- a/server/src/services/Purchases/BillPayments/BillPaymentsPages.ts +++ b/server/src/services/Purchases/BillPayments/BillPaymentsPages.ts @@ -90,11 +90,12 @@ export default class BillPaymentsPages { return { entryType: 'invoice', billId: bill.id, - dueAmount: bill.dueAmount, - amount: bill.amount, billNo: bill.billNumber, + amount: bill.amount, + dueAmount: bill.dueAmount, totalPaymentAmount: bill.paymentAmount, paymentAmount: bill.paymentAmount, + currencyCode: bill.currencyCode, date: bill.billDate, }; } diff --git a/server/src/services/Sales/PaymentReceives/PaymentReceivesPages.ts b/server/src/services/Sales/PaymentReceives/PaymentReceivesPages.ts index 98daa575c..47d6a8985 100644 --- a/server/src/services/Sales/PaymentReceives/PaymentReceivesPages.ts +++ b/server/src/services/Sales/PaymentReceives/PaymentReceivesPages.ts @@ -30,11 +30,12 @@ export default class PaymentReceivesPages { return { entryType: 'invoice', invoiceId: invoice.id, - dueAmount: invoice.dueAmount, - amount: invoice.balance, invoiceNo: invoice.invoiceNo, - totalPaymentAmount: invoice.paymentAmount, + amount: invoice.balance, + dueAmount: invoice.dueAmount, paymentAmount: invoice.paymentAmount, + totalPaymentAmount: invoice.paymentAmount, + currencyCode: invoice.currencyCode, date: invoice.invoiceDate, }; }