renamed vars according to convention
This commit is contained in:
parent
7fce2e233c
commit
05fc1f08a8
|
@ -29,7 +29,7 @@ module.exports = Self => {
|
||||||
});
|
});
|
||||||
|
|
||||||
Self.updatePrice = async(id, newPrice) => {
|
Self.updatePrice = async(id, newPrice) => {
|
||||||
let $ = Self.app.models;
|
let models = Self.app.models;
|
||||||
let transaction = await Self.beginTransaction({});
|
let transaction = await Self.beginTransaction({});
|
||||||
let options = {transaction};
|
let options = {transaction};
|
||||||
|
|
||||||
|
@ -49,17 +49,17 @@ module.exports = Self => {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
let sale = await $.Sale.findById(id, filter, options);
|
let sale = await models.Sale.findById(id, filter, options);
|
||||||
|
|
||||||
let isEditable = await $.Ticket.isEditable(sale.ticketFk);
|
let isEditable = await models.Ticket.isEditable(sale.ticketFk);
|
||||||
if (!isEditable)
|
if (!isEditable)
|
||||||
throw new UserError(`The sales of this ticket can't be modified`);
|
throw new UserError(`The sales of this ticket can't be modified`);
|
||||||
|
|
||||||
let salesPerson = sale.ticket().client().salesPersonFk;
|
let salesPerson = sale.ticket().client().salesPersonFk;
|
||||||
let usesMana = await $.WorkerMana.findOne({where: {workerFk: salesPerson}, fields: 'amount'}, options);
|
let usesMana = await models.WorkerMana.findOne({where: {workerFk: salesPerson}, fields: 'amount'}, options);
|
||||||
let componentCode = usesMana ? 'mana' : 'buyerDiscount';
|
let componentCode = usesMana ? 'mana' : 'buyerDiscount';
|
||||||
|
|
||||||
let discount = await $.ComponentRate.findOne({where: {code: componentCode}}, options);
|
let discount = await models.ComponentRate.findOne({where: {code: componentCode}}, options);
|
||||||
let componentId = discount.id;
|
let componentId = discount.id;
|
||||||
let componentValue = newPrice - sale.price;
|
let componentValue = newPrice - sale.price;
|
||||||
|
|
||||||
|
@ -67,14 +67,14 @@ module.exports = Self => {
|
||||||
componentFk: componentId,
|
componentFk: componentId,
|
||||||
saleFk: id
|
saleFk: id
|
||||||
};
|
};
|
||||||
let saleComponent = await $.SaleComponent.findOne({where}, options);
|
let saleComponent = await models.SaleComponent.findOne({where}, options);
|
||||||
|
|
||||||
if (saleComponent) {
|
if (saleComponent) {
|
||||||
await $.SaleComponent.updateAll(where, {
|
await models.SaleComponent.updateAll(where, {
|
||||||
value: saleComponent.value + componentValue
|
value: saleComponent.value + componentValue
|
||||||
}, options);
|
}, options);
|
||||||
} else {
|
} else {
|
||||||
await $.SaleComponent.create({
|
await models.SaleComponent.create({
|
||||||
saleFk: id,
|
saleFk: id,
|
||||||
componentFk: componentId,
|
componentFk: componentId,
|
||||||
value: componentValue
|
value: componentValue
|
||||||
|
|
|
@ -25,26 +25,26 @@ module.exports = Self => {
|
||||||
|
|
||||||
Self.changeState = async(ctx, params) => {
|
Self.changeState = async(ctx, params) => {
|
||||||
let userId = ctx.req.accessToken.userId;
|
let userId = ctx.req.accessToken.userId;
|
||||||
let $ = Self.app.models;
|
let models = Self.app.models;
|
||||||
|
|
||||||
if (!params.stateFk && !params.code)
|
if (!params.stateFk && !params.code)
|
||||||
throw new UserError('State cannot be blank');
|
throw new UserError('State cannot be blank');
|
||||||
|
|
||||||
if (params.code) {
|
if (params.code) {
|
||||||
let state = await $.State.findOne({where: {code: params.code}, fields: ['id']});
|
let state = await models.State.findOne({where: {code: params.code}, fields: ['id']});
|
||||||
params.stateFk = state.id;
|
params.stateFk = state.id;
|
||||||
}
|
}
|
||||||
|
|
||||||
let isProduction = await $.Account.hasRole(userId, 'production');
|
let isProduction = await models.Account.hasRole(userId, 'production');
|
||||||
let isSalesPerson = await $.Account.hasRole(userId, 'salesPerson');
|
let isSalesPerson = await models.Account.hasRole(userId, 'salesPerson');
|
||||||
|
|
||||||
let ticket = await $.TicketState.findById(
|
let ticket = await models.TicketState.findById(
|
||||||
params.ticketFk,
|
params.ticketFk,
|
||||||
{fields: ['stateFk']}
|
{fields: ['stateFk']}
|
||||||
);
|
);
|
||||||
|
|
||||||
let oldState = await $.State.findById(ticket.stateFk);
|
let oldState = await models.State.findById(ticket.stateFk);
|
||||||
let newState = await $.State.findById(params.stateFk);
|
let newState = await models.State.findById(params.stateFk);
|
||||||
|
|
||||||
let isAllowed = isProduction || isSalesPerson
|
let isAllowed = isProduction || isSalesPerson
|
||||||
&& oldState.isEditable()
|
&& oldState.isEditable()
|
||||||
|
@ -54,10 +54,10 @@ module.exports = Self => {
|
||||||
throw new UserError(`You don't have enough privileges`, 'ACCESS_DENIED');
|
throw new UserError(`You don't have enough privileges`, 'ACCESS_DENIED');
|
||||||
|
|
||||||
if (newState.code != 'PICKER_DESIGNED') {
|
if (newState.code != 'PICKER_DESIGNED') {
|
||||||
let worker = await $.Worker.findOne({where: {userFk: userId}});
|
let worker = await models.Worker.findOne({where: {userFk: userId}});
|
||||||
params.workerFk = worker.id;
|
params.workerFk = worker.id;
|
||||||
}
|
}
|
||||||
|
|
||||||
return await $.TicketTracking.create(params);
|
return await models.TicketTracking.create(params);
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
@ -26,19 +26,19 @@ module.exports = function(Self) {
|
||||||
|
|
||||||
Self.makeInvoice = async(ctx, id) => {
|
Self.makeInvoice = async(ctx, id) => {
|
||||||
let userId = ctx.req.accessToken.userId;
|
let userId = ctx.req.accessToken.userId;
|
||||||
let $ = Self.app.models;
|
let models = Self.app.models;
|
||||||
|
|
||||||
let options = {};
|
let options = {};
|
||||||
options.transaction = await Self.beginTransaction({});
|
options.transaction = await Self.beginTransaction({});
|
||||||
|
|
||||||
try {
|
try {
|
||||||
let ticket = await $.Ticket.findById(id, {fields: ['id', 'clientFk', 'companyFk']});
|
let ticket = await models.Ticket.findById(id, {fields: ['id', 'clientFk', 'companyFk']});
|
||||||
|
|
||||||
let clientCanBeInvoiced = await $.Client.canBeInvoiced(ticket.clientFk);
|
let clientCanBeInvoiced = await models.Client.canBeInvoiced(ticket.clientFk);
|
||||||
if (!clientCanBeInvoiced)
|
if (!clientCanBeInvoiced)
|
||||||
throw new UserError(`This client can't be invoiced`);
|
throw new UserError(`This client can't be invoiced`);
|
||||||
|
|
||||||
let ticketCanBeInvoiced = await $.Ticket.canBeInvoiced(ticket.id);
|
let ticketCanBeInvoiced = await models.Ticket.canBeInvoiced(ticket.id);
|
||||||
if (!ticketCanBeInvoiced)
|
if (!ticketCanBeInvoiced)
|
||||||
throw new UserError(`This ticket can't be invoiced`);
|
throw new UserError(`This ticket can't be invoiced`);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue