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

Merge pull request #2066 from Safelite/feature/CSR-2304

Browse source 
CSR-2304 swap address & address2 places
This commit is contained in:
CarlNation 2024-11-01 08:49:22 -04:00 committed by GitHub
commit f2a07535b6
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/layouts/confirmation/confirmation.spec.js
View file

@ -237,7 +237,7 @@ describe("computed properties...", () => {
const testValue = wrapper.vm.AppointmentWordingText; const testValue = wrapper.vm.AppointmentWordingText;
// Assert // Assert
expect(testValue).toEqual("wording Text 123, test,<br/> test, AZ 12345"); expect(testValue).toEqual("wording Text test, 123,<br/> test, AZ 12345");
}); });
test("AppointmentWordingText should return DROP_OFF text in expected format.", () => { test("AppointmentWordingText should return DROP_OFF text in expected format.", () => {
//Arrange //Arrange
@ -419,7 +419,7 @@ describe("computed properties...", () => {
const testValue = wrapper.vm.ServiceLocationFullAddress; const testValue = wrapper.vm.ServiceLocationFullAddress;
// Assert // Assert
expect(testValue).toEqual("123, test,<br/> test, AZ 12345"); expect(testValue).toEqual("test, 123,<br/> test, AZ 12345");
}); });
test("ProviderFullAddress should return text in expected format.", () => { test("ProviderFullAddress should return text in expected format.", () => {
//Arrange //Arrange

6
src/layouts/confirmation/confirmation.vue
View file

@ -314,11 +314,7 @@ export default {
} }
}, },
ServiceLocationFullAddress() { ServiceLocationFullAddress() {
return `${this.ServiceLocationAddress2 ? this.ServiceLocationAddress2 + "," : ""} ${ return `${this.ServiceLocationAddress}${this.ServiceLocationAddress2 ? ", " + this.ServiceLocationAddress2 : ""},<br/> ${this.ServiceLocationCity}, ${this.ServiceLocationState} ${this.ServiceLocationZipCode}`;
this.ServiceLocationAddress
},<br/> ${this.ServiceLocationCity}, ${this.ServiceLocationState} ${
this.ServiceLocationZipCode
}`;
}, },
ProviderFullAddress() { ProviderFullAddress() {
return `${this.ProviderAddress},<br/> ${this.ProviderCity}, ${this.ProviderState} ${this.ProviderZipCode}`; return `${this.ProviderAddress},<br/> ${this.ProviderCity}, ${this.ProviderState} ${this.ProviderZipCode}`;