Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev

src/pages/Order/Card/OrderCatalogFilter.vue

@@ -166,6 +166,7 @@ onMounted(() => {
         :expr-builder="exprBuilder"
         :custom-tags="['tagGroups', 'categoryFk']"
         :redirect="false"
+        search-url="params"
     >
         <template #tags="{ tag, formatFn }">
             <strong v-if="tag.label === 'typeFk'">

src/pages/Order/Card/OrderLines.vue

@@ -111,6 +111,7 @@ const columns = computed(() => [
         component: 'select',
         attrs: {
             url: 'Items',
+            sortBy: 'name ASC ',
             fields: ['id', 'name', 'subName'],
         },
         columnField: {

src/pages/Ticket/Card/TicketSale.vue

@@ -94,25 +94,32 @@ const columns = computed(() => [
     },
     {
         align: 'left',
-        label: t('ticketList.id'),
+        label: t('globals.id'),
         name: 'itemFk',
     },
     {
         align: 'left',
-        label: t('basicData.quantity'),
+        label: t('globals.quantity'),
         name: 'quantity',
         format: (row) => toCurrency(row.quantity),
     },
     {
         align: 'left',
-        label: t('basicData.item'),
+        label: t('globals.item'),
         name: 'item',
         format: (row) => row?.item?.name,
         columnClass: 'expand',
     },
     {
         align: 'left',
-        label: t('basicData.price'),
+        label: t('globals.size'),
+        name: 'size',
+        format: (row) => row?.item?.size,
+        columnClass: 'expand',
+    },
+    {
+        align: 'left',
+        label: t('globals.price'),
         name: 'price',
         format: (row) => toCurrency(row.price),
     },
@@ -124,7 +131,7 @@ const columns = computed(() => [
     },
     {
         align: 'left',
-        label: t('ticketList.amount'),
+        label: t('globals.amount'),
         name: 'amount',
         format: (row) => parseInt(row.amount * row.quantity),
     },

src/pages/Ticket/locale/es.yml

@@ -138,6 +138,7 @@ ticketSale:
     ok: Ok
     more: Más
     address: Consignatario
+    size: Medida
 ticketComponents:
     serie: Serie
     components: Componentes