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

#847 ticket.index new

This commit is contained in:
Gerard 2018-11-28 12:03:48 +01:00
parent 632c91bcd1
commit 48dca4fe32
3 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
services/loopback/common/methods/claim-beginning/importToNewRefundTicket.js
View File

@ -61,7 +61,7 @@ module.exports = Self => {
], transaction);
}
Self.importToNewRefundTicket = async(ctx, id) => {
Self.importToNewRefundTicket = async (ctx, id) => {
let models = Self.app.models;
let token = ctx.req.accessToken;
let userId = token.userId;
@ -112,7 +112,7 @@ module.exports = Self => {
let transaction = await Self.beginTransaction({});
try {
let newRefundTicket = await models.Ticket.new(params, {transaction: transaction});
let newRefundTicket = await models.Ticket.new(ctx, params, {transaction: transaction});
let observation = {
description: `Reclama ticket: ${claim.ticketFk}`,

20
services/loopback/common/methods/claim/regularizeClaim.js
View File

@ -132,16 +132,16 @@ module.exports = Self => {
return ticket && ticket.id;
}
async function createTicket(params, transaction) {
let ticket = await Self.app.models.Ticket.new({
shipped: new Date(),
landed: new Date(),
clientFk: params.clientFk,
warehouseFk: params.warehouseFk,
companyFk: params.companyFk,
addressFk: params.addressFk,
userId: params.userId
}, {transaction: transaction});
async function createTicket(ctx, params, transaction) {
let ticket = await Self.app.models.Ticket.new(ctx,
{shipped: new Date(),
landed: new Date(),
clientFk: params.clientFk,
warehouseFk: params.warehouseFk,
companyFk: params.companyFk,
addressFk: params.addressFk,
userId: params.userId
}, {transaction: transaction});
return ticket.id;
}

12
services/loopback/common/methods/ticket/new.js
View File

@ -44,12 +44,14 @@ module.exports = Self => {
let clientFk = address.clientFk;
let query = `SELECT vn.clientGetDebt(?, CURDATE()) AS debt`;
let clientDebt = await Self.rawSql(query, [clientFk]);
if (clientDebt[0].debt > 0)
throw new UserError(`You can't create an order for a client that has a debt`);
let agency = await Self.app.models.Agency.findById(agencyModeFk);
if (agency.code != 'refund') {
let query = `SELECT vn.clientGetDebt(?, CURDATE()) AS debt`;
let clientDebt = await Self.rawSql(query, [clientFk]);
if (clientDebt[0].debt > 0)
throw new UserError(`You can't create an order for a client that has a debt`);
}
if (!params.userId && ctx.req && ctx.req.accessToken.userId)
params.userId = ctx.req.accessToken.userId;