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

Contact from email #322

Merged
merged 4 commits into from
Feb 2, 2016
Merged

Contact from email #322

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0f335b2
Contact_form email modification.
raulanatol Jan 29, 2016
0efc555
i18n error
raulanatol Jan 29, 2016
dbac969
Merge remote-tracking branch 'upstream/master'
raulanatol Feb 2, 2016
23edc40
Contact from email with email hook
raulanatol Feb 2, 2016
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
72 changes: 45 additions & 27 deletions app/apps/plugins/contact_form/contact_form_helper.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,34 +104,15 @@ def perform_save_form(form, values, fields, settings, success, errors)
form_new = current_site.contact_forms.new(name: "response-#{Time.now}", description: form.description, settings: fix_meta_value(new_settings), site_id: form.site_id, parent_id: form.id)

if form_new.save
begin
content = render_to_string partial: 'contact_form/submission',
layout: false,
locals: {
file_attachments: attachments,
fields: convert_form_values(
values[:fields],
fields
)
}
rescue ActionView::MissingTemplate
content = render_to_string partial: 'contact_form/views/contact_form/submission',
layout: false,
locals: {
file_attachments: attachments,
fields: convert_form_values(
values[:fields],
fields
)
}
content = get_content_from_submission_partial(attachments, values, fields)
content = get_content_from_views_submission_partial(attachments, values, fields) unless content.nil?

if content.nil?
extra_data = {fields: convert_form_values(values[:fields], fields)}
send_email(settings[:railscf_mail][:to], settings[:railscf_mail][:subject], '', settings[:railscf_mail][:to], attachments, 'contact_form_email', 'camaleon_cms/mailer', extra_data)
else
sendmail(settings[:railscf_mail][:to], settings[:railscf_mail][:subject], content, settings[:railscf_mail][:to], attachments)
end

sendmail(
settings[:railscf_mail][:to], settings[:railscf_mail][:subject],
content,
settings[:railscf_mail][:to],
attachments
)
success << settings[:railscf_message][:mail_sent_ok]
else
errors << settings[:railscf_message][:mail_sent_ng]
Expand Down Expand Up @@ -175,4 +156,41 @@ def fix_meta_value(value)
end
value
end

private

def get_content_from_submission_partial(attachments, values, fields)
begin
content = render_to_string partial: 'contact_form/submission',
layout: false,
locals: {
file_attachments: attachments,
fields: convert_form_values(
values[:fields],
fields
)
}
rescue ActionView::MissingTemplate
content = nil
end
content
end

def get_content_from_views_submission_partial(attachments, values, fields)
begin
content = render_to_string partial: 'contact_form/views/contact_form/submission',
layout: false,
locals: {
file_attachments: attachments,
fields: convert_form_values(
values[:fields],
fields
)
}
rescue ActionView::MissingTemplate
content = nil
end
content
end

end