From a4a70ec272ef146d1281c5f58445d1c2a0869299 Mon Sep 17 00:00:00 2001
From: Jia Xu <Jia.Xu@gov.bc.ca>
Date: Wed, 8 May 2024 16:46:55 -0700
Subject: [PATCH 1/6] show suspension for eft overdue payment account

---
 ...064e6fd_add_eft_overdue_suspension_code.py | 29 +++++++++++++++++++
 auth-api/src/auth_api/utils/enums.py          |  1 +
 .../auth/common/AccountSuspendAlert.vue       | 16 +++++++---
 .../components/pay/LinkedShortNameTable.vue   | 15 ++++++++++
 auth-web/src/util/constants.ts                |  8 +++++
 5 files changed, 65 insertions(+), 4 deletions(-)
 create mode 100644 auth-api/migrations/versions/2024_05_07_a8c61064e6fd_add_eft_overdue_suspension_code.py

diff --git a/auth-api/migrations/versions/2024_05_07_a8c61064e6fd_add_eft_overdue_suspension_code.py b/auth-api/migrations/versions/2024_05_07_a8c61064e6fd_add_eft_overdue_suspension_code.py
new file mode 100644
index 0000000000..31fe586a87
--- /dev/null
+++ b/auth-api/migrations/versions/2024_05_07_a8c61064e6fd_add_eft_overdue_suspension_code.py
@@ -0,0 +1,29 @@
+"""Add Overdue EFT Payments suspension code
+
+Revision ID: a8c61064e6fd
+Revises: e65cc8ab51cc
+Create Date: 2024-05-07 15:53:21.674906
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = 'a8c61064e6fd'
+down_revision = 'e65cc8ab51cc'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    op.execute("INSERT INTO public.suspension_reason_codes "
+            "(code, description,\"default\") "
+            "VALUES "
+            "('OVERDUE_EFT', 'Overdue EFT Payments', false)")
+    op.execute("commit")
+
+
+def downgrade():
+    op.execute("DELETE FROM suspension_reason_codes WHERE code in ('OVERDUE_EFT')")
+    op.execute("commit")
diff --git a/auth-api/src/auth_api/utils/enums.py b/auth-api/src/auth_api/utils/enums.py
index 923ee89e0a..44bdd4767d 100644
--- a/auth-api/src/auth_api/utils/enums.py
+++ b/auth-api/src/auth_api/utils/enums.py
@@ -193,6 +193,7 @@ class SuspensionReasonCode(Enum):
     DISPUTE = 'Account Ownership Dispute'
     COURT_ORDER = 'Court Order'
     FRAUDULENT = 'Fraudulent Activity'
+    OVERDUE_EFT = 'Overdue EFT Payments'
 
 
 class InvitationType(Enum):
diff --git a/auth-web/src/components/auth/common/AccountSuspendAlert.vue b/auth-web/src/components/auth/common/AccountSuspendAlert.vue
index 25f95c0302..0ac059ce02 100644
--- a/auth-web/src/components/auth/common/AccountSuspendAlert.vue
+++ b/auth-web/src/components/auth/common/AccountSuspendAlert.vue
@@ -14,13 +14,14 @@
           mdi-alert-circle-outline
         </v-icon>
         <div
-          v-if="isSuspendedForNSF"
+          v-if="isSuspendedForNSF || isSuspendedForEFTOverdue"
           class="account-alert__info ml-7"
         >
           <div class="font-weight-bold">
             Account Suspended
           </div>
-          <div>Account has been suspended for outstanding balance (NSF).</div>
+          <div v-if="isSuspendedForNSF">Account has been suspended for outstanding balance (NSF).</div>
+          <div v-if="isSuspendedForEFTOverdue">Account has been suspended for overdue EFT payments.</div>
           <div class="mt-6 title font-weight-bold">
             BALANCE DUE:  ${{ totalAmountToPay.toFixed(2) }}
           </div>
@@ -50,7 +51,7 @@
 <script lang="ts">
 import { Action, State } from 'pinia-class'
 import { Component, Vue } from 'vue-property-decorator'
-import { AccountStatus } from '@/util/constants'
+import { AccountStatus, SuspensionReasonCode } from '@/util/constants'
 import { Code } from '@/models/Code'
 import CommonUtils from '@/util/common-util'
 import { FailedInvoice } from '@/models/invoice'
@@ -75,7 +76,14 @@ export default class AccountSuspendAlert extends Vue {
   }
 
   get isSuspendedForNSF (): boolean {
-    return this.currentOrganization?.statusCode === AccountStatus.NSF_SUSPENDED
+    console.log(this.currentOrganization)
+    return (this.currentOrganization?.statusCode === AccountStatus.NSF_SUSPENDED
+      && this.currentOrganization?.suspensionReasonCode !== SuspensionReasonCode.OVERDUE_EFT)
+  }
+
+  get isSuspendedForEFTOverdue (): boolean {
+    return (this.currentOrganization?.statusCode === AccountStatus.SUSPENDED
+      && this.currentOrganization?.suspensionReasonCode === SuspensionReasonCode.OVERDUE_EFT)
   }
 
   get suspendedBy (): string {
diff --git a/auth-web/src/components/pay/LinkedShortNameTable.vue b/auth-web/src/components/pay/LinkedShortNameTable.vue
index 49a77b6ee1..052c1a8a9b 100644
--- a/auth-web/src/components/pay/LinkedShortNameTable.vue
+++ b/auth-web/src/components/pay/LinkedShortNameTable.vue
@@ -51,6 +51,18 @@
           </v-icon>
         </v-btn>
       </template>
+      <template #item-slot-accountName="{ item }">
+        <span>{{item.accountName}}</span>
+        <v-chip
+          small
+          label
+          color="error"
+          class="item-chip"
+          v-if="item.cfsAccountStatus && item.cfsAccountStatus !== 'ACTIVE'"
+        >
+          SUSPENDED
+        </v-chip>
+      </template>
       <template #item-slot-actions="{ index }">
         <div
           :id="`action-menu-${index}`"
@@ -252,4 +264,7 @@ export default defineComponent({
   border: 1px solid #e9ecef;
   font-weight: bold;
 }
+.item-chip {
+  margin-left: 1em;
+}
 </style>
diff --git a/auth-web/src/util/constants.ts b/auth-web/src/util/constants.ts
index 6841e8b4ae..9f6fd8cf59 100644
--- a/auth-web/src/util/constants.ts
+++ b/auth-web/src/util/constants.ts
@@ -118,6 +118,14 @@ export enum AccountStatus {
     PENDING_INVITE_ACCEPT = 'PENDING_INVITE_ACCEPT'
 }
 
+export enum SuspensionReasonCode {
+    OWNER_CHANGE = 'OWNER_CHANGE',
+    DISPUTE = 'DISPUTE',
+    COURT_ORDER = 'COURT_ORDER',
+    FRAUDULENT = 'FRAUDULENT',
+    OVERDUE_EFT = 'OVERDUE_EFT'
+}
+
 export enum IdpHint {
     BCROS = 'bcros',
     IDIR = 'idir',

From 425c134a68bd6405f73809eff2f7f3a91e03b4b8 Mon Sep 17 00:00:00 2001
From: Jia Xu <Jia.Xu@gov.bc.ca>
Date: Thu, 9 May 2024 07:58:26 -0700
Subject: [PATCH 2/6] tweaks

---
 .../components/auth/common/AccountSuspendAlert.vue   |  8 ++++----
 auth-web/src/components/pay/LinkedShortNameTable.vue | 12 ++++++++++++
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/auth-web/src/components/auth/common/AccountSuspendAlert.vue b/auth-web/src/components/auth/common/AccountSuspendAlert.vue
index 0ac059ce02..88b05764fb 100644
--- a/auth-web/src/components/auth/common/AccountSuspendAlert.vue
+++ b/auth-web/src/components/auth/common/AccountSuspendAlert.vue
@@ -27,7 +27,7 @@
           </div>
         </div>
         <div
-          v-if="isSuspendedForNSF"
+          v-if="isSuspendedForNSF || isSuspendedForEFTOverdue"
           class="account-alert__date"
         >
           {{ suspendedDate }}
@@ -49,15 +49,15 @@
 </template>
 
 <script lang="ts">
-import { Action, State } from 'pinia-class'
-import { Component, Vue } from 'vue-property-decorator'
 import { AccountStatus, SuspensionReasonCode } from '@/util/constants'
+import { Action, State } from 'pinia-class'
 import { Code } from '@/models/Code'
-import CommonUtils from '@/util/common-util'
+import { Component, Vue } from 'vue-property-decorator'
 import { FailedInvoice } from '@/models/invoice'
 import { Organization } from '@/models/Organization'
 import { useCodesStore } from '@/stores/codes'
 import { useOrgStore } from '@/stores/org'
+import CommonUtils from '@/util/common-util'
 
 @Component
 export default class AccountSuspendAlert extends Vue {
diff --git a/auth-web/src/components/pay/LinkedShortNameTable.vue b/auth-web/src/components/pay/LinkedShortNameTable.vue
index 54892dd7db..d39a00a57e 100644
--- a/auth-web/src/components/pay/LinkedShortNameTable.vue
+++ b/auth-web/src/components/pay/LinkedShortNameTable.vue
@@ -41,6 +41,18 @@
           </v-icon>
         </v-btn>
       </template>
+      <template #item-slot-accountName="{ item }">
+        <span>{{item.accountName}}</span>
+        <v-chip
+          small
+          label
+          color="error"
+          class="item-chip"
+          v-if="item.cfsAccountStatus && item.cfsAccountStatus !== 'ACTIVE'"
+        >
+          SUSPENDED
+        </v-chip>
+      </template>
       <template #item-slot-amountOwing="{ item }">
         <span>{{ formatAmount(item.amountOwing) }}</span>
       </template>

From 5f0ec2449c7ea1a7b8133085c87bb0fb75ebd7e3 Mon Sep 17 00:00:00 2001
From: Jia Xu <Jia.Xu@gov.bc.ca>
Date: Thu, 9 May 2024 08:08:20 -0700
Subject: [PATCH 3/6] lint fix

---
 .../auth/common/AccountSuspendAlert.vue       | 20 +++++++++++--------
 .../components/pay/LinkedShortNameTable.vue   |  4 ++--
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/auth-web/src/components/auth/common/AccountSuspendAlert.vue b/auth-web/src/components/auth/common/AccountSuspendAlert.vue
index 88b05764fb..6a94e5cc5a 100644
--- a/auth-web/src/components/auth/common/AccountSuspendAlert.vue
+++ b/auth-web/src/components/auth/common/AccountSuspendAlert.vue
@@ -20,8 +20,12 @@
           <div class="font-weight-bold">
             Account Suspended
           </div>
-          <div v-if="isSuspendedForNSF">Account has been suspended for outstanding balance (NSF).</div>
-          <div v-if="isSuspendedForEFTOverdue">Account has been suspended for overdue EFT payments.</div>
+          <div v-if="isSuspendedForNSF">
+            Account has been suspended for outstanding balance (NSF).
+          </div>
+          <div v-if="isSuspendedForEFTOverdue">
+            Account has been suspended for overdue EFT payments.
+          </div>
           <div class="mt-6 title font-weight-bold">
             BALANCE DUE:  ${{ totalAmountToPay.toFixed(2) }}
           </div>
@@ -51,13 +55,13 @@
 <script lang="ts">
 import { AccountStatus, SuspensionReasonCode } from '@/util/constants'
 import { Action, State } from 'pinia-class'
-import { Code } from '@/models/Code'
 import { Component, Vue } from 'vue-property-decorator'
+import { Code } from '@/models/Code'
+import CommonUtils from '@/util/common-util'
 import { FailedInvoice } from '@/models/invoice'
 import { Organization } from '@/models/Organization'
 import { useCodesStore } from '@/stores/codes'
 import { useOrgStore } from '@/stores/org'
-import CommonUtils from '@/util/common-util'
 
 @Component
 export default class AccountSuspendAlert extends Vue {
@@ -77,13 +81,13 @@ export default class AccountSuspendAlert extends Vue {
 
   get isSuspendedForNSF (): boolean {
     console.log(this.currentOrganization)
-    return (this.currentOrganization?.statusCode === AccountStatus.NSF_SUSPENDED
-      && this.currentOrganization?.suspensionReasonCode !== SuspensionReasonCode.OVERDUE_EFT)
+    return (this.currentOrganization?.statusCode === AccountStatus.NSF_SUSPENDED &&
+      this.currentOrganization?.suspensionReasonCode !== SuspensionReasonCode.OVERDUE_EFT)
   }
 
   get isSuspendedForEFTOverdue (): boolean {
-    return (this.currentOrganization?.statusCode === AccountStatus.SUSPENDED
-      && this.currentOrganization?.suspensionReasonCode === SuspensionReasonCode.OVERDUE_EFT)
+    return (this.currentOrganization?.statusCode === AccountStatus.SUSPENDED &&
+      this.currentOrganization?.suspensionReasonCode === SuspensionReasonCode.OVERDUE_EFT)
   }
 
   get suspendedBy (): string {
diff --git a/auth-web/src/components/pay/LinkedShortNameTable.vue b/auth-web/src/components/pay/LinkedShortNameTable.vue
index d39a00a57e..739dcef7b5 100644
--- a/auth-web/src/components/pay/LinkedShortNameTable.vue
+++ b/auth-web/src/components/pay/LinkedShortNameTable.vue
@@ -42,13 +42,13 @@
         </v-btn>
       </template>
       <template #item-slot-accountName="{ item }">
-        <span>{{item.accountName}}</span>
+        <span>{{ item.accountName }}</span>
         <v-chip
+          v-if="item.cfsAccountStatus && item.cfsAccountStatus !== 'ACTIVE'"
           small
           label
           color="error"
           class="item-chip"
-          v-if="item.cfsAccountStatus && item.cfsAccountStatus !== 'ACTIVE'"
         >
           SUSPENDED
         </v-chip>

From f3322434239476cc4745543c9c668a7f70df9373 Mon Sep 17 00:00:00 2001
From: Jia Xu <Jia.Xu@gov.bc.ca>
Date: Thu, 9 May 2024 13:05:23 -0700
Subject: [PATCH 4/6] code review fix

---
 ..._24_b20a33cb84f2_mhr_qualified_supplier.py |  8 +++----
 ...08_03_746771099983_add_nds_product_code.py |  4 +---
 ...08_08_18823fc88aac_update_product_codes.py |  8 +++----
 ...824f5ef280c6_add_ca_search_product_code.py |  4 +---
 ...064e6fd_add_eft_overdue_suspension_code.py |  2 +-
 .../versions/2024_05_09_fcede9989aa2_.py      | 24 +++++++++++++++++++
 auth-api/migrations/versions/211deb552319_.py |  3 +--
 .../975fe0b2c859_add_mhr_product_code.py      |  3 +--
 .../auth/common/AccountSuspendAlert.vue       | 18 +++++++++-----
 .../components/pay/LinkedShortNameTable.vue   |  2 +-
 10 files changed, 48 insertions(+), 28 deletions(-)
 create mode 100644 auth-api/migrations/versions/2024_05_09_fcede9989aa2_.py

diff --git a/auth-api/migrations/versions/2023_07_24_b20a33cb84f2_mhr_qualified_supplier.py b/auth-api/migrations/versions/2023_07_24_b20a33cb84f2_mhr_qualified_supplier.py
index aea4e0f747..241c737abb 100644
--- a/auth-api/migrations/versions/2023_07_24_b20a33cb84f2_mhr_qualified_supplier.py
+++ b/auth-api/migrations/versions/2023_07_24_b20a33cb84f2_mhr_qualified_supplier.py
@@ -27,27 +27,25 @@ def upgrade():
                   sa.Column('external_source_id', sa.String(length=75), nullable=True))
 
     # Add MHR sub product codes
-    op.execute("INSERT INTO public.product_codes "
+    op.execute("INSERT INTO product_codes "
                "(code, description,\"default\", type_code, hidden, need_review, premium_only, url, keycloak_group, "
                "parent_code) "
                "VALUES "
                "('MHR_QSLN', 'Qualified Supplier - Lawyers and Notaries', false, 'INTERNAL', false, true, true, "
                "'https://www.bcregistry.ca/ppr', 'mhr_qualified_user', 'MHR')")
-    op.execute("INSERT INTO public.product_codes "
+    op.execute("INSERT INTO product_codes "
                "(code, description,\"default\", type_code, hidden, need_review, premium_only, url, keycloak_group, "
                "parent_code) "
                "VALUES "
                "('MHR_QSHM', 'Qualified Supplier - Home Manufacturers', false, 'INTERNAL', false, true, true, "
                "'https://www.bcregistry.ca/ppr', 'mhr_manufacturer', 'MHR')")
-    op.execute("INSERT INTO public.product_codes "
+    op.execute("INSERT INTO product_codes "
                "(code, description,\"default\", type_code, hidden, need_review, premium_only, url, keycloak_group, "
                "parent_code) "
                "VALUES "
                "('MHR_QSHD', 'Qualified Supplier - Home Dealers', false, 'INTERNAL', false, true, true, "
                "'https://www.bcregistry.ca/ppr', 'mhr_general_user', 'MHR')")
 
-    op.execute("commit")
-
 
 def downgrade():
     op.execute("DELETE FROM product_codes WHERE code in ('MHR_QSLN')")
diff --git a/auth-api/migrations/versions/2023_08_03_746771099983_add_nds_product_code.py b/auth-api/migrations/versions/2023_08_03_746771099983_add_nds_product_code.py
index 8acdc88dae..52aa4844e0 100644
--- a/auth-api/migrations/versions/2023_08_03_746771099983_add_nds_product_code.py
+++ b/auth-api/migrations/versions/2023_08_03_746771099983_add_nds_product_code.py
@@ -16,13 +16,11 @@
 
 
 def upgrade():
-    op.execute("INSERT INTO public.product_codes "
+    op.execute("INSERT INTO product_codes "
              "(code, description,\"default\", type_code, hidden, need_review, premium_only, url) "
              "VALUES "
              "('NDS', 'New Director Search', false, 'INTERNAL', true, true, false,'')")
-    op.execute("commit")
 
 
 def downgrade():
     op.execute("DELETE FROM product_codes WHERE code in ('NDS')")
-    op.execute("commit")
diff --git a/auth-api/migrations/versions/2023_08_08_18823fc88aac_update_product_codes.py b/auth-api/migrations/versions/2023_08_08_18823fc88aac_update_product_codes.py
index b224ab05b4..230413f86e 100644
--- a/auth-api/migrations/versions/2023_08_08_18823fc88aac_update_product_codes.py
+++ b/auth-api/migrations/versions/2023_08_08_18823fc88aac_update_product_codes.py
@@ -20,20 +20,18 @@ def upgrade():
     # ### commands auto generated by Alembic - please adjust! ###
     op.add_column('product_codes', sa.Column('need_system_admin', sa.Boolean(), nullable=True))
     # ### end Alembic commands ###
-    op.execute("UPDATE public.product_codes "
+    op.execute("UPDATE product_codes "
                "SET need_review=false, need_system_admin=true "
                "WHERE code='NDS'")
-    op.execute("UPDATE public.product_codes "
+    op.execute("UPDATE product_codes "
                "SET need_system_admin=false "
                "WHERE code!='NDS'")
-    op.execute("commit")
 
 
 def downgrade():
     # ### commands auto generated by Alembic - please adjust! ###
     op.drop_column('product_codes', 'need_system_admin')
     # ### end Alembic commands ###
-    op.execute("UPDATE public.product_codes "
+    op.execute("UPDATE product_codes "
                "SET need_review=true "
                "WHERE code='NDS'")
-    op.execute("commit")
diff --git a/auth-api/migrations/versions/2024_04_19_824f5ef280c6_add_ca_search_product_code.py b/auth-api/migrations/versions/2024_04_19_824f5ef280c6_add_ca_search_product_code.py
index 9de3cff5c2..917421c8c0 100644
--- a/auth-api/migrations/versions/2024_04_19_824f5ef280c6_add_ca_search_product_code.py
+++ b/auth-api/migrations/versions/2024_04_19_824f5ef280c6_add_ca_search_product_code.py
@@ -17,12 +17,10 @@
 
 
 def upgrade():
-    op.execute("INSERT INTO public.product_codes "
+    op.execute("INSERT INTO product_codes "
              "(code, description,\"default\", type_code, hidden, need_review, need_system_admin, premium_only, url) "
              "VALUES "
              "('CA_SEARCH', 'Competent Authority Search', false, 'INTERNAL', true, false, true, false,'')")
-    op.execute("commit")
 
 def downgrade():
     op.execute("DELETE FROM product_codes WHERE code in ('CA_SEARCH')")
-    op.execute("commit")
diff --git a/auth-api/migrations/versions/2024_05_07_a8c61064e6fd_add_eft_overdue_suspension_code.py b/auth-api/migrations/versions/2024_05_07_a8c61064e6fd_add_eft_overdue_suspension_code.py
index 31fe586a87..94b485e3f9 100644
--- a/auth-api/migrations/versions/2024_05_07_a8c61064e6fd_add_eft_overdue_suspension_code.py
+++ b/auth-api/migrations/versions/2024_05_07_a8c61064e6fd_add_eft_overdue_suspension_code.py
@@ -17,7 +17,7 @@
 
 
 def upgrade():
-    op.execute("INSERT INTO public.suspension_reason_codes "
+    op.execute("INSERT INTO suspension_reason_codes "
             "(code, description,\"default\") "
             "VALUES "
             "('OVERDUE_EFT', 'Overdue EFT Payments', false)")
diff --git a/auth-api/migrations/versions/2024_05_09_fcede9989aa2_.py b/auth-api/migrations/versions/2024_05_09_fcede9989aa2_.py
new file mode 100644
index 0000000000..804c0e8fce
--- /dev/null
+++ b/auth-api/migrations/versions/2024_05_09_fcede9989aa2_.py
@@ -0,0 +1,24 @@
+"""empty message
+
+Revision ID: fcede9989aa2
+Revises: a8c61064e6fd, 17369fa9416d
+Create Date: 2024-05-09 10:57:29.187758
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = 'fcede9989aa2'
+down_revision = ('a8c61064e6fd', '17369fa9416d')
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    pass
+
+
+def downgrade():
+    pass
diff --git a/auth-api/migrations/versions/211deb552319_.py b/auth-api/migrations/versions/211deb552319_.py
index 32aba19f66..d68a780e75 100644
--- a/auth-api/migrations/versions/211deb552319_.py
+++ b/auth-api/migrations/versions/211deb552319_.py
@@ -17,12 +17,11 @@
 
 
 def upgrade():
-    op.execute("INSERT INTO public.product_codes "
+    op.execute("INSERT INTO product_codes "
              "(code, description,\"default\", type_code, hidden, need_review, premium_only, url) "
              "VALUES "
              "('BUSINESS_SEARCH', 'Business Search', false, 'INTERNAL', false, false, true, "
              "'https://www.bcregistry.ca/business/search')")
-    op.execute("commit")
 
 
 def downgrade():
diff --git a/auth-api/migrations/versions/975fe0b2c859_add_mhr_product_code.py b/auth-api/migrations/versions/975fe0b2c859_add_mhr_product_code.py
index 4b55129e85..7fd19abf16 100644
--- a/auth-api/migrations/versions/975fe0b2c859_add_mhr_product_code.py
+++ b/auth-api/migrations/versions/975fe0b2c859_add_mhr_product_code.py
@@ -17,12 +17,11 @@
 
 
 def upgrade():
-    op.execute("INSERT INTO public.product_codes "
+    op.execute("INSERT INTO product_codes "
              "(code, description,\"default\", type_code, hidden, need_review, premium_only, url) "
              "VALUES "
              "('MHR', 'Manufactured Home Registry', false, 'INTERNAL', true, false, true, "
              "'https://www.bcregistry.ca/ppr')")
-    op.execute("commit")
 
 
 
diff --git a/auth-web/src/components/auth/common/AccountSuspendAlert.vue b/auth-web/src/components/auth/common/AccountSuspendAlert.vue
index 6a94e5cc5a..4283269fe3 100644
--- a/auth-web/src/components/auth/common/AccountSuspendAlert.vue
+++ b/auth-web/src/components/auth/common/AccountSuspendAlert.vue
@@ -20,11 +20,8 @@
           <div class="font-weight-bold">
             Account Suspended
           </div>
-          <div v-if="isSuspendedForNSF">
-            Account has been suspended for outstanding balance (NSF).
-          </div>
-          <div v-if="isSuspendedForEFTOverdue">
-            Account has been suspended for overdue EFT payments.
+          <div>
+            Account has been suspended for {{ accountSuspendReason }}.
           </div>
           <div class="mt-6 title font-weight-bold">
             BALANCE DUE:  ${{ totalAmountToPay.toFixed(2) }}
@@ -80,7 +77,6 @@ export default class AccountSuspendAlert extends Vue {
   }
 
   get isSuspendedForNSF (): boolean {
-    console.log(this.currentOrganization)
     return (this.currentOrganization?.statusCode === AccountStatus.NSF_SUSPENDED &&
       this.currentOrganization?.suspensionReasonCode !== SuspensionReasonCode.OVERDUE_EFT)
   }
@@ -94,6 +90,16 @@ export default class AccountSuspendAlert extends Vue {
     return this.currentOrganization?.decisionMadeBy
   }
 
+  get accountSuspendReason (): string {
+    if (this.isSuspendedForNSF) {
+      return 'outstanding balance (NSF)'
+    }
+    if (this.isSuspendedForEFTOverdue) {
+      return 'overdue EFT payments'
+    }
+    return ''
+  }
+
   suspendedReason (): string {
     return this.suspensionReasonCodes?.find(suspensionReasonCode =>
       suspensionReasonCode?.code === this.currentOrganization?.suspensionReasonCode)?.desc
diff --git a/auth-web/src/components/pay/LinkedShortNameTable.vue b/auth-web/src/components/pay/LinkedShortNameTable.vue
index 739dcef7b5..9dac716c60 100644
--- a/auth-web/src/components/pay/LinkedShortNameTable.vue
+++ b/auth-web/src/components/pay/LinkedShortNameTable.vue
@@ -44,7 +44,7 @@
       <template #item-slot-accountName="{ item }">
         <span>{{ item.accountName }}</span>
         <v-chip
-          v-if="item.cfsAccountStatus && item.cfsAccountStatus !== 'ACTIVE'"
+          v-if="item.cfsAccountStatus === 'FREEZE'"
           small
           label
           color="error"

From 7b48f1219b047628cb0aa5f237bfbd28d6064043 Mon Sep 17 00:00:00 2001
From: Jia Xu <Jia.Xu@gov.bc.ca>
Date: Thu, 9 May 2024 13:34:14 -0700
Subject: [PATCH 5/6] add CfsAccountStatus enums

---
 ..._05_07_a8c61064e6fd_add_eft_overdue_suspension_code.py | 2 --
 auth-web/src/components/pay/LinkedShortNameTable.vue      | 7 ++++---
 auth-web/src/util/constants.ts                            | 8 ++++++++
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/auth-api/migrations/versions/2024_05_07_a8c61064e6fd_add_eft_overdue_suspension_code.py b/auth-api/migrations/versions/2024_05_07_a8c61064e6fd_add_eft_overdue_suspension_code.py
index 94b485e3f9..507990fcc2 100644
--- a/auth-api/migrations/versions/2024_05_07_a8c61064e6fd_add_eft_overdue_suspension_code.py
+++ b/auth-api/migrations/versions/2024_05_07_a8c61064e6fd_add_eft_overdue_suspension_code.py
@@ -21,9 +21,7 @@ def upgrade():
             "(code, description,\"default\") "
             "VALUES "
             "('OVERDUE_EFT', 'Overdue EFT Payments', false)")
-    op.execute("commit")
 
 
 def downgrade():
     op.execute("DELETE FROM suspension_reason_codes WHERE code in ('OVERDUE_EFT')")
-    op.execute("commit")
diff --git a/auth-web/src/components/pay/LinkedShortNameTable.vue b/auth-web/src/components/pay/LinkedShortNameTable.vue
index 9dac716c60..eed8b26fda 100644
--- a/auth-web/src/components/pay/LinkedShortNameTable.vue
+++ b/auth-web/src/components/pay/LinkedShortNameTable.vue
@@ -44,7 +44,7 @@
       <template #item-slot-accountName="{ item }">
         <span>{{ item.accountName }}</span>
         <v-chip
-          v-if="item.cfsAccountStatus === 'FREEZE'"
+          v-if="item.cfsAccountStatus === CfsAccountStatus.FREEZE"
           small
           label
           color="error"
@@ -77,7 +77,7 @@
   </div>
 </template>
 <script lang="ts">
-import { SessionStorageKeys, ShortNameStatus } from '@/util/constants'
+import { CfsAccountStatus, SessionStorageKeys, ShortNameStatus } from '@/util/constants'
 import { defineComponent, onMounted, reactive, watch } from '@vue/composition-api'
 import { BaseVDataTable } from '..'
 import CommonUtils from '@/util/common-util'
@@ -249,7 +249,8 @@ export default defineComponent({
       state,
       updateFilter,
       viewDetails,
-      formatAmount
+      formatAmount,
+      CfsAccountStatus
     }
   }
 })
diff --git a/auth-web/src/util/constants.ts b/auth-web/src/util/constants.ts
index 967499df49..26d934a976 100644
--- a/auth-web/src/util/constants.ts
+++ b/auth-web/src/util/constants.ts
@@ -638,3 +638,11 @@ export enum ShortNameStatus {
 export enum ShortNameResponseStatus {
     EFT_SHORT_NAME_ALREADY_MAPPED = 'EFT_SHORT_NAME_ALREADY_MAPPED'
 }
+
+export enum CfsAccountStatus {
+    PENDING = 'PENDING',
+    PENDING_PAD_ACTIVATION = 'PENDING_PAD_ACTIVATION',
+    ACTIVE = 'ACTIVE',
+    INACTIVE = 'INACTIVE',
+    FREEZE = 'FREEZE'
+}

From 3438412e9be6fa93ba1f39ea9fd2f89c3a3a9775 Mon Sep 17 00:00:00 2001
From: Jia Xu <Jia.Xu@gov.bc.ca>
Date: Thu, 9 May 2024 16:43:42 -0700
Subject: [PATCH 6/6] fix migration error and change overdue eft status to
 NSF_SUSPENDED

---
 ...417607_add_eft_overdue_suspension_code.py} | 12 +++++-----
 .../versions/2024_05_09_fcede9989aa2_.py      | 24 -------------------
 .../auth/common/AccountSuspendAlert.vue       | 19 ++++-----------
 .../StaffSuspendedAccountsTable.vue           | 11 ++++-----
 .../components/pay/LinkedShortNameTable.vue   |  7 +++---
 auth-web/src/util/constants.ts                |  5 ++++
 6 files changed, 25 insertions(+), 53 deletions(-)
 rename auth-api/migrations/versions/{2024_05_07_a8c61064e6fd_add_eft_overdue_suspension_code.py => 2024_05_09_e2d1d6417607_add_eft_overdue_suspension_code.py} (69%)
 delete mode 100644 auth-api/migrations/versions/2024_05_09_fcede9989aa2_.py

diff --git a/auth-api/migrations/versions/2024_05_07_a8c61064e6fd_add_eft_overdue_suspension_code.py b/auth-api/migrations/versions/2024_05_09_e2d1d6417607_add_eft_overdue_suspension_code.py
similarity index 69%
rename from auth-api/migrations/versions/2024_05_07_a8c61064e6fd_add_eft_overdue_suspension_code.py
rename to auth-api/migrations/versions/2024_05_09_e2d1d6417607_add_eft_overdue_suspension_code.py
index 507990fcc2..c2aaee2008 100644
--- a/auth-api/migrations/versions/2024_05_07_a8c61064e6fd_add_eft_overdue_suspension_code.py
+++ b/auth-api/migrations/versions/2024_05_09_e2d1d6417607_add_eft_overdue_suspension_code.py
@@ -1,8 +1,8 @@
-"""Add Overdue EFT Payments suspension code
+"""empty message
 
-Revision ID: a8c61064e6fd
-Revises: e65cc8ab51cc
-Create Date: 2024-05-07 15:53:21.674906
+Revision ID: e2d1d6417607
+Revises: 17369fa9416d
+Create Date: 2024-05-09 15:39:36.678009
 
 """
 from alembic import op
@@ -10,8 +10,8 @@
 
 
 # revision identifiers, used by Alembic.
-revision = 'a8c61064e6fd'
-down_revision = 'e65cc8ab51cc'
+revision = 'e2d1d6417607'
+down_revision = '17369fa9416d'
 branch_labels = None
 depends_on = None
 
diff --git a/auth-api/migrations/versions/2024_05_09_fcede9989aa2_.py b/auth-api/migrations/versions/2024_05_09_fcede9989aa2_.py
deleted file mode 100644
index 804c0e8fce..0000000000
--- a/auth-api/migrations/versions/2024_05_09_fcede9989aa2_.py
+++ /dev/null
@@ -1,24 +0,0 @@
-"""empty message
-
-Revision ID: fcede9989aa2
-Revises: a8c61064e6fd, 17369fa9416d
-Create Date: 2024-05-09 10:57:29.187758
-
-"""
-from alembic import op
-import sqlalchemy as sa
-
-
-# revision identifiers, used by Alembic.
-revision = 'fcede9989aa2'
-down_revision = ('a8c61064e6fd', '17369fa9416d')
-branch_labels = None
-depends_on = None
-
-
-def upgrade():
-    pass
-
-
-def downgrade():
-    pass
diff --git a/auth-web/src/components/auth/common/AccountSuspendAlert.vue b/auth-web/src/components/auth/common/AccountSuspendAlert.vue
index 4283269fe3..028ccecf17 100644
--- a/auth-web/src/components/auth/common/AccountSuspendAlert.vue
+++ b/auth-web/src/components/auth/common/AccountSuspendAlert.vue
@@ -14,7 +14,7 @@
           mdi-alert-circle-outline
         </v-icon>
         <div
-          v-if="isSuspendedForNSF || isSuspendedForEFTOverdue"
+          v-if="isSuspendedForNSF"
           class="account-alert__info ml-7"
         >
           <div class="font-weight-bold">
@@ -28,7 +28,7 @@
           </div>
         </div>
         <div
-          v-if="isSuspendedForNSF || isSuspendedForEFTOverdue"
+          v-if="isSuspendedForNSF"
           class="account-alert__date"
         >
           {{ suspendedDate }}
@@ -77,13 +77,7 @@ export default class AccountSuspendAlert extends Vue {
   }
 
   get isSuspendedForNSF (): boolean {
-    return (this.currentOrganization?.statusCode === AccountStatus.NSF_SUSPENDED &&
-      this.currentOrganization?.suspensionReasonCode !== SuspensionReasonCode.OVERDUE_EFT)
-  }
-
-  get isSuspendedForEFTOverdue (): boolean {
-    return (this.currentOrganization?.statusCode === AccountStatus.SUSPENDED &&
-      this.currentOrganization?.suspensionReasonCode === SuspensionReasonCode.OVERDUE_EFT)
+    return this.currentOrganization?.statusCode === AccountStatus.NSF_SUSPENDED
   }
 
   get suspendedBy (): string {
@@ -91,13 +85,10 @@ export default class AccountSuspendAlert extends Vue {
   }
 
   get accountSuspendReason (): string {
-    if (this.isSuspendedForNSF) {
-      return 'outstanding balance (NSF)'
-    }
-    if (this.isSuspendedForEFTOverdue) {
+    if (this.currentOrganization?.suspensionReasonCode === SuspensionReasonCode.OVERDUE_EFT) {
       return 'overdue EFT payments'
     }
-    return ''
+    return 'outstanding balance (NSF)'
   }
 
   suspendedReason (): string {
diff --git a/auth-web/src/components/auth/staff/account-management/StaffSuspendedAccountsTable.vue b/auth-web/src/components/auth/staff/account-management/StaffSuspendedAccountsTable.vue
index cfa624d025..cbea24e622 100644
--- a/auth-web/src/components/auth/staff/account-management/StaffSuspendedAccountsTable.vue
+++ b/auth-web/src/components/auth/staff/account-management/StaffSuspendedAccountsTable.vue
@@ -45,7 +45,7 @@
 </template>
 
 <script lang="ts">
-import { AccessType, Account, AccountStatus } from '@/util/constants'
+import { AccessType, Account, AccountStatus, SuspensionReason, SuspensionReasonCode } from '@/util/constants'
 import { Action, State } from 'pinia-class'
 import { Component, Mixins, Watch } from 'vue-property-decorator'
 import { Member, OrgFilterParams, OrgList, Organization } from '@/models/Organization'
@@ -176,12 +176,11 @@ export default class StaffActiveAccountsTable extends Mixins(PaginationMixin) {
 
   getStatusText (org: Organization) {
     if (org.statusCode === AccountStatus.NSF_SUSPENDED) {
-      return 'NSF'
-    } else if (org.statusCode === AccountStatus.SUSPENDED) {
-      return this.getSuspensionReasonCode(org)
-    } else {
-      return org.statusCode
+      return org.suspensionReasonCode === SuspensionReasonCode.OVERDUE_EFT ? SuspensionReason.OVERDUE_EFT : SuspensionReason.NSF
     }
+    return org.statusCode === AccountStatus.SUSPENDED
+      ? this.getSuspensionReasonCode(org)
+      : org.statusCode
   }
 
   private getSuspensionReasonCode (org: Organization) : string {
diff --git a/auth-web/src/components/pay/LinkedShortNameTable.vue b/auth-web/src/components/pay/LinkedShortNameTable.vue
index eed8b26fda..69a2f9ed83 100644
--- a/auth-web/src/components/pay/LinkedShortNameTable.vue
+++ b/auth-web/src/components/pay/LinkedShortNameTable.vue
@@ -50,7 +50,7 @@
           color="error"
           class="item-chip"
         >
-          SUSPENDED
+          {{ AccountStatus.SUSPENDED }}
         </v-chip>
       </template>
       <template #item-slot-amountOwing="{ item }">
@@ -77,7 +77,7 @@
   </div>
 </template>
 <script lang="ts">
-import { CfsAccountStatus, SessionStorageKeys, ShortNameStatus } from '@/util/constants'
+import { AccountStatus, CfsAccountStatus, SessionStorageKeys, ShortNameStatus } from '@/util/constants'
 import { defineComponent, onMounted, reactive, watch } from '@vue/composition-api'
 import { BaseVDataTable } from '..'
 import CommonUtils from '@/util/common-util'
@@ -250,7 +250,8 @@ export default defineComponent({
       updateFilter,
       viewDetails,
       formatAmount,
-      CfsAccountStatus
+      CfsAccountStatus,
+      AccountStatus
     }
   }
 })
diff --git a/auth-web/src/util/constants.ts b/auth-web/src/util/constants.ts
index 26d934a976..2ea273aef6 100644
--- a/auth-web/src/util/constants.ts
+++ b/auth-web/src/util/constants.ts
@@ -126,6 +126,11 @@ export enum SuspensionReasonCode {
     OVERDUE_EFT = 'OVERDUE_EFT'
 }
 
+export enum SuspensionReason {
+    NSF = 'NSF',
+    OVERDUE_EFT = 'Overdue EFT Payments'
+}
+
 export enum IdpHint {
     BCROS = 'bcros',
     IDIR = 'idir',