diff --git a/auth-web/package-lock.json b/auth-web/package-lock.json index ff598d1891..fa91128d51 100644 --- a/auth-web/package-lock.json +++ b/auth-web/package-lock.json @@ -1,12 +1,12 @@ { "name": "auth-web", - "version": "2.6.10", + "version": "2.6.11", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "auth-web", - "version": "2.6.10", + "version": "2.6.11", "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 5ffb8466ab..5f37396035 100644 --- a/auth-web/package.json +++ b/auth-web/package.json @@ -1,6 +1,6 @@ { "name": "auth-web", - "version": "2.6.10", + "version": "2.6.11", "appName": "Auth Web", "sbcName": "SBC Common Components", "private": true, diff --git a/auth-web/src/components/auth/account-settings/transaction/TransactionsDataTable.vue b/auth-web/src/components/auth/account-settings/transaction/TransactionsDataTable.vue index 627108eb2e..86d1799c09 100644 --- a/auth-web/src/components/auth/account-settings/transaction/TransactionsDataTable.vue +++ b/auth-web/src/components/auth/account-settings/transaction/TransactionsDataTable.vue @@ -115,7 +115,7 @@ > mdi-alert </v-icon> - <b>{{ invoiceStatusDisplay[item.statusCode] }}</b> + <b>{{ getInvoiceStatus(item) }}</b> <br> <span v-if="item.updatedOn" @@ -143,12 +143,12 @@ <script lang="ts"> import { BaseVDataTable, DatePicker, IconTooltip } from '@/components' +import { InvoiceStatus, PaymentTypes } from '@/util/constants' import { Ref, computed, defineComponent, nextTick, ref, watch } from '@vue/composition-api' import { BaseTableHeaderI } from '@/components/datatable/interfaces' import CommonUtils from '@/util/common-util' import { DEFAULT_DATA_OPTIONS } from '@/components/datatable/resources' import { DataOptions } from 'vuetify' -import { InvoiceStatus } from '@/util/constants' import { Transaction } from '@/models' import _ from 'lodash' import { invoiceStatusDisplay } from '@/resources/display-mappers' @@ -171,6 +171,15 @@ export default defineComponent({ const getHeaders = computed(() => props.headers) + const getInvoiceStatus = (item: Transaction) => { + // Special case for Online Banking - it shouldn't show NSF, should show Pending. + if (item.paymentMethod === PaymentTypes.ONLINE_BANKING && + item.statusCode === InvoiceStatus.SETTLEMENT_SCHEDULED) { + return invoiceStatusDisplay[InvoiceStatus.PENDING] + } + return invoiceStatusDisplay[item.statusCode] + } + // date picker stuff const dateRangeReset = ref(0) const dateRangeSelected = ref(false) @@ -264,7 +273,8 @@ export default defineComponent({ displayDate, scrollToDatePicker, updateDateRange, - loadTransactionList + loadTransactionList, + getInvoiceStatus } } })