diff --git a/src/layouts/confirmation/confirmation.spec.js b/src/layouts/confirmation/confirmation.spec.js index 166973ce6..4bbe162d7 100644 --- a/src/layouts/confirmation/confirmation.spec.js +++ b/src/layouts/confirmation/confirmation.spec.js @@ -237,7 +237,7 @@ describe("computed properties...", () => { const testValue = wrapper.vm.AppointmentWordingText; // Assert - expect(testValue).toEqual("wording Text 123, test,
test, AZ 12345"); + expect(testValue).toEqual("wording Text test, 123,
test, AZ 12345"); }); test("AppointmentWordingText should return DROP_OFF text in expected format.", () => { //Arrange @@ -419,7 +419,7 @@ describe("computed properties...", () => { const testValue = wrapper.vm.ServiceLocationFullAddress; // Assert - expect(testValue).toEqual("123, test,
test, AZ 12345"); + expect(testValue).toEqual("test, 123,
test, AZ 12345"); }); test("ProviderFullAddress should return text in expected format.", () => { //Arrange diff --git a/src/layouts/confirmation/confirmation.vue b/src/layouts/confirmation/confirmation.vue index 1d77585b3..2f499122d 100644 --- a/src/layouts/confirmation/confirmation.vue +++ b/src/layouts/confirmation/confirmation.vue @@ -314,11 +314,7 @@ export default { } }, ServiceLocationFullAddress() { - return `${this.ServiceLocationAddress2 ? this.ServiceLocationAddress2 + "," : ""} ${ - this.ServiceLocationAddress - },
${this.ServiceLocationCity}, ${this.ServiceLocationState} ${ - this.ServiceLocationZipCode - }`; + return `${this.ServiceLocationAddress}${this.ServiceLocationAddress2 ? ", " + this.ServiceLocationAddress2 : ""},
${this.ServiceLocationCity}, ${this.ServiceLocationState} ${this.ServiceLocationZipCode}`; }, ProviderFullAddress() { return `${this.ProviderAddress},
${this.ProviderCity}, ${this.ProviderState} ${this.ProviderZipCode}`;