Ruderverein-Donau-Linz/rowt
1
1
Fork 1
Code Issues 25 Pull Requests Actions Packages Projects Wiki Activity

fix-no-group #824

Merged
philipp merged 4 commits from fix-no-group into staging 2025-01-01 17:46:08 +01:00
Conversation 0 Commits 4 Files Changed 1 +9 -3
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/model/user.rs
View File

@ -342,7 +342,10 @@ ASKÖ Ruderverein Donau Linz", self.name),
} }
pub async fn fee(&self, db: &SqlitePool) -> Option<Fee> { 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; return None;
} }
if self.deleted { if self.deleted {
@ -378,13 +381,16 @@ ASKÖ Ruderverein Donau Linz", self.name),
async fn fee_without_families(&self, db: &SqlitePool) -> Fee { async fn fee_without_families(&self, db: &SqlitePool) -> Fee {
let mut fee = Fee::new(); 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; return fee;
} }
if self.has_role(db, "Rennrudern").await { if self.has_role(db, "Rennrudern").await {
if self.has_role(db, "half-rennrudern").await { if self.has_role(db, "half-rennrudern").await {
fee.add("Rennruderbeitrag (1/2 Preis) ".into(), RENNRUDERBEITRAG / 2); fee.add("Rennruderbeitrag (1/2 Preis) ".into(), RENNRUDERBEITRAG / 2);
} else { } else if !self.has_role(db, "renntrainer").await {
fee.add("Rennruderbeitrag".into(), RENNRUDERBEITRAG); fee.add("Rennruderbeitrag".into(), RENNRUDERBEITRAG);
} }
} }