adjsut resubmit

pull/718/head
Pete Matsyburka 4 weeks ago
parent 6f4527038b
commit 616f7b4fd8

@ -86,10 +86,12 @@ class StartFormResubmitController < ApplicationController
rescue Submitters::StartForm::NotSaved rescue Submitters::StartForm::NotSaved
render 'start_form/show', status: :unprocessable_content render 'start_form/show', status: :unprocessable_content
rescue Submitters::UnableToSendCode, Submitters::InvalidOtp => e rescue Submitters::UnableToSendCode, Submitters::InvalidOtp => e
redirect_to start_form_path(@template.slug, params: submitter_params.merge(email_verification: true)), flash.now[:alert] = e.message
alert: e.message
render 'start_form/email_verification'
rescue RateLimit::LimitApproached rescue RateLimit::LimitApproached
redirect_to start_form_path(@template.slug, params: submitter_params.merge(email_verification: true)), flash.now[:alert] = I18n.t(:too_many_attempts)
alert: I18n.t(:too_many_attempts)
render 'start_form/email_verification'
end end
end end

@ -49,6 +49,10 @@
<%= f.button button_title(title: t('submit')), class: 'base-button' %> <%= f.button button_title(title: t('submit')), class: 'base-button' %>
</toggle-submit> </toggle-submit>
<% end %> <% end %>
<%= button_to t(:re_send_email), start_form_email_2fa_send_index_path, params: { slug: @template.slug, resend: true, submitter: { name: params[:name] || params.dig(:submitter, :name), email: params[:email] || params.dig(:submitter, :email), phone: params[:phone] || params.dig(:submitter, :phone) } }.compact, method: :post, id: 'resend_code', class: 'hidden' %> <% if @resubmit_submitter %>
<%= button_to t(:re_send_email), resubmit_form_path, params: { resubmit: @resubmit_submitter.slug }, method: :put, id: 'resend_code', class: 'hidden' %>
<% else %>
<%= button_to t(:re_send_email), start_form_email_2fa_send_index_path, params: { slug: @template.slug, resend: true, submitter: { name: params[:name] || params.dig(:submitter, :name), email: params[:email] || params.dig(:submitter, :email), phone: params[:phone] || params.dig(:submitter, :phone) } }.compact, method: :post, id: 'resend_code', class: 'hidden' %>
<% end %>
</div> </div>
</main> </main>

@ -28,7 +28,8 @@
</div> </div>
</div> </div>
<% if !@template.archived_at? && !@template.account.archived_at? %> <% if !@template.archived_at? && !@template.account.archived_at? %>
<%= form_for @submitter, url: start_form_path(@template.slug), data: { turbo_frame: :_top }, method: :put, html: { class: 'space-y-4' } do |f| %> <%= form_for @submitter, url: @resubmit_submitter ? resubmit_form_path : start_form_path(@template.slug), data: { turbo_frame: :_top }, method: :put, html: { class: 'space-y-4' } do |f| %>
<%= hidden_field_tag :resubmit, @resubmit_submitter.slug if @resubmit_submitter %>
<% if @error_message %> <% if @error_message %>
<div class="alert items-start bg-base-100 border border-red-400 text-red-400"> <div class="alert items-start bg-base-100 border border-red-400 text-red-400">
<%= svg_icon('info_circle', class: 'stroke-current shrink-0 h-6 w-6 mt-1') %> <%= svg_icon('info_circle', class: 'stroke-current shrink-0 h-6 w-6 mt-1') %>

Loading…
Cancel
Save