From a337bdf4746ee8bf617f0972640dd19f22c92dc5 Mon Sep 17 00:00:00 2001 From: jtubau Date: Tue, 28 Jan 2025 08:30:38 +0100 Subject: [PATCH 1/7] feat: refs #7411 add VnCheckbox component with info support --- src/components/common/VnCheckbox.vue | 40 ++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 src/components/common/VnCheckbox.vue diff --git a/src/components/common/VnCheckbox.vue b/src/components/common/VnCheckbox.vue new file mode 100644 index 000000000..60a2379f7 --- /dev/null +++ b/src/components/common/VnCheckbox.vue @@ -0,0 +1,40 @@ + + + -- 2.40.1 From f7c93c841668958b7efb96053a8d12295584e0b8 Mon Sep 17 00:00:00 2001 From: jtubau Date: Tue, 28 Jan 2025 08:39:35 +0100 Subject: [PATCH 2/7] refactor: refs #7411 remove unnecessary $props prefix --- src/components/common/VnCheckbox.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/components/common/VnCheckbox.vue b/src/components/common/VnCheckbox.vue index 60a2379f7..28890f09b 100644 --- a/src/components/common/VnCheckbox.vue +++ b/src/components/common/VnCheckbox.vue @@ -28,12 +28,12 @@ const isChecked = computed({ diff --git a/src/components/TransferInvoiceForm.vue b/src/components/TransferInvoiceForm.vue index aa71070d6..c4ef1454a 100644 --- a/src/components/TransferInvoiceForm.vue +++ b/src/components/TransferInvoiceForm.vue @@ -10,6 +10,7 @@ import VnSelect from 'components/common/VnSelect.vue'; import FormPopup from './FormPopup.vue'; import axios from 'axios'; import useNotify from 'src/composables/useNotify.js'; +import VnCheckbox from './common/VnCheckbox.vue'; const $props = defineProps({ invoiceOutData: { @@ -186,15 +187,11 @@ const makeInvoice = async () => { /> -
- - - {{ t('transferInvoiceInfo') }} - -
+
diff --git a/src/components/common/VnCheckbox.vue b/src/components/common/VnCheckbox.vue index 28890f09b..e3bd4de66 100644 --- a/src/components/common/VnCheckbox.vue +++ b/src/components/common/VnCheckbox.vue @@ -31,7 +31,7 @@ const isChecked = computed({ :label="label" v-model="isChecked" /> - + {{ info }} diff --git a/src/pages/Account/Card/AccountDescriptorMenu.vue b/src/pages/Account/Card/AccountDescriptorMenu.vue index ccf029e44..dab8ea442 100644 --- a/src/pages/Account/Card/AccountDescriptorMenu.vue +++ b/src/pages/Account/Card/AccountDescriptorMenu.vue @@ -12,6 +12,7 @@ import VnInputPassword from 'src/components/common/VnInputPassword.vue'; import VnChangePassword from 'src/components/common/VnChangePassword.vue'; import { useQuasar } from 'quasar'; import { useRouter } from 'vue-router'; +import VnCheckbox from 'src/components/common/VnCheckbox.vue'; const $props = defineProps({ hasAccount: { @@ -121,18 +122,12 @@ onMounted(() => { :promise="sync" > @@ -201,6 +195,8 @@ function handleLocation(data, location) { +en: + whenActivatingIt: When activating it, do not enter the country code in the ID field. es: - When activating it, do not enter the country code in the ID field.: Al activarlo, no informar el código del país en el campo nif + whenActivatingIt: Al activarlo, no informar el código del país en el campo nif. diff --git a/src/pages/Ticket/Card/BasicData/TicketBasicData.vue b/src/pages/Ticket/Card/BasicData/TicketBasicData.vue index c6a85c287..bdbc20693 100644 --- a/src/pages/Ticket/Card/BasicData/TicketBasicData.vue +++ b/src/pages/Ticket/Card/BasicData/TicketBasicData.vue @@ -9,6 +9,7 @@ import FetchData from 'components/FetchData.vue'; import { useStateStore } from 'stores/useStateStore'; import { toCurrency } from 'filters/index'; import { useRole } from 'src/composables/useRole'; +import VnCheckbox from 'src/components/common/VnCheckbox.vue'; const haveNegatives = defineModel('haveNegatives', { type: Boolean, required: true }); const formData = defineModel({ type: Object, required: true }); @@ -182,22 +183,19 @@ onMounted(async () => { - - - - {{ t('basicData.withoutNegativesInfo') }} - - -- 2.40.1 From 2e0575052c97de2ea7a6c53a103809ac1738c33a Mon Sep 17 00:00:00 2001 From: jtubau Date: Tue, 28 Jan 2025 14:23:28 +0100 Subject: [PATCH 4/7] refactor: refs #7411 update VnCheckbox component to use defineModel for modelValue binding --- src/components/common/VnCheckbox.vue | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/src/components/common/VnCheckbox.vue b/src/components/common/VnCheckbox.vue index e3bd4de66..09b054e54 100644 --- a/src/components/common/VnCheckbox.vue +++ b/src/components/common/VnCheckbox.vue @@ -1,13 +1,9 @@