From 6fe6cd79e876a86a40636bfdbc3b885ba64d7730 Mon Sep 17 00:00:00 2001 From: Javier Segarra Date: Wed, 31 Jan 2024 08:41:02 +0100 Subject: [PATCH 1/7] refs #5834 feat: add tooltip for iban input --- src/pages/Customer/Card/CustomerBillingData.vue | 11 ++++++++++- src/pages/Supplier/Card/SupplierAccounts.vue | 13 +++++++++---- src/pages/Worker/WorkerCreate.vue | 10 +++++++++- 3 files changed, 28 insertions(+), 6 deletions(-) diff --git a/src/pages/Customer/Card/CustomerBillingData.vue b/src/pages/Customer/Card/CustomerBillingData.vue index 1543eac7a..195783824 100644 --- a/src/pages/Customer/Card/CustomerBillingData.vue +++ b/src/pages/Customer/Card/CustomerBillingData.vue @@ -70,7 +70,16 @@ const getBankEntities = () => {
- + + asd + + +
{ class="row q-gutter-md q-mb-md" >
- + +
{ v-model="data.iban" :label="t('worker.create.iban')" :rules="validate('Worker.iban')" - /> + > + +
Date: Wed, 31 Jan 2024 08:41:21 +0100 Subject: [PATCH 2/7] refs #5834 feat: add required for country --- src/components/CreateBankEntityForm.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/components/CreateBankEntityForm.vue b/src/components/CreateBankEntityForm.vue index 2a1385945..00a540a6f 100644 --- a/src/components/CreateBankEntityForm.vue +++ b/src/components/CreateBankEntityForm.vue @@ -77,6 +77,7 @@ const onDataSaved = (data) => { option-value="id" option-label="country" hide-selected + :required="true" :rules="validate('bankEntity.countryFk')" />
From f3e7d8ceb19babfd3c15bdfb8f30f626f082770b Mon Sep 17 00:00:00 2001 From: Javier Segarra Date: Wed, 31 Jan 2024 08:54:49 +0100 Subject: [PATCH 3/7] refs #5834 feat: i18n --- src/components/common/VnLocation.vue | 6 ++++-- src/i18n/en/index.js | 1 + src/i18n/es/index.js | 1 + 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/components/common/VnLocation.vue b/src/components/common/VnLocation.vue index 0b30faaa7..17dd3d37b 100644 --- a/src/components/common/VnLocation.vue +++ b/src/components/common/VnLocation.vue @@ -94,7 +94,7 @@ function handleFetch( data) { :options="postcodesOptions" :label="t('Location')" :option-label="showLabel" - :placeholder="t('Search by postalCode, town, province or country')" + :placeholder="t('search_by_postalcode')" @input-value="locationFilter" :default-filter="false" :input-debounce="300" @@ -129,7 +129,9 @@ function handleFetch( data) { +en: + search_by_postalcode: Search by postalcode, town, province or country es: Location: Ubicación - Search by postalcode, town, province or country: Buscar por código postal, ciudad o país + search_by_postalcode: Buscar por código postal, ciudad o país diff --git a/src/i18n/en/index.js b/src/i18n/en/index.js index 2eb445680..7e3e7fe3b 100644 --- a/src/i18n/en/index.js +++ b/src/i18n/en/index.js @@ -1087,5 +1087,6 @@ export default { VnLv: { copyText: '{copyValue} has been copied to the clipboard', }, + iban_tooltip: 'IBAN: ES21 1234 5678 90 0123456789', }, }; diff --git a/src/i18n/es/index.js b/src/i18n/es/index.js index 2a9bcd615..82a24893b 100644 --- a/src/i18n/es/index.js +++ b/src/i18n/es/index.js @@ -1086,5 +1086,6 @@ export default { VnLv: { copyText: '{copyValue} se ha copiado al portapepeles', }, + iban_tooltip: 'IBAN: ES21 1234 5678 90 0123456789', }, }; From 0287ec4932b242c4eb9c2e54b742ee4e62bcc5f9 Mon Sep 17 00:00:00 2001 From: Javier Segarra Date: Wed, 31 Jan 2024 08:57:05 +0100 Subject: [PATCH 4/7] refs #5834 feat: add required for code --- src/components/CreateBankEntityForm.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/components/CreateBankEntityForm.vue b/src/components/CreateBankEntityForm.vue index 00a540a6f..270a79d93 100644 --- a/src/components/CreateBankEntityForm.vue +++ b/src/components/CreateBankEntityForm.vue @@ -82,7 +82,7 @@ const onDataSaved = (data) => { />
- +
@@ -96,12 +96,12 @@ en: name: Name * swift: Swift * country: Country - id: Entity code + id: Entity code * es: title: Nueva entidad bancaria subtitle: ¡Por favor, asegúrate de poner los datos correctos! name: Nombre * swift: Swift * country: País - id: Código de la entidad + id: Código de la entidad * From fea618b2133f096d3b3f4826795141cc133591ba Mon Sep 17 00:00:00 2001 From: Javier Segarra Date: Wed, 31 Jan 2024 09:00:48 +0100 Subject: [PATCH 5/7] refs #5834 feat: replace QInput by VnInput --- src/components/CreateBankEntityForm.vue | 26 ++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/src/components/CreateBankEntityForm.vue b/src/components/CreateBankEntityForm.vue index 270a79d93..106dbec3a 100644 --- a/src/components/CreateBankEntityForm.vue +++ b/src/components/CreateBankEntityForm.vue @@ -1,6 +1,7 @@