jason/DigitalConsumer.FixMyGlass
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #2863 from Safelite/feature/bugfix/CASH-1502

Browse source 
Feature/bugfix/cash-1502
This commit is contained in:
AdamCaouetteSafelite 2025-09-24 10:14:45 -04:00 committed by GitHub
commit 4fe2e1443f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 22 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/layouts/estimate/estimate.vue
View file

@ -275,6 +275,7 @@ export default {
} }
.sub-text strong { .sub-text strong {
text-transform: uppercase; text-transform: uppercase;
font-weight: 400;
} }
} }

13
src/layouts/quote/quote.vue
View file

@ -2,7 +2,9 @@
<Form @submit="onSubmit" @invalid-submit="onInvalidSubmit" ref="theForm" v-slot="{ meta }"> <Form @submit="onSubmit" @invalid-submit="onInvalidSubmit" ref="theForm" v-slot="{ meta }">
<loadingModal ref="loadingModal" /> <loadingModal ref="loadingModal" />
<funnelHeader cmsWidgetName="FunnelHeaderWidget" ref="funnelHeader" /> <funnelHeader cmsWidgetName="FunnelHeaderWidget" ref="funnelHeader" />
<div class="container quote position-relative"> <div
class="container quote position-relative"
:class="[showSaveProgressPopup ? 'initial-popup-open' : '']">
<div class="row justify-content-center"> <div class="row justify-content-center">
<div class="col-12"> <div class="col-12">
<funnelSubHeader class="mb-5" cmsWidgetName="FunnelSubHeaderWidget" /> <funnelSubHeader class="mb-5" cmsWidgetName="FunnelSubHeaderWidget" />
@ -286,6 +288,7 @@ export default {
const isEmailInStoreOnPageLoad = emailFromStore?.length > 0; const isEmailInStoreOnPageLoad = emailFromStore?.length > 0;
const isPopupSkipped = const isPopupSkipped =
store.getters.pageData(routeData.QUOTE.name)?.saveProgressPopupSkipped === true; store.getters.pageData(routeData.QUOTE.name)?.saveProgressPopupSkipped === true;
// "popup" is the automatic opening centered popup on load
const showSaveProgressPopup = !(isEmailInStoreOnPageLoad || isPopupSkipped); const showSaveProgressPopup = !(isEmailInStoreOnPageLoad || isPopupSkipped);
const showSaveProgressModal = isEmailInStoreOnPageLoad ? false : true; const showSaveProgressModal = isEmailInStoreOnPageLoad ? false : true;
const shouldSkipToInsurance = const shouldSkipToInsurance =
@ -555,8 +558,8 @@ export default {
servicePackage: null, servicePackage: null,
holdParentAccountNumber: null, holdParentAccountNumber: null,
holdBillToAccountNumber: null, holdBillToAccountNumber: null,
showSaveProgressPopup: null, showSaveProgressPopup: null, // "popup" is the automatic opening centered popup on load
showSaveProgressModal: null, showSaveProgressModal: null, // "modal" is the user-triggered slide-in drawer
isSaveProgressComplete: null, isSaveProgressComplete: null,
packageNumber: null, packageNumber: null,
skipToInsurance: null, skipToInsurance: null,
@ -899,6 +902,10 @@ export default {
<style lang="scss" scoped> <style lang="scss" scoped>
// Unique to quote page for 2.0/Heritage parity // Unique to quote page for 2.0/Heritage parity
// prettier-ignore
.prevent-modal-scroll.modal-open .container.quote.initial-popup-open .row:not(.save-progress-popup) {
display: none;
}
.quote { .quote {
padding-bottom: 2rem; padding-bottom: 2rem;

27
src/ux-components/text-link/text-link.vue
View file

@ -1,26 +1,21 @@
<template> <template>
<loadingModal v-if="useLoadingModal" notFullScreen ref="loadingModal" /> <loadingModal v-if="useLoadingModal" notFullScreen ref="loadingModal" />
<a v-if="linkType === 'navigation'" @click="handleClick" class="navigation-link" :href="href"> <!-- NOTE: each prettier-ignore is needed below...
{{ text }} each anchor that follows needs to be one single line in markup or adds unwanted spaces within link (fixes CASH-1502) -->
<slot name="after-text"></slot>
</a> <!-- prettier-ignore -->
<a v-if="linkType === 'navigation'" @click="handleClick" class="navigation-link" :href="href">{{ text }}<slot name="after-text"></slot></a>
<!-- prettier-ignore -->
<a <a
v-else-if="linkType === 'newWindowLink'" v-else-if="linkType === 'newWindowLink'"
@click="handleClick" @click="handleClick"
class="new-window-link" class="new-window-link"
:href="href" :href="href"
target="_blank"> target="_blank">{{ text }}<slot name="after-text"></slot></a>
{{ text }} <!-- prettier-ignore -->
<slot name="after-text"></slot> <a v-else-if="linkType === 'textSmall'" @click="handleClick" class="small" :href="href">{{ text }}<slot name="after-text"></slot></a>
</a> <!-- prettier-ignore -->
<a v-else-if="linkType === 'textSmall'" @click="handleClick" class="small" :href="href"> <a v-else-if="linkType === 'text'" @click="handleClick" :href="href">{{ text }}<slot name="after-text"></slot></a>
{{ text }}
<slot name="after-text"></slot>
</a>
<a v-else-if="linkType === 'text'" @click="handleClick" :href="href">
{{ text }}
<slot name="after-text"></slot>
</a>
</template> </template>
<script> <script>