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

Merge branch 'develop' into feature/CSR-1389

Browse source
This commit is contained in:
Chloe Herd 2023-09-28 12:38:13 -04:00
commit 4cda2e7bfe
3 changed files with 16 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/fmg-components/nav-bar/nav-bar.vue
View file

@ -1,7 +1,7 @@
<template> <template>
<div class="row"></div> <div class="row"></div>
<div class="nav-bar container-fluid g-5 my-5 px-0" id="infoBox"> <div class="nav-bar container-fluid g-5 my-5 px-0" id="infoBox">
<div class="row d-flex flex-row-reverse align-items-center vw-100"> <div class="row d-flex flex-row-reverse justify-content-between align-items-center vw-100">
<div <div
:class="['col button-col d-flex', buttonSize ? 'large-button' : 'medium-button']" :class="['col button-col d-flex', buttonSize ? 'large-button' : 'medium-button']"
id="stacked"> id="stacked">

11
src/layouts/vehicle-damage/vehicle-damage.vue
View file

@ -32,6 +32,7 @@
groupName="DamageLocationQuestion" /> groupName="DamageLocationQuestion" />
<windshieldOptions <windshieldOptions
class="windshield-options"
ref="windshieldOptions" ref="windshieldOptions"
v-model="selectedWindshieldOptions" v-model="selectedWindshieldOptions"
:hasRepairReplaceConflict="hasRepairReplaceConflict" :hasRepairReplaceConflict="hasRepairReplaceConflict"
@ -547,10 +548,12 @@ export default {
<style lang="scss"> <style lang="scss">
.vehicle-damage { .vehicle-damage {
@include media-breakpoint-up(md) { .windshield-options {
.col { @include media-breakpoint-up(md) {
flex: 0 0 auto; .col {
width: 33.33333333%; flex: 0 0 auto;
width: 33.33333333%;
}
} }
} }
} }

26
src/store/index.js
View file

@ -1675,35 +1675,25 @@ export const actions = {
context, context,
{ year, make, model, style, carId, category, imageUrl, imageVifNumber, imageVifColor } { year, make, model, style, carId, category, imageUrl, imageVifNumber, imageVifColor }
) { ) {
context.dispatch(storeActions.RESET_DAMAGE_STATE_AND_DEPENDENCIES);
context.dispatch(storeActions.RESET_REGISTRATION_STATE_AND_DEPENDENCIES);
if ( if (
context.state.order.vehicle.year != year || context.state.order.vehicle.year != year ||
context.state.order.vehicle.make != make || context.state.order.vehicle.make != make ||
context.state.order.vehicle.model != model || context.state.order.vehicle.model != model ||
context.state.order.vehicle.style != style context.state.order.vehicle.style != style
) ) {
context.dispatch(storeActions.RESET_DAMAGE_STATE_AND_DEPENDENCIES);
context.dispatch(storeActions.RESET_REGISTRATION_STATE_AND_DEPENDENCIES);
context.commit(storeMutations.UPDATE_VEHICLE_VIN, null); context.commit(storeMutations.UPDATE_VEHICLE_VIN, null);
if (context.state.order.vehicle.year != year) {
context.commit(storeMutations.UPDATE_YEAR, year); context.commit(storeMutations.UPDATE_YEAR, year);
}
if (context.state.order.vehicle.make != make) {
context.commit(storeMutations.UPDATE_MAKE, make); context.commit(storeMutations.UPDATE_MAKE, make);
}
if (context.state.order.vehicle.model != model) {
context.commit(storeMutations.UPDATE_MODEL, model); context.commit(storeMutations.UPDATE_MODEL, model);
}
if (context.state.order.vehicle.style != style) {
context.commit(storeMutations.UPDATE_STYLE, style); context.commit(storeMutations.UPDATE_STYLE, style);
context.commit(storeMutations.UPDATE_CAR_ID, carId);
context.commit(storeMutations.UPDATE_VEHICLE_CATEGORY, category);
context.commit(storeMutations.UPDATE_VEHICLE_IMAGE_URL, imageUrl);
context.commit(storeMutations.UPDATE_VEHICLE_IMAGE_VIF_NUMBER, imageVifNumber);
context.commit(storeMutations.UPDATE_VEHICLE_IMAGE_COLOR, imageVifColor);
} }
context.commit(storeMutations.UPDATE_CAR_ID, carId);
context.commit(storeMutations.UPDATE_VEHICLE_CATEGORY, category);
context.commit(storeMutations.UPDATE_VEHICLE_IMAGE_URL, imageUrl);
context.commit(storeMutations.UPDATE_VEHICLE_IMAGE_VIF_NUMBER, imageVifNumber);
context.commit(storeMutations.UPDATE_VEHICLE_IMAGE_COLOR, imageVifColor);
}, },
saveVehicleDamage( saveVehicleDamage(