From 6ead125865bddd653be40c9544f07405b674aa11 Mon Sep 17 00:00:00 2001 From: Alex Lambert <60455392+lambert-alex@users.noreply.github.com> Date: Wed, 23 Nov 2022 12:02:16 -0800 Subject: [PATCH] 14145 Update Confirm Incorporation Agreement and Article Completion (#474) * Update incorporation agreement step description & add custom descriptions for the four corp types * Update App version --- package-lock.json | 4 +- package.json | 2 +- src/components/common/AgreementType.vue | 17 ++-- .../resource-interfaces/resource-interface.ts | 6 ++ .../Incorporations/benefitCompany.ts | 10 +++ .../communityContributionCompany.ts | 23 +++++- .../Incorporations/limitedCompany.ts | 9 +- .../Incorporations/unlimitedCompany.ts | 21 +++-- src/store/getters/resource-getters.ts | 5 ++ src/store/state/resource-model.ts | 6 ++ .../Incorporation/IncorporationAgreement.vue | 82 ++++--------------- tests/jest-wrapper-factory.ts | 6 +- tests/unit/AgreementType.spec.ts | 76 ++++++++++------- 13 files changed, 146 insertions(+), 121 deletions(-) diff --git a/package-lock.json b/package-lock.json index dce4f9d85..b434aafb8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "business-create-ui", - "version": "4.3.14", + "version": "4.3.15", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "business-create-ui", - "version": "4.3.14", + "version": "4.3.15", "dependencies": { "@babel/compat-data": "^7.19.1", "@bcrs-shared-components/breadcrumb": "2.1.2", diff --git a/package.json b/package.json index c9462016a..d3671b73b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "business-create-ui", - "version": "4.3.14", + "version": "4.3.15", "private": true, "appName": "Create UI", "sbcName": "SBC Common Components", diff --git a/src/components/common/AgreementType.vue b/src/components/common/AgreementType.vue index cce1e5af4..96bac3a25 100644 --- a/src/components/common/AgreementType.vue +++ b/src/components/common/AgreementType.vue @@ -3,7 +3,7 @@ - + -
+
- @Getter isTypeBcCcc!: boolean + @Getter isTypeBcUlcCompany!: boolean @Getter getIncorporationAgreementStep!: IncorporationAgreementIF + @Getter getShowErrors!: boolean @Action setIncorporationAgreementStepData!: ActionBindingIF diff --git a/src/interfaces/resource-interfaces/resource-interface.ts b/src/interfaces/resource-interfaces/resource-interface.ts index 73e3e05c5..cfeae07d5 100644 --- a/src/interfaces/resource-interfaces/resource-interface.ts +++ b/src/interfaces/resource-interfaces/resource-interface.ts @@ -24,6 +24,12 @@ export interface IncorporationResourceIF { shareClasses?: { countMinimum: number } + incorporationArticles?: { + articles: string, + articlesTooltip: string, + provisions?: string, + provisionTooltip?: string + } incorporationAgreement?: { helpSection: Array article: string diff --git a/src/resources/Incorporations/benefitCompany.ts b/src/resources/Incorporations/benefitCompany.ts index 037c20e2e..bda62e93e 100644 --- a/src/resources/Incorporations/benefitCompany.ts +++ b/src/resources/Incorporations/benefitCompany.ts @@ -39,6 +39,16 @@ export const BenefitCompanyResource: IncorporationResourceIF = { 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: [ { diff --git a/src/resources/Incorporations/communityContributionCompany.ts b/src/resources/Incorporations/communityContributionCompany.ts index 152cf72d7..fb347ce5a 100644 --- a/src/resources/Incorporations/communityContributionCompany.ts +++ b/src/resources/Incorporations/communityContributionCompany.ts @@ -39,6 +39,18 @@ export const CommunityContributionCompanyResource: IncorporationResourceIF = { shareClasses: { countMinimum: 1 }, + incorporationArticles: { + articles: 'Community Contribution Company Articles', + articlesTooltip: 'The Articles for a Community Contribution Company must include the following statements “This ' + + 'company is a community contribution company, and, as such, has purposes beneficial to society. This company is ' + + 'restricted, in accordance with Part 2.2 of the Business Corporations Act, in its ability to pay dividends and ' + + 'to distribute its assets on dissolution or otherwise.” Articles should also outline the rules and procedures ' + + 'for corporate matters such as holding meetings, issuing and transferring shares, and duties of directors ' + + 'and officers.', + provisions: 'community provision', + provisionTooltip: 'A clause in the Articles which communicates the liability statement required by the Business ' + + 'Corporations Act 51.11.' + }, incorporationAgreement: { helpSection: [ { @@ -67,8 +79,15 @@ export const CommunityContributionCompanyResource: IncorporationResourceIF = { documents: [ { code: 'sample', - description: 'The Incorporation Agreement and Articles containing the community purposes has been ' + - 'completed and a copy has been added to the company\'s record book.' + description: 'The sample Incorporation Agreement and Articles containing the community provision' + + ' required by the Business Corporations Act 51.911 has been completed and a copy has been added to the' + + ' company\'s record book.' + }, + { + code: 'custom', + description: 'The custom Incorporation Agreement and custom Articles containing the community' + + ' provision required by the Business Corporations Act 51.911 has been completed and a copy has been added' + + ' to the company\'s record book.' } ] }, diff --git a/src/resources/Incorporations/limitedCompany.ts b/src/resources/Incorporations/limitedCompany.ts index b8c2f87b3..5be5d9332 100644 --- a/src/resources/Incorporations/limitedCompany.ts +++ b/src/resources/Incorporations/limitedCompany.ts @@ -39,6 +39,11 @@ export const LimitedCompanyResource: IncorporationResourceIF = { shareClasses: { countMinimum: 1 }, + incorporationArticles: { + articles: '
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: [ { @@ -78,8 +83,8 @@ export const LimitedCompanyResource: IncorporationResourceIF = { article: 'Sample_articles.pdf', documents: [ { - code: 'Table-1', - description: 'The sample Incorporation Agreement and Table 1 Articles ' + + code: 'sample', + description: 'The sample Incorporation Agreement and Articles ' + 'has been completed and a copy has been added to the company\'s record book.' }, { diff --git a/src/resources/Incorporations/unlimitedCompany.ts b/src/resources/Incorporations/unlimitedCompany.ts index e028d6827..ccf9633c5 100644 --- a/src/resources/Incorporations/unlimitedCompany.ts +++ b/src/resources/Incorporations/unlimitedCompany.ts @@ -39,6 +39,17 @@ export const UnlimitedCompanyResource: IncorporationResourceIF = { shareClasses: { countMinimum: 1 }, + incorporationArticles: { + articles: 'Unlimited Liability Company Articles', + articlesTooltip: 'The Articles for an Unlimited Liability Company must include the following statement: “The ' + + 'shareholders of this company are jointly and severally liable to satisfy the debts and liabilities of this ' + + 'company to the extent provided in section 51.3 of the Business Corporations Act.” Articles should also outline ' + + 'the rules and procedures for corporate matters such as holding meetings, issuing and transferring shares, and ' + + 'duties of directors and officers.', + provisions: 'liability provision', + provisionTooltip: 'A clause in the Articles which communicates the liability statement required by the Business ' + + 'Corporations Act 51.11.' + }, incorporationAgreement: { helpSection: [ { @@ -77,15 +88,11 @@ export const UnlimitedCompanyResource: IncorporationResourceIF = { ], article: 'unlimited_liability_company__corporation_agreement.pdf', documents: [ - { - code: 'Table-1', - description: 'The sample Incorporation Agreement and Table 1 Articles ' + - 'has been completed and a copy has been added to the company\'s record book.' - }, { code: 'custom', - description: 'The custom Incorporation Agreement and custom Articles ' + - 'has been completed and a copy has been added to the company\'s record book.' + description: 'The custom Incorporation Agreement and custom Articles containing the liability' + + ' provision required by the Business Corporations Act 51.11 has been completed and a copy has been added' + + ' to the company\'s record book.' } ] }, diff --git a/src/store/getters/resource-getters.ts b/src/store/getters/resource-getters.ts index 22bac83af..edef4bf23 100644 --- a/src/store/getters/resource-getters.ts +++ b/src/store/getters/resource-getters.ts @@ -27,6 +27,11 @@ export const getPeopleAndRolesResource = (state: StateIF): any => { return state.resourceModel.peopleAndRoles } +/** The Incorporation Articles */ +export const getIncorporationArticlesResource = (state: StateIF): any => { + return state.resourceModel.incorporationArticles +} + /** The Create Rules object. */ export const getCreateRulesResource = (state: StateIF): CreateRulesResourceIF => { return state.resourceModel.createRules diff --git a/src/store/state/resource-model.ts b/src/store/state/resource-model.ts index e7432f3eb..cb4e4ecff 100644 --- a/src/store/state/resource-model.ts +++ b/src/store/state/resource-model.ts @@ -18,6 +18,12 @@ const incorporationResourceModel: IncorporationResourceIF = { shareClasses: { countMinimum: null }, + incorporationArticles: { + articles: null, + articlesTooltip: null, + provisions: null, + provisionTooltip: null + }, incorporationAgreement: null, reviewAndConfirm: { completingPartyStatement: { diff --git a/src/views/Incorporation/IncorporationAgreement.vue b/src/views/Incorporation/IncorporationAgreement.vue index af0020f5d..5b2f24414 100644 --- a/src/views/Incorporation/IncorporationAgreement.vue +++ b/src/views/Incorporation/IncorporationAgreement.vue @@ -7,8 +7,8 @@ -

- Before submitting your incorporation application you must complete, sign, and date an +

+ Before submitting your incorporation application you must complete, sign, and date an