From 598f2f4f20b5bcc2394ec1c9fef40794db044967 Mon Sep 17 00:00:00 2001 From: Kat Date: Mon, 20 Mar 2023 11:26:08 +0000 Subject: [PATCH] PR comments --- app/models/sales_log.rb | 2 +- app/models/validations/sales/sale_information_validations.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/models/sales_log.rb b/app/models/sales_log.rb index 972704c12..d1fde9249 100644 --- a/app/models/sales_log.rb +++ b/app/models/sales_log.rb @@ -335,7 +335,7 @@ class SalesLog < Log return if value.blank? discount_amount = discount ? value * discount / 100 : 0 - (value - discount_amount) + value - discount_amount end def mortgage_deposit_and_grand_total diff --git a/app/models/validations/sales/sale_information_validations.rb b/app/models/validations/sales/sale_information_validations.rb index 7a0d3c824..4f7b5f40f 100644 --- a/app/models/validations/sales/sale_information_validations.rb +++ b/app/models/validations/sales/sale_information_validations.rb @@ -47,7 +47,7 @@ module Validations::Sales::SaleInformationValidations end 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.mortgage || record.mortgageused == 2 return unless record.discount || record.grant || record.type == 29