philipp/hacky-ruadat
1
0
Fork 0
forked from Ruderverein-Donau-Linz/rowt
Code Pull Requests 1 Actions Activity

main #1

Open
philipp wants to merge 71 commits from Ruderverein-Donau-Linz/rowt:main into main
pull from: Ruderverein-Donau-Linz/rowt:main
merge into: philipp:main
Conversation 0 Commits 71 Files Changed 33 +8 -2
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit e61b16c389 - Show all commits

10
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> {
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 {