From 32a0955c1d5e210176868d1f39539f555fdb6970 Mon Sep 17 00:00:00 2001 From: Juan Ferrer Toribio Date: Thu, 8 Jun 2023 12:48:14 +0200 Subject: [PATCH 01/29] refs #5667 Zone translations fixed --- modules/zone/back/locale/zone-event/en.yml | 8 ++++---- modules/zone/back/locale/zone-event/es.yml | 6 +++--- modules/zone/back/locale/zone-exclusion/en.yml | 4 ++-- modules/zone/back/locale/zone-exclusion/es.yml | 2 +- modules/zone/back/locale/zone-included/en.yml | 4 +++- modules/zone/back/locale/zone-included/es.yml | 4 +++- modules/zone/back/locale/zone-warehouse/en.yml | 2 +- modules/zone/back/locale/zone-warehouse/es.yml | 2 +- 8 files changed, 18 insertions(+), 14 deletions(-) diff --git a/modules/zone/back/locale/zone-event/en.yml b/modules/zone/back/locale/zone-event/en.yml index 2d6ef39ab7..1988c1239b 100644 --- a/modules/zone/back/locale/zone-event/en.yml +++ b/modules/zone/back/locale/zone-event/en.yml @@ -1,14 +1,14 @@ -name: zone event +name: event columns: id: id zoneFk: zone type: type dated: dated - started: started - ended: ended + started: starts + ended: ends weekDays: week days hour: hour travelingDays: traveling days price: price bonus: bonus - m3Max: max m3 + m3Max: max. m3 diff --git a/modules/zone/back/locale/zone-event/es.yml b/modules/zone/back/locale/zone-event/es.yml index 9bc8db9fe4..5092cc9333 100644 --- a/modules/zone/back/locale/zone-event/es.yml +++ b/modules/zone/back/locale/zone-event/es.yml @@ -1,11 +1,11 @@ -name: evento zona +name: evento columns: id: id zoneFk: zona type: tipo dated: fecha - started: comenzado - ended: terminado + started: empieza + ended: termina weekDays: días semana hour: hora travelingDays: días de viaje diff --git a/modules/zone/back/locale/zone-exclusion/en.yml b/modules/zone/back/locale/zone-exclusion/en.yml index 4389d8b937..6a2383b87a 100644 --- a/modules/zone/back/locale/zone-exclusion/en.yml +++ b/modules/zone/back/locale/zone-exclusion/en.yml @@ -1,5 +1,5 @@ -name: zone exclusion +name: exclusion columns: id: id - dated: dated + dated: date zoneFk: zone diff --git a/modules/zone/back/locale/zone-exclusion/es.yml b/modules/zone/back/locale/zone-exclusion/es.yml index 4e59cba46b..35102a670c 100644 --- a/modules/zone/back/locale/zone-exclusion/es.yml +++ b/modules/zone/back/locale/zone-exclusion/es.yml @@ -1,4 +1,4 @@ -name: zone exclusion +name: exclusión columns: id: id dated: fecha diff --git a/modules/zone/back/locale/zone-included/en.yml b/modules/zone/back/locale/zone-included/en.yml index 0e44989e9a..65e4faac61 100644 --- a/modules/zone/back/locale/zone-included/en.yml +++ b/modules/zone/back/locale/zone-included/en.yml @@ -1,5 +1,7 @@ -name: zone included +name: inclusion columns: id: id dated: dated zoneFk: zone + isIncluded: incluida + geoFk: localización diff --git a/modules/zone/back/locale/zone-included/es.yml b/modules/zone/back/locale/zone-included/es.yml index 30a89373ad..bd48cdbe5d 100644 --- a/modules/zone/back/locale/zone-included/es.yml +++ b/modules/zone/back/locale/zone-included/es.yml @@ -1,5 +1,7 @@ -name: zona incluida +name: inclusión columns: id: id dated: fecha zoneFk: zona + isIncluded: incluida + geoFk: localización diff --git a/modules/zone/back/locale/zone-warehouse/en.yml b/modules/zone/back/locale/zone-warehouse/en.yml index b9c4f76098..6caa3de1b2 100644 --- a/modules/zone/back/locale/zone-warehouse/en.yml +++ b/modules/zone/back/locale/zone-warehouse/en.yml @@ -1,4 +1,4 @@ -name: zone warehouse +name: warehouse columns: id: id warehouseFk: warehouse diff --git a/modules/zone/back/locale/zone-warehouse/es.yml b/modules/zone/back/locale/zone-warehouse/es.yml index ec8dec2dd0..caf0d8f1a4 100644 --- a/modules/zone/back/locale/zone-warehouse/es.yml +++ b/modules/zone/back/locale/zone-warehouse/es.yml @@ -1,4 +1,4 @@ -name: almacén zona +name: almacén columns: id: id warehouseFk: almacén From 703c224e91e2e5d0ab668fc68224be3363723f6a Mon Sep 17 00:00:00 2001 From: alexandre Date: Mon, 12 Jun 2023 10:26:50 +0200 Subject: [PATCH 02/29] refs #5513 modified-entry email --- db/dump/fixtures.sql | 3 ++- modules/entry/back/methods/entry/addFromBuy.js | 2 +- .../back/methods/supplier/getItemsPackaging.js | 4 ++-- .../email/modified-entry/assets/css/import.js | 11 +++++++++++ .../templates/email/modified-entry/locale/en.yml | 3 +++ .../templates/email/modified-entry/locale/es.yml | 3 +++ .../email/modified-entry/modified-entry.html | 11 +++++++++++ .../email/modified-entry/modified-entry.js | 16 ++++++++++++++++ 8 files changed, 49 insertions(+), 4 deletions(-) create mode 100644 print/templates/email/modified-entry/assets/css/import.js create mode 100644 print/templates/email/modified-entry/locale/en.yml create mode 100644 print/templates/email/modified-entry/locale/es.yml create mode 100644 print/templates/email/modified-entry/modified-entry.html create mode 100755 print/templates/email/modified-entry/modified-entry.js diff --git a/db/dump/fixtures.sql b/db/dump/fixtures.sql index 4441ec19c0..5e3efd1de4 100644 --- a/db/dump/fixtures.sql +++ b/db/dump/fixtures.sql @@ -2732,7 +2732,8 @@ INSERT INTO `util`.`notification` (`id`, `name`, `description`) (1, 'print-email', 'notification fixture one'), (2, 'invoice-electronic', 'A electronic invoice has been generated'), (3, 'not-main-printer-configured', 'A printer distinct than main has been configured'), - (4, 'supplier-pay-method-update', 'A supplier pay method has been updated'); + (4, 'supplier-pay-method-update', 'A supplier pay method has been updated'), + (5, 'modified-entry', 'An entry has been modified'); INSERT INTO `util`.`notificationAcl` (`notificationFk`, `roleFk`) VALUES diff --git a/modules/entry/back/methods/entry/addFromBuy.js b/modules/entry/back/methods/entry/addFromBuy.js index f7e1b637e1..bfbd1b4160 100644 --- a/modules/entry/back/methods/entry/addFromBuy.js +++ b/modules/entry/back/methods/entry/addFromBuy.js @@ -46,7 +46,7 @@ module.exports = Self => { } try { - let buy = await models.Buy.findOne({where: {entryFk: args.id}}, myOptions); + let buy = await models.Buy.findOne({where: {entryFk: args.id, itemFk: args.item}}, myOptions); if (buy) await buy.updateAttribute('printedStickers', args.printedStickers, myOptions); else { diff --git a/modules/supplier/back/methods/supplier/getItemsPackaging.js b/modules/supplier/back/methods/supplier/getItemsPackaging.js index 8ef80529b4..c06195a554 100644 --- a/modules/supplier/back/methods/supplier/getItemsPackaging.js +++ b/modules/supplier/back/methods/supplier/getItemsPackaging.js @@ -26,14 +26,14 @@ module.exports = Self => { Self.getItemsPackaging = async(id, entry) => { return Self.rawSql(` WITH entryTmp AS ( - SELECT i.id, SUM(b.quantity) quantity + SELECT i.id, SUM(b.quantity) quantity, SUM(b.printedStickers) printedStickers FROM vn.entry e JOIN vn.buy b ON b.entryFk = e.id JOIN vn.supplier s ON s.id = e.supplierFk JOIN vn.item i ON i.id = b.itemFk WHERE e.id = ? AND e.supplierFk = ? GROUP BY i.id - ) SELECT i.id, i.name, et.quantity, SUM(b.quantity) quantityTotal + ) SELECT i.id, i.name, et.quantity, SUM(b.quantity) quantityTotal, et.printedStickers FROM vn.buy b JOIN vn.item i ON i.id = b.itemFk JOIN vn.entry e ON e.id = b.entryFk diff --git a/print/templates/email/modified-entry/assets/css/import.js b/print/templates/email/modified-entry/assets/css/import.js new file mode 100644 index 0000000000..4b4bb70869 --- /dev/null +++ b/print/templates/email/modified-entry/assets/css/import.js @@ -0,0 +1,11 @@ +const Stylesheet = require(`vn-print/core/stylesheet`); + +const path = require('path'); +const vnPrintPath = path.resolve('print'); + +module.exports = new Stylesheet([ + `${vnPrintPath}/common/css/spacing.css`, + `${vnPrintPath}/common/css/misc.css`, + `${vnPrintPath}/common/css/layout.css`, + `${vnPrintPath}/common/css/email.css`]) + .mergeStyles(); diff --git a/print/templates/email/modified-entry/locale/en.yml b/print/templates/email/modified-entry/locale/en.yml new file mode 100644 index 0000000000..c70cfe5ccd --- /dev/null +++ b/print/templates/email/modified-entry/locale/en.yml @@ -0,0 +1,3 @@ +subject: Modified entry +title: Modified entry +description: 'From Warehouse the following packaging entry has been created/modified: ' diff --git a/print/templates/email/modified-entry/locale/es.yml b/print/templates/email/modified-entry/locale/es.yml new file mode 100644 index 0000000000..72ddb5ca55 --- /dev/null +++ b/print/templates/email/modified-entry/locale/es.yml @@ -0,0 +1,3 @@ +subject: Entrada modificada +title: Entrada modificada +description: 'Desde Almacén se ha creado/modificado la siguiente entrada de embalajes: ' diff --git a/print/templates/email/modified-entry/modified-entry.html b/print/templates/email/modified-entry/modified-entry.html new file mode 100644 index 0000000000..a0f2973544 --- /dev/null +++ b/print/templates/email/modified-entry/modified-entry.html @@ -0,0 +1,11 @@ + +
+
+

{{ $t('title') }}

+

+ {{ $t('description') }} + {{ url }} +

+
+
+ diff --git a/print/templates/email/modified-entry/modified-entry.js b/print/templates/email/modified-entry/modified-entry.js new file mode 100755 index 0000000000..35474a12fb --- /dev/null +++ b/print/templates/email/modified-entry/modified-entry.js @@ -0,0 +1,16 @@ +const Component = require(`vn-print/core/component`); +const emailBody = new Component('email-body'); + +module.exports = { + name: 'modified-entry', + components: { + 'email-body': emailBody.build(), + }, + props: { + url: { + type: String, + required: true + } + } +}; + From d3c4a6ba5c68a0458cefa0c4c0867b3ab9530f41 Mon Sep 17 00:00:00 2001 From: alexm Date: Mon, 12 Jun 2023 15:20:46 +0200 Subject: [PATCH 03/29] refs #5094 feat(ticket_index): docuware multiple deliveryNote --- back/methods/docuware/core.js | 8 +- back/methods/docuware/upload.js | 227 +++++++++--------- loopback/locale/en.json | 3 +- loopback/locale/es.json | 2 +- modules/ticket/front/descriptor-menu/index.js | 8 +- .../front/descriptor-menu/index.spec.js | 4 +- modules/ticket/front/index/index.html | 42 ++-- modules/ticket/front/index/index.js | 31 +-- 8 files changed, 161 insertions(+), 164 deletions(-) diff --git a/back/methods/docuware/core.js b/back/methods/docuware/core.js index 2053ddf851..be310e82b2 100644 --- a/back/methods/docuware/core.js +++ b/back/methods/docuware/core.js @@ -20,8 +20,8 @@ module.exports = Self => { const options = await Self.getOptions(); - if (!process.env.NODE_ENV) - return Math.round(); + // if (!process.env.NODE_ENV) + // return Math.round(); const response = await axios.get(`${options.url}/FileCabinets/${fileCabinetId}/dialogs`, options.headers); const dialogs = response.data.Dialog; @@ -44,8 +44,8 @@ module.exports = Self => { } }); - if (!process.env.NODE_ENV) - return Math.round(); + // if (!process.env.NODE_ENV) + // return Math.round(); const fileCabinetResponse = await axios.get(`${options.url}/FileCabinets`, options.headers); const fileCabinets = fileCabinetResponse.data.FileCabinet; diff --git a/back/methods/docuware/upload.js b/back/methods/docuware/upload.js index ea9ee36228..d14e8a668d 100644 --- a/back/methods/docuware/upload.js +++ b/back/methods/docuware/upload.js @@ -7,30 +7,27 @@ module.exports = Self => { accessType: 'WRITE', accepts: [ { - arg: 'id', - type: 'number', - description: 'The ticket id', - http: {source: 'path'} + arg: 'ticketIds', + type: ['number'], + description: 'The ticket ids', + required: true }, { arg: 'fileCabinet', type: 'string', - description: 'The file cabinet' - }, - { - arg: 'dialog', - type: 'string', - description: 'The dialog' + description: 'The file cabinet', + required: true } ], returns: [], http: { - path: `/:id/upload`, + path: `/upload`, verb: 'POST' } }); - Self.upload = async function(ctx, id, fileCabinet) { + Self.upload = async function(ctx, ticketIds, fileCabinet) { + delete ctx.args.ticketIds; const models = Self.app.models; const action = 'store'; @@ -38,104 +35,116 @@ module.exports = Self => { const fileCabinetId = await Self.getFileCabinet(fileCabinet); const dialogId = await Self.getDialog(fileCabinet, action, fileCabinetId); + const uploaded = []; + // get delivery note - const deliveryNote = await models.Ticket.deliveryNotePdf(ctx, { - id, - type: 'deliveryNote' - }); - - // get ticket data - const ticket = await models.Ticket.findById(id, { - include: [{ - relation: 'client', - scope: { - fields: ['id', 'socialName', 'fi'] - } - }] - }); - - // upload file - const templateJson = { - 'Fields': [ - { - 'FieldName': 'N__ALBAR_N', - 'ItemElementName': 'string', - 'Item': id, - }, - { - 'FieldName': 'CIF_PROVEEDOR', - 'ItemElementName': 'string', - 'Item': ticket.client().fi, - }, - { - 'FieldName': 'CODIGO_PROVEEDOR', - 'ItemElementName': 'string', - 'Item': ticket.client().id, - }, - { - 'FieldName': 'NOMBRE_PROVEEDOR', - 'ItemElementName': 'string', - 'Item': ticket.client().socialName, - }, - { - 'FieldName': 'FECHA_FACTURA', - 'ItemElementName': 'date', - 'Item': ticket.shipped, - }, - { - 'FieldName': 'TOTAL_FACTURA', - 'ItemElementName': 'Decimal', - 'Item': ticket.totalWithVat, - }, - { - 'FieldName': 'ESTADO', - 'ItemElementName': 'string', - 'Item': 'Pendiente procesar', - }, - { - 'FieldName': 'FIRMA_', - 'ItemElementName': 'string', - 'Item': 'Si', - }, - { - 'FieldName': 'FILTRO_TABLET', - 'ItemElementName': 'string', - 'Item': 'Tablet1', - } - ] - }; - - if (process.env.NODE_ENV != 'production') - throw new UserError('Action not allowed on the test environment'); - - // delete old - const docuwareFile = await models.Docuware.checkFile(ctx, id, fileCabinet, false); - if (docuwareFile) { - const deleteJson = { - 'Field': [{'FieldName': 'ESTADO', 'Item': 'Pendiente eliminar', 'ItemElementName': 'String'}] - }; - const deleteUri = `${options.url}/FileCabinets/${fileCabinetId}/Documents/${docuwareFile.id}/Fields`; - await axios.put(deleteUri, deleteJson, options.headers); - } - - const uploadUri = `${options.url}/FileCabinets/${fileCabinetId}/Documents?StoreDialogId=${dialogId}`; - const FormData = require('form-data'); - const data = new FormData(); - - data.append('document', JSON.stringify(templateJson), 'schema.json'); - data.append('file[]', deliveryNote[0], 'file.pdf'); - const uploadOptions = { - headers: { - 'Content-Type': 'multipart/form-data', - 'X-File-ModifiedDate': Date.vnNew(), - 'Cookie': options.headers.headers.Cookie, - ...data.getHeaders() - }, - }; - - return await axios.post(uploadUri, data, uploadOptions) - .catch(() => { - throw new UserError('Failed to upload file'); + for (id of ticketIds) { + // get delivery note + ctx.args.id = id; + const deliveryNote = await models.Ticket.deliveryNotePdf(ctx, { + id, + type: 'deliveryNote' }); + // get ticket data + const ticket = await models.Ticket.findById(id, { + include: [{ + relation: 'client', + scope: { + fields: ['id', 'name', 'fi'] + } + }] + }); + + // upload file + const templateJson = { + 'Fields': [ + { + 'FieldName': 'N__ALBAR_N', + 'ItemElementName': 'string', + 'Item': id, + }, + { + 'FieldName': 'CIF_PROVEEDOR', + 'ItemElementName': 'string', + 'Item': ticket.client().fi, + }, + { + 'FieldName': 'CODIGO_PROVEEDOR', + 'ItemElementName': 'string', + 'Item': ticket.client().id, + }, + { + 'FieldName': 'NOMBRE_PROVEEDOR', + 'ItemElementName': 'string', + 'Item': ticket.client().name + ' - ' + id, + }, + { + 'FieldName': 'FECHA_FACTURA', + 'ItemElementName': 'date', + 'Item': ticket.shipped, + }, + { + 'FieldName': 'TOTAL_FACTURA', + 'ItemElementName': 'Decimal', + 'Item': ticket.totalWithVat, + }, + { + 'FieldName': 'ESTADO', + 'ItemElementName': 'string', + 'Item': 'Pendiente procesar', + }, + { + 'FieldName': 'FIRMA_', + 'ItemElementName': 'string', + 'Item': 'Si', + }, + { + 'FieldName': 'FILTRO_TABLET', + 'ItemElementName': 'string', + 'Item': 'Tablet1', + } + ] + }; + + // if (process.env.NODE_ENV != 'production') + // throw new UserError('Action not allowed on the test environment'); + + // delete old + const docuwareFile = await models.Docuware.checkFile(ctx, id, fileCabinet, false); + if (docuwareFile) { + const deleteJson = { + 'Field': [{'FieldName': 'ESTADO', 'Item': 'Pendiente eliminar', 'ItemElementName': 'String'}] + }; + const deleteUri = `${options.url}/FileCabinets/${fileCabinetId}/Documents/${docuwareFile.id}/Fields`; + await axios.put(deleteUri, deleteJson, options.headers); + } + + const uploadUri = `${options.url}/FileCabinets/${fileCabinetId}/Documents?StoreDialogId=${dialogId}`; + const FormData = require('form-data'); + const data = new FormData(); + + data.append('document', JSON.stringify(templateJson), 'schema.json'); + data.append('file[]', deliveryNote[0], 'file.pdf'); + const uploadOptions = { + headers: { + 'Content-Type': 'multipart/form-data', + 'X-File-ModifiedDate': Date.vnNew(), + 'Cookie': options.headers.headers.Cookie, + ...data.getHeaders() + }, + }; + + try { + await axios.post(uploadUri, data, uploadOptions); + } catch (err) { + const $t = ctx.req.__; + const message = $t('Failed to upload ticket', {id}); + if (uploaded.length) + await models.TicketTracking.setDelivered(ctx, uploaded); + throw new UserError(message); + } + uploaded.push(id); + } + return models.TicketTracking.setDelivered(ctx, ticketIds); }; }; diff --git a/loopback/locale/en.json b/loopback/locale/en.json index 14ffffeb51..b334b86761 100644 --- a/loopback/locale/en.json +++ b/loopback/locale/en.json @@ -173,5 +173,6 @@ "This ticket is already a refund": "This ticket is already a refund", "A claim with that sale already exists": "A claim with that sale already exists", "Can't transfer claimed sales": "Can't transfer claimed sales", - "Invalid quantity": "Invalid quantity" + "Invalid quantity": "Invalid quantity", + "Failed to upload delivery note": "Error to upload delivery note {{id}}" } diff --git a/loopback/locale/es.json b/loopback/locale/es.json index d88a4ebc95..bd49db9b3c 100644 --- a/loopback/locale/es.json +++ b/loopback/locale/es.json @@ -259,7 +259,7 @@ "App name does not exist": "El nombre de aplicación no es válido", "Try again": "Vuelve a intentarlo", "Aplicación bloqueada por el usuario 9": "Aplicación bloqueada por el usuario 9", - "Failed to upload file": "Error al subir archivo", + "Failed to upload delivery note": "Error al subir albarán {{id}}", "The DOCUWARE PDF document does not exists": "El documento PDF Docuware no existe", "It is not possible to modify tracked sales": "No es posible modificar líneas de pedido que se hayan empezado a preparar", "It is not possible to modify sales that their articles are from Floramondo": "No es posible modificar líneas de pedido cuyos artículos sean de Floramondo", diff --git a/modules/ticket/front/descriptor-menu/index.js b/modules/ticket/front/descriptor-menu/index.js index 835f395a84..17a34ad597 100644 --- a/modules/ticket/front/descriptor-menu/index.js +++ b/modules/ticket/front/descriptor-menu/index.js @@ -326,14 +326,8 @@ class Controller extends Section { if (!force) return this.$.pdfToTablet.show(); - return this.$http.post(`Docuwares/${this.id}/upload`, {fileCabinet: 'deliveryNote'}) + return this.$http.post(`Docuwares/upload`, {fileCabinet: 'deliveryNote', ticketIds: [this.id]}) .then(() => { - this.$.balanceCreate.amountPaid = this.ticket.totalWithVat; - this.$.balanceCreate.clientFk = this.ticket.clientFk; - this.$.balanceCreate.description = 'Albaran: '; - this.$.balanceCreate.description += this.ticket.id; - - this.$.balanceCreate.show(); this.vnApp.showSuccess(this.$t('PDF sent!')); }); } diff --git a/modules/ticket/front/descriptor-menu/index.spec.js b/modules/ticket/front/descriptor-menu/index.spec.js index 5d27acff12..95a580fe50 100644 --- a/modules/ticket/front/descriptor-menu/index.spec.js +++ b/modules/ticket/front/descriptor-menu/index.spec.js @@ -304,9 +304,8 @@ describe('Ticket Component vnTicketDescriptorMenu', () => { expect(controller.$.pdfToTablet.show).toHaveBeenCalled(); }); - it('should make a query and show balance create', () => { + it('should make a query', () => { controller.$.balanceCreate = {show: () => {}}; - jest.spyOn(controller.$.balanceCreate, 'show'); jest.spyOn(controller.vnApp, 'showSuccess'); $httpBackend.whenPOST(`Docuwares/${ticket.id}/upload`).respond(true); @@ -314,7 +313,6 @@ describe('Ticket Component vnTicketDescriptorMenu', () => { $httpBackend.flush(); expect(controller.vnApp.showSuccess).toHaveBeenCalled(); - expect(controller.$.balanceCreate.show).toHaveBeenCalled(); }); }); diff --git a/modules/ticket/front/index/index.html b/modules/ticket/front/index/index.html index 1e18ce284e..d6e230ebe3 100644 --- a/modules/ticket/front/index/index.html +++ b/modules/ticket/front/index/index.html @@ -9,7 +9,7 @@ - @@ -33,7 +33,7 @@ class="clickable vn-tr search-result" ui-sref="ticket.card.summary({id: {{::ticket.id}}})"> - @@ -109,7 +109,7 @@ class="link"> {{::ticket.refFk}} - {{ticket.state}} @@ -132,8 +132,8 @@
- - - - - - Filter by selection - Exclude selection - Remove filter - Remove all filters - Copy value @@ -241,4 +241,4 @@ on-accept="$ctrl.makeInvoice()" question="{{$ctrl.confirmationMessage}}" message="Invoice selected tickets"> - \ No newline at end of file + diff --git a/modules/ticket/front/index/index.js b/modules/ticket/front/index/index.js index 42332ccc86..55229eabbb 100644 --- a/modules/ticket/front/index/index.js +++ b/modules/ticket/front/index/index.js @@ -9,28 +9,23 @@ export default class Controller extends Section { this.vnReport = vnReport; } - setDelivered() { + sendDocuware() { const checkedTickets = this.checked; - let ids = []; + let ticketIds = []; for (let ticket of checkedTickets) - ids.push(ticket.id); + ticketIds.push(ticket.id); - this.$http.post('TicketTrackings/setDelivered', ids).then(res => { - let state = res.data; - for (let ticket of checkedTickets) { - ticket.stateFk = state.id; - ticket.state = state.name; - ticket.alertLevel = state.alertLevel; - ticket.alertLevelCode = state.code; - } - this.openDeliveryNotes(ids); - }); - } - - openDeliveryNotes(ids) { - for (let id of ids) - this.vnReport.show(`Tickets/${id}/delivery-note-pdf`); + return this.$http.post(`Docuwares/upload`, {fileCabinet: 'deliveryNote', ticketIds}) + .then(res => { + let state = res.data; + for (let ticket of checkedTickets) { + ticket.stateFk = state.id; + ticket.state = state.name; + ticket.alertLevel = state.alertLevel; + ticket.alertLevelCode = state.code; + } + }); } openBalanceDialog() { From 59642ab3ca579cc7bb90ea349ebe6cce1dce5a2a Mon Sep 17 00:00:00 2001 From: carlossa Date: Mon, 12 Jun 2023 15:44:22 +0200 Subject: [PATCH 04/29] refs #5325 defaultSearch --- modules/claim/front/action/index.js | 1 + modules/claim/front/index/index.js | 1 + modules/client/front/defaulter/index.js | 1 + modules/client/front/extended-list/index.js | 1 + modules/client/front/notification/index.js | 1 + modules/entry/front/latest-buys/index.js | 1 + modules/invoiceOut/front/negative-bases/index.js | 4 +++- modules/item/front/index/index.js | 1 + modules/item/front/item-shelving/index.js | 1 + modules/monitor/front/index/clients/index.js | 1 + modules/monitor/front/index/tickets/index.js | 1 + modules/route/front/agency-term/index/index.js | 1 + modules/ticket/front/advance/index.js | 1 + modules/ticket/front/expedition/index.js | 1 + modules/ticket/front/future/index.js | 1 + modules/ticket/front/weekly/index.js | 1 + 16 files changed, 18 insertions(+), 1 deletion(-) diff --git a/modules/claim/front/action/index.js b/modules/claim/front/action/index.js index 10b629f273..6b4879a852 100644 --- a/modules/claim/front/action/index.js +++ b/modules/claim/front/action/index.js @@ -26,6 +26,7 @@ export default class Controller extends Section { activeButtons: { search: true }, + defaultSearch: true, columns: [ { field: 'claimDestinationFk', diff --git a/modules/claim/front/index/index.js b/modules/claim/front/index/index.js index e3fdabf799..8e948f426b 100644 --- a/modules/claim/front/index/index.js +++ b/modules/claim/front/index/index.js @@ -9,6 +9,7 @@ class Controller extends Section { activeButtons: { search: true }, + defaultSearch: true, columns: [ { field: 'clientName', diff --git a/modules/client/front/defaulter/index.js b/modules/client/front/defaulter/index.js index 95c7622f99..1244191f15 100644 --- a/modules/client/front/defaulter/index.js +++ b/modules/client/front/defaulter/index.js @@ -12,6 +12,7 @@ export default class Controller extends Section { activeButtons: { search: true }, + defaultSearch: true, columns: [ { field: 'clientFk', diff --git a/modules/client/front/extended-list/index.js b/modules/client/front/extended-list/index.js index 8eed48d01c..2cb7a6d581 100644 --- a/modules/client/front/extended-list/index.js +++ b/modules/client/front/extended-list/index.js @@ -11,6 +11,7 @@ class Controller extends Section { search: true, shownColumns: true, }, + defaultSearch: true, columns: [ { field: 'socialName', diff --git a/modules/client/front/notification/index.js b/modules/client/front/notification/index.js index faa062b253..ada5437152 100644 --- a/modules/client/front/notification/index.js +++ b/modules/client/front/notification/index.js @@ -9,6 +9,7 @@ export default class Controller extends Section { activeButtons: { search: true }, + defaultSearch: true, columns: [ { field: 'socialName', diff --git a/modules/entry/front/latest-buys/index.js b/modules/entry/front/latest-buys/index.js index d9065193ea..1a9b3627bb 100644 --- a/modules/entry/front/latest-buys/index.js +++ b/modules/entry/front/latest-buys/index.js @@ -14,6 +14,7 @@ export default class Controller extends Section { search: true, shownColumns: true, }, + defaultSearch: true, columns: [ { field: 'code', diff --git a/modules/invoiceOut/front/negative-bases/index.js b/modules/invoiceOut/front/negative-bases/index.js index 1a838507ca..b70a2f7be3 100644 --- a/modules/invoiceOut/front/negative-bases/index.js +++ b/modules/invoiceOut/front/negative-bases/index.js @@ -19,7 +19,9 @@ export default class Controller extends Section { this.smartTableOptions = { activeButtons: { search: true, - }, columns: [ + }, + defaultSearch: true, + columns: [ { field: 'isActive', searchable: false diff --git a/modules/item/front/index/index.js b/modules/item/front/index/index.js index 10bd4bbb7f..f341f64547 100644 --- a/modules/item/front/index/index.js +++ b/modules/item/front/index/index.js @@ -11,6 +11,7 @@ class Controller extends Section { search: true, shownColumns: true, }, + defaultSearch: true, columns: [ { field: 'category', diff --git a/modules/item/front/item-shelving/index.js b/modules/item/front/item-shelving/index.js index b8584039b8..8e5df459d9 100644 --- a/modules/item/front/item-shelving/index.js +++ b/modules/item/front/item-shelving/index.js @@ -9,6 +9,7 @@ export default class Controller extends Section { activeButtons: { search: true }, + defaultSearch: true, columns: [ { field: 'parking', diff --git a/modules/monitor/front/index/clients/index.js b/modules/monitor/front/index/clients/index.js index ac3ce91408..9faf2ed53d 100644 --- a/modules/monitor/front/index/clients/index.js +++ b/modules/monitor/front/index/clients/index.js @@ -20,6 +20,7 @@ export default class Controller extends Section { activeButtons: { search: true }, + defaultSearch: true, columns: [ { field: 'clientFk', diff --git a/modules/monitor/front/index/tickets/index.js b/modules/monitor/front/index/tickets/index.js index 2f2dead057..92097833b2 100644 --- a/modules/monitor/front/index/tickets/index.js +++ b/modules/monitor/front/index/tickets/index.js @@ -12,6 +12,7 @@ export default class Controller extends Section { search: true, shownColumns: true, }, + defaultSearch: true, columns: [ { field: 'totalProblems', diff --git a/modules/route/front/agency-term/index/index.js b/modules/route/front/agency-term/index/index.js index 6c3bafc9a1..6277fb9a13 100644 --- a/modules/route/front/agency-term/index/index.js +++ b/modules/route/front/agency-term/index/index.js @@ -9,6 +9,7 @@ class Controller extends Section { activeButtons: { search: true }, + defaultSearch: true, columns: [ { field: 'agencyModeFk', diff --git a/modules/ticket/front/advance/index.js b/modules/ticket/front/advance/index.js index 0cec41227a..0cd1b09813 100644 --- a/modules/ticket/front/advance/index.js +++ b/modules/ticket/front/advance/index.js @@ -11,6 +11,7 @@ export default class Controller extends Section { activeButtons: { search: true, }, + defaultSearch: true, columns: [ { field: 'state', diff --git a/modules/ticket/front/expedition/index.js b/modules/ticket/front/expedition/index.js index b8046be521..1e30ce4478 100644 --- a/modules/ticket/front/expedition/index.js +++ b/modules/ticket/front/expedition/index.js @@ -11,6 +11,7 @@ class Controller extends Section { search: true, shownColumns: true, }, + defaultSearch: true, columns: [ { field: 'packageItemName', diff --git a/modules/ticket/front/future/index.js b/modules/ticket/front/future/index.js index 66d6269936..846c3883f6 100644 --- a/modules/ticket/front/future/index.js +++ b/modules/ticket/front/future/index.js @@ -10,6 +10,7 @@ export default class Controller extends Section { activeButtons: { search: true, }, + defaultSearch: true, columns: [{ field: 'totalProblems', searchable: false, diff --git a/modules/ticket/front/weekly/index.js b/modules/ticket/front/weekly/index.js index a10ff7184c..d0a3331584 100644 --- a/modules/ticket/front/weekly/index.js +++ b/modules/ticket/front/weekly/index.js @@ -22,6 +22,7 @@ export default class Controller extends Section { search: true, shownColumns: true, }, + defaultSearch: true, columns: [ { field: 'ticketFk', From 3386af9b17bb5c1b27ff3c5012b34c0700e380a3 Mon Sep 17 00:00:00 2001 From: Juan Ferrer Toribio Date: Mon, 12 Jun 2023 16:27:02 +0200 Subject: [PATCH 05/29] refs #5667 MailAliasAccount translations added --- modules/account/back/locale/mail-alias-account/en.yml | 5 +++++ modules/account/back/locale/mail-alias-account/es.yml | 5 +++++ 2 files changed, 10 insertions(+) create mode 100644 modules/account/back/locale/mail-alias-account/en.yml create mode 100644 modules/account/back/locale/mail-alias-account/es.yml diff --git a/modules/account/back/locale/mail-alias-account/en.yml b/modules/account/back/locale/mail-alias-account/en.yml new file mode 100644 index 0000000000..2449ab2526 --- /dev/null +++ b/modules/account/back/locale/mail-alias-account/en.yml @@ -0,0 +1,5 @@ +name: Mail alias +columns: + id: id + mailAlias: alias + account: account diff --git a/modules/account/back/locale/mail-alias-account/es.yml b/modules/account/back/locale/mail-alias-account/es.yml new file mode 100644 index 0000000000..0565b7a775 --- /dev/null +++ b/modules/account/back/locale/mail-alias-account/es.yml @@ -0,0 +1,5 @@ +name: Alias de correo +columns: + id: id + mailAlias: alias + account: cuenta From cc788d7e0606412b4b149864bdac45b59aecd801 Mon Sep 17 00:00:00 2001 From: Juan Ferrer Toribio Date: Mon, 12 Jun 2023 16:28:47 +0200 Subject: [PATCH 06/29] refs #5667 Account translations added --- modules/account/back/locale/account/en.yml | 3 +++ modules/account/back/locale/account/es.yml | 3 +++ modules/account/back/locale/mail-alias-account/en.yml | 2 +- modules/account/back/locale/mail-alias-account/es.yml | 2 +- 4 files changed, 8 insertions(+), 2 deletions(-) create mode 100644 modules/account/back/locale/account/en.yml create mode 100644 modules/account/back/locale/account/es.yml diff --git a/modules/account/back/locale/account/en.yml b/modules/account/back/locale/account/en.yml new file mode 100644 index 0000000000..221afef5f5 --- /dev/null +++ b/modules/account/back/locale/account/en.yml @@ -0,0 +1,3 @@ +name: account +columns: + id: id diff --git a/modules/account/back/locale/account/es.yml b/modules/account/back/locale/account/es.yml new file mode 100644 index 0000000000..a79b1f40c3 --- /dev/null +++ b/modules/account/back/locale/account/es.yml @@ -0,0 +1,3 @@ +name: cuenta +columns: + id: id diff --git a/modules/account/back/locale/mail-alias-account/en.yml b/modules/account/back/locale/mail-alias-account/en.yml index 2449ab2526..bf805d66f3 100644 --- a/modules/account/back/locale/mail-alias-account/en.yml +++ b/modules/account/back/locale/mail-alias-account/en.yml @@ -1,4 +1,4 @@ -name: Mail alias +name: mail alias columns: id: id mailAlias: alias diff --git a/modules/account/back/locale/mail-alias-account/es.yml b/modules/account/back/locale/mail-alias-account/es.yml index 0565b7a775..b53ade9967 100644 --- a/modules/account/back/locale/mail-alias-account/es.yml +++ b/modules/account/back/locale/mail-alias-account/es.yml @@ -1,4 +1,4 @@ -name: Alias de correo +name: alias de correo columns: id: id mailAlias: alias From 7127c5a3a820add9c2168975ae1c82aa615cc0ce Mon Sep 17 00:00:00 2001 From: carlossa Date: Mon, 12 Jun 2023 17:37:25 +0200 Subject: [PATCH 07/29] refs #5325 e2e 1 smart Table --- e2e/helpers/selectors.js | 8 ++++---- e2e/paths/02-client/21_defaulter.spec.js | 2 +- e2e/paths/04-item/01_summary.spec.js | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/e2e/helpers/selectors.js b/e2e/helpers/selectors.js index 039f6ee8fc..19ea23d73e 100644 --- a/e2e/helpers/selectors.js +++ b/e2e/helpers/selectors.js @@ -311,9 +311,9 @@ export default { }, clientDefaulter: { anyClient: 'vn-client-defaulter tbody > tr', - firstClientName: 'vn-client-defaulter tbody > tr:nth-child(1) > td:nth-child(2) > span', - firstSalesPersonName: 'vn-client-defaulter tbody > tr:nth-child(1) > td:nth-child(3) > span', - firstObservation: 'vn-client-defaulter tbody > tr:nth-child(1) > td:nth-child(8) > vn-textarea[ng-model="defaulter.observation"]', + firstClientName: 'vn-client-defaulter tbody > tr:nth-child(2) > td:nth-child(2) > span', + firstSalesPersonName: 'vn-client-defaulter tbody > tr:nth-child(2) > td:nth-child(3) > span', + firstObservation: 'vn-client-defaulter tbody > tr:nth-child(2) > td:nth-child(8) > vn-textarea[ng-model="defaulter.observation"]', allDefaulterCheckbox: 'vn-client-defaulter thead vn-multi-check', addObservationButton: 'vn-client-defaulter vn-button[icon="icon-notes"]', observation: '.vn-dialog.shown vn-textarea[ng-model="$ctrl.defaulter.observation"]', @@ -336,7 +336,7 @@ export default { createItemButton: `vn-float-button`, firstSearchResult: 'vn-item-index tbody tr:nth-child(1)', searchResult: 'vn-item-index tbody tr:not(.empty-rows)', - firstResultPreviewButton: 'vn-item-index tbody > :nth-child(1) .buttons > [icon="preview"]', + firstResultPreviewButton: 'vn-item-index tbody > :nth-child(2) .buttons > [icon="preview"]', searchResultCloneButton: 'vn-item-index .buttons > [icon="icon-clone"]', acceptClonationAlertButton: '.vn-confirm.shown [response="accept"]', closeItemSummaryPreview: '.vn-popup.shown', diff --git a/e2e/paths/02-client/21_defaulter.spec.js b/e2e/paths/02-client/21_defaulter.spec.js index 97e62abef4..2bb3d62546 100644 --- a/e2e/paths/02-client/21_defaulter.spec.js +++ b/e2e/paths/02-client/21_defaulter.spec.js @@ -19,7 +19,7 @@ describe('Client defaulter path', () => { it('should count the amount of clients in the turns section', async() => { const result = await page.countElement(selectors.clientDefaulter.anyClient); - expect(result).toEqual(5); + expect(result).toEqual(6); }); it('should check contain expected client', async() => { diff --git a/e2e/paths/04-item/01_summary.spec.js b/e2e/paths/04-item/01_summary.spec.js index e24fa6a9f1..621dd9cd80 100644 --- a/e2e/paths/04-item/01_summary.spec.js +++ b/e2e/paths/04-item/01_summary.spec.js @@ -1,7 +1,7 @@ import selectors from '../../helpers/selectors.js'; import getBrowser from '../../helpers/puppeteer'; -describe('Item summary path', () => { +fdescribe('Item summary path', () => { let browser; let page; beforeAll(async() => { @@ -22,7 +22,7 @@ describe('Item summary path', () => { await page.waitToClick(selectors.itemsIndex.firstResultPreviewButton); const isVisible = await page.isVisible(selectors.itemSummary.basicData); - expect(resultsCount).toBe(3); + expect(resultsCount).toBe(4); expect(isVisible).toBeTruthy(); }); From b7c8b03a650e3d6dca07e1ec27e924be58cd08dc Mon Sep 17 00:00:00 2001 From: carlossa Date: Mon, 12 Jun 2023 19:51:16 +0200 Subject: [PATCH 08/29] refs #5325 e2e 2 --- e2e/helpers/selectors.js | 32 +++++++++---------- e2e/paths/04-item/01_summary.spec.js | 6 ++-- e2e/paths/04-item/10_item_log.spec.js | 2 +- .../05-ticket/01-sale/02_edit_sale.spec.js | 4 +-- .../05-ticket/02_expeditions_and_log.spec.js | 2 +- e2e/paths/05-ticket/09_weekly.spec.js | 6 ++-- e2e/paths/05-ticket/20_moveExpedition.spec.js | 4 +-- e2e/paths/05-ticket/21_future.spec.js | 2 +- 8 files changed, 29 insertions(+), 29 deletions(-) diff --git a/e2e/helpers/selectors.js b/e2e/helpers/selectors.js index 19ea23d73e..3d5bcddb57 100644 --- a/e2e/helpers/selectors.js +++ b/e2e/helpers/selectors.js @@ -334,7 +334,7 @@ export default { }, itemsIndex: { createItemButton: `vn-float-button`, - firstSearchResult: 'vn-item-index tbody tr:nth-child(1)', + firstSearchResult: 'vn-item-index tbody tr:nth-child(2)', searchResult: 'vn-item-index tbody tr:not(.empty-rows)', firstResultPreviewButton: 'vn-item-index tbody > :nth-child(2) .buttons > [icon="preview"]', searchResultCloneButton: 'vn-item-index .buttons > [icon="icon-clone"]', @@ -342,7 +342,7 @@ export default { closeItemSummaryPreview: '.vn-popup.shown', shownColumns: 'vn-item-index vn-button[id="shownColumns"]', shownColumnsList: '.vn-popover.shown .content', - firstItemImage: 'vn-item-index tbody > tr:nth-child(1) > td:nth-child(1) > img', + firstItemImage: 'vn-item-index tbody > tr:nth-child(2) > td:nth-child(1) > img', firstItemImageTd: 'vn-item-index smart-table tr:nth-child(1) td:nth-child(1)', firstItemId: 'vn-item-index tbody > tr:nth-child(1) > td:nth-child(2)', idCheckbox: '.vn-popover.shown vn-horizontal:nth-child(3) > vn-check[label="Identifier"]', @@ -526,8 +526,8 @@ export default { fourthWeeklyTicket: 'vn-ticket-weekly-index vn-card smart-table slot-table tr:nth-child(4)', fiveWeeklyTicket: 'vn-ticket-weekly-index vn-card smart-table slot-table tr:nth-child(5)', weeklyTicket: 'vn-ticket-weekly-index vn-card smart-table slot-table table tbody tr', - firstWeeklyTicketDeleteIcon: 'vn-ticket-weekly-index vn-card smart-table slot-table tr:nth-child(1) vn-icon-button[icon="delete"]', - firstWeeklyTicketAgency: 'vn-ticket-weekly-index vn-card smart-table slot-table tr:nth-child(1) [ng-model="weekly.agencyModeFk"]', + firstWeeklyTicketDeleteIcon: 'vn-ticket-weekly-index vn-card smart-table slot-table tr:nth-child(2) vn-icon-button[icon="delete"]', + firstWeeklyTicketAgency: 'vn-ticket-weekly-index vn-card smart-table slot-table tr:nth-child(2) [ng-model="weekly.agencyModeFk"]', acceptDeleteTurn: '.vn-confirm.shown button[response="accept"]' }, createTicketView: { @@ -572,8 +572,8 @@ export default { submitNotesButton: 'button[type=submit]' }, ticketExpedition: { - firstSaleCheckbox: 'vn-ticket-expedition tr:nth-child(1) vn-check[ng-model="expedition.checked"]', - thirdSaleCheckbox: 'vn-ticket-expedition tr:nth-child(3) vn-check[ng-model="expedition.checked"]', + firstSaleCheckbox: 'vn-ticket-expedition tr:nth-child(2) vn-check[ng-model="expedition.checked"]', + thirdSaleCheckbox: 'vn-ticket-expedition tr:nth-child(4) vn-check[ng-model="expedition.checked"]', deleteExpeditionButton: 'vn-ticket-expedition slot-actions > vn-button[icon="delete"]', moveExpeditionButton: 'vn-ticket-expedition slot-actions > vn-button[icon="keyboard_arrow_down"]', moreMenuWithoutRoute: 'vn-item[name="withoutRoute"]', @@ -606,16 +606,16 @@ export default { firstSaleThumbnailImage: 'vn-ticket-sale:nth-child(1) vn-tr:nth-child(1) vn-td:nth-child(3) > img', firstSaleZoomedImage: 'body > div > div > img', firstSaleQuantity: 'vn-ticket-sale [ng-model="sale.quantity"]', - firstSaleQuantityCell: 'vn-ticket-sale vn-tr:nth-child(1) > vn-td-editable:nth-child(7)', + firstSaleQuantityCell: 'vn-ticket-sale vn-tr:nth-child(2) > vn-td-editable:nth-child(7)', firstSalePrice: 'vn-ticket-sale vn-table vn-tr:nth-child(1) > vn-td:nth-child(9) > span', firstSalePriceInput: '.vn-popover.shown input[ng-model="$ctrl.field"]', firstSaleDiscount: 'vn-ticket-sale vn-table vn-tr:nth-child(1) > vn-td:nth-child(10) > span', firstSaleDiscountInput: '.vn-popover.shown [ng-model="$ctrl.field"]', saveSaleDiscountButton: '.vn-popover.shown vn-button[label="Save"]', - firstSaleImport: 'vn-ticket-sale:nth-child(1) vn-td:nth-child(11)', - firstSaleReservedIcon: 'vn-ticket-sale vn-tr:nth-child(1) > vn-td:nth-child(2) > vn-icon:nth-child(3)', + firstSaleImport: 'vn-ticket-sale:nth-child(3) vn-td:nth-child(11)', + firstSaleReservedIcon: 'vn-ticket-sale vn-tr:nth-child(2) > vn-td:nth-child(2) > vn-icon:nth-child(3)', firstSaleColour: 'vn-ticket-sale vn-tr:nth-child(1) vn-fetched-tags section', - firstSaleCheckbox: 'vn-ticket-sale vn-tr:nth-child(1) vn-check[ng-model="sale.checked"]', + firstSaleCheckbox: 'vn-ticket-sale vn-tr:nth-child(2) vn-check[ng-model="sale.checked"]', secondSaleText: 'vn-table div > vn-tbody > vn-tr:nth-child(2)', secondSaleId: 'vn-ticket-sale:nth-child(2) vn-td-editable:nth-child(4) text > span', secondSaleIdAutocomplete: 'vn-ticket-sale vn-tr:nth-child(2) vn-autocomplete[ng-model="sale.itemFk"]', @@ -625,9 +625,9 @@ export default { secondSaleConceptInput: 'vn-ticket-sale vn-tbody > :nth-child(2) > vn-td-editable.ng-isolate-scope.selected vn-textfield', totalImport: 'vn-ticket-sale vn-one.taxes > p:nth-child(3) > strong', selectAllSalesCheckbox: 'vn-ticket-sale vn-thead vn-check', - secondSaleCheckbox: 'vn-ticket-sale vn-tr:nth-child(2) vn-check[ng-model="sale.checked"]', - thirdSaleCheckbox: 'vn-ticket-sale vn-tr:nth-child(3) vn-check[ng-model="sale.checked"]', - fourthSaleCheckbox: 'vn-ticket-sale vn-tr:nth-child(4) vn-check[ng-model="sale.checked"]', + secondSaleCheckbox: 'vn-ticket-sale vn-tr:nth-child(3) vn-check[ng-model="sale.checked"]', + thirdSaleCheckbox: 'vn-ticket-sale vn-tr:nth-child(4) vn-check[ng-model="sale.checked"]', + fourthSaleCheckbox: 'vn-ticket-sale vn-tr:nth-child(5) vn-check[ng-model="sale.checked"]', deleteSaleButton: 'vn-ticket-sale vn-tool-bar > vn-button[icon="delete"]', transferSaleButton: 'vn-ticket-sale vn-tool-bar > vn-button[icon="call_split"]', moveToTicketInput: 'form vn-input-number[ng-model="$ctrl.transfer.ticketId"] input', @@ -712,7 +712,7 @@ export default { problems: 'vn-check[label="With problems"]', tableButtonSearch: 'vn-button[vn-tooltip="Search"]', moveButton: 'vn-button[vn-tooltip="Future tickets"]', - firstCheck: 'tbody > tr:nth-child(1) > td > vn-check', + firstCheck: 'tbody > tr:nth-child(2) > td > vn-check', multiCheck: 'vn-multi-check', tableId: 'vn-textfield[name="id"]', tableFutureId: 'vn-textfield[name="futureId"]', @@ -736,7 +736,7 @@ export default { tableButtonSearch: 'vn-button[vn-tooltip="Search"]', moveButton: 'vn-button[vn-tooltip="Advance tickets"]', acceptButton: '.vn-confirm.shown button[response="accept"]', - firstCheck: 'tbody > tr:nth-child(1) > td > vn-check', + firstCheck: 'tbody > tr:nth-child(2) > td > vn-check', tableId: 'vn-textfield[name="id"]', tableFutureId: 'vn-textfield[name="futureId"]', tableLiters: 'vn-textfield[name="liters"]', @@ -810,7 +810,7 @@ export default { claimAction: { importClaimButton: 'vn-claim-action vn-button[label="Import claim"]', anyLine: 'vn-claim-action vn-tbody > vn-tr', - firstDeleteLine: 'vn-claim-action tr:nth-child(1) vn-icon-button[icon="delete"]', + firstDeleteLine: 'vn-claim-action tr:nth-child(2) vn-icon-button[icon="delete"]', isPaidWithManaCheckbox: 'vn-claim-action vn-check[ng-model="$ctrl.claim.isChargedToMana"]' }, ordersIndex: { diff --git a/e2e/paths/04-item/01_summary.spec.js b/e2e/paths/04-item/01_summary.spec.js index 621dd9cd80..e09ecb7787 100644 --- a/e2e/paths/04-item/01_summary.spec.js +++ b/e2e/paths/04-item/01_summary.spec.js @@ -1,7 +1,7 @@ import selectors from '../../helpers/selectors.js'; import getBrowser from '../../helpers/puppeteer'; -fdescribe('Item summary path', () => { +describe('Item summary path', () => { let browser; let page; beforeAll(async() => { @@ -18,7 +18,7 @@ fdescribe('Item summary path', () => { await page.doSearch('Ranged weapon'); const resultsCount = await page.countElement(selectors.itemsIndex.searchResult); - await page.waitForTextInElement(selectors.itemsIndex.searchResult, 'Ranged weapon'); + await page.waitForTextInElement(selectors.itemsIndex.firstSearchResult, 'Ranged weapon'); await page.waitToClick(selectors.itemsIndex.firstResultPreviewButton); const isVisible = await page.isVisible(selectors.itemSummary.basicData); @@ -66,7 +66,7 @@ fdescribe('Item summary path', () => { await page.waitToClick(selectors.itemsIndex.firstResultPreviewButton); await page.waitForSelector(selectors.itemSummary.basicData, {visible: true}); - expect(resultsCount).toBe(2); + expect(resultsCount).toBe(3); }); it(`should now check the item summary preview shows fields from basic data`, async() => { diff --git a/e2e/paths/04-item/10_item_log.spec.js b/e2e/paths/04-item/10_item_log.spec.js index dc467044dc..c88fbd337e 100644 --- a/e2e/paths/04-item/10_item_log.spec.js +++ b/e2e/paths/04-item/10_item_log.spec.js @@ -18,7 +18,7 @@ describe('Item log path', () => { await page.doSearch('Knowledge artifact'); const nResults = await page.countElement(selectors.itemsIndex.searchResult); - expect(nResults).toEqual(0); + expect(nResults).toEqual(1); }); it('should access to the create item view by clicking the create floating button', async() => { diff --git a/e2e/paths/05-ticket/01-sale/02_edit_sale.spec.js b/e2e/paths/05-ticket/01-sale/02_edit_sale.spec.js index 6264073f63..a494a88482 100644 --- a/e2e/paths/05-ticket/01-sale/02_edit_sale.spec.js +++ b/e2e/paths/05-ticket/01-sale/02_edit_sale.spec.js @@ -365,7 +365,7 @@ describe('Ticket Edit sale path', () => { }); it('should confirm the original ticket received the line', async() => { - const expectedLines = 4; + const expectedLines = 3; await page.waitForNumberOfElements(selectors.ticketSales.saleLine, expectedLines); const result = await page.countElement(selectors.ticketSales.saleLine); @@ -402,7 +402,7 @@ describe('Ticket Edit sale path', () => { }); it('should confirm the new ticket received the line', async() => { - const expectedLines = 1; + const expectedLines = 3; const result = await page.countElement(selectors.ticketSales.saleLine); expect(result).toEqual(expectedLines); diff --git a/e2e/paths/05-ticket/02_expeditions_and_log.spec.js b/e2e/paths/05-ticket/02_expeditions_and_log.spec.js index edccd55610..b97576940b 100644 --- a/e2e/paths/05-ticket/02_expeditions_and_log.spec.js +++ b/e2e/paths/05-ticket/02_expeditions_and_log.spec.js @@ -27,6 +27,6 @@ describe('Ticket expeditions and log path', () => { const result = await page .countElement(selectors.ticketExpedition.expeditionRow); - expect(result).toEqual(3); + expect(result).toEqual(4); }); }); diff --git a/e2e/paths/05-ticket/09_weekly.spec.js b/e2e/paths/05-ticket/09_weekly.spec.js index 0ba57aa9dc..a9cce2ead1 100644 --- a/e2e/paths/05-ticket/09_weekly.spec.js +++ b/e2e/paths/05-ticket/09_weekly.spec.js @@ -19,7 +19,7 @@ describe('Ticket descriptor path', () => { it('should count the amount of tickets in the turns section', async() => { const result = await page.countElement(selectors.ticketsIndex.weeklyTicket); - expect(result).toEqual(6); + expect(result).toEqual(7); }); it('should go back to the ticket index then search and access a ticket summary', async() => { @@ -89,7 +89,7 @@ describe('Ticket descriptor path', () => { await page.doSearch('11'); const nResults = await page.countElement(selectors.ticketsIndex.searchWeeklyResult); - expect(nResults).toEqual(1); + expect(nResults).toEqual(2); }); it('should delete the weekly ticket 11', async() => { @@ -104,7 +104,7 @@ describe('Ticket descriptor path', () => { await page.doSearch(); const nResults = await page.countElement(selectors.ticketsIndex.searchWeeklyResult); - expect(nResults).toEqual(6); + expect(nResults).toEqual(7); }); it('should update the agency then remove it afterwards', async() => { diff --git a/e2e/paths/05-ticket/20_moveExpedition.spec.js b/e2e/paths/05-ticket/20_moveExpedition.spec.js index cf1c5ded32..ae23c9c999 100644 --- a/e2e/paths/05-ticket/20_moveExpedition.spec.js +++ b/e2e/paths/05-ticket/20_moveExpedition.spec.js @@ -29,7 +29,7 @@ describe('Ticket expeditions', () => { const result = await page .countElement(selectors.ticketExpedition.expeditionRow); - expect(result).toEqual(1); + expect(result).toEqual(2); }); it(`should move one expedition to new ticket with route`, async() => { @@ -45,6 +45,6 @@ describe('Ticket expeditions', () => { const result = await page .countElement(selectors.ticketExpedition.expeditionRow); - expect(result).toEqual(1); + expect(result).toEqual(2); }); }); diff --git a/e2e/paths/05-ticket/21_future.spec.js b/e2e/paths/05-ticket/21_future.spec.js index c854dcbaf3..7b7d478f73 100644 --- a/e2e/paths/05-ticket/21_future.spec.js +++ b/e2e/paths/05-ticket/21_future.spec.js @@ -87,7 +87,7 @@ describe('Ticket Future path', () => { await page.clearInput(selectors.ticketFuture.futureState); await page.waitToClick(selectors.ticketFuture.submit); - await page.waitForNumberOfElements(selectors.ticketFuture.searchResult, 4); + await page.waitForNumberOfElements(selectors.ticketFuture.searchResult, 5); await page.waitToClick(selectors.ticketFuture.multiCheck); await page.waitToClick(selectors.ticketFuture.firstCheck); await page.waitToClick(selectors.ticketFuture.moveButton); From d8b041c734a9a013a400c3257f2c5746f23cf500 Mon Sep 17 00:00:00 2001 From: alexm Date: Mon, 12 Jun 2023 22:04:02 +0200 Subject: [PATCH 09/29] refs #5472 correcto version folder --- db/changes/{232401 => 232601}/00-userPassExpired.sql | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename db/changes/{232401 => 232601}/00-userPassExpired.sql (100%) diff --git a/db/changes/232401/00-userPassExpired.sql b/db/changes/232601/00-userPassExpired.sql similarity index 100% rename from db/changes/232401/00-userPassExpired.sql rename to db/changes/232601/00-userPassExpired.sql From fa9719de78b3211f5f9855f19936347ff46f5354 Mon Sep 17 00:00:00 2001 From: vicent Date: Tue, 13 Jun 2023 08:16:37 +0200 Subject: [PATCH 10/29] refs #5691 feat: cambiado url por data en los crudModel --- modules/route/front/index/index.html | 55 ++++++++++++++++++---------- 1 file changed, 35 insertions(+), 20 deletions(-) diff --git a/modules/route/front/index/index.html b/modules/route/front/index/index.html index 7a64a9affe..9384af6be6 100644 --- a/modules/route/front/index/index.html +++ b/modules/route/front/index/index.html @@ -1,11 +1,26 @@ + + + + + +
-
@@ -35,7 +50,7 @@ - @@ -52,19 +67,19 @@ Vehicle - Date + Date - m³ + m³ - Description + Description - Hour started + Hour started - Hour finished + Hour finished @@ -74,7 +89,7 @@ class="clickable vn-tr search-result" ng-attr-id="{{::route.id}}" vn-droppable="$ctrl.onDrop($event)"> - @@ -83,7 +98,7 @@ - + - - - + @@ -156,7 +171,7 @@ - +
@@ -171,7 +186,7 @@ route="$ctrl.routeSelected"> - - @@ -210,4 +225,4 @@ - \ No newline at end of file + From 92953b9aa821e392a7c8d9969e101d40c99dd1d1 Mon Sep 17 00:00:00 2001 From: alexm Date: Tue, 13 Jun 2023 11:37:35 +0200 Subject: [PATCH 11/29] refs #5094 test(docuware): adapt tests --- back/methods/docuware/core.js | 8 ++++---- back/methods/docuware/specs/upload.spec.js | 5 +++-- back/methods/docuware/upload.js | 9 ++++++--- .../front/descriptor-menu/index.spec.js | 2 +- modules/ticket/front/index/index.spec.js | 20 +++++++++---------- 5 files changed, 24 insertions(+), 20 deletions(-) diff --git a/back/methods/docuware/core.js b/back/methods/docuware/core.js index be310e82b2..2053ddf851 100644 --- a/back/methods/docuware/core.js +++ b/back/methods/docuware/core.js @@ -20,8 +20,8 @@ module.exports = Self => { const options = await Self.getOptions(); - // if (!process.env.NODE_ENV) - // return Math.round(); + if (!process.env.NODE_ENV) + return Math.round(); const response = await axios.get(`${options.url}/FileCabinets/${fileCabinetId}/dialogs`, options.headers); const dialogs = response.data.Dialog; @@ -44,8 +44,8 @@ module.exports = Self => { } }); - // if (!process.env.NODE_ENV) - // return Math.round(); + if (!process.env.NODE_ENV) + return Math.round(); const fileCabinetResponse = await axios.get(`${options.url}/FileCabinets`, options.headers); const fileCabinets = fileCabinetResponse.data.FileCabinet; diff --git a/back/methods/docuware/specs/upload.spec.js b/back/methods/docuware/specs/upload.spec.js index 7ac873e95f..3b8c55a504 100644 --- a/back/methods/docuware/specs/upload.spec.js +++ b/back/methods/docuware/specs/upload.spec.js @@ -2,8 +2,9 @@ const models = require('vn-loopback/server/server').models; describe('docuware upload()', () => { const userId = 9; - const ticketId = 10; + const ticketIds = [10]; const ctx = { + args: {ticketIds}, req: { getLocale: () => { return 'en'; @@ -27,7 +28,7 @@ describe('docuware upload()', () => { let error; try { - await models.Docuware.upload(ctx, ticketId, fileCabinetName); + await models.Docuware.upload(ctx, ticketIds, fileCabinetName); } catch (e) { error = e.message; } diff --git a/back/methods/docuware/upload.js b/back/methods/docuware/upload.js index d14e8a668d..57e96170f1 100644 --- a/back/methods/docuware/upload.js +++ b/back/methods/docuware/upload.js @@ -19,7 +19,10 @@ module.exports = Self => { required: true } ], - returns: [], + returns: { + type: 'object', + root: true + }, http: { path: `/upload`, verb: 'POST' @@ -106,8 +109,8 @@ module.exports = Self => { ] }; - // if (process.env.NODE_ENV != 'production') - // throw new UserError('Action not allowed on the test environment'); + if (process.env.NODE_ENV != 'production') + throw new UserError('Action not allowed on the test environment'); // delete old const docuwareFile = await models.Docuware.checkFile(ctx, id, fileCabinet, false); diff --git a/modules/ticket/front/descriptor-menu/index.spec.js b/modules/ticket/front/descriptor-menu/index.spec.js index 95a580fe50..0aef956dbb 100644 --- a/modules/ticket/front/descriptor-menu/index.spec.js +++ b/modules/ticket/front/descriptor-menu/index.spec.js @@ -308,7 +308,7 @@ describe('Ticket Component vnTicketDescriptorMenu', () => { controller.$.balanceCreate = {show: () => {}}; jest.spyOn(controller.vnApp, 'showSuccess'); - $httpBackend.whenPOST(`Docuwares/${ticket.id}/upload`).respond(true); + $httpBackend.whenPOST(`Docuwares/upload`).respond(true); controller.uploadDocuware(true); $httpBackend.flush(); diff --git a/modules/ticket/front/index/index.spec.js b/modules/ticket/front/index/index.spec.js index 5046387b00..951c6aa09e 100644 --- a/modules/ticket/front/index/index.spec.js +++ b/modules/ticket/front/index/index.spec.js @@ -12,12 +12,14 @@ describe('Component vnTicketIndex', () => { id: 2, clientFk: 1, checked: true, - totalWithVat: 20.5 + totalWithVat: 20.5, + stateFk: 1 }, { id: 3, clientFk: 1, checked: true, - totalWithVat: 30 + totalWithVat: 30, + stateFk: 1 }]; beforeEach(ngModule('ticket')); @@ -86,18 +88,16 @@ describe('Component vnTicketIndex', () => { }); }); - describe('setDelivered()/openDeliveryNotes()', () => { - it('should perform a post to setDelivered and open tabs with the delivery notes', () => { + describe('sendDocuware()', () => { + it('should perform a post to sendDocuware and change tickets state', () => { controller.$.model = {data: tickets, refresh: () => {}}; + const newState = {id: 2}; - $window.open = jest.fn(); - - $httpBackend.expect('POST', 'TicketTrackings/setDelivered').respond('ok'); - controller.setDelivered(); + $httpBackend.expect('POST', 'Docuwares/upload').respond({id: newState.id}); + controller.sendDocuware(); $httpBackend.flush(); - expect($window.open).toHaveBeenCalledWith(`api/Tickets/${tickets[1].id}/delivery-note-pdf`); - expect($window.open).toHaveBeenCalledWith(`api/Tickets/${tickets[2].id}/delivery-note-pdf`); + expect(controller.$.model.data[1].stateFk).toEqual(newState.id); }); }); From dd4b62d0a53ac810f2dd8ef7442e6683988e69e0 Mon Sep 17 00:00:00 2001 From: alexm Date: Tue, 13 Jun 2023 12:42:12 +0200 Subject: [PATCH 12/29] description --- back/methods/docuware/upload.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/back/methods/docuware/upload.js b/back/methods/docuware/upload.js index 57e96170f1..421c1c4d80 100644 --- a/back/methods/docuware/upload.js +++ b/back/methods/docuware/upload.js @@ -3,7 +3,7 @@ const axios = require('axios'); module.exports = Self => { Self.remoteMethodCtx('upload', { - description: 'Upload an docuware PDF', + description: 'Upload docuware PDFs', accessType: 'WRITE', accepts: [ { @@ -39,8 +39,6 @@ module.exports = Self => { const dialogId = await Self.getDialog(fileCabinet, action, fileCabinetId); const uploaded = []; - - // get delivery note for (id of ticketIds) { // get delivery note ctx.args.id = id; From 61ce25c1e1e22563d7853b1f14b1c072e33e8f18 Mon Sep 17 00:00:00 2001 From: carlossa Date: Tue, 13 Jun 2023 13:32:04 +0200 Subject: [PATCH 13/29] refs #5325 all e2e fix smartTable --- e2e/helpers/selectors.js | 20 +++++++++---------- ..._smartTable_searchBar_integrations.spec.js | 6 +++--- .../05-ticket/01-sale/02_edit_sale.spec.js | 4 ++-- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/e2e/helpers/selectors.js b/e2e/helpers/selectors.js index 3d5bcddb57..b8eaa99a1d 100644 --- a/e2e/helpers/selectors.js +++ b/e2e/helpers/selectors.js @@ -523,8 +523,8 @@ export default { searchResultDate: 'vn-ticket-summary [label=Landed] span', topbarSearch: 'vn-searchbar', moreMenu: 'vn-ticket-index vn-icon-button[icon=more_vert]', - fourthWeeklyTicket: 'vn-ticket-weekly-index vn-card smart-table slot-table tr:nth-child(4)', - fiveWeeklyTicket: 'vn-ticket-weekly-index vn-card smart-table slot-table tr:nth-child(5)', + fourthWeeklyTicket: 'vn-ticket-weekly-index vn-card smart-table slot-table tr:nth-child(5)', + fiveWeeklyTicket: 'vn-ticket-weekly-index vn-card smart-table slot-table tr:nth-child(6)', weeklyTicket: 'vn-ticket-weekly-index vn-card smart-table slot-table table tbody tr', firstWeeklyTicketDeleteIcon: 'vn-ticket-weekly-index vn-card smart-table slot-table tr:nth-child(2) vn-icon-button[icon="delete"]', firstWeeklyTicketAgency: 'vn-ticket-weekly-index vn-card smart-table slot-table tr:nth-child(2) [ng-model="weekly.agencyModeFk"]', @@ -606,16 +606,16 @@ export default { firstSaleThumbnailImage: 'vn-ticket-sale:nth-child(1) vn-tr:nth-child(1) vn-td:nth-child(3) > img', firstSaleZoomedImage: 'body > div > div > img', firstSaleQuantity: 'vn-ticket-sale [ng-model="sale.quantity"]', - firstSaleQuantityCell: 'vn-ticket-sale vn-tr:nth-child(2) > vn-td-editable:nth-child(7)', + firstSaleQuantityCell: 'vn-ticket-sale vn-tr:nth-child(1) > vn-td-editable:nth-child(7)', firstSalePrice: 'vn-ticket-sale vn-table vn-tr:nth-child(1) > vn-td:nth-child(9) > span', firstSalePriceInput: '.vn-popover.shown input[ng-model="$ctrl.field"]', firstSaleDiscount: 'vn-ticket-sale vn-table vn-tr:nth-child(1) > vn-td:nth-child(10) > span', firstSaleDiscountInput: '.vn-popover.shown [ng-model="$ctrl.field"]', saveSaleDiscountButton: '.vn-popover.shown vn-button[label="Save"]', - firstSaleImport: 'vn-ticket-sale:nth-child(3) vn-td:nth-child(11)', - firstSaleReservedIcon: 'vn-ticket-sale vn-tr:nth-child(2) > vn-td:nth-child(2) > vn-icon:nth-child(3)', + firstSaleImport: 'vn-ticket-sale:nth-child(1) vn-td:nth-child(11)', + firstSaleReservedIcon: 'vn-ticket-sale vn-tr:nth-child(1) > vn-td:nth-child(2) > vn-icon:nth-child(3)', firstSaleColour: 'vn-ticket-sale vn-tr:nth-child(1) vn-fetched-tags section', - firstSaleCheckbox: 'vn-ticket-sale vn-tr:nth-child(2) vn-check[ng-model="sale.checked"]', + firstSaleCheckbox: 'vn-ticket-sale vn-tr:nth-child(1) vn-check[ng-model="sale.checked"]', secondSaleText: 'vn-table div > vn-tbody > vn-tr:nth-child(2)', secondSaleId: 'vn-ticket-sale:nth-child(2) vn-td-editable:nth-child(4) text > span', secondSaleIdAutocomplete: 'vn-ticket-sale vn-tr:nth-child(2) vn-autocomplete[ng-model="sale.itemFk"]', @@ -625,9 +625,9 @@ export default { secondSaleConceptInput: 'vn-ticket-sale vn-tbody > :nth-child(2) > vn-td-editable.ng-isolate-scope.selected vn-textfield', totalImport: 'vn-ticket-sale vn-one.taxes > p:nth-child(3) > strong', selectAllSalesCheckbox: 'vn-ticket-sale vn-thead vn-check', - secondSaleCheckbox: 'vn-ticket-sale vn-tr:nth-child(3) vn-check[ng-model="sale.checked"]', - thirdSaleCheckbox: 'vn-ticket-sale vn-tr:nth-child(4) vn-check[ng-model="sale.checked"]', - fourthSaleCheckbox: 'vn-ticket-sale vn-tr:nth-child(5) vn-check[ng-model="sale.checked"]', + secondSaleCheckbox: 'vn-ticket-sale vn-tr:nth-child(2) vn-check[ng-model="sale.checked"]', + thirdSaleCheckbox: 'vn-ticket-sale vn-tr:nth-child(3) vn-check[ng-model="sale.checked"]', + fourthSaleCheckbox: 'vn-ticket-sale vn-tr:nth-child(4) vn-check[ng-model="sale.checked"]', deleteSaleButton: 'vn-ticket-sale vn-tool-bar > vn-button[icon="delete"]', transferSaleButton: 'vn-ticket-sale vn-tool-bar > vn-button[icon="call_split"]', moveToTicketInput: 'form vn-input-number[ng-model="$ctrl.transfer.ticketId"] input', @@ -1216,7 +1216,7 @@ export default { addTagButton: 'vn-icon-button[vn-tooltip="Add tag"]', itemTagInput: 'vn-autocomplete[ng-model="itemTag.tagFk"]', itemTagValueInput: 'vn-autocomplete[ng-model="itemTag.value"]', - firstBuy: 'vn-entry-latest-buys tbody > tr:nth-child(1)', + firstBuy: 'vn-entry-latest-buys tbody > tr:nth-child(2)', allBuysCheckBox: 'vn-entry-latest-buys thead vn-check', secondBuyCheckBox: 'vn-entry-latest-buys tbody tr:nth-child(2) vn-check[ng-model="buy.checked"]', editBuysButton: 'vn-entry-latest-buys vn-button[icon="edit"]', diff --git a/e2e/paths/01-salix/03_smartTable_searchBar_integrations.spec.js b/e2e/paths/01-salix/03_smartTable_searchBar_integrations.spec.js index 526afa1405..a56f54185b 100644 --- a/e2e/paths/01-salix/03_smartTable_searchBar_integrations.spec.js +++ b/e2e/paths/01-salix/03_smartTable_searchBar_integrations.spec.js @@ -19,16 +19,16 @@ describe('SmartTable SearchBar integration', () => { await page.waitToClick(selectors.itemsIndex.openAdvancedSearchButton); await page.autocompleteSearch(selectors.itemsIndex.advancedSearchItemType, 'Anthurium'); await page.waitToClick(selectors.itemsIndex.advancedSearchButton); - await page.waitForNumberOfElements(selectors.itemsIndex.searchResult, 3); + await page.waitForNumberOfElements(selectors.itemsIndex.searchResult, 4); await page.reload({ waitUntil: 'networkidle2' }); - await page.waitForNumberOfElements(selectors.itemsIndex.searchResult, 3); + await page.waitForNumberOfElements(selectors.itemsIndex.searchResult, 4); await page.waitToClick(selectors.itemsIndex.advancedSmartTableButton); - await page.write(selectors.itemsIndex.advancedSmartTableGrouping, '1'); + await page.write(selectors.itemsIndex.advancedSmartTableGrouping, 3); await page.keyboard.press('Enter'); await page.waitForNumberOfElements(selectors.itemsIndex.searchResult, 2); diff --git a/e2e/paths/05-ticket/01-sale/02_edit_sale.spec.js b/e2e/paths/05-ticket/01-sale/02_edit_sale.spec.js index a494a88482..6264073f63 100644 --- a/e2e/paths/05-ticket/01-sale/02_edit_sale.spec.js +++ b/e2e/paths/05-ticket/01-sale/02_edit_sale.spec.js @@ -365,7 +365,7 @@ describe('Ticket Edit sale path', () => { }); it('should confirm the original ticket received the line', async() => { - const expectedLines = 3; + const expectedLines = 4; await page.waitForNumberOfElements(selectors.ticketSales.saleLine, expectedLines); const result = await page.countElement(selectors.ticketSales.saleLine); @@ -402,7 +402,7 @@ describe('Ticket Edit sale path', () => { }); it('should confirm the new ticket received the line', async() => { - const expectedLines = 3; + const expectedLines = 1; const result = await page.countElement(selectors.ticketSales.saleLine); expect(result).toEqual(expectedLines); From 3cef6d642d4d8129cf38dfa8a67edc2a79a0a76f Mon Sep 17 00:00:00 2001 From: carlossa Date: Tue, 13 Jun 2023 14:15:31 +0200 Subject: [PATCH 14/29] refs #5325 smartTable e2e fix --- .../01-salix/03_smartTable_searchBar_integrations.spec.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/e2e/paths/01-salix/03_smartTable_searchBar_integrations.spec.js b/e2e/paths/01-salix/03_smartTable_searchBar_integrations.spec.js index a56f54185b..9c37ce9ba0 100644 --- a/e2e/paths/01-salix/03_smartTable_searchBar_integrations.spec.js +++ b/e2e/paths/01-salix/03_smartTable_searchBar_integrations.spec.js @@ -27,8 +27,7 @@ describe('SmartTable SearchBar integration', () => { await page.waitForNumberOfElements(selectors.itemsIndex.searchResult, 4); - await page.waitToClick(selectors.itemsIndex.advancedSmartTableButton); - await page.write(selectors.itemsIndex.advancedSmartTableGrouping, 3); + await page.write(selectors.itemsIndex.advancedSmartTableGrouping, '1'); await page.keyboard.press('Enter'); await page.waitForNumberOfElements(selectors.itemsIndex.searchResult, 2); @@ -36,7 +35,7 @@ describe('SmartTable SearchBar integration', () => { waitUntil: 'networkidle2' }); - await page.waitForNumberOfElements(selectors.itemsIndex.searchResult, 2); + await page.waitForNumberOfElements(selectors.itemsIndex.searchResult, 1); }); it('should filter in section without smart-table and search in searchBar go to zone section', async() => { From 66c5eda6f2989c017c2a5d5813c1db03d9039058 Mon Sep 17 00:00:00 2001 From: carlossa Date: Tue, 13 Jun 2023 16:08:11 +0200 Subject: [PATCH 15/29] refs #5325 remove defaultSearch --- front/core/components/smart-table/index.js | 2 ++ modules/claim/front/action/index.js | 1 - modules/claim/front/index/index.js | 1 - modules/client/front/defaulter/index.js | 1 - modules/client/front/extended-list/index.js | 1 - modules/client/front/notification/index.js | 1 - modules/entry/front/latest-buys/index.js | 1 - modules/invoiceOut/front/negative-bases/index.js | 1 - modules/item/front/fixed-price/index.js | 1 - modules/item/front/index/index.js | 1 - modules/item/front/item-shelving/index.js | 1 - modules/monitor/front/index/clients/index.js | 1 - modules/monitor/front/index/tickets/index.js | 1 - modules/route/front/agency-term/index/index.js | 1 - modules/ticket/front/advance/index.js | 1 - modules/ticket/front/expedition/index.js | 1 - modules/ticket/front/future/index.js | 1 - modules/ticket/front/weekly/index.js | 1 - 18 files changed, 2 insertions(+), 17 deletions(-) diff --git a/front/core/components/smart-table/index.js b/front/core/components/smart-table/index.js index b2380a62f8..c3b927c62b 100644 --- a/front/core/components/smart-table/index.js +++ b/front/core/components/smart-table/index.js @@ -40,6 +40,8 @@ export default class SmartTable extends Component { this._options = options; if (!options) return; + options.defaultSearch = true; + if (options.defaultSearch) this.displaySearch(); diff --git a/modules/claim/front/action/index.js b/modules/claim/front/action/index.js index 6b4879a852..10b629f273 100644 --- a/modules/claim/front/action/index.js +++ b/modules/claim/front/action/index.js @@ -26,7 +26,6 @@ export default class Controller extends Section { activeButtons: { search: true }, - defaultSearch: true, columns: [ { field: 'claimDestinationFk', diff --git a/modules/claim/front/index/index.js b/modules/claim/front/index/index.js index 8e948f426b..e3fdabf799 100644 --- a/modules/claim/front/index/index.js +++ b/modules/claim/front/index/index.js @@ -9,7 +9,6 @@ class Controller extends Section { activeButtons: { search: true }, - defaultSearch: true, columns: [ { field: 'clientName', diff --git a/modules/client/front/defaulter/index.js b/modules/client/front/defaulter/index.js index 1244191f15..95c7622f99 100644 --- a/modules/client/front/defaulter/index.js +++ b/modules/client/front/defaulter/index.js @@ -12,7 +12,6 @@ export default class Controller extends Section { activeButtons: { search: true }, - defaultSearch: true, columns: [ { field: 'clientFk', diff --git a/modules/client/front/extended-list/index.js b/modules/client/front/extended-list/index.js index 2cb7a6d581..8eed48d01c 100644 --- a/modules/client/front/extended-list/index.js +++ b/modules/client/front/extended-list/index.js @@ -11,7 +11,6 @@ class Controller extends Section { search: true, shownColumns: true, }, - defaultSearch: true, columns: [ { field: 'socialName', diff --git a/modules/client/front/notification/index.js b/modules/client/front/notification/index.js index ada5437152..faa062b253 100644 --- a/modules/client/front/notification/index.js +++ b/modules/client/front/notification/index.js @@ -9,7 +9,6 @@ export default class Controller extends Section { activeButtons: { search: true }, - defaultSearch: true, columns: [ { field: 'socialName', diff --git a/modules/entry/front/latest-buys/index.js b/modules/entry/front/latest-buys/index.js index 1a9b3627bb..d9065193ea 100644 --- a/modules/entry/front/latest-buys/index.js +++ b/modules/entry/front/latest-buys/index.js @@ -14,7 +14,6 @@ export default class Controller extends Section { search: true, shownColumns: true, }, - defaultSearch: true, columns: [ { field: 'code', diff --git a/modules/invoiceOut/front/negative-bases/index.js b/modules/invoiceOut/front/negative-bases/index.js index b70a2f7be3..f60668b200 100644 --- a/modules/invoiceOut/front/negative-bases/index.js +++ b/modules/invoiceOut/front/negative-bases/index.js @@ -20,7 +20,6 @@ export default class Controller extends Section { activeButtons: { search: true, }, - defaultSearch: true, columns: [ { field: 'isActive', diff --git a/modules/item/front/fixed-price/index.js b/modules/item/front/fixed-price/index.js index a39cd66027..fe6788e9cb 100644 --- a/modules/item/front/fixed-price/index.js +++ b/modules/item/front/fixed-price/index.js @@ -13,7 +13,6 @@ export default class Controller extends Section { activeButtons: { search: true }, - defaultSearch: true, columns: [ { field: 'warehouseFk', diff --git a/modules/item/front/index/index.js b/modules/item/front/index/index.js index f341f64547..10bd4bbb7f 100644 --- a/modules/item/front/index/index.js +++ b/modules/item/front/index/index.js @@ -11,7 +11,6 @@ class Controller extends Section { search: true, shownColumns: true, }, - defaultSearch: true, columns: [ { field: 'category', diff --git a/modules/item/front/item-shelving/index.js b/modules/item/front/item-shelving/index.js index 8e5df459d9..b8584039b8 100644 --- a/modules/item/front/item-shelving/index.js +++ b/modules/item/front/item-shelving/index.js @@ -9,7 +9,6 @@ export default class Controller extends Section { activeButtons: { search: true }, - defaultSearch: true, columns: [ { field: 'parking', diff --git a/modules/monitor/front/index/clients/index.js b/modules/monitor/front/index/clients/index.js index 9faf2ed53d..ac3ce91408 100644 --- a/modules/monitor/front/index/clients/index.js +++ b/modules/monitor/front/index/clients/index.js @@ -20,7 +20,6 @@ export default class Controller extends Section { activeButtons: { search: true }, - defaultSearch: true, columns: [ { field: 'clientFk', diff --git a/modules/monitor/front/index/tickets/index.js b/modules/monitor/front/index/tickets/index.js index 92097833b2..2f2dead057 100644 --- a/modules/monitor/front/index/tickets/index.js +++ b/modules/monitor/front/index/tickets/index.js @@ -12,7 +12,6 @@ export default class Controller extends Section { search: true, shownColumns: true, }, - defaultSearch: true, columns: [ { field: 'totalProblems', diff --git a/modules/route/front/agency-term/index/index.js b/modules/route/front/agency-term/index/index.js index 6277fb9a13..6c3bafc9a1 100644 --- a/modules/route/front/agency-term/index/index.js +++ b/modules/route/front/agency-term/index/index.js @@ -9,7 +9,6 @@ class Controller extends Section { activeButtons: { search: true }, - defaultSearch: true, columns: [ { field: 'agencyModeFk', diff --git a/modules/ticket/front/advance/index.js b/modules/ticket/front/advance/index.js index 0cd1b09813..0cec41227a 100644 --- a/modules/ticket/front/advance/index.js +++ b/modules/ticket/front/advance/index.js @@ -11,7 +11,6 @@ export default class Controller extends Section { activeButtons: { search: true, }, - defaultSearch: true, columns: [ { field: 'state', diff --git a/modules/ticket/front/expedition/index.js b/modules/ticket/front/expedition/index.js index 1e30ce4478..b8046be521 100644 --- a/modules/ticket/front/expedition/index.js +++ b/modules/ticket/front/expedition/index.js @@ -11,7 +11,6 @@ class Controller extends Section { search: true, shownColumns: true, }, - defaultSearch: true, columns: [ { field: 'packageItemName', diff --git a/modules/ticket/front/future/index.js b/modules/ticket/front/future/index.js index 846c3883f6..66d6269936 100644 --- a/modules/ticket/front/future/index.js +++ b/modules/ticket/front/future/index.js @@ -10,7 +10,6 @@ export default class Controller extends Section { activeButtons: { search: true, }, - defaultSearch: true, columns: [{ field: 'totalProblems', searchable: false, diff --git a/modules/ticket/front/weekly/index.js b/modules/ticket/front/weekly/index.js index d0a3331584..a10ff7184c 100644 --- a/modules/ticket/front/weekly/index.js +++ b/modules/ticket/front/weekly/index.js @@ -22,7 +22,6 @@ export default class Controller extends Section { search: true, shownColumns: true, }, - defaultSearch: true, columns: [ { field: 'ticketFk', From 961941ecb3095b7857da9bb9481d8b6290bd9a14 Mon Sep 17 00:00:00 2001 From: Juan Ferrer Toribio Date: Tue, 13 Jun 2023 20:52:26 +0200 Subject: [PATCH 16/29] refs #5667 TicketRequest translations added/fixed --- .../ticket/back/locale/ticket-request/en.yml | 19 ++++++++++------- .../ticket/back/locale/ticket-request/es.yml | 21 +++++++++++-------- 2 files changed, 23 insertions(+), 17 deletions(-) diff --git a/modules/ticket/back/locale/ticket-request/en.yml b/modules/ticket/back/locale/ticket-request/en.yml index f381e0c9db..fc9210501b 100644 --- a/modules/ticket/back/locale/ticket-request/en.yml +++ b/modules/ticket/back/locale/ticket-request/en.yml @@ -2,14 +2,17 @@ name: request columns: id: id description: description - created: created + buyerCode: buyer quantity: quantity price: price - isOk: ok - response: response - saleFk: sale - ticketFk: ticket - attenderFk: attender - requesterFk: requester itemFk: item - + clientFk: client + response: response + total: total + buyed: buyed + saleFk: sale + created: created + isOk: ok + requesterFk: requester + attenderFk: attender + ticketFk: ticket diff --git a/modules/ticket/back/locale/ticket-request/es.yml b/modules/ticket/back/locale/ticket-request/es.yml index 5504448bfc..fd89ddf60c 100644 --- a/modules/ticket/back/locale/ticket-request/es.yml +++ b/modules/ticket/back/locale/ticket-request/es.yml @@ -1,15 +1,18 @@ -name: peticion +name: petición columns: id: id description: descripción - created: creado + buyerCode: comprador quantity: cantidad price: precio - isOk: ok - response: respuesta - saleFk: línea - ticketFk: ticket - attenderFk: asistente - requesterFk: solicitante itemFk: artículo - + clientFk: cliente + response: respuesta + total: total + buyed: comprado + saleFk: línea + created: creado + isOk: ok + requesterFk: solicitante + attenderFk: asistente + ticketFk: ticket From aa2d3be4516b750bacf1cf80eb062577032cdf04 Mon Sep 17 00:00:00 2001 From: alexm Date: Wed, 14 Jun 2023 07:30:50 +0200 Subject: [PATCH 17/29] typo --- back/methods/docuware/upload.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/back/methods/docuware/upload.js b/back/methods/docuware/upload.js index 421c1c4d80..096301e563 100644 --- a/back/methods/docuware/upload.js +++ b/back/methods/docuware/upload.js @@ -139,7 +139,7 @@ module.exports = Self => { await axios.post(uploadUri, data, uploadOptions); } catch (err) { const $t = ctx.req.__; - const message = $t('Failed to upload ticket', {id}); + const message = $t('Failed to upload delivery note', {id}); if (uploaded.length) await models.TicketTracking.setDelivered(ctx, uploaded); throw new UserError(message); From c62e6fa0eb19b7805107086587ac554fd20673f3 Mon Sep 17 00:00:00 2001 From: sergiodt Date: Wed, 14 Jun 2023 10:51:22 +0200 Subject: [PATCH 18/29] refs #5651 packingSiteAdvanced --- db/changes/232601/00-packingSiteAdvanced.sql | 63 +++++++++++++++++++ modules/ticket/back/model-config.json | 3 + .../back/models/packing-site-advanced.json | 18 ++++++ 3 files changed, 84 insertions(+) create mode 100644 db/changes/232601/00-packingSiteAdvanced.sql create mode 100644 modules/ticket/back/models/packing-site-advanced.json diff --git a/db/changes/232601/00-packingSiteAdvanced.sql b/db/changes/232601/00-packingSiteAdvanced.sql new file mode 100644 index 0000000000..63c348fcce --- /dev/null +++ b/db/changes/232601/00-packingSiteAdvanced.sql @@ -0,0 +1,63 @@ +CREATE TABLE `vn`.`packingSiteAdvanced` ( + `ticketFk` int(11), + `workerFk` int(10) unsigned, + PRIMARY KEY (`ticketFk`), + KEY `packingSiteAdvanced_FK_1` (`workerFk`), + CONSTRAINT `packingSiteAdvanced_FK` FOREIGN KEY (`ticketFk`) REFERENCES `ticket` (`id`) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT `packingSiteAdvanced_FK_1` FOREIGN KEY (`workerFk`) REFERENCES `worker` (`id`) ON DELETE CASCADE ON UPDATE CASCADE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci; + + +INSERT INTO `salix`.`ACL` (`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`) + VALUES + ('PackingSiteAdvanced', '*', '*', 'ALLOW', 'ROLE', 'production'); + +DROP PROCEDURE IF EXISTS `vn`.`packingSite_startCollection`; + +DELIMITER $$ +$$ +CREATE DEFINER=`root`@`localhost` PROCEDURE `vn`.`packingSite_startCollection`(vSelf INT, vTicketFk INT) +proc: BEGIN +/** + * @param vSelf packingSite id + * @param vTicketFk A ticket id from the collection to start + */ + DECLARE vNewCollectionFk INT; + DECLARE vIsAdvanced BOOL; + DECLARE vOldCollectionFk INT; + DECLARE vIsPackingByOther BOOL; + + SELECT COUNT(*) > 0 + INTO vIsAdvanced + FROM packingSiteAdvanced + WHERE ticketFk = vTicketFk; + + IF vIsAdvanced THEN + LEAVE proc; + END IF; + + SELECT collectionFk INTO vNewCollectionFk + FROM ticketCollection WHERE ticketFk = vTicketFk; + + SELECT collectionFk INTO vOldCollectionFk + FROM packingSite WHERE id = vSelf; + + IF NOT (vOldCollectionFk <=> vNewCollectionFk) THEN + SELECT COUNT(*) > 0 + INTO vIsPackingByOther + FROM packingSite + WHERE id <> vSelf + AND collectionFk = vOldCollectionFk; + + IF NOT vIsPackingByOther AND NOT collection_isPacked(vOldCollectionFk) AND vSelf IS NOT NULL THEN + CALL util.throw('cannotChangeCollection'); + END IF; + END IF; + + UPDATE packingSite SET collectionFk = vNewCollectionFk + WHERE id = vSelf; +END$$ +DELIMITER ; + + + diff --git a/modules/ticket/back/model-config.json b/modules/ticket/back/model-config.json index bee01a8756..3c7e12eead 100644 --- a/modules/ticket/back/model-config.json +++ b/modules/ticket/back/model-config.json @@ -100,5 +100,8 @@ }, "TicketConfig": { "dataSource": "vn" + }, + "PackingSiteAdvanced": { + "dataSource": "vn" } } diff --git a/modules/ticket/back/models/packing-site-advanced.json b/modules/ticket/back/models/packing-site-advanced.json new file mode 100644 index 0000000000..f48cbf4121 --- /dev/null +++ b/modules/ticket/back/models/packing-site-advanced.json @@ -0,0 +1,18 @@ +{ + "name": "PackingSiteAdvanced", + "base": "VnModel", + "options": { + "mysql": { + "table": "packingSiteAdvanced" + } + }, + "properties": { + "ticketFk": { + "id": true, + "type": "number" + }, + "workerFk": { + "type": "number" + } + } +} From 927c0fddc6231075f15209b83291726ee6468b6d Mon Sep 17 00:00:00 2001 From: sergiodt Date: Wed, 14 Jun 2023 13:15:37 +0200 Subject: [PATCH 19/29] refs #5651 --- db/changes/232601/00-packingSiteAdvanced.sql | 64 +++++++++++--------- 1 file changed, 36 insertions(+), 28 deletions(-) diff --git a/db/changes/232601/00-packingSiteAdvanced.sql b/db/changes/232601/00-packingSiteAdvanced.sql index 63c348fcce..0e33744cd8 100644 --- a/db/changes/232601/00-packingSiteAdvanced.sql +++ b/db/changes/232601/00-packingSiteAdvanced.sql @@ -12,7 +12,7 @@ INSERT INTO `salix`.`ACL` (`model`, `property`, `accessType`, `permission`, `pri VALUES ('PackingSiteAdvanced', '*', '*', 'ALLOW', 'ROLE', 'production'); -DROP PROCEDURE IF EXISTS `vn`.`packingSite_startCollection`; + DROP PROCEDURE IF EXISTS `vn`.`packingSite_startCollection`; DELIMITER $$ $$ @@ -22,40 +22,48 @@ proc: BEGIN * @param vSelf packingSite id * @param vTicketFk A ticket id from the collection to start */ - DECLARE vNewCollectionFk INT; - DECLARE vIsAdvanced BOOL; - DECLARE vOldCollectionFk INT; - DECLARE vIsPackingByOther BOOL; + DECLARE vExists BOOL; + DECLARE vIsAdvanced BOOL; + DECLARE vNewCollectionFk INT; + DECLARE vOldCollectionFk INT; + DECLARE vIsPackingByOther BOOL; - SELECT COUNT(*) > 0 - INTO vIsAdvanced - FROM packingSiteAdvanced - WHERE ticketFk = vTicketFk; + SELECT id, collectionFk + INTO vExists, vOldCollectionFk + FROM packingSite + WHERE id = vSelf; - IF vIsAdvanced THEN - LEAVE proc; - END IF; + IF NOT vExists THEN + CALL util.throw('packingSiteNotExists'); + END IF; - SELECT collectionFk INTO vNewCollectionFk - FROM ticketCollection WHERE ticketFk = vTicketFk; + SELECT COUNT(*) > 0 + INTO vIsAdvanced + FROM packingSiteAdvanced + WHERE ticketFk = vTicketFk; - SELECT collectionFk INTO vOldCollectionFk - FROM packingSite WHERE id = vSelf; + IF vIsAdvanced THEN + LEAVE proc; + END IF; - IF NOT (vOldCollectionFk <=> vNewCollectionFk) THEN - SELECT COUNT(*) > 0 - INTO vIsPackingByOther - FROM packingSite - WHERE id <> vSelf - AND collectionFk = vOldCollectionFk; + SELECT collectionFk INTO vNewCollectionFk + FROM ticketCollection WHERE ticketFk = vTicketFk; - IF NOT vIsPackingByOther AND NOT collection_isPacked(vOldCollectionFk) AND vSelf IS NOT NULL THEN - CALL util.throw('cannotChangeCollection'); - END IF; - END IF; + IF vOldCollectionFk IS NOT NULL + AND vOldCollectionFk <> vNewCollectionFk THEN + SELECT COUNT(*) > 0 + INTO vIsPackingByOther + FROM packingSite + WHERE id <> vSelf + AND collectionFk = vOldCollectionFk; - UPDATE packingSite SET collectionFk = vNewCollectionFk - WHERE id = vSelf; + IF NOT vIsPackingByOther AND NOT collection_isPacked(vOldCollectionFk) THEN + CALL util.throw('cannotChangeCollection'); + END IF; + END IF; + + UPDATE packingSite SET collectionFk = vNewCollectionFk + WHERE id = vSelf; END$$ DELIMITER ; From 7fa4eabf86df48b01a25ee1981e7f0475d3a12c4 Mon Sep 17 00:00:00 2001 From: vicent Date: Wed, 14 Jun 2023 14:59:18 +0200 Subject: [PATCH 20/29] refs #5842 fix: recalcula invoiceDate cuando se cambia la company --- .../front/global-invoicing/index.html | 3 +- .../front/global-invoicing/index.js | 34 +++++++++++-------- 2 files changed, 22 insertions(+), 15 deletions(-) diff --git a/modules/invoiceOut/front/global-invoicing/index.html b/modules/invoiceOut/front/global-invoicing/index.html index 6d5b16329f..1df01c7f0f 100644 --- a/modules/invoiceOut/front/global-invoicing/index.html +++ b/modules/invoiceOut/front/global-invoicing/index.html @@ -118,7 +118,8 @@ label="Company" show-field="code" value-field="id" - ng-model="$ctrl.companyFk"> + ng-model="$ctrl.companyFk" + on-change="$ctrl.recalcInvoiceDate($ctrl.companyFk)"> { - this.companyFk = res.data.companyFk; - const params = { - companyFk: this.companyFk - }; - return this.$http.get('InvoiceOuts/getInvoiceDate', {params}); - }) - .then(res => { - this.minInvoicingDate = res.data.issued ? new Date(res.data.issued) : null; - this.invoiceDate = this.minInvoicingDate; - }); - } + .then(res => { + this.companyFk = res.data.companyFk; + this.recalcInvoiceDate(this.companyFk); + }); + } + + recalcInvoiceDate(companyFk) { + const params = { companyFk: companyFk }; + this.fetchInvoiceDate(params); + } + + fetchInvoiceDate(params) { + this.$http.get('InvoiceOuts/getInvoiceDate', { params }) + .then(res => { + this.minInvoicingDate = res.data.issued ? new Date(res.data.issued) : null; + this.invoiceDate = this.minInvoicingDate; + }); + } stopInvoicing() { this.status = 'stopping'; From 14ebcf96c05931c6318d7dbcbab2f3ded84cfee7 Mon Sep 17 00:00:00 2001 From: vicent Date: Thu, 15 Jun 2023 07:24:17 +0200 Subject: [PATCH 21/29] refs #5842 refactor: change names --- modules/invoiceOut/front/global-invoicing/index.html | 2 +- modules/invoiceOut/front/global-invoicing/index.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/invoiceOut/front/global-invoicing/index.html b/modules/invoiceOut/front/global-invoicing/index.html index 1df01c7f0f..3f0a106507 100644 --- a/modules/invoiceOut/front/global-invoicing/index.html +++ b/modules/invoiceOut/front/global-invoicing/index.html @@ -119,7 +119,7 @@ show-field="code" value-field="id" ng-model="$ctrl.companyFk" - on-change="$ctrl.recalcInvoiceDate($ctrl.companyFk)"> + on-change="$ctrl.getInvoiceDate(value)"> { this.companyFk = res.data.companyFk; - this.recalcInvoiceDate(this.companyFk); + this.getInvoiceDate(this.companyFk); }); } - recalcInvoiceDate(companyFk) { + getInvoiceDate(companyFk) { const params = { companyFk: companyFk }; this.fetchInvoiceDate(params); } From a50de4e509d11fae67b6d069bd9f7183330be973 Mon Sep 17 00:00:00 2001 From: vicent Date: Thu, 15 Jun 2023 09:50:46 +0200 Subject: [PATCH 22/29] refs #5842 feat: comprueba que invoiceDate no sea null --- modules/invoiceOut/front/global-invoicing/index.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/invoiceOut/front/global-invoicing/index.js b/modules/invoiceOut/front/global-invoicing/index.js index f300d44965..965782e5b7 100644 --- a/modules/invoiceOut/front/global-invoicing/index.js +++ b/modules/invoiceOut/front/global-invoicing/index.js @@ -42,13 +42,14 @@ class Controller extends Section { this.addresses = null; try { + console.log(this.invoiceDate, this.minInvoicingDate); if (this.clientsToInvoice == 'one' && !this.clientId) throw new UserError('Choose a valid client'); if (!this.invoiceDate || !this.maxShipped) throw new UserError('Invoice date and the max date should be filled'); if (this.invoiceDate < this.maxShipped) throw new UserError('Invoice date can\'t be less than max date'); - if (this.invoiceDate.getTime() < this.minInvoicingDate.getTime()) + if (this.minInvoicingDate && this.invoiceDate.getTime() < this.minInvoicingDate.getTime()) throw new UserError('Exists an invoice with a previous date'); if (!this.companyFk) throw new UserError('Choose a valid company'); From 5f2c5c5f9d93ee7416f84309c095e45535433cd8 Mon Sep 17 00:00:00 2001 From: vicent Date: Thu, 15 Jun 2023 09:55:32 +0200 Subject: [PATCH 23/29] refs #5842 delete console.log --- modules/invoiceOut/front/global-invoicing/index.js | 1 - 1 file changed, 1 deletion(-) diff --git a/modules/invoiceOut/front/global-invoicing/index.js b/modules/invoiceOut/front/global-invoicing/index.js index 965782e5b7..5a078dfbb0 100644 --- a/modules/invoiceOut/front/global-invoicing/index.js +++ b/modules/invoiceOut/front/global-invoicing/index.js @@ -42,7 +42,6 @@ class Controller extends Section { this.addresses = null; try { - console.log(this.invoiceDate, this.minInvoicingDate); if (this.clientsToInvoice == 'one' && !this.clientId) throw new UserError('Choose a valid client'); if (!this.invoiceDate || !this.maxShipped) From 99ad9d3afa56d8d38a1dc112e11fc39c69571a19 Mon Sep 17 00:00:00 2001 From: alexm Date: Thu, 15 Jun 2023 11:49:39 +0200 Subject: [PATCH 24/29] refs #5753 fix(change-password) --- CHANGELOG.md | 2 +- README.md | 4 ++-- back/methods/vn-user/signIn.js | 7 +++---- db/changes/{232601 => 232401}/00-userPassExpired.sql | 0 db/changes/232601/.gitkeep | 0 front/salix/components/change-password/index.js | 8 ++++---- front/salix/components/login/index.js | 7 +++---- front/salix/routes.js | 2 +- modules/account/front/accounts/index.js | 3 +-- package.json | 2 +- 10 files changed, 16 insertions(+), 19 deletions(-) rename db/changes/{232601 => 232401}/00-userPassExpired.sql (100%) delete mode 100644 db/changes/232601/.gitkeep diff --git a/CHANGELOG.md b/CHANGELOG.md index 708ebbc4b6..8967a1633b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,7 +14,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Fixed - -## [2324.01] - 2023-06-08 +## [2324.01] - 2023-06-15 ### Added - (Tickets -> Abono) Al abonar permite crear el ticket abono con almacén o sin almmacén diff --git a/README.md b/README.md index f73a8551be..59f5dbcf78 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ Salix is also the scientific name of a beautifull tree! :) Required applications. -* Node.js = 14.x LTS +* Node.js >= 16.x LTS * Docker * Git @@ -71,7 +71,7 @@ $ npm run test:e2e Open Visual Studio Code, press Ctrl+P and paste the following commands. -In Visual Studio Code we use the ESLint extension. +In Visual Studio Code we use the ESLint extension. ``` ext install dbaeumer.vscode-eslint ``` diff --git a/back/methods/vn-user/signIn.js b/back/methods/vn-user/signIn.js index d7db90a21e..6615cb5f13 100644 --- a/back/methods/vn-user/signIn.js +++ b/back/methods/vn-user/signIn.js @@ -62,10 +62,9 @@ module.exports = Self => { scopes: ['change-password'], userId: vnUser.id }); - throw new UserError('Pass expired', 'passExpired', { - id: vnUser.id, - token: changePasswordToken.id - }); + const err = new UserError('Pass expired', 'passExpired'); + err.details = {token: changePasswordToken}; + throw err; } try { diff --git a/db/changes/232601/00-userPassExpired.sql b/db/changes/232401/00-userPassExpired.sql similarity index 100% rename from db/changes/232601/00-userPassExpired.sql rename to db/changes/232401/00-userPassExpired.sql diff --git a/db/changes/232601/.gitkeep b/db/changes/232601/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/front/salix/components/change-password/index.js b/front/salix/components/change-password/index.js index 3d660e894c..baa9d96e52 100644 --- a/front/salix/components/change-password/index.js +++ b/front/salix/components/change-password/index.js @@ -15,7 +15,7 @@ export default class Controller { } $onInit() { - if (!this.$state.params || !this.$state.params.id || !this.$state.params.token) + if (!this.$state.params.id) this.$state.go('login'); this.$http.get('UserPasswords/findOne') @@ -25,7 +25,7 @@ export default class Controller { } submit() { - const id = this.$state.params.id; + const userId = this.$state.params.userId; const newPassword = this.newPassword; const oldPassword = this.oldPassword; @@ -35,12 +35,12 @@ export default class Controller { throw new UserError(`Passwords don't match`); const headers = { - Authorization: this.$state.params.token + Authorization: this.$state.params.id }; this.$http.post('VnUsers/change-password', { - id, + id: userId, oldPassword, newPassword }, diff --git a/front/salix/components/login/index.js b/front/salix/components/login/index.js index 0412f3b742..8e8f082444 100644 --- a/front/salix/components/login/index.js +++ b/front/salix/components/login/index.js @@ -27,10 +27,9 @@ export default class Controller { this.loading = false; this.password = ''; this.focusUser(); - if (req?.data?.error?.code == 'passExpired') { - const [args] = req.data.error.translateArgs; - this.$state.go('change-password', args); - } + const err = req.data?.error; + if (err?.code == 'passExpired') + this.$state.go('change-password', err.details.token); throw req; }); diff --git a/front/salix/routes.js b/front/salix/routes.js index d6dea244a5..675da719a5 100644 --- a/front/salix/routes.js +++ b/front/salix/routes.js @@ -38,7 +38,7 @@ function config($stateProvider, $urlRouterProvider) { }) .state('change-password', { parent: 'outLayout', - url: '/change-password?id&token', + url: '/change-password?id&userId', description: 'Change password', template: '' }) diff --git a/modules/account/front/accounts/index.js b/modules/account/front/accounts/index.js index 7a341b0b03..0e78ab8d6d 100644 --- a/modules/account/front/accounts/index.js +++ b/modules/account/front/accounts/index.js @@ -5,8 +5,7 @@ import UserError from 'core/lib/user-error'; export default class Controller extends Section { onSynchronizeAll() { this.vnApp.showSuccess(this.$t('Synchronizing in the background')); - this.$http.patch(`Accounts/syncAll`) - .then(() => this.vnApp.showSuccess(this.$t('Users synchronized!'))); + this.$http.patch(`Accounts/syncAll`); } onUserSync() { diff --git a/package.json b/package.json index 4358c86a70..f1b3daca34 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "salix-back", - "version": "23.26.01", + "version": "23.24.01", "author": "Verdnatura Levante SL", "description": "Salix backend", "license": "GPL-3.0", From 2a34abac611ba522648bba05a85890b21d714384 Mon Sep 17 00:00:00 2001 From: alexandre Date: Thu, 15 Jun 2023 12:06:42 +0200 Subject: [PATCH 25/29] refs #5513 minor fixes --- print/templates/email/modified-entry/locale/en.yml | 2 +- print/templates/email/modified-entry/locale/es.yml | 2 +- print/templates/email/modified-entry/modified-entry.html | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/print/templates/email/modified-entry/locale/en.yml b/print/templates/email/modified-entry/locale/en.yml index c70cfe5ccd..7bdfa15ff7 100644 --- a/print/templates/email/modified-entry/locale/en.yml +++ b/print/templates/email/modified-entry/locale/en.yml @@ -1,3 +1,3 @@ subject: Modified entry title: Modified entry -description: 'From Warehouse the following packaging entry has been created/modified: ' +description: From Warehouse the following packaging entry has been created/modified diff --git a/print/templates/email/modified-entry/locale/es.yml b/print/templates/email/modified-entry/locale/es.yml index 72ddb5ca55..5a00307f9b 100644 --- a/print/templates/email/modified-entry/locale/es.yml +++ b/print/templates/email/modified-entry/locale/es.yml @@ -1,3 +1,3 @@ subject: Entrada modificada title: Entrada modificada -description: 'Desde Almacén se ha creado/modificado la siguiente entrada de embalajes: ' +description: Desde Almacén se ha creado/modificado la siguiente entrada de embalajes diff --git a/print/templates/email/modified-entry/modified-entry.html b/print/templates/email/modified-entry/modified-entry.html index a0f2973544..869d019a4b 100644 --- a/print/templates/email/modified-entry/modified-entry.html +++ b/print/templates/email/modified-entry/modified-entry.html @@ -3,7 +3,7 @@

{{ $t('title') }}

- {{ $t('description') }} + {{ $t('description') }}: {{ url }}

From 8b832c68b3c1289a5457e3827c791e9a7221797a Mon Sep 17 00:00:00 2001 From: carlossa Date: Thu, 15 Jun 2023 12:49:53 +0200 Subject: [PATCH 26/29] refs #5325 fix back --- modules/ticket/back/methods/ticket-request/specs/filter.spec.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/ticket/back/methods/ticket-request/specs/filter.spec.js b/modules/ticket/back/methods/ticket-request/specs/filter.spec.js index ae004a024a..565e006fbb 100644 --- a/modules/ticket/back/methods/ticket-request/specs/filter.spec.js +++ b/modules/ticket/back/methods/ticket-request/specs/filter.spec.js @@ -173,7 +173,7 @@ describe('ticket-request filter()', () => { const result = await models.TicketRequest.filter(ctx, options); const requestId = result[0].id; - expect(requestId).toEqual(3); + expect(requestId).toEqual(4); await tx.rollback(); } catch (e) { From 1c666cd48e04ce883e128d2b9a42b2bd1109f501 Mon Sep 17 00:00:00 2001 From: Juan Ferrer Toribio Date: Thu, 15 Jun 2023 13:10:44 +0200 Subject: [PATCH 27/29] refs #5595 Fix: ctx & userId removed from TpvTransaction/confirm --- modules/client/back/methods/tpv-transaction/confirm.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/client/back/methods/tpv-transaction/confirm.js b/modules/client/back/methods/tpv-transaction/confirm.js index 4faa21bb5e..41229a1fd0 100644 --- a/modules/client/back/methods/tpv-transaction/confirm.js +++ b/modules/client/back/methods/tpv-transaction/confirm.js @@ -2,7 +2,7 @@ const UserError = require('vn-loopback/util/user-error'); const base64url = require('base64url'); module.exports = Self => { - Self.remoteMethodCtx('confirm', { + Self.remoteMethod('confirm', { description: 'Confirms electronic payment transaction', accessType: 'WRITE', accepts: [ @@ -30,7 +30,7 @@ module.exports = Self => { } }); - Self.confirm = async(ctx, signatureVersion, merchantParameters, signature) => { + Self.confirm = async(signatureVersion, merchantParameters, signature) => { const $ = Self.app.models; let transaction; @@ -83,7 +83,7 @@ module.exports = Self => { params['Ds_Currency'], params['Ds_Response'], params['Ds_ErrorCode'] - ], {userId: ctx.req.accessToken.userId}); + ]); return true; } catch (err) { From e8d28ddb025a2191bb92c106c8334015f168519a Mon Sep 17 00:00:00 2001 From: alexm Date: Thu, 15 Jun 2023 15:15:41 +0200 Subject: [PATCH 28/29] v232601 --- package-lock.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index 4ed50e2568..c190065b0b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "salix-back", - "version": "23.24.01", + "version": "23.26.01", "lockfileVersion": 2, "requires": true, "packages": { diff --git a/package.json b/package.json index f1b3daca34..4358c86a70 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "salix-back", - "version": "23.24.01", + "version": "23.26.01", "author": "Verdnatura Levante SL", "description": "Salix backend", "license": "GPL-3.0", From 7bff915a7f3cb62dba4224e5c6e4ca1731afc0d5 Mon Sep 17 00:00:00 2001 From: carlossa Date: Thu, 15 Jun 2023 17:14:34 +0200 Subject: [PATCH 29/29] refs #5325 back fix correct --- modules/ticket/back/methods/ticket-request/specs/filter.spec.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/ticket/back/methods/ticket-request/specs/filter.spec.js b/modules/ticket/back/methods/ticket-request/specs/filter.spec.js index 565e006fbb..ae004a024a 100644 --- a/modules/ticket/back/methods/ticket-request/specs/filter.spec.js +++ b/modules/ticket/back/methods/ticket-request/specs/filter.spec.js @@ -173,7 +173,7 @@ describe('ticket-request filter()', () => { const result = await models.TicketRequest.filter(ctx, options); const requestId = result[0].id; - expect(requestId).toEqual(4); + expect(requestId).toEqual(3); await tx.rollback(); } catch (e) {