staging #260

Merged
philipp merged 5 commits from staging into main 2024-03-09 18:17:16 +01:00
Showing only changes of commit a61f7cebbb - Show all commits

View File

@ -212,6 +212,8 @@ impl User {
} else if Family::find_by_opt_id(db, self.family_id).await.is_none() { } else if Family::find_by_opt_id(db, self.family_id).await.is_none() {
if self.has_role(db, "Student").await || self.has_role(db, "Schüler").await { if self.has_role(db, "Student").await || self.has_role(db, "Schüler").await {
fee.add("Schüler/Student".into(), STUDENT_OR_PUPIL); fee.add("Schüler/Student".into(), STUDENT_OR_PUPIL);
} else if self.has_role(db, "Ehrenmitglied").await {
fee.add("Ehrenmitglied".into(), 0);
} else { } else {
fee.add("Mitgliedsbeitrag".into(), REGULAR); fee.add("Mitgliedsbeitrag".into(), REGULAR);
} }