From 048f8eb9abd74a94f8bad7320cb28e2d3f8d7fb0 Mon Sep 17 00:00:00 2001 From: AdamCaouetteSafelite Date: Mon, 1 Sep 2025 23:20:17 -0400 Subject: [PATCH 1/3] CASH-1123: logic changes for cart subheader --- src/fmg-components/cart/cart.vue | 14 ++++++++++++-- src/layouts/confirmation/confirmation.vue | 2 +- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/src/fmg-components/cart/cart.vue b/src/fmg-components/cart/cart.vue index 8337e78a1..c1f281e3d 100644 --- a/src/fmg-components/cart/cart.vue +++ b/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"> - {{ OrderDetailsText }} + {{ cartHeaderText }} {{ getLineItemAmount(amountDue, showCoverageAsPending) }} @@ -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"); }, diff --git a/src/layouts/confirmation/confirmation.vue b/src/layouts/confirmation/confirmation.vue index b497125a1..2e1963288 100644 --- a/src/layouts/confirmation/confirmation.vue +++ b/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" />
From 5f227f78fd466d697cdf51a4580dab671b02cabb Mon Sep 17 00:00:00 2001 From: AdamCaouetteSafelite Date: Tue, 2 Sep 2025 08:10:51 -0400 Subject: [PATCH 2/3] CASH-1450: appointment details fixes --- .../review-dropdown/review-dropdown.vue | 29 +++++++++++++++++-- .../customer-review/customer-review.vue | 3 +- 2 files changed, 29 insertions(+), 3 deletions(-) diff --git a/src/layouts/payment-method/review-dropdown/review-dropdown.vue b/src/layouts/payment-method/review-dropdown/review-dropdown.vue index 3aec6383b..9b568d48f 100644 --- a/src/layouts/payment-method/review-dropdown/review-dropdown.vue +++ b/src/layouts/payment-method/review-dropdown/review-dropdown.vue @@ -15,6 +15,31 @@
+ + +
+ + + +
+ + + +
+ + + +
+ + + +
@@ -119,9 +145,8 @@ export default { customerReview, damageReview, scheduleReview, - serviceLocationReview, - servicePackageReview, vehicleReview, + serviceLocationReview, }, }; diff --git a/src/layouts/payment-method/review-dropdown/review-sections/customer-review/customer-review.vue b/src/layouts/payment-method/review-dropdown/review-sections/customer-review/customer-review.vue index 2fd82c716..0aa384682 100644 --- a/src/layouts/payment-method/review-dropdown/review-sections/customer-review/customer-review.vue +++ b/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"); From fa65a56bf06d78e44d673b74abe606cf31d99b94 Mon Sep 17 00:00:00 2001 From: AdamCaouetteSafelite Date: Tue, 2 Sep 2025 08:12:02 -0400 Subject: [PATCH 3/3] CASH-1450: amend unit test --- .../review-sections/customer-review/customer-review.spec.js | 1 - 1 file changed, 1 deletion(-) diff --git a/src/layouts/payment-method/review-dropdown/review-sections/customer-review/customer-review.spec.js b/src/layouts/payment-method/review-dropdown/review-sections/customer-review/customer-review.spec.js index 13138a182..08dac9e5e 100644 --- a/src/layouts/payment-method/review-dropdown/review-sections/customer-review/customer-review.spec.js +++ b/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,