Alex/GoMembership
1
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases Wiki Activity

fix:admin Notification mail sending;typo in template

Browse Source
This commit is contained in:
$(pass /github/name)
2024-07-12 13:35:35 +02:00
parent 5035dd7489
commit d8115f512d
3 changed files with 8 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
internal/controllers/user_controller.go
View File

@@ -107,14 +107,7 @@ func (uc *UserController) VerifyMailHandler(c *gin.Context) {
return
}
membership, err := uc.MembershipService.FindMembershipByUserID(user.ID)
if err != nil {
logger.Error.Printf("Cannot get membership of user %v: %v", user.ID, err)
c.HTML(http.StatusInternalServerError, "verifiction_error.html", gin.H{"ErrorMessage": "Nutzer konnte nicht gefunden werden.. Merkwürdig.. wende Dich bitte an info@carsharing-hasloh.de."})
return
}
uc.EmailService.SendWelcomeEmail(user, membership)
uc.EmailService.SendWelcomeEmail(user)
c.HTML(http.StatusOK, "verification_success.html", gin.H{"FirstName": user.FirstName})
}

12
internal/services/email_service.go
View File

@@ -76,7 +76,7 @@ func (s *EmailService) SendVerificationEmail(user *models.User, token *string) e
}
func (s *EmailService) SendWelcomeEmail(user *models.User, membership *models.Membership) error {
func (s *EmailService) SendWelcomeEmail(user *models.User) error {
// Prepare data to be injected into the template
data := struct {
FirstName string
@@ -86,10 +86,10 @@ func (s *EmailService) SendWelcomeEmail(user *models.User, membership *models.Me
RentalFee float32
}{
FirstName: user.FirstName,
MembershipModel: membership.SubscriptionModel.Name,
MembershipID: membership.ID,
MembershipFee: float32(membership.SubscriptionModel.MonthlyFee),
RentalFee: float32(membership.SubscriptionModel.HourlyRate),
MembershipModel: user.Membership.SubscriptionModel.Name,
MembershipID: user.Membership.ID,
MembershipFee: float32(user.Membership.SubscriptionModel.MonthlyFee),
RentalFee: float32(user.Membership.SubscriptionModel.HourlyRate),
}
subject := "Willkommen beim Dörpsmobil Hasloh e.V."
@@ -139,5 +139,5 @@ func (s *EmailService) NotifyAdminOfNewUser(user *models.User) error {
logger.Error.Print("Couldn't send admin notification mail")
return err
}
return s.SendEmail(user.Email, subject, body)
return s.SendEmail(config.LoadConfig().SMTP.AdminEmail, subject, body)
}

2
templates/email/mail_registration.html
View File

@@ -77,7 +77,7 @@
</ul>
</li>
<li><strong>Name:</strong> {{.FirstName}} {{.LastName}}</li>
<li><strong>Mitgliedsname:</strong> {{.MembershipID}}</li>
<li><strong>Mitgliedsnr:</strong> {{.MembershipID}}</li>
<li>
<strong>Adresse:</strong> {{.Address}},{{.ZipCode}}
{{.City}}