From 20bc21f87fffd0097c9cddea50194e82779f5bcf Mon Sep 17 00:00:00 2001 From: Benjamin ter Kuile Date: Fri, 2 Oct 2015 17:50:15 +0200 Subject: [PATCH] Add mockup new_supplier mail code --- app/controllers/new_suppliers_controller.rb | 1 + app/controllers/user_controller.rb | 2 +- app/mailers/notifier.rb | 11 +++++++++-- app/views/notifier/new_supplier.html.slim | 5 +++++ app/views/notifier/user_feedback.html.slim | 2 +- 5 files changed, 17 insertions(+), 4 deletions(-) create mode 100644 app/views/notifier/new_supplier.html.slim diff --git a/app/controllers/new_suppliers_controller.rb b/app/controllers/new_suppliers_controller.rb index 252f8cdd..3f2595d1 100644 --- a/app/controllers/new_suppliers_controller.rb +++ b/app/controllers/new_suppliers_controller.rb @@ -17,6 +17,7 @@ class NewSuppliersController < ApplicationController if @new_supplier.save sign_in @new_supplier.employee unless current_employee + Notifier.new_supplier(@new_supplier.supplier.try(:id), @new_supplier.employee.id).deliver_later session[:supplier_id] = @new_supplier.supplier.try(:id) redirect_to supplier_root_path(anchor: '/pages/introduction') else diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb index ee0cf638..680fa089 100644 --- a/app/controllers/user_controller.rb +++ b/app/controllers/user_controller.rb @@ -127,7 +127,7 @@ class UserController < Users::ApplicationController def feedback user_feedback = UserFeedback.create(user_id: current_user.id, content: params[:feedback].to_s) - Notifier.user_feedback(user_feedback).deliver_later + Notifier.user_feedback(user_feedback.id).deliver_later render json: {} end diff --git a/app/mailers/notifier.rb b/app/mailers/notifier.rb index b30b504a..48c29dbb 100644 --- a/app/mailers/notifier.rb +++ b/app/mailers/notifier.rb @@ -8,9 +8,16 @@ class Notifier < ActionMailer::Base mail to: "bterkuile+mozo-contact-form@gmail.com", subject: "[CONTACTFORM] new entry" end - def user_feedback(feedback) - @user_feedback = feedback + def user_feedback(feedback_id) + @user_feedback = UserFeedback.find(feedback_id) I18n.locale = :en mail to: "bterkuile+mozo-user-feedback@gmail.com", subject: "[MOZO][USER-FEEDBACK] New user feedback" end + + def new_supplier(supplier_id, employee_id) + return unless @supplier = Supplier.find(supplier_id) + @employee = Employee.find(employee_id) + @employee.enrich_with_settings @supplier.settings_for(@employee) + mail to: "bterkuile+mozo-new-supplier@gmail.com", subject: "[MOZO][NEW-SUPPLIER] New supplier registration" + end end diff --git a/app/views/notifier/new_supplier.html.slim b/app/views/notifier/new_supplier.html.slim new file mode 100644 index 00000000..bb1d1a71 --- /dev/null +++ b/app/views/notifier/new_supplier.html.slim @@ -0,0 +1,5 @@ +h3 New supplier +p There is a new supplier +pre= @supplier.as_json.to_yaml +p Created by employee +pre= @employee.as_json.to_yaml diff --git a/app/views/notifier/user_feedback.html.slim b/app/views/notifier/user_feedback.html.slim index ef172157..9c4f422a 100644 --- a/app/views/notifier/user_feedback.html.slim +++ b/app/views/notifier/user_feedback.html.slim @@ -1,5 +1,5 @@ h3 New feedback received: b User info -pre= @user_feedback.user.try(:attributes).try(:to_yaml) +pre= @user_feedback.user.try(:attributes).try(:as_json).try(:to_yaml) b Feedback info pre= @user_feedback.content