10680 - Allow changing from GOVN -> PREMIUM

auth-web/src/components/auth/account-settings/account-info/AccountAccessType.vue

@@ -60,7 +60,6 @@
                 v-model="selectedAccessType"
                 class="mt-0"
                 req
-                :rules="[selectedAccessTypeRules]"
               >
                 <v-radio
                   :key="AccessType.REGULAR"
@@ -75,19 +74,6 @@
                   data-test="radio-govn"
                 />
               </v-radio-group>
-              <div
-                v-if="!isPad"
-                class="d-flex pb-3"
-              >
-                <v-icon
-                  size="30"
-                  color="error"
-                  class="mt-1 mr-4"
-                >
-                  mdi-alert-circle-outline
-                </v-icon>
-                <span class="error-text">{{ $t('accountAccessTypeUpdateWarning') }}</span>
-              </div>
 
               <v-card-actions class="px-0 pt-0">
                 <v-row>
@@ -130,7 +116,7 @@
 </template>
 
 <script lang="ts">
-import { AccessType, Account, PaymentTypes } from '@/util/constants'
+import { AccessType, Account } from '@/util/constants'
 import { Component, Emit, Prop, Vue, Watch } from 'vue-property-decorator'
 import { Organization } from '@/models/Organization'
 
@@ -150,16 +136,13 @@ export default class AccountAccessType extends Vue {
   public AccessType = AccessType
   public isLoading = false
 
-  public get isPad (): boolean {
-    return this.currentOrgPaymentType && this.currentOrgPaymentType === PaymentTypes.PAD
-  }
-
+  // Only allow PREMIUM -> GOVN and GOVN -> PREMIUM
   public get isChangeButtonEnabled (): boolean {
     // Check access type and orgtype must be premium
     const accessType: any = this.organization.accessType
     const isAllowedAccessType = this.organization.orgType === Account.PREMIUM &&
-      [AccessType.REGULAR, AccessType.EXTRA_PROVINCIAL, AccessType.REGULAR_BCEID].includes(accessType)
-    return isAllowedAccessType && this.canChangeAccessType // canChangeAccessType is the role based access pasased as property
+      [AccessType.REGULAR, AccessType.EXTRA_PROVINCIAL, AccessType.REGULAR_BCEID, AccessType.GOVN].includes(accessType)
+    return isAllowedAccessType && this.canChangeAccessType // canChangeAccessType is the role based access passed as a property
   }
 
   public get getAccessTypeText (): string {
@@ -178,16 +161,8 @@ export default class AccountAccessType extends Vue {
     this.selectedAccessType = this.organization.accessType === AccessType.GOVN ? AccessType.GOVN : AccessType.REGULAR
   }
 
-  // Custom rules for selectedAccessType v-model in form
-  public selectedAccessTypeRules (): any {
-    return this.selectedAccessType === AccessType.GOVN ? true : 'Please select Government agency'
-  }
-
-  // Currently, there is only one way change from Regular access type accounts to GovN. Not the other way around
   public updateDetails () {
-    if (this.isPad && this.$refs.accountAccessTypeForm.validate()) {
-      this.$emit('update:updateAndSaveAccessTypeDetails', this.selectedAccessType)
-    }
+    this.$emit('update:updateAndSaveAccessTypeDetails', this.selectedAccessType)
   }
 
   @Emit('update:viewOnlyMode')

auth-web/src/components/auth/account-settings/account-info/AccountInfo.vue

@@ -283,6 +283,7 @@
 
 <script lang="ts">
 import {
+  AccessType,
   AccountStatus,
   Pages,
   Permission,
@@ -341,10 +342,12 @@ export default class AccountInfo extends Mixins(
 
   @Action(useOrgStore) syncAddress!: () => Address
   @Action(useOrgStore) getOrgPayments!: () => any
-  @Action(useOrgStore) updateOrganizationAccessType!: (accessType: string) => Promise<Organization>
+  @Action(useOrgStore) updateOrganizationAccessType!: (accessType: string, orgId: number, syncOrg: boolean) =>
+    Promise<Organization>
 
   @Action(useOrgStore) syncOrganization!: (currentAccount: number) => Promise<Organization>
   @Action(useOrgStore) suspendOrganization!: (selectedSuspensionReasonCode: string) => Promise<Organization>
+  @Action(useOrgStore) removeOrgAccountFees!: (orgId: number) => Promise<void>
 
   private dialogTitle: string = ''
   private dialogText: string = ''
@@ -417,7 +420,11 @@ export default class AccountInfo extends Mixins(
 
   // update account access type from child component
   public async updateAndSaveAccessTypeDetails (accessType: string) {
-    await this.updateOrganizationAccessType(accessType)
+    await this.updateOrganizationAccessType(accessType, this.currentOrganization.id, true)
+    // Only remove the account fees if going from GOVN -> PREMIUM (REGULAR)
+    if (accessType === AccessType.REGULAR) {
+      await this.removeOrgAccountFees(this.currentOrganization.id)
+    }
     this.viewOnlyMode({ component: 'accessType', mode: true })
   }
 

auth-web/src/components/auth/manage-business/manage-business-dialog/ManageBusinessDialog.vue

@@ -564,7 +564,6 @@ export default defineComponent({
       }
     })
 
-
     // Methods
     const closeAuthorizationRequestSentDialog = () => {
       authorizationRequestSentDialog.value?.close()

auth-web/src/locales/en.json

@@ -216,7 +216,6 @@
   "acceptInviteLandingMessageBCEID": "To accept the invitation to this account, log in to Business Registry with a registered BCeID account, and verify your identity by a notarized affidavit.",
   "pendingAffidavitAdminReviewTitle":"Your submission to join {team} has been requested ",
   "pendingAffidvitAdminReviewMessage":"Once your information has been reviewed and approved, you will receive an email allowing you to join the account. Please allow {days} business days for this process",
-  "accountAccessTypeUpdateWarning": "This account currently can't change access type. Contact account admin to update the payment method to PAD in order to change the access type.",
   "govnAccountDescription": "Service BC Staff will manually review your account information.",
   "govnConfirmText": "BC Registry Staff will manually review the account to verify the account user. <b>Account will be rejected if account admin does not verify as a government other than BC provincial. </b>This is a option for townships, cities, districts, municipalities, and federal government.",
   "searchAccountNoResult": "<h4>No Results</h4><p>None of the accounts matched this search. Try another search.</p>",

auth-web/src/services/payment.services.ts

@@ -188,4 +188,8 @@ export default class PaymentService {
     const { product } = accountFeePayload
     return axios.put(`${ConfigHelper.getPayAPIURL()}/accounts/${accountId}/fees/${product}`, accountFeePayload)
   }
+
+  static removeAccountFees (accountId: string | number): AxiosPromise<any> {
+    return axios.delete(`${ConfigHelper.getPayAPIURL()}/accounts/${accountId}/fees`)
+  }
 }

auth-web/src/stores/org.ts

@@ -997,7 +997,7 @@ export const useOrgStore = defineStore('org', () => {
     return response?.data || {}
   }
 
-  async function updateOrganizationAccessType ({ accessType, orgId = null, syncOrg = true }): Promise<boolean> {
+  async function updateOrganizationAccessType (accessType: string, orgId: number = null, syncOrg = true): Promise<boolean> {
     if (!orgId) orgId = state.currentOrganization?.id as number
     if (orgId && accessType) {
       try {
@@ -1018,6 +1018,15 @@ export const useOrgStore = defineStore('org', () => {
     }
   }
 
+  async function removeOrgAccountFees (orgId: number) {
+    try {
+      await PaymentService.removeAccountFees(orgId)
+    } catch (error) {
+      // eslint-disable-next-line no-console
+      console.error('remove org account fees operation failed! - ', error)
+    }
+  }
+
   return {
     ...toRefs(state),
     isPremiumAccount,
@@ -1113,6 +1122,7 @@ export const useOrgStore = defineStore('org', () => {
     revokeOrgApiKeys,
     updateOrganizationAccessType,
     $reset,
-    isStaffOrSbcStaff
+    isStaffOrSbcStaff,
+    removeOrgAccountFees
   }
 })

auth-web/src/views/auth/staff/ReviewAccountView.vue

@@ -186,7 +186,7 @@ export default defineComponent({
     const taskRelationshipType: Ref<string> = ref('')
     const productFeeFormValid: Ref<boolean> = ref(false)
     const viewOnly = DisplayModeValues.VIEW_ONLY
-    const accountInfoAccessType = ref(null)
+    const accountInfoAccessType = ref<string>(null)
     const accountInfoValid: Ref<boolean> = ref(true)
     const showAccountInfoValidations: Ref<boolean> = ref(false)
 
@@ -598,11 +598,9 @@ export default defineComponent({
 
       try {
         if (accountInfoAccessType.value && accountInfoAccessType.value !== accountUnderReview.value.accessType) {
-          const success = await orgStore.updateOrganizationAccessType({
-            accessType: accountInfoAccessType.value as string,
-            orgId: accountUnderReview.value.id,
-            syncOrg: false
-          })
+          const success = await orgStore.updateOrganizationAccessType(
+            accountInfoAccessType.value, accountUnderReview.value.id, false
+          )
           if (!success) throw new Error('Error updating account access type prevented review completion.')
         }
         if (isApprove) {

auth-web/tests/unit/components/AccountAccessType.spec.ts

@@ -87,7 +87,7 @@ describe('AccountAccessType.vue', () => {
     expect(wrapper.vm.currentOrgPaymentTypePad).toBeFalsy()
   })
 
-  it('validate view mode with govn org', () => {
+  it('validate view mode with govn org, should be able to change to PREMIUM', () => {
     const $t = () => ''
     const govnOrg = organization
     govnOrg.accessType = AccessType.GOVN
@@ -106,7 +106,7 @@ describe('AccountAccessType.vue', () => {
     expect(wrapper.find('[data-test="title"]').text()).toBe('Access Type')
     expect(wrapper.find('[data-test="txt-selected-access-type"]').text())
       .toBe('Government agency (other than BC provincial)')
-    expect(wrapper.find('[data-test="btn-edit"]').exists()).toBeFalsy()
+    expect(wrapper.find('[data-test="btn-edit"]').exists()).toBeTruthy()
   })
 
   it('validate view mode with govm org', () => {