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

24190 Updated conversion codes + logic (WIP) #780

Closed
wants to merge 1 commit into from
Closed

24190 Updated conversion codes + logic (WIP) #780

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions app/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.5.10",
"version": "5.5.11",
"private": true,
"appName": "Name Request UI",
"sbcName": "SBC Common Components",
Expand All @@ -17,7 +17,7 @@
"@babel/compat-data": "^7.24.4",
"@bcrs-shared-components/breadcrumb": "2.1.24",
"@bcrs-shared-components/corp-type-module": "1.0.15",
"@bcrs-shared-components/enums": "1.1.13",
"@bcrs-shared-components/enums": "1.1.15",
"@bcrs-shared-components/folio-number-input": "^1.1.44",
"@bcrs-shared-components/genesys-web-message": "1.0.0",
"@bcrs-shared-components/interfaces": "1.0.67",
Expand Down
16 changes: 8 additions & 8 deletions app/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.

4 changes: 3 additions & 1 deletion app/src/components/new-request/search-components/business-lookup-fetch.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
:hint="hint"
@click:append="onBusiness(null)"
@keyup.delete="onBusiness(null)"
@keydown.enter.native.prevent

Check warning on line 32 in app/src/components/new-request/search-components/business-lookup-fetch.vue

View workflow job for this annotation

GitHub Actions / namerequest-ci / linting-pnpm (21, 9) 

'.native' modifier on 'v-on' directive is deprecated

Check warning on line 32 in app/src/components/new-request/search-components/business-lookup-fetch.vue

View workflow job for this annotation

GitHub Actions / namerequest-ci / verify-build (21, 9) 

'.native' modifier on 'v-on' directive is deprecated
/>
</v-form>
</v-col>
Expand Down Expand Up @@ -118,10 +118,12 @@
if (this.getSearchBusiness) {
// set the from business for alteration (conversion)
this.setOriginEntityTypeCd(this.getSearchBusiness.legalType)
// *** TODO: the comment below is no longer true
// BENs can now convert to BC or CCC
// special case if the from business is BEN
// set conversionType and entityTypeCd because there's only one alteration type for it
if (this.isBenBusiness) {
this.setConversionType(NrRequestTypeCodes.CONVERT_CORP)
this.setConversionType(NrRequestTypeCodes.CONVERT_BEN_TO_BC)
this.setEntityTypeCd(EntityTypes.CR)
}
} else {
Expand Down
65 changes: 38 additions & 27 deletions app/src/list-data/conversion-types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,71 +3,82 @@ import { ConversionTypesI } from '@/interfaces/models'

export const ConversionTypes: ConversionTypesI[] = [
{
desc: 'Limited Company to an Unlimited Liability Company',
text: 'Limited Company to an Unlimited Liability Company',
entity_type_cd: EntityTypes.UL,
origin_entity_type_cd: EntityTypes.BC,
desc: 'Limited Company to a Benefit Company',
text: 'Limited Company to a Benefit Company',
entity_type_cd: EntityTypes.BC, // Benefit Company (namex)
origin_entity_type_cd: EntityTypes.BC, // BC Limited (lear)
blurbs: [
'Alter business type from a limited company to an unlimited liability company.'
'Alter business type from a limited company to a benefit company.'
],
value: NrRequestTypeCodes.CONVERT_ULC,
rank: 1,
shortlist: true
value: NrRequestTypeCodes.CONVERT_BC_TO_BEN,
shortlist: false
},
{
desc: 'Limited Company to a Community Contribution Company',
text: 'Limited Company to a Community Contribution Company',
entity_type_cd: EntityTypes.CC,
origin_entity_type_cd: EntityTypes.BC,
entity_type_cd: EntityTypes.CC, // CCC (namex)
origin_entity_type_cd: EntityTypes.BC, // BC Limited (lear)
blurbs: [
'Alter business type from a limited company to a community contribution company.'
],
value: NrRequestTypeCodes.CONVERT_CCC,
value: NrRequestTypeCodes.CONVERT_BC_TO_CCC,
rank: 2,
shortlist: true
},
{
desc: 'Limited Company to a Benefit Company',
text: 'Limited Company to a Benefit Company',
entity_type_cd: EntityTypes.BC,
origin_entity_type_cd: EntityTypes.BC,
desc: 'Limited Company to an Unlimited Liability Company',
text: 'Limited Company to an Unlimited Liability Company',
entity_type_cd: EntityTypes.UL, // ULC (namex)
origin_entity_type_cd: EntityTypes.BC, // BC Limited (lear)
blurbs: [
'Alter business type from a limited company to a benefit company.'
'Alter business type from a limited company to an unlimited liability company.'
],
value: NrRequestTypeCodes.CONVERT_BEN,
shortlist: false
value: NrRequestTypeCodes.CONVERT_BC_TO_ULC,
rank: 1,
shortlist: true
},
{
desc: 'Benefit Company to a Limited Company',
text: 'Benefit Company to a Limited Company',
entity_type_cd: EntityTypes.CR,
origin_entity_type_cd: EntityTypes.BEN,
entity_type_cd: EntityTypes.CR, // BC Limited (namex)
origin_entity_type_cd: EntityTypes.BEN, // Benefit Company (lear)
blurbs: [
'Alter business type from a benefit company to a limited company.'
],
value: NrRequestTypeCodes.CONVERT_CORP,
value: NrRequestTypeCodes.CONVERT_BEN_TO_BC,
shortlist: false
},
{
desc: 'Benefit Company to a Community Contribution Company',
text: 'Benefit Company to a Community Contribution Company',
entity_type_cd: EntityTypes.CC, // CCC (namex)
origin_entity_type_cd: EntityTypes.BEN, // Benefit Company (lear)
blurbs: [
'Alter business type from a benefit company to a community contribution company.'
],
value: NrRequestTypeCodes.CONVERT_BEN_TO_CCC,
shortlist: false
},
{
desc: 'Unlimited Liability Company to a Limited Company',
text: 'Unlimited Liability Company to a Limited Company',
entity_type_cd: EntityTypes.CR,
origin_entity_type_cd: EntityTypes.ULC,
entity_type_cd: EntityTypes.CR, // BC Limited (namex)
origin_entity_type_cd: EntityTypes.ULC, // ULC (lear)
blurbs: [
'Alter business type from an unlimited liability company to a limited company.'
],
value: NrRequestTypeCodes.CONVERT_ULCB,
value: NrRequestTypeCodes.CONVERT_ULC_TO_BC,
shortlist: false
},
{
desc: 'Unlimited Liability Company to a Benefit Company',
text: 'Unlimited Liability Company to a Benefit Company',
entity_type_cd: EntityTypes.BC,
origin_entity_type_cd: EntityTypes.ULC,
entity_type_cd: EntityTypes.BC, // Benefit Company (namex)
origin_entity_type_cd: EntityTypes.ULC, // ULC (lear)
blurbs: [
'Alter business type from an unlimited liability company to a benefit company.'
],
value: NrRequestTypeCodes.CONVERT_ULBE,
value: NrRequestTypeCodes.CONVERT_ULC_TO_BEN,
shortlist: false
}
]
7 changes: 4 additions & 3 deletions app/src/mixins/common-mixin.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,9 +162,10 @@ export class CommonMixin extends Vue {
/** Returns true if the specified alteration NR is allowed to be done online. */
isAlterOnline (type: NrRequestTypeCodes): boolean {
return !(
type === NrRequestTypeCodes.CONVERT_BEN ||
type === NrRequestTypeCodes.CONVERT_CORP ||
type === NrRequestTypeCodes.CONVERT_ULBE
type === NrRequestTypeCodes.CONVERT_BC_TO_BEN ||
type === NrRequestTypeCodes.CONVERT_BEN_TO_BC ||
type === NrRequestTypeCodes.CONVERT_BEN_TO_CCC ||
type === NrRequestTypeCodes.CONVERT_ULC_TO_BEN
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 the list of alterations for which we display a "contact us" message instead of an action button, "Alter Now".

This is the subject of bcgov/entity#24278.

Just leave this alone for now. (The change above is OK.)

)
}

Expand Down
Loading