Merge pull request 'fix: refs #235425 sale priceFixed update' (!3146) from hotfix235425-updatePrice into master
gitea/salix/pipeline/head This commit looks good
Details
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #3146 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
This commit is contained in:
commit
a707f9cbff
|
@ -85,6 +85,25 @@ describe('sale updatePrice()', () => {
|
|||
}
|
||||
});
|
||||
|
||||
it('should check if priceFixed has changed', async() => {
|
||||
const tx = await models.Sale.beginTransaction({});
|
||||
|
||||
try {
|
||||
const options = {transaction: tx};
|
||||
|
||||
const price = 3;
|
||||
const beforeUpdate = await models.Sale.findById(saleId, null, options);
|
||||
await models.Sale.updatePrice(ctx, saleId, price, options);
|
||||
const afterUpdate = await models.Sale.findById(saleId, null, options);
|
||||
|
||||
expect(beforeUpdate.priceFixed).not.toEqual(afterUpdate.priceFixed);
|
||||
await tx.rollback();
|
||||
} catch (e) {
|
||||
await tx.rollback();
|
||||
throw e;
|
||||
}
|
||||
});
|
||||
|
||||
it('should set price as a decimal number and check the sale has the mana component changing the salesPersonMana', async() => {
|
||||
const tx = await models.Sale.beginTransaction({});
|
||||
|
||||
|
|
|
@ -91,7 +91,21 @@ module.exports = Self => {
|
|||
value: componentValue
|
||||
}, myOptions);
|
||||
}
|
||||
await sale.updateAttributes({price: newPrice}, myOptions);
|
||||
|
||||
const [priceFixed] = await Self.rawSql(`
|
||||
SELECT SUM(value) value
|
||||
FROM sale s
|
||||
JOIN saleComponent sc ON sc.saleFk = s.id
|
||||
JOIN component c ON c.id = sc.componentFk
|
||||
JOIN componentType ct ON ct.id = c.typeFk
|
||||
WHERE ct.isBase
|
||||
AND s.id = ?
|
||||
`, [id], myOptions);
|
||||
|
||||
await sale.updateAttributes({
|
||||
price: newPrice,
|
||||
priceFixed: priceFixed.value
|
||||
}, myOptions);
|
||||
|
||||
await Self.rawSql('CALL vn.manaSpellersRequery(?)', [userId], myOptions);
|
||||
await Self.rawSql('CALL vn.ticket_recalc(?, NULL)', [sale.ticketFk], myOptions);
|
||||
|
|
|
@ -28,6 +28,9 @@
|
|||
"discount": {
|
||||
"type": "number"
|
||||
},
|
||||
"priceFixed": {
|
||||
"type": "number"
|
||||
},
|
||||
"reserved": {
|
||||
"type": "boolean"
|
||||
},
|
||||
|
|
Loading…
Reference in New Issue