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

change new code
gitea/salix/pipeline/head This commit looks good Details

This commit is contained in:
Alex Moreno 2022-04-20 14:40:29 +02:00
parent e00d63d7af
commit 8b68fcf088
5 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
db/changes/10440-fallas/00-manaCustomerUpdate.sql
View File

@ -40,7 +40,7 @@ BEGIN
INTO vFromDated INTO vFromDated
FROM bs.manaCustomer; FROM bs.manaCustomer;
WHILE timestampadd(DAY,30,vFromDated) < CURDATE() DO WHILE timestampadd(DAY,30,vFromDated) < vn.VN_CURDATE() DO
SELECT SELECT
timestampadd(DAY,30,vFromDated), timestampadd(DAY,30,vFromDated),

4
db/changes/10440-fallas/00-manaSpellersRequery.sql
View File

@ -11,7 +11,7 @@ BEGIN
*/ */
DECLARE vWorkerIsExcluded BOOLEAN; DECLARE vWorkerIsExcluded BOOLEAN;
DECLARE vFromDated DATE; DECLARE vFromDated DATE;
DECLARE vToDated DATE DEFAULT TIMESTAMPADD(DAY,1,CURDATE()); DECLARE vToDated DATE DEFAULT TIMESTAMPADD(DAY,1,vn.VN_CURDATE());
DECLARE vMana INT; DECLARE vMana INT;
DECLARE vAutoMana INT; DECLARE vAutoMana INT;
DECLARE vClaimMana INT; DECLARE vClaimMana INT;
@ -63,7 +63,7 @@ BEGIN
FROM greuge g FROM greuge g
JOIN client c ON c.id = g.clientFk JOIN client c ON c.id = g.clientFk
WHERE c.salesPersonFk = vWorkerFk AND g.greugeTypeFk = vManaGreugeType WHERE c.salesPersonFk = vWorkerFk AND g.greugeTypeFk = vManaGreugeType
AND g.shipped > vFromDated and g.shipped < CURDATE() AND g.shipped > vFromDated and g.shipped < vn.VN_CURDATE()
UNION ALL UNION ALL
SELECT cc.mana SELECT cc.mana
FROM clientManaCache cc FROM clientManaCache cc

4
db/changes/10440-fallas/00-ticketRefund.sql
View File

@ -51,13 +51,13 @@ BEGIN
) )
SELECT SELECT
vCustomer, vCustomer,
CURDATE(), vn.VN_CURDATE(),
vAddress, vAddress,
vRefundAgencyMode, vRefundAgencyMode,
a.nickname, a.nickname,
vWarehouse, vWarehouse,
vCompany, vCompany,
CURDATE(), vn.VN_CURDATE(),
vZoneFk vZoneFk
FROM address a FROM address a
WHERE a.id = vAddress; WHERE a.id = vAddress;

4
db/changes/10451-april/00-ticket_doRefund.sql
View File

@ -58,13 +58,13 @@ BEGIN
) )
SELECT SELECT
vCustomer, vCustomer,
CURDATE(), vn.VN_CURDATE(),
vAddress, vAddress,
vRefundAgencyMode, vRefundAgencyMode,
a.nickname, a.nickname,
vWarehouse, vWarehouse,
vCompany, vCompany,
CURDATE(), vn.VN_CURDATE(),
vZoneFk vZoneFk
FROM address a FROM address a
WHERE a.id = vAddress; WHERE a.id = vAddress;

4
db/tests/vn/zone_getLanded.spec.js
View File

@ -14,7 +14,7 @@ describe('zone zone_getLanded()', () => {
warehouseFk: 1, warehouseFk: 1,
showExpiredZones: true}; showExpiredZones: true};
stmt = new ParameterizedSQL('CALL zone_getLanded(DATE_ADD(CURDATE(), INTERVAL -1 DAY), ?, ?, ?, ?)', [ stmt = new ParameterizedSQL('CALL zone_getLanded(DATE_ADD(vn.VN_CURDATE(), INTERVAL -1 DAY), ?, ?, ?, ?)', [
params.addressFk, params.addressFk,
params.agencyModeFk, params.agencyModeFk,
params.warehouseFk, params.warehouseFk,
@ -47,7 +47,7 @@ describe('zone zone_getLanded()', () => {
warehouseFk: 1, warehouseFk: 1,
showExpiredZones: false}; showExpiredZones: false};
stmt = new ParameterizedSQL('CALL zone_getLanded(DATE_ADD(CURDATE(), INTERVAL +2 DAY), ?, ?, ?, ?)', [ stmt = new ParameterizedSQL('CALL zone_getLanded(DATE_ADD(vn.VN_CURDATE(), INTERVAL +2 DAY), ?, ?, ?, ?)', [
params.addressFk, params.addressFk,
params.agencyModeFk, params.agencyModeFk,
params.warehouseFk, params.warehouseFk,