diff --git a/ppr-ui/package-lock.json b/ppr-ui/package-lock.json index 2ffce949f..f6decdffd 100644 --- a/ppr-ui/package-lock.json +++ b/ppr-ui/package-lock.json @@ -1,12 +1,12 @@ { "name": "ppr-ui", - "version": "3.2.62", + "version": "3.2.63", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "ppr-ui", - "version": "3.2.62", + "version": "3.2.63", "dependencies": { "@bcrs-shared-components/input-field-date-picker": "^1.0.0", "@lemoncode/fonk": "^1.5.1", diff --git a/ppr-ui/package.json b/ppr-ui/package.json index 83b1728ef..a83d3c1c1 100644 --- a/ppr-ui/package.json +++ b/ppr-ui/package.json @@ -1,6 +1,6 @@ { "name": "ppr-ui", - "version": "3.2.62", + "version": "3.2.63", "private": true, "appName": "Assets UI", "sbcName": "SBC Common Components", diff --git a/ppr-ui/src/assets/svgs/IconExtend.svg b/ppr-ui/src/assets/svgs/IconExtend.svg index a00070c7f..6b887e6ac 100644 --- a/ppr-ui/src/assets/svgs/IconExtend.svg +++ b/ppr-ui/src/assets/svgs/IconExtend.svg @@ -1,4 +1,4 @@ - + diff --git a/ppr-ui/src/assets/svgs/newPermit.svg b/ppr-ui/src/assets/svgs/NewPermit.svg similarity index 87% rename from ppr-ui/src/assets/svgs/newPermit.svg rename to ppr-ui/src/assets/svgs/NewPermit.svg index ba5560292..285fd826c 100644 --- a/ppr-ui/src/assets/svgs/newPermit.svg +++ b/ppr-ui/src/assets/svgs/NewPermit.svg @@ -1,3 +1,3 @@ - + diff --git a/ppr-ui/src/components/common/InfoChip.vue b/ppr-ui/src/components/common/InfoChip.vue index 798b09d3c..3e82c0ce0 100644 --- a/ppr-ui/src/components/common/InfoChip.vue +++ b/ppr-ui/src/components/common/InfoChip.vue @@ -40,6 +40,7 @@ export default defineComponent({ case 'HISTORICAL': case 'CANCELLED': case 'VOID': + case 'COMPLETED': return { bgColor: 'grey-lighten-2' } case 'LIEN': case 'LOCKED': diff --git a/ppr-ui/src/components/mhrRegistration/ReviewConfirm/HomeLocationReview.vue b/ppr-ui/src/components/mhrRegistration/ReviewConfirm/HomeLocationReview.vue index 469121e9f..4ceef03c8 100644 --- a/ppr-ui/src/components/mhrRegistration/ReviewConfirm/HomeLocationReview.vue +++ b/ppr-ui/src/components/mhrRegistration/ReviewConfirm/HomeLocationReview.vue @@ -41,16 +41,38 @@ /> +
+
+ + mdi-map-marker + + +

+ Current Registered Location +

+
+ +
+
@@ -87,7 +109,8 @@ !isChangeLocationActive && !isCorrectionReview && !isPrevTransportPermitLocation && - !isCancelTransportPermitReview) || isExtendChangeLocationActive" + !isCancelTransportPermitReview && + !isCreateNewPermit) || isExtendChangeLocationActive" :isCancelledLocation="isCancelledTransportPermitDetails" :isVoidPermit="isExemptionWithActiveTransportPermit" :infoText="exemptionWithActivePermitText" @@ -461,7 +484,10 @@ - + - + @@ -533,6 +563,7 @@ @@ -659,6 +690,10 @@ export default defineComponent({ isExtendChangeLocationReview: { type: Boolean, default: false + }, + isCreateNewPermit: { + type: Boolean, + default: false } }, setup (props) { @@ -689,6 +724,7 @@ export default defineComponent({ const countryProvincesHelpers = useCountriesProvinces() const { required, notEqualTo, customRules } = useInputRules() const { + isNewPermitActive, hasActiveTransportPermit, isChangeLocationActive, isAmendLocationActive, @@ -702,9 +738,9 @@ export default defineComponent({ const { isExemptionWithActiveTransportPermit, exemptionLabel } = useExemptions() const homeLocationInfo: MhrRegistrationHomeLocationIF = - (props.isPrevTransportPermitLocation || props.isCancelTransportPermitReview || props.isExtendChangeLocationReview) + (props.isPrevTransportPermitLocation || props.isCancelTransportPermitReview) ? getMhrTransportPermitPreviousLocation.value - : props.isTransportPermitReview + : (props.isTransportPermitReview && !props.isExtendChangeLocationReview) ? getMhrTransportPermit.value.newLocation : getMhrRegistrationLocation.value @@ -824,6 +860,7 @@ export default defineComponent({ }, { immediate: true }) return { + isNewPermitActive, homeLocationInfo, newPadNumberRef, HomeLocationTypes, diff --git a/ppr-ui/src/components/mhrTransportPermit/CompletedPermitDetails.vue b/ppr-ui/src/components/mhrTransportPermit/CompletedPermitDetails.vue new file mode 100644 index 000000000..78f836515 --- /dev/null +++ b/ppr-ui/src/components/mhrTransportPermit/CompletedPermitDetails.vue @@ -0,0 +1,112 @@ + + + + diff --git a/ppr-ui/src/components/mhrTransportPermit/LocationChange.vue b/ppr-ui/src/components/mhrTransportPermit/LocationChange.vue index 7270c8ae0..4962e7dda 100644 --- a/ppr-ui/src/components/mhrTransportPermit/LocationChange.vue +++ b/ppr-ui/src/components/mhrTransportPermit/LocationChange.vue @@ -7,7 +7,7 @@ />
@@ -19,13 +19,18 @@ data-test-id="void-transport-permit-badge" />

- Transport Permit Details + Transport Permit {{ isCompletedLocation ? '' : 'Details' }}

+ @@ -83,7 +88,10 @@ }} - +
@@ -99,10 +107,12 @@ const { getMhrInformation } = storeToRefs(useStore()) // eslint-disable-next-line @typescript-eslint/no-unused-vars const props = withDefaults(defineProps<{ isCancelledLocation?: boolean, + isCompletedLocation?: boolean, isVoidPermit?: boolean, infoText?: string }>(), { isCancelledLocation: false, + isCompletedLocation: false, isVoidPermit: false, infoText: '' }) @@ -122,7 +132,7 @@ h3 { .transport-details-header { display: contents; } - dd, dt, .transport-details-header h3 { + dd, dt, .transport-details-header, .tp-header, .tp-label { opacity: 0.4; } } diff --git a/ppr-ui/src/composables/mhrInformation/useTransportPermits.ts b/ppr-ui/src/composables/mhrInformation/useTransportPermits.ts index 1972eb764..48212ea1a 100644 --- a/ppr-ui/src/composables/mhrInformation/useTransportPermits.ts +++ b/ppr-ui/src/composables/mhrInformation/useTransportPermits.ts @@ -31,6 +31,7 @@ const isChangeLocationActive: Ref = ref(false) const isAmendLocationActive: Ref = ref(false) const isCancelChangeLocationActive: Ref = ref(false) const isExtendChangeLocationActive: Ref = ref(false) +const isNewPermitActive: Ref = ref(false) export const useTransportPermits = () => { @@ -127,6 +128,11 @@ export const useTransportPermits = () => { isExtendChangeLocationActive.value = val } + /** Toggle Extend location change flow **/ + const setNewPermitChange = (val: boolean) => { + isNewPermitActive.value = val + } + const setLocationChangeType = (locationChangeType: LocationChangeTypes) => { setMhrTransportPermitLocationChangeType(locationChangeType) } @@ -235,6 +241,9 @@ export const useTransportPermits = () => { ...(isRoleQualifiedSupplier.value && { clientReferenceId: getMhrTransferAttentionReference.value || '' }), + ...(isNewPermitActive.value && { + moveCompleted: true + }), submittingParty: { ...submittingParty, phoneNumber: fromDisplayPhone(submittingParty?.phoneNumber) @@ -399,6 +408,7 @@ export const useTransportPermits = () => { initTransportPermit, resetTransportPermit, isChangeLocationActive, + isNewPermitActive, isAmendLocationActive, isCancelChangeLocationActive, isExtendChangeLocationActive, @@ -416,6 +426,7 @@ export const useTransportPermits = () => { isValueAmended, hasAmendmentChanges, setLocationChange, + setNewPermitChange, setLocationChangeType, setAmendLocationChange, setCancelLocationChange, diff --git a/ppr-ui/src/composables/userAccess/useUserAccess.ts b/ppr-ui/src/composables/userAccess/useUserAccess.ts index 4dc101549..65415dff4 100644 --- a/ppr-ui/src/composables/userAccess/useUserAccess.ts +++ b/ppr-ui/src/composables/userAccess/useUserAccess.ts @@ -360,8 +360,7 @@ export const useUserAccess = () => { let dealerManufacturerAddress: AddressIF if(isDealer) { - const dealerData: MhrQsPayloadIF = await getQualifiedSupplier() - dealerManufacturerAddress = dealerData?.address + return getMhrRegistrationLocation.value.locationType !== HomeLocationTypes.LOT } else { const manufacturerData: MhrManufacturerInfoIF = await getMhrManufacturerInfo() dealerManufacturerAddress = manufacturerData?.location?.address diff --git a/ppr-ui/src/interfaces/mhr-registration-interfaces/MhrTransportPermitIF.ts b/ppr-ui/src/interfaces/mhr-registration-interfaces/MhrTransportPermitIF.ts index 0b43332cd..c44652101 100644 --- a/ppr-ui/src/interfaces/mhr-registration-interfaces/MhrTransportPermitIF.ts +++ b/ppr-ui/src/interfaces/mhr-registration-interfaces/MhrTransportPermitIF.ts @@ -5,6 +5,7 @@ export interface MhrTransportPermitIF { documentId?: string clientReferenceId?: string attentionReference?: string + moveCompleted?: boolean submittingParty: SubmittingPartyIF, locationChangeType: LocationChangeTypes, newLocation: MhrRegistrationHomeLocationIF, diff --git a/ppr-ui/src/resources/dialogOptions/cancelDialogs.ts b/ppr-ui/src/resources/dialogOptions/cancelDialogs.ts index ba61a48ba..a0a1c424c 100644 --- a/ppr-ui/src/resources/dialogOptions/cancelDialogs.ts +++ b/ppr-ui/src/resources/dialogOptions/cancelDialogs.ts @@ -80,3 +80,12 @@ export const changeTransportPermitLocationTypeDialog: DialogOptionsIF = { text: 'Changing the Location Type will undo any changes you have made and return you to the original state.' } +export const confirmNewTransportPermit: DialogOptionsIF = { + acceptText: 'Confirm and Create New Transport Permit', + cancelText: 'Back', + title: 'Verify Transport Permit Status', + label: '', + text: 'By applying for a new transport permit you are confirming that the active Transport permit {number} issued' + + ' on {date of issue} has been completed and will render as no longer active.' +} + diff --git a/ppr-ui/src/views/Dashboard.vue b/ppr-ui/src/views/Dashboard.vue index ac7a75478..b167ffbfa 100644 --- a/ppr-ui/src/views/Dashboard.vue +++ b/ppr-ui/src/views/Dashboard.vue @@ -284,6 +284,7 @@ export default defineComponent({ setMhrDraftNumber('') useTransportPermits().setLocationChange(false) useTransportPermits().setExtendLocationChange(false) + useTransportPermits().setNewPermitChange(false) onAppReady(props.appReady) }) diff --git a/ppr-ui/src/views/mhrInformation/MhrInformation.vue b/ppr-ui/src/views/mhrInformation/MhrInformation.vue index 53a3a1b46..c167041a9 100644 --- a/ppr-ui/src/views/mhrInformation/MhrInformation.vue +++ b/ppr-ui/src/views/mhrInformation/MhrInformation.vue @@ -194,6 +194,14 @@ setMsg="This information must match the information on the bill of sale." /> + +
+ + + +
+ + + + +
- + + + + mdi-close + + Cancel New Transport Permit + + + + + extend-icon + Create New Transport Permit + + + - extend-icon + + extend-icon + Extend Transport Permit + + + + + extend-icon + + Create New Transport Permit + + + - + mdi-delete Cancel Transport Permit @@ -169,7 +250,15 @@

+ Transport permits are issued by changing the location on the manufactured home. Transport permits expire 30 days + from the date of issue. +

+ +

Cancelling the transport permit will restore the previous registered location for this home.

@@ -212,7 +301,7 @@

-