From c73a3ce9a874855d47d55defde61c5b39a3d5e7d Mon Sep 17 00:00:00 2001 From: chiu Date: Wed, 20 May 2020 17:53:06 +0800 Subject: [PATCH] fix error --- app/helpers/admin/property_hires_helper.rb | 2 +- app/views/email/edit_email.html.erb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/helpers/admin/property_hires_helper.rb b/app/helpers/admin/property_hires_helper.rb index d0b1835..9d2302b 100644 --- a/app/helpers/admin/property_hires_helper.rb +++ b/app/helpers/admin/property_hires_helper.rb @@ -75,7 +75,7 @@ module Admin::PropertyHiresHelper module_app_key:"property_hire", template:"email/#{field_name}_email.html.erb", mail_sentdate: send_date || Time.current, - mail_subject: I18n.t("seminar.email_#{field_name}_success"), + mail_subject: I18n.t("property_hire.email_#{field_name}_success"), template_data:{'property_id'=>property_id,'content'=>content,'locale'=>I18n.locale.to_s,'hire_id'=>hire_id}) elsif !(email_set[0].disabled) mail = Email.create(mail_to: Array(email), diff --git a/app/views/email/edit_email.html.erb b/app/views/email/edit_email.html.erb index dffc7e9..8a31a21 100644 --- a/app/views/email/edit_email.html.erb +++ b/app/views/email/edit_email.html.erb @@ -30,7 +30,7 @@ <%= property[k].collect{|k,v| v}.uniq.join('/') rescue nil %> <% elsif k=='owners' %> <%= property.owner_profiles.collect{|v| v.name}.join(', ') %> - <% elsif k == 'category' %> + <% elsif ['category','property_location'].include?(k) %> <%= v.title %> <% elsif k == 'can_be_hired' %> <%= v ? t('yes_') : t('no_') %>