diff --git a/src/constants/error-messages.js b/src/constants/error-messages.js
index 81f0fad0..224c6e30 100644
--- a/src/constants/error-messages.js
+++ b/src/constants/error-messages.js
@@ -65,7 +65,9 @@ const errorMessages = Object.freeze({
STYLE_REQUIRED: 'Vehicle style is required.',
MOBILE_LOCATION_REQUIRED: 'Please enter your service address',
DATE_REQUIRED: 'Please select a date',
- TIME_REQUIRED: 'Please select an appointment time.'
+ TIME_REQUIRED: 'Please select an appointment time.',
+ PRIMARY_PHONE_REQUIRED: 'Primary phone number is required.',
+ BAILOUT_EMAIL_ADDRESS_REQUIRED: 'Email address is required.'
});
export default errorMessages;
diff --git a/src/constants/global-rules.js b/src/constants/global-rules.js
index e82b118a..878b7a27 100644
--- a/src/constants/global-rules.js
+++ b/src/constants/global-rules.js
@@ -26,7 +26,9 @@ const globalRules = Object.freeze({
EXTENSION_FORMAT: 'extension-format',
ZIP_CODE_REQUIRED: 'zip-code-required',
ZIP_CODE_SEARCH_FORMAT: 'zip-code-search-format',
- OPTION_REQUIRED: 'option-required'
+ OPTION_REQUIRED: 'option-required',
+ PRIMARY_PHONE_REQUIRED: 'primary-phone-required',
+ BAILOUT_EMAIL_ADDRESS_REQUIRED: 'bailout-email-address-required'
});
export default globalRules;
diff --git a/src/helpers/bailout-helper.js b/src/helpers/bailout-helper.js
index 0191755d..b0d364c5 100644
--- a/src/helpers/bailout-helper.js
+++ b/src/helpers/bailout-helper.js
@@ -10,7 +10,7 @@ function canBailoutNavigateBack() {
switch (code) {
case BailoutCode.VehicleNotFound:
- case BailoutCode.DoNotSeeMyShop:
+ case BailoutCode.RequestCallback:
case BailoutCode.TPANotEnabled:
return true;
diff --git a/src/helpers/global-rule-definer.js b/src/helpers/global-rule-definer.js
index 5aca4f66..b91f3dc0 100644
--- a/src/helpers/global-rule-definer.js
+++ b/src/helpers/global-rule-definer.js
@@ -24,6 +24,7 @@ function defineGlobalNameRules() {
*/
function defineGlobalEmailRules() {
defineRule(globalRules.EMAIL_ADDRESS_REQUIRED, required(errorMessages.EMAIL_ADDRESS_REQUIRED));
+ defineRule(globalRules.BAILOUT_EMAIL_ADDRESS_REQUIRED, required(errorMessages.BAILOUT_EMAIL_ADDRESS_REQUIRED));
defineRule(
globalRules.EMAIL_ADDRESS_FORMAT,
regex(
@@ -71,6 +72,7 @@ function defineGlobalDateOfLossRules() {
*/
function defineGlobalPhoneNumberRules() {
defineRule(globalRules.PHONE_NUMBER_REQUIRED, required(errorMessages.PHONE_NUMBER_REQUIRED));
+ defineRule(globalRules.PRIMARY_PHONE_REQUIRED, required(errorMessages.PRIMARY_PHONE_REQUIRED));
defineRule(
globalRules.PHONE_NUMBER_FORMAT,
regex(
diff --git a/src/layouts/bailout-page/__snapshots__/bailout-page.spec.js.snap b/src/layouts/bailout-page/__snapshots__/bailout-page.spec.js.snap
index 62f2829b..b191b402 100644
--- a/src/layouts/bailout-page/__snapshots__/bailout-page.spec.js.snap
+++ b/src/layouts/bailout-page/__snapshots__/bailout-page.spec.js.snap
@@ -12,13 +12,14 @@ Object {
"phoneNumber": "6145550909",
},
"rules": Object {
- "email": "email-required|email-address-format",
- "firstName": "first-name-required",
- "lastName": "last-name-required",
- "phoneNumber": "phone-number-required|phone-number-format",
+ "email": "bailout-email-address-required|email-address-format",
+ "firstName": "policyholder-first-name-required",
+ "lastName": "policyholder-last-name-required",
+ "phoneNumber": "primary-phone-required|phone-number-format",
},
"widget": Object {
"defaultSiteHeader": "SiteSubHeaderWidget",
+ "disclaimerText": "DisclaimerWidget",
"noTpa": "ContentGroupNoTPAWidget",
"notSeeingPreferredShop": "ContentGroupNotSeeingPreferredShop",
},
diff --git a/src/layouts/bailout-page/bailout-page.spec.js b/src/layouts/bailout-page/bailout-page.spec.js
index 5b0c68ee..3ccd149b 100644
--- a/src/layouts/bailout-page/bailout-page.spec.js
+++ b/src/layouts/bailout-page/bailout-page.spec.js
@@ -156,6 +156,16 @@ describe('Bailout page', () => {
// Assert
expect(siteFooter.exists()).toBeTruthy();
});
+ test('disclaimer text block', () => {
+ // Arrange
+ const wrapper = shallowMount(bailoutPage, getMountOptions());
+
+ // Act
+ const disclaimerText = wrapper.findComponent({ ref: 'disclaimerText' });
+
+ // Assert
+ expect(disclaimerText.exists()).toBeTruthy();
+ });
});
describe('computed', () => {
describe('subHeaderCmsWidgetName', () => {
diff --git a/src/layouts/bailout-page/bailout-page.vue b/src/layouts/bailout-page/bailout-page.vue
index a84f0dfe..db6aa074 100644
--- a/src/layouts/bailout-page/bailout-page.vue
+++ b/src/layouts/bailout-page/bailout-page.vue
@@ -20,28 +20,34 @@
:subContentProperty="subContentProperty"
class="sub-header-content mt-2 mb-5"
justification="left" />
-