- app version = 5.6.1

- added route names to enum
- added views to enum
- added filing interface
- added resource interface
- updated state interface
- added amalgamation state interface
- updated filing template mixin
- added initial amalgamation resources
- added amalgamation steps
- added amalgamation routes
- added/updated getters/actions to  store
- updated state model
- added initial amalgamation views

package.json

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

src/App.vue

@@ -295,6 +295,7 @@ export default class App extends Mixins(CommonMixin, DateMixin, FilingTemplateMi
   @Getter(useStore) getUserLastName!: string
   @Getter(useStore) getUserEmail!: string
   @Getter(useStore) getUserPhone!: string
+  @Getter(useStore) isAmalgamationFiling!: boolean
   @Getter(useStore) isDissolutionFiling!: boolean
   @Getter(useStore) isIncorporationFiling!: boolean
   @Getter(useStore) isMobile!: boolean
@@ -361,7 +362,7 @@ export default class App extends Mixins(CommonMixin, DateMixin, FilingTemplateMi
   readonly window = window
 
   /** The Update Current JS Date timer id. */
-  private updateCurrentJsDateId = 0
+  private updateCurrentJsDateId = null // may be number or NodeJS.Timeout
 
   /** The route breadcrumbs list. */
   get breadcrumbs (): Array<BreadcrumbIF> {
@@ -733,6 +734,9 @@ export default class App extends Mixins(CommonMixin, DateMixin, FilingTemplateMi
       // then try to re-route them
       if (this.$route.meta.filingType !== this.getFilingType) {
         switch (this.getFilingType) {
+          case FilingTypes.AMALGAMATION:
+            this.$router.push(RouteNames.AMALGAMATION_REG_INFORMATION).catch(() => {})
+            return
           case FilingTypes.DISSOLUTION:
             if (this.isTypeFirm) {
               this.$router.push(RouteNames.DISSOLUTION_FIRM).catch(() => {})

src/enums/index.ts

@@ -20,6 +20,7 @@ export { CorpTypeCd } from '@bcrs-shared-components/corp-type-module'
 export {
   AccountTypes,
   ApprovalTypes,
+  AmalgamationTypes,
   CorrectNameOptions,
   EffectiveDateTypes,
   EntityStates,

src/enums/routeNames.ts

@@ -34,4 +34,11 @@ export enum RouteNames {
   RESTORATION_BUSINESS_INFORMATION = 'restoration-business-information',
   RESTORATION_BUSINESS_NAME = 'restoration-business-name',
   RESTORATION_REVIEW_CONFIRM = 'restoration-review-confirm',
+
+  // Amalgamation (regular) route names
+  AMALGAMATION_REG_BUSINESS_INFO = 'amalgamation-reg-business-info',
+  AMALGAMATION_REG_INFORMATION = 'amalgamation-reg-information',
+  AMALGAMATION_REG_PEOPLE_ROLES = 'amalgamation-reg-people-roles',
+  AMALGAMATION_REG_REVIEW_CONFIRM = 'amalgamation-reg-review-confirm',
+  AMALGAMATION_REG_SHARE_STRUCTURE = 'amalgamation-reg-share-structure',
 }

src/enums/views.ts

@@ -6,6 +6,13 @@ export enum Views {
   SIGN_IN = 'signin',
   SIGN_OUT = 'signout',
 
+  // Amalgamation views
+  AMALGAMATION_REG_BUSINESS_INFO = 'amalgamation-reg-business-info',
+  AMALGAMATION_REG_INFORMATION = 'amalgamation-reg-information',
+  AMALGAMATION_REG_PEOPLE_ROLES = 'amalgamation-reg-people-roles',
+  AMALGAMATION_REG_REVIEW_CONFIRM = 'amalgamation-reg-review-confirm',
+  AMALGAMATION_REG_SHARE_STRUCTURE = 'amalgamation-reg-share-structure',
+
   // Dissolution views
   DISSOLUTION_AFFIDAVIT = 'dissolution-affidavit',
   DISSOLUTION_DEFINE_DISSOLUTION = 'dissolution-define-dissolution',

src/interfaces/filing-interfaces/filing-interfaces.ts

@@ -1,7 +1,7 @@
 import { BusinessAddressIF, CourtOrderIF, RegisteredRecordsAddressesIF, NaicsIF, NameTranslationIF,
   OfficeAddressIF, PartyIF, ShareClassIF, SpecialResolutionIF } from '@/interfaces'
-import { ApprovalTypes, BusinessTypes, DissolutionStatementTypes, DissolutionTypes, FilingTypes,
-  RestorationTypes, RelationshipTypes } from '@/enums'
+import { AmalgamationTypes, ApprovalTypes, BusinessTypes, DissolutionStatementTypes, DissolutionTypes,
+  FilingTypes, RestorationTypes, RelationshipTypes } from '@/enums'
 import { CorrectNameOptions } from '@bcrs-shared-components/enums/'
 import { CorpTypeCd } from '@bcrs-shared-components/corp-type-module/'
 import { ContactPointIF } from '@bcrs-shared-components/interfaces'
@@ -18,6 +18,48 @@ export interface NameRequestFilingIF {
   correctNameOption?: CorrectNameOptions // only used by UI for save and resume
 }
 
+/** Interface for amalgamation filing data saved to the Legal API. */
+export interface AmalgamationFilingIF {
+  header: {
+    name: FilingTypes
+    certifiedBy: string
+    date: string
+    effectiveDate?: string // should be set only for future effective filings
+    filingId?: number // for existing filings (not used when building a new filing)
+    folioNumber?: string // only displayed for certain account types
+    isFutureEffective: boolean
+
+    // staff payment properties:
+    routingSlipNumber?: string
+    bcolAccountNumber?: string
+    datNumber?: string
+    waiveFees?: boolean
+    priority?: boolean
+  }
+  business: {
+    legalType: CorpTypeCd
+    identifier: string
+  }
+  amalgamation: {
+    amalgamationType: AmalgamationTypes
+    nameRequest: NameRequestFilingIF
+    nameTranslations: NameTranslationIF[]
+    offices: RegisteredRecordsAddressesIF | object
+    contactPoint: ContactPointIF
+    parties: PartyIF[]
+
+    // BEN / CC / BC / ULC only:
+    shareStructure?: {
+      shareClasses: ShareClassIF[]
+    }
+    incorporationAgreement?: {
+      agreementType: string
+    }
+    // ULC only:
+    courtOrder?: CourtOrderIF
+  }
+}
+
 /** Interface for incorporation filing data saved to the Legal API. */
 export interface IncorporationFilingIF {
   header: {

src/interfaces/index.ts

@@ -45,6 +45,7 @@ export * from './stepper-interfaces/ReviewConfirm/certify-interface'
 
 // Store interfaces
 export * from './store-interfaces/state-interfaces/account-information-interface'
+export * from './store-interfaces/state-interfaces/amalgamation-state-interface'
 export * from './store-interfaces/state-interfaces/auth-information-interface'
 export * from './store-interfaces/state-interfaces/business-interface'
 export * from './store-interfaces/state-interfaces/dissolution-state-interface'

src/interfaces/resource-interfaces/resource-interface.ts

@@ -5,6 +5,33 @@ import {
 } from '@/interfaces'
 import { CorpTypeCd } from '@bcrs-shared-components/corp-type-module'
 
+/** Amalgamation (regular) resource interface. */
+export interface AmalgamationRegResourceIF {
+  entityType: CorpTypeCd
+  displayName: string
+  steps: Array<StepIF>
+  filingData: Array<FilingDataIF>
+  peopleAndRoles: PeopleAndRolesResourceIF
+  reviewAndConfirm: {
+    completingPartyStatement: CompletingPartyStatementIF
+  }
+
+  shareClasses?: {
+    countMinimum: number
+  }
+  incorporationArticles?: {
+    articles: string,
+    articlesTooltip: string,
+    provisions?: string,
+    provisionTooltip?: string
+  }
+  incorporationAgreement?: {
+    helpSection: Array<HelpSectionIF>
+    article: string
+    documents: Array<IncorporationAgreementTypeIF>
+  }
+}
+
 /** Dissolution resource interface. */
 export interface DissolutionResourceIF {
   entityType: CorpTypeCd
@@ -79,5 +106,5 @@ export interface RestorationResourceIF {
   }
 }
 
-export interface ResourceIF extends DissolutionResourceIF, IncorporationResourceIF, RegistrationResourceIF,
-  RestorationResourceIF {}
+export interface ResourceIF extends AmalgamationRegResourceIF, DissolutionResourceIF,
+  IncorporationResourceIF, RegistrationResourceIF, RestorationResourceIF {}

src/interfaces/store-interfaces/state-interface.ts

@@ -2,6 +2,7 @@ import { CorrectNameOptions } from '@bcrs-shared-components/enums/'
 import { CorpTypeCd } from '@bcrs-shared-components/corp-type-module'
 import {
   AccountInformationIF,
+  AmalgamationStateIF,
   ContactPointIF,
   BusinessIF,
   CertifyIF,
@@ -71,6 +72,7 @@ export interface StateModelIF {
   registration: RegistrationStateIF
   completingParty?: CompletingPartyIF
   parties?: Array<PartyIF>
+  amalgamation: AmalgamationStateIF
   restoration: RestorationStateIF
 
   // staffPaymentStep and courtOrder are common and for now are only used in dissolution

src/interfaces/store-interfaces/state-interfaces/amalgamation-state-interface.ts

@@ -0,0 +1,15 @@
+import { AmalgamationTypes, ApprovalTypes, RelationshipTypes } from '@/enums'
+import { CourtOrderIF } from '@/interfaces'
+
+export interface AmalgamationStateIF {
+  applicationDate?: string // YYYY-MM-DD
+  approvalType: ApprovalTypes
+  approvalTypeValid: boolean
+  businessNameValid: boolean
+  courtOrder?: CourtOrderIF
+  expiry?: string // YYYY-MM-DD
+  noticeDate?: string // YYYY-MM-DD
+  relationships?: RelationshipTypes[]
+  restorationTypeValid: boolean
+  type: AmalgamationTypes
+}