Merge branch 'release/2025.01.23' into feature/CASH-109
This commit is contained in:
commit
7ad42554d5
6 changed files with 31 additions and 18 deletions
|
|
@ -27,17 +27,17 @@
|
|||
</div>
|
||||
<div class="modal-body ps-5 pe-5 pb-4 pt-1">
|
||||
<slot></slot>
|
||||
<div class="modal-footer">
|
||||
<modalButtonMain
|
||||
isPrimary
|
||||
class="w-100"
|
||||
:id="modalId + '-modalbtn'"
|
||||
ref="modalButtonMain"
|
||||
loaderColor="white"
|
||||
:buttonText="footerButtonText"
|
||||
@click-event="validateAndEmit"
|
||||
:class="isFooterButtonDisabled && 'form-test-invalid'" />
|
||||
</div>
|
||||
</div>
|
||||
<div class="modal-footer">
|
||||
<modalButtonMain
|
||||
isPrimary
|
||||
class="w-100"
|
||||
:id="modalId + '-modalbtn'"
|
||||
ref="modalButtonMain"
|
||||
loaderColor="white"
|
||||
:buttonText="footerButtonText"
|
||||
@click-event="validateAndEmit"
|
||||
:class="isFooterButtonDisabled && 'form-test-invalid'" />
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -173,7 +173,7 @@ export default {
|
|||
}
|
||||
}
|
||||
.modal-footer {
|
||||
padding: 1rem 0;
|
||||
padding: 1rem 1.5rem;
|
||||
position: sticky;
|
||||
width: 100%;
|
||||
bottom: 0;
|
||||
|
|
|
|||
|
|
@ -64,7 +64,9 @@ export default {
|
|||
// Call the "next" function to complete the transition to this page.
|
||||
next(async (vm) => {
|
||||
vm.setCmsContent(resultMap.cmsContent);
|
||||
vm.showSaveProgressModal = !(emailFromStore?.length > 0);
|
||||
// turned off Save Your Progress for 1/23/25 release
|
||||
// to restore, uncomment line below
|
||||
// vm.showSaveProgressModal = !(emailFromStore?.length > 0);
|
||||
if (store.getters.externalParameterState?.isExternalParameter) {
|
||||
if (store.getters.externalParameterServiceZip.zipCode) {
|
||||
await baseMixin.methods.dispatchStoreAction(
|
||||
|
|
|
|||
|
|
@ -64,7 +64,9 @@ export default {
|
|||
// Call the "next" function to complete the transition to this page.
|
||||
next(async (vm) => {
|
||||
vm.setCmsContent(resultMap.cmsContent);
|
||||
vm.showSaveProgressModal = !(emailFromStore?.length > 0);
|
||||
// turned off Save Your Progress for 1/23/25 release
|
||||
// to restore, uncomment line below
|
||||
// vm.showSaveProgressModal = !(emailFromStore?.length > 0);
|
||||
if (store.getters.externalParameterState?.isExternalParameter) {
|
||||
if (store.getters.externalParameterServiceZip.zipCode) {
|
||||
await baseMixin.methods.dispatchStoreAction(
|
||||
|
|
|
|||
|
|
@ -64,7 +64,9 @@ export default {
|
|||
// Call the "next" function to complete the transition to this page.
|
||||
next(async (vm) => {
|
||||
vm.setCmsContent(resultMap.cmsContent);
|
||||
vm.showSaveProgressModal = !(emailFromStore?.length > 0);
|
||||
// turned off Save Your Progress for 1/23/25 release
|
||||
// to restore, uncomment line below
|
||||
// vm.showSaveProgressModal = !(emailFromStore?.length > 0);
|
||||
if (store.getters.externalParameterState?.isExternalParameter) {
|
||||
if (store.getters.externalParameterServiceZip.zipCode) {
|
||||
const serviceState = store.getters.order.serviceLocation.state;
|
||||
|
|
|
|||
|
|
@ -293,8 +293,12 @@ export default {
|
|||
// Call the "next" function to complete the transition to this page.
|
||||
next(async (vm) => {
|
||||
vm.setCmsContent(resultMap.cmsContent);
|
||||
vm.showSaveProgressPopup = showSaveProgressPopup;
|
||||
vm.showSaveProgressModal = showSaveProgressModal;
|
||||
|
||||
// turned off Save Your Progress for 1/23/25 release
|
||||
// to restore, uncomment the 2 lines below
|
||||
// vm.showSaveProgressPopup = showSaveProgressPopup;
|
||||
// vm.showSaveProgressModal = showSaveProgressModal;
|
||||
|
||||
vm.addableVaps = addableVaps;
|
||||
vm.lineItems = lineItems;
|
||||
vm.availableLineItems = pricingResults;
|
||||
|
|
|
|||
|
|
@ -94,7 +94,10 @@ export default {
|
|||
// Call the "next" function to complete the transition to this page.
|
||||
next((vm) => {
|
||||
vm.setCmsContent(resultMap.cmsContent);
|
||||
vm.showSaveProgressModal = !(emailFromStore?.length > 0);
|
||||
// turned off Save Your Progress for 1/23/25 release
|
||||
// to restore, uncomment line below
|
||||
// vm.showSaveProgressModal = !(emailFromStore?.length > 0);
|
||||
|
||||
// Glass Part Question dynamic component
|
||||
Object.keys(vm.$refs)
|
||||
.filter((r) => r.includes(vm.RefPrefix) && vm.$refs[r][0] !== undefined)
|
||||
|
|
|
|||
Loading…
Reference in a new issue