From d58eb6164f4764a7605c2978cbeb9b45599d571b Mon Sep 17 00:00:00 2001 From: Kat Date: Fri, 8 Dec 2023 14:35:46 +0000 Subject: [PATCH] PO fixes --- app/controllers/form_controller.rb | 2 +- app/controllers/organisations_controller.rb | 2 +- app/helpers/filters_helper.rb | 2 +- app/models/form/sales/questions/managing_organisation.rb | 1 - db/seeds.rb | 3 +++ 5 files changed, 6 insertions(+), 4 deletions(-) diff --git a/app/controllers/form_controller.rb b/app/controllers/form_controller.rb index dcd78c312..9fb0fe243 100644 --- a/app/controllers/form_controller.rb +++ b/app/controllers/form_controller.rb @@ -102,7 +102,7 @@ private result[question.id] = question_params end - if question.id == "owning_organisation_id" && @log.lettings? + if question.id == "owning_organisation_id" owning_organisation = Organisation.find(result["owning_organisation_id"]) if current_user.support? && @log.managing_organisation.blank? && owning_organisation&.managing_agents&.empty? result["managing_organisation_id"] = owning_organisation.id diff --git a/app/controllers/organisations_controller.rb b/app/controllers/organisations_controller.rb index 41213ba9c..2b902d129 100644 --- a/app/controllers/organisations_controller.rb +++ b/app/controllers/organisations_controller.rb @@ -122,7 +122,7 @@ class OrganisationsController < ApplicationController end def sales_logs - organisation_logs = SalesLog.visible.where(owning_organisation_id: @organisation.id) + organisation_logs = SalesLog.visible.filter_by_organisation(@organisation) unpaginated_filtered_logs = filter_manager.filtered_logs(organisation_logs, search_term, session_filters) respond_to do |format| diff --git a/app/helpers/filters_helper.rb b/app/helpers/filters_helper.rb index 21d16e998..94c5a6eca 100644 --- a/app/helpers/filters_helper.rb +++ b/app/helpers/filters_helper.rb @@ -125,7 +125,7 @@ module FiltersHelper end def non_support_with_multiple_owning_orgs? - current_user.organisation.stock_owners.count > 1 && user_lettings_path? || current_user.organisation.has_recent_absorbed_organisations? + current_user.organisation.stock_owners.count > 1 || current_user.organisation.has_recent_absorbed_organisations? end def non_support_with_multiple_managing_orgs? diff --git a/app/models/form/sales/questions/managing_organisation.rb b/app/models/form/sales/questions/managing_organisation.rb index 7fba0b131..42e1dfd38 100644 --- a/app/models/form/sales/questions/managing_organisation.rb +++ b/app/models/form/sales/questions/managing_organisation.rb @@ -5,7 +5,6 @@ class Form::Sales::Questions::ManagingOrganisation < ::Form::Question @check_answer_label = "Reported by" @header = "Which organisation is reporting this sales log?" @type = "select" - @question_number = 2 end def answer_options(log = nil, user = nil) diff --git a/db/seeds.rb b/db/seeds.rb index 876601c19..805f0c53a 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -200,6 +200,7 @@ unless Rails.env.test? SalesLog.find_or_create_by!( created_by: support_user, owning_organisation: org, + managing_organisation: org, saledate: Date.new(2023, 4, 1), purchid: "1", ownershipsch: 1, @@ -211,6 +212,7 @@ unless Rails.env.test? SalesLog.find_or_create_by!( created_by: support_user, owning_organisation: org, + managing_organisation: org, saledate: Date.new(2023, 4, 1), purchid: "1", ownershipsch: 2, @@ -222,6 +224,7 @@ unless Rails.env.test? SalesLog.find_or_create_by!( created_by: support_user, owning_organisation: org, + managing_organisation: org, saledate: Date.new(2023, 4, 1), purchid: "1", ownershipsch: 3,