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

Merge pull request 'fix no 'donau linz' group' (#825) from fix-no-group into main #826

Merged
philipp merged 2 commits from show-boatreservations-in-planned into staging 2025-01-01 19:30:04 +01:00
Conversation 0 Commits 2 Files Changed 3 +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 d7187a7589 - 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 {