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

Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details

This commit is contained in:
Alex Moreno 2025-03-04 12:05:07 +01:00
parent fc9344d486 ff977de929
commit 8bc54d0d64
7 changed files with 28 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
db/routines/vn/procedures/item_getBalance.sql
View File

@ -1,5 +1,4 @@
DELIMITER $$ DELIMITER $$
$$
CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`item_getBalance`( CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`item_getBalance`(
vItemFk INT, vItemFk INT,
vWarehouseFk INT, vWarehouseFk INT,

2
db/routines/vn/procedures/item_getStock.sql
View File

@ -1,5 +1,4 @@
DELIMITER $$ DELIMITER $$
$$
CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`item_getStock`( CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`item_getStock`(
vWarehouseFk SMALLINT, vWarehouseFk SMALLINT,
vAvailabled DATETIME, vAvailabled DATETIME,
@ -55,6 +54,5 @@ BEGIN
) sub ) sub
GROUP BY itemFk GROUP BY itemFk
HAVING stock; HAVING stock;
END$$ END$$
DELIMITER ; DELIMITER ;

4
db/routines/vn/triggers/ticket_beforeInsert.sql
View File

@ -7,10 +7,10 @@ BEGIN
SET NEW.editorFk = account.myUser_getId(); SET NEW.editorFk = account.myUser_getId();
SELECT TIME(hour) INTO vTime /* SELECT TIME(hour) INTO vTime
FROM zone FROM zone
WHERE id = NEW.zoneFk; WHERE id = NEW.zoneFk;
/* IF vTime IS NOT NULL THEN IF vTime IS NOT NULL THEN
SET NEW.shipped = ADDTIME(DATE(NEW.shipped), vTime); SET NEW.shipped = ADDTIME(DATE(NEW.shipped), vTime);
END IF; */ END IF; */
END$$ END$$

7
modules/monitor/back/methods/sales-monitor/salesFilter.js
View File

@ -262,10 +262,7 @@ module.exports = Self => {
(INDEX (ticketFk)) (INDEX (ticketFk))
ENGINE = MEMORY ENGINE = MEMORY
SELECT f.id ticketFk SELECT f.id ticketFk
FROM tmp.filter f FROM tmp.filter f`);
LEFT JOIN alertLevel al ON al.id = f.alertLevel
WHERE (al.code = 'FREE' OR f.alertLevel IS NULL)
AND f.shipped >= ?`, [date]);
stmts.push(stmt); stmts.push(stmt);
stmts.push('CALL ticket_getProblems(FALSE)'); stmts.push('CALL ticket_getProblems(FALSE)');
@ -288,7 +285,7 @@ module.exports = Self => {
stmts.push(stmt); stmts.push(stmt);
stmt = new ParameterizedSQL(` stmt = new ParameterizedSQL(`
SELECT * SELECT f.*, tp.*
FROM tmp.filter f FROM tmp.filter f
LEFT JOIN tmp.ticketProblems tp ON tp.ticketFk = f.id LEFT JOIN tmp.ticketProblems tp ON tp.ticketFk = f.id
LEFT JOIN tmp.ticket_warnings tw ON tw.ticketFk = f.id LEFT JOIN tmp.ticket_warnings tw ON tw.ticketFk = f.id

6
modules/monitor/back/methods/sales-monitor/specs/salesFilter.spec.js
View File

@ -68,7 +68,7 @@ describe('SalesMonitor salesFilter()', () => {
const filter = {}; const filter = {};
const result = await models.SalesMonitor.salesFilter(ctx, filter, options); const result = await models.SalesMonitor.salesFilter(ctx, filter, options);
expect(result.length).toEqual(5); expect(result.length).toEqual(8);
await tx.rollback(); await tx.rollback();
} catch (e) { } catch (e) {
@ -254,8 +254,8 @@ describe('SalesMonitor salesFilter()', () => {
const firstTicket = result.shift(); const firstTicket = result.shift();
const secondTicket = result.shift(); const secondTicket = result.shift();
expect(firstTicket.totalProblems).toEqual(null); expect(firstTicket.totalProblems).toEqual(0);
expect(secondTicket.totalProblems).toEqual(null); expect(secondTicket.totalProblems).toEqual(0);
await tx.rollback(); await tx.rollback();
} catch (e) { } catch (e) {