Merge branch 'master' into Hotifx-CustomerDms

src/pages/Ticket/Card/BasicData/TicketBasicDataForm.vue

@@ -290,7 +290,7 @@ async function getZone(options) {
                 </template>
             </VnSelect>
             <VnSelect
-                :label="t('ticketList.warehouse')"
+                :label="t('basicData.warehouse')"
                 v-model="warehouseId"
                 option-value="id"
                 option-label="name"
@@ -298,7 +298,7 @@ async function getZone(options) {
                 hide-selected
                 map-options
                 :required="true"
-                :rules="validate('ticketList.warehouse')"
+                :rules="validate('basicData.warehouse')"
             />
         </VnRow>
         <VnRow class="row q-gutter-md q-mb-md no-wrap">

src/pages/Ticket/TicketAdvance.vue

@@ -101,7 +101,7 @@ const ticketColumns = computed(() => [
         format: (row, dashIfEmpty) => dashIfEmpty(row.lines),
     },
     {
-        align: 'left',
+        align: 'right',
         label: t('advanceTickets.import'),
         name: 'totalWithVat',
         hidden: true,
@@ -145,6 +145,15 @@ const ticketColumns = computed(() => [
         headerClass: 'horizontal-separator',
         name: 'futureLiters',
     },
+    {
+        label: t('advanceTickets.preparation'),
+        name: 'futurePreparation',
+        field: 'futurePreparation',
+        align: 'left',
+        sortable: true,
+        headerClass: 'horizontal-separator',
+        columnFilter: false,
+    },
     {
         align: 'left',
         label: t('advanceTickets.futureZone'),
@@ -169,15 +178,17 @@ const ticketColumns = computed(() => [
         label: t('advanceTickets.notMovableLines'),
         headerClass: 'horizontal-separator',
         name: 'notMovableLines',
+        class: 'shrink',
     },
     {
         align: 'left',
         label: t('advanceTickets.futureLines'),
         headerClass: 'horizontal-separator',
         name: 'futureLines',
+        class: 'shrink',
     },
     {
-        align: 'left',
+        align: 'right',
         label: t('advanceTickets.futureImport'),
         name: 'futureTotalWithVat',
         hidden: true,
@@ -332,7 +343,12 @@ watch(
         if (!$el) return;
         const head = $el.querySelector('thead');
         const firstRow = $el.querySelector('thead > tr');
-
+        const headSelectionCol = $el.querySelector(
+            'thead tr.bg-header th.q-table--col-auto-width',
+        );
+        if (headSelectionCol) {
+            headSelectionCol.classList.add('horizontal-separator');
+        }
         const newRow = document.createElement('tr');
         destinationElRef.value = document.createElement('th');
         originElRef.value = document.createElement('th');
@@ -341,8 +357,10 @@ watch(
         destinationElRef.value.classList.add('text-uppercase', 'color-vn-label');
         originElRef.value.classList.add('text-uppercase', 'color-vn-label');
 
-        destinationElRef.value.setAttribute('colspan', '7');
+        originElRef.value.classList.add('advance-icon');
-        originElRef.value.setAttribute('colspan', '9');
+
+        destinationElRef.value.setAttribute('colspan', '9');
+        originElRef.value.setAttribute('colspan', '11');
 
         destinationElRef.value.textContent = `${t(
             'advanceTickets.destination',
@@ -453,8 +471,6 @@ watch(
                 selection: 'multiple',
             }"
             v-model:selected="selectedTickets"
-            :pagination="{ rowsPerPage: 0 }"
-            :no-data-label="t('globals.noResults')"
             :right-search="false"
             :order="['futureTotalWithVat ASC']"
             auto-load

src/pages/Ticket/TicketFuture.vue

@@ -85,6 +85,7 @@ const ticketColumns = computed(() => [
         label: t('advanceTickets.liters'),
         name: 'liters',
         align: 'left',
+        class: 'shrink',
         headerClass: 'horizontal-separator',
     },
     {
@@ -177,7 +178,12 @@ watch(
         if (!$el) return;
         const head = $el.querySelector('thead');
         const firstRow = $el.querySelector('thead > tr');
-
+        const headSelectionCol = $el.querySelector(
+            'thead tr.bg-header th.q-table--col-auto-width',
+        );
+        if (headSelectionCol) {
+            headSelectionCol.classList.add('horizontal-separator');
+        }
         const newRow = document.createElement('tr');
         destinationElRef.value = document.createElement('th');
         originElRef.value = document.createElement('th');
@@ -185,9 +191,10 @@ watch(
         newRow.classList.add('bg-header');
         destinationElRef.value.classList.add('text-uppercase', 'color-vn-label');
         originElRef.value.classList.add('text-uppercase', 'color-vn-label');
+        originElRef.value.classList.add('advance-icon');
 
-        destinationElRef.value.setAttribute('colspan', '7');
+        destinationElRef.value.setAttribute('colspan', '9');
-        originElRef.value.setAttribute('colspan', '9');
+        originElRef.value.setAttribute('colspan', '7');
 
         originElRef.value.textContent = `${t('advanceTickets.origin')}`;
         destinationElRef.value.textContent = `${t('advanceTickets.destination')}`;
@@ -371,4 +378,12 @@ watch(
 :deep(.horizontal-bottom-separator) {
     border-bottom: 4px solid white !important;
 }
+:deep(th.advance-icon::after) {
+    content: '>>';
+    font-size: larger;
+    position: absolute;
+    text-align: center;
+    float: 0;
+    left: 0;
+}
 </style>

src/pages/Ticket/locale/en.yml

@@ -120,6 +120,7 @@ basicData:
     difference: Difference
     total: Total
     price: Price
+    warehouse: Warehouse
     newPrice: New price
     chargeDifference: Charge difference to
     withoutNegatives: Create without negatives

src/pages/Ticket/locale/es.yml

@@ -47,6 +47,7 @@ basicData:
     difference: Diferencia
     total: Total
     price: Precio
+    warehouse: Almacén
     newPrice: Nuevo precio
     chargeDifference: Cargar diferencia a
     withoutNegatives: Crear sin negativos