From 46e8dada6623abe91eca24b271dea629b0463acc Mon Sep 17 00:00:00 2001 From: Cameron Bowler Date: Wed, 9 Oct 2024 10:16:48 -0700 Subject: [PATCH 1/3] Refactor Dealer TP Location Restrictions --- ppr-ui/package-lock.json | 4 ++-- ppr-ui/package.json | 2 +- ppr-ui/src/composables/userAccess/useUserAccess.ts | 5 ++--- ppr-ui/src/views/mhrInformation/MhrInformation.vue | 4 ++-- 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/ppr-ui/package-lock.json b/ppr-ui/package-lock.json index c26b26d7c..8246130f2 100644 --- a/ppr-ui/package-lock.json +++ b/ppr-ui/package-lock.json @@ -1,12 +1,12 @@ { "name": "ppr-ui", - "version": "3.2.61", + "version": "3.2.61a", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "ppr-ui", - "version": "3.2.61", + "version": "3.2.61a", "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 a9c4756aa..71c85da07 100644 --- a/ppr-ui/package.json +++ b/ppr-ui/package.json @@ -1,6 +1,6 @@ { "name": "ppr-ui", - "version": "3.2.61", + "version": "3.2.61a", "private": true, "appName": "Assets UI", "sbcName": "SBC Common Components", diff --git a/ppr-ui/src/composables/userAccess/useUserAccess.ts b/ppr-ui/src/composables/userAccess/useUserAccess.ts index 4dc101549..3bc758708 100644 --- a/ppr-ui/src/composables/userAccess/useUserAccess.ts +++ b/ppr-ui/src/composables/userAccess/useUserAccess.ts @@ -22,7 +22,7 @@ import { import { ApiHomeTenancyTypes, HomeLocationTypes, - HomeOwnerPartyTypes, + HomeOwnerPartyTypes, LocationChangeTypes, MhrSubTypes, ProductCode, ProductStatus, @@ -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/views/mhrInformation/MhrInformation.vue b/ppr-ui/src/views/mhrInformation/MhrInformation.vue index 2c41fb609..3e41d4223 100644 --- a/ppr-ui/src/views/mhrInformation/MhrInformation.vue +++ b/ppr-ui/src/views/mhrInformation/MhrInformation.vue @@ -1075,11 +1075,11 @@ export default defineComponent({ case isRoleManufacturer.value: localState.disableRoleBaseTransfer = await disableDealerManufacturerTransfer() localState.disableRoleBaseLocationChange = await disableDealerManufacturerLocationChange() - break; + break case isRoleQualifiedSupplierHomeDealer.value: localState.disableRoleBaseTransfer = await disableDealerManufacturerTransfer(true) localState.disableRoleBaseLocationChange = await disableDealerManufacturerLocationChange(true) - break; + break } if ((isRoleQualifiedSupplier.value || isRoleStaffSbc.value) && !isRoleStaffReg.value) { From d5c5dab35f4f04266e8c5f68eb03ab508338a817 Mon Sep 17 00:00:00 2001 From: Cameron Bowler Date: Wed, 9 Oct 2024 10:20:22 -0700 Subject: [PATCH 2/3] minor clean up --- ppr-ui/src/composables/userAccess/useUserAccess.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ppr-ui/src/composables/userAccess/useUserAccess.ts b/ppr-ui/src/composables/userAccess/useUserAccess.ts index 3bc758708..65415dff4 100644 --- a/ppr-ui/src/composables/userAccess/useUserAccess.ts +++ b/ppr-ui/src/composables/userAccess/useUserAccess.ts @@ -22,7 +22,7 @@ import { import { ApiHomeTenancyTypes, HomeLocationTypes, - HomeOwnerPartyTypes, LocationChangeTypes, + HomeOwnerPartyTypes, MhrSubTypes, ProductCode, ProductStatus, From 343539aae85b7d4e3b0b6312cf419f922a24b319 Mon Sep 17 00:00:00 2001 From: Cameron Bowler Date: Wed, 9 Oct 2024 11:21:10 -0700 Subject: [PATCH 3/3] Note text logic update --- ppr-ui/src/views/mhrInformation/MhrTransportPermit.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ppr-ui/src/views/mhrInformation/MhrTransportPermit.vue b/ppr-ui/src/views/mhrInformation/MhrTransportPermit.vue index 82bdc560b..0db42ec5b 100644 --- a/ppr-ui/src/views/mhrInformation/MhrTransportPermit.vue +++ b/ppr-ui/src/views/mhrInformation/MhrTransportPermit.vue @@ -134,7 +134,7 @@