Merge pull request bcgov#43 from turb0c0w/sam/host-dashboard

adding completion chip
turb0c0w · Jul 9, 2024 · 0cb5d1a · 0cb5d1a
2 parents 97117c4 + 4909b1b
commit 0cb5d1a
Show file tree

Hide file tree

Showing 7 changed files with 48 additions and 11 deletions.
diff --git a/strr-web/components/bcros/form-section/review/Subsection.vue b/strr-web/components/bcros/form-section/review/Subsection.vue
@@ -3,14 +3,14 @@
     <div class="flex flex-row justify-between w-full desktop:mb-[40px]">
       <div class="flex flex-col w-full">
         <div class="flex flex-row justify-between w-full mb-[24px] mobile:flex-col">
-          <BcrosFormSectionReviewItem
-            :title="tContact('preferred')"
-            :content="state.preferredName ? state.preferredName: '-'"
-          />
           <BcrosFormSectionReviewItem
             :title="tContact('fullName')"
             :content="getNames()"
           />
+          <BcrosFormSectionReviewItem
+            :title="tContact('preferred')"
+            :content="state.preferredName ? state.preferredName: '-'"
+          />
           <BcrosFormSectionReviewItem
             :title="tContact('phoneNumber')"
             :content="state.phoneNumber?.toString() ?? '-'"

diff --git a/strr-web/interfaces/account-i.ts b/strr-web/interfaces/account-i.ts
@@ -51,6 +51,8 @@ export interface OrgI {
 }
 
 export interface ContactI {
+  socialInsuranceNumber: string,
+  businessNumber: string,
   dateOfBirth: string,
   details: {
     emailAddress: string,
@@ -173,7 +175,11 @@ export interface MailingAddressAPII {
   city: string,
   postalCode: string,
   province: string,
-  country: string,
+  country: string
+}
+
+export interface UnitAddressI extends MailingAddressAPII {
+  nickname: string
 }
 
 export interface ContactNameAPII {
@@ -193,6 +199,8 @@ export interface ContactAPII {
     emailAddress: string
   },
   mailingAddress: MailingAddressAPII
+  socialInsuranceNumber: string,
+  businessNumber: string
 }
 
 export interface SelectedAccountMailingAPII {
@@ -218,7 +226,7 @@ export interface CreateAccountFormAPII {
     }
     primaryContact?: ContactAPII,
     secondaryContact?: ContactAPII,
-    unitAddress: MailingAddressAPII,
+    unitAddress: UnitAddressI,
     unitDetails: {
       parcelIdentifier?: string,
       businessLicense?: string,

diff --git a/strr-web/pages/application-details/[applicationId]/auto-approval/index.vue b/strr-web/pages/application-details/[applicationId]/auto-approval/index.vue
@@ -105,7 +105,13 @@ const provisionalRows = [
 
 const getFlavour = (status: string, invoices: RegistrationI['invoices']):
   { alert: AlertsFlavourE, text: string } | undefined => {
-  if (status === 'PENDING' && invoices[0].payment_status_code === 'COMPLETED') {
+  if (invoices.length === 0) {
+    return {
+      text: tRegistrationStatus('applied'),
+      alert: AlertsFlavourE.APPLIED
+    }
+  }
+  if (invoices[0].payment_status_code === 'COMPLETED') {
     return {
       text: tRegistrationStatus('applied'),
       alert: AlertsFlavourE.APPLIED

diff --git a/strr-web/pages/application-details/[applicationId]/index.vue b/strr-web/pages/application-details/[applicationId]/index.vue
@@ -261,7 +261,13 @@ const history = await getRegistrationHistory(applicationId.toString())
 
 const getFlavour = (status: string, invoices: RegistrationI['invoices']):
   { alert: AlertsFlavourE, text: string } | undefined => {
-  if (status === 'PENDING' && invoices[0].payment_status_code === 'COMPLETED') {
+  if (invoices.length === 0) {
+    return {
+      text: tRegistrationStatus('applied'),
+      alert: AlertsFlavourE.APPLIED
+    }
+  }
+  if (invoices[0].payment_status_code === 'COMPLETED') {
     return {
       text: tRegistrationStatus('applied'),
       alert: AlertsFlavourE.APPLIED
@@ -301,6 +307,8 @@ const getContactRows = (contactBlock: ContactI) => [{
         ? contactBlock.details.extension
         : ''
       }
-    `
+    `,
+  SIN: contactBlock.socialInsuranceNumber,
+  'BN (GST)': contactBlock.businessNumber
 }]
 </script>
diff --git a/strr-web/pages/application-details/[applicationId]/ltsa/index.vue b/strr-web/pages/application-details/[applicationId]/ltsa/index.vue
@@ -137,7 +137,13 @@ const formatDate = (date: Date) => date.toLocaleDateString('en-US')
 
 const getFlavour = (status: string, invoices: RegistrationI['invoices']):
   { alert: AlertsFlavourE, text: string } | undefined => {
-  if (status === 'PENDING' && invoices[0].payment_status_code === 'COMPLETED') {
+  if (invoices.length === 0) {
+    return {
+      text: tRegistrationStatus('applied'),
+      alert: AlertsFlavourE.APPLIED
+    }
+  }
+  if (invoices[0].payment_status_code === 'COMPLETED') {
     return {
       text: tRegistrationStatus('applied'),
       alert: AlertsFlavourE.APPLIED

diff --git a/strr-web/pages/application-status.vue b/strr-web/pages/application-status.vue
@@ -109,6 +109,12 @@ registrations.value =
 
 const getFlavour = (status: string, invoices: RegistrationI['invoices']):
   { alert: AlertsFlavourE, text: string } | undefined => {
+  if (invoices.length === 0) {
+    return {
+      text: tRegistrationStatus('applied'),
+      alert: AlertsFlavourE.APPLIED
+    }
+  }
   if (invoices[0].payment_status_code === 'COMPLETED') {
     return {
       text: tRegistrationStatus('applied'),

diff --git a/strr-web/utils/formStateToApi.ts b/strr-web/utils/formStateToApi.ts
@@ -31,6 +31,8 @@ export const formStateToApi = (
             ? formState.secondaryContact?.lastName
             : '-'
     }
+    dataContact.socialInsuranceNumber = stateContact.socialInsuranceNumber ?? ''
+    dataContact.businessNumber = stateContact.businessNumber ?? ''
     dataContact.dateOfBirth = `${stateContact.birthYear}-${stateContact.birthMonth}-${stateContact.birthDay}`
     dataContact.details = {
       preferredName: stateContact.preferredName,
@@ -68,7 +70,8 @@ export const formStateToApi = (
     city: formState.propertyDetails.city ?? '',
     postalCode: formState.propertyDetails.postalCode ?? '',
     province: formState.propertyDetails.province ?? '',
-    country: formState.propertyDetails.country ?? ''
+    country: formState.propertyDetails.country ?? '',
+    nickname: formState.propertyDetails.nickname ?? ''
   }
   formData.registration.unitDetails = {
     parcelIdentifier: formState.propertyDetails.parcelIdentifier,