From 2243481fe0deeb90082eef38907e2dc0f3dd62a8 Mon Sep 17 00:00:00 2001 From: Daniel Illi Date: Mon, 2 May 2022 09:31:33 +0200 Subject: [PATCH] Change email from address to no-reply@puzzle.ch, schedule CommitReminderJob, refs #55511 --- app/mailers/employee_mailer.rb | 3 +-- config/application.rb | 1 + config/settings.yml | 5 +---- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/app/mailers/employee_mailer.rb b/app/mailers/employee_mailer.rb index dbf7d974..139db27f 100644 --- a/app/mailers/employee_mailer.rb +++ b/app/mailers/employee_mailer.rb @@ -3,8 +3,7 @@ def worktime_deleted_mail(worktime, deleted_by) @worktime = worktime @deleted_by = deleted_by - mail(from: Settings.mailer.employee.worktime_deleted.from, - to: worktime.employee.email, + mail(to: worktime.employee.email, subject: 'PuzzleTime-Eintrag wurde gelöscht') end diff --git a/config/application.rb b/config/application.rb index 3a2427cc..8c4dfc58 100644 --- a/config/application.rb +++ b/config/application.rb @@ -77,6 +77,7 @@ class Application < Rails::Application Crm.init Invoicing.init BI.init + CommitReminderJob.schedule end end diff --git a/config/settings.yml b/config/settings.yml index 2eaae0f9..26f636d8 100644 --- a/config/settings.yml +++ b/config/settings.yml @@ -173,10 +173,7 @@ reports: lower_limit: 0 mailer: - from: <%= ENV['RAILS_PTIME_MAILER_FROM'] || 'time@puzzle.ch' %> - employee: - worktime_deleted: - from: <%= ENV['RAILS_PTIME_MAILER_EMPLOYEE_WORKTIME_DELETED_FROM'] || 'time@puzzle.ch' %> + from: <%= ENV['RAILS_PTIME_MAILER_FROM'] || 'no-reply@puzzle.ch' %> influxdb: export: <%= ENV['RAILS_INFLUXDB_EXPORT'] == '1' %>