Merge branch 'release/2023.01.12' into rlsmerge/2023.01.12-to-develop

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

@@ -13,34 +13,38 @@
                     class="sub-label m-0"
                     v-if="this.buttonLabelSubCopy"
                     v-html="this.buttonLabelSubCopy"></p>
-                <!-- Parse the body text containing <ul> with logic -->
+                <div class="hide-when-closed">
-                <ul>
+                    <!-- Parse the body text containing <ul> with logic -->
-                    <li v-for="listItem in this.arrayOfListItemsFromBodyText" :key="listItem">
+                    <ul>
-                        <!-- no textLink -->
+                        <li v-for="listItem in this.arrayOfListItemsFromBodyText" :key="listItem">
-                        <span v-if="!doesCopyContainTextLink(listItem)" v-html="listItem"></span>
+                            <!-- no textLink -->
-                        <!-- with textLink -->
+                            <span
-                        <template
+                                v-if="!doesCopyContainTextLink(listItem)"
-                            v-else
+                                v-html="listItem"></span>
-                            v-for="copy in splitCopyOnCMSPlaceHolder(listItem)"
+                            <!-- with textLink -->
-                            :key="copy">
+                            <template
-                            <span v-if="!doesCopyContainTextLink(copy)" v-html="copy"></span>
+                                v-else
-                            <span v-else>
+                                v-for="copy in splitCopyOnCMSPlaceHolder(listItem)"
-                                <textLink
+                                :key="copy">
-                                    linkType="text"
+                                <span v-if="!doesCopyContainTextLink(copy)" v-html="copy"></span>
-                                    :text="getLinkDisplayTextFromCopy(copy)"
+                                <span v-else>
-                                    href="#!"
+                                    <textLink
-                                    data-bs-toggle="modal"
+                                        linkType="text"
-                                    :data-bs-target="'#' + getLinkTargetFromCopy(copy)"
+                                        :text="getLinkDisplayTextFromCopy(copy)"
-                                    aria-label="Modal window" />
+                                        href="#!"
-                            </span>
+                                        data-bs-toggle="modal"
-                        </template>
+                                        :data-bs-target="'#' + getLinkTargetFromCopy(copy)"
-                    </li>
+                                        aria-label="Modal window" />
-                </ul>
+                                </span>
-                <!-- End of body text parsing -->
+                            </template>
-                <div
+                        </li>
-                    class="package-footer fw-bold caption ms-n6"
+                    </ul>
-                    v-if="this.buttonFooterCopy"
+                    <!-- End of body text parsing -->
-                    v-html="this.buttonFooterCopy"></div>
+                    <div
+                        class="package-footer fw-bold caption ms-n6"
+                        v-if="this.buttonFooterCopy"
+                        v-html="this.buttonFooterCopy"></div>
+                </div>
             </div>
         </div>
     </baseInputButton>
@@ -114,10 +118,10 @@ export default {
                     0px 4px 24px -8px rgba(0, 0, 0, 0.2);
                 border-radius: 0.5rem;
                 overflow: hidden;
-                min-height: 58px;
+                min-height: 60px;
 
                 &.has-subheader {
-                    min-height: 78px;
+                    min-height: 80px;
                 }
 
                 &:before {
@@ -159,6 +163,13 @@ export default {
                         max-height: 1000px;
                     }
                 }
+                + .package-label {
+                    .package-specs {
+                        .hide-when-closed {
+                            display: block;
+                        }
+                    }
+                }
                 + .package-label {
                     background-color: $blue-100;
                     border: 1px solid $blue;
@@ -194,7 +205,7 @@ export default {
             flex-direction: column;
             width: 100%;
             max-height: 0;
-            transition: all 0.75s ease;
+            transition: all 0.5s ease;
 
             p {
                 font-weight: 500;
@@ -220,6 +231,20 @@ export default {
                     font-size: 0.875rem;
                 }
             }
+
+            @keyframes slideaway {
+                from {
+                    display: block;
+                }
+                to {
+                    transform: translateY(40px);
+                    opacity: 0;
+                }
+            }
+
+            .hide-when-closed {
+                display: none;
+            }
         }
     }
 }

src/layouts/vehicle-damage/replace-options-question/replace-options-question.vue

@@ -101,6 +101,17 @@ export default {
                 this.selectedValues = this.isMultiSelect ? [] : "";
             }
         },
+        replaceOptions(replaceOptions) {
+            // For rear window, in case user chooses slider and later comes back
+            // with a vehicle with only stationary
+            if (
+                !Array.isArray(this.selectedValues) &&
+                !replaceOptions.includes(this.selectedValues)
+            ) {
+                this.selectedValues = null;
+                this.updateSelectedValues();
+            }
+        },
     },
     components: {
         buttonQuestion,

src/mixins/vehicle-questions-mixin.js

@@ -476,18 +476,24 @@ export default {
             let currentPartsOrQuestions = null;
 
             if (
-                currentPage !== fmgPageValues.CAPABILITY_QUESTIONS &&
+                this.currentPageComesAfterPage(currentPage, fmgPageValues.CAPABILITY_QUESTIONS) &&
                 !!pageDataCapabilityQuestions
             ) {
                 currentPartsOrQuestions = pageDataCapabilityQuestions?.partsOrQuestions;
             } else if (
-                currentPage !== fmgPageValues.MOLDING_QUESTIONS &&
+                this.currentPageComesAfterPage(currentPage, fmgPageValues.MOLDING_QUESTIONS) &&
                 !!pageDataMoldingQuestions
             ) {
                 currentPartsOrQuestions = pageDataMoldingQuestions?.partsOrQuestions;
-            } else if (currentPage !== fmgPageValues.VEHICLE_PARTS && !!pageDataVehicleParts) {
+            } else if (
+                this.currentPageComesAfterPage(currentPage, fmgPageValues.VEHICLE_PARTS) &&
+                !!pageDataVehicleParts
+            ) {
                 currentPartsOrQuestions = pageDataVehicleParts?.partsOrQuestions;
-            } else if (currentPage !== fmgPageValues.PARTS_QUESTIONS && !!pageDataPartQuestions) {
+            } else if (
+                this.currentPageComesAfterPage(currentPage, fmgPageValues.PARTS_QUESTIONS) &&
+                !!pageDataPartQuestions
+            ) {
                 currentPartsOrQuestions = pageDataPartQuestions?.partsOrQuestions;
             }
 

src/router/router-constants/routing-table.js

@@ -267,6 +267,10 @@ const routingTable = function (store) {
                     scenario: navigationScenarios.CLICKED_FORWARD_WITH_CAPABILITY_QUESTIONS,
                     destinationFmgPageValue: fmgPageValues.CAPABILITY_QUESTIONS,
                 },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_NO_MORE_QUESTIONS,
+                    destinationFmgPageValue: fmgPageValues.QUOTE,
+                },
             ],
         },
         {

src/store/index.js

@@ -343,6 +343,13 @@ export const mutations = {
         state.order.damage.isRepair = sessionInformation.order.damage.isRepair;
         state.order.damage.numberOfChips = sessionInformation.order.damage.numberOfChips;
 
+        state.order.damage.partQuestionAnswers =
+            sessionInformation.order.damage.partQuestionAnswers;
+        state.order.damage.moldingQuestionAnswers =
+            sessionInformation.order.damage.moldingQuestionAnswers;
+        state.order.damage.capabilityQuestionAnswers =
+            sessionInformation.order.damage.capabilityQuestionAnswers;
+
         state.order.lineItems.glassParts = sessionInformation.order.lineItems.glassParts;
         state.order.lineItems.supportingItems = sessionInformation.order.lineItems.supportingItems;
         state.order.lineItems.vaps = sessionInformation.order.lineItems.vaps;

src/ux-components/button-main/button-main.vue

@@ -100,6 +100,7 @@ export default {
             color: $white;
             background: $blue-700;
             box-shadow: 0 0 0 3px, 0 0 0 5.5px $blue-700;
+            pointer-events: none;
         }
         &.delay {
             // fixes flicker while transitioning between states
@@ -140,6 +141,7 @@ export default {
         &.has-loader {
             color: $white;
             @include blue-gradient;
+            pointer-events: none;
         }
         &.delay {
             // fixes flicker while transitioning between states

src/ux-components/list-button-horizontal/list-button-horizontal.vue

@@ -99,6 +99,7 @@ export default {
             border: 1px solid $blue-700;
             z-index: 2;
             color: $blue;
+            height: 100%;
 
             span {
                 font-size: 1rem;