Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

21033 Use different entity types for continuation in NRs #763

Closed
wants to merge 3 commits into from
Closed

21033 Use different entity types for continuation in NRs #763

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
727e8c1
- app version = 5.4.9
Apr 30, 2024
947b614
wip
Apr 30, 2024
727d07d
- added CS to society code checks
Apr 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "name-request",
"version": "5.4.8",
"version": "5.4.9",
"private": true,
"appName": "Name Request UI",
"sbcName": "SBC Common Components",
Expand All @@ -11,7 +11,8 @@
"test:unit": "vue-cli-service test:unit --testPathPattern --coverage",
"lint": "vue-cli-service lint",
"lint:nofix": "vue-cli-service lint --no-fix",
"build-check": "node --max_old_space_size=8000 node_modules/@vue/cli-service/bin/vue-cli-service.js build"},
"build-check": "node --max_old_space_size=8000 node_modules/@vue/cli-service/bin/vue-cli-service.js build"
},
"dependencies": {
"@babel/compat-data": "^7.21.5",
"@bcrs-shared-components/breadcrumb": "2.1.24",
Expand Down
10 changes: 5 additions & 5 deletions pnpm-lock.yaml
View file
Open in desktop

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

9 changes: 8 additions & 1 deletion src/components/dialogs/pick-entity-or-conversion.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -338,7 +338,14 @@ export default class PickEntityOrConversionDialog extends CommonMixin {

chooseType (entity: SelectOptionsI) {
// special case for Society: if FF is not enabled then show society info panel and don't set the type
if (!this.isSocietyEnabled() && (entity.value === EntityTypes.SO || entity.value === EntityTypes.XSO)) {
if (
!this.isSocietyEnabled() &&
(
entity.value === EntityTypes.SO ||
entity.value === EntityTypes.XSO ||
entity.value === EntityTypes.CS
)
) {
this.showSocietiesInfo = true
return
}
Expand Down
7 changes: 6 additions & 1 deletion src/components/existing-request/nr-approved-gray-box.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,8 +270,13 @@ export default class NrApprovedGrayBox extends Mixins(CommonMixin) {

/** True if the Go To Societies Online button should be shown. */
get showGoToSocietiesButton (): boolean {
const isSociety = (
this.getNr.entity_type_cd === EntityTypes.SO ||
this.getNr.entity_type_cd === EntityTypes.XSO ||
this.getNr.entity_type_cd === EntityTypes.CS
)
return (
this.getNr.entity_type_cd === EntityTypes.SO &&
isSociety &&
this.getNr.request_action_cd === NrRequestActionCodes.NEW_BUSINESS &&
(NrState.APPROVED === this.getNr.state || this.isConsentUnRequired)
)
Expand Down
5 changes: 4 additions & 1 deletion src/components/new-request/search.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -454,7 +454,10 @@ export default class Search extends Mixins(CommonMixin, NrAffiliationMixin, Sear
get isSocietyDisabled (): boolean {
return (
!this.isSocietyEnabled() &&
(this.getEntityTypeCd === EntityTypes.SO || this.getEntityTypeCd === EntityTypes.XSO)
(
this.getEntityTypeCd === EntityTypes.SO ||
this.getEntityTypeCd === EntityTypes.XSO ||
this.getEntityTypeCd === EntityTypes.CS)
)
}

Expand Down
1 change: 1 addition & 0 deletions src/enums/entity-types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ export enum EntityTypes {
CCC = CorpTypeCd.CCC_CONTINUE_IN,
CP = CorpTypeCd.COOP,
CR = CorpTypeCd.CORPORATION,
CS = CorpTypeCd.CONT_IN_SOCIETY,
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

... Even though we have that other feature flag to redirect users straight to Society Online if they choose a society-anything NR.

CUL = CorpTypeCd.ULC_CONTINUE_IN,
DBA = CorpTypeCd.DOING_BUSINESS_AS,
FI = CorpTypeCd.FINANCIAL,
Expand Down
171 changes: 171 additions & 0 deletions src/list-data/entity-type-data.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,6 +281,177 @@ export const EntityTypesBcData: EntityI[] = [
}
]

/** List of entity types for Continuation In NRs. */
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is almost the same as the EntityTypesBcData, above, except with only the 6 cont in entity types. The category and blurbs are the same.

(Yes, cont in coop is still CP. This is an ongoing discussion and may be fixed in a separate ticket.)

export const EntityTypesContInData: EntityI[] = [
{
text: 'Limited Company',
value: EntityTypes.C,
cat: 'Corporations',
blurbs: [
`A company that may have one or more people who own shares with some personal responsibility for debt and
liabilities.`,
`Has many of the same rights of an individual`,
`Reported separately as Corporate tax`,
`Has name protection in BC`
],
mveBlurbs: [
`A company that may have one or more people who own shares with some personal responsibility for
debts and liabilities.`,
'Has many of the same rights of an individual',
'Reported separately as Corporate tax',
'Has name protection in BC'
],
rehBlurbs: [
'Restore a limited company that is no longer active with BC Registries.'
],
amlBlurbs: [
'An amalgamation of two or more corporations to form a new limited company.'
],
chgBlurbs: [
'Change/Correct the name of an existing limited company.'
],
shortlist: true,
rank: 1
},
{
text: 'Unlimited Liability Company',
value: EntityTypes.CUL,
cat: 'Corporations',
blurbs: [
`A type of corporation that is often used by American corporations as a Canadian subsidiary or to hold Canadian
assets.`,
'Shareholders liable for debts and liabilities',
'Reported separately as Canadian Corporate tax',
'Has name protection in BC'
],
mveBlurbs: [
`A type of corporation that is often used by American corporations as a Canadian subsidiary or
to hold Canadian assets.`,
'Shareholders liable for debts and liabilities',
'Reported separately as Canadian Corporate tax',
'Has name protection in BC'
],
rehBlurbs: [
'Restore an unlimited liability company (ULC) that is no longer active with BC Registries.'
],
amlBlurbs: [
'An amalgamation of two or more corporations to form a new unlimited liability company.'
],
chgBlurbs: [
'Change/Correct the name of an existing unlimited liability company.'
]
},
{
text: 'Cooperative Association',
value: EntityTypes.CP, // FUTURE: update this? see also request-action-mapping.ts
cat: 'Social Enterprises',
blurbs: [
'Membership-based organization, owned and operated by the people who use its services.',
'Has independent legal status separate from its members',
'Members take on shares and have limited liability',
'Reported as Corporate tax',
'Has name protection in BC'
],
mveBlurbs: [
'Membership-based organization, owned and operated by the people who use its services.',
'Has independent legal status separate from its members',
'Members take on shares and have limited liability',
'Reported as Corporate tax',
'Has name protection in BC'
],
rehBlurbs: [
'Restore a cooperative association that is no longer active with BC Registries.'
],
amlBlurbs: [
`An amalgamation of two or more cooperative associations to form a new cooperative
association.`
],
chgBlurbs: [
'Change/correct the name of an existing cooperative association.'
]
},
{
text: 'Benefit Company',
value: EntityTypes.CBEN,
cat: 'Corporations',
blurbs: [
`A type of corporation with special commitments to conduct business in a responsible and sustainable way.`,
'Must publish and post an audited annual benefit report',
'Reported as Corporate tax',
'Has name protection in BC'
],
mveBlurbs: [
'A type of corporation with special commitments to conduct business in a responsible and sustainable way.',
'Must publish and post an audited annual benefit report',
'Reported as Corporate tax',
'Has name protection in BC'
],
rehBlurbs: [
'Restore a benefit company that is no longer active with BC Registries.'
],
amlBlurbs: [
'An amalgamation of two or more corporations to form a new benefit company.'
],
chgBlurbs: [
'Change/Correct the name of an existing benefit company.'
]
},
{
text: 'Community Contribution Company',
value: EntityTypes.CCC,
cat: 'Social Enterprises',
blurbs: [
`A type of corporation that has a benefit to the community. It is intended to bridge the gap between
for-profit and non-profit companies.`,
'Reported as Corporate tax',
'Has name protection in BC'
],
mveBlurbs: [
'A type of corporation that has a benefit to the community. It is intended to bridge the gap between ' +
'for-profit and non-profit companies.',
'Reported as Corporate tax',
'Has name protection in BC'
],
rehBlurbs: [
'Restore a community contribution company (CCC) that is no longer active with BC Registries.'
],
amlBlurbs: [
`An amalgamation of two or more corporations to form a new community contribution
company.`
],
chgBlurbs: [
'Change/correct the name of an existing community contribution company.'
]
},
{
text: 'Society',
value: EntityTypes.CS,
cat: 'Social Enterprises',
blurbs: [
`A non-profit organization that is also known as a non-share corporation.`,
'Any funds or profits must be used only for social or community benefit',
'When incorporated, has independent legal status separate from its members',
'Members, staff and directors protected from personal liability',
'Has name protection in BC',
'Must use Societies Online to register a name and incorporate'
],
mveBlurbs: [
`A non-profit organization that is also known as a non-share corporation.`,
'Any funds or profits must be used only for social or community benefit',
'When incorporated, has independent legal status separate from its members',
'Members, staff and directors protected from personal liability',
'Has name protection in BC',
'Must use Societies Online to register a name and incorporate'
],
amlBlurbs: [
'Society amalgamation'
],
chgBlurbs: [
'Societies must use Societies Online to get their name.'
]
}
]

export const EntityTypesXproData: EntityI[] = [
{
text: 'Extraprovincial Limited Company',
Expand Down
51 changes: 31 additions & 20 deletions src/list-data/request-action-mapping.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,25 +2,31 @@ import { EntityTypes, NrRequestActionCodes } from '@/enums'
import { RequestActionMappingI } from '@/interfaces'

const EntityTypesBC = [
EntityTypes.FR,
EntityTypes.DBA,
EntityTypes.BC,
EntityTypes.C,
EntityTypes.CBEN,
EntityTypes.CC,
EntityTypes.CCC,
EntityTypes.CP,
EntityTypes.CR,
EntityTypes.UL,
EntityTypes.CS,
EntityTypes.CUL,
EntityTypes.DBA,
EntityTypes.FI,
EntityTypes.FR,
EntityTypes.GP,
EntityTypes.LP,
EntityTypes.LL,
EntityTypes.CP,
EntityTypes.BC,
EntityTypes.CC,
EntityTypes.SO,
EntityTypes.LP,
EntityTypes.PA,
EntityTypes.FI,
EntityTypes.PAR
EntityTypes.PAR,
EntityTypes.SO,
EntityTypes.UL
]
Copy link
Collaborator Author

@severinbeauvais severinbeauvais Apr 30, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I added 5 cont in types (since there is no new cont in type for CP), and sorted this list.

-> C, CBEN, CCC, CS and CUL


// maps request_action_cd (key) to array of allowable entities (value)
// { [request_action_cd]: entity_type_cd[] }
export const BcMapping: RequestActionMappingI = {
// Amalgamate
AML: [
EntityTypes.CR,
EntityTypes.UL,
Expand All @@ -29,6 +35,7 @@ export const BcMapping: RequestActionMappingI = {
EntityTypes.BC,
EntityTypes.SO
],
// Renew
REN: [
EntityTypes.CR,
EntityTypes.CP,
Expand All @@ -38,6 +45,7 @@ export const BcMapping: RequestActionMappingI = {
EntityTypes.BC,
EntityTypes.SO
],
// Restore
REH: [
EntityTypes.CR,
EntityTypes.CP,
Expand All @@ -47,17 +55,17 @@ export const BcMapping: RequestActionMappingI = {
EntityTypes.BC,
EntityTypes.SO
],
// every entity type except Parishes and Private Act
// Change Name
// (every entity type except Parishes and Private Act)
CHG: EntityTypesBC.filter(ent => ent !== EntityTypes.PAR && ent !== EntityTypes.PA),
// when a MVE (continuation in) NR is created, the resultant company will have a
// different entity type in LEAR, as per comments below
// MVE = Continuation In
MVE: [
EntityTypes.CR, // will become CorpTypeCd.CONTINUE_IN
EntityTypes.CC, // will become CorpTypeCd.CCC_CONTINUE_IN
EntityTypes.CP,
EntityTypes.UL, // will become CorpTypeCd.ULC_CONTINUE_IN
EntityTypes.SO,
EntityTypes.BC // will become CorpTypeCd.BEN_CONTINUE_IN
EntityTypes.C,
EntityTypes.CCC,
EntityTypes.CP, // FUTURE: update this? see also entity-type-data.ts
EntityTypes.CUL,
EntityTypes.CS,
EntityTypes.CBEN
]
}

Expand Down Expand Up @@ -131,5 +139,8 @@ export const NumberedEntityTypes = [
EntityTypes.CC,
EntityTypes.CR,
EntityTypes.UL,
EntityTypes.C
EntityTypes.C,
EntityTypes.CBEN,
EntityTypes.CCC,
EntityTypes.CUL
]
Loading
Loading