Uxa and Qa Items

bcgov · Oct 18, 2024 · e8223b0 · e8223b0
1 parent 2eb8da3
commit e8223b0
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 9 deletions.
diff --git a/ppr-ui/package-lock.json b/ppr-ui/package-lock.json
diff --git a/ppr-ui/package.json b/ppr-ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ppr-ui",
-  "version": "3.2.65",
+  "version": "3.2.65a",
   "private": true,
   "appName": "Assets UI",
   "sbcName": "SBC Common Components",

diff --git a/ppr-ui/src/components/mhrRegistration/ReviewConfirm/HomeLocationReview.vue b/ppr-ui/src/components/mhrRegistration/ReviewConfirm/HomeLocationReview.vue
@@ -615,10 +615,15 @@
               Tax Certificate <br>Expiry Date
             </v-col>
             <v-col cols="9">
-              {{ isExtendChangeLocationActive
-                ? convertDateToLongFormat(getMhrTransportPermit.newLocation.taxExpiryDate)
-                : convertDateToLongFormat(homeLocationInfo.taxExpiryDate)
-              }}
+              <p v-if="getMhrTransportPermitHomeLocation.waiveCertificate">
+                Certificate requirement waived
+              </p>
+              <span v-else>
+                {{ isExtendChangeLocationActive
+                  ? convertDateToLongFormat(getMhrTransportPermit.newLocation.taxExpiryDate)
+                  : convertDateToLongFormat(homeLocationInfo.taxExpiryDate)
+                }}
+              </span>
             </v-col>
           </v-row>
         </template>
@@ -749,7 +754,8 @@ export default defineComponent({
       currentPadNumber: homeLocationInfo.pad,
       newTransportPermitPadNumber: '',
       showTaxCertificateExpiryDate: isNotManufacturersLot.value && !isMovingWithinSamePark.value &&
-        (homeLocationInfo.taxCertificate || getMhrTransportPermit.value?.newLocation?.taxCertificate),
+        (homeLocationInfo.taxCertificate || getMhrTransportPermit.value?.newLocation?.taxCertificate ||
+          getMhrTransportPermitHomeLocation.value?.waiveCertificate),
       isNewPadNumberValid: false,
       amendedBadgeLocationType: {
         baseline: getMhrOriginalTransportPermitHomeLocation.value,
@@ -883,6 +889,7 @@ export default defineComponent({
       showUpdatedBadge,
       getMhrTransportPermit,
       isExemptionWithActiveTransportPermit,
+      getMhrTransportPermitHomeLocation,
       ...toRefs(localState)
     }
   }

diff --git a/ppr-ui/src/components/mhrTransfers/TaxCertificate.vue b/ppr-ui/src/components/mhrTransfers/TaxCertificate.vue
@@ -73,6 +73,7 @@ watch(() => props.validate, async () => {
 
 watch(() => state.certificateWaived, async (val: boolean) => {
   if (val){
+    emit('setStoreProperty', '')
     expiryDatePickerRef.value.clearDate()
     await nextTick()
     expiryDatePickerRef.value?.validate()

diff --git a/ppr-ui/src/views/mhrInformation/MhrInformation.vue b/ppr-ui/src/views/mhrInformation/MhrInformation.vue
@@ -276,7 +276,8 @@
                   class="submitting-party"
                 >
                   <ContactInformation
-                    :contactInfo="(isChangeLocationActive || isCancelChangeLocationActive)
+                    :contactInfo="(isChangeLocationActive || isCancelChangeLocationActive ||
+                      isExtendChangeLocationActive)
                       ? getMhrTransportPermit.submittingParty
                       : getMhrAccountSubmittingParty"
                     :sectionNumber="1"