diff --git a/.vscode/settings.json b/.vscode/settings.json index 5026b7d3b..f175e4b82 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -14,5 +14,13 @@ "[vue]": { "editor.defaultFormatter": "esbenp.prettier-vscode" }, - "cSpell.words": ["axios"] + "cSpell.words": ["axios"], + + "editor.tabSize": 2, + "files.autoSave": "onFocusChange", + "files.trimTrailingWhitespace": true, + "editor.hover.enabled": true, + "editor.formatOnPaste": true, + "editor.wordWrapColumn": 80, + "prettier.singleQuote": true } diff --git a/src/filters/toCurrency.js b/src/filters/toCurrency.js index 5005e95bc..f820c0127 100644 --- a/src/filters/toCurrency.js +++ b/src/filters/toCurrency.js @@ -9,13 +9,10 @@ export default function (value, symbol = 'EUR', fractionSize = 2) { style: 'currency', currency: symbol, minimumFractionDigits: fractionSize, - maximumFractionDigits: fractionSize + maximumFractionDigits: fractionSize, }; const lang = locale.value == 'es' ? 'de' : locale.value; - return new Intl.NumberFormat(lang, options) - .format(value); - - -} \ No newline at end of file + return new Intl.NumberFormat(lang, options).format(value); +} diff --git a/src/i18n/en/index.js b/src/i18n/en/index.js index 106bc1a6a..e3b9b9533 100644 --- a/src/i18n/en/index.js +++ b/src/i18n/en/index.js @@ -348,6 +348,7 @@ export default { pageTitles: { invoiceOuts: 'Invoices Out', list: 'List', + negativeBases: 'Negative Bases', globalInvoicing: 'Global invoicing', createInvoiceOut: 'Create invoice out', summary: 'Summary', @@ -402,6 +403,21 @@ export default { criticalInvoiceError: 'Critical invoicing error, process stopped', }, }, + negativeBases: { + from: 'From', + to: 'To', + company: 'Company', + country: 'Country', + clientId: 'Client Id', + client: 'Client', + amount: 'Amount', + base: 'Base', + ticketId: 'Ticket Id', + active: 'Active', + hasToInvoice: 'Has to Invoice', + verifiedData: 'Verified Data', + comercial: 'Comercial', + }, }, worker: { pageTitles: { diff --git a/src/i18n/es/index.js b/src/i18n/es/index.js index c15d6e714..0f1dead30 100644 --- a/src/i18n/es/index.js +++ b/src/i18n/es/index.js @@ -348,6 +348,7 @@ export default { pageTitles: { invoiceOuts: 'Fact. emitidas', list: 'Listado', + negativeBases: 'Bases Negativas', globalInvoicing: 'Facturación global', createInvoiceOut: 'Crear fact. emitida', summary: 'Resumen', @@ -404,6 +405,21 @@ export default { criticalInvoiceError: 'Error crítico en la facturación, proceso detenido', }, }, + negativeBases: { + from: 'Desde', + to: 'Hasta', + company: 'Empresa', + country: 'País', + clientId: 'ID Cliente', + client: 'Cliente', + amount: 'Importe', + base: 'Base', + ticketId: 'ID Ticket', + active: 'Activo', + hasToInvoice: 'Tiene que facturar', + verifiedData: 'Datos verificados', + comercial: 'Comercial', + }, }, worker: { pageTitles: { diff --git a/src/pages/InvoiceOut/InvoiceOutNegativeBases.vue b/src/pages/InvoiceOut/InvoiceOutNegativeBases.vue new file mode 100644 index 000000000..e4b8f4f89 --- /dev/null +++ b/src/pages/InvoiceOut/InvoiceOutNegativeBases.vue @@ -0,0 +1,400 @@ + + + + + + + + { + "en": { + "status": { + "packageInvoicing": "Build packaging tickets", + "invoicing": "Invoicing client", + "stopping": "Stopping process", + "done": "Ended process" + }, + "of": "of" + }, + "es": { + "status":{ + "packageInvoicing": "Generación de tickets de empaque", + "invoicing": "Facturando a cliente", + "stopping": "Deteniendo proceso", + "done": "Proceso detenido", + }, + "of": "de" + } + } + diff --git a/src/router/modules/invoiceOut.js b/src/router/modules/invoiceOut.js index e8e18a810..ec30e4fc0 100644 --- a/src/router/modules/invoiceOut.js +++ b/src/router/modules/invoiceOut.js @@ -10,7 +10,7 @@ export default { component: RouterView, redirect: { name: 'InvoiceOutMain' }, menus: { - main: ['InvoiceOutList', 'InvoiceOutGlobal'], + main: ['InvoiceOutList', 'InvoiceOutGlobal', 'InvoiceOutNegativeBases'], card: [], }, children: [ @@ -38,6 +38,16 @@ export default { }, component: () => import('src/pages/InvoiceOut/InvoiceOutGlobal.vue'), }, + { + path: 'negative-bases', + name: 'InvoiceOutNegativeBases', + meta: { + title: 'negativeBases', + icon: 'view_list', + }, + component: () => + import('src/pages/InvoiceOut/InvoiceOutNegativeBases.vue'), + }, ], }, { diff --git a/src/services/InvoiceOut.service.js b/src/services/InvoiceOut.service.js index 039943483..b44b52b1f 100644 --- a/src/services/InvoiceOut.service.js +++ b/src/services/InvoiceOut.service.js @@ -17,6 +17,10 @@ const request = async (method, url, params = {}) => { }; const invoiceOutService = { + getNegativeBases: async (params) => { + return await request('GET', 'InvoiceOuts/negativeBases', params); + }, + getInvoiceDate: async (params) => { return await request('GET', 'InvoiceOuts/getInvoiceDate', params); },