From 7ee8dbf2d6511ad43b695e1e02cce54296d9d7be Mon Sep 17 00:00:00 2001 From: alexandre Date: Mon, 28 Nov 2022 09:10:13 +0100 Subject: [PATCH] refs #4801 fetched tags added --- src/components/ui/FetchedTags.vue | 54 +++++++++++++++++++++++++ src/css/quasar.variables.scss | 1 + src/i18n/en/index.js | 3 +- src/i18n/es/index.js | 3 +- src/pages/Ticket/Card/FetchedTags.vue | 17 -------- src/pages/Ticket/Card/TicketSummary.vue | 41 ++++++++++++++++--- 6 files changed, 95 insertions(+), 24 deletions(-) create mode 100644 src/components/ui/FetchedTags.vue delete mode 100644 src/pages/Ticket/Card/FetchedTags.vue diff --git a/src/components/ui/FetchedTags.vue b/src/components/ui/FetchedTags.vue new file mode 100644 index 000000000..364713cbc --- /dev/null +++ b/src/components/ui/FetchedTags.vue @@ -0,0 +1,54 @@ + + + + diff --git a/src/css/quasar.variables.scss b/src/css/quasar.variables.scss index 6476f150a..33e59074f 100644 --- a/src/css/quasar.variables.scss +++ b/src/css/quasar.variables.scss @@ -24,6 +24,7 @@ $info: #31ccec; $warning: #f2c037; $color-spacer-light: rgba(255, 255, 255, .12); +$color-spacer:rgba(255, 255, 255, .3); $border-thin-light: 1px solid $color-spacer-light; $spacing-md: 16px; diff --git a/src/i18n/en/index.js b/src/i18n/en/index.js index 62e83884e..acde021bd 100644 --- a/src/i18n/en/index.js +++ b/src/i18n/en/index.js @@ -227,7 +227,8 @@ export default { changeState: 'Change state', requester: 'Requester', atender: 'Atender', - request: 'Request' + request: 'Request', + goTo: 'Go to' } }, claim: { diff --git a/src/i18n/es/index.js b/src/i18n/es/index.js index d614591e3..78519a604 100644 --- a/src/i18n/es/index.js +++ b/src/i18n/es/index.js @@ -226,7 +226,8 @@ export default { changeState: 'Cambiar estado', requester: 'Solicitante', atender: 'Comprador', - request: 'PeticiĆ³n de compra' + request: 'PeticiĆ³n de compra', + goTo: 'Ir a' } }, claim: { diff --git a/src/pages/Ticket/Card/FetchedTags.vue b/src/pages/Ticket/Card/FetchedTags.vue deleted file mode 100644 index 86abe93f7..000000000 --- a/src/pages/Ticket/Card/FetchedTags.vue +++ /dev/null @@ -1,17 +0,0 @@ - - - - diff --git a/src/pages/Ticket/Card/TicketSummary.vue b/src/pages/Ticket/Card/TicketSummary.vue index 44239a25f..b172d0c89 100644 --- a/src/pages/Ticket/Card/TicketSummary.vue +++ b/src/pages/Ticket/Card/TicketSummary.vue @@ -6,7 +6,7 @@ import axios from 'axios'; import { dashIfEmpty, toDate, toCurrency, zeroFill } from 'src/filters'; import SkeletonSummary from 'components/ui/SkeletonSummary.vue'; import FetchData from 'components/FetchData.vue'; -import FetchedTags from './FetchedTags.vue'; +import FetchedTags from 'components/ui/FetchedTags.vue'; onMounted(() => fetch()); onUpdated(() => fetch()); @@ -126,7 +126,7 @@ async function changeState(value) { {{ t('ticket.summary.salesPerson') }} - {{ ticket.client.salesPersonUser.name }} + {{ ticket.client.salesPersonUser.name }} @@ -150,7 +150,7 @@ async function changeState(value) { {{ t('ticket.summary.invoice') }} - {{ dashIfEmpty(ticket.refFk) }} + {{ ticket.refFk }} @@ -250,6 +250,7 @@ async function changeState(value) {
{{ t('ticket.summary.saleLines') }} + {{ t('ticket.summary.goTo') }}