winzer/elwig
2
1
Fork 0
Code Issues 8 Pull Requests Actions Releases 46 Activity

[#46] Billing: Only adjust business shares for active members

Browse Source
This commit is contained in:
Lorenz Stechauner
2024-06-17 10:51:48 +02:00
parent 87467bbe75
commit 66eb177fbf
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Elwig/Helpers/Billing/Billing.cs
View File

@ -41,7 +41,7 @@ namespace Elwig.Helpers.Billing {
UPDATE member UPDATE member
SET business_shares = member.business_shares - h.business_shares SET business_shares = member.business_shares - h.business_shares
FROM member_history h FROM member_history h
WHERE h.date = '{Year}-11-30' AND h.type = 'auto' AND h.mgnr = member.mgnr; WHERE h.date = '{Year}-11-30' AND h.type = 'auto' AND h.mgnr = member.mgnr AND member.active;
INSERT INTO member_history (mgnr, date, type, business_shares) INSERT INTO member_history (mgnr, date, type, business_shares)
SELECT u.mgnr, SELECT u.mgnr,
@ -52,7 +52,8 @@ namespace Elwig.Helpers.Billing {
- {allowanceRel.ToString(CultureInfo.InvariantCulture)} * u.business_shares) AS bs - {allowanceRel.ToString(CultureInfo.InvariantCulture)} * u.business_shares) AS bs
FROM v_total_under_delivery u FROM v_total_under_delivery u
JOIN season s ON s.year = u.year JOIN season s ON s.year = u.year
WHERE s.year = {Year} AND bs >= {addMinBs} JOIN member m ON m.mgnr = u.mgnr
WHERE s.year = {Year} AND bs >= {addMinBs} AND m.active
ON CONFLICT DO UPDATE ON CONFLICT DO UPDATE
SET business_shares = excluded.business_shares; SET business_shares = excluded.business_shares;
@ -69,7 +70,7 @@ namespace Elwig.Helpers.Billing {
UPDATE member UPDATE member
SET business_shares = member.business_shares - h.business_shares SET business_shares = member.business_shares - h.business_shares
FROM member_history h FROM member_history h
WHERE h.date = '{Year}-11-30' AND h.type = 'auto' AND h.mgnr = member.mgnr; WHERE h.date = '{Year}-11-30' AND h.type = 'auto' AND h.mgnr = member.mgnr AND member.active;
DELETE FROM member_history WHERE date = '{Year}-11-30' AND type = 'auto'; DELETE FROM member_history WHERE date = '{Year}-11-30' AND type = 'auto';
"""); """);