diff --git a/src/digital-components/modal/modal.vue b/src/digital-components/modal/modal.vue
index d4be7797..83e07ccb 100644
--- a/src/digital-components/modal/modal.vue
+++ b/src/digital-components/modal/modal.vue
@@ -13,20 +13,20 @@
}">
-
@@ -26,12 +33,14 @@
diff --git a/src/layouts/coverage-statement/coverage-statement.vue b/src/layouts/coverage-statement/coverage-statement.vue
index 2026f289..4e31fa37 100644
--- a/src/layouts/coverage-statement/coverage-statement.vue
+++ b/src/layouts/coverage-statement/coverage-statement.vue
@@ -10,7 +10,7 @@
cmsWidgetName="SiteHeaderWidget" />
-
diff --git a/src/layouts/provider-preference/provider-preference.spec.js b/src/layouts/provider-preference/provider-preference.spec.js
index 0d93ed3a..d00c9183 100644
--- a/src/layouts/provider-preference/provider-preference.spec.js
+++ b/src/layouts/provider-preference/provider-preference.spec.js
@@ -2,7 +2,7 @@ import ProviderPreference from '@/layouts/provider-preference/provider-preferenc
import { shallowMount } from '@vue/test-utils';
import settleAllPromises from '@/helpers/layout-helper.js';
-import { fetchCmsContentForPage } from '@/helpers/cms-content-helper';
+import { fetchCmsContentForPage, processIfStatements } from '@/helpers/cms-content-helper';
import { getMountOptions } from '@/helpers/unit-test-helper.js';
import { useMainStore } from '@/store';
import navigationScenarios from '@/router/router-constants/navigation-scenarios';
@@ -13,7 +13,8 @@ jest.mock('@/helpers/layout-helper.js', () => jest.fn());
// Mock fetchCmsContentForPage
jest.mock('@/helpers/cms-content-helper', () => ({
fetchCmsContentForPage: jest.fn(),
- setupModalLinks: jest.fn()
+ setupModalLinks: jest.fn(),
+ processIfStatements: jest.fn()
}));
/** @ignore */
diff --git a/src/layouts/provider-preference/provider-preference.vue b/src/layouts/provider-preference/provider-preference.vue
index 27e38ff8..21a6bc20 100644
--- a/src/layouts/provider-preference/provider-preference.vue
+++ b/src/layouts/provider-preference/provider-preference.vue
@@ -58,11 +58,11 @@
// Import Supporting Files
import {
fetchCmsContentForPage,
+ processIfStatements,
setupModalLinks
} from '@/helpers/cms-content-helper';
import settleAllPromises from '@/helpers/layout-helper';
import errorMessages from '@/constants/error-messages';
-import buttonQuestion from '@/digital-components/button-question/button-question.vue';
import showIssLoadingModal from '@/helpers/loading-modal-helper';
import bailoutMessage from '@/constants/bailoutMessage';
import baseFormMixin from '@/mixins/base-form-mixin';
@@ -133,26 +133,14 @@ export default {
return this.getCmsContent('ScheduleWithSafeliteText', 'BodyText');
},
scheduleWithOtherText() {
- return this.getCmsContent('ScheduleWithOtherText', 'BodyText');
+ const text = this.getCmsContent('ScheduleWithOtherText', 'BodyText');
+ return processIfStatements(text, 'custom', this.getStateSpecificText);
}
},
mounted() {
setupModalLinks(this);
},
methods: {
- getHeaderTextFromCms(cmsWidgetName) {
- const headerText = this.getCmsContent(cmsWidgetName, 'HeaderText');
- return headerText?.replace(
- '{custom:SafeliteLogo}',
- ""
- );
- },
- getSubheaderTextFromCms(cmsWidgetName) {
- return this.getCmsContent(cmsWidgetName, 'SubheaderText');
- },
- getBodyTextFromCms(cmsWidgetName) {
- return this.getCmsContent(cmsWidgetName, 'BodyText');
- },
arePagePrerequisiteValid() {
return true;
},
@@ -191,6 +179,9 @@ export default {
},
openStateSteeringModal() {
this.$refs[STEERING_MODAL_REF_NAME].openModal();
+ },
+ getStateSpecificText(value) {
+ return this.mainStore.order.customer.address.state?.toLowerCase() === value?.toLowerCase();
}
}
};
diff --git a/src/layouts/provider-preference/steering-modal/steering-modal.vue b/src/layouts/provider-preference/steering-modal/steering-modal.vue
index 9e9bdd50..e93f1feb 100644
--- a/src/layouts/provider-preference/steering-modal/steering-modal.vue
+++ b/src/layouts/provider-preference/steering-modal/steering-modal.vue
@@ -1,21 +1,24 @@
-
-
- {{ ModalHeadline }}
-
-
-
+
+
+
+ {{ ModalHeadline }}
+
+
+
+
diff --git a/src/layouts/schedule-page/service-location/service-location.spec.js b/src/layouts/schedule-page/service-location/service-location.spec.js
index 6a50fe05..cda30da8 100644
--- a/src/layouts/schedule-page/service-location/service-location.spec.js
+++ b/src/layouts/schedule-page/service-location/service-location.spec.js
@@ -124,7 +124,7 @@ const mountOptions = {
alert: true,
textBlock: true,
appointmentTypeQuestion: true,
- contentGroupModal: true,
+ recalModal: true,
siteFooter: true,
siteHeader: true,
siteSubHeader: true,
diff --git a/src/layouts/schedule-page/service-location/service-location.vue b/src/layouts/schedule-page/service-location/service-location.vue
index 601a1e5d..cbce93d2 100644
--- a/src/layouts/schedule-page/service-location/service-location.vue
+++ b/src/layouts/schedule-page/service-location/service-location.vue
@@ -117,9 +117,8 @@
cmsWidgetName="MobileFeeDisclaimerWidget"
typeStyle="disclaimer" />
-
@@ -140,10 +139,10 @@ import alert from '@/ux-components/alert/alert.vue';
import textBlock from '@/digital-components/text-block/text-block.vue';
import appointmentTypeQuestion from '@/layouts/schedule-page/service-location/appointment-type-question/appointment-type-question.vue';
import baseFormMixin from '@/mixins/base-form-mixin';
-import contentGroupModal from '@/iss-components/content-group-modal/content-group-modal.vue';
import shopAddress from '@/layouts/schedule-page/service-location/shop-address/shop-address.vue';
import serviceZipQuestion from '@/layouts/schedule-page/service-location/service-zip-question/service-zip-question.vue';
import widgetFields from '@/constants/cms-widget-fields';
+import recalModal from '@/iss-components/recal-modal/recal-modal.vue';
const RECAL_MODAL_REF_NAME = 'RecalModal';
@@ -153,9 +152,9 @@ export default {
alert,
textBlock,
appointmentTypeQuestion,
- contentGroupModal,
shopAddress,
- serviceZipQuestion
+ serviceZipQuestion,
+ recalModal
},
mixins: [baseFormMixin],
emits: ['appointment-type-changed', 'city-updated', 'clear-mobile-data', 'in-shop-zip-updated', 'mobile-zip-updated', 'provider-changed'],
diff --git a/src/layouts/service-packages/service-packages.vue b/src/layouts/service-packages/service-packages.vue
index 403f327e..3b76c75b 100644
--- a/src/layouts/service-packages/service-packages.vue
+++ b/src/layouts/service-packages/service-packages.vue
@@ -57,7 +57,7 @@
cmsWidgetName="RearWiperModal" />
diff --git a/src/styles/ux-variables.scss b/src/styles/ux-variables.scss
index ce965a49..290bb653 100644
--- a/src/styles/ux-variables.scss
+++ b/src/styles/ux-variables.scss
@@ -221,7 +221,7 @@ $alert-red-color: $red;
//Modal animation
// This affects all [Bootstrap] modals
-$modal-fade-transform: translate(0, 100%);
+$modal-fade-transform: translate(0, -25%);
$modal-backdrop-opacity: 0;
//Disable default !important behavior