18689 More Amalgamation fixes/updates

package.json

@@ -1,6 +1,6 @@
 {
   "name": "business-create-ui",
-  "version": "5.6.28",
+  "version": "5.6.29",
   "private": true,
   "appName": "Create UI",
   "sbcName": "SBC Common Components",

src/components/common/Actions.vue

@@ -104,12 +104,13 @@ import { Component, Emit, Mixins } from 'vue-property-decorator'
 import { Getter, Action } from 'pinia-class'
 import { useStore } from '@/store/store'
 import { Navigate } from '@/utils'
-import { CommonMixin, DateMixin, FilingTemplateMixin, NameRequestMixin } from '@/mixins'
+import { AmalgamationMixin, CommonMixin, DateMixin, FilingTemplateMixin, NameRequestMixin } from '@/mixins'
 import { LegalServices } from '@/services/'
 import { FilingTypes, NameRequestStates, RouteNames } from '@/enums'
 
 @Component({})
-export default class Actions extends Mixins(CommonMixin, DateMixin, FilingTemplateMixin, NameRequestMixin) {
+export default class Actions extends Mixins(AmalgamationMixin, CommonMixin,
+  DateMixin, FilingTemplateMixin, NameRequestMixin) {
   @Getter(useStore) getCurrentStep!: number
   @Getter(useStore) getEntityIdentifier!: string
   @Getter(useStore) getFilingType!: string
@@ -138,6 +139,7 @@ export default class Actions extends Mixins(CommonMixin, DateMixin, FilingTempla
 
   get isSummaryStep (): boolean {
     return (
+      this.$route.name === RouteNames.AMALG_REG_REVIEW_CONFIRM ||
       this.$route.name === RouteNames.DISSOLUTION_REVIEW_CONFIRM ||
       this.$route.name === RouteNames.INCORPORATION_REVIEW_CONFIRM ||
       this.$route.name === RouteNames.REGISTRATION_REVIEW_CONFIRM ||
@@ -246,6 +248,19 @@ export default class Actions extends Mixins(CommonMixin, DateMixin, FilingTempla
         }
       }
 
+      // If we're filing an amalgamation, we need to re-fetch the business table data on file and pay.
+      // We do that in case one of the businesses became invalid (e.g. historical) while the draft is open.
+      if (this.getFilingType === FilingTypes.AMALGAMATION_APPLICATION) {
+        try {
+          await this.refetchAmalgamatingBusinessesInfo()
+          console.log(this.getAmalgamatingBusinesses)
+        } catch (error) {
+          console.log('Error validating table in onClickFilePay(): ', error) // eslint-disable-line no-console
+          this.setIsFilingPaying(false)
+          return
+        }
+      }
+
       let filingComplete: any
       try {
         const filing = await this.prepareFiling()

src/mixins/amalgamation-mixin.ts

@@ -1,7 +1,7 @@
 import { Component, Vue } from 'vue-property-decorator'
 import { Action, Getter } from 'pinia-class'
 import { useStore } from '@/store/store'
-import { AmlRoles, AmlStatuses, AmlTypes, RestorationTypes } from '@/enums'
+import { AmlRoles, AmlStatuses, AmlTypes, EntityStates, RestorationTypes } from '@/enums'
 import { AmalgamatingBusinessIF } from '@/interfaces'
 import { CorpTypeCd } from '@bcrs-shared-components/corp-type-module'
 import { AuthServices, LegalServices } from '@/services'
@@ -221,7 +221,8 @@ export default class AmalgamationMixin extends Vue {
           address: tingBusiness.addresses?.registeredOffice.mailingAddress || null,
           isNotInGoodStanding: (tingBusiness.businessInfo.goodStanding === false),
           isFutureEffective: (tingBusiness.firstFiling.isFutureEffective === true),
-          isLimitedRestoration: await this.isLimitedRestoration(tingBusiness)
+          isLimitedRestoration: await this.isLimitedRestoration(tingBusiness),
+          isHistorical: (tingBusiness.businessInfo.state === EntityStates.HISTORICAL)
         } as AmalgamatingBusinessIF
       }
     }

src/store/store.ts

@@ -588,17 +588,20 @@ export const useStore = defineStore('store', {
 
     /** Whether all the amalgamation (regular) steps are valid. */
     isAmalgamationRegularValid (): boolean {
-      // *** TODO: add checks for review page components
-      const isFolioNumberValid = !this.isPremiumAccount || this.getFolioNumberValid
+      const isCertifyValid = this.getCertifyState.valid && !!this.getCertifyState.certifiedBy
       const isCourtOrderValid = this.isRoleStaff ? this.getCourtOrderStep.valid : true
+      const isFolioNumberValid = !this.isPremiumAccount || this.getFolioNumberValid
+      const isStaffPaymentValid = this.isRoleStaff ? this.getStaffPaymentStep.valid : true
 
       return (
         this.isAmalgamationInformationRegValid &&
         this.isDefineCompanyValid &&
         this.isAddPeopleAndRolesValid &&
         this.isCreateShareStructureValid &&
-        isFolioNumberValid &&
+        isCertifyValid &&
         isCourtOrderValid &&
+        isFolioNumberValid &&
+        isStaffPaymentValid &&
         this.getAmalgamationCourtApprovalValid
       )
     },