Browse Source

Return support definitions before user definitions

pull/2539/head
Manny Dinssa 2 years ago
parent
commit
be41fa0cd4
  1. 4
      app/services/csv/lettings_log_csv_service.rb
  2. 4
      app/services/csv/sales_log_csv_service.rb

4
app/services/csv/lettings_log_csv_service.rb

@ -280,7 +280,9 @@ module Csv
record = nil record = nil
year = @year year = @year
while year >= 2021 && record.nil? while year >= 2021 && record.nil?
record = records.find { |r| r.log_type == "lettings" && r.year == year } record = records.find do |r|
r.year == year && (!@user.support? || r.user_type == "support" || r.user_type == "user")
end
year -= 1 year -= 1
end end
record || records.first record || records.first

4
app/services/csv/sales_log_csv_service.rb

@ -184,7 +184,9 @@ module Csv
record = nil record = nil
year = @year year = @year
while year >= 2022 && record.nil? while year >= 2022 && record.nil?
record = records.find { |r| r.log_type == "sales" && r.year == year } record = records.find do |r|
r.year == year && (!@user.support? || r.user_type == "support" || r.user_type == "user")
end
year -= 1 year -= 1
end end
record || records.first record || records.first

Loading…
Cancel
Save