wip

bcgov · Oct 11, 2023 · d88e9d6 · d88e9d6
1 parent 707b397
commit d88e9d6
Show file tree

Hide file tree

Showing 8 changed files with 159 additions and 125 deletions.
diff --git a/src/components/common/YourCompany/ChangeBusinessType.vue b/src/components/common/YourCompany/ChangeBusinessType.vue
@@ -307,6 +307,9 @@ export default class ChangeBusinessType extends Mixins(CommonMixin) {
   @Getter(useStore) getEntitySnapshot!: EntitySnapshotIF
   @Getter(useStore) getEntityType!: CorpTypeCd
   @Getter(useStore) getNumberOfDirectors!: number
+  @Getter(useStore) getOriginalLegalName!: string
+  @Getter(useStore) getOriginalLegalType!: CorpTypeCd
+  @Getter(useStore) getOriginalNrNumber!: string
   @Getter(useStore) getResource!: ResourceIF
   @Getter(useStore) hasBusinessNameChanged!: boolean
   @Getter(useStore) hasBusinessTypeChanged!: boolean
@@ -403,9 +406,9 @@ export default class ChangeBusinessType extends Mixins(CommonMixin) {
     this.setEntityType(this.getEntitySnapshot?.businessInfo?.legalType)
     // reset name request
     this.setNameRequest({
-      legalType: this.getEntitySnapshot?.businessInfo?.legalType,
-      legalName: this.getEntitySnapshot?.businessInfo?.legalName,
-      nrNumber: this.getEntitySnapshot?.businessInfo?.nrNumber
+      legalType: this.getOriginalLegalType,
+      legalName: this.getOriginalLegalName,
+      nrNumber: this.getOriginalNrNumber
     })
     this.setNameChangedByType(false)
     this.isEditingType = false
@@ -418,14 +421,14 @@ export default class ChangeBusinessType extends Mixins(CommonMixin) {
     this.isEditingType = false
 
     if (this.shouldUpdateName()) {
-      const originalName = this.getEntitySnapshot?.businessInfo.legalName
+      const originalName = this.getOriginalLegalName
       const updatedName = this.getUpdatedName(originalName)
 
       if (originalName !== updatedName) {
         const nameRequest = {
           legalType: this.selectedEntityType,
           legalName: updatedName,
-          nrNumber: this.getEntitySnapshot?.businessInfo?.nrNumber
+          nrNumber: this.getOriginalNrNumber
         }
 
         this.setNameRequest(nameRequest)

diff --git a/src/components/common/YourCompany/CorrectName/CorrectCompanyName.vue b/src/components/common/YourCompany/CorrectName/CorrectCompanyName.vue
@@ -38,8 +38,8 @@ export default class CorrectCompanyName extends Mixins(CommonMixin) {
   @Getter(useStore) getNameRequest!: NameRequestIF
 
   // Local properties
-  protected valid = false
-  protected companyName = ''
+  valid = false
+  companyName = ''
 
   // Form Ref
   $refs: { correctNameForm: HTMLFormElement }

diff --git a/src/components/common/YourCompany/CorrectName/CorrectNameRequest.vue b/src/components/common/YourCompany/CorrectName/CorrectNameRequest.vue
@@ -279,7 +279,10 @@ export default class CorrectNameRequest extends Mixins(CommonMixin, NameRequestM
     }
 
     // set the new correction NR data
-    this.setNameRequest({ ...this.getNameRequest, ...nrCorrection })
+    this.setNameRequest({
+      ...this.getNameRequest,
+      ...nrCorrection
+    })
   }
 
   /** Inform parent the process is complete. */

diff --git a/src/components/common/YourCompany/CorrectName/CorrectNameToNumber.vue b/src/components/common/YourCompany/CorrectName/CorrectNameToNumber.vue
@@ -38,7 +38,7 @@ export default class CorrectNameToNumber extends Vue {
   @Getter(useStore) getBusinessId!: string
 
   // Local properties
-  protected correctToNumbered = false
+  correctToNumbered = false
 
   get businessId (): string {
     return this.getBusinessId && this.getBusinessId.substring(2)

diff --git a/src/components/common/YourCompany/EntityName.vue b/src/components/common/YourCompany/EntityName.vue
@@ -280,6 +280,9 @@ export default class EntityName extends Mixins(NameRequestMixin) {
   @Getter(useStore) getNameRequest!: NameRequestIF
   @Getter(useStore) getNameRequestLegalName!: string
   @Getter(useStore) getNameRequestNumber!: string
+  @Getter(useStore) getOriginalLegalName!: string
+  @Getter(useStore) getOriginalLegalType!: CorpTypeCd
+  @Getter(useStore) getOriginalNrNumber!: string
   @Getter(useStore) hasBusinessNameChanged!: boolean
   @Getter(useStore) isAlterationFiling!: boolean
   @Getter(useStore) isConflictingLegalType!: boolean
@@ -343,7 +346,7 @@ export default class EntityName extends Mixins(NameRequestMixin) {
   /** Whether a new business legal name was entered.. */
   get isNewName () {
     const originalName = this.getNameRequestLegalName
-    const currentName = this.getEntitySnapshot?.businessInfo.legalName
+    const currentName = this.getOriginalLegalName
     return (originalName !== currentName)
   }
 
@@ -405,9 +408,9 @@ export default class EntityName extends Mixins(NameRequestMixin) {
 
     // reset name request
     this.setNameRequest({
-      legalType: this.getEntitySnapshot.businessInfo.legalType,
-      legalName: this.getEntitySnapshot.businessInfo.legalName,
-      nrNumber: this.getEntitySnapshot.businessInfo.nrNumber
+      legalType: this.getOriginalLegalType,
+      legalName: this.getOriginalLegalName,
+      nrNumber: this.getOriginalNrNumber
     })
 
     if (this.isEntityTypeChangedByName) {

diff --git a/src/interfaces/correction-interfaces/correct-name-interface.ts b/src/interfaces/correction-interfaces/correct-name-interface.ts
@@ -11,13 +11,13 @@ export interface CorrectNameOptionIF {
 }
 
 export interface NrCorrectionIF {
+  applicant: NameRequestApplicantIF
+  expiry: string,
+  legalName: string,
   legalType: CorpTypeCd,
   nrNumber: string,
-  legalName: string,
-  expiry: string,
-  requestType: string,
+  requestType: NrRequestActionCodes,
   status: NameRequestStates,
-  applicant: NameRequestApplicantIF
 }
 
 export interface NrActionIF {