Merge branch 'develop' into nation/CASH-632
This commit is contained in:
commit
81476b5d43
4 changed files with 38 additions and 9 deletions
|
|
@ -57,6 +57,7 @@ export default {
|
||||||
buttonSize: { type: Boolean, default: false },
|
buttonSize: { type: Boolean, default: false },
|
||||||
isSubmitHidden: { type: Boolean, default: false },
|
isSubmitHidden: { type: Boolean, default: false },
|
||||||
overrideButtonText: String,
|
overrideButtonText: String,
|
||||||
|
overrideBackButtonText: String,
|
||||||
},
|
},
|
||||||
components: {
|
components: {
|
||||||
textLink,
|
textLink,
|
||||||
|
|
@ -73,7 +74,10 @@ export default {
|
||||||
},
|
},
|
||||||
computed: {
|
computed: {
|
||||||
backLink() {
|
backLink() {
|
||||||
return this.getCmsContent(this.cmsWidgetName, "BackButtonText");
|
return (
|
||||||
|
this.overrideBackButtonText ||
|
||||||
|
this.getCmsContent(this.cmsWidgetName, "BackButtonText")
|
||||||
|
);
|
||||||
},
|
},
|
||||||
buttonText() {
|
buttonText() {
|
||||||
return this.customButtontext
|
return this.customButtontext
|
||||||
|
|
|
||||||
|
|
@ -1,3 +1,15 @@
|
||||||
|
// .NET serializes an unset DateTime as DateTime.MinValue ("0001-01-01T00:00:00").
|
||||||
|
// Treat that as "no date" so it doesn't masquerade as a real, validation-passing value.
|
||||||
|
const DOTNET_MIN_DATE_PREFIX = "0001-01-01";
|
||||||
|
|
||||||
|
export function isDotNetMinDate(value) {
|
||||||
|
return typeof value === "string" && value.startsWith(DOTNET_MIN_DATE_PREFIX);
|
||||||
|
}
|
||||||
|
|
||||||
|
export function normalizeDotNetMinDate(value) {
|
||||||
|
return isDotNetMinDate(value) ? null : value;
|
||||||
|
}
|
||||||
|
|
||||||
export function getDateDifferenceInDays(startDate, endDate) {
|
export function getDateDifferenceInDays(startDate, endDate) {
|
||||||
// Create date objects from the input strings
|
// Create date objects from the input strings
|
||||||
var date1 = new Date(endDate);
|
var date1 = new Date(endDate);
|
||||||
|
|
|
||||||
|
|
@ -191,12 +191,15 @@
|
||||||
v-model="morePolicyQuestions"
|
v-model="morePolicyQuestions"
|
||||||
groupName="MorePolicyQuestionsQuestion" />
|
groupName="MorePolicyQuestionsQuestion" />
|
||||||
|
|
||||||
<navbar
|
<div class="policy-info-navbar">
|
||||||
cmsWidgetName="FunnelFooterWidget"
|
<navbar
|
||||||
ref="navbar"
|
cmsWidgetName="FunnelFooterWidget"
|
||||||
:isForwardActionDisabled="!meta.valid"
|
ref="navbar"
|
||||||
@back-clicked="backButtonAction"
|
:isForwardActionDisabled="!meta.valid"
|
||||||
@ForwardClicked="forwardButtonAction" />
|
overrideBackButtonText="Cancel verification"
|
||||||
|
@back-clicked="backButtonAction"
|
||||||
|
@ForwardClicked="forwardButtonAction" />
|
||||||
|
</div>
|
||||||
|
|
||||||
<span
|
<span
|
||||||
v-if="displayDisclaimerText"
|
v-if="displayDisclaimerText"
|
||||||
|
|
@ -527,6 +530,14 @@ export default {
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<style lang="scss">
|
<style lang="scss">
|
||||||
|
.policy-info-navbar {
|
||||||
|
.navigation-link {
|
||||||
|
font-family: inherit;
|
||||||
|
font-weight: 600;
|
||||||
|
text-decoration: none;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
.cc-page-title {
|
.cc-page-title {
|
||||||
font-size: 20px !important;
|
font-size: 20px !important;
|
||||||
line-height: 1.325;
|
line-height: 1.325;
|
||||||
|
|
|
||||||
|
|
@ -40,7 +40,7 @@ import {
|
||||||
getPromoCodeWithoutBundleIdentifier,
|
getPromoCodeWithoutBundleIdentifier,
|
||||||
removeCurrentlyActivePromoCodesFromInactivePromos,
|
removeCurrentlyActivePromoCodesFromInactivePromos,
|
||||||
} from "@/helpers/promotions-helper";
|
} from "@/helpers/promotions-helper";
|
||||||
import { getDateDifferenceInDays } from "@/helpers/date-helper";
|
import { getDateDifferenceInDays, normalizeDotNetMinDate } from "@/helpers/date-helper";
|
||||||
import sharedMutations from "./vuex-shared-mutations/vuexSharedMutations";
|
import sharedMutations from "./vuex-shared-mutations/vuexSharedMutations";
|
||||||
import {
|
import {
|
||||||
coverageStatus,
|
coverageStatus,
|
||||||
|
|
@ -848,7 +848,9 @@ export const mutations = {
|
||||||
state.order.damage.glassToReplace = sessionInformation.order.damage.glassToReplace;
|
state.order.damage.glassToReplace = sessionInformation.order.damage.glassToReplace;
|
||||||
state.order.damage.isRepair = sessionInformation.order.damage.isRepair;
|
state.order.damage.isRepair = sessionInformation.order.damage.isRepair;
|
||||||
state.order.damage.numberOfChips = sessionInformation.order.damage.numberOfChips;
|
state.order.damage.numberOfChips = sessionInformation.order.damage.numberOfChips;
|
||||||
state.order.damage.dateOfLoss = sessionInformation.order.damage?.dateOfLoss;
|
state.order.damage.dateOfLoss = normalizeDotNetMinDate(
|
||||||
|
sessionInformation.order.damage?.dateOfLoss
|
||||||
|
);
|
||||||
state.order.damage.damageCause = sessionInformation.order.damage?.damageCause;
|
state.order.damage.damageCause = sessionInformation.order.damage?.damageCause;
|
||||||
|
|
||||||
state.order.damage.partQuestionAnswers =
|
state.order.damage.partQuestionAnswers =
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue