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

perf(salix): refs #7677 #7677 restore files

This commit is contained in:
Javier Segarra 2024-09-17 11:43:28 +02:00
parent 3e5442c40b
commit 2e32dfddc4
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
db/dump/fixtures.after.sql
View File

@ -255,7 +255,7 @@ INSERT INTO vn.operator (workerFk, numberOfWagons, trainFk, itemPackingTypeFk, w
(9, 1, 1, 'V', 1); (9, 1, 1, 'V', 1);
*/ */
-- XXX: web -- XXX: web
/* #5483
INSERT INTO `hedera`.`config` (`cookieLife`, `defaultForm`) INSERT INTO `hedera`.`config` (`cookieLife`, `defaultForm`)
VALUES (15,'cms/home'); VALUES (15,'cms/home');
@ -274,7 +274,7 @@ UPDATE `vn`.`agencyMode` SET `description` = `name`;
INSERT INTO `hedera`.`tpvConfig` (currency, terminal, transactionType, maxAmount, employeeFk, `url`, testMode, testUrl, testKey, merchantUrl) INSERT INTO `hedera`.`tpvConfig` (currency, terminal, transactionType, maxAmount, employeeFk, `url`, testMode, testUrl, testKey, merchantUrl)
VALUES (978, 1, 0, 2000, 9, 'https://sis.redsys.es/sis/realizarPago', 0, 'https://sis-t.redsys.es:25443/sis/realizarPago', 'sq7HjrUOBfKmC576ILgskD5srU870gJ7', NULL); VALUES (978, 1, 0, 2000, 9, 'https://sis.redsys.es/sis/realizarPago', 0, 'https://sis-t.redsys.es:25443/sis/realizarPago', 'sq7HjrUOBfKmC576ILgskD5srU870gJ7', NULL);
*/
INSERT INTO hedera.tpvMerchantEnable (merchantFk, companyFk) INSERT INTO hedera.tpvMerchantEnable (merchantFk, companyFk)
VALUES (1, 442); VALUES (1, 442);

6
db/routines/vn/procedures/client_userDisable.sql
View File

@ -20,15 +20,15 @@ BEGIN
WHERE c.typeFk = 'normal' WHERE c.typeFk = 'normal'
AND a.id IS NULL AND a.id IS NULL
AND u.active AND u.active
AND c.created < util.VN_CURDATE() - INTERVAL vMonths MONTH AND c.created < util.VN_CURDATE() - INTERVAL vMonths MONTH
AND NOT u.role = (SELECT id FROM `role` WHERE name = 'supplier') AND NOT u.role = (SELECT id FROM `role` WHERE name = 'supplier')
AND u.id NOT IN ( AND u.id NOT IN (
SELECT DISTINCT c.id SELECT DISTINCT c.id
FROM client c FROM client c
LEFT JOIN ticket t ON t.clientFk = c.id LEFT JOIN ticket t ON t.clientFk = c.id
WHERE c.salesPersonFk IS NOT NULL WHERE c.salesPersonFk IS NOT NULL
OR t.created > util.VN_CURDATE() - INTERVAL vMonths MONTH OR t.created > util.VN_CURDATE() - INTERVAL vMonths MONTH
OR shipped > util.VN_CURDATE() - INTERVAL vMonths MONTH OR shipped > util.VN_CURDATE() - INTERVAL vMonths MONTH
); );
END$$ END$$
DELIMITER ; DELIMITER ;

2
loopback/locale/es.json
View File

@ -378,4 +378,4 @@
"There is already a tray with the same height": "Ya existe una bandeja con la misma altura", "There is already a tray with the same height": "Ya existe una bandeja con la misma altura",
"The height must be greater than 50cm": "La altura debe ser superior a 50cm", "The height must be greater than 50cm": "La altura debe ser superior a 50cm",
"The maximum height of the wagon is 200cm": "La altura máxima es 200cm" "The maximum height of the wagon is 200cm": "La altura máxima es 200cm"
} }