closes #3681 move-sign_save-to-salix #1151

Merged
joan merged 16 commits from 3681-move-sign_save-to-salix into dev 2022-12-22 12:44:02 +00:00
Contributor
No description provided.
pau added the
CR / Tests passed
label 2022-11-16 11:31:13 +00:00
pau added 10 commits 2022-11-16 11:31:16 +00:00
pau added 1 commit 2022-11-16 12:44:23 +00:00
gitea/salix/pipeline/head This commit looks good Details
25764c0411
change error message
pau added 1 commit 2022-11-21 08:33:54 +00:00
gitea/salix/pipeline/head There was a failure building this commit Details
7475aa8389
Merge branch 'dev' into 3681-move-sign_save-to-salix
joan requested changes 2022-11-22 09:46:19 +00:00
@ -237,6 +237,12 @@
"Modifiable user details only by an administrator": "Detalles de usuario modificables solo por un administrador",
"Modifiable password only via recovery or by an administrator": "Contraseña modificable solo a través de la recuperación o por un administrador",
"Not enough privileges to edit a client": "No tienes suficientes privilegios para editar un cliente",
<<<<<<< HEAD
Contributor

Resolver conflicto

Resolver conflicto
pau added 1 commit 2022-11-30 06:24:37 +00:00
gitea/salix/pipeline/head There was a failure building this commit Details
a676351e5b
Merge branch 'dev' into 3681-move-sign_save-to-salix
pau added 1 commit 2022-11-30 06:29:06 +00:00
gitea/salix/pipeline/head This commit looks good Details
1c4dbb5b4d
solve merge conflict
pau requested review from joan 2022-11-30 06:36:46 +00:00
jgallego requested review from juan 2022-12-02 11:18:15 +00:00
joan requested changes 2022-12-13 07:10:52 +00:00
@ -0,0 +8,4 @@
accepts:
[
{
arg: 'singContent',
Contributor

signContent

signContent
pau marked this conversation as resolved
@ -0,0 +40,4 @@
async function createGestDoc(ticketId, userFk) {
if (! await gestDocExists(ticketId)) {
const query = `SELECT t.warehouseFk,
Contributor

Utilizar modelos siempre que sea posible

Utilizar modelos siempre que sea posible
pau marked this conversation as resolved
@ -0,0 +62,4 @@
const resultDmsType = await Self.rawSql(queryDmsType, []);
const dmsInsert = `INSERT INTO vn.dms
Contributor

Utilizar modelos siempre que sea posible

Utilizar modelos siempre que sea posible
pau marked this conversation as resolved
@ -0,0 +78,4 @@
return resultDms.insertId;
}
return 'null';
Contributor

este return no es necesario, además de que es un string

este return no es necesario, además de que es un string
pau marked this conversation as resolved
@ -0,0 +82,4 @@
}
async function gestDocExists(ticket) {
const dMSQuery = `SELECT dmsFk as id FROM vn.ticketDms WHERE ticketFk = ?`;
Contributor

Utilizar modelos siempre que sea posible

Utilizar modelos siempre que sea posible
pau marked this conversation as resolved
@ -0,0 +86,4 @@
result = await Self.rawSql(dMSQuery, [ticket]);
if (result.length < 0)
Contributor

Si no hay resultados siempre devolverá cero

Si no hay resultados siempre devolverá cero
Author
Contributor

Al cambiarlo por los modelos si no hay resultados devuelve null

Al cambiarlo por los modelos si no hay resultados devuelve null
pau marked this conversation as resolved
@ -0,0 +96,4 @@
if (isSigned[0].isSigned)
return true;
else
deleteFromGestDoc(ticket);
Contributor

No parece necesario crear la función

No parece necesario crear la función
pau marked this conversation as resolved
@ -0,0 +129,4 @@
}
Self.saveSign = async(ctx, signContent, tickets, signedTime, addressFk) => {
let tx = await Self.beginTransaction({});
Contributor

No parece que se esté utilizando. Añadir transacción a todos los métodos utilizados dentro de la transacción

No parece que se esté utilizando. Añadir transacción a todos los métodos utilizados dentro de la transacción
@ -0,0 +1 @@
INSERT INTO `salix`.`ACL` (`model`,`property`,`accessType`,`permission`,`principalId`) VALUES ('Dms','saveSign','*','ALLOW','employee');
Contributor

Mover a la carpeta actual

Mover a la carpeta actual
@ -3,6 +3,13 @@
"version": "1.0.0",
"lockfileVersion": 1,
"requires": true,
<<<<<<< HEAD
Contributor

Recuerda que estas lineas se tienen que eliminar. Resolver conflicto o eliminar o recrear archivo

Recuerda que estas lineas se tienen que eliminar. Resolver conflicto o eliminar o recrear archivo
pau added 1 commit 2022-12-22 07:31:05 +00:00
gitea/salix/pipeline/head This commit looks good Details
aa716634db
Merge branch 'dev' into 3681-move-sign_save-to-salix
pau added 1 commit 2022-12-22 09:35:26 +00:00
gitea/salix/pipeline/head This commit looks good Details
6ded11a4c2
requested changes refs #3681 @3h
joan approved these changes 2022-12-22 12:43:54 +00:00
joan merged commit e15d724db5 into dev 2022-12-22 12:44:02 +00:00
joan deleted branch 3681-move-sign_save-to-salix 2022-12-22 12:44:02 +00:00
Sign in to join this conversation.
No reviewers
No Milestone
No Assignees
2 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: verdnatura/salix#1151
No description provided.