17347 - Add additional fields to Correction (#529)

package.json

@@ -1,6 +1,6 @@
 {
   "name": "business-edit-ui",
-  "version": "4.6.2",
+  "version": "4.6.3",
   "private": true,
   "appName": "Edit UI",
   "sbcName": "SBC Common Components",

src/components/common/YourCompany/FolioInformation.vue

@@ -75,7 +75,7 @@ export default class FolioInformation extends Mixins(CommonMixin) {
 
   /** Helps builds edit label and determine if folio number update should be instant. */
   get isInstantUpdate (): boolean {
-    return this.isAlterationFiling || this.isSpecialResolutionFiling
+    return this.isAlterationFiling
   }
 
   /** Modifies label for instant update of folio number. */

src/components/common/YourCompany/OfficeAddresses.vue

@@ -621,6 +621,7 @@ export default class OfficeAddresses extends Mixins(CommonMixin) {
   @Getter(useStore) isAlterationFiling!: boolean
   @Getter(useStore) isBenBcCccUlc!: boolean
   @Getter(useStore) isBenBcCccUlcCorrectionFiling!: boolean
+  @Getter(useStore) isCoopCorrectionFiling!: boolean
   @Getter(useStore) isCorrectionFiling!: boolean
   @Getter(useStore) isFirmChangeFiling!: boolean
   @Getter(useStore) isFirmConversionFiling!: boolean
@@ -711,7 +712,8 @@ export default class OfficeAddresses extends Mixins(CommonMixin) {
    * Sets local address data and "inherit" flags from store.
    */
   private setLocalProperties (): void {
-    if (this.isBenBcCccUlcCorrectionFiling || this.isAlterationFiling || this.isRestorationFiling) {
+    if (this.isBenBcCccUlcCorrectionFiling || this.isAlterationFiling ||
+      this.isRestorationFiling) {
       // assign registered office addresses (may be {})
       this.mailingAddress = { ...this.getOfficeAddresses?.registeredOffice?.mailingAddress }
       this.deliveryAddress = { ...this.getOfficeAddresses?.registeredOffice?.deliveryAddress }
@@ -747,15 +749,15 @@ export default class OfficeAddresses extends Mixins(CommonMixin) {
         IsSame(this.recMailingAddress, this.recDeliveryAddress, ['addressType', 'addressCountryDescription', 'id'])
       )
     }
-
-    if (this.isFirmChangeFiling || this.isFirmConversionFiling || this.isFirmCorrectionFiling) {
+    if (this.isFirmChangeFiling || this.isFirmConversionFiling ||
+      this.isFirmCorrectionFiling) {
       // assign business office addresses (may be {})
       this.mailingAddress = { ...this.getOfficeAddresses?.businessOffice?.mailingAddress }
       this.deliveryAddress = { ...this.getOfficeAddresses?.businessOffice?.deliveryAddress }
       this.initializeNonRecordsAddressValidation()
     }
 
-    if (this.isSpecialResolutionFiling) {
+    if (this.isSpecialResolutionFiling || this.isCoopCorrectionFiling) {
       // assign registered office addresses (may be {})
       this.mailingAddress = { ...this.getOfficeAddresses?.registeredOffice?.mailingAddress }
       this.deliveryAddress = { ...this.getOfficeAddresses?.registeredOffice?.deliveryAddress }
@@ -940,7 +942,8 @@ export default class OfficeAddresses extends Mixins(CommonMixin) {
       })
     }
 
-    if (this.isFirmChangeFiling || this.isFirmConversionFiling || this.isFirmCorrectionFiling) {
+    if (this.isFirmChangeFiling || this.isFirmConversionFiling ||
+      this.isFirmCorrectionFiling) {
       // at the moment, only firm changes, conversions and corrections are supported
       this.setOfficeAddresses({
         businessOffice: {
@@ -949,6 +952,16 @@ export default class OfficeAddresses extends Mixins(CommonMixin) {
         }
       })
     }
+
+    if (this.isCoopCorrectionFiling) {
+      // at the moment, only coop changes, corrections are supported
+      this.setOfficeAddresses({
+        registeredOffice: {
+          deliveryAddress: this.deliveryAddress,
+          mailingAddress: this.mailingAddress
+        }
+      })
+    }
   }
 
   /**
@@ -1017,6 +1030,7 @@ export default class OfficeAddresses extends Mixins(CommonMixin) {
   @Watch('isBenBcCccUlcCorrectionFiling')
   @Watch('isFirmCorrectionFiling')
   @Watch('isRestorationFiling')
+  @Watch('isCoopCorrectionFiling')
   private updateAddresses (): void {
     // set local properties from store
     this.setLocalProperties()

src/components/common/YourCompany/RecognitionDateTime.vue

@@ -32,11 +32,12 @@ export default class RecognitionDateTime extends Vue {
   @Getter(useStore) getCorrectedFilingDate!: string
   @Getter(useStore) isAlterationFiling!: boolean
   @Getter(useStore) isBenBcCccUlcCorrectionFiling!: boolean
+  @Getter(useStore) isCoopCorrectionFiling!: boolean
   @Getter(useStore) isRestorationFiling!: boolean
 
   /** The recognition date or business start date string. */
   get recognitionDateTime (): string {
-    if (this.isBenBcCccUlcCorrectionFiling || this.isRestorationFiling) {
+    if (this.isBenBcCccUlcCorrectionFiling || this.isRestorationFiling || this.isCoopCorrectionFiling) {
       if (this.getBusinessFoundingDateTime) {
         return DateUtilities.apiToPacificDateTime(this.getBusinessFoundingDateTime)
       }

src/mixins/filing-template-mixin.ts

@@ -200,9 +200,6 @@ export default class FilingTemplateMixin extends DateMixin {
     }
 
     if (this.isCoopCorrectionFiling) {
-      // Offices aren't required for Coop corrections.
-      delete filing.correction.offices
-
       // Apply Court Order ONLY when it is required and applied
       if (this.getHasPlanOfArrangement || this.getFileNumber) {
         filing.correction.courtOrder = {

src/resources/Correction/CP.ts

@@ -8,7 +8,7 @@ export const CpCorrectionResource: ResourceIF = {
   contactLabel: 'Registered Office',
   displayName: null, // not used
   entityType: CorpTypeCd.COOP,
-  addressLabel: 'Business Addresses',
+  addressLabel: 'Registered Office',
   filingData: {
     filingTypeCode: FilingCodes.CORRECTION,
     entityType: CorpTypeCd.COOP,

src/store/store.ts

@@ -575,6 +575,7 @@ export const useStore = defineStore('store', {
           this.hasBusinessNameChanged ||
           this.hasAssociationTypeChanged ||
           this.hasSpecialResolutionMemorandumChanged ||
+          this.haveOfficeAddressesChanged ||
           this.hasSpecialResolutionRulesChanged ||
           this.hasSpecialResolutionResolutionChanged
         )
@@ -738,6 +739,7 @@ export const useStore = defineStore('store', {
       if (this.isCoopCorrectionFiling) {
         return (
           this.getFlagsCompanyInfo.isValidCompanyName &&
+          this.getFlagsCompanyInfo.isValidAddress &&
           this.getFlagsCompanyInfo.isValidAssociationType &&
           this.getFlagsCompanyInfo.isValidContactInfo &&
           this.getFlagsCompanyInfo.isValidRules &&
@@ -938,6 +940,15 @@ export const useStore = defineStore('store', {
           ['addressCountryDescription', 'id']
         )
       }
+      if (
+        this.isCoopCorrectionFiling
+      ) {
+        return !IsSame(
+          this.getOfficeAddresses?.registeredOffice?.mailingAddress,
+          this.getOriginalOfficeAddresses?.registeredOffice?.mailingAddress,
+          ['addressCountryDescription', 'id']
+        )
+      }
       return false // should never happen
     },
 
@@ -957,7 +968,8 @@ export const useStore = defineStore('store', {
       if (
         this.isFirmChangeFiling ||
         this.isFirmConversionFiling ||
-        this.isFirmCorrectionFiling
+        this.isFirmCorrectionFiling ||
+        this.isCoopCorrectionFiling
       ) {
         return !IsSame(
           this.getOfficeAddresses?.businessOffice?.deliveryAddress,

src/views/Correction/CoopCorrection.vue

@@ -4,7 +4,7 @@
     id="coop-correction-view"
   >
     <header>
-      <h1>Special Resolution Register Correction</h1>
+      <h1>REGISTER CORRECTION</h1>
     </header>
 
     <section
@@ -24,6 +24,8 @@
         <EntityName />
       </div>
       <AssociationType />
+      <RecognitionDateTime />
+      <OfficeAddresses />
       <BusinessContactInfo />
     </YourCompanyWrapper>
 
@@ -72,8 +74,8 @@
 import { Component, Emit, Mixins, Prop, Watch } from 'vue-property-decorator'
 import { SpecialResolutionSummary, Resolution } from '@/components/SpecialResolution'
 import { AssociationType, BusinessContactInfo, BusinessType, CertifySection, CompletingParty, CourtOrderPoa,
-  CurrentDirectors, Detail, DocumentsDelivery, EntityName, FolioInformation, OfficeAddresses, StaffPayment,
-  TransactionalFolioNumber, YourCompanyWrapper } from '@/components/common/'
+  CurrentDirectors, Detail, DocumentsDelivery, EntityName, FolioInformation, OfficeAddresses, RecognitionDateTime,
+  StaffPayment, TransactionalFolioNumber, YourCompanyWrapper } from '@/components/common/'
 import { CommonMixin, DateMixin, FeeMixin, FilingTemplateMixin } from '@/mixins/'
 import ViewWrapper from '@/components/ViewWrapper.vue'
 import Rules from '@/components/SpecialResolution/Rules.vue'
@@ -102,6 +104,7 @@ import { FilingDataIF } from '@bcrs-shared-components/interfaces'
     EntityName,
     FolioInformation,
     OfficeAddresses,
+    RecognitionDateTime,
     SpecialResolutionSummary,
     StaffPayment,
     TransactionalFolioNumber,
@@ -184,17 +187,19 @@ export default class CoopCorrection extends Mixins(CommonMixin, DateMixin, FeeMi
       AuthServices.fetchAuthInfo(this.getBusinessId),
       LegalServices.fetchBusinessDocuments(this.getBusinessId),
       LegalServices.fetchResolutions(this.getBusinessId, true),
-      LegalServices.fetchParties(this.getBusinessId)
+      LegalServices.fetchParties(this.getBusinessId),
+      LegalServices.fetchAddresses(this.getBusinessId)
     ])
 
-    if (items.length !== 5) throw new Error('Failed to fetch entity snapshot')
+    if (items.length !== 6) throw new Error('Failed to fetch entity snapshot')
 
     return {
       businessInfo: items[0],
       authInfo: items[1],
       businessDocuments: items[2],
       resolutions: items[3],
-      orgPersons: items[4]
+      orgPersons: items[4],
+      addresses: items[5]
     } as EntitySnapshotIF
   }
 

tests/unit/CoopCorrection.spec.ts

@@ -3,6 +3,8 @@ import Vuetify from 'vuetify'
 import flushPromises from 'flush-promises'
 import { mount } from '@vue/test-utils'
 import { AssociationType, BusinessContactInfo, CertifySection, CompletingParty, CourtOrderPoa, Detail, EntityName,
+  OfficeAddresses,
+  RecognitionDateTime,
   StaffPayment, YourCompanyWrapper } from '@/components/common/'
 import CoopCorrection from '@/views/Correction/CoopCorrection.vue'
 import { createPinia, setActivePinia } from 'pinia'
@@ -161,6 +163,36 @@ describe('Coop Correction component', () => {
       }
     ])
 
+    LegalServices.fetchAddresses = vi.fn().mockResolvedValue([
+      {
+        'registeredOffice': {
+          'deliveryAddress': {
+            'addressCity': 'Scarborough',
+            'addressCountry': 'CA',
+            'addressRegion': 'BC',
+            'addressType': 'delivery',
+            'deliveryInstructions': null,
+            'id': 2660329,
+            'postalCode': 'M1B 4B9',
+            'streetAddress': '34-70 Alford Cres',
+            'streetAddressAdditional': ''
+          },
+          'mailingAddress': {
+            'addressCity': 'Scarborough',
+            'addressCountry': 'CA',
+            'addressRegion': 'BC',
+            'addressType': 'mailing',
+            'deliveryInstructions': null,
+            'id': 2660328,
+            'postalCode': 'M1B 4B9',
+            'streetAddress': '34-70 Alford Cres',
+            'streetAddressAdditional': ''
+          }
+        }
+      }
+
+    ])
+
     LegalServices.fetchParties = vi.fn().mockResolvedValue([
       { roles: [{ appointmentDate: '2022-04-01', roleType: 'Completing Party' }] },
       { roles: [{ appointmentDate: '2022-04-01', roleType: 'Incorporator' }] },
@@ -192,6 +224,8 @@ describe('Coop Correction component', () => {
     expect(wrapper.findComponent(YourCompanyWrapper).exists()).toBe(true)
     expect(wrapper.findComponent(EntityName).exists()).toBe(true)
     expect(wrapper.findComponent(AssociationType).exists()).toBe(true)
+    expect(wrapper.findComponent(RecognitionDateTime).exists()).toBe(true)
+    expect(wrapper.findComponent(OfficeAddresses).exists()).toBe(true)
     expect(wrapper.findComponent(BusinessContactInfo).exists()).toBe(true)
     expect(wrapper.findComponent(Rules).exists()).toBe(true)
     expect(wrapper.findComponent(Memorandum).exists()).toBe(true)