From 248e02f53008e6ad58dff144bbf81e7329caabc0 Mon Sep 17 00:00:00 2001 From: wbuezas Date: Mon, 5 Feb 2024 08:25:35 -0300 Subject: [PATCH 01/20] WIP --- src/i18n/en/index.js | 1 + src/i18n/es/index.js | 1 + .../InvoiceOut/Card/InvoiceOutSummary.vue | 43 +++--- src/pages/InvoiceOut/InvoiceOutList.vue | 68 +++------- .../InvoiceOut/InvoiceOutNegativeBases.vue | 123 +++--------------- 5 files changed, 67 insertions(+), 169 deletions(-) diff --git a/src/i18n/en/index.js b/src/i18n/en/index.js index baaf414d6..9585bf7fb 100644 --- a/src/i18n/en/index.js +++ b/src/i18n/en/index.js @@ -531,6 +531,7 @@ export default { company: 'Company', dued: 'Due date', shortDued: 'Due date', + amount: 'Amount', }, card: { issued: 'Issued', diff --git a/src/i18n/es/index.js b/src/i18n/es/index.js index 0ea506b55..30e982ea2 100644 --- a/src/i18n/es/index.js +++ b/src/i18n/es/index.js @@ -531,6 +531,7 @@ export default { company: 'Empresa', dued: 'Fecha vencimineto', shortDued: 'F. vencimiento', + amount: 'Importe', }, card: { issued: 'Fecha emisión', diff --git a/src/pages/InvoiceOut/Card/InvoiceOutSummary.vue b/src/pages/InvoiceOut/Card/InvoiceOutSummary.vue index 5a56a3957..afdc4ea7d 100644 --- a/src/pages/InvoiceOut/Card/InvoiceOutSummary.vue +++ b/src/pages/InvoiceOut/Card/InvoiceOutSummary.vue @@ -2,11 +2,15 @@ import { onMounted, ref, computed } from 'vue'; import { useRoute } from 'vue-router'; import { useI18n } from 'vue-i18n'; -import axios from 'axios'; -import { toCurrency, toDate } from 'src/filters'; + import CardSummary from 'components/ui/CardSummary.vue'; import VnLv from 'src/components/ui/VnLv.vue'; +import TicketDescriptorProxy from 'src/pages/Ticket/Card/TicketDescriptorProxy.vue'; +import CustomerDescriptorProxy from 'src/pages/Customer/Card/CustomerDescriptorProxy.vue'; + import { getUrl } from 'src/composables/getUrl'; +import { toCurrency, toDate } from 'src/filters'; +import axios from 'axios'; onMounted(async () => { fetch(); @@ -66,30 +70,34 @@ const taxColumns = ref([ const ticketsColumns = ref([ { - name: 'item', - label: 'invoiceOut.summary.ticketId', + name: 'id', + label: t('invoiceOut.summary.ticketId'), field: (row) => row.id, sortable: true, + align: 'left', }, { - name: 'quantity', - label: 'invoiceOut.summary.nickname', + name: 'alias', + label: t('invoiceOut.summary.nickname'), field: (row) => row.nickname, sortable: true, + align: 'left', }, { name: 'landed', - label: 'invoiceOut.summary.shipped', + label: t('invoiceOut.summary.shipped'), field: (row) => row.shipped, format: (value) => toDate(value), sortable: true, + align: 'left', }, { name: 'landed', - label: 'invoiceOut.summary.totalWithVat', + label: t('invoiceOut.summary.totalWithVat'), field: (row) => row.totalWithVat, format: (value) => toCurrency(value), sortable: true, + align: 'left', }, ]); @@ -139,17 +147,22 @@ const ticketsColumns = ref([ - +
{{ t('invoiceOut.summary.tickets') }}
-