diff --git a/Elwig/Helpers/Billing/Billing.cs b/Elwig/Helpers/Billing/Billing.cs index 02d314d..1d32746 100644 --- a/Elwig/Helpers/Billing/Billing.cs +++ b/Elwig/Helpers/Billing/Billing.cs @@ -41,7 +41,7 @@ namespace Elwig.Helpers.Billing { UPDATE member SET business_shares = member.business_shares - h.business_shares 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) SELECT u.mgnr, @@ -52,7 +52,8 @@ namespace Elwig.Helpers.Billing { - {allowanceRel.ToString(CultureInfo.InvariantCulture)} * u.business_shares) AS bs FROM v_total_under_delivery u 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 SET business_shares = excluded.business_shares; @@ -69,7 +70,7 @@ namespace Elwig.Helpers.Billing { UPDATE member SET business_shares = member.business_shares - h.business_shares 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'; """);