From 0eb699bcbedd910007abee213e271962e77118d8 Mon Sep 17 00:00:00 2001 From: jgallego Date: Tue, 20 Aug 2024 10:10:11 +0200 Subject: [PATCH] feat: refs #7346 formdata uses serialType --- src/i18n/locale/en.yml | 1 + src/i18n/locale/es.yml | 1 + src/pages/InvoiceOut/Card/InvoiceOutDescriptorMenu.vue | 4 ++-- src/pages/InvoiceOut/InvoiceOutGlobalForm.vue | 2 +- src/pages/Ticket/Card/TicketSaleMoreActions.vue | 4 ++-- src/stores/invoiceOutGlobal.js | 10 +++++----- 6 files changed, 12 insertions(+), 10 deletions(-) diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml index 7d3682525..7f15ecf6a 100644 --- a/src/i18n/locale/en.yml +++ b/src/i18n/locale/en.yml @@ -689,6 +689,7 @@ invoiceOut: chooseValidClient: Choose a valid client chooseValidCompany: Choose a valid company chooseValidPrinter: Choose a valid printer + chooseValidSerialType: Choose a serial type fillDates: Invoice date and the max date should be filled invoiceDateLessThanMaxDate: Invoice date can not be less than max date invoiceWithFutureDate: Exists an invoice with a future date diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml index 8157f1803..fb892f015 100644 --- a/src/i18n/locale/es.yml +++ b/src/i18n/locale/es.yml @@ -695,6 +695,7 @@ invoiceOut: chooseValidClient: Selecciona un cliente válido chooseValidCompany: Selecciona una empresa válida chooseValidPrinter: Selecciona una impresora válida + chooseValidSerialType: Selecciona una tipo de serie válida fillDates: La fecha de la factura y la fecha máxima deben estar completas invoiceDateLessThanMaxDate: La fecha de la factura no puede ser menor que la fecha máxima invoiceWithFutureDate: Existe una factura con una fecha futura diff --git a/src/pages/InvoiceOut/Card/InvoiceOutDescriptorMenu.vue b/src/pages/InvoiceOut/Card/InvoiceOutDescriptorMenu.vue index e524faa24..4c02ccf84 100644 --- a/src/pages/InvoiceOut/Card/InvoiceOutDescriptorMenu.vue +++ b/src/pages/InvoiceOut/Card/InvoiceOutDescriptorMenu.vue @@ -222,7 +222,7 @@ const showTransferInvoiceForm = async () => { {{ t('Generate PDF invoice') }} - {{ t('Refund...') }} + {{ t('Refund') }} @@ -250,7 +250,7 @@ es: Delete invoice: Eliminar factura Book invoice: Asentar factura Generate PDF invoice: Generar PDF factura - Refund...: Abono + Refund: Abono As PDF: como PDF As CSV: como CSV Send PDF: Enviar PDF diff --git a/src/pages/InvoiceOut/InvoiceOutGlobalForm.vue b/src/pages/InvoiceOut/InvoiceOutGlobalForm.vue index 5fc519061..88d55b093 100644 --- a/src/pages/InvoiceOut/InvoiceOutGlobalForm.vue +++ b/src/pages/InvoiceOut/InvoiceOutGlobalForm.vue @@ -110,7 +110,7 @@ onMounted(async () => { /> { - {{ t('Refund...') }} + {{ t('Refund') }} @@ -279,7 +279,7 @@ es: Add claim: Crear reclamación Mark as reserved: Marcar como reservado Unmark as reserved: Desmarcar como reservado - Refund...: Abono... + Refund: Abono with warehouse: con almacén without warehouse: sin almacén Claim out of time: Reclamación fuera de plazo diff --git a/src/stores/invoiceOutGlobal.js b/src/stores/invoiceOutGlobal.js index ca123d0b3..669d65728 100644 --- a/src/stores/invoiceOutGlobal.js +++ b/src/stores/invoiceOutGlobal.js @@ -19,7 +19,7 @@ export const useInvoiceOutGlobalStore = defineStore({ maxShipped: null, clientId: null, printer: null, - invoiceType: null, + serialType: null, }, addresses: [], minInvoicingDate: null, @@ -101,7 +101,7 @@ export const useInvoiceOutGlobalStore = defineStore({ maxShipped: new Date(formData.maxShipped), clientId: formData.clientId ? formData.clientId : null, companyFk: formData.companyFk, - invoiceType: formData.invoiceType, + serialType: formData.serialType, }; this.validateMakeInvoceParams(params, clientsToInvoice); @@ -154,9 +154,9 @@ export const useInvoiceOutGlobalStore = defineStore({ ); throw new Error('Invoice date in the future'); } - if (!params.invoiceType) { + if (!params.serialType) { notify( - 'invoiceOut.globalInvoices.errors.chooseValidinvoiceType', + 'invoiceOut.globalInvoices.errors.chooseValidSerialType', 'negative' ); throw new Error('Invalid Serial Type'); @@ -188,7 +188,7 @@ export const useInvoiceOutGlobalStore = defineStore({ invoiceDate: new Date(formData.invoiceDate), maxShipped: new Date(formData.maxShipped), companyFk: formData.companyFk, - invoiceType: formData.invoiceType, + serialType: formData.serialType, }; this.status = 'invoicing';