app/mailers/error_report_mailer.rb in softwear-lib-2.0.4 vs app/mailers/error_report_mailer.rb in softwear-lib-2.0.5

- old
+ new

@@ -1,39 +1,48 @@ class ErrorReportMailer < ActionMailer::Base default to: 'devteam@annarbortees.com' def send_report(user, params) - @order = Order.find_by(id: params[:order_id]) @user = user || User.find_by(id: params[:user_id]) + if ["Softwear CRM", "Softwear Production"].include?(app_name) + @order = Order.find_by(id: params[:order_id]) - if @user.nil? - from_customer = true + if @user.nil? + from_customer = true - if @order.nil? + if @order.nil? + @user = OpenStruct.new( + email: 'unknown-user@annarbortees.com', + full_name: 'Unknown Customer' + ) + else + @user = OpenStruct.new( + email: @order.email, + full_name: "(Customer) #{@order.full_name}" + ) + end + end + + if @user.nil? @user = OpenStruct.new( email: 'unknown-user@annarbortees.com', full_name: 'Unknown Customer' ) - else - @user = OpenStruct.new( - email: @order.email, - full_name: "(Customer) #{@order.full_name}" - ) end + + @error_class = params[:error_class] + @error_message = params[:error_message] + @backtrace = params[:backtrace] + @user_message = params[:user_message] + @additional_info = params[:additional_info] end - @error_class = params[:error_class] - @error_message = params[:error_message] - @backtrace = params[:backtrace] - @user_message = params[:user_message] - @additional_info = params[:additional_info] - mail( from: from_customer ? 'customer-report@softwearcrm.com' : @user.email, reply_to: @user.email, to: 'devteam@annarbortees.com', - subject: "Softwear CRM Error Report From #{@user.full_name}" + subject: "#{app_name} Error Report from #{@user.full_name}" ) end def auth_server_down(at) mail( @@ -48,6 +57,23 @@ from: 'noreply@softwearcrm.com', subject: 'Authentication server back up!', body: at.strftime("Just got a response at %I:%M%p") ) end + + private + + def app_name + case Rails.application.class.parent.to_s + when "CrmSoftwearcrmCom" then return "Softwear CRM" + when "RetailPublishing" then return "Softwear Mockbot" + when "SoftwearProduction" then return "Softwear Production" + when "SoftwearHub" then return "Softwear Hub" + when "AnnarborteesFba" then return "Softwear Fba" + when "AnnarborteesWww" then return "Ann Arbor Tees WWW" + else + return "Unknown App" + end + end + end +