verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 67 Releases Wiki Activity

Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into test-to-dev
gitea/salix/pipeline/head This commit looks good Details

This commit is contained in:
Alexandre Riera 2023-04-24 08:42:32 +02:00
parent a7a0853248 5b44323009
commit 0a1583aa54
5 changed files with 7342 additions and 570 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
e2e/helpers/selectors.js
View File

@ -1000,9 +1000,9 @@ export default {
saveButton: 'vn-worker-basic-data button[type=submit]' saveButton: 'vn-worker-basic-data button[type=submit]'
}, },
workerNotes: { workerNotes: {
addNoteFloatButton: 'vn-worker-note vn-icon[icon="add"]', addNoteFloatButton: 'vn-worker-note vn-float-button',
note: 'vn-note-worker-create vn-textarea[ng-model="$ctrl.note.text"]', note: 'vn-textarea[ng-model="$ctrl.note.text"]',
saveButton: 'vn-note-worker-create button[type=submit]', saveButton: 'button[type=submit]',
firstNoteText: 'vn-worker-note .text' firstNoteText: 'vn-worker-note .text'
}, },
workerPbx: { workerPbx: {

4
loopback/locale/en.json
View File

@ -155,7 +155,5 @@
"Warehouse inventory not set": "Almacén inventario no está establecido", "Warehouse inventory not set": "Almacén inventario no está establecido",
"Component cost not set": "Componente coste no está estabecido", "Component cost not set": "Componente coste no está estabecido",
"Tickets with associated refunds can't be deleted. This ticket is associated with refund Nº 2": "Tickets with associated refunds can't be deleted. This ticket is associated with refund Nº 2", "Tickets with associated refunds can't be deleted. This ticket is associated with refund Nº 2": "Tickets with associated refunds can't be deleted. This ticket is associated with refund Nº 2",
"Description cannot be blank": "Description cannot be blank", "Description cannot be blank": "Description cannot be blank"
"Added observation": "Added observation",
"Comment added to client": "Comment added to client"
} }

2
modules/ticket/back/methods/ticket/saveSign.js
View File

@ -100,7 +100,7 @@ module.exports = Self => {
dmsTypeId: dmsType.id, dmsTypeId: dmsType.id,
reference: '', reference: '',
description: `Firma del cliente - Ruta ${ticket.route().id}`, description: `Firma del cliente - Ruta ${ticket.route().id}`,
hasFile: true hasFile: false
}; };
dms = await models.Dms.uploadFile(ctxUploadFile, myOptions); dms = await models.Dms.uploadFile(ctxUploadFile, myOptions);
gestDocCreated = true; gestDocCreated = true;

7899
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

1
package.json
View File

@ -39,6 +39,7 @@
"mailparser": "^2.8.0", "mailparser": "^2.8.0",
"md5": "^2.2.1", "md5": "^2.2.1",
"node-ssh": "^11.0.0", "node-ssh": "^11.0.0",
"npm": "^8.19.4",
"object-diff": "0.0.4", "object-diff": "0.0.4",
"object.pick": "^1.3.0", "object.pick": "^1.3.0",
"puppeteer": "^18.0.5", "puppeteer": "^18.0.5",