From a58b7fdd02ea724b9660e3f7318abd3b9e4acd8a Mon Sep 17 00:00:00 2001 From: Adam Caouette Date: Fri, 18 Nov 2022 10:08:30 -0500 Subject: [PATCH 1/7] CSR-818: adjust focus styling on primary button --- src/styles/common-error-styles.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/styles/common-error-styles.scss b/src/styles/common-error-styles.scss index f7b8ce23e..cc5c08248 100644 --- a/src/styles/common-error-styles.scss +++ b/src/styles/common-error-styles.scss @@ -185,11 +185,11 @@ html { pointer-events: all; font-weight: $font-weight-normal; } - &.btn.btn-primary:hover { + &.btn.btn-primary:hover, + &.btn.btn-primary:focus { background: $gray-200; box-shadow: none; } - &.btn.btn-primary:focus, &.btn.btn-primary:focus-visible { box-shadow: 0 0 0 3px $white, 0 0 0 5.5px $gray-700; } From 251469144fe91c85570daa0de56529c269deced7 Mon Sep 17 00:00:00 2001 From: Scott Kiener Date: Fri, 18 Nov 2022 10:16:24 -0500 Subject: [PATCH 2/7] CSR-504 | Fixing defect regarding repair work flow Make glassParts nullsafe --- src/layouts/quote/quote.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/layouts/quote/quote.vue b/src/layouts/quote/quote.vue index 5c903ea7e..fe29401b6 100644 --- a/src/layouts/quote/quote.vue +++ b/src/layouts/quote/quote.vue @@ -92,7 +92,7 @@ export default { ]; const resultMap = await settleAllPromises(promiseResultMap); - const glassParts = [...store.getters.order.lineItems.glassParts]; + const glassParts = store.getters.order.lineItems.glassParts ?? []; const availableLineItems = [ resultMap.rainDefense, ...resultMap.supportingItems, From f21764e421f3602296cf7045136a14b0423811dc Mon Sep 17 00:00:00 2001 From: Katie Date: Fri, 18 Nov 2022 13:51:59 -0500 Subject: [PATCH 3/7] CSR-748 Fix navigate back from quote --- src/mixins/vehicle-questions-mixin.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/mixins/vehicle-questions-mixin.js b/src/mixins/vehicle-questions-mixin.js index 0c75aa788..a58cb8bc3 100644 --- a/src/mixins/vehicle-questions-mixin.js +++ b/src/mixins/vehicle-questions-mixin.js @@ -471,10 +471,10 @@ export default { navigateBack(vm) { const self = vm ?? this; const partsOrQuestions = ( - self.$store.getters.pageData(fmgPageValues.PART_QUESTIONS) ?? - self.$store.getters.pageData(fmgPageValues.VEHICLE_PARTS) ?? + self.$store.getters.pageData(fmgPageValues.CAPABILITY_QUESTIONS) ?? self.$store.getters.pageData(fmgPageValues.MOLDING_QUESTIONS) ?? - self.$store.getters.pageData(fmgPageValues.CAPABILITY_QUESTIONS) + self.$store.getters.pageData(fmgPageValues.VEHICLE_PARTS) ?? + self.$store.getters.pageData(fmgPageValues.PART_QUESTIONS) )?.partsOrQuestions; const hasPartQuestions = this.hasPartQuestions(partsOrQuestions); const hasGlassLocationWithMultipleParts = From 3b53c8fc4441cfc383f9cc27fe118f35d97c706b Mon Sep 17 00:00:00 2001 From: Katie Date: Fri, 18 Nov 2022 14:00:21 -0500 Subject: [PATCH 4/7] CSR-748 format --- src/mixins/vehicle-questions-mixin.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mixins/vehicle-questions-mixin.js b/src/mixins/vehicle-questions-mixin.js index a58cb8bc3..db1905310 100644 --- a/src/mixins/vehicle-questions-mixin.js +++ b/src/mixins/vehicle-questions-mixin.js @@ -471,7 +471,7 @@ export default { navigateBack(vm) { const self = vm ?? this; const partsOrQuestions = ( - self.$store.getters.pageData(fmgPageValues.CAPABILITY_QUESTIONS) ?? + self.$store.getters.pageData(fmgPageValues.CAPABILITY_QUESTIONS) ?? self.$store.getters.pageData(fmgPageValues.MOLDING_QUESTIONS) ?? self.$store.getters.pageData(fmgPageValues.VEHICLE_PARTS) ?? self.$store.getters.pageData(fmgPageValues.PART_QUESTIONS) From 620e038c57d64dc2964db65345a64dba1c29ed57 Mon Sep 17 00:00:00 2001 From: Bryan Mauger Date: Mon, 21 Nov 2022 10:35:28 -0500 Subject: [PATCH 5/7] Update CMS copy. Update style to use BS helpers. --- .../service-package-radio/service-package-radio.vue | 7 ++----- src/styles/ux-variables.scss | 3 +++ 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/layouts/quote/service-package-question/service-package-radio/service-package-radio.vue b/src/layouts/quote/service-package-question/service-package-radio/service-package-radio.vue index 0a6098c97..0b96a8e37 100644 --- a/src/layouts/quote/service-package-question/service-package-radio/service-package-radio.vue +++ b/src/layouts/quote/service-package-question/service-package-radio/service-package-radio.vue @@ -35,7 +35,7 @@
@@ -179,10 +179,7 @@ export default { } .package-footer { - font-size: 12px; - font-weight: 500; - color: #d4281c; - margin-left: -32px; + color: $red; } .package-specs { diff --git a/src/styles/ux-variables.scss b/src/styles/ux-variables.scss index d9b462af4..1e95a4052 100644 --- a/src/styles/ux-variables.scss +++ b/src/styles/ux-variables.scss @@ -163,6 +163,9 @@ $spacers: ( /* 48px */ ); +//Enable negative spacing (does NOT work on padding) +$enable-negative-margins: true; + //Grid breakpoints $grid-breakpoints: ( xs: 0, From 6e55fcd1e7621e3580ba25c825b9ac406a0f3f7d Mon Sep 17 00:00:00 2001 From: Scott Kiener Date: Mon, 21 Nov 2022 21:57:51 -0500 Subject: [PATCH 6/7] CSR-746 | Aligning front end with back end changes Now using a field called "parentAccountNumber" which should actually use what we have in the store --- src/store/index.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/store/index.js b/src/store/index.js index 253b404de..1182f5f3f 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -900,14 +900,14 @@ export const actions = { const carId = context.getters.vehicle.carId; const isRepair = context.getters.damage.isRepair; const numberOfChips = context.getters.damage.numberOfChips; - const accountNumber = "82791"; //context.getters.order.accountNumber.toString(); + const parentAccountNumber = context.getters.order.accountNumber.toString(); return globalMethods.callHttpClient({ method: endpoints.GetSupportingItems.method, endpoint: endpoints.GetSupportingItems.url, payload: { carId: carId, serviceType: isRepair ? "Repair" : "Replace", - //accountNumber: accountNumber, + parentAccountNumber: parentAccountNumber, parts: glassPartsArray, numberOfRepairChips: isRepair ? numberOfChips : 0, }, From f367f0804f43fa2ef00c4b7212192b921ecd6e46 Mon Sep 17 00:00:00 2001 From: Bryan Mauger Date: Tue, 22 Nov 2022 10:34:54 -0500 Subject: [PATCH 7/7] Set max height of input. --- src/common-components/textbox-question/textbox-question.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/common-components/textbox-question/textbox-question.vue b/src/common-components/textbox-question/textbox-question.vue index 1d8540075..1fd8c3256 100644 --- a/src/common-components/textbox-question/textbox-question.vue +++ b/src/common-components/textbox-question/textbox-question.vue @@ -203,6 +203,7 @@ export default { border: 1px solid $gray-500; border-radius: 0.5rem; min-height: 3rem; + max-height: 48px; padding: 12px 16px; &::placeholder { color: $gray-500;