Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Feature/new email templates #457

Merged
merged 26 commits into from
Nov 8, 2023
Merged

Feature/new email templates #457

Changes from 1 commit
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
39ea6ad
Localize couple mailers and add new simple html template
tsubik Aug 22, 2023
575c08d
do not send observation emails to inactive users
tsubik Aug 22, 2023
c885501
new observation mailer templates
tsubik Aug 23, 2023
aacdc05
fix mailer specs
tsubik Aug 23, 2023
145b84d
add banner to emails
tsubik Aug 24, 2023
8ce522a
add missing html templates for observation mailer, cleanup
tsubik Aug 24, 2023
24c8be8
install mjml in github test workflow
tsubik Aug 25, 2023
9fc762b
fix organization_name method
tsubik Sep 5, 2023
dc232cc
fix observation email sending
tsubik Oct 5, 2023
3aad732
update operator mailers
tsubik Oct 20, 2023
c2fccef
fix typo
tsubik Oct 23, 2023
84a00bb
update translation
tsubik Oct 23, 2023
6b2a4e3
better display for expiring/expired documents
tsubik Oct 25, 2023
5beaa2e
remove old expiring docs mail
tsubik Oct 25, 2023
20266ea
more changes to observation mailer, remove not needed mail, refactor
tsubik Nov 3, 2023
34065a9
fix observation mailer previews
tsubik Nov 3, 2023
fe6d932
latest text changes
tsubik Nov 7, 2023
879830a
move mailer previews to better place, first mailer preview spec
tsubik Nov 7, 2023
f05984f
actually better to smoke test all email previews
tsubik Nov 7, 2023
d4fb9de
fix specs
tsubik Nov 7, 2023
6ca2bdc
use translated type for observation in mailer
tsubik Nov 7, 2023
acafc5a
send emails with user's locale
tsubik Nov 7, 2023
bfb4c88
missing link in mail
tsubik Nov 7, 2023
2aa202a
make sure observation responsible_admins do not get duplicate emails
tsubik Nov 7, 2023
4f833f0
observations: start qc directly from the email
tsubik Nov 8, 2023
4b803e7
fix spec
tsubik Nov 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix organization_name method
  • Loading branch information
@tsubik
tsubik committed Nov 8, 2023
commit 9fc762b0f84cad2bcbf996a9fcbaaff64ca668eb
2 changes: 1 addition & 1 deletion app/models/user.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ def send_reset_password_instructions
end

def organization_name
return operator.name if operator.present? && user_permission&.user_role&.operator?
return operator.name if operator.present? && user_permission&.operator?
return observer.name if observer.present? && user_permission&.user_role&.starts_with?("ngo")
return country.name if country.present? && user_permission&.government?

Expand Down