Skip to content
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
2 changes: 0 additions & 2 deletions app/enums/product-display.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import { ProductCode } from './product-code'

export const productDisplay = {
[ProductCode.BCA]: 'BC Assessment',
[ProductCode.BUSINESS]: 'Business Registry & Name Request',
[ProductCode.BUSINESS_SEARCH]: 'Business and Person Search',
[ProductCode.CSO]: 'Court Services Online',
Expand All @@ -10,6 +9,5 @@ export const productDisplay = {
[ProductCode.PPR]: 'Personal Property Registry',
[ProductCode.RPPR]: 'Restricted Personal Property Registry',
[ProductCode.RPT]: 'Rural Property Tax',
[ProductCode.STRR]: 'Short-Term Rental Registry',
[ProductCode.VS]: 'Wills Registry'
}
37 changes: 29 additions & 8 deletions app/pages/product-fees.vue
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
<script setup lang="ts">
import { productDisplay } from '~/enums/product-display'
import { ProductCode } from '~/enums/product-code'

const { locale, t } = useI18n()
const rtc = useRuntimeConfig().public
const { setLoginRedirectUrl, clearLogoutRedirectUrl } = useKeycloak()
const localePath = useLocalePath()
const ldStore = useConnectLaunchdarklyStore()

useHead({
title: t('page.productFees.title')
Expand All @@ -24,6 +26,7 @@
serviceCharge: number
gst: number
total: number | string
variable: boolean
url?: string
}

Expand All @@ -44,12 +47,17 @@
productCode,
corpType,
corpTypeDescription,
filingType
filingType,
variable
} = currentItem
const total = typeof fee === 'string' ? fee : fee + serviceCharge + gst

let serviceString = corpTypeDescription + ' - ' + service
if (variable) {
serviceString += '*'
}
const productFee: ProductFee = {
service: corpTypeDescription + ' - ' + service,
service: serviceString,
fee,
serviceCharge,
gst,
Expand All @@ -58,7 +66,8 @@
filingType,
productCode,
corpType,
corpTypeDescription
corpTypeDescription,
variable
}

if (!accumulator[productCode]) {
Expand Down Expand Up @@ -105,7 +114,7 @@
cell: ({ row }: { row: { original: { service: string, url?: string } } }) => {
if (row.original.url) {
return h('div', {
innerHTML: `<a href="${row.original.url}"
innerHTML: `<a href="${row.original.url}"
target="_blank" class="underline text-bcGovColor-markBlue">${row.original.service}</a>` })
} else {
return h('div', row.original.service)
Expand Down Expand Up @@ -172,7 +181,8 @@

onMounted(async () => {
try {
const response = await fetch(`${rtc.payApiURL}/fees`, {
const apiURL = ldStore.getStoredFlag('override-price-list-api-url') || rtc.payApiURL
const response = await fetch(`${apiURL}/fees`, {
method: 'GET',
headers: {
'Content-Type': 'application/json',
Expand Down Expand Up @@ -225,7 +235,7 @@
body: 'p-4 sm:px-7 sm:pt-7 sm:pb-0 pb-0 grow',
footer: 'p-4 sm:pb-7 sm:px-7'
}"
class="mb-10"
class="mb-2"
>
<template #header>
<div class="flex justify-between pl-7 pr-4 font-bold">
Expand All @@ -249,7 +259,7 @@
}"
/>
</UCard>
<p><strong>{{ t('page.productFees.note') }}</strong> {{ t('page.productFees.noteContent') }} </p>
<p> {{ t('page.productFees.variableFeeNote') }} </p>
<!-- iterate over the grouped products and display them in a card -->
<UCard
v-for="(product, index) in filteredProducts"
Expand All @@ -270,12 +280,23 @@
</span>
</div>
</template>

<p v-if="ProductCode.BUSINESS == product.name"

Check warning on line 283 in app/pages/product-fees.vue

View workflow job for this annotation

GitHub Actions / bcregistry-ui-ci / linting-pnpm (20.15.0, 9)

Expected a linebreak before this attribute
class="text-sm">

Check warning on line 284 in app/pages/product-fees.vue

View workflow job for this annotation

GitHub Actions / bcregistry-ui-ci / linting-pnpm (20.15.0, 9)

Expected 1 line break before closing bracket, but no line breaks found
{{ t('page.productFees.noteContent') }}
</p>
<UTable
:data="product.productFees"
:columns="serviceColumns"
class="product-fees-table"
/>
</UCard>
</div>
</div>
</template>

<style scoped>
:deep(.product-fees-table th),
:deep(.product-fees-table td) {
padding-left: 0 !important;
}
</style>
7 changes: 4 additions & 3 deletions i18n/locales/en-CA.ts
Original file line number Diff line number Diff line change
Expand Up @@ -312,15 +312,16 @@ export default {
title: 'Product Fees - BC Registries and Online Services',
h1: 'Product Fees',
p1: 'An overview of fees associated with products on Service BC Connect.',
p2: 'Refunds will not be processed for amounts under $10 unless specifically requested by the client. GST is not charged. Fees are subject to change.',
p2: 'Refunds will not be processed for amounts under $10 unless specifically requested by the client. Fees are subject to change.',
header: 'View Fees by Product Type',
selectTitle: 'Choose a product to view fees by product type:',
selectDefault: 'All Products',
note:'Note:',
noteContent: 'A priority fee or future effective fee adds an extra $100.00 to the total cost.',
variableFeeNote: 'Fees indicated with an asterisk (*) in the description have a variable amount and may differ from the amount shown.',
table: {
header: {
service: 'Service',
service: 'Description',
fee: 'Fee',
serviceCharge: 'Service Charge',
gst: 'GST',
Expand All @@ -346,4 +347,4 @@ export default {
strongWithProps: 'This should have {boldStart} bold {boldEnd} text and allow a {prop}'
}
}
}
}
5 changes: 3 additions & 2 deletions i18n/locales/fr-CA.ts
Original file line number Diff line number Diff line change
Expand Up @@ -308,12 +308,13 @@ export default {
title: 'Frais de Produit - Registres et services en ligne de la Colombie-Britannique',
h1: 'Frais de Produit',
p1: 'Un aperçu des frais associés aux produits sur Service BC Connect.',
p2: "Les remboursements ne seront pas traités pour les montants inférieurs à 10 $, sauf demande expresse du client. La TPS n'est pas facturée. Les frais sont sujets à changement.",
p2: "Les remboursements ne seront pas traités pour les montants inférieurs à 10 $, sauf demande expresse du client. Les frais sont sujets à changement.",
header: 'Afficher les frais par type de produit',
selectTitle: 'Choisissez un produit pour afficher les frais par type de produit:',
selectDefault: 'Tous les produits',
note:'Note:',
noteContent: 'Des frais prioritaires ou des frais futurs ajoutent 100,00 $ supplémentaires au coût total.',
variableFeeNote: 'Les frais signalés par un astérisque (*) dans la description ont un montant variable et peuvent différer du montant affiché.',
table: {
header: {
service: 'Service',
Expand All @@ -335,4 +336,4 @@ export default {
ConnectBreadcrumb: {
default: 'BC Registries et Services en Ligne'
}
}
}
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "bc-registry",
"version": "3.0.10",
"version": "3.0.11",
"private": true,
"type": "module",
"scripts": {
Expand Down
Loading