diff --git a/app/controllers/activities_controller.rb b/app/controllers/activities_controller.rb index 852729e3d..1dacda3f9 100644 --- a/app/controllers/activities_controller.rb +++ b/app/controllers/activities_controller.rb @@ -101,11 +101,18 @@ def order_screen # rubocop:disable Metrics/MethodLength, Metrics/AbcSize @sumup_key = Rails.application.config.x.sumup_key @sumup_enabled = @sumup_key.present? - @sumup_error_order = if params['sumup_error'] - Order.find(params['sumup_error']) - else - false - end + if params['sumup_error'] + sumup_order_id = params['sumup_error'].split('-').first + sumup_attempt = if params['sumup_error'].include? '-' + params['sumup_error'].split('-').last.to_i + else + 0 + end + @sumup_error_order = Order.find(sumup_order_id) + @sumup_tx_id = "#{sumup_order_id}-#{sumup_attempt + 1}" + else + @sumup_error_order = false + end # Set flags for application.html.slim @show_navigationbar = false diff --git a/app/views/activities/order_screen.html.erb b/app/views/activities/order_screen.html.erb index e8ded5969..c5476e18b 100644 --- a/app/views/activities/order_screen.html.erb +++ b/app/views/activities/order_screen.html.erb @@ -76,7 +76,7 @@ <% if @sumup_error_order %>