baarkerlounger
/
submit-social-housing-lettings-and-sales-data
mirror of https://github.com/communitiesuk/submit-social-housing-lettings-and-sales-data.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

PR comments

pull/1429/head
Kat 3 years ago
parent
28683046a7
commit
598f2f4f20
2 changed files with 2 additions and 2 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      app/models/sales_log.rb
  2. 2
      app/models/validations/sales/sale_information_validations.rb

2
app/models/sales_log.rb
Unescape View File

@ -335,7 +335,7 @@ class SalesLog < Log
return if value.blank? return if value.blank?
discount_amount = discount ? value * discount / 100 : 0 discount_amount = discount ? value * discount / 100 : 0
(value - discount_amount) value - discount_amount
end end
def mortgage_deposit_and_grand_total def mortgage_deposit_and_grand_total

2
app/models/validations/sales/sale_information_validations.rb
Unescape View File

@ -47,7 +47,7 @@ module Validations::Sales::SaleInformationValidations
end end
def validate_discounted_ownership_value(record) def validate_discounted_ownership_value(record)
return unless record.saledate && collection_start_year(record.saledate) > 2023 return unless record.saledate && collection_start_year(record.saledate) >= 2024
return unless record.value && record.deposit && record.ownershipsch return unless record.value && record.deposit && record.ownershipsch
return unless record.mortgage || record.mortgageused == 2 return unless record.mortgage || record.mortgageused == 2
return unless record.discount || record.grant || record.type == 29 return unless record.discount || record.grant || record.type == 29

Write Preview
Loading…
Cancel
Save