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

23754 Updated ULC Information section #752

Merged
merged 2 commits into from
Oct 23, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 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.12.9",
"version": "5.12.10",
"private": true,
"appName": "Create UI",
"sbcName": "SBC Common Components",
Expand Down
10 changes: 8 additions & 2 deletions src/components/ContinuationIn/AuthorizationInformation.vue
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,10 @@
<v-divider class="my-6" />

<!-- Unlimited Liability Corporation Information -->
<v-row no-gutters>
<v-row
v-if="getExistingBusinessInfo.affidavitFile"
no-gutters
>
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Only show this section if an affidavit file (ULC Info) exists.

<v-col
cols="12"
sm="3"
Expand Down Expand Up @@ -159,7 +162,10 @@
</v-col>
</v-row>

<v-divider class="my-6" />
<v-divider
v-if="getExistingBusinessInfo.affidavitFile"
class="my-6"
/>

<!-- Confirmation -->
<v-row
Expand Down
34 changes: 1 addition & 33 deletions src/components/ContinuationIn/ExtraproRegistration.vue
Original file line number Diff line number Diff line change
Expand Up @@ -173,30 +173,6 @@
/>
</v-col>
</v-row>

<!-- Unlimited Liability Corporation Information -->
<v-row
v-if="isContinuationInAffidavitRequired"
class="mt-6"
no-gutters
>
<v-col
cols="12"
sm="3"
>
<label>Unlimited Liability Corporation Information</label>
</v-col>

<v-col
cols="12"
sm="9"
>
<UploadAffidavit
:business="business"
@valid="affidavitValid = $event"
/>
</v-col>
</v-row>
</v-form>

<!-- historical business -->
Expand Down Expand Up @@ -317,7 +293,6 @@ import { Rules } from '@/rules'
import ExtraproBusinessLookup from './ExtraproBusinessLookup.vue'
import MessageBox from '@/components/common/MessageBox.vue'
import RegistriesContactInfo from '@/components/common/RegistriesContactInfo.vue'
import UploadAffidavit from './UploadAffidavit.vue'
import { DatePicker as DatePickerShared } from '@bcrs-shared-components/date-picker'

@Component({
Expand All @@ -327,8 +302,7 @@ import { DatePicker as DatePickerShared } from '@bcrs-shared-components/date-pic
GenericErrorDialog,
Jurisdiction,
MessageBox,
RegistriesContactInfo,
UploadAffidavit
RegistriesContactInfo
},
directives: {
mask
Expand All @@ -346,7 +320,6 @@ export default class ExtraproRegistration extends Mixins(DateMixin) {
@Getter(useStore) getCurrentDate!: string
@Getter(useStore) getExistingBusinessInfo!: ExistingBusinessInfoIF
@Getter(useStore) getShowErrors!: boolean
@Getter(useStore) isContinuationInAffidavitRequired!: boolean

@Action(useStore) setExistingBusinessInfo!: (x: ExistingBusinessInfoIF) => void
@Action(useStore) setHaveChanges!: (x: boolean) => void
Expand All @@ -355,7 +328,6 @@ export default class ExtraproRegistration extends Mixins(DateMixin) {
active = false
business = {} as ExistingBusinessInfoIF
formValid = false
affidavitValid = false
uploadMemorandumDoc = null as File
uploadMemorandumDocKey = null as string
errorDialog = false
Expand Down Expand Up @@ -537,7 +509,6 @@ export default class ExtraproRegistration extends Mixins(DateMixin) {
/** Emits form validity. */
@Watch('isBusinessActive')
@Watch('business', { deep: true })
@Watch('affidavitValid')
@Watch('formValid')
@Watch('getShowErrors')
@Emit('valid')
Expand All @@ -548,15 +519,12 @@ export default class ExtraproRegistration extends Mixins(DateMixin) {
// this component is valid if we have an active business
// and we have the home jurisdiction (custom component)
// and we have the home incorporation date (custom component)
// and we have the affidavit file, if required (custom component)
// and the other form (Vuetify) components are valid
// show tick mark only when user visits Review Page
return (
this.getShowErrors &&
this.isBusinessActive &&
!!this.business.previousJurisdiction &&
!!this.business.prevIncorporationDate &&
(!this.isContinuationInAffidavitRequired || this.affidavitValid) &&
this.formValid
)
}
Expand Down
34 changes: 1 addition & 33 deletions src/components/ContinuationIn/ManualBusinessInfo.vue
Original file line number Diff line number Diff line change
Expand Up @@ -139,30 +139,6 @@
/>
</v-col>
</v-row>

<!-- Unlimited Liability Corporation Information -->
<v-row
v-if="isContinuationInAffidavitRequired"
class="mt-6"
no-gutters
>
<v-col
cols="12"
sm="3"
>
<label>Unlimited Liability Corporation Information</label>
</v-col>

<v-col
cols="12"
sm="9"
>
<UploadAffidavit
:business="business"
@valid="affidavitValid = $event"
/>
</v-col>
</v-row>
</v-form>
</template>
</div>
Expand All @@ -183,14 +159,12 @@ import { DatePicker as DatePickerShared } from '@bcrs-shared-components/date-pic
import { JurisdictionLocation } from '@bcrs-shared-components/enums'
import { CountriesProvincesMixin } from '@/mixins/'
import { FormIF } from '@bcrs-shared-components/interfaces'
import UploadAffidavit from './UploadAffidavit.vue'

@Component({
components: {
DatePickerShared,
Jurisdiction,
MessageBox,
UploadAffidavit
MessageBox
},
directives: {
mask
Expand All @@ -208,7 +182,6 @@ export default class ManualBusinessInfo extends Mixins(CountriesProvincesMixin,
@Getter(useStore) getCurrentDate!: string
@Getter(useStore) getExistingBusinessInfo!: ExistingBusinessInfoIF
@Getter(useStore) getShowErrors!: boolean
@Getter(useStore) isContinuationInAffidavitRequired!: boolean

@Action(useStore) setExistingBusinessInfo!: (x: ExistingBusinessInfoIF) => void
@Action(useStore) setHaveChanges!: (x: boolean) => void
Expand All @@ -217,7 +190,6 @@ export default class ManualBusinessInfo extends Mixins(CountriesProvincesMixin,
active = false
business = {} as ExistingBusinessInfoIF
formValid = false
affidavitValid = false

readonly identifyingNumberRules: Array<VuetifyRuleFunction> = [
(v) => !!v?.trim() || 'Identifying Number is required',
Expand Down Expand Up @@ -309,7 +281,6 @@ export default class ManualBusinessInfo extends Mixins(CountriesProvincesMixin,
/** Emits form validity. */
@Watch('business', { deep: true })
@Watch('formValid')
@Watch('affidavitValid')
@Watch('getShowErrors')
@Emit('valid')
private onComponentValid (): boolean {
Expand All @@ -318,14 +289,11 @@ export default class ManualBusinessInfo extends Mixins(CountriesProvincesMixin,

// this form is valid if we have the previous jurisdiction (custom component)
// and we have the incorporation date (custom component)
// and we have the affidavit file, if required (custom component)
// and the other form (Vuetify) components are valid
// show tick mark only when user visits Review Page
return (
this.getShowErrors &&
!!this.business.previousJurisdiction &&
!!this.business.prevIncorporationDate &&
(!this.isContinuationInAffidavitRequired || this.affidavitValid) &&
this.formValid
)
}
Expand Down
Loading
Loading