From bd7be85511a465028694557dba95e1710959db3c Mon Sep 17 00:00:00 2001
From: hiteshkumar87 <hitesh.kumar@safelite.com>
Date: Mon, 16 Oct 2023 17:03:57 +0530
Subject: [PATCH] CSR-1417

remove getFullDayName and getFullMonthName from date-helper and use from schedule helper
---
 src/helpers/date-helper.js                    | 16 ---------------
 src/helpers/date-helper.spec.js               | 19 +-----------------
 .../add-to-calendar/add-to-calendar.vue       |  2 +-
 src/layouts/confirmation/confirmation.vue     | 20 +++++++++----------
 4 files changed, 12 insertions(+), 45 deletions(-)

diff --git a/src/helpers/date-helper.js b/src/helpers/date-helper.js
index d42ad326f..7a8c3e71d 100644
--- a/src/helpers/date-helper.js
+++ b/src/helpers/date-helper.js
@@ -7,22 +7,6 @@ export function getDateDifferenceInDays(startDate, endDate) {
     // Convert milliseconds to days and return the result
     return difference / (1000 * 3600 * 24);
 }
-export function getFullDayName(date) {
-    // Use a ternary operator to check if the input is a valid date object
-    return date instanceof Date
-        ? // Use the built-in method toLocaleDateString() to get the full day name in the current locale
-          date.toLocaleDateString(undefined, { weekday: "long" })
-        : // Return undefined if the input is not a valid date object
-          undefined;
-}
-export function getFullMonthName(date) {
-    // Use a ternary operator to check if the input is a valid date object
-    return date instanceof Date
-        ? // Use the built-in method toLocaleDateString() to get the full month name in the current locale
-          date.toLocaleDateString(undefined, { month: "long" })
-        : // Return undefined if the input is not a valid date object
-          undefined;
-}
 export function get12HourTimeFormat(time) {
     // Check correct time format and split into components
     time = time.toString().match(/^([01]\d|2[0-3])(:)([0-5]\d)?$/) || [time];
diff --git a/src/helpers/date-helper.spec.js b/src/helpers/date-helper.spec.js
index 4ea2157f5..b78397e0f 100644
--- a/src/helpers/date-helper.spec.js
+++ b/src/helpers/date-helper.spec.js
@@ -1,6 +1,4 @@
 import {
-    getFullDayName,
-    getFullMonthName,
     get12HourTimeFormat,
     get12HourTimeMobileFormat,
     getDateFormat,
@@ -49,22 +47,6 @@ describe("date-helper.js", () => {
             expect(result).toEqual(testCase.expected);
         }
     });
-    it("getFullMonthName should return full month format.", () => {
-        // Arrange / Act
-        const date = new Date("2023-10-01");
-        const monthName = getFullMonthName(date);
-
-        // Assert
-        expect(monthName).toEqual("October");
-    });
-    it("getFullDayName should return full Day Name format.", () => {
-        // Arrange / Act
-        const date = new Date("2023-10-01");
-        const dayName = getFullDayName(date);
-
-        // Assert
-        expect(dayName).toEqual("Sunday");
-    });
     it("getDateFormat should return date in the given format.", () => {
         // Arrange / Act
         const date = new Date("2023-10-01");
@@ -74,6 +56,7 @@ describe("date-helper.js", () => {
         // Assert
         expect(formattedDate).toEqual("2023-10-01");
     });
+
     it("should return the correct difference in days", function () {
         // Define some sample dates and their expected differences
         const testCases = [
diff --git a/src/layouts/add-to-calendar/add-to-calendar.vue b/src/layouts/add-to-calendar/add-to-calendar.vue
index b0306b5d0..0b856e72d 100644
--- a/src/layouts/add-to-calendar/add-to-calendar.vue
+++ b/src/layouts/add-to-calendar/add-to-calendar.vue
@@ -127,7 +127,7 @@ export default {
         serviceType() {
             const isRepair = store.getters.order.damage.isRepair;
             const funnelHasRecalibrationPart = store.getters.funnelHasRecalibrationPart;
-            if (isRepair) {
+            if (!isRepair) {
                 if (funnelHasRecalibrationPart) {
                     return "replacement and recalibration";
                 } else {
diff --git a/src/layouts/confirmation/confirmation.vue b/src/layouts/confirmation/confirmation.vue
index cb7ca43c1..5fa24856d 100644
--- a/src/layouts/confirmation/confirmation.vue
+++ b/src/layouts/confirmation/confirmation.vue
@@ -55,15 +55,11 @@ import { fetchCmsContentForPage } from "@/helpers/cms-content-helper";
 import { AppointmentTypeStrings } from "@/constants/schedule-constants";
 import { settleAllPromises } from "@/helpers/layout-helper";
 import { applicationConfig } from "@/constants/application-config.js";
+import { convertDateStringToDate } from "@/layouts/schedule/helpers/schedule-helper";
 import { Form } from "vee-validate";
 import store from "@/store";
 
-import {
-    getFullDayName,
-    getFullMonthName,
-    get12HourTimeFormat,
-    get12HourTimeMobileFormat,
-} from "@/helpers/date-helper";
+import { get12HourTimeFormat, get12HourTimeMobileFormat } from "@/helpers/date-helper";
 export default {
     name: "confirmation",
     async beforeRouteEnter(to, from, next) {
@@ -174,10 +170,14 @@ export default {
             return `${this.ProviderAddress},<br/> ${this.ProviderCity}, ${this.ProviderState} ${this.ProviderZipCode}`;
         },
         ScheduleDateFormatted() {
-            const scheduleDate = new Date(this.ScheduleDate);
-            return `${getFullDayName(scheduleDate)}, ${getFullMonthName(
-                scheduleDate
-            )} ${scheduleDate.getDate()}`;
+            // This conversion ensures we don't get get GMT induced date changes
+            const dateObject = convertDateStringToDate(this.ScheduleDate);
+            // Ex: Tuesday, April 22
+            return dateObject.toLocaleDateString("en-us", {
+                weekday: "long",
+                month: "long",
+                day: "numeric",
+            });
         },
         ScheduleTimeFormatted() {
             if (this.AppointmentType == AppointmentTypeStrings.MOBILE) {