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

hotfix isTrucker was not in the params #1350

Merged
alexandre merged 2 commits from hotfix-supplier-isTrucker into master 2023-02-28 13:58:03 +00:00
Conversation 0 Commits 2 Files Changed 1 +24 -18
5 changed files with 24 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 4d6a770b26 - Show all commits

2
e2e/paths/05-ticket/18_index_payout.spec.js
View File

@ -63,6 +63,6 @@ describe('Ticket index payout path', () => {
const reference = await page.waitToGetProperty(selectors.clientBalance.firstLineReference, 'innerText');
expect(count).toEqual(4);
expect(reference).toContain('Cash,Albaran: 7, 8Payment');
expect(reference).toContain('Cash, Albaran: 7, 8Payment');
});
});

12
loopback/locale/es.json
View File

@ -259,10 +259,10 @@
"Aplicación bloqueada por el usuario 9": "Aplicación bloqueada por el usuario 9",
"Failed to upload file": "Error al subir archivo",
"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",
"It is not possible to modify cloned sales": "No es posible modificar líneas de pedido clonadas",
"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",
"It is not possible to modify cloned sales": "No es posible modificar líneas de pedido clonadas",
"A supplier with the same name already exists. Change the country.": "Un proveedor con el mismo nombre ya existe. Cambie el país.",
"There is no assigned email for this client": "No hay correo asignado para este cliente"
}
"There is no assigned email for this client": "No hay correo asignado para este cliente",
"Not exist this branch": "Not exist this branch"
}

2
modules/client/front/balance/create/index.js
View File

@ -68,7 +68,7 @@ class Controller extends Dialog {
this.receipt.description.push(accountingType.receiptDescription);
if (this.originalDescription)
this.receipt.description.push(this.originalDescription);
this.receipt.description.join(', ');
this.receipt.description = this.receipt.description.join(', ');
}
this.maxAmount = accountingType && accountingType.maxAmount;

2
modules/client/front/balance/create/index.spec.js
View File

@ -38,7 +38,7 @@ describe('Client', () => {
}
};
expect(controller.receipt.description.join(',')).toEqual('Cash,Albaran: 1, 2');
expect(controller.receipt.description).toEqual('Cash, Albaran: 1, 2');
});
});

24
modules/mdb/back/methods/mdbVersion/upload.js
View File

@ -47,7 +47,16 @@ module.exports = Self => {
verb: 'POST'
}
});
Self.upload = async(ctx, options) => {
Self.upload = async(
ctx,
appName,
toVersion,
branch,
fromVersion,
description,
unlock,
options
) => {
const models = Self.app.models;
const myOptions = {};
const $t = ctx.req.__; // $translate
@ -55,12 +64,6 @@ module.exports = Self => {
const AccessContainer = models.AccessContainer;
const fileOptions = {};
let tx;
const appName = ctx.args.appName;
const toVersion = ctx.args.toVersion;
const branch = ctx.args.branch;
const fromVersion = ctx.args.fromVersion;
let description = ctx.args.description;
const unlock = ctx.args.unlock;
if (typeof options == 'object')
Object.assign(myOptions, options);
@ -153,11 +156,14 @@ module.exports = Self => {
formatDesc += `*${appName.toUpperCase()}* v.${toVersion} `;
const oldVersion = await models.MdbVersionTree.findOne({
where: {version: fromVersion},
where: {
version: fromVersion,
app: appName
},
fields: ['branchFk']
}, myOptions);
if (branch == oldVersion.branchFk)
if (!oldVersion || branch == oldVersion.branchFk)
formatDesc += `[*${branch}*]: `;
else
formatDesc += `[*${oldVersion.branchFk}* » *${branch}*]: `;