Merge branch 'release/2025.09.04' into feature/CASH-1184

This commit is contained in:
Johnny Shultz 2025-08-28 15:19:42 -04:00 committed by GitHub
commit f4ac8a5bd7
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 43 additions and 19 deletions

View file

@ -6,6 +6,7 @@
:max-length="12" :max-length="12"
v-model="selectedValue" v-model="selectedValue"
:mask="mask" :mask="mask"
placeholderText="###-###-####"
:isRequired="isRequired" :isRequired="isRequired"
:validationRules="validationRulesForTextBoxQuestion" :validationRules="validationRulesForTextBoxQuestion"
:cmsWidgetName="cmsWidgetName" /> :cmsWidgetName="cmsWidgetName" />

View file

@ -3,7 +3,9 @@
<div class="px-0" v-if="isCartReadyToLoad"> <div class="px-0" v-if="isCartReadyToLoad">
<div <div
class="row vin-toggle flex align-items-center pt-4" class="row vin-toggle flex align-items-center pt-4"
:class="[isExpanded ? 'expanded' : '']" :class="[
isCollapsible ? (isExpanded ? 'expanded' : '') : 'expanded non-collapsible',
]"
@click="toggleIsExpanded()"> @click="toggleIsExpanded()">
<a <a
aria-label="expand cart" aria-label="expand cart"
@ -208,6 +210,7 @@ export default {
isItac: Boolean, isItac: Boolean,
isNoComp: Boolean, isNoComp: Boolean,
isExpandedOnLoad: Boolean, isExpandedOnLoad: Boolean,
isCollapsible: { type: Boolean, default: true },
isMSRFeeApplicable: Boolean, isMSRFeeApplicable: Boolean,
donationCartItem: Object, donationCartItem: Object,
}, },
@ -1182,6 +1185,11 @@ export default {
font-weight: 500; font-weight: 500;
line-height: 1.625; line-height: 1.625;
} }
.non-collapsible {
.amount-due {
display: none;
}
}
.amount-due { .amount-due {
color: $green; color: $green;
@ -1283,23 +1291,26 @@ export default {
margin-top: 0.5rem; margin-top: 0.5rem;
} }
.vin-toggle { .vin-toggle {
&:after { &:not(.non-collapsible) {
content: ""; &:after {
transition: all 0.5s ease; content: "";
background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' fill='none' viewBox='0 0 24 24'%3E%3Cpath fill='%230070D1' d='M12 0a12 12 0 1 0 0 24 12 12 0 0 0 0-24Zm6.113 11.28-5.52 5.52a.84.84 0 0 1-1.186 0l-5.52-5.52a.843.843 0 1 1 1.186-1.2L12 15.012l4.927-4.932a.843.843 0 1 1 1.186 1.2Z'/%3E%3C/svg%3E"); transition: all 0.5s ease;
background-repeat: no-repeat; background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' fill='none' viewBox='0 0 24 24'%3E%3Cpath fill='%230070D1' d='M12 0a12 12 0 1 0 0 24 12 12 0 0 0 0-24Zm6.113 11.28-5.52 5.52a.84.84 0 0 1-1.186 0l-5.52-5.52a.843.843 0 1 1 1.186-1.2L12 15.012l4.927-4.932a.843.843 0 1 1 1.186 1.2Z'/%3E%3C/svg%3E");
background-position: right center; background-repeat: no-repeat;
width: 24px; background-position: right center;
height: 24px; width: 24px;
display: inline-flex; height: 24px;
position: relative; display: inline-flex;
right: 0.75rem; position: relative;
margin: 0.5rem 0 0.5rem 1rem; right: 0.75rem;
cursor: pointer; margin: 0.5rem 0 0.5rem 1rem;
} cursor: pointer;
&.expanded:after { }
transform: rotate(180deg); &.expanded:after {
transform: rotate(180deg);
}
} }
&.expanded + .cart-panel { &.expanded + .cart-panel {
max-height: 650px; max-height: 650px;
transition: all 150ms ease-in; transition: all 150ms ease-in;
@ -1307,6 +1318,13 @@ export default {
padding: 1rem 0 0.5rem; padding: 1rem 0 0.5rem;
visibility: visible; visibility: visible;
} }
&.non-collapsible {
& > a {
cursor: default;
}
}
a { a {
font-family: UrbanistSemibold; font-family: UrbanistSemibold;
text-decoration: none; text-decoration: none;

View file

@ -4,7 +4,10 @@
<div class="container page-container-grouped-styles"> <div class="container page-container-grouped-styles">
<div class="row"> <div class="row">
<div class="col-12 col-md-10 col-lg-8 col-xl-7"> <div class="col-12 col-md-10 col-lg-8 col-xl-7">
<funnelSubHeader cmsWidgetName="FunnelSubHeaderWidget" class="mt-4 mb-5" /> <funnelSubHeader
cmsWidgetName="FunnelSubHeaderWidget"
class="mt-4 mb-5"
alignLeft />
<textboxQuestion <textboxQuestion
isRequired isRequired
class="mb-4" class="mb-4"

View file

@ -53,7 +53,7 @@
:showInsuranceCoverageAs="showInsuranceCoverageAs" :showInsuranceCoverageAs="showInsuranceCoverageAs"
:isItac="isItac" :isItac="isItac"
:isNoComp="isNoComp" :isNoComp="isNoComp"
:isExpandedOnLoad="true" /> :isCollapsible="false" />
<button <button
v-if="showSwitchPaymentMethod" v-if="showSwitchPaymentMethod"
@ -936,6 +936,7 @@ export default {
} }
& > #cart-container { & > #cart-container {
flex-basis: 36%; flex-basis: 36%;
margin-top: 2rem;
} }
@include media-breakpoint-down(lg) { @include media-breakpoint-down(lg) {
@ -946,6 +947,7 @@ export default {
} }
& > #cart-container { & > #cart-container {
flex-basis: 100%; flex-basis: 100%;
margin: 0 0.5rem;
& > button#submit-payment { & > button#submit-payment {
display: none; display: none;