Merge branch 'dev' of https: refs #8004//gitea.verdnatura.es/verdnatura/salix-front into 8004-liliumStyleRemake

Reviewed-on: #820
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>

src/boot/defaults/qInput.js

@@ -0,0 +1,4 @@
+import { QInput } from 'quasar';
+import setDefault from './setDefault';
+
+setDefault(QInput, 'dense', true);

src/boot/defaults/qSelect.js

@@ -0,0 +1,4 @@
+import { QSelect } from 'quasar';
+import setDefault from './setDefault';
+
+setDefault(QSelect, 'dense', true);

src/boot/quasar.defaults.js

@@ -1 +1,3 @@
 export * from './defaults/qTable';
+export * from './defaults/qInput';
+export * from './defaults/qSelect';

src/components/common/VnInput.vue

@@ -130,24 +130,4 @@ const mixinRules = [
 .q-field__append {
     padding-inline: 0;
 }
-
-.q-field__append.q-field__marginal.row.no-wrap.items-center.row {
-    height: 20px;
-}
-.q-field--outlined .q-field__append.q-field__marginal.row.no-wrap.items-center.row {
-    height: auto;
-}
-.q-field__control {
-    height: unset;
-}
-
-.q-field--labeled {
-    .q-field__native,
-    .q-field__prefix,
-    .q-field__suffix,
-    .q-field__input {
-        padding-bottom: 0;
-        min-height: 15px;
-    }
-}
 </style>

src/components/common/VnSelect.vue

@@ -283,15 +283,4 @@ const getVal = (val) => ($props.useLike ? { like: `%${val}%` } : val);
 .q-field--outlined {
     max-width: 100%;
 }
-.q-field__inner {
-    .q-field__control {
-        min-height: auto !important;
-
-        display: flex;
-        align-items: flex-end;
-        .q-field__native.row {
-            min-height: auto !important;
-        }
-    }
-}
 </style>

src/components/ui/VnRow.vue

@@ -9,7 +9,6 @@ defineProps({ wrap: { type: Boolean, default: false } });
 <style lang="scss" scoped>
 .vn-row {
     display: flex;
-    align-items: flex-end;
     > :deep(*) {
         flex: 1;
     }

src/pages/InvoiceIn/Card/InvoiceInSummary.vue

@@ -274,10 +274,7 @@ const getLink = (param) => `#/invoice-in/${entityId.value}/${param}`;
                     :label="t('invoiceIn.summary.company')"
                     :value="entity.company?.code"
                 />
-                <VnLv
+                <VnLv :label="t('invoiceIn.isBooked')" :value="invoiceIn?.isBooked" />
-                    :label="t('invoiceIn.summary.booked')"
-                    :value="invoiceIn?.isBooked"
-                />
             </QCard>
             <QCard class="vn-one">
                 <QCardSection class="q-pa-none">

src/pages/InvoiceIn/InvoiceInFilter.vue

@@ -116,7 +116,7 @@ const activities = ref([]);
             <QItem>
                 <QItemSection>
                     <QCheckbox
-                        :label="t('params.isBooked')"
+                        :label="t('invoiceIn.isBooked')"
                         v-model="params.isBooked"
                         @update:model-value="searchFn()"
                         toggle-indeterminate
@@ -170,7 +170,7 @@ es:
         awb: AWB
         amount: Importe
         issued: Emitida
-        isBooked: Conciliada
+        isBooked: Contabilizada
         account: Cuenta contable
         created: Creada
         dued: Vencida

src/pages/InvoiceIn/InvoiceInList.vue

@@ -65,7 +65,7 @@ const cols = computed(() => [
     {
         align: 'left',
         name: 'isBooked',
-        label: t('invoiceIn.list.isBooked'),
+        label: t('invoiceIn.isBooked'),
         columnFilter: false,
         cardVisible: true,
     },

src/pages/InvoiceIn/locale/en.yml

@@ -1,5 +1,6 @@
 invoiceIn:
     serial: Serial
+    isBooked: Is booked
     list:
         ref: Reference
         supplier: Supplier
@@ -7,7 +8,6 @@ invoiceIn:
         serial: Serial
         file: File
         issued: Issued
-        isBooked: Is booked
         awb: AWB
         amount: Amount
     card:
@@ -31,7 +31,6 @@ invoiceIn:
         sage: Sage withholding
         vat: Undeductible VAT
         company: Company
-        booked: Booked
         expense: Expense
         taxableBase: Taxable base
         rate: Rate

src/pages/InvoiceIn/locale/es.yml

@@ -1,5 +1,6 @@
 invoiceIn:
     serial: Serie
+    isBooked: Contabilizada
     list:
         ref: Referencia
         supplier: Proveedor
@@ -7,7 +8,6 @@ invoiceIn:
         shortIssued: F. emisión
         file: Fichero
         issued: Fecha emisión
-        isBooked: Conciliada
         awb: AWB
         amount: Importe
     card:
@@ -31,7 +31,6 @@ invoiceIn:
         sage: Retención sage
         vat: Iva no deducible
         company: Empresa
-        booked: Contabilizada
         expense: Gasto
         taxableBase: Base imp.
         rate: Tasa

src/pages/Worker/Card/WorkerSummary.vue

@@ -139,6 +139,7 @@ onBeforeMount(async () => {
                         <VnLinkPhone :phone-number="worker?.sip?.extension" />
                     </template>
                 </VnLv>
+                <VnLv :label="t('queue')" :value="worker.sip?.queueMember?.queue" />
             </QCard>
         </template>
     </CardSummary>

src/pages/Worker/locale/en.yml

@@ -9,3 +9,4 @@ tableColumns:
     fi: FI
     SSN: SSN
     extension: Extension
+queue: Queue

src/pages/Worker/locale/es.yml

@@ -14,3 +14,4 @@ tableColumns:
     fi: NIF
     SSN: NSS
     extension: Extensión
+queue: Cola

test/cypress/integration/ticket/ticketDescriptor.spec.js

@@ -1,7 +1,7 @@
 /// <reference types="cypress" />
 describe('Ticket descriptor', () => {
-    const toCloneOpt = '[role="menu"] .q-list > :nth-child(5)';
+    const toCloneOpt = '[role="menu"] .q-list > :nth-child(8)';
-    const setWeightOpt = '[role="menu"] .q-list > :nth-child(6)';
+    const setWeightOpt = '[role="menu"] .q-list > :nth-child(13)';
     const warehouseValue = ':nth-child(1) > :nth-child(6) > .value > span';
     const summaryHeader = '.summaryHeader > div';
     const weight = 25;