From 7474b6f19907fc72ceb4211387539a780735d243 Mon Sep 17 00:00:00 2001 From: Aaron Spencer Date: Mon, 31 Jul 2023 17:30:15 +0100 Subject: [PATCH] CLDC-2505: lettings changes made to sales --- app/controllers/bulk_upload_sales_results_controller.rb | 1 + app/controllers/bulk_upload_sales_resume_controller.rb | 2 ++ app/models/forms/bulk_upload_sales_resume/confirm.rb | 2 +- app/models/forms/bulk_upload_sales_resume/fix_choice.rb | 2 +- 4 files changed, 5 insertions(+), 2 deletions(-) diff --git a/app/controllers/bulk_upload_sales_results_controller.rb b/app/controllers/bulk_upload_sales_results_controller.rb index feb7b3e06..1ed44aae9 100644 --- a/app/controllers/bulk_upload_sales_results_controller.rb +++ b/app/controllers/bulk_upload_sales_results_controller.rb @@ -17,6 +17,7 @@ class BulkUploadSalesResultsController < ApplicationController redirect_to(sales_logs_path(bulk_upload_id: [@bulk_upload.id])) else + @bulk_upload.update!(choice: "completed") reset_logs_filters end end diff --git a/app/controllers/bulk_upload_sales_resume_controller.rb b/app/controllers/bulk_upload_sales_resume_controller.rb index 9f937630d..5096a4a34 100644 --- a/app/controllers/bulk_upload_sales_resume_controller.rb +++ b/app/controllers/bulk_upload_sales_resume_controller.rb @@ -41,6 +41,8 @@ private Forms::BulkUploadSalesResume::Chosen.new(form_params.merge(bulk_upload: @bulk_upload)) when "confirm" Forms::BulkUploadSalesResume::Confirm.new(form_params.merge(bulk_upload: @bulk_upload)) + when "completed" + Forms::BulkUploadSalesResume::Confirm.new(form_params.merge(bulk_upload: @bulk_upload)) else raise "invalid form" end diff --git a/app/models/forms/bulk_upload_sales_resume/confirm.rb b/app/models/forms/bulk_upload_sales_resume/confirm.rb index b093c5fa9..84fc6dca9 100644 --- a/app/models/forms/bulk_upload_sales_resume/confirm.rb +++ b/app/models/forms/bulk_upload_sales_resume/confirm.rb @@ -41,7 +41,7 @@ module Forms when "bulk-confirm-soft-validations" page_bulk_upload_sales_soft_validations_check_path(bulk_upload, :chosen) when "completed" - resume_bulk_upload_lettings_result_path(bulk_upload.id) + resume_bulk_upload_sales_result_path(bulk_upload.id) end end end diff --git a/app/models/forms/bulk_upload_sales_resume/fix_choice.rb b/app/models/forms/bulk_upload_sales_resume/fix_choice.rb index c348b384e..1c8e13d9d 100644 --- a/app/models/forms/bulk_upload_sales_resume/fix_choice.rb +++ b/app/models/forms/bulk_upload_sales_resume/fix_choice.rb @@ -62,7 +62,7 @@ module Forms when "bulk-confirm-soft-validations" page_bulk_upload_sales_soft_validations_check_path(bulk_upload, :chosen) when "completed" - resume_bulk_upload_lettings_result_path(bulk_upload.id) + resume_bulk_upload_sales_result_path(bulk_upload.id) end end end