From b092c5af6d0ec396f125694e6fa405d18685c263 Mon Sep 17 00:00:00 2001 From: pablone Date: Mon, 26 Feb 2024 15:00:14 +0100 Subject: [PATCH 01/28] refs 6486 commit --- src/components/ui/CardDescriptor.vue | 5 +- src/css/app.scss | 21 +--- src/css/quasar.variables.scss | 28 ++++- src/css/test.scss | 136 +++++++++++++++++++++++ src/pages/Claim/Card/ClaimDescriptor.vue | 3 + 5 files changed, 167 insertions(+), 26 deletions(-) create mode 100644 src/css/test.scss diff --git a/src/components/ui/CardDescriptor.vue b/src/components/ui/CardDescriptor.vue index 241937a4e..417f186d5 100644 --- a/src/components/ui/CardDescriptor.vue +++ b/src/components/ui/CardDescriptor.vue @@ -171,6 +171,7 @@ const emit = defineEmits(['onFetch']); diff --git a/src/css/app.scss b/src/css/app.scss index db4464bfc..c0c523a9f 100644 --- a/src/css/app.scss +++ b/src/css/app.scss @@ -4,7 +4,8 @@ body.body--light { --fount-color: black; --vn-sectionColor: #ffffff; - background-color: #e0e0e0; + --vn-pageColor: #e0e0e0; + background-color: var(--vn-pageColor); .q-header .q-toolbar { color: var(--fount-color); } From 04903928f579c34099c5b7588bb4061ff1877b8a Mon Sep 17 00:00:00 2001 From: carlossa Date: Mon, 4 Mar 2024 09:33:12 +0100 Subject: [PATCH 09/28] refs #6892 fix css --- src/components/ui/CardSummary.vue | 15 ++--- src/pages/Customer/Card/CustomerSummary.vue | 73 +++++++++++++++------ 2 files changed, 61 insertions(+), 27 deletions(-) diff --git a/src/components/ui/CardSummary.vue b/src/components/ui/CardSummary.vue index 202dbc709..cd42706b5 100644 --- a/src/components/ui/CardSummary.vue +++ b/src/components/ui/CardSummary.vue @@ -70,14 +70,7 @@ watch(props, async () => { display: flex; justify-content: center; } -.label-two { - > .vn-label-value { - > .label { - position: relative; - background-color: red; - } - } -} + .cardSummary { width: 100%; @@ -148,6 +141,12 @@ watch(props, async () => { .header.link:hover { color: lighten($primary, 20%); } + .QCheckbox { + display: flex; + // position: absolute; + // left: 0; + color: gray; + } } } diff --git a/src/pages/Customer/Card/CustomerSummary.vue b/src/pages/Customer/Card/CustomerSummary.vue index 36fa9035c..264c6042d 100644 --- a/src/pages/Customer/Card/CustomerSummary.vue +++ b/src/pages/Customer/Card/CustomerSummary.vue @@ -120,33 +120,56 @@ const creditWarning = computed(() => { /> - + {{ t('customer.summary.fiscalData') }} - - - + - - - + - @@ -159,14 +182,26 @@ const creditWarning = computed(() => { /> - - - + + From fdf09710d83d4020a0780a71f6443835a3cde862 Mon Sep 17 00:00:00 2001 From: carlossa Date: Mon, 4 Mar 2024 09:51:51 +0100 Subject: [PATCH 10/28] refs #6892 fix checkbox --- src/components/ui/CardSummary.vue | 5 +++-- src/pages/Customer/Card/CustomerSummary.vue | 6 ++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/components/ui/CardSummary.vue b/src/components/ui/CardSummary.vue index cd42706b5..23f54b6cd 100644 --- a/src/components/ui/CardSummary.vue +++ b/src/components/ui/CardSummary.vue @@ -143,8 +143,9 @@ watch(props, async () => { } .QCheckbox { display: flex; - // position: absolute; - // left: 0; + position: absolute; + left: 0; + margin-left: auto; color: gray; } } diff --git a/src/pages/Customer/Card/CustomerSummary.vue b/src/pages/Customer/Card/CustomerSummary.vue index 264c6042d..f3cb9fdb7 100644 --- a/src/pages/Customer/Card/CustomerSummary.vue +++ b/src/pages/Customer/Card/CustomerSummary.vue @@ -231,9 +231,11 @@ const creditWarning = computed(() => { :label="t('customer.summary.username')" :value="entity.account.name" /> - From c6f315d493e3058c645568f90df854ebe8b80368 Mon Sep 17 00:00:00 2001 From: carlossa Date: Mon, 4 Mar 2024 10:32:51 +0100 Subject: [PATCH 11/28] refs #6892 fix checkbox css --- src/components/ui/CardSummary.vue | 15 ++++-- src/pages/Claim/Card/ClaimSummary.vue | 3 +- src/pages/Entry/Card/EntrySummary.vue | 52 +++++++++++++------ src/pages/InvoiceIn/Card/InvoiceInSummary.vue | 6 ++- src/pages/Supplier/Card/SupplierSummary.vue | 32 +++++------- src/pages/Travel/Card/TravelSummary.vue | 30 +++++------ 6 files changed, 77 insertions(+), 61 deletions(-) diff --git a/src/components/ui/CardSummary.vue b/src/components/ui/CardSummary.vue index 23f54b6cd..e9c2ef187 100644 --- a/src/components/ui/CardSummary.vue +++ b/src/components/ui/CardSummary.vue @@ -143,10 +143,17 @@ watch(props, async () => { } .QCheckbox { display: flex; - position: absolute; - left: 0; - margin-left: auto; - color: gray; + margin-bottom: 9px; + & .q-checkbox__label { + margin-left: 20px; + color: var(--vn-text); + } + & .q-checkbox__inner { + position: absolute; + left: 0; + margin-left: auto; + color: gray; + } } } } diff --git a/src/pages/Claim/Card/ClaimSummary.vue b/src/pages/Claim/Card/ClaimSummary.vue index b93cbbd81..a2087bb60 100644 --- a/src/pages/Claim/Card/ClaimSummary.vue +++ b/src/pages/Claim/Card/ClaimSummary.vue @@ -220,9 +220,10 @@ function openDialog(dmsId) { diff --git a/src/pages/Entry/Card/EntrySummary.vue b/src/pages/Entry/Card/EntrySummary.vue index 3e63a67d3..cfca4c17e 100644 --- a/src/pages/Entry/Card/EntrySummary.vue +++ b/src/pages/Entry/Card/EntrySummary.vue @@ -192,18 +192,35 @@ const fetchEntryBuys = async () => { :label="t('entry.summary.invoiceNumber')" :value="entry.invoiceNumber" /> - - - - - - - - - - + + + + @@ -236,11 +253,12 @@ const fetchEntryBuys = async () => { :value="entry.travel.warehouseOut.name" /> - - { :value="entry.travel.warehouseIn.name" /> - diff --git a/src/pages/InvoiceIn/Card/InvoiceInSummary.vue b/src/pages/InvoiceIn/Card/InvoiceInSummary.vue index 850b67cc3..46be88e34 100644 --- a/src/pages/InvoiceIn/Card/InvoiceInSummary.vue +++ b/src/pages/InvoiceIn/Card/InvoiceInSummary.vue @@ -275,9 +275,11 @@ function getLink(param) { :label="t('invoiceIn.summary.company')" :value="invoiceIn.company?.code" /> - diff --git a/src/pages/Supplier/Card/SupplierSummary.vue b/src/pages/Supplier/Card/SupplierSummary.vue index d734e21a5..9eff36fcc 100644 --- a/src/pages/Supplier/Card/SupplierSummary.vue +++ b/src/pages/Supplier/Card/SupplierSummary.vue @@ -83,26 +83,18 @@ const isAdministrative = computed(() => { - - - - - - + + diff --git a/src/pages/Travel/Card/TravelSummary.vue b/src/pages/Travel/Card/TravelSummary.vue index 2ed6a0487..36cd84545 100644 --- a/src/pages/Travel/Card/TravelSummary.vue +++ b/src/pages/Travel/Card/TravelSummary.vue @@ -269,15 +269,12 @@ async function setTravelData(travelData) { :label="t('globals.wareHouseOut')" :value="travel.warehouseOut?.name" /> - - - + @@ -285,15 +282,12 @@ async function setTravelData(travelData) { :label="t('globals.wareHouseIn')" :value="travel.warehouseIn?.name" /> - - - + From 2ba9cc990d615face15bf5d82fbe3623cec53ab2 Mon Sep 17 00:00:00 2001 From: carlossa Date: Mon, 4 Mar 2024 11:13:53 +0100 Subject: [PATCH 12/28] refs #6892 fix scss --- src/components/ui/CardSummary.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/ui/CardSummary.vue b/src/components/ui/CardSummary.vue index e9c2ef187..4169ca1a4 100644 --- a/src/components/ui/CardSummary.vue +++ b/src/components/ui/CardSummary.vue @@ -145,13 +145,13 @@ watch(props, async () => { display: flex; margin-bottom: 9px; & .q-checkbox__label { - margin-left: 20px; + margin-left: 25px; color: var(--vn-text); } & .q-checkbox__inner { position: absolute; left: 0; - margin-left: auto; + margin-left: 5px; color: gray; } } From bb17be2a8ab52c87ef901c224d1dce09d61d031a Mon Sep 17 00:00:00 2001 From: carlossa Date: Mon, 4 Mar 2024 11:21:24 +0100 Subject: [PATCH 13/28] refs #6892 remove label --- src/components/ui/CardSummary.vue | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/components/ui/CardSummary.vue b/src/components/ui/CardSummary.vue index 4169ca1a4..95d2e049b 100644 --- a/src/components/ui/CardSummary.vue +++ b/src/components/ui/CardSummary.vue @@ -127,9 +127,6 @@ watch(props, async () => { color: var(--vn-text); overflow: hidden; } - .label-two { - width: 8em; - } } .header { color: $primary; From f8872b81c5daff94884eb1c556eb61f73e71dd28 Mon Sep 17 00:00:00 2001 From: carlossa Date: Mon, 4 Mar 2024 11:28:38 +0100 Subject: [PATCH 14/28] refs #6892 rename color --- src/components/ui/CardSummary.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/ui/CardSummary.vue b/src/components/ui/CardSummary.vue index 95d2e049b..0631982fa 100644 --- a/src/components/ui/CardSummary.vue +++ b/src/components/ui/CardSummary.vue @@ -149,7 +149,7 @@ watch(props, async () => { position: absolute; left: 0; margin-left: 5px; - color: gray; + color: var(--vn-label); } } } From adc290da6d223fd51bba3e3ab99834b261bba517 Mon Sep 17 00:00:00 2001 From: carlossa Date: Mon, 4 Mar 2024 12:26:14 +0100 Subject: [PATCH 15/28] refs #6935 restyle card --- src/components/ui/CardDescriptor.vue | 2 -- src/i18n/en/index.js | 2 ++ src/i18n/es/index.js | 2 ++ src/pages/Claim/Card/ClaimDescriptor.vue | 32 +++++++++---------- .../Customer/Card/CustomerDescriptor.vue | 16 +++++++--- src/pages/Ticket/Card/TicketDescriptor.vue | 19 +++++------ 6 files changed, 41 insertions(+), 32 deletions(-) diff --git a/src/components/ui/CardDescriptor.vue b/src/components/ui/CardDescriptor.vue index 345c8d088..1cb570ef0 100644 --- a/src/components/ui/CardDescriptor.vue +++ b/src/components/ui/CardDescriptor.vue @@ -223,8 +223,6 @@ const emit = defineEmits(['onFetch']); margin-bottom: 15px; } .list-box { - background-color: var(--vn-gray); - .q-item__label { color: var(--vn-label); } diff --git a/src/i18n/en/index.js b/src/i18n/en/index.js index 0cc91c88d..110c2b2fc 100644 --- a/src/i18n/en/index.js +++ b/src/i18n/en/index.js @@ -172,6 +172,7 @@ export default { hasDebt: 'Customer has debt', notChecked: 'Customer not checked', noWebAccess: 'Web access is disabled', + businessTypeFk: 'Business type', }, summary: { basicData: 'Basic data', @@ -437,6 +438,7 @@ export default { shipped: 'Shipped', warehouse: 'Warehouse', customerCard: 'Customer card', + alias: 'Alias', }, boxing: { expedition: 'Expedition', diff --git a/src/i18n/es/index.js b/src/i18n/es/index.js index 7369721e6..0324b3672 100644 --- a/src/i18n/es/index.js +++ b/src/i18n/es/index.js @@ -171,6 +171,7 @@ export default { hasDebt: 'El cliente tiene riesgo', notChecked: 'El cliente no está comprobado', noWebAccess: 'El acceso web está desactivado', + businessTypeFk: 'Tipo de negocio', }, summary: { basicData: 'Datos básicos', @@ -436,6 +437,7 @@ export default { shipped: 'Enviado', warehouse: 'Almacén', customerCard: 'Ficha del cliente', + alias: 'Alias', }, boxing: { expedition: 'Expedición', diff --git a/src/pages/Claim/Card/ClaimDescriptor.vue b/src/pages/Claim/Card/ClaimDescriptor.vue index 3827a70d4..c4642bdd4 100644 --- a/src/pages/Claim/Card/ClaimDescriptor.vue +++ b/src/pages/Claim/Card/ClaimDescriptor.vue @@ -105,7 +105,6 @@ onMounted(async () => { - - - + - + + + (data.value = useCardDescription(entity.name, entity data-key="customerData" >