Merge branch 'release/2025.09.04' into feature/bugfix/CASH-1417

azure-pipelines.yml

@@ -31,7 +31,7 @@ resources:
           type: github
           name: Safelite/AzureDevOps
           endpoint: Safelite
-          ref: refs/tags/t5.6.41
+          ref: refs/tags/t5.7.24
 
 variables:
     - group: Digital-Infrastructure
@@ -323,4 +323,5 @@ stages:
                   parameters:
                       dependsOn: prodBuildDeployment
                       userName: SafeliteAzureDevops
-                      userEmail: githubazuredevops@safelite.com
+                      userEmail: githubazuredevops@safelite.com
+                      environment: digitalCloud-prod

src/layouts/quote/quote.spec.js

@@ -10,6 +10,7 @@ import { experimentSettings } from "@/constants/experiments";
 import experimentMixin from "@/mixins/experiment-mixin.js";
 import baseMixin from "@/mixins/base-mixin.js";
 import { containsLineItemWithPartType } from "../../helpers/service-package-helper";
+import { savePageData } from "../../router/methods/helpers/save-page-data";
 
 jest.mock("@/store", () => ({
     commit: jest.fn(), // Mock store.commit
@@ -90,6 +91,10 @@ jest.mock("@/mixins/base-mixin", () => ({
     },
 }));
 
+jest.mock("@/router/methods/helpers/save-page-data", () => ({
+    savePageData: jest.fn(),
+}));
+
 const mockExperimentSettings = experimentSettings;
 
 jest.mock("@/mixins/experiment-mixin.js", () => ({

src/layouts/quote/quote.vue

@@ -67,7 +67,7 @@
                 </div>
             </div>
             <div class="row justify-content-center">
-                <div class="col-md-8 col-xl-6">
+                <div class="col-md-8 col-xl-6 nav-container">
                     <contentGroupModal ref="RainDefenseModal" cmsWidgetName="RainDefenseModal" />
                     <contentGroupModal ref="FrontWiperModal" cmsWidgetName="FrontWiperModal" />
                     <contentGroupModal ref="RearWiperModal" cmsWidgetName="RearWiperModal" />
@@ -673,14 +673,12 @@ export default {
         async closeSaveProgressPopup() {
             this.showSaveProgressPopup = false;
 
-            savePageData(this.pageName, { saveProgressPopupSkipped: true }, true);
-
             if (this.skipToInsurance) {
                 // skip ahead now if in IGQ skip experiment
                 await this.skip(true, externalParamPackageLabels.GLASS_ONLY);
             }
         },
-        forwardButtonAction() {
+        async forwardButtonAction() {
             this.dispatchStoreAction(
                 this.storeActions.SAVE_PAYMENT_TYPE,
                 this.isInsuranceSelected,
@@ -751,6 +749,8 @@ export default {
                 false
             );
 
+            await savePageData(this.pageName, { saveProgressPopupSkipped: true }, true);
+
             const payment = this.$store.getters.payment;
             if (payment.isInsurance) {
                 this.$router.navigateWithSaving(
@@ -901,6 +901,12 @@ export default {
 // Unique to quote page for 2.0/Heritage parity
 .quote {
     padding-bottom: 2rem;
+
+    .nav-container {
+        /* Create correct positioning point for .nav-bar a.navigation-link */
+        position: relative;
+    }
+
     :deep(.nav-bar) {
         position: initial;
         button.btn {
@@ -910,10 +916,7 @@ export default {
         a.navigation-link {
             position: absolute;
             left: 1rem;
-            bottom: 1rem;
-            @include media-breakpoint-up(lg) {
-                left: 6rem;
-            }
+            bottom: -1rem;
         }
         .col-auto {
             width: -webkit-fill-available;

src/layouts/service-location/shop-question/shop-question-popup.vue

@@ -295,14 +295,14 @@ export default {
                         this.displayNoServiceAlert = true;
                         return null;
                     }
-
-                    getShopProviderData(this.localZipCode).then(async (result) => {
-                        this.localShopProviderData = result.data;
-                        this.numberOfShopsToDisplay = 3;
-                        this.updateShopsForZip();
-                        this.isLoading = false;
-                    });
                 }
+
+                getShopProviderData(this.localZipCode).then(async (result) => {
+                    this.localShopProviderData = result.data;
+                    this.numberOfShopsToDisplay = 3;
+                    this.updateShopsForZip();
+                    this.isLoading = false;
+                });
             } else {
                 this.isLoading = false;
             }

src/ux-components/alert/alert.vue

@@ -145,6 +145,8 @@ export default {
 <style lang="scss">
 .alert {
     padding: 0.675rem 0;
+    border-radius: 0.5rem;
+    border-width: 0px;
 
     button {
         display: none;