From 624f33389b44d27de466f9a44f90499c23bbc8b4 Mon Sep 17 00:00:00 2001
From: JG <moarpheus@gmail.com>
Date: Tue, 20 Sep 2022 12:08:10 +0100
Subject: [PATCH] sales logs are now working

---
 app/controllers/form_controller.rb | 27 +++++++++++++++------------
 app/controllers/logs_controller.rb |  2 +-
 app/helpers/tasklist_helper.rb     |  4 ++--
 3 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/app/controllers/form_controller.rb b/app/controllers/form_controller.rb
index f86e55597..5d68142af 100644
--- a/app/controllers/form_controller.rb
+++ b/app/controllers/form_controller.rb
@@ -131,28 +131,31 @@ private
     end
   end
 
-
   def find_resource
-    @log = if new_log_request? || new_log_request_referrer?
+    @log = if params.key?("sales_log")
+             if new_log_request? || new_log_request_referrer?
+               SalesLog.new(owning_organisation: current_user.support? ? nil : current_user.organisation)
+             else
+               current_user.sales_logs.find_by(id: params[:id])
+             end
+           elsif new_log_request? || new_log_request_referrer?
              LettingsLog.new(owning_organisation: current_user.support? ? nil : current_user.organisation)
            else
-             params.key?("sales_log") ? current_user.sales_logs.find_by(id: params[:id]) : current_user.lettings_logs.find_by(id: params[:id])
+             current_user.lettings_logs.find_by(id: params[:id])
            end
   end
 
   def find_resource_by_named_id
     @log = if params[:sales_log_id].present?
-               current_user.sales_logs.find_by(id: params[:sales_log_id])
-           else
-             if new_log_request?
-               if request.path.include? ("sales-logs")
-                 SalesLog.new
-               else
-                 LettingsLog.new
-               end
+             current_user.sales_logs.find_by(id: params[:sales_log_id])
+           elsif new_log_request?
+             if request.path.include?("sales-logs")
+               SalesLog.new
              else
-               current_user.lettings_logs.find_by(id: params[:lettings_log_id])
+               LettingsLog.new
              end
+           else
+             current_user.lettings_logs.find_by(id: params[:lettings_log_id])
            end
   end
 
diff --git a/app/controllers/logs_controller.rb b/app/controllers/logs_controller.rb
index 9bb913d70..ba7b2cd7f 100644
--- a/app/controllers/logs_controller.rb
+++ b/app/controllers/logs_controller.rb
@@ -15,7 +15,7 @@ private
 
     respond_to do |format|
       format.html do
-        redirect_to ( request.path.include?("sales") ? new_log_sales_logs_path : new_log_lettings_logs_path)
+        redirect_to(request.path.include?("sales") ? new_log_sales_logs_path : new_log_lettings_logs_path)
       end
       format.json do
         if log.save
diff --git a/app/helpers/tasklist_helper.rb b/app/helpers/tasklist_helper.rb
index ba4ea9a14..27a4959bb 100644
--- a/app/helpers/tasklist_helper.rb
+++ b/app/helpers/tasklist_helper.rb
@@ -16,11 +16,11 @@ module TasklistHelper
              "#{log.class.name.underscore}_#{subsection.id}_check_answers_path"
            else
              "#{log.class.name.underscore}_#{next_question_page(subsection, log, current_user)}_path"
-             end
+           end
     if log.id
       send(path, log)
     else
-      "/#{log.lettings? ? "lettings" : "sales"}-logs/new/#{next_question_page(subsection, log, current_user)}"
+      "/#{log.lettings? ? 'lettings' : 'sales'}-logs/new/#{next_question_page(subsection, log, current_user)}"
     end
   end