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

feat: refs #8190 entry_getCommission #3207

Open
robert wants to merge 4 commits from 8190-entry_getCommission into dev
pull from: 8190-entry_getCommission
merge into: verdnatura:dev
Conversation 0 Commits 4 Files Changed 1 +36 -31
1 changed files with 36 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 69314171ea - Show all commits

41
db/routines/vn/functions/entry_getCommission.sql
View File

@ -7,31 +7,36 @@ CREATE OR REPLACE DEFINER=`vn`@`localhost` FUNCTION `vn`.`entry_getCommission`(v
NOT DETERMINISTIC
READS SQL DATA
BEGIN
DECLARE vCommission INT;
DECLARE vCurrentCommission INT;
DECLARE vIsCurrencyUsd INT;
DECLARE vLastEntryFk INT;
DECLARE vCommission INT;
DECLARE vCurrentCommission INT;
DECLARE vIsCurrencyUsd INT;
DECLARE vLastEntryFk INT;
DECLARE vTravelFkLanded INT;
jgallego commented 2024-11-26 14:52:12 +00:00
Review
Copy Link

vLanded

vLanded
SELECT count(*) INTO vIsCurrencyUsd
FROM currency c
WHERE c.code = 'USD' AND id = vCurrencyFk;
SELECT count(*) INTO vIsCurrencyUsd
FROM currency c
WHERE c.code = 'USD' AND id = vCurrencyFk;
IF NOT vIsCurrencyUsd THEN
IF NOT vIsCurrencyUsd THEN
SELECT landed INTO vTravelFkLanded
FROM travel
WHERE id = vTravelFk;
SELECT e.id INTO vLastEntryFk
FROM vn.entry e
JOIN vn.travel tr ON tr.id = e.travelFk
WHERE e.supplierFk = vSupplierFk
ORDER BY tr.landed DESC
LIMIT 1;
FROM entry e
JOIN travel tr ON tr.id = e.travelFk
WHERE tr.landed < vTravelFkLanded
AND e.supplierFk = vSupplierFk
ORDER BY (vTravelFkLanded - tr.landed) ASC, tr.landed DESC
LIMIT 1;
IF vLastEntryFk THEN
IF vLastEntryFk THEN
SELECT commission INTO vCurrentCommission
FROM vn.entry
WHERE id = vLastEntryFk;
WHERE id = vLastEntryFk;
jgallego commented 2024-11-26 14:52:40 +00:00
Review
Copy Link

per defecte ja es ASC

per defecte ja es ASC
ELSE
ELSE
SELECT commission INTO vCurrentCommission
FROM supplier s
@ -39,9 +44,9 @@ BEGIN
END IF;
RETURN vCurrentCommission;
RETURN vCurrentCommission;
ELSE
ELSE
SELECT ROUND(-100 * (1 - (1 / r.value))) INTO vCommission
FROM travel t