From a01f02e31b137cb88a372cbbf4df975ff982e067 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Wed, 5 Mar 2025 23:24:11 +0100
Subject: [PATCH] fix: refs #8725 customerFiscalData
---
src/components/FormModel.vue | 3 ++-
src/pages/Customer/Card/CustomerFiscalData.vue | 8 +++++---
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/src/components/FormModel.vue b/src/components/FormModel.vue
index b36f0998e..02afae2c6 100644
--- a/src/components/FormModel.vue
+++ b/src/components/FormModel.vue
@@ -19,7 +19,7 @@ const quasar = useQuasar();
const state = useState();
const stateStore = useStateStore();
const { t } = useI18n();
-const { validate } = useValidator();
+const { validate, validations } = useValidator();
const { notify } = useNotify();
const route = useRoute();
const myForm = ref(null);
@@ -350,6 +350,7 @@ defineExpose({
name="form"
:data="formData"
:validate="validate"
+ :validations="validations()"
:filter="filter"
/>
<SkeletonForm v-else />
diff --git a/src/pages/Customer/Card/CustomerFiscalData.vue b/src/pages/Customer/Card/CustomerFiscalData.vue
index d3f1f937a..baa728868 100644
--- a/src/pages/Customer/Card/CustomerFiscalData.vue
+++ b/src/pages/Customer/Card/CustomerFiscalData.vue
@@ -79,7 +79,7 @@ async function acceptPropagate({ isEqualizated }) {
observe-form-changes
@on-data-saved="checkEtChanges"
>
- <template #form="{ data, validate }">
+ <template #form="{ data, validate, validations }">
<VnRow>
<VnInput
:label="t('Social name')"
@@ -112,7 +112,7 @@ async function acceptPropagate({ isEqualizated }) {
v-model="data.sageTaxTypeFk"
data-cy="sageTaxTypeFk"
:required="data.isTaxDataChecked"
- :rules="[(val) => val !== null || 'Please type your age']"
+ :rules="[(val) => validations.required(data.isTaxDataChecked, val)]"
/>
<VnSelect
:label="t('Sage transaction type')"
@@ -123,7 +123,9 @@ async function acceptPropagate({ isEqualizated }) {
data-cy="sageTransactionTypeFk"
v-model="data.sageTransactionTypeFk"
:required="data.isTaxDataChecked"
- :rules="[(val) => val !== null || 'Please type your age']"
+ :rules="[
+ (val) => validations.required(data.sageTransactionTypeFk, val),
+ ]"
>
<template #option="scope">
<QItem v-bind="scope.itemProps">