Updated in response to Sev's comments

bcgov · Dec 22, 2023 · 4060a6f · 4060a6f
1 parent ed3e937
commit 4060a6f
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 11 deletions.
diff --git a/src/components/Amalgamation/AmalgamatingBusinesses.vue b/src/components/Amalgamation/AmalgamatingBusinesses.vue
@@ -277,22 +277,26 @@ export default class AmalgamatingBusinesses extends Mixins(AmalgamationMixin, Co
     this.$root.$emit('showSpinner', true)
 
     // Special case to handle Extra-pro A companies
-    if (businessLookup.legalType === 'A') {
+    if ((businessLookup.legalType as any) === CorpTypeCd.EXTRA_PRO_A) {
       const tingBusiness = {
         type: AmlTypes.FOREIGN,
         role: AmlRoles.AMALGAMATING,
         foreignJurisdiction: {
           region: 'British Columbia',
-          country: 'CA'
+          country: JurisdictionLocation.CA
         },
         legalName: businessLookup.name,
         corpNumber: businessLookup.identifier
       } as AmalgamatingBusinessIF
 
       // Check for duplicate
       if (this.checkForDuplicateInTable(tingBusiness, true)) {
+        this.snackbarText = 'Business is already in table.'
+        this.snackbar = true
+
         // Hide spinner.
         this.$root.$emit('showSpinner', false)
+
         return
       }
 
@@ -351,8 +355,13 @@ export default class AmalgamatingBusinesses extends Mixins(AmalgamationMixin, Co
 
     // Check for duplicate.
     if (this.checkForDuplicateInTable(business, false)) {
+      // Hide spinner.
+      this.snackbarText = 'Business is already in table.'
+      this.snackbar = true
+
       // Hide spinner.
       this.$root.$emit('showSpinner', false)
+
       return
     }
 
@@ -421,11 +430,7 @@ export default class AmalgamatingBusinesses extends Mixins(AmalgamationMixin, Co
       this.getAmalgamatingBusinesses.find(
         (b: any) => (b.corpNumber && b.corpNumber === business.corpNumber))
 
-    if (duplicateNonExtraPro || duplicateExtraPro) {
-      this.snackbarText = 'Business is already in table.'
-      this.snackbar = true
-      return true
-    }
+    if (duplicateNonExtraPro || duplicateExtraPro) return true
     return false
   }
 

diff --git a/src/mixins/amalgamation-mixin.ts b/src/mixins/amalgamation-mixin.ts
@@ -88,9 +88,6 @@ export default class AmalgamationMixin extends Vue {
     if (!this.isRoleStaff && business.type === AmlTypes.FOREIGN) {
       return AmlStatuses.ERROR_FOREIGN
     }
-    if (!this.isRoleStaff && business.type === AmlTypes.FOREIGN && business.corpNumber[0] === CorpTypeCd.EXTRA_PRO_A) {
-      return AmlStatuses.ERROR_FOREIGN
-    }
     return null
   }
 
@@ -122,7 +119,6 @@ export default class AmalgamationMixin extends Vue {
   xproUlcCcc (business: AmalgamatingBusinessIF): AmlStatuses {
     if (
       business.type === AmlTypes.FOREIGN &&
-      business.corpNumber[0] === CorpTypeCd.EXTRA_PRO_A &&
       (!this.isTypeBcUlcCompany || !this.isTypeBcCcc)
     ) {
       return AmlStatuses.ERROR_XPRO_ULC_CCC