Merge pull request 'fix-no-group' (#824 ) from fix-no-group into staging

Reviewed-on: #824
fix no 'donau linz' group
2025-01-01 17:45:52 +01:00 · 2025-01-01 17:44:48 +01:00 · 2024-12-19 21:16:31 +01:00 · 2024-12-17 08:57:29 +01:00
1 changed files with 8 additions and 2 deletions
--- a/src/model/user.rs
+++ b/src/model/user.rs
@@ -342,7 +342,10 @@ ASKÖ Ruderverein Donau Linz", self.name),
    }

    pub async fn fee(&self, db: &SqlitePool) -> Option<Fee> {
-        if !self.has_role(db, "Donau Linz").await {
+        if !self.has_role(db, "Donau Linz").await
+            && !self.has_role(db, "Unterstützend").await
+            && !self.has_role(db, "Förderndes Mitglied").await
+        {
            return None;
        }
        if self.deleted {
@@ -378,7 +381,10 @@ ASKÖ Ruderverein Donau Linz", self.name),
    async fn fee_without_families(&self, db: &SqlitePool) -> Fee {
        let mut fee = Fee::new();

-        if !self.has_role(db, "Donau Linz").await {
+        if !self.has_role(db, "Donau Linz").await
+            && !self.has_role(db, "Unterstützend").await
+            && !self.has_role(db, "Förderndes Mitglied").await
+        {
            return fee;
        }
        if self.has_role(db, "Rennrudern").await {
Author	SHA1	Message	Date
philipp	e61b16c389	Merge pull request 'fix-no-group' (#824 ) from fix-no-group into staging All checks were successful CI/CD Pipeline / test (push) Successful in 13m16s Details CI/CD Pipeline / deploy-staging (push) Successful in 20m18s Details CI/CD Pipeline / deploy-main (push) Has been skipped Details Reviewed-on: #824	2025-01-01 17:45:52 +01:00
Philipp Hofer	2ac8a3155c	fix no 'donau linz' group All checks were successful CI/CD Pipeline / test (push) Successful in 29m54s Details CI/CD Pipeline / deploy-staging (push) Has been skipped Details CI/CD Pipeline / deploy-main (push) Has been skipped Details	2025-01-01 17:44:48 +01:00
philipp	f38ca09eb7	Merge pull request 'allow lazy people to mark all notifcations as read' (#823 ) from mark-all-notifications-read into main All checks were successful CI/CD Pipeline / test (push) Successful in 13m3s Details CI/CD Pipeline / deploy-staging (push) Has been skipped Details CI/CD Pipeline / deploy-main (push) Successful in 6m48s Details Reviewed-on: #823	2024-12-19 21:16:31 +01:00
philipp	0f8e1158b9	Merge pull request 'add renntrainer role' (#821 ) from add-renntrainer into main All checks were successful CI/CD Pipeline / test (push) Successful in 31m0s Details CI/CD Pipeline / deploy-staging (push) Has been skipped Details CI/CD Pipeline / deploy-main (push) Successful in 19m41s Details Reviewed-on: #821	2024-12-17 08:57:29 +01:00