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

Merge branch 'release/2025.02.13' into feature/CASH-48-bug

Browse source
This commit is contained in:
CarlNation 2025-02-03 14:59:09 -05:00
commit e559d37ac0
8 changed files with 125 additions and 125 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
src/digital-components/modal/modal.vue
View file

@ -29,9 +29,10 @@
<slot></slot>
</div>
<div class="modal-footer">
<slot name="modal-footer-slot"></slot>
<modalButtonMain
isPrimary
class="w-100"
class="w-100 modal-footer-button"
:id="modalId + '-modalbtn'"
ref="modalButtonMain"
loaderColor="white"
@ -258,56 +259,7 @@ export default {
}
}
}
.save-progress-modal-question {
p.modal-body {
padding: 0;
}
.modal-body {
display: flex;
flex-direction: column;
.textbox-question {
padding: 0;
margin: 0 0 1.5rem 0;
}
}
}
.save-progress-modal-question,
.save-progress-popup-question {
p.modal-body {
padding: 0;
}
.modal-body {
display: flex;
flex-direction: column;
.textbox-question {
label {
text-align: left;
font-weight: 900;
}
}
}
.modal-body-inner {
text-align: center;
margin-bottom: 1.5rem;
}
.modal-disclaimer {
font-size: 0.75rem;
order: 2;
text-align: left;
a {
text-decoration: none;
}
}
.modal-footer {
margin: 0 0 1.5rem 0;
padding-top: 0;
padding-bottom: 0;
}
}
body {
.modal-backdrop {
height: 100%;

78
src/fmg-components/save-progress-modal-question/save-progress-modal-question.vue
View file

@ -1,13 +1,12 @@
<template>
<div class="save-progress-modal-question" :class="isProgressSaved ? 'progress-saved' : ''">
<buttonMain
ref="buttonMain"
type="button"
v-if="!isProgressSaved"
:buttonText="buttonText"
loaderColor="white"
:suppressLoader="true"
class="save-progress-button"
class="open-save-progress-button"
@click-event="openModal" />
<alert
class="my-4"
@ -21,12 +20,14 @@
:onModalClosedCallback="onModalClosed"
:footerButtonText="modalButtonText"
@footer-button-event="saveProgress">
<p class="modal-body-inner">{{ modalBodyText }}</p>
<p class="modal-body-inner" v-html="modalBodyText"></p>
<saveProgressQuestion
ref="saveProgressQuestion"
v-model="userInput"
cmsWidgetName="SaveProgressQuestionWidget" />
<p class="modal-disclaimer" v-html="modalDisclaimerText"></p>
<template v-slot:modal-footer-slot>
<p class="modal-disclaimer" v-html="modalDisclaimerText"></p>
</template>
</modal>
</div>
</template>
@ -112,7 +113,7 @@ export default {
};
</script>
<style lang="scss" scoped>
<style lang="scss">
.save-progress-modal-question {
margin-bottom: 1.5rem;
order: 2;
@ -128,7 +129,7 @@ export default {
background: none;
}
.save-progress-button {
.open-save-progress-button {
order: 4;
position: relative;
color: $blue;
@ -160,12 +161,57 @@ export default {
transition: background 0s 0s ease-in-out;
}
}
:deep(.alert) {
.modal.modal-component .modal-dialog .modal-content {
.modal-header {
padding-top: 0;
margin-top: 1.875rem;
}
.modal-body {
display: flex;
flex-direction: column;
padding: 0 1.5rem;
.textbox-question {
padding: 0;
margin: 0 0 1.5rem 0;
label {
text-align: left;
font-weight: 900;
}
}
}
.modal-body-inner {
text-align: center;
margin-bottom: 1.5rem;
}
.modal-disclaimer {
font-size: 0.75rem;
order: 2;
text-align: left;
margin: 0;
a {
text-decoration: none;
}
}
.modal-footer {
margin: 0 0 1.5rem 0;
padding-top: 0;
padding-bottom: 0;
button.btn {
margin-bottom: 1.5rem;
}
}
}
.alert {
border-radius: $border-radius-lg;
border: 1px solid $green;
margin-top: 0;
}
:deep(.alert-heading) {
.alert-heading {
position: relative;
font-weight: 600;
font-size: 1rem;
@ -183,20 +229,4 @@ export default {
}
}
}
.applied-promo {
font-size: 0.875rem;
font-weight: 500;
line-height: 24px;
color: $green;
.promo-code {
text-transform: uppercase;
}
}
.alert {
color: $red;
font-size: 0.875rem;
font-weight: 500;
line-height: 24px;
}
</style>

96
src/fmg-components/save-progress-popup-question/save-progress-popup-question.vue
View file

@ -14,20 +14,22 @@
v-model="userInput"
cmsWidgetName="SaveProgressPopupQuestionWidget"
class="save-progress-popup-question" />
<buttonMain
ref="skipButton"
type="button"
:buttonText="buttonText"
loaderColor="white"
:suppressLoader="true"
class="skip-button"
@click-event="closeModal" />
<template v-slot:modal-footer-slot>
<buttonMain
ref="skipButton"
type="button"
:buttonText="buttonText"
loaderColor="white"
:suppressLoader="true"
class="skip-button"
@click-event="closeModal" />
<p class="modal-disclaimer" v-html="modalDisclaimerText"></p>
</template>
<alert
class="my-4"
v-if="isProgressSaved"
cmsWidgetName="SaveProgressModalAlertWidget"
alertClass="alert-success" />
<p class="modal-disclaimer" v-html="modalDisclaimerText"></p>
</modal>
</div>
</template>
@ -205,35 +207,63 @@ export default {
left: 0;
}
}
.modal-footer {
order: 3;
padding: 0;
}
.modal-disclaimer {
order: 4;
.modal.modal-component .modal-dialog .modal-content {
p.modal-body {
padding: 0;
}
.modal-body {
display: flex;
flex-direction: column;
padding: 0 1.5rem;
.textbox-question {
padding: 0;
margin: 0 0 1.5rem 0;
label {
text-align: left;
font-weight: 900;
}
}
}
.modal-body-inner {
text-align: center;
margin-bottom: 1.5rem;
}
.modal-footer {
padding: 0 1.5rem;
margin: 0 0 1.5rem 0;
button.btn {
order: 1;
margin-bottom: 1.5rem;
}
button.btn.skip-button {
padding: 0;
order: 2;
font-size: 1rem;
}
.modal-disclaimer {
font-size: 0.75rem;
text-align: left;
order: 3;
margin: 0;
a {
text-decoration: none;
}
}
}
}
&.progress-saved {
.modal-footer,
.save-progress-popup-question {
.modal-footer-button,
.modal-disclaimer {
display: none;
}
.skip-button {
margin-bottom: 0;
}
}
}
.applied-promo {
font-size: 0.875rem;
font-weight: 500;
line-height: 24px;
color: $green;
.promo-code {
text-transform: uppercase;
}
}
.alert {
color: $red;
font-size: 0.875rem;
font-weight: 500;
line-height: 24px;
}
</style>

4
src/layouts/capability-questions/capability-questions.vue
View file

@ -64,9 +64,7 @@ export default {
// Call the "next" function to complete the transition to this page.
next(async (vm) => {
vm.setCmsContent(resultMap.cmsContent);
// turned off Save Your Progress for 1/23/25 release
// to restore, uncomment line below
// vm.showSaveProgressModal = !(emailFromStore?.length > 0);
vm.showSaveProgressModal = !(emailFromStore?.length > 0);
if (store.getters.externalParameterState?.isExternalParameter) {
if (store.getters.externalParameterServiceZip.zipCode) {
await baseMixin.methods.dispatchStoreAction(

4
src/layouts/molding-questions/molding-questions.vue
View file

@ -64,9 +64,7 @@ export default {
// Call the "next" function to complete the transition to this page.
next(async (vm) => {
vm.setCmsContent(resultMap.cmsContent);
// turned off Save Your Progress for 1/23/25 release
// to restore, uncomment line below
// vm.showSaveProgressModal = !(emailFromStore?.length > 0);
vm.showSaveProgressModal = !(emailFromStore?.length > 0);
if (store.getters.externalParameterState?.isExternalParameter) {
if (store.getters.externalParameterServiceZip.zipCode) {
await baseMixin.methods.dispatchStoreAction(

4
src/layouts/part-questions/part-questions.vue
View file

@ -64,9 +64,7 @@ export default {
// Call the "next" function to complete the transition to this page.
next(async (vm) => {
vm.setCmsContent(resultMap.cmsContent);
// turned off Save Your Progress for 1/23/25 release
// to restore, uncomment line below
// vm.showSaveProgressModal = !(emailFromStore?.length > 0);
vm.showSaveProgressModal = !(emailFromStore?.length > 0);
if (store.getters.externalParameterState?.isExternalParameter) {
if (store.getters.externalParameterServiceZip.zipCode) {
const serviceState = store.getters.order.serviceLocation.state;

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

@ -294,12 +294,8 @@ export default {
// Call the "next" function to complete the transition to this page.
next(async (vm) => {
vm.setCmsContent(resultMap.cmsContent);
// turned off Save Your Progress for 1/23/25 release
// to restore, uncomment the 2 lines below
// vm.showSaveProgressPopup = showSaveProgressPopup;
// vm.showSaveProgressModal = showSaveProgressModal;
vm.showSaveProgressPopup = showSaveProgressPopup;
vm.showSaveProgressModal = showSaveProgressModal;
vm.addableVaps = addableVaps;
vm.lineItems = lineItems;
vm.availableLineItems = pricingResults;

4
src/layouts/vehicle-parts/vehicle-parts.vue
View file

@ -94,9 +94,7 @@ export default {
// Call the "next" function to complete the transition to this page.
next((vm) => {
vm.setCmsContent(resultMap.cmsContent);
// turned off Save Your Progress for 1/23/25 release
// to restore, uncomment line below
// vm.showSaveProgressModal = !(emailFromStore?.length > 0);
vm.showSaveProgressModal = !(emailFromStore?.length > 0);
// Glass Part Question dynamic component
Object.keys(vm.$refs)