jason/DigitalConsumer.FixMyGlass
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' into feature/CSR-803-refactoring-2

Browse source
This commit is contained in:
Adam Caouette 2022-11-22 17:07:10 -05:00
commit 105a74c618
7 changed files with 14 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/common-components/textbox-question/textbox-question.vue
View file

@ -203,6 +203,7 @@ export default {
border: 1px solid $gray-500; border: 1px solid $gray-500;
border-radius: 0.5rem; border-radius: 0.5rem;
min-height: 3rem; min-height: 3rem;
max-height: 48px;
padding: 12px 16px; padding: 12px 16px;
&::placeholder { &::placeholder {
color: $gray-500; color: $gray-500;

2
src/layouts/quote/quote.vue
View file

@ -92,7 +92,7 @@ export default {
]; ];
const resultMap = await settleAllPromises(promiseResultMap); const resultMap = await settleAllPromises(promiseResultMap);
const glassParts = [...store.getters.order.lineItems.glassParts]; const glassParts = store.getters.order.lineItems.glassParts ?? [];
const availableLineItems = [ const availableLineItems = [
resultMap.rainDefense, resultMap.rainDefense,
...resultMap.supportingItems, ...resultMap.supportingItems,

7
src/layouts/quote/service-package-question/service-package-radio/service-package-radio.vue
View file

@ -35,7 +35,7 @@
</ul> </ul>
<!-- End of body text parsing --> <!-- End of body text parsing -->
<div <div
class="package-footer" class="package-footer fw-bold caption ms-n6"
v-if="this.buttonFooterCopy" v-if="this.buttonFooterCopy"
v-html="this.buttonFooterCopy"></div> v-html="this.buttonFooterCopy"></div>
</div> </div>
@ -179,10 +179,7 @@ export default {
} }
.package-footer { .package-footer {
font-size: 12px; color: $red;
font-weight: 500;
color: #d4281c;
margin-left: -32px;
} }
.package-specs { .package-specs {

6
src/mixins/vehicle-questions-mixin.js
View file

@ -471,10 +471,10 @@ export default {
navigateBack(vm) { navigateBack(vm) {
const self = vm ?? this; const self = vm ?? this;
const partsOrQuestions = ( const partsOrQuestions = (
self.$store.getters.pageData(fmgPageValues.PART_QUESTIONS) ?? self.$store.getters.pageData(fmgPageValues.CAPABILITY_QUESTIONS) ??
self.$store.getters.pageData(fmgPageValues.VEHICLE_PARTS) ??
self.$store.getters.pageData(fmgPageValues.MOLDING_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; )?.partsOrQuestions;
const hasPartQuestions = this.hasPartQuestions(partsOrQuestions); const hasPartQuestions = this.hasPartQuestions(partsOrQuestions);
const hasGlassLocationWithMultipleParts = const hasGlassLocationWithMultipleParts =

4
src/store/index.js
View file

@ -900,14 +900,14 @@ export const actions = {
const carId = context.getters.vehicle.carId; const carId = context.getters.vehicle.carId;
const isRepair = context.getters.damage.isRepair; const isRepair = context.getters.damage.isRepair;
const numberOfChips = context.getters.damage.numberOfChips; const numberOfChips = context.getters.damage.numberOfChips;
const accountNumber = "82791"; //context.getters.order.accountNumber.toString(); const parentAccountNumber = context.getters.order.accountNumber.toString();
return globalMethods.callHttpClient({ return globalMethods.callHttpClient({
method: endpoints.GetSupportingItems.method, method: endpoints.GetSupportingItems.method,
endpoint: endpoints.GetSupportingItems.url, endpoint: endpoints.GetSupportingItems.url,
payload: { payload: {
carId: carId, carId: carId,
serviceType: isRepair ? "Repair" : "Replace", serviceType: isRepair ? "Repair" : "Replace",
//accountNumber: accountNumber, parentAccountNumber: parentAccountNumber,
parts: glassPartsArray, parts: glassPartsArray,
numberOfRepairChips: isRepair ? numberOfChips : 0, numberOfRepairChips: isRepair ? numberOfChips : 0,
}, },

4
src/styles/common-error-styles.scss
View file

@ -185,11 +185,11 @@ html {
pointer-events: all; pointer-events: all;
font-weight: $font-weight-normal; font-weight: $font-weight-normal;
} }
&.btn.btn-primary:hover { &.btn.btn-primary:hover,
&.btn.btn-primary:focus {
background: $gray-200; background: $gray-200;
box-shadow: none; box-shadow: none;
} }
&.btn.btn-primary:focus,
&.btn.btn-primary:focus-visible { &.btn.btn-primary:focus-visible {
box-shadow: 0 0 0 3px $white, 0 0 0 5.5px $gray-700; box-shadow: 0 0 0 3px $white, 0 0 0 5.5px $gray-700;
} }

3
src/styles/ux-variables.scss
View file

@ -163,6 +163,9 @@ $spacers: (
/* 48px */ /* 48px */
); );
//Enable negative spacing (does NOT work on padding)
$enable-negative-margins: true;
//Grid breakpoints //Grid breakpoints
$grid-breakpoints: ( $grid-breakpoints: (
xs: 0, xs: 0,