Browse Source

use log#sales?

pull/1292/head
Jack S 3 years ago
parent
commit
ac17c34146
  1. 2
      app/helpers/tasklist_helper.rb
  2. 4
      app/models/lettings_log.rb
  3. 6
      app/models/log.rb
  4. 2
      app/views/form/review.html.erb
  5. 5
      spec/models/lettings_log_spec.rb
  6. 7
      spec/models/sales_log_spec.rb

2
app/helpers/tasklist_helper.rb

@ -39,7 +39,7 @@ module TasklistHelper
def review_log_text(log) def review_log_text(log)
if log.collection_period_open? if log.collection_period_open?
link = log.is_a?(SalesLog) ? review_sales_log_path(id: log, sales_log: true) : review_lettings_log_path(log) link = log.sales? ? review_sales_log_path(id: log, sales_log: true) : review_lettings_log_path(log)
"You can #{govuk_link_to 'review and make changes to this log', link} until #{log.form.end_date.to_formatted_s(:govuk_date)}.".html_safe "You can #{govuk_link_to 'review and make changes to this log', link} until #{log.form.end_date.to_formatted_s(:govuk_date)}.".html_safe
else else

4
app/models/lettings_log.rb

@ -481,10 +481,6 @@ class LettingsLog < Log
location.type_of_unit_before_type_cast if location location.type_of_unit_before_type_cast if location
end end
def lettings?
true
end
def rent_type_detail def rent_type_detail
form.get_question("rent_type", self)&.label_from_value(rent_type) form.get_question("rent_type", self)&.label_from_value(rent_type)
end end

6
app/models/log.rb

@ -40,7 +40,11 @@ class Log < ApplicationRecord
end end
def lettings? def lettings?
false is_a? LettingsLog
end
def sales?
is_a? SalesLog
end end
def ethnic_refused? def ethnic_refused?

2
app/views/form/review.html.erb

@ -1,4 +1,4 @@
<% if @log.is_a? SalesLog %> <% if @log.sales? %>
<% content_for :title, "Review sales log" %> <% content_for :title, "Review sales log" %>
<% content_for :breadcrumbs, govuk_breadcrumbs(breadcrumbs: { <% content_for :breadcrumbs, govuk_breadcrumbs(breadcrumbs: {
"Logs" => "/logs", "Logs" => "/logs",

5
spec/models/lettings_log_spec.rb

@ -18,6 +18,11 @@ RSpec.describe LettingsLog do
expect(described_class).to be < ApplicationRecord expect(described_class).to be < ApplicationRecord
end end
it "is a not a sales log" do
lettings_log = FactoryBot.build(:lettings_log, created_by: created_by_user)
expect(lettings_log.sales?).to be false
end
it "is a lettings log" do it "is a lettings log" do
lettings_log = FactoryBot.build(:lettings_log, created_by: created_by_user) lettings_log = FactoryBot.build(:lettings_log, created_by: created_by_user)
expect(lettings_log).to be_lettings expect(lettings_log).to be_lettings

7
spec/models/sales_log_spec.rb

@ -12,11 +12,16 @@ RSpec.describe SalesLog, type: :model do
expect(described_class).to be < ApplicationRecord expect(described_class).to be < ApplicationRecord
end end
it "is a sales log" do it "is a not a lettings log" do
sales_log = build(:sales_log, created_by: created_by_user) sales_log = build(:sales_log, created_by: created_by_user)
expect(sales_log.lettings?).to be false expect(sales_log.lettings?).to be false
end end
it "is a sales log" do
sales_log = build(:sales_log, created_by: created_by_user)
expect(sales_log.sales?).to be true
end
describe "#new" do describe "#new" do
context "when creating a record" do context "when creating a record" do
let(:sales_log) do let(:sales_log) do

Loading…
Cancel
Save