Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
gitea/salix-front/pipeline/head This commit looks good Details

This commit is contained in:
Alex Moreno 2024-11-19 07:48:02 +01:00
commit 43f58d3dba
5 changed files with 11 additions and 0 deletions

View File

@ -184,6 +184,7 @@ function addOrder(value, field, params) {
:custom-tags="['tagGroups']" :custom-tags="['tagGroups']"
@remove="clearFilter" @remove="clearFilter"
:redirect="false" :redirect="false"
search-url="params"
> >
<template #tags="{ tag, formatFn }"> <template #tags="{ tag, formatFn }">
<strong v-if="tag.label === 'categoryFk'"> <strong v-if="tag.label === 'categoryFk'">

View File

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

View File

@ -106,6 +106,13 @@ const columns = computed(() => [
format: (row) => row?.item?.name, format: (row) => row?.item?.name,
columnClass: 'expand', columnClass: 'expand',
}, },
{
align: 'left',
label: t('ticketSale.size'),
name: 'size',
format: (row) => row?.item?.size,
columnClass: 'expand',
},
{ {
align: 'left', align: 'left',
label: t('ticketSale.price'), label: t('ticketSale.price'),

View File

@ -48,6 +48,7 @@ ticketSale:
shipped: Shipped shipped: Shipped
agency: Agency agency: Agency
address: Address address: Address
size: Size
advanceTickets: advanceTickets:
preparation: Preparation preparation: Preparation
origin: Origin origin: Origin

View File

@ -184,6 +184,7 @@ ticketSale:
shipped: F. Envío shipped: F. Envío
agency: Agencia agency: Agencia
address: Consignatario address: Consignatario
size: Medida
ticketComponents: ticketComponents:
item: Artículo item: Artículo
description: Descripción description: Descripción