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

Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head There was a failure building this commit Details

This commit is contained in:
Joan Sanchez 2022-02-02 09:07:03 +01:00
parent d6ba1247d4 8be7f9153e
commit 4de2220b5c
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/ticket/back/methods/ticket/componentUpdate.js
View File

@ -138,7 +138,9 @@ module.exports = Self => {
const params = [args.id, args.shipped, args.warehouseFk];
const [salesMovable] = await Self.rawSql(query, params, myOptions);
const salesNewTicket = salesMovable.filter(sale => (sale.movable ?? 0) >= sale.quantity);
const saleMovable = sale.movable ? sale.movable : 0;
const salesNewTicket = salesMovable.filter(sale => saleMovable >= sale.quantity);
if (salesNewTicket.length) {
const newTicket = await models.Ticket.transferSales(ctx, args.id, null, salesNewTicket, myOptions);
args.id = newTicket.id;
@ -250,7 +252,7 @@ module.exports = Self => {
res.id = args.id;
if (tx) await tx.commit();
return res;
} catch (e) {
if (tx) await tx.rollback();

10
modules/ticket/back/methods/ticket/priceDifference.js
View File

@ -114,7 +114,7 @@ module.exports = Self => {
const ticketOrigin = await models.Ticket.findById(args.id, null, myOptions);
const differenceShipped = ticketOrigin.shipped.getTime() != args.shipped.getTime();
const differenceWarehouse = ticketOrigin.warehouseFk != args.warehouseId;
salesObj.haveDifferences = differenceShipped || differenceWarehouse;
let query = `CALL ticket_getMovable(?,?,?)`;
@ -122,8 +122,10 @@ module.exports = Self => {
const [salesMovable] = await Self.rawSql(query, params, myOptions);
const itemMovable = new Map();
for (sale of salesMovable)
itemMovable.set(sale.id, sale.movable ?? 0);
for (sale of salesMovable) {
const saleMovable = sale.movable ? sale.movable : 0;
itemMovable.set(sale.id, saleMovable);
}
// Sale price component, one per sale
query = `CALL vn.ticket_priceDifference(?, ?, ?, ?, ?)`;
@ -152,7 +154,7 @@ module.exports = Self => {
}
if (tx) await tx.commit();
return salesObj;
} catch (e) {
if (tx) await tx.rollback();