From 9d600ab3952fbcda04c7cbc62912806e77f4cf9a Mon Sep 17 00:00:00 2001 From: Phil Lee Date: Thu, 24 Nov 2022 15:14:06 +0000 Subject: [PATCH] add year page to bulk upload journey --- .../bulk_upload_lettings_logs_controller.rb | 12 ++++++++++++ app/controllers/bulk_upload_sales_logs_controller.rb | 12 ++++++++++++ app/views/bulk_upload_lettings_logs/show.html.erb | 1 - app/views/bulk_upload_sales_logs/show.html.erb | 1 - 4 files changed, 24 insertions(+), 2 deletions(-) delete mode 100644 app/views/bulk_upload_lettings_logs/show.html.erb delete mode 100644 app/views/bulk_upload_sales_logs/show.html.erb diff --git a/app/controllers/bulk_upload_lettings_logs_controller.rb b/app/controllers/bulk_upload_lettings_logs_controller.rb index 108c25fef..55c1421e2 100644 --- a/app/controllers/bulk_upload_lettings_logs_controller.rb +++ b/app/controllers/bulk_upload_lettings_logs_controller.rb @@ -21,6 +21,18 @@ class BulkUploadLettingsLogsController < ApplicationController end end + def show + render form.view_path + end + + def update + if form.valid? + redirect_to bulk_upload_lettings_log_path(id: "prepare-your-file", form: { year: form_params[:year] }) + else + render form.view_path + end + end + private def current_year diff --git a/app/controllers/bulk_upload_sales_logs_controller.rb b/app/controllers/bulk_upload_sales_logs_controller.rb index 81d018d4c..eb2eef265 100644 --- a/app/controllers/bulk_upload_sales_logs_controller.rb +++ b/app/controllers/bulk_upload_sales_logs_controller.rb @@ -21,6 +21,18 @@ class BulkUploadSalesLogsController < ApplicationController end end + def show + render form.view_path + end + + def update + if form.valid? + redirect_to bulk_upload_sales_log_path(id: "prepare-your-file", form: { year: form_params[:year] }) + else + render form.view_path + end + end + private def current_year diff --git a/app/views/bulk_upload_lettings_logs/show.html.erb b/app/views/bulk_upload_lettings_logs/show.html.erb deleted file mode 100644 index 6f03ef508..000000000 --- a/app/views/bulk_upload_lettings_logs/show.html.erb +++ /dev/null @@ -1 +0,0 @@ -Find me in app/views/bulk_upload_lettings_logs/show.html.erb diff --git a/app/views/bulk_upload_sales_logs/show.html.erb b/app/views/bulk_upload_sales_logs/show.html.erb deleted file mode 100644 index 86facd42c..000000000 --- a/app/views/bulk_upload_sales_logs/show.html.erb +++ /dev/null @@ -1 +0,0 @@ -Find me in app/views/bulk_upload_sales_logs/show.html.erb