Merge branch 'release/2025.09.04' into feature/CASH-1184

src/fmg-components/funnel-sub-header/funnel-sub-header.vue

@@ -68,6 +68,9 @@ export default {
 <style lang="scss" scoped>
 :deep(.bolded-words) {
     font-family: UrbanistSemibold, Arial, Helvetica, sans-serif;
+    color: $black;
+    font-weight: 600;
+    font-size: 16px;
 }
 h5 {
     line-height: 32px;

src/layouts/customer-details/customer-details.vue

@@ -218,3 +218,8 @@ export default {
     },
 };
 </script>
+<style lang="scss">
+.form-check {
+    margin-bottom: 0.5rem;
+}
+</style>

src/layouts/payment-method/payment-method-question/payment-method-question.vue

@@ -95,6 +95,7 @@ export default {
     .question-text span {
         text-align: left;
         line-height: 24px;
+        font-weight: 600;
     }
 }
 </style>

src/layouts/payment-method/payment-method.vue

@@ -751,15 +751,15 @@ export default {
         customCtaCopy() {
             switch (this.paymentMethod) {
                 case paymentMethods.PAY_NOW:
-                    return "Continue to checkout";
+                    return "Continue"; // Before Heritage Parity it was "Continue to checkout"
                 case paymentMethods.INSURANCE:
-                    return "Continue to insurance";
+                    return "Continue"; // Before Heritage Parity it was "Continue to insurance"
                 case paymentMethods.CREDIT_CARD:
-                    return "Continue to checkout";
+                    return "Continue"; // Before Heritage Parity it was "Continue to checkout"
                 case paymentMethods.PAYPAL:
-                    return "Continue to Paypal";
+                    return "Continue"; // Before Heritage Parity it was "Continue to Paypal"
                 case paymentMethods.AFTERPAY:
-                    return "Continue to Afterpay";
+                    return "Continue"; // Before Heritage Parity it was "Continue to Afterpay"
                 default:
                     return null;
             }
@@ -945,4 +945,11 @@ export default {
         }
     }
 }
+:deep(span.label) {
+    font-weight: 600;
+}
+:deep(div.service-questions span) {
+    color: $black;
+    font-family: UrbanistSemibold;
+}
 </style>

src/layouts/payment/payment.vue

@@ -919,10 +919,6 @@ export default {
     width: 100%;
     min-height: 650px;
     border: 0 none;
-
-    @include media-breakpoint-down(lg) {
-        min-height: 1688px;
-    }
 }
 #pageLoadingModal {
     background-color: red;
@@ -942,11 +938,11 @@ export default {
     @include media-breakpoint-down(lg) {
         flex-direction: column;
         & > iframe {
-            flex-basis: 100%;
+            flex-basis: auto;
             margin-right: 0;
         }
         & > #cart-container {
-            flex-basis: 100%;
+            flex-basis: auto;
             margin: 0 0.5rem;
 
             & > button#submit-payment {

src/layouts/schedule/schedule.vue

@@ -1238,7 +1238,9 @@ export default {
             return store.getters.lineItems.supportingItems;
         },
         updateFooterButtonText(timeSlotInfo) {
-            let navbarButtonText;
+            let navbarButtonText = "Continue";
+            // Archiving the following in case we revert back from Heritage parity
+            /*
             if (!timeSlotInfo || !timeSlotInfo.timeSlot.date) {
                 navbarButtonText = "Continue";
             } else {
@@ -1273,6 +1275,7 @@ export default {
                     )}`;
                 }
             }
+            */
             this.$refs.navbar.updateButtonText(navbarButtonText);
         },
         convertSelectedDateToShortMonthAndDay(selectedDate) {