diff --git a/app/controllers/bulk_upload_lettings_logs_controller.rb b/app/controllers/bulk_upload_lettings_logs_controller.rb index 6f3568c87..c7d78df5c 100644 --- a/app/controllers/bulk_upload_lettings_logs_controller.rb +++ b/app/controllers/bulk_upload_lettings_logs_controller.rb @@ -55,7 +55,7 @@ private when "upload-your-file" Forms::BulkUploadLettings::UploadYourFile.new(form_params.merge(current_user:, request:)) when "checking-file" - Forms::BulkUploadLettings::CheckingFile.new(form_params.merge(request:)) + Forms::BulkUploadLettings::CheckingFile.new(form_params) else raise "Page not found for path #{params[:id]}" end diff --git a/app/controllers/bulk_upload_sales_logs_controller.rb b/app/controllers/bulk_upload_sales_logs_controller.rb index fbeb9e033..923fa2bd6 100644 --- a/app/controllers/bulk_upload_sales_logs_controller.rb +++ b/app/controllers/bulk_upload_sales_logs_controller.rb @@ -53,7 +53,7 @@ private when "upload-your-file" Forms::BulkUploadSales::UploadYourFile.new(form_params.merge(current_user:, request:)) when "checking-file" - Forms::BulkUploadSales::CheckingFile.new(form_params.merge(request:)) + Forms::BulkUploadSales::CheckingFile.new(form_params) else raise "Page not found for path #{params[:id]}" end diff --git a/app/models/forms/bulk_upload_lettings/checking_file.rb b/app/models/forms/bulk_upload_lettings/checking_file.rb index c1ca7f003..8cd9ee696 100644 --- a/app/models/forms/bulk_upload_lettings/checking_file.rb +++ b/app/models/forms/bulk_upload_lettings/checking_file.rb @@ -6,19 +6,13 @@ module Forms include Rails.application.routes.url_helpers attribute :year, :integer - attribute :organisation_id, :integer def view_path "bulk_upload_lettings_logs/forms/checking_file" end def back_path - organisation_id = request.query_parameters[:organisation_id] - if organisation_id.present? - lettings_logs_organisation_path(organisation_id) - else - bulk_upload_lettings_log_path(id: "start") - end + bulk_upload_lettings_log_path(id: "start") end def year_combo diff --git a/app/models/forms/bulk_upload_lettings/upload_your_file.rb b/app/models/forms/bulk_upload_lettings/upload_your_file.rb index 73a47fe2f..f501da811 100644 --- a/app/models/forms/bulk_upload_lettings/upload_your_file.rb +++ b/app/models/forms/bulk_upload_lettings/upload_your_file.rb @@ -36,7 +36,7 @@ module Forms end def next_path - bulk_upload_lettings_log_path(id: "checking-file", form: { year:, organisation_id: }) + bulk_upload_lettings_log_path(id: "checking-file", form: { year: }) end def save! diff --git a/app/models/forms/bulk_upload_sales/checking_file.rb b/app/models/forms/bulk_upload_sales/checking_file.rb index bdcc94db1..a37be3ccb 100644 --- a/app/models/forms/bulk_upload_sales/checking_file.rb +++ b/app/models/forms/bulk_upload_sales/checking_file.rb @@ -6,19 +6,13 @@ module Forms include Rails.application.routes.url_helpers attribute :year, :integer - attribute :organisation_id, :integer def view_path "bulk_upload_sales_logs/forms/checking_file" end def back_path - organisation_id = request.query_parameters[:organisation_id] - if organisation_id.present? - sales_logs_organisation_path(organisation_id) - else - bulk_upload_sales_log_path(id: "start") - end + bulk_upload_sales_log_path(id: "start") end def year_combo diff --git a/app/models/forms/bulk_upload_sales/upload_your_file.rb b/app/models/forms/bulk_upload_sales/upload_your_file.rb index 8f601614f..83cc12def 100644 --- a/app/models/forms/bulk_upload_sales/upload_your_file.rb +++ b/app/models/forms/bulk_upload_sales/upload_your_file.rb @@ -34,7 +34,7 @@ module Forms end def next_path - bulk_upload_sales_log_path(id: "checking-file", form: { year:, organisation_id: }) + bulk_upload_sales_log_path(id: "checking-file", form: { year: }) end def save!