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

Voluntary Dissolution filing display changes #61

Merged
merged 4 commits into from
Nov 5, 2024
Merged

Voluntary Dissolution filing display changes #61

Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
40ad34d
fix voluntary dissolution wording and styling
BrandonSharratt Oct 30, 2024
babbf99
remove unneeded code
BrandonSharratt Oct 30, 2024
9a3ea01
add entityFirm stuff back to voluntary dissolution
BrandonSharratt Nov 4, 2024
eb8f685
missed indent
BrandonSharratt Nov 4, 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
34 changes: 7 additions & 27 deletions src/components/bcros/filing/item/DissolutionVoluntary.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
import type { ApiResponseFilingI } from '#imports'
import { FilingStatusE, isFilingStatus } from '#imports'

const { isEntityFirm } = useBcrosBusiness()
const { currentBusinessName, businessConfig } = storeToRefs(useBcrosBusiness())

const t = useNuxtApp().$i18n.t
Expand All @@ -18,15 +17,6 @@ const unknownStr = `[${t('text.general.unknown')}]`
const entityTitle = computed(() => businessConfig.value?.dissolutionConfirmation?.entityTitle || unknownStr)
const actTitle = computed(() => businessConfig.value?.dissolutionConfirmation?.act || unknownStr)

/** The dissolution date-time submitted to display. */
const dissolutionDateSubmittedPacific =
props.filing.submittedDate ? dateToPacificDateTime(new Date(props.filing.submittedDate)) : unknownStr

/** The dissolution date to display. */
const dissolutionDateIso = props.filing.data?.dissolution?.dissolutionDate
const date = yyyyMmDdToDate(dissolutionDateIso)
const dissolutionDatePacific = dateToPacificDate(date, true) || unknownStr

/** The dissolution date-time to display. */
const dissolutionDateTime =
props.filing.effectiveDate ? dateToPacificDateTime(new Date(props.filing.effectiveDate)) : unknownStr
Expand All @@ -35,8 +25,11 @@ const dissolutionDateTime =
<template>
<BcrosFilingCommonTemplate :filing="filing" data-cy="dissolution-voluntary">
<template #subtitle>
<BcrosFilingCommonFiledAndPendingPaid v-if="isFutureEffectivePending(filing)" :filing="filing" />
<BcrosFilingCommonFutureEffectivePaid v-else-if="isFutureEffective(filing)" :filing="filing" />
<div class="mt-0.5 mb-3">
<BcrosFilingCommonFiledAndPendingPaid v-if="isFutureEffectivePending(filing)" :filing="filing" />
<BcrosFilingCommonFutureEffectivePaid v-else-if="isFutureEffective(filing)" :filing="filing" />
<BcrosFilingCommonFiledAndPaid v-else :filing="filing" />
</div>
</template>

<template #body>
Expand All @@ -46,20 +39,7 @@ const dissolutionDateTime =
<div v-else-if="isStatusCompleted" data-cy="completed-dissolution-details">
<strong>{{ $t('text.filing.dissolution.completed') }}</strong>

<p v-if="isEntityFirm">
Copy link
Collaborator

Choose a reason for hiding this comment

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

we want to keep this v-if as different text is displayed based on whether the business is an entity firm or not. I think we get incorrect text in the screenshot because isEntityFirm is actually a function. Changing it to v-if="isEntityFirm()" can solve the issue.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

added back along with all the other stuff that was ripped out as part of removing

{{ $t('text.filing.dissolution.theStatementOf') }} {{ entityTitle }} {{ currentBusinessName || '' }}
{{ $t('text.filing.dissolution.wasSuccessfully') }}&nbsp;{{ $t('text.filing.dissolution.submittedOn') }}&nbsp;
<strong>{{ dissolutionDateSubmittedPacific }}</strong>
{{ $t('text.filing.dissolution.withDissolutionDateOf') }}&nbsp;<strong>{{ dissolutionDatePacific }}</strong>.
{{ $t('text.general.the') }}&nbsp;{{ entityTitle }} {{
$t('text.filing.dissolution.hasBeenStruckAndDissolved')
}},
{{ $t('text.filing.dissolution.ceasedToBe') }}
{{ $t('text.filing.dissolution.aRegistered') }}&nbsp;{{ entityTitle }}
{{ $t('text.filing.dissolution.underThe') }}&nbsp;{{ actTitle }} Act.
</p>

<p v-if="!isEntityFirm">
Copy link
Collaborator

Choose a reason for hiding this comment

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

same here

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

brought back but as a v-else instead of a !

<p class="mt-3">
{{ $t('text.general.the') }}&nbsp;{{ entityTitle }} {{ currentBusinessName || '' }}
{{ $t('text.filing.dissolution.wasSuccessfully') }}&nbsp;
<strong>{{ $t('text.filing.dissolution.dissolvedOn') }}&nbsp;{{ dissolutionDateTime }}</strong>.
Expand All @@ -70,7 +50,7 @@ const dissolutionDateTime =
{{ $t('text.filing.dissolution.underThe') }}&nbsp;{{ actTitle }} Act.
</p>

<p class="font-weight-bold">
<p class="font-bold mt-3">
{{ $t('text.filing.dissolution.requiredToRetain') }}
</p>

Expand Down
Loading