From 99d051fe7fcc7ac251ff6f6e2b04cae98ea282ff Mon Sep 17 00:00:00 2001
From: CarlNation <Carl.Nation@safelite.com>
Date: Fri, 1 Nov 2024 07:19:36 -0400
Subject: [PATCH 1/2] CSR-2304 swap address & address2 places

CSR-2304 swap address & address2 places
---
 src/layouts/confirmation/confirmation.vue | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/layouts/confirmation/confirmation.vue b/src/layouts/confirmation/confirmation.vue
index 1d77585b3..f5afe3066 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
-            },<br/> ${this.ServiceLocationCity}, ${this.ServiceLocationState} ${
-                this.ServiceLocationZipCode
-            }`;
+            return `${this.ServiceLocationAddress} ${this.ServiceLocationAddress2 ? "," + this.ServiceLocationAddress2 : ""}<br/> ${this.ServiceLocationCity}, ${this.ServiceLocationState} ${this.ServiceLocationZipCode}`;
         },
         ProviderFullAddress() {
             return `${this.ProviderAddress},<br/> ${this.ProviderCity}, ${this.ProviderState} ${this.ProviderZipCode}`;

From 1635156aa2565754d01a856125542a1372b5abb0 Mon Sep 17 00:00:00 2001
From: CarlNation <Carl.Nation@safelite.com>
Date: Fri, 1 Nov 2024 08:43:50 -0400
Subject: [PATCH 2/2] CSR-2304 tests

CSR-2304 tests
---
 src/layouts/confirmation/confirmation.spec.js | 4 ++--
 src/layouts/confirmation/confirmation.vue     | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

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,<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.", () => {
         //Arrange
@@ -419,7 +419,7 @@ describe("computed properties...", () => {
         const testValue = wrapper.vm.ServiceLocationFullAddress;
 
         // 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.", () => {
         //Arrange
diff --git a/src/layouts/confirmation/confirmation.vue b/src/layouts/confirmation/confirmation.vue
index f5afe3066..2f499122d 100644
--- a/src/layouts/confirmation/confirmation.vue
+++ b/src/layouts/confirmation/confirmation.vue
@@ -314,7 +314,7 @@ export default {
             }
         },
         ServiceLocationFullAddress() {
-            return `${this.ServiceLocationAddress} ${this.ServiceLocationAddress2 ? "," + this.ServiceLocationAddress2 : ""}<br/> ${this.ServiceLocationCity}, ${this.ServiceLocationState} ${this.ServiceLocationZipCode}`;
+            return `${this.ServiceLocationAddress}${this.ServiceLocationAddress2 ? ", " + this.ServiceLocationAddress2 : ""},<br/> ${this.ServiceLocationCity}, ${this.ServiceLocationState} ${this.ServiceLocationZipCode}`;
         },
         ProviderFullAddress() {
             return `${this.ProviderAddress},<br/> ${this.ProviderCity}, ${this.ProviderState} ${this.ProviderZipCode}`;