28609 - Price list - update design pricing columns

app/pages/product-fees.vue

@@ -20,13 +20,14 @@ interface ProductFee {
   corpType: string
   corpTypeDescription: string
   fee: number | string
+  feeGst: number
   filingType: string
   productCode: string
   service: string
   serviceCharge: number
-  gst: number
-  total: number | string
-  variable: boolean
+  serviceChargeGst: number
+  total?: number | string
+  variable: boolean | null
   url?: string
 }
 
@@ -41,16 +42,18 @@ function groupAndTotalProducts(inputProducts: ProductFee[]): GroupedProductFee[]
     const {
       service,
       fee,
+      feeGst,
       serviceCharge,
-      gst,
+      serviceChargeGst,
       url,
       productCode,
       corpType,
       corpTypeDescription,
       filingType,
       variable
     } = currentItem
-    const total = typeof fee === 'string' ? fee : fee + serviceCharge + gst
+
+    const total = calculateTotal(fee, feeGst, serviceCharge, serviceChargeGst)
 
     let serviceString = corpTypeDescription + ' - ' + service
     if (variable) {
@@ -59,8 +62,9 @@ function groupAndTotalProducts(inputProducts: ProductFee[]): GroupedProductFee[]
     const productFee: ProductFee = {
       service: serviceString,
       fee,
+      feeGst,
       serviceCharge,
-      gst,
+      serviceChargeGst,
       total,
       url,
       filingType,
@@ -92,6 +96,9 @@ function groupAndTotalProducts(inputProducts: ProductFee[]): GroupedProductFee[]
 
 const groupedProducts = computed(() => groupAndTotalProducts(productsRaw.value))
 
+const calculateTotal = (fee: number | string, feeGst: number, serviceCharge: number, serviceChargeGst: number) =>
+  typeof fee === 'string' ? fee : fee + feeGst + serviceCharge + serviceChargeGst
+
 const formatCurrency = (value: number | null | undefined) =>
   new Intl.NumberFormat('en-CA', { style: 'currency', currency: 'CAD' })
     .format(value ?? 0)
@@ -123,24 +130,32 @@ const serviceColumns = [
   },
   {
     accessorKey: 'fee',
-    header: textHeader(t('page.productFees.table.header.fee'), 'right'),
+    header: textHeader(t('page.productFees.table.header.statutoryFee'), 'right'),
     cell: currencyCell('fee'),
     meta: {
       class: { td: 'w-[170px]' }
     }
   },
+  {
+    accessorKey: 'feeGst',
+    header: textHeader(t('page.productFees.table.header.statutoryFeeGst'), 'right'),
+    cell: currencyCell('feeGst'),
+    meta: {
+      class: { td: 'w-[170px]' }
+    }
+  },
   {
     accessorKey: 'serviceCharge',
-    header: textHeader(t('page.productFees.table.header.serviceCharge'), 'right'),
+    header: textHeader(t('page.productFees.table.header.serviceFee'), 'right'),
     cell: currencyCell('serviceCharge'),
     meta: {
       class: { td: 'w-[170px]' }
     }
   },
   {
-    accessorKey: 'gst',
-    header: textHeader(t('page.productFees.table.header.gst'), 'right'),
-    cell: currencyCell('gst'),
+    accessorKey: 'serviceChargeGst',
+    header: textHeader(t('page.productFees.table.header.serviceFeeGst'), 'right'),
+    cell: currencyCell('serviceChargeGst'),
     meta: {
       class: { td: 'w-[170px]' }
     }

i18n/locales/en-CA.ts

@@ -322,9 +322,10 @@ export default {
       table: {
         header: {
           service: 'Description',
-          fee: 'Fee',
-          serviceCharge: 'Service Charge',
-          gst: 'GST',
+          statutoryFee: 'Statutory Fee',
+          statutoryFeeGst: 'Statutory Fee GST',
+          serviceFee: 'Service Fee',
+          serviceFeeGst: 'Service Fee GST',
           total: 'Total'
         }
       }

i18n/locales/fr-CA.ts

@@ -318,9 +318,10 @@ export default {
       table: {
         header: {
           service: 'Service',
-          fee: 'Frais',
-          serviceCharge: 'Frais de Service',
-          gst: 'TPS',
+          statutoryFee: 'Frais statutaires',
+          statutoryFeeGst: 'TPS frais statutaires',
+          serviceFee: 'Frais de service',
+          serviceFeeGst: 'TPS frais de service',
           total: 'Total'
         }
       }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "bc-registry",
-  "version": "3.0.20",
+  "version": "3.0.21",
   "private": true,
   "type": "module",
   "scripts": {