diff --git a/auth-web/package-lock.json b/auth-web/package-lock.json index ad9a43a59d..83ccc6c989 100644 --- a/auth-web/package-lock.json +++ b/auth-web/package-lock.json @@ -1,12 +1,12 @@ { "name": "auth-web", - "version": "2.6.56", + "version": "2.6.57", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "auth-web", - "version": "2.6.56", + "version": "2.6.57", "dependencies": { "@bcrs-shared-components/base-address": "2.0.3", "@bcrs-shared-components/bread-crumb": "1.0.8", diff --git a/auth-web/package.json b/auth-web/package.json index 3e54488b50..551570b1e8 100644 --- a/auth-web/package.json +++ b/auth-web/package.json @@ -1,6 +1,6 @@ { "name": "auth-web", - "version": "2.6.56", + "version": "2.6.57", "appName": "Auth Web", "sbcName": "SBC Common Components", "private": true, diff --git a/auth-web/src/components/pay/eft/ShortNameTransactions.vue b/auth-web/src/components/pay/eft/ShortNameTransactions.vue index 712caa09f7..309c31b6fc 100644 --- a/auth-web/src/components/pay/eft/ShortNameTransactions.vue +++ b/auth-web/src/components/pay/eft/ShortNameTransactions.vue @@ -28,7 +28,7 @@ > mdi-format-list-bulleted - Payment History + Short Name Payment History @@ -158,8 +159,13 @@ export default defineComponent({ } return amount } + function formatBalanceAmount (item: any) { + if (item.balance === undefined) return '' + return `Balance: ${CommonUtils.formatAmount(item.balance)}` + } return { + formatBalanceAmount, formatTransactionAmount, formatDate: CommonUtils.formatDisplayDate, formatAccountDisplayName: CommonUtils.formatAccountDisplayName, diff --git a/auth-web/src/util/common-util.ts b/auth-web/src/util/common-util.ts index 29fef9a781..30e3587c74 100644 --- a/auth-web/src/util/common-util.ts +++ b/auth-web/src/util/common-util.ts @@ -128,7 +128,12 @@ export default class CommonUtils { // Format amount for displaying dollar currency static formatAmount (amount: number): string { - return `$${amount.toFixed(2)}` + return amount.toLocaleString('en-CA', { + style: 'currency', + currency: 'CAD', + minimumFractionDigits: 2, + maximumFractionDigits: 2 + }) } // Formatting date in the desired format for displaying in the template diff --git a/auth-web/tests/unit/components/LinkedShortNameTable.spec.ts b/auth-web/tests/unit/components/LinkedShortNameTable.spec.ts index c42c3da4be..74ac3debc7 100644 --- a/auth-web/tests/unit/components/LinkedShortNameTable.spec.ts +++ b/auth-web/tests/unit/components/LinkedShortNameTable.spec.ts @@ -1,5 +1,6 @@ import { Wrapper, createLocalVue, mount } from '@vue/test-utils' import { BaseVDataTable } from '@/components' +import CommonUtils from '@/util/common-util' import LinkedShortNameTableVue from '@/components/pay/LinkedShortNameTable.vue' import { VueConstructor } from 'vue' import Vuetify from 'vuetify' @@ -112,7 +113,7 @@ describe('LinkedShortNameTable.vue', () => { expect(columns.at(1).text()).toBe(linkedShortNameResponse.items[i].accountName) expect(columns.at(2).text()).toBe(linkedShortNameResponse.items[i].accountBranch) expect(columns.at(3).text()).toBe(linkedShortNameResponse.items[i].accountId) - expect(columns.at(4).text()).toBe(`$${linkedShortNameResponse.items[i].amountOwing.toFixed(2)}`) + expect(columns.at(4).text()).toBe(`${CommonUtils.formatAmount(linkedShortNameResponse.items[i].amountOwing)}`) expect(columns.at(5).text()).toBe(linkedShortNameResponse.items[i].statementId.toString()) } }) diff --git a/auth-web/tests/unit/components/Statements.spec.ts b/auth-web/tests/unit/components/Statements.spec.ts index 0245d02b74..0427223cb2 100644 --- a/auth-web/tests/unit/components/Statements.spec.ts +++ b/auth-web/tests/unit/components/Statements.spec.ts @@ -101,8 +101,8 @@ describe('Statements.vue', () => { }) expect(wrapper.vm.formatAmount(0)).toBe('$0.00') expect(wrapper.vm.formatAmount(1)).toBe('$1.00') - expect(wrapper.vm.formatAmount(1000)).toBe('$1000.00') - expect(wrapper.vm.formatAmount(1000.1)).toBe('$1000.10') + expect(wrapper.vm.formatAmount(1000)).toBe('$1,000.00') + expect(wrapper.vm.formatAmount(1000.1)).toBe('$1,000.10') wrapper.destroy() }) diff --git a/auth-web/tests/unit/util/common-util.spec.ts b/auth-web/tests/unit/util/common-util.spec.ts index 08529721d2..1b1a3426ab 100644 --- a/auth-web/tests/unit/util/common-util.spec.ts +++ b/auth-web/tests/unit/util/common-util.spec.ts @@ -195,6 +195,10 @@ describe('Common Util Test', () => { expect(CommonUtil.trimTrailingSlashURL('abc/')).toBe('abc') }) + it('formatAmount returns formatted amount', () => { + expect(CommonUtil.formatAmount(1234.567)).toBe('$1,234.57') + }) + afterEach(() => { window.location.pathname = pathname })