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

Merge pull request #482 from Safelite/feature/richardson/SSR-775

Browse source 
Show Address Line 2 on mobile Location modal
This commit is contained in:
brich1212safe 2023-10-16 09:44:17 -04:00 committed by GitHub
commit 58f54257b2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 11 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/digital-components/date-picker/date-picker.vue
View file

@ -669,7 +669,6 @@ export default {
}
},
async updateSelectableDates(monthStart, monthEnd) {
console.log(this.mainStore);
const moreSelectableDates = await this.customSelectableDatesCallback(
monthStart,
monthEnd,

4
src/layouts/service-location/appointment-type-question/appointment-type-question.vue
View file

@ -91,7 +91,7 @@ export default {
&& newValue.findIndex((answer) => (answer.Name === AppointmentTypeStrings.MOBILE
|| answer.Name === AppointmentTypeStrings.MOBILE_NOT_ITAC_AND_NOT_NOCOMP)) !== -1
) {
if (this.isITAC) {
if (this.isItacOrNoComp) {
this.selectedValues = AppointmentTypeStrings.MOBILE;
} else {
this.selectedValues = AppointmentTypeStrings.MOBILE_NOT_ITAC_AND_NOT_NOCOMP;
@ -103,7 +103,7 @@ export default {
isMobileOnly: {
handler(newValue) {
if (newValue) {
if (this.isITAC) {
if (this.isItacOrNoComp) {
this.selectedValues = AppointmentTypeStrings.MOBILE;
} else {
this.selectedValues = AppointmentTypeStrings.MOBILE_NOT_ITAC_AND_NOT_NOCOMP;

7
src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
View file

@ -43,13 +43,14 @@
:onModalOpenedCallback="onModalOpened"
:onModalClosedCallback="onModalClosed"
@isModalOpened="setModalStatus"
@footer-button-event="setMobileLocation">
@footerButtonEvent="setMobileLocation">
<template v-if="isModalOpened">
<addressQuestions
ref="addressQuestions"
v-model="internalModel.addressQuestions"
captureApartmentNumberOrBusinessName="true"
preserveCityAndStateOnReset="true" />
preserveCityAndStateOnReset="true"
includeStreetAddress2="true" />
<vehicleProtectedQuestion
ref="vehicleProtectedQuestion"
v-model="internalModel.isVehicleProtected"
@ -108,7 +109,7 @@ export default {
default: () => ({
addressQuestions: {
streetAddress: '',
apartmentNumberOrBusinessName: '',
streetAddress2: '',
city: '',
state: '',
zipCode: ''

11
src/layouts/service-location/service-location.vue
View file

@ -194,7 +194,7 @@ export default {
data() {
return {
streetAddress: this.getServiceAddressFromStore(),
apartmentNumberOrBusinessName: this.getServiceAddress2FromStore(),
streetAddress2: this.getServiceAddress2FromStore(),
city: this.getServiceCityFromStore(),
state: this.getServiceStateFromStore(),
zipCode: this.getServiceZipCodeFromStore(),
@ -243,7 +243,7 @@ export default {
return {
addressQuestions: {
streetAddress: this.streetAddress,
apartmentNumberOrBusinessName: this.apartmentNumberOrBusinessName,
streetAddress2: this.streetAddress2,
city: this.city,
state: this.state,
zipCode: this.zipCode
@ -253,8 +253,7 @@ export default {
},
set(newValue) {
this.streetAddress = newValue.addressQuestions.streetAddress;
this.apartmentNumberOrBusinessName =
newValue.addressQuestions.apartmentNumberOrBusinessName;
this.streetAddress2 = newValue.addressQuestions.streetAddress2;
this.city = newValue.addressQuestions.city;
this.state = newValue.addressQuestions.state;
this.zipCode = newValue.addressQuestions.zipCode;
@ -342,7 +341,7 @@ export default {
async forwardButtonAction() {
useMainStore().saveServiceLocation({
address: this.streetAddress,
address2: this.apartmentNumberOrBusinessName,
address2: this.streetAddress2,
city: this.city,
state: this.state,
zipCode: this.zipCode,
@ -417,7 +416,7 @@ export default {
},
resetMobileLocation() {
this.streetAddress = '';
this.apartmentNumberOrBusinessName = '';
this.streetAddress2 = '';
this.city = '';
this.isVehicleProtected = null;