From a6442b760e6d1a25147443d19ca41eb184863a49 Mon Sep 17 00:00:00 2001 From: Hrvoje Fekete Date: Tue, 10 Dec 2024 10:05:46 -0800 Subject: [PATCH 1/7] 24817 - fix: wrong redirect; missing start date for filngs. --- src/components/bcros/businessDetails/Links.vue | 9 +++++++-- src/stores/filings.ts | 1 + 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/components/bcros/businessDetails/Links.vue b/src/components/bcros/businessDetails/Links.vue index 62527651..0677c575 100644 --- a/src/components/bcros/businessDetails/Links.vue +++ b/src/components/bcros/businessDetails/Links.vue @@ -168,7 +168,12 @@ const dissolveBusiness = async (): Promise => { console.error('Filing error no filingId') reject(new Error('Failed to create filing')) } - goToCreatePage('/dissolution-define-dissolution', { id: currentBusiness.value.identifier }) + if (isFirm.value) { + goToCreatePage('/define-dissolution', { id: currentBusiness.value.identifier }) + } else { + goToCreatePage('/dissolution-define-dissolution', { id: currentBusiness.value.identifier }) + } + // goToCreatePage('/dissolution-define-dissolution', { id: currentBusiness.value.identifier }) resolve() } }) @@ -278,7 +283,7 @@ const contacts = getContactInfo('registries') - {{ $t('label.comments.comment', (comments?.length || 0 )) }} + {{ $t('label.comments.comment', (comments?.length || 0)) }} diff --git a/src/stores/filings.ts b/src/stores/filings.ts index 2cb70a3a..9ce4c6a5 100644 --- a/src/stores/filings.ts +++ b/src/stores/filings.ts @@ -104,6 +104,7 @@ export const useBcrosFilings = defineStore('bcros/filings', () => { identifier: business.identifier, legalType: business.legalType, legalName: business.legalName, + startDate: business.startDate, foundingDate: business.foundingDate } } From 05d0f8f8c3a2f4506a87a9bb29c0e51d6bc5fcef Mon Sep 17 00:00:00 2001 From: Hrvoje Fekete Date: Tue, 10 Dec 2024 10:12:50 -0800 Subject: [PATCH 2/7] chore: remove comment. --- src/components/bcros/businessDetails/Links.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/src/components/bcros/businessDetails/Links.vue b/src/components/bcros/businessDetails/Links.vue index 0677c575..fb1382d4 100644 --- a/src/components/bcros/businessDetails/Links.vue +++ b/src/components/bcros/businessDetails/Links.vue @@ -173,7 +173,6 @@ const dissolveBusiness = async (): Promise => { } else { goToCreatePage('/dissolution-define-dissolution', { id: currentBusiness.value.identifier }) } - // goToCreatePage('/dissolution-define-dissolution', { id: currentBusiness.value.identifier }) resolve() } }) From e28df8838b85bd88fe8830865a0dc3793175b871 Mon Sep 17 00:00:00 2001 From: Hrvoje Fekete Date: Tue, 10 Dec 2024 16:04:54 -0800 Subject: [PATCH 3/7] 24667 - fix missing body for retrieve business information button when bootsrap business. --- src/components/bcros/filing/CommonTemplate.vue | 6 ++++-- .../bcros/filing/item/AmalgamationFiling.vue | 9 +++++---- src/components/bcros/filing/item/ContinuationIn.vue | 8 ++++---- .../bcros/filing/item/IncorporationApplication.vue | 8 ++++---- .../bcros/filing/item/RegistrationFiling.vue | 11 ++++++----- src/utils/navigate.ts | 8 +++++--- 6 files changed, 28 insertions(+), 22 deletions(-) diff --git a/src/components/bcros/filing/CommonTemplate.vue b/src/components/bcros/filing/CommonTemplate.vue index c6d8fa62..1a98cf34 100644 --- a/src/components/bcros/filing/CommonTemplate.vue +++ b/src/components/bcros/filing/CommonTemplate.vue @@ -38,7 +38,6 @@ -
@@ -107,7 +106,10 @@ if (filing.value.commentsCount && filing.value.commentsLink) { const isStatusPaid = computed(() => isFilingStatus(filing.value, FilingStatusE.PAID)) const isStatusApproved = computed(() => isFilingStatus(filing.value, FilingStatusE.APPROVED)) -const isShowBody = ref(false) + +const url = useRequestURL() +const expandedFilingId = url.searchParams.get('filing_id') +const isShowBody = ref(expandedFilingId && expandedFilingId === filing?.value?.filingId?.toString()) const showDetails = () => { if (filing.value.documents === undefined && filing.value.documentsLink) { diff --git a/src/components/bcros/filing/item/AmalgamationFiling.vue b/src/components/bcros/filing/item/AmalgamationFiling.vue index 3ffee604..b62e83f4 100644 --- a/src/components/bcros/filing/item/AmalgamationFiling.vue +++ b/src/components/bcros/filing/item/AmalgamationFiling.vue @@ -10,14 +10,15 @@
{{ $t('text.filing.amalgamation.complete') }} -

{{ currentBusinessName }} {{ $t('text.filing.amalgamation.successfullyAmalgamated') }}.

+

{{ currentBusinessName }} {{ $t('text.filing.amalgamation.successfullyAmalgamated') }}.

-

{{ $t('text.filing.amalgamation.systemCompletedProcessing') }}

+

{{ $t('text.filing.amalgamation.systemCompletedProcessing') }}

@@ -40,5 +41,5 @@ const props = defineProps({ filing: { type: Object as PropType, required: true } }) -const tempRegNumber = !!sessionStorage.getItem('TEMP_REG_NUMBER') +const { isBootstrapFiling } = storeToRefs(useBcrosBusinessBootstrap()) diff --git a/src/components/bcros/filing/item/ContinuationIn.vue b/src/components/bcros/filing/item/ContinuationIn.vue index 7cc1fdc3..21be7636 100644 --- a/src/components/bcros/filing/item/ContinuationIn.vue +++ b/src/components/bcros/filing/item/ContinuationIn.vue @@ -31,10 +31,10 @@
-
+
{{ $t('text.filing.continuation.incorporationComplete') }} -

{{ currentBusinessName }} {{ $t('text.filing.continuation.hasBeenSuccessfullyContinuedIn') }}

-

{{ $t('text.filing.common.systemCompletedProcessingFiling') }}

+

{{ currentBusinessName }} {{ $t('text.filing.continuation.hasBeenSuccessfullyContinuedIn') }}

+

{{ $t('text.filing.common.systemCompletedProcessingFiling') }}

@@ -54,5 +54,5 @@ const props = defineProps({ const isStatusRejected = isFilingStatus(props.filing, FilingStatusE.REJECTED) const isStatusCompleted = isFilingStatus(props.filing, FilingStatusE.COMPLETED) -const tempRegNumber = !!sessionStorage.getItem('TEMP_REG_NUMBER') +const { isBootstrapFiling } = storeToRefs(useBcrosBusinessBootstrap()) diff --git a/src/components/bcros/filing/item/IncorporationApplication.vue b/src/components/bcros/filing/item/IncorporationApplication.vue index e264fa19..23f081ad 100644 --- a/src/components/bcros/filing/item/IncorporationApplication.vue +++ b/src/components/bcros/filing/item/IncorporationApplication.vue @@ -11,15 +11,15 @@