22561 Update ledger body for FE IA / Amalgamation / Continuation In / etc

.env.example

@@ -37,3 +37,5 @@ VUE_APP_SENTRY_TRACE_SAMPLE_RATE="1.0"
 
 #vaults hotjar
 VUE_APP_HOTJAR_ID=
+
+VUE_APP_NOTICE_OF_WITHDRAWAL_FORM_URL="https://www2.gov.bc.ca/assets/gov/employment-business-and-economic-development/business-management/permits-licences-and-registration/registries-forms/form_19_-_notice_of_withdrawal.pdf"

devops/vaults.env

@@ -14,6 +14,7 @@ VUE_APP_REGISTRY_HOME_URL="op://web-url/$APP_ENV/registry/REGISTRY_HOME_URL"
 VUE_APP_AUTH_WEB_URL="op://web-url/$APP_ENV/auth-web/AUTH_WEB_URL"
 VUE_APP_BUSINESSES_URL="op://web-url/$APP_ENV/business/BUSINESSES_URL"
 VUE_APP_BUSINESS_CREATE_URL="op://web-url/$APP_ENV/business-create/BUSINESS_CREATE_URL"
+VUE_APP_NOTICE_OF_WITHDRAWAL_FORM_URL="op://web-url/$APP_ENV/bcregistry/NOTICE_OF_WITHDRAWAL_FORM_URL"
 
 # vaults API
 VUE_APP_PAY_API_URL="op://API/$APP_ENV/pay-api/PAY_API_URL"

nuxt.config.ts

@@ -65,7 +65,8 @@ export default defineNuxtConfig({
       requireLogin: true,
       version: process.env.npm_package_version || '',
       appName: process.env.npm_package_name || '',
-      appNameDisplay: 'BCROS Business Dashboard'
+      appNameDisplay: 'BCROS Business Dashboard',
+      noticeOfWithdrawalFormURL: `${process.env.VUE_APP_NOTICE_OF_WITHDRAWAL_FORM_URL || ''}`
     }
   }
 })

package.json

@@ -2,7 +2,7 @@
   "name": "bcros-business-dashboard",
   "private": true,
   "type": "module",
-  "version": "1.0.5",
+  "version": "1.0.6",
   "scripts": {
     "build": "nuxt generate",
     "build:local": "nuxt build",

src/components/bcros/ContactInfo.vue

@@ -10,7 +10,7 @@
         data-cy="contact-icon"
       />
       <label class="px-2" data-cy="contact-label">{{ contact.label }}:</label>
-      <a class="text-blue-500" :href="contact.href" data-cy="contact-value">{{ contact.value }}</a>
+      <a class="text-blue-500 underline" :href="contact.href" data-cy="contact-value">{{ contact.value }}</a>
     </li>
   </ul>
 </template>

src/components/bcros/filing/CommonTemplate.vue

@@ -34,7 +34,7 @@
       </div>
       <div class="ml-auto order-2">
         <slot name="actions">
-          <BcrosFilingCommonHeaderActions v-model:isExpanded="isShowBody" v-model:filing="filing" />
+          <BcrosFilingCommonHeaderActions v-model:is-expanded="isShowBody" v-model:filing="filing" />
         </slot>
       </div>
     </div>

src/components/bcros/filing/common/filedAnd/PendingCoa.vue

@@ -4,35 +4,13 @@
       {{ $t('text.filing.filedAndPending') }}
       <BcrosFilingCommonFiledLabel :filing="filing" />
     </span>
-    <BcrosTooltip
-      :text="tooltipText"
-      :popper="{
-        placement: 'top',
-        arrow: true
-      }"
-    >
-      <UIcon class="text-orange-500" name="i-mdi-alert" />
-    </BcrosTooltip>
   </div>
 </template>
 
 <script setup lang="ts">
 import type { ApiResponseFilingI } from '~/interfaces/filing-i'
 
-const t = useNuxtApp().$i18n.t
-
-const props = defineProps({
+defineProps({
   filing: { type: Object as PropType<ApiResponseFilingI>, required: true }
 })
-
-/** The effective date-time of this filing. */
-const effectiveDateTime = computed((): string =>
-  props.filing.effectiveDate
-    ? dateToPacificDateTime(new Date(props.filing.effectiveDate))
-    : '[unknown]'
-)
-
-const tooltipText = computed(() =>
-  `${t('tooltip.pendingAddressChange').replace('COA_EFFECTIVE_DATE', effectiveDateTime.value)}`
-)
 </script>

src/components/bcros/filing/common/futureEffective/Paid.vue

@@ -4,11 +4,12 @@
     <span v-else-if="isTypeContinuationApplication">{{ $t('text.filing.futureEffectiveContinuation') }}</span>
     <span v-else-if="isTypeAlteration">{{ $t('text.filing.futureEffectiveAlteration') }}</span>
     <span v-else-if="isTypeDissolutionVoluntary">{{ $t('text.filing.futureEffectiveDissolution') }}</span>
+    <span v-else-if="isTypeAmalgamation">{{ $t('text.filing.futureEffectiveAmalgamation') }}</span>
     <span v-else>{{ $t('text.filing.futureEffectiveFiling') }}</span>
+    <BcrosDivider class="mx-2" />
     <span>
-      {{ ' ' + $t('text.filing.paid') }}
+      {{ $t('text.filing.paid') + ' ' }}
     </span>
-    <BcrosDivider class="mx-2" />
     <BcrosFilingCommonFiledLabel :filing="filing" />
   </div>
 </template>
@@ -33,4 +34,7 @@ const isTypeAlteration = computed(() => isFilingType(props.filing, FilingTypes.A
 /** Whether this is a voluntary dissolution. */
 const isTypeDissolutionVoluntary = computed(() =>
   isFilingType(props.filing, undefined, FilingSubTypeE.DISSOLUTION_VOLUNTARY))
+
+/** Whether this is an amalgamation. */
+const isTypeAmalgamation = computed(() => isFilingType(props.filing, FilingTypes.AMALGAMATION_APPLICATION))
 </script>

src/components/bcros/filing/common/futureEffective/index.vue

@@ -1,15 +1,13 @@
 <script setup lang="ts">
-import { FilingTypes, FilingNames } from '@bcrs-shared-components/enums'
+import { FilingTypes } from '@bcrs-shared-components/enums'
 
 const prop = defineProps({
   filing: { type: Object as PropType<ApiResponseFilingI>, required: true }
 })
 const contacts = getContactInfo('registries')
-const { currentBusinessName } = storeToRefs(useBcrosBusiness())
 
 const subtitle: Ref<string> = ref()
 const filingLabel: Ref<string> = ref()
-const filingTitle: Ref<string> = ref()
 
 const courtOrderNumber = computed(() =>
   prop.filing.data?.order?.fileNumber
@@ -24,49 +22,46 @@ const effectiveDateTime = computed(() =>
 )
 
 watch(prop.filing, () => {
+  subtitle.value = 'Future Effective Date'
   switch (prop.filing.name) {
-    case FilingTypes.INCORPORATION_APPLICATION:
-      subtitle.value = 'Future Effective Incorporation Date'
-      filingLabel.value = 'incorporation'
-      filingTitle.value = FilingNames.INCORPORATION_APPLICATION as string
-      break
     case FilingTypes.ALTERATION:
-      subtitle.value = 'Future Effective Alteration Date'
       filingLabel.value = 'alteration'
-      filingTitle.value = 'Alteration Notice'
+      break
+    case FilingTypes.CHANGE_OF_ADDRESS:
+      subtitle.value = 'Filed and Pending'
+      filingLabel.value = 'address change'
+      break
+    case FilingTypes.AMALGAMATION_APPLICATION:
+      filingLabel.value = 'amalgamation'
       break
     case FilingTypes.DISSOLUTION:
       // check if the filing is a voluntary dissolution
       if (prop.filing.filingSubType === FilingSubTypeE.DISSOLUTION_VOLUNTARY) {
-        subtitle.value = 'Future Effective Voluntary Dissolution Date'
         filingLabel.value = 'dissolution'
-        filingTitle.value = FilingNames.VOLUNTARY_DISSOLUTION
       }
       break
     case FilingTypes.CONTINUATION_IN:
-      subtitle.value = 'Future Effective Continuation Date'
-      filingLabel.value = 'filing'
-      filingTitle.value = FilingNames.CONTINUATION_IN_APPLICATION
+      filingLabel.value = 'continuation'
+      break
+    case FilingTypes.INCORPORATION_APPLICATION:
+      filingLabel.value = 'incorporation'
       break
     default:
-      subtitle.value = 'Future Effective Filing Date'
       filingLabel.value = 'filing'
-      filingTitle.value = 'filing'
       break
   }
 }, { immediate: true })
 </script>
 
 <template>
-  <div class="flex flex-col gap-3">
-    <UDivider class="mt-6" />
+  <div class="flex flex-col gap-2">
+    <UDivider class="mt-4" />
     <div class="font-bold mt-3">
       {{ subtitle }}
     </div>
 
     <p>
-      The {{ filingLabel }} date and time for {{ currentBusinessName || 'this company' }}
-      will be <strong>{{ effectiveDateTime }}</strong>.
+      The {{ filingLabel }} will take effect on <strong>{{ effectiveDateTime }}</strong>.
     </p>
 
     <p v-if="courtOrderNumber">
@@ -78,13 +73,22 @@ watch(prop.filing, () => {
     </p>
 
     <p>
-      If you wish to change the information in this {{ filingLabel }}, you must contact BC
-      Registries staff to file a withdrawal. Withdrawing this {{ filingTitle }} will remove
-      this {{ filingLabel }} and all associated information, and will incur a $20.00 fee.
+      If you no longer wish to file this {{ filingLabel }}, you must submit a
+      <a
+        :href="useRuntimeConfig().public.noticeOfWithdrawalFormURL"
+        target="_blank"
+        class="text-primary underline"
+      >
+        Notice of Withdrawal Form
+        <UIcon name="i-mdi-open-in-new" class="text-primary align-middle" />
+      </a> and a $20.00 fee to BC Registries. You must provide BC Registries
+      with enough time to process the withdrawal before the effective date and time.
+      If you withdraw this record, your filing fees will not be refunded.
     </p>
 
-    <div class="font-bold">
-      BC Registries Contact Information:
+    <div class="font-bold mt-4">
+      BC Registries Contact Information
+      <p>Monday to Friday, 8:30am - 4:30pm Pacific Time</p>
     </div>
 
     <BcrosContactInfo :contacts="contacts" />

src/components/bcros/filing/item/ChangeOfAddress.vue

@@ -5,9 +5,7 @@
     </template>
 
     <template #body>
-      <div v-if="isFutureEffective">
-        <!-- no body in this case -->
-      </div>
+      <BcrosFilingCommonFutureEffective v-if="isFutureEffective" :filing="filing" />
     </template>
   </BcrosFilingCommonTemplate>
 </template>

src/lang/en.json

@@ -380,6 +380,7 @@
       "futureEffectiveContinuation": "FUTURE EFFECTIVE",
       "futureEffectiveAlteration": "FUTURE EFFECTIVE ALTERATION",
       "futureEffectiveDissolution": "FUTURE EFFECTIVE DISSOLUTION",
+      "futureEffectiveAmalgamation": "FUTURE EFFECTIVE AMALGAMATION",
       "futureEffectiveFiling": "FUTURE EFFECTIVE FILING",
       "completeYourFilingToDisplay": "Complete your filing to display",
       "youHaveNoFilingHistory": "You have no filing history",