Skip to content

Commit

Permalink
- app version = 5.7.0
Browse files Browse the repository at this point in the history
- WIP
  • Loading branch information
Severin Beauvais committed Jan 19, 2024
1 parent 5d5cc19 commit 67b2c59
Show file tree
Hide file tree
Showing 28 changed files with 2,103 additions and 261 deletions.
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "business-create-ui",
"version": "5.6.42",
"version": "5.7.0",
"private": true,
"appName": "Create UI",
"sbcName": "SBC Common Components",
Expand Down
26 changes: 21 additions & 5 deletions src/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -250,10 +250,10 @@ import * as Views from '@/views'
// Mixins, interfaces, etc
import { CommonMixin, DateMixin, FilingTemplateMixin, NameRequestMixin } from '@/mixins'
import { AccountInformationIF, AddressIF, BreadcrumbIF, BusinessWarningIF, CompletingPartyIF,
ConfirmDialogType, EmptyFees, FeesIF, FilingDataIF, NameRequestIF, OrgInformationIF, PartyIF, ResourceIF,
ConfirmDialogType, EmptyFees, FeesIF, FilingDataIF, OrgInformationIF, PartyIF, ResourceIF,
StepIF } from '@/interfaces'
import { AmalgamationRegResources, DissolutionResources, IncorporationResources, RegistrationResources,
RestorationResources, getEntityDashboardBreadcrumb, getMyBusinessRegistryBreadcrumb,
import { AmalgamationRegResources, AmalgamationShortResources, DissolutionResources, IncorporationResources,

Check failure on line 255 in src/App.vue

View workflow job for this annotation

GitHub Actions / linting (20.5.1)

'AmalgamationShortResources' is defined but never used

Check warning on line 255 in src/App.vue

View workflow job for this annotation

GitHub Actions / linting (20.5.1)

'AmalgamationShortResources' is defined but never used
RegistrationResources, RestorationResources, getEntityDashboardBreadcrumb, getMyBusinessRegistryBreadcrumb,
getRegistryDashboardBreadcrumb, getSbcStaffDashboardBreadcrumb, getStaffDashboardBreadcrumb } from '@/resources'
import { AuthServices, LegalServices, PayServices } from '@/services/'
Expand Down Expand Up @@ -295,7 +295,9 @@ 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) isAmalgamationFilingHorizontal!: boolean
// @Getter(useStore) isAmalgamationFilingRegular!: boolean
// @Getter(useStore) isAmalgamationFilingVertical!: boolean
@Getter(useStore) isDissolutionFiling!: boolean
@Getter(useStore) isIncorporationFiling!: boolean
@Getter(useStore) isMobile!: boolean
Expand All @@ -320,7 +322,7 @@ export default class App extends Mixins(CommonMixin, DateMixin, FilingTemplateMi
@Action(useStore) setLastAddressChangeDate!: (x: string) => void
@Action(useStore) setLastAnnualReportDate!: (x: string) => void
@Action(useStore) setLastDirectorChangeDate!: (x: string) => void
@Action(useStore) setNameRequest!: (x: NameRequestIF) => void
// @Action(useStore) setNameRequest!: (x: NameRequestIF) => void
@Action(useStore) setParties!: (x: Array<PartyIF>) => void
@Action(useStore) setResources!: (x: ResourceIF) => void
@Action(useStore) setUserAddress!: (x: AddressIF) => void
Expand Down Expand Up @@ -733,6 +735,12 @@ export default class App extends Mixins(CommonMixin, DateMixin, FilingTemplateMi
if (this.$route.meta.filingType !== this.getFilingType) {
switch (this.getFilingType) {
case FilingTypes.AMALGAMATION_APPLICATION:
// *** TODO: need to check filing subtype and route accordingly
// isAmalgamationFilingHorizontal
// isAmalgamationFilingRegular
// isAmalgamationFilingVertical
this.$router.push(RouteNames.AMALG_REG_INFORMATION).catch(() => {})
return
case FilingTypes.DISSOLUTION:
Expand Down Expand Up @@ -884,6 +892,14 @@ export default class App extends Mixins(CommonMixin, DateMixin, FilingTemplateMi
let resources: ResourceIF
switch (this.getFilingType) {
case FilingTypes.AMALGAMATION_APPLICATION:
// *** TODO: need to check filing subtype and create draft and set resources accordingly
// isAmalgamationFilingHorizontal
// isAmalgamationFilingRegular
// isAmalgamationFilingVertical
// AmalgamationShortResources
draftFiling = {
...this.buildAmalgamationFiling(),
...draftFiling
Expand Down
7 changes: 7 additions & 0 deletions src/enums/routeNames.ts
Original file line number Diff line number Diff line change
Expand Up @@ -41,4 +41,11 @@ export enum RouteNames {
AMALG_REG_PEOPLE_ROLES = 'amalg-reg-people-roles',
AMALG_REG_REVIEW_CONFIRM = 'amalg-reg-review-confirm',
AMALG_REG_SHARE_STRUCTURE = 'amalg-reg-share-structure',

// Amalgamation (short) route names
AMALG_SHORT_BUSINESS_INFO = 'amalg-short-business-info',
AMALG_SHORT_INFORMATION = 'amalg-short-information',
AMALG_SHORT_PEOPLE_ROLES = 'amalg-short-people-roles',
AMALG_SHORT_REVIEW_CONFIRM = 'amalg-short-review-confirm',
AMALG_SHORT_SHARE_STRUCTURE = 'amalg-short-share-structure',
}
9 changes: 8 additions & 1 deletion src/enums/views.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,20 @@ export enum Views {
SIGN_IN = 'signin',
SIGN_OUT = 'signout',

// Amalgamation views
// Amalgamation (regular) views
AMALGAMATION_REG_BUSINESS_INFO = 'amalg-reg-business-info',
AMALGAMATION_REG_INFORMATION = 'amalg-reg-information',
AMALGAMATION_REG_PEOPLE_ROLES = 'amalg-reg-people-roles',
AMALGAMATION_REG_REVIEW_CONFIRM = 'amalg-reg-review-confirm',
AMALGAMATION_REG_SHARE_STRUCTURE = 'amalg-reg-share-structure',

// Amalgamation (short) views
AMALGAMATION_SHORT_BUSINESS_INFO = 'amalg-short-business-info',
AMALGAMATION_SHORT_INFORMATION = 'amalg-short-information',
AMALGAMATION_SHORT_PEOPLE_ROLES = 'amalg-short-people-roles',
AMALGAMATION_SHORT_REVIEW_CONFIRM = 'amalg-short-review-confirm',
AMALGAMATION_SHORT_SHARE_STRUCTURE = 'amalg-short-share-structure',

// Dissolution views
DISSOLUTION_AFFIDAVIT = 'dissolution-affidavit',
DISSOLUTION_DEFINE_DISSOLUTION = 'dissolution-define-dissolution',
Expand Down
1 change: 1 addition & 0 deletions src/interfaces/resource-interfaces/resource-interface.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import {
import { CorpTypeCd } from '@bcrs-shared-components/corp-type-module'

/** Amalgamation (regular) resource interface. */
// *** TODO: do we need another interface for short amalgamations?
export interface AmalgamationRegResourceIF {
entityType: CorpTypeCd
displayName: string
Expand Down
2 changes: 2 additions & 0 deletions src/mixins/amalgamation-mixin.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ export default class AmalgamationMixin extends Vue {
@Getter(useStore) getAmalgamatingBusinesses!: AmalgamatingBusinessIF[]
@Getter(useStore) getCurrentDate!: string
@Getter(useStore) isAmalgamationFilingHorizontal!: boolean
@Getter(useStore) isAmalgamationFilingRegular!: boolean
@Getter(useStore) isAmalgamationFilingVertical!: boolean
@Getter(useStore) isRoleStaff!: boolean
@Getter(useStore) isTypeBcCcc!: boolean
@Getter(useStore) isTypeBcUlcCompany!: boolean
Expand Down
77 changes: 77 additions & 0 deletions src/resources/AmalgamationShort/BC.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@
import { AmalgamationRegResourceIF } from '@/interfaces'
import { FilingCodes, RuleIds } from '@/enums'
import { AmalgamationShortSteps } from './steps'
import { CorpTypeCd, GetCorpFullDescription } from '@bcrs-shared-components/corp-type-module'

export const AmalgamationShortResourceBc: AmalgamationRegResourceIF = {
entityType: CorpTypeCd.BC_COMPANY,
displayName: GetCorpFullDescription(CorpTypeCd.BC_COMPANY),
steps: AmalgamationShortSteps,
filingData: [{
entityType: CorpTypeCd.BC_COMPANY,
filingTypeCode: FilingCodes.AMALGAMATION_REGULAR
}],
peopleAndRoles: {
header: '1. Add People to your Application',
blurb: `Add the people who will have a role in the amalgamated business. A person can be
both the Completing Party and a Director.`,
helpSection: null,
rules: [
{
id: RuleIds.NUM_COMPLETING_PARTY,
text: 'The Completing Party',
test: (num) => { return (num === 1) }
},
{
id: RuleIds.NUM_DIRECTORS,
text: 'At least one Director',
test: (num) => { return (num >= 1) }
}
]
},
shareClasses: {
countMinimum: 1
},
incorporationArticles: {
articles: '<br>BC LTD Articles.', // Line break is required to prevent tooltip from splitting the screen.
articlesTooltip: 'Articles should outline the rules and procedures for corporate matters such as holding ' +
'meetings, issuing and transferring shares, and duties of directors and officers.'
},
incorporationAgreement: {
helpSection: [
{
header: 'What is the sample Incorporation Agreement and Company Articles?',
helpText: [
`The sample Incorporation Agreement and Company Articles is a template that you can use to create an
incorporation agreement and articles for your company. It uses all the standard provisions by legislation.
There are three types of samples depending on if you're incorporating a Limited Company, a Benefit Company,
or a Community Contribution Company.`,
`If you would like to customize any other provisions in the Articles, you cannot use these samples.
We recommend seeking professional assistance from a lawyer or accountant to help you prepare your articles.`
]
}
],
article: 'bc_limited_company_incorporation_agreement.pdf',
documents: [
{
code: 'sample',
description: 'The <b>sample Incorporation Agreement and Articles</b> ' +
'has been completed and a copy has been added to the company\'s record book.'
},
{
code: 'custom',
description: 'The <b>custom Incorporation Agreement and custom Articles</b> ' +
'has been completed and a copy has been added to the company\'s record book.'
}
]
},
reviewAndConfirm: {
completingPartyStatement: {
certifyStatements: [],
certifyClause: `Note: It is an offence to make a false or misleading statement in respect
of a material fact in a record submitted to the Corporate Registry for filing.
See section 427 of the Business Corporations Act.`,
entityDisplay: null
}
}
}
113 changes: 113 additions & 0 deletions src/resources/AmalgamationShort/BEN.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,113 @@
import { AmalgamationRegResourceIF } from '@/interfaces'
import { FilingCodes, RuleIds } from '@/enums'
import { AmalgamationShortSteps } from './steps'
import { CorpTypeCd, GetCorpFullDescription } from '@bcrs-shared-components/corp-type-module'

export const AmalgamationShortResourceBen: AmalgamationRegResourceIF = {
entityType: CorpTypeCd.BENEFIT_COMPANY,
displayName: GetCorpFullDescription(CorpTypeCd.BENEFIT_COMPANY),
steps: AmalgamationShortSteps,
filingData: [{
entityType: CorpTypeCd.BENEFIT_COMPANY,
filingTypeCode: FilingCodes.AMALGAMATION_REGULAR
}],
peopleAndRoles: {
header: '1. Add People to your Application',
blurb: `Add the people who will have a role in the amalgamated business. A person can be
both the Completing Party and a Director.`,
helpSection: null,
rules: [
{
id: RuleIds.NUM_COMPLETING_PARTY,
text: 'The Completing Party',
test: (num) => { return (num === 1) }
},
{
id: RuleIds.NUM_DIRECTORS,
text: 'At least one Director',
test: (num) => { return (num >= 1) }
}
]
},
shareClasses: {
countMinimum: 1
},
incorporationArticles: {
articles: 'Benefit Company Articles',
articlesTooltip: 'The Articles for a Benefit Company must state the benefits the company intends to provide to ' +
'society, as well as outlining the rules and procedures for corporate matters such as holding meetings, ' +
'issuing and transferring shares, and duties of directors and officers.',
provisions: ' benefit provision',
provisionTooltip: 'Clauses in the Articles which specify the public benefits to be promoted by the Benefit ' +
'Company and the company\'s commitment to promote those benefits and to conduct business in a responsible and ' +
'sustainable manner.'
},
incorporationAgreement: {
helpSection: [
{
header: 'What is the sample Incorporation Agreement and Benefit Company Articles?',
helpText: [
`The sample Incorporation Agreement and Benefit Company Articles is a template that you can use
to create an incorporation agreement and articles for your company. It uses all the standard
provisions suggested by legislation and also includes a place to specify the company's benefit
provision.`,
`If you would like to customize any other provisions in the Articles, you cannot use this sample. We
recommend seeking professional assistance from a lawyer or accountant to help you prepare your Articles.`
]
},
{
header: 'What is a Benefit Provision?',
helpText: [
`A Benefit Provision is a statement by the company of its public benefits and its commitments to promote
those public benefits and to conduct business in a responsible and sustainable manner.`,
'A Benefit Company must include a benefit provision in its Articles.'
]
},
{
header: 'Can I use the sample Incorporation Agreement and Benefit Company Articles?'
},
{
header: 'You can use the sample Articles if:',
icon: 'mdi-check',
iconColor: 'green darken-2',
statements: [
`There are no special rights or restrictions attached to any class or series of shares in
the corporation’s authorized share structure.`,
'You do not wish to change any of the standard provisions in the sample Articles.'
]
},
{
header: 'You cannot use the sample Articles if:',
icon: 'mdi-close',
iconColor: 'red',
statements: [
`There are special rights or restrictions attached to any class or series of shares in the corporation's
authorized share structure.`,
'You wish to change any of the standard provisions in the sample Articles.'
]
}
],
article: 'benefit_company_incorporation_agreement.pdf',
documents: [
{
code: 'sample',
description: 'The <b>sample Incorporation Agreement and Articles</b> containing a benefit provision ' +
'has been completed and a copy has been added to the company\'s record book.'
},
{
code: 'custom',
description: 'The <b>custom Incorporation Agreement and custom Articles</b> containing a benefit provision ' +
'has been completed and a copy has been added to the company\'s record book.'
}
]
},
reviewAndConfirm: {
completingPartyStatement: {
certifyStatements: [],
certifyClause: `Note: It is an offence to make a false or misleading statement in respect
of a material fact in a record submitted to the Corporate Registry for filing.
See section 427 of the Business Corporations Act.`,
entityDisplay: null
}
}
}
Loading

0 comments on commit 67b2c59

Please sign in to comment.