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

Merge branch 'dev' of http://git.verdnatura.es/salix into dev

This commit is contained in:
Carlos Jimenez 2018-10-08 11:12:53 +02:00
parent fa385cd9d6 16902fab8f
commit 979660dac3
4 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
services/loopback/common/methods/sale/updatePrice.js
View File

@ -52,7 +52,7 @@ module.exports = Self => {
let ticket = await Self.getTicket(params);
let usesMana = await model.WorkerMana.findOne({where: {workerFk: ticket[0].client().salesPersonFk}, fields: 'amount'});
let currentLine = await Self.app.models.Sale.findOne({where: {id: params.id}, fields: 'price'});
let currentLine = await Self.app.models.Sale.findOne({where: {id: params.id}});
let componentToUse;
if (usesMana)
@ -67,7 +67,7 @@ module.exports = Self => {
await Self.rawSql(query, [params.id, componentToUse, value, value]);
await Self.app.models.Sale.update({id: params.id}, {price: params.price});
await currentLine.updateAttributes({price: params.price});
query = `call vn.manaSpellersRequery(?)`;
await Self.rawSql(query, [ticket[0].client().salesPersonFk]);

4
services/loopback/common/methods/sale/updateQuantity.js
View File

@ -30,10 +30,10 @@ module.exports = Self => {
if (isNaN(quantity))
throw new UserError(`The value should be a number`);
let currentLine = await Self.app.models.Sale.findOne({where: {id: id}, fields: ['quantity']});
let currentLine = await Self.app.models.Sale.findOne({where: {id: id}});
if (quantity > currentLine.quantity)
throw new UserError('The new quantity should be smaller than the old one');
return await Self.app.models.Sale.update({id: id}, {quantity: quantity});
return await currentLine.updateAttributes({quantity: quantity});
};
};

3
services/loopback/common/methods/ticket/deleted.js
View File

@ -20,7 +20,8 @@ module.exports = Self => {
});
Self.deleted = async(ctx, params) => {
await Self.app.models.Ticket.update({id: params.id}, {isDeleted: '1'});
let currentTicket = await Self.app.models.Ticket.findById(params.id);
await currentTicket.updateAttributes({isDeleted: '1'});
if (ctx.req.accessToken) {
let token = ctx.req.accessToken;

10
services/loopback/common/methods/userConfig/specs/getUserConfig.spec.js Normal file
View File

@ -0,0 +1,10 @@
const app = require(`${servicesDir}/ticket/server/server`);
describe('userConfig getUserConfig()', () => {
it(`should return the configuration data of a given user`, async() => {
await app.models.UserConfig.getUserConfig({req: {accessToken: {userId: 9}}})
.then(response => {
expect(response.warehouseFk).toEqual(1);
});
});
});