diff --git a/src/model/mail.rs b/src/model/mail.rs index 0e405dd..791f65b 100644 --- a/src/model/mail.rs +++ b/src/model/mail.rs @@ -1,9 +1,9 @@ use std::{error::Error, fs}; use lettre::{ - Address, Message, SmtpTransport, Transport, - message::{Attachment, MultiPart, SinglePart, header::ContentType}, + message::{header::ContentType, Attachment, MultiPart, SinglePart}, transport::smtp::authentication::Credentials, + Address, Message, SmtpTransport, Transport, }; use sqlx::{Sqlite, SqlitePool, Transaction}; @@ -162,7 +162,7 @@ impl Mail { } } - if user.has_role(db, "schnupperant").await { + if user.has_role(db, "schnupperant").await || user.has_role(db, "scheckbuch").await { continue; } @@ -279,7 +279,7 @@ Der Vorstand"); } } - if user.has_role(db, "schnupperant").await { + if user.has_role(db, "schnupperant").await || user.has_role(db, "scheckbuch").await { continue; } diff --git a/src/model/user/fee.rs b/src/model/user/fee.rs index 192cad0..a1d07e4 100644 --- a/src/model/user/fee.rs +++ b/src/model/user/fee.rs @@ -1,8 +1,8 @@ use super::User; use crate::{ - BOAT_STORAGE, DUAL_MEMBERSHIP, EINSCHREIBGEBUEHR, FAMILY_THREE_OR_MORE, FAMILY_TWO, FOERDERND, - REGULAR, RENNRUDERBEITRAG, STUDENT_OR_PUPIL, TRIAL_ROWING, TRIAL_ROWING_REDUCED, - UNTERSTUETZEND, model::family::Family, + model::family::Family, BOAT_STORAGE, DUAL_MEMBERSHIP, EINSCHREIBGEBUEHR, FAMILY_THREE_OR_MORE, + FAMILY_TWO, FOERDERND, REGULAR, RENNRUDERBEITRAG, SCHECKBUCH, STUDENT_OR_PUPIL, TRIAL_ROWING, + TRIAL_ROWING_REDUCED, UNTERSTUETZEND, }; use chrono::{Datelike, Local, NaiveDate}; use serde::Serialize; @@ -70,6 +70,7 @@ impl User { && !self.has_role(db, "Unterstützend").await && !self.has_role(db, "Förderndes Mitglied").await && !self.has_role(db, "schnupperant").await + && !self.has_role(db, "scheckbuch").await { return None; } @@ -110,6 +111,7 @@ impl User { && !self.has_role(db, "Unterstützend").await && !self.has_role(db, "Förderndes Mitglied").await && !self.has_role(db, "schnupperant").await + && !self.has_role(db, "scheckbuch").await { return fee; } @@ -162,6 +164,8 @@ impl User { } else { fee.add("Schnupperkurs".into(), TRIAL_ROWING); } + } else if self.has_role(db, "scheckbuch").await { + fee.add("Scheckbuch".into(), SCHECKBUCH); } else if self.has_role(db, "Unterstützend").await { fee.add("Unterstützendes Mitglied".into(), UNTERSTUETZEND); } else if self.has_role(db, "Förderndes Mitglied").await {