Merge pull request 'fix no 'donau linz' group' (#825) from fix-no-group into main
All checks were successful
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / test (push) Successful in 13m38s
CI/CD Pipeline / deploy-main (push) Successful in 20m5s

Reviewed-on: #825
This commit is contained in:
philipp 2025-01-01 17:46:26 +01:00
commit d7187a7589

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 {