Merge pull request #2815 from Safelite/feature/CASH-1450

Feature/cash1450

src/fmg-components/cart/cart.vue

@@ -11,7 +11,7 @@
                     aria-label="expand cart"
                     href="javascript:void(0)"
                     class="col d-flex justify-content-between py-0">
-                    <span class="label">{{ OrderDetailsText }}</span>
+                    <span class="label">{{ cartHeaderText }}</span>
                     <span class="label amount-due larger">
                         {{ getLineItemAmount(amountDue, showCoverageAsPending) }}
                     </span>
@@ -1097,9 +1097,19 @@ export default {
         amountDueText() {
             return this.getCmsContent("AmountDueTextWidget", "Text");
         },
-        OrderDetailsText() {
+        orderDetailsText() {
             return this.getCmsContent("OrderDetailsTextWidget", "Text");
         },
+        estimateDetailsText() {
+            return this.getCmsContent("EstimateDetailsTextWidget", "Text");
+        },
+        cartHeaderText() {
+            if (!this.isInsurance && this.shouldHideRecalibration) {
+                return this.estimateDetailsText;
+            } else {
+                return this.orderDetailsText;
+            }
+        },
         amountPaidText() {
             return this.getCmsContent("AmountPaidTextWidget", "Text");
         },

src/layouts/confirmation/confirmation.vue

@@ -66,9 +66,9 @@
                         :insuranceCompanyName="insuranceCompanyName"
                         :showInsuranceCoverageAs="showInsuranceCoverageAs"
                         :shouldHideRecalibration="shouldHideRecalibration"
-                        :isExpandedOnLoad="false"
                         :isItac="isItac"
                         :isNoComp="isNoComp"
+                        :isExpandedOnLoad="false"
                         :isMSRFeeApplicable="isMSRFeeApplicable" />
 
                     <hr class="mb-5" />

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

@@ -15,6 +15,31 @@
         <div v-html="apptWordingText" v-show="!isExpanded"></div>
 
         <div class="review-table px-4">
+            <serviceLocationReview
+                class="service-location"
+                cmsWidgetName="ServiceLocationTitleWidget"
+                :serviceLocation="serviceLocationInfo" />
+
+            <hr class="my-0" />
+
+            <scheduleReview cmsWidgetName="ScheduleWidget" :appointmentType="appointmentType" />
+
+            <hr class="my-0" />
+
+            <vehicleReview cmsWidgetName="VehicleReviewWidget" :vehicle="vehicleInfo" />
+
+            <hr class="my-0" />
+
+            <damageReview
+                cmsWidgetName="DamageReviewWidget"
+                damageLocationsWidgetName="DamageLocationsWidget"
+                :damage="damageInfo" />
+
+            <hr class="my-0" />
+
+            <customerReview cmsWidgetName="CustomerReviewWidget" :customer="customerInfo" />
+
+            <!-- the following was the order prior to Heritage parity
             <vehicleReview cmsWidgetName="VehicleReviewWidget" :vehicle="vehicleInfo" />
 
             <hr class="my-0" />
@@ -48,6 +73,7 @@
             <hr class="my-0" />
 
             <customerReview cmsWidgetName="CustomerReviewWidget" :customer="customerInfo" />
+            -->
         </div>
     </div>
 </template>
@@ -119,9 +145,8 @@ export default {
         customerReview,
         damageReview,
         scheduleReview,
-        serviceLocationReview,
-        servicePackageReview,
         vehicleReview,
+        serviceLocationReview,
     },
 };
 </script>

src/layouts/payment-method/review-dropdown/review-sections/customer-review/customer-review.spec.js

@@ -82,7 +82,6 @@ describe("Customer Review Block", () => {
 
         // Assert
         expect(wrapper.vm.displayContent).toEqual([
-            testConstants.displayContent.fullName,
             testConstants.displayContent.emailAddress,
             testConstants.displayContent.phoneNumber,
             testConstants.displayContent.smsOptIn,

src/layouts/payment-method/review-dropdown/review-sections/customer-review/customer-review.vue

@@ -21,7 +21,8 @@ export default {
     },
     computed: {
         displayContent() {
-            return [this.fullName, this.email, this.phoneNumber, this.smsOptIn];
+            return [this.email, this.phoneNumber, this.smsOptIn];
+            // return [this.fullName, this.email, this.phoneNumber, this.smsOptIn]; // prior to Heritage parity
         },
         header() {
             return this.getCmsContent(this.cmsWidgetName, "HeaderText");