diff --git a/app/views/submissions/_detailed_form.html.erb b/app/views/submissions/_detailed_form.html.erb index 3bc01583..aa0ce8ee 100644 --- a/app/views/submissions/_detailed_form.html.erb +++ b/app/views/submissions/_detailed_form.html.erb @@ -91,8 +91,8 @@ <%= local_assigns[:variables_form] %>
- <%= render('submitters_order', f:, template:) if Accounts.can_send_emails?(current_account) %> - <%= render 'send_email', f:, template: %> + <%= render('submitters_order', f:, template:) if can_send_emails %> + <%= render 'send_email', f:, template:, can_send_emails: %> <% if has_phone_field %> <%= render 'send_sms', f: %> <% end %> diff --git a/app/views/submissions/_email_form.html.erb b/app/views/submissions/_email_form.html.erb index 2df01e38..e5f32a6c 100644 --- a/app/views/submissions/_email_form.html.erb +++ b/app/views/submissions/_email_form.html.erb @@ -69,8 +69,8 @@ <% end %> <%= local_assigns[:variables_form] %>
- <%= render('submitters_order', f:, template:) if Accounts.can_send_emails?(current_account) %> - <%= render 'send_email', f:, template: %> + <%= render('submitters_order', f:, template:) if can_send_emails %> + <%= render 'send_email', f:, template:, can_send_emails: %> <%= render 'extra_fields', f: %>
diff --git a/app/views/submissions/_phone_form.html.erb b/app/views/submissions/_phone_form.html.erb index 246657d9..ce71e9c9 100644 --- a/app/views/submissions/_phone_form.html.erb +++ b/app/views/submissions/_phone_form.html.erb @@ -56,7 +56,7 @@ <%= local_assigns[:variables_form] %>
- <%= render('submitters_order', f:, template:) if Accounts.can_send_emails?(current_account) %> + <%= render 'submitters_order', f:, template: %> <%= render 'send_sms', f:, checked: true %> <%= render 'extra_phone_fields', f: %>
diff --git a/app/views/submissions/_send_email_base.html.erb b/app/views/submissions/_send_email_base.html.erb index ad54a649..ede68994 100644 --- a/app/views/submissions/_send_email_base.html.erb +++ b/app/views/submissions/_send_email_base.html.erb @@ -2,7 +2,6 @@ <% template_submitters = local_assigns[:submitter]&.submission&.template_submitters || template.submitters %> <% message_field_id = "message_field_#{SecureRandom.hex(3)}" %>
- <% can_send_emails = Accounts.can_send_emails?(current_account, on_events: can?(:manage, :countless)) %>
<%= f.label :send_email, for: uuid = SecureRandom.uuid, class: 'flex items-center cursor-pointer' do %> <%= f.check_box :send_email, id: uuid, class: 'base-checkbox', disabled: !can_send_emails || local_assigns[:disable_email], checked: can_send_emails && !local_assigns.key?(:resend_email) && !local_assigns[:disable_email] && template&.preferences&.dig('request_email_enabled') != false %> diff --git a/app/views/submissions/new.html.erb b/app/views/submissions/new.html.erb index e1e95875..57c793df 100644 --- a/app/views/submissions/new.html.erb +++ b/app/views/submissions/new.html.erb @@ -3,6 +3,7 @@ <% prefillable_fields = @template.fields.select { |f| f['prefillable'] } %> <% default_tab = cookies.permanent[:add_recipients_tab].presence || 'email' %> <% recipient_form_fields = Accounts.load_recipient_form_fields(current_account) if prefillable_fields.blank? %> +<% can_send_emails = Accounts.can_send_emails?(current_account) %> <% only_detailed = require_phone_2fa || require_email_2fa || prefillable_fields.present? || recipient_form_fields.present? %> <% with_list = @template.variables_schema.blank? %> <% variables_form = render 'variables_form', schema: @template.variables_schema if @template.variables_schema.present? && @template.variables_schema.any? { |_, v| !v['disabled'] } %> @@ -25,18 +26,18 @@
<% unless only_detailed %>
- <%= render 'email_form', template: @template, variables_form: %> + <%= render 'email_form', template: @template, variables_form:, can_send_emails: %>
<%= render 'phone_form', template: @template, variables_form: %>
<% end %>
- <%= render 'detailed_form', template: @template, require_phone_2fa:, require_email_2fa:, prefillable_fields:, recipient_form_fields:, variables_form: %> + <%= render 'detailed_form', template: @template, require_phone_2fa:, require_email_2fa:, prefillable_fields:, recipient_form_fields:, variables_form:, can_send_emails: %>
<% if with_list %> <% end %> <%= render 'submissions/error' %> diff --git a/app/views/submitters/edit.html.erb b/app/views/submitters/edit.html.erb index 1f203bcb..6330cc83 100644 --- a/app/views/submitters/edit.html.erb +++ b/app/views/submitters/edit.html.erb @@ -17,7 +17,7 @@
- <%= render 'submissions/send_email', f:, template: @submitter.template, submitter: @submitter, resend_email: @submitter.sent_at?, submitter_email_message: @submitter_email_message, disable_save_as_default_template_option: true, message_per_submitter: false %> + <%= render 'submissions/send_email', f:, template: @submitter.template, submitter: @submitter, resend_email: @submitter.sent_at?, submitter_email_message: @submitter_email_message, disable_save_as_default_template_option: true, message_per_submitter: false, can_send_emails: Accounts.can_send_emails?(current_account) %> <%= render 'submissions/send_sms', f:, resend_sms: @submitter.sent_at? %>