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.

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

18538 Resulting Business Name and Type component (WIP) #591

Merged
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.7",
"version": "5.6.8",
"private": true,
"appName": "Create UI",
"sbcName": "SBC Common Components",
Expand Down
26 changes: 26 additions & 0 deletions src/components/common/HelpText.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
<template>
<header id="name-header">
severinbeauvais marked this conversation as resolved.
Show resolved Hide resolved
<h2>Help with Resulting Business Type</h2>
<p class="mt-4">
A BC Limited Company and BC Community Contribution Company can amalgamate
but must form a BC Community Contribution Company. - BCA s. 51.98
severinbeauvais marked this conversation as resolved.
Show resolved Hide resolved
</p>
<p class="mt-4">
A BC Unlimited Liability Company and BC Community Contribution
Company can amalgamate but must form a BC Community Contribution Company. - BCA s. 51.98
</p>
<p>
For assistance with amalgamations involving extraprovincial corporations, please contact BC Registries staff:
</p>
<RegistriesContactInfo />
severinbeauvais marked this conversation as resolved.
Show resolved Hide resolved
</header>
</template>

<script lang="ts">
import { Component, Vue } from 'vue-property-decorator'
import RegistriesContactInfo from '@/components/common/RegistriesContactInfo.vue'
@Component({
severinbeauvais marked this conversation as resolved.
Show resolved Hide resolved
components: { RegistriesContactInfo }
})
export default class HelpText extends Vue {}
severinbeauvais marked this conversation as resolved.
Show resolved Hide resolved
</script>
24 changes: 17 additions & 7 deletions src/components/common/NameRequestInfo.vue
severinbeauvais marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@
sm="3"
class="pr-4"
>
<label>Name</label>
<label>Resulting Business Name</label>
severinbeauvais marked this conversation as resolved.
Show resolved Hide resolved
</v-col>

<v-col
Expand All @@ -121,12 +121,6 @@
<li id="numbered-company-title">
<strong>[Incorporation Number]</strong> B.C. LTD.
</li>
<li class="mt-4">
<strong>Entity Type:</strong> {{ getEntityTypeDescription }}
</li>
<li class="mt-2">
<strong>Request Type:</strong> {{ requestType }}
</li>
<li class="bullet-point mt-4 ml-6">
You will be filing this Incorporation Application for a company
created by adding "B.C. LTD." after the Incorporation Number.
Expand All @@ -140,6 +134,22 @@
</li>
</ul>
</v-col>
<v-col
cols="12"
sm="3"
class="pr-4 mt-4"
>
<label>Resulting Business Type</label>
</v-col>
<v-col
cols="12"
sm="9"
class="mt-4"
>
<ul>
{{ getEntityTypeDescription }}
</ul>
</v-col>
</v-row>
</div>
</template>
Expand Down
4 changes: 3 additions & 1 deletion src/views/AmalgamationRegular/Information.vue
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
helpLabel="Help with Business Type"
>
<template #content>
[*** TODO: help text component ***]
<HelpText />
</template>
</ExpandableHelp>

Expand All @@ -50,6 +50,7 @@ import { DefineCompanyIF } from '@/interfaces'
import { CommonMixin } from '@/mixins'
import { RouteNames } from '@/enums'
import { ExpandableHelp } from '@bcrs-shared-components/expandable-help'
import HelpText from '@/components/common/HelpText.vue'
import NameRequestInfo from '@/components/common/NameRequestInfo.vue'
import NameTranslations from '@/components/common/NameTranslations.vue'
import AmalgamatingBusinesses from '@/components/Amalgamation/AmalgamatingBusinesses.vue'
Expand All @@ -58,6 +59,7 @@ import AmalgamatingBusinesses from '@/components/Amalgamation/AmalgamatingBusine
components: {
AmalgamatingBusinesses,
ExpandableHelp,
HelpText,
NameRequestInfo,
NameTranslations
}
Expand Down