From adc290da6d223fd51bba3e3ab99834b261bba517 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Mon, 4 Mar 2024 12:26:14 +0100
Subject: [PATCH 1/2] 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 () => {
             <ClaimDescriptorMenu :claim="entity" />
         </template>
         <template #body="{ entity }">
-            <VnLv :label="t('claim.card.created')" :value="toDate(entity.created)" />
             <VnLv v-if="entity.claimState" :label="t('claim.card.state')">
                 <template #value>
                     <QBadge :color="stateColor(entity.claimState.code)" dense>
@@ -113,13 +112,13 @@ onMounted(async () => {
                     </QBadge>
                 </template>
             </VnLv>
-            <VnLv :label="t('claim.card.ticketId')">
+            <VnLv :label="t('claim.card.created')" :value="toDate(entity.created)" />
+            <VnLv :label="t('claim.card.commercial')">
                 <template #value>
-                    <span class="link">
-                        {{ entity.ticketFk }}
-
-                        <TicketDescriptorProxy :id="entity.ticketFk" />
-                    </span>
+                    <VnUserLink
+                        :name="entity.client?.salesPersonUser?.name"
+                        :worker-id="entity.client?.salesPersonFk"
+                    />
                 </template>
             </VnLv>
             <VnLv
@@ -134,19 +133,20 @@ onMounted(async () => {
                     />
                 </template>
             </VnLv>
-            <VnLv :label="t('claim.card.commercial')">
-                <template #value>
-                    <VnUserLink
-                        :name="entity.client?.salesPersonUser?.name"
-                        :worker-id="entity.client?.salesPersonFk"
-                    />
-                </template>
-            </VnLv>
+            <VnLv :label="t('claim.card.zone')" :value="entity.ticket?.zone?.name" />
             <VnLv
                 :label="t('claim.card.province')"
                 :value="entity.ticket?.address?.province?.name"
             />
-            <VnLv :label="t('claim.card.zone')" :value="entity.ticket?.zone?.name" />
+            <VnLv :label="t('claim.card.ticketId')">
+                <template #value>
+                    <span class="link">
+                        {{ entity.ticketFk }}
+
+                        <TicketDescriptorProxy :id="entity.ticketFk" />
+                    </span>
+                </template>
+            </VnLv>
             <VnLv
                 :label="t('claimRate')"
                 :value="toPercentage(entity.client?.claimsRatio?.claimingRate)"
diff --git a/src/pages/Customer/Card/CustomerDescriptor.vue b/src/pages/Customer/Card/CustomerDescriptor.vue
index 2e8770fe7..73b926964 100644
--- a/src/pages/Customer/Card/CustomerDescriptor.vue
+++ b/src/pages/Customer/Card/CustomerDescriptor.vue
@@ -40,6 +40,15 @@ const setData = (entity) => (data.value = useCardDescription(entity.name, entity
         data-key="customerData"
     >
         <template #body="{ entity }">
+            <VnLv :label="t('customer.card.payMethod')" :value="entity.payMethod.name" />
+
+            <VnLv :label="t('customer.card.credit')" :value="toCurrency(entity.credit)" />
+            <VnLv
+                :label="t('customer.card.securedCredit')"
+                :value="toCurrency(entity.creditInsurance)"
+            />
+
+            <VnLv :label="t('customer.card.debt')" :value="toCurrency(entity.debt)" />
             <VnLv v-if="entity.salesPersonUser" :label="t('customer.card.salesPerson')">
                 <template #value>
                     <VnUserLink
@@ -48,13 +57,10 @@ const setData = (entity) => (data.value = useCardDescription(entity.name, entity
                     />
                 </template>
             </VnLv>
-            <VnLv :label="t('customer.card.credit')" :value="toCurrency(entity.credit)" />
             <VnLv
-                :label="t('customer.card.securedCredit')"
-                :value="toCurrency(entity.creditInsurance)"
+                :label="t('customer.card.businessTypeFk')"
+                :value="entity.businessTypeFk"
             />
-            <VnLv :label="t('customer.card.payMethod')" :value="entity.payMethod.name" />
-            <VnLv :label="t('customer.card.debt')" :value="toCurrency(entity.debt)" />
         </template>
         <template #icons="{ entity }">
             <QCardActions>
diff --git a/src/pages/Ticket/Card/TicketDescriptor.vue b/src/pages/Ticket/Card/TicketDescriptor.vue
index 37ed13c2e..f0ded019b 100644
--- a/src/pages/Ticket/Card/TicketDescriptor.vue
+++ b/src/pages/Ticket/Card/TicketDescriptor.vue
@@ -88,14 +88,6 @@ const setData = (entity) =>
             <TicketDescriptorMenu :ticket="entity" />
         </template>
         <template #body="{ entity }">
-            <VnLv v-if="entity.ticketState" :label="t('ticket.card.state')">
-                <template #value>
-                    <QBadge :color="entity.ticketState.state.classColor">
-                        {{ entity.ticketState.state.name }}
-                    </QBadge>
-                </template>
-            </VnLv>
-            <VnLv :label="t('ticket.card.shipped')" :value="toDate(entity.shipped)" />
             <VnLv :label="t('ticket.card.customerId')">
                 <template #value>
                     <span class="link">
@@ -104,6 +96,13 @@ const setData = (entity) =>
                     </span>
                 </template>
             </VnLv>
+            <VnLv v-if="entity.ticketState" :label="t('ticket.card.state')">
+                <template #value>
+                    <QBadge :color="entity.ticketState.state.classColor">
+                        {{ entity.ticketState.state.name }}
+                    </QBadge>
+                </template>
+            </VnLv>
             <VnLv :label="t('ticket.summary.salesPerson')">
                 <template #value>
                     <VnUserLink
@@ -112,12 +111,14 @@ const setData = (entity) =>
                     />
                 </template>
             </VnLv>
-            <VnLv :label="t('ticket.card.warehouse')" :value="entity.warehouse?.name" />
+            <VnLv :label="t('ticket.card.shipped')" :value="toDate(entity.shipped)" />
             <VnLv
                 v-if="entity.agencyMode"
                 :label="t('ticket.card.agency')"
                 :value="entity.agencyMode.name"
             />
+            <VnLv :label="t('ticket.card.warehouse')" :value="entity.warehouse?.name" />
+            <VnLv :label="t('ticket.card.alias')" :value="entity.nickname" />
         </template>
         <template #icons="{ entity }">
             <QCardActions>

From 8ad2aed994d9549fbb05bdf2df441d93acc07172 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Tue, 5 Mar 2024 13:09:12 +0100
Subject: [PATCH 2/2] refs #6935 perf: improve css class to handle content
 after

---
 src/components/ui/CardDescriptor.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/components/ui/CardDescriptor.vue b/src/components/ui/CardDescriptor.vue
index 1cb570ef0..241a813b8 100644
--- a/src/components/ui/CardDescriptor.vue
+++ b/src/components/ui/CardDescriptor.vue
@@ -188,7 +188,8 @@ const emit = defineEmits(['onFetch']);
         .label {
             color: var(--vn-label);
             font-size: 12px;
-            ::after {
+
+            &:not(:has(a))::after {
                 content: ':';
             }
         }