Merge branch 'release/syp-release' into feature/CASH-77-again

src/digital-components/modal/modal.vue

@@ -216,8 +216,12 @@ export default {
                         overflow: auto;
                         flex: none;
                     }
+                    .textbox-question {
+                        padding: .25rem 0;
+                    }
                 }
             }
+            
             &.modal-dialog-centered {
                 align-items: flex-end;
                 min-height: 100%;
@@ -269,8 +273,6 @@ export default {
         flex-direction: column;
 
         .textbox-question {
-            padding: 0;
-
             label {
                 text-align: left;
                 font-weight: 900;

src/layouts/quote/quote.vue

@@ -20,7 +20,7 @@
                 </div>
             </div>
             <div class="row justify-content-center">
-                <div class="col-md-12 col-xl-8">
+                <div class="col-md-12 col-xl-8 mb-5">
                     <servicePackageQuestion
                         ref="servicePackage"
                         cashCmsWidgetName="CashServicePackageQuestionWidget"

src/layouts/quote/service-package-question/service-package-radio/service-package-radio.vue

@@ -141,8 +141,11 @@ export default {
 .package-main {
     .package-wrapper {
         margin: 1rem 0;
+        &:last-child {
+            margin: 1rem 0 0 0;
+        }
         @include media-breakpoint-up(md) {
-            margin: 1rem 0.5rem;
+            margin: 1rem 0.5rem 0 0.5rem;
             display: flex;
             flex-direction: column;
         }
@@ -322,6 +325,7 @@ export default {
                     display: flex;
                     justify-content: flex-end;
                     align-items: center;
+                    align-self: flex-start;
                     div.strikethrough-discount-price {
                         text-decoration: line-through;
                         margin-right: 0.5rem;

src/router/index.js

@@ -691,7 +691,11 @@ async function DisplayPageError(errorPayload = null) {
             type: globalEventTypes.Danger,
         }
     );
-    store.commit(storeMutations.UPDATE_IS_EXTERNAL_PARAMETER, externalParameterStatus.INACTIVE);
+    if (
+        store.getters.externalParameterState?.isExternalParameter == externalParameterStatus.ACTIVE
+    ) {
+        store.commit(storeMutations.UPDATE_IS_EXTERNAL_PARAMETER, externalParameterStatus.INACTIVE);
+    }
     baseMixin.methods.dispatchStoreAction(storeActions.RESET_SAVE_SESSION_PROMISE);
     const pageError = getQuerystringParameter(queryStrings.PAGE_ERROR);
 
@@ -772,22 +776,6 @@ function getRedirectedStartPage() {
 }
 
 function updateExternalParameterState() {
-    // if there is an existing external parameter state then they have already been through from an external source(LeadGen) and
-    // are returning.  clear out prior related things that need to be selected again like parts and damage type.
-    if (
-        store.getters.externalParameterState?.isExternalParameter ==
-        externalParameterStatus.INACTIVE
-    ) {
-        store.dispatch(storeActions.RESET_VEHICLE_STATE_AND_DEPENDENCIES);
-        store.dispatch(storeActions.SAVE_SERVICE_ZIP_CODE_INFO, {
-            state: null,
-            zipCode: null,
-            zipCodeCtu: null,
-        });
-        store.dispatch(storeActions.SAVE_EMAIL, null);
-        store.dispatch(storeActions.RESET_DAMAGE_STATE_AND_DEPENDENCIES);
-    }
-
     const externalParameterYear = getQuerystringParameter(queryStrings.VEHICLE_YEAR);
     const externalParameterMake = getQuerystringParameter(queryStrings.VEHICLE_MAKE);
     const externalParameterModel = getQuerystringParameter(queryStrings.VEHICLE_MODEL);
@@ -806,6 +794,7 @@ function updateExternalParameterState() {
         externalParameterModel &&
         externalParameterStyle
     ) {
+        resetStoreForExternalParameter();
         store.commit(storeMutations.UPDATE_IS_EXTERNAL_PARAMETER, externalParameterStatus.ACTIVE);
         store.commit(storeMutations.UPDATE_EXTERNAL_PARAMETER_YEAR, externalParameterYear);
         store.commit(storeMutations.UPDATE_EXTERNAL_PARAMETER_MAKE, externalParameterMake);
@@ -856,4 +845,22 @@ function updateExternalParameterState() {
     }
 }
 
+// if there is an existing external parameter state then they have already been through from an external source(LeadGen) and
+// are returning.  clear out prior related things that need to be selected again like parts and damage type.
+function resetStoreForExternalParameter() {
+    if (
+        store.getters.externalParameterState?.isExternalParameter ==
+        externalParameterStatus.INACTIVE
+    ) {
+        store.dispatch(storeActions.RESET_VEHICLE_STATE_AND_DEPENDENCIES);
+        store.dispatch(storeActions.SAVE_SERVICE_ZIP_CODE_INFO, {
+            state: null,
+            zipCode: null,
+            zipCodeCtu: null,
+        });
+        store.dispatch(storeActions.SAVE_EMAIL, null);
+        store.dispatch(storeActions.RESET_DAMAGE_STATE_AND_DEPENDENCIES);
+    }
+}
+
 export default router;