From a3476b70986bad0971f816925a6af5ac708a7b8a Mon Sep 17 00:00:00 2001 From: Katie Date: Wed, 11 May 2022 13:22:13 -0400 Subject: [PATCH] CSR-543 Allow for number validation in textbox-questions for initialValues --- .../textbox-question/textbox-question.vue | 19 ++++++++++++++++--- src/helpers/damage-helper.js | 1 - src/layouts/vin-lookup/vin-lookup.vue | 6 +++--- 3 files changed, 19 insertions(+), 7 deletions(-) diff --git a/src/common-components/textbox-question/textbox-question.vue b/src/common-components/textbox-question/textbox-question.vue index fed8deea7..a5f82f502 100644 --- a/src/common-components/textbox-question/textbox-question.vue +++ b/src/common-components/textbox-question/textbox-question.vue @@ -51,13 +51,26 @@ export default { default: '', }, validationRules: String, - cmsWidgetName: String, + cmsWidgetName: String }, setup(props) { + const propsClone = Object.assign({}, props); + const modelValue = propsClone.modelValue; + let initialValue; + + switch (typeof modelValue) { + case "number": + initialValue = modelValue; + break; + default: + initialValue = (modelValue && modelValue.length > 0) ? modelValue : ""; + break; + } + const fieldOptions = { type: "text", - value: props.modelValue, - initialValue: (props.modelValue && props.modelValue.length > 0) ? props.modelValue : "", + value: modelValue, + initialValue: initialValue }; const { diff --git a/src/helpers/damage-helper.js b/src/helpers/damage-helper.js index a9b14b98d..f47499bed 100644 --- a/src/helpers/damage-helper.js +++ b/src/helpers/damage-helper.js @@ -26,7 +26,6 @@ export function getDamageString() { export function getIsWindshieldOnly () { const damageLocations = store.getters.damage.glassToReplace; const returnString = damageLocations.length === 1 && damageLocations[0]?.location === "Windshield" ? "windshield" : "glass"; - console.log(damageLocations); return returnString; } diff --git a/src/layouts/vin-lookup/vin-lookup.vue b/src/layouts/vin-lookup/vin-lookup.vue index 05c251bfd..7c9268a30 100644 --- a/src/layouts/vin-lookup/vin-lookup.vue +++ b/src/layouts/vin-lookup/vin-lookup.vue @@ -262,13 +262,13 @@ export default { store.dispatch(storeActions.RESET_PARTS_STATE_AND_DEPENDENCIES); }, getEmailFromStore(){ - return store.getters.order.customer.emailAddress + return store.getters.order.customer.emailAddress; }, getVinFromStore(){ - return store.getters.vehicle.vin + return store.getters.vehicle.vin; }, getZipFromStore(){ - return store.getters.vehicle.registration.zipCode + return store.getters.order.serviceLocation.zipCode; }, attachCustomEvents() { this.prependActionToMethod(this, this.forwardButtonAction, () => {