verdnatura/salix
verdnatura
/
salix
3
5
Fork 2
Code Issues Pull Requests 71 Releases Wiki Activity

3372-ticket_sale multi-check for recalculatePrice #811

Merged
carlosjr merged 7 commits from 3372-ticket_sale into dev 2021-12-01 12:55:56 +00:00
Conversation 1 Commits 7 Files Changed 9 +29 -4
3 changed files with 29 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit decd4b5a95 - Show all commits

6
db/changes/10390-constitution/00-sale_calculateComponent2.sql → db/changes/10390-constitution/00-sale_recalcComponent.sql
View File

@ -1,8 +1,8 @@
DROP PROCEDURE IF EXISTS `vn`.`sale_calculateComponentSalix`; DROP PROCEDURE IF EXISTS `vn`.`sale_recalcComponent`;
DELIMITER $$ DELIMITER $$
$$ $$
CREATE DEFINER=`root`@`%` PROCEDURE `vn`.`sale_calculateComponentSalix`() CREATE DEFINER=`root`@`%` PROCEDURE `vn`.`sale_recalcComponent`(vOption INT)
proc: BEGIN proc: BEGIN
/** /**
* Actualiza los componentes * Actualiza los componentes
@ -103,7 +103,9 @@ proc: BEGIN
(PRIMARY KEY (saleFk)) ENGINE = MEMORY (PRIMARY KEY (saleFk)) ENGINE = MEMORY
SELECT vSale saleFk,vWarehouseFk warehouseFk; SELECT vSale saleFk,vWarehouseFk warehouseFk;
IF vOption IS NULL THEN
SET vOption = IF(vIsEditable, 1, 6); SET vOption = IF(vIsEditable, 1, 6);
END IF;
CALL ticketComponentUpdateSale(vOption); CALL ticketComponentUpdateSale(vOption);
CALL catalog_componentPurge(); CALL catalog_componentPurge();

23
db/changes/10390-constitution/01-sale_calculateComponent.sql Normal file
View File

@ -0,0 +1,23 @@
DROP PROCEDURE IF EXISTS `vn`.`sale_calculateComponent`;
DELIMITER $$
$$
CREATE DEFINER=`root`@`%` PROCEDURE `vn`.`sale_calculateComponent`(vSale INT, vOption INT)
proc: BEGIN
/**
* Crea tabla temporal para vn.sale_recalcComponent() para recalcular los componentes
*
* @param vSale Id de la venta
* @param vOption indica en que componente pone el descuadre, NULL en casos habituales
*/
DROP TEMPORARY TABLE IF EXISTS tmp.recalculateSales;
CREATE TEMPORARY TABLE tmp.recalculateSales
SELECT s.id
FROM sale s
WHERE s.id = vSale;
CALL vn.sale_recalcComponent(vOption);
DROP TEMPORARY TABLE tmp.recalculateSales;
END$$
DELIMITER ;

2
modules/ticket/back/methods/sale/recalculatePrice.js
View File

@ -57,7 +57,7 @@ module.exports = Self => {
SELECT s.id SELECT s.id
FROM sale s FROM sale s
WHERE s.id IN (${paramsString}); WHERE s.id IN (${paramsString});
CALL vn.sale_calculateComponentSalix(); CALL vn.sale_recalcComponent(null);
DROP TEMPORARY TABLE tmp.recalculateSales;`; DROP TEMPORARY TABLE tmp.recalculateSales;`;
const recalculation = await Self.rawSql(query, salesIds, myOptions); const recalculation = await Self.rawSql(query, salesIds, myOptions);