Merge branch 'feature/CASH-845' into feature/CASH-845-stage-2

public/css/hop-styling.css

@@ -12,7 +12,7 @@ body {
   padding: 8px;
 }
 body h3 {
-  font-weight: 600;
+  font-weight: 700;
 }
 body .validation-info {
   display: none;
@@ -35,7 +35,7 @@ body .form-group {
 body .headerlinecontainer .headerline1 {
   font-size: 20px;
   line-height: 32px;
-  font-weight: 500;
+  font-weight: 400;
   margin: 24px 0;
   text-align: center;
 }
@@ -51,6 +51,8 @@ body select {
   font-size: 16px;
   color: #000;
   background-color: #fff;
+  font-family: Urbanist, Arial, Helvetica, sans-serif;
+  font-weight: 400;
 }
 body input:focus, body input:focus-visible,
 body select:focus,
@@ -96,7 +98,7 @@ body .creditCardSpecific div .headerlinecontainer {
   display: none;
 }
 body .creditCardSpecific div label {
-  font-weight: 600;
+  font-weight: 500;
 }
 body .creditCardSpecific #infoRow2 {
   margin-bottom: 0;
@@ -140,6 +142,7 @@ body .buttonContainer button {
   border-radius: 8px;
   color: #fff;
   justify-content: center;
+  font-family: Urbanist, Arial, Helvetica, sans-serif;
   font-weight: 500;
   font-size: 16px;
   height: 48px;
@@ -272,7 +275,7 @@ body .cc-error-container #alert-message {
 #fmg-checkout-shared #other-payments-container label span.paymentOptionText {
   margin: auto 0;
   padding-left: 0;
-  font-weight: 600;
+  font-weight: 400;
 }
 #fmg-checkout-shared #other-payments-container #afterpayParentLink label > span:first-of-type {
   width: 100%;

public/scss/hop-styling.scss

@@ -12,7 +12,7 @@ body {
     padding: 8px;
 
     h3 {
-        font-weight: 600;
+        font-weight: 700;
     }
 
     .validation-info {
@@ -42,7 +42,7 @@ body {
         .headerline1 {
             font-size: 20px;
             line-height: 32px;
-            font-weight: 500;
+            font-weight: 400;
             margin: 24px 0;
             text-align: center;
         }
@@ -61,6 +61,8 @@ body {
         font-size: 16px;
         color: #000;
         background-color: #fff;
+        font-family: Urbanist, Arial, Helvetica, sans-serif;
+        font-weight: 400;
         &:focus,
         &:focus-visible {
             box-shadow: 0 0 0 2.5px #1574a1;
@@ -103,7 +105,7 @@ body {
                 display: none;
             }
             label {
-                font-weight: 600;
+                font-weight: 500;
             }
         }
         #infoRow2 {
@@ -151,6 +153,7 @@ body {
             border-radius: 8px;
             color: #fff;
             justify-content: center;
+            font-family: Urbanist, Arial, Helvetica, sans-serif;
             font-weight: 500;
             font-size: 16px;
             height: 48px;
@@ -330,7 +333,7 @@ body {
 				&.paymentOptionText {
 					margin: auto 0;
 					padding-left: 0;
-                    font-weight: 600;
+                    font-weight: 400;
 				}
 			}
 		}

src/router/constants/routes.js

@@ -55,11 +55,11 @@ export const routeData = {
         name: "insurance-company",
         path: "/insurance-company",
     },
-    // TODO: REMOVE THIS COMMENT AND BELOW, ONCE CASH-803 (SERVICE-LOCATION AND SCHEDULE PAGE COMBINATION) HAS BEEN VETTED
+    SERVICE_LOCATION: {
-    // SERVICE_LOCATION: {
+        // keep even though this page has been removed from the regular flow bc Heritage still points to it
-    //     name: "service-location",
+        name: "service-location",
-    //     path: "/service-location",
+        path: "/service-location",
-    // },
+    },
     HERITAGE: {
         name: "heritage",
         path: "/virtual/heritage",

src/router/methods/helpers/handle-heritage-return.js

@@ -1,7 +1,6 @@
 import { queryStrings } from "@/constants/query-strings";
 import { consumeReferralQuerystrings } from "@/router/methods/helpers/consume-referral-info";
 import { loadSessionIfPresent } from "@/helpers/heritage-integration/order-helper";
-import router from "@/router";
 import { routeData } from "@/router/constants/routes";
 
 export async function handleHeritageReturn(to, from) {
@@ -12,16 +11,6 @@ export async function handleHeritageReturn(to, from) {
         await consumeReferralQuerystrings();
 
         // load session with new cookie
-        await loadSessionIfPresent(true, routeData.SCHEDULE.name);
+        await loadSessionIfPresent(true, routeData.SERVICE_LOCATION.name);
-
-        // Temporary redirect until URLs to old service-location page can be updated in Heritage
-        if (
-            to.fullPath.includes("fmgPage=service-location")
-        ) {
-            // Redirect to Schedule page
-            router.push({
-                name: routeData.SCHEDULE.name,
-            });
-        }
     }
 }

src/router/methods/route-logic/service-location.js

@@ -0,0 +1,8 @@
+import { routeData } from "@/router/constants/routes";
+
+export async function serviceLocationBeforeEnter(to, from) {
+    return {
+        name: routeData.SCHEDULE.name,
+        replace: true,
+    };
+}

src/router/methods/routes.js

@@ -12,6 +12,7 @@ import { errorBeforeEnter } from "@/router/methods/route-logic/error";
 import { restartBeforeEnter } from "@/router/methods/route-logic/restart";
 import { paymentMethodBeforeEnter } from "@/router/methods/route-logic/payment-method";
 import { paymentBeforeEnter } from "@/router/methods/route-logic/payment";
+import { serviceLocationBeforeEnter } from "@/router/methods/route-logic/service-location";
 
 export const routes = [
     // Non-virtual pages.
@@ -29,8 +30,7 @@ export const routes = [
     createRoute(routeData.CAPABILITY_QUESTIONS),
     createRoute(routeData.QUOTE, quoteBeforeEnter),
     createRoute(routeData.INSURANCE_COMPANY, insuranceCompanyBeforeEnter),
-    // TODO: REMOVE THIS COMMENT AND BELOW, ONCE CASH-803 (SERVICE-LOCATION AND SCHEDULE PAGE COMBINATION) HAS BEEN VETTED
+    createRoute(routeData.SERVICE_LOCATION, serviceLocationBeforeEnter),
-    // createRoute(routeData.SERVICE_LOCATION),
     createRoute(routeData.SCHEDULE),
     createRoute(routeData.CUSTOMER_DETAILS),
     createRoute(routeData.PAYMENT_METHOD, paymentMethodBeforeEnter),