Removed duplicate functions & unused getter.

bcgov · Nov 29, 2023 · 0abe3ac · 0abe3ac
1 parent c978e6c
commit 0abe3ac
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 35 deletions.
diff --git a/src/components/existing-request/existing-request-display.vue b/src/components/existing-request/existing-request-display.vue
@@ -313,8 +313,7 @@
             :approvedName="approvedName && approvedName.name"
             :emailAddress="nr && nr.applicants && nr.applicants.emailAddress"
             :disabled="disableUnfurnished"
-            @incorporateRegisterYourBusiness="incorporateRegisterYourBusiness()"
-            @amalgamateYourBusiness="amalgamateYourBusiness()"
+            @affiliateYourBusiness="affiliateYourBusiness()"
             @goToSocietiesOnline="goToSocietiesOnline()"
             @goToCorpOnline="goToCorpOnline()"
             @goToEntityDashboard="goToEntityDashboard(nr.corpNum)"
@@ -369,7 +368,6 @@ export default class ExistingRequestDisplay extends Mixins(
   @Getter getNrId!: number
   @Getter getNrState!: NrState
   @Getter isMobile!: boolean
-  @Getter isAmalgamation!: boolean
   // Global actions
   @Action editExistingRequest!: ActionBindingIF
   @Action setDisplayedComponent!: ActionBindingIF
@@ -774,15 +772,8 @@ export default class ExistingRequestDisplay extends Mixins(
     this.setConditionsModalVisible(true)
   }
 
-  /** Called to incorporate/register the business. */
-  async incorporateRegisterYourBusiness (): Promise<void> {
-    // safety check
-    if (!this.isNrApprovedOrConditional) return
-
-    return this.affiliateOrLogin()
-  }
-
-  async amalgamateYourBusiness (): Promise<void> {
+  /** Called to incorporate/register/amalgamate the business. */
+  async affiliateYourBusiness (): Promise<void> {
     // safety check
     if (!this.isNrApprovedOrConditional) return
 

diff --git a/src/components/existing-request/nr-approved-gray-box.vue b/src/components/existing-request/nr-approved-gray-box.vue
@@ -12,7 +12,7 @@
           class="register-btn mt-30"
           min-width="20rem"
           :disabled="disabled"
-          @click="$emit('incorporateRegisterYourBusiness')"
+          @click="$emit('affiliateYourBusiness')"
         >
           <strong>Register Your Business</strong>
         </v-btn>
@@ -26,7 +26,7 @@
           class="incorporate-now-btn mt-30"
           min-width="20rem"
           :disabled="disabled"
-          @click="$emit('incorporateRegisterYourBusiness')"
+          @click="$emit('affiliateYourBusiness')"
         >
           <strong>Incorporate Your Business</strong>
         </v-btn>
@@ -72,7 +72,7 @@
           class="amalgamate-now-btn mt-30"
           min-width="20rem"
           :disabled="disabled"
-          @click="$emit('amalgamateYourBusiness')"
+          @click="$emit('affiliateYourBusiness')"
         >
           <strong>Amalgamate Now</strong>
         </v-btn>
@@ -225,7 +225,7 @@ export default class NrApprovedGrayBox extends Mixins(CommonMixin) {
   }
 
   get showOpenExternalIcon (): boolean {
-    if (this.showAmalgamateNowButton && !this.isSupportedAmalgamation(this.getNr.requestTypeCd)) return true
+    if (this.showAmalgamateNowButton && !this.isSupportedAmalgamation(this.getNr.entity_type_cd)) return true
     if (this.showAlterNowButton && !this.isSupportedAlteration(this.getNr.requestTypeCd)) return true
     return false
   }

diff --git a/src/mixins/nr-affiliation-mixin.ts b/src/mixins/nr-affiliation-mixin.ts
@@ -141,27 +141,29 @@ export class NrAffiliationMixin extends Mixins(CommonMixin) {
     let businessRequest = {} as BusinessRequest
     const nrNumber = nr.nrNum
     if (!this.isFirm(nr)) {
-      name = FilingTypes.INCORPORATION_APPLICATION
-      legalType = this.entityTypeToCorpType(nr.entity_type_cd)
-      businessRequest = {
-        filing: {
-          business: { legalType },
-          header: { accountId, name },
-          incorporationApplication: {
-            nameRequest: { legalType, nrNumber }
+      if (nr.request_action_cd === 'AML') {
+        name = FilingTypes.AMALGAMATION
+        legalType = nr.legalType
+        businessRequest = {
+          filing: {
+            business: { legalType },
+            header: { accountId, name },
+            amalgamation: {
+              type: AmalgamationTypes.REGULAR,
+              nameRequest: { legalType, nrNumber }
+            }
           }
         }
-      }
-    } else if (nr.request_action_cd === 'AML') {
-      name = FilingTypes.AMALGAMATION
-      legalType = nr.legalType
-      businessRequest = {
-        filing: {
-          business: { legalType },
-          header: { accountId, name },
-          amalgamation: {
-            type: AmalgamationTypes.REGULAR,
-            nameRequest: { legalType, nrNumber }
+      } else {
+        name = FilingTypes.INCORPORATION_APPLICATION
+        legalType = this.entityTypeToCorpType(nr.entity_type_cd)
+        businessRequest = {
+          filing: {
+            business: { legalType },
+            header: { accountId, name },
+            incorporationApplication: {
+              nameRequest: { legalType, nrNumber }
+            }
           }
         }
       }