From cad00fe1f5c5e0d7d9dbd69f6be827bf533da19b Mon Sep 17 00:00:00 2001 From: natdeanlewissoftwire Date: Thu, 2 Feb 2023 15:44:11 +0000 Subject: [PATCH] feat: revert saledate/exdate work --- app/models/form/sales/pages/handover_date_check.rb | 2 +- app/models/validations/sales/soft_validations.rb | 8 ++------ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/app/models/form/sales/pages/handover_date_check.rb b/app/models/form/sales/pages/handover_date_check.rb index 12ab7c2e3..cc0ce9a9b 100644 --- a/app/models/form/sales/pages/handover_date_check.rb +++ b/app/models/form/sales/pages/handover_date_check.rb @@ -1,7 +1,7 @@ class Form::Sales::Pages::HandoverDateCheck < ::Form::Page def initialize(id, hsh, subsection) super - @depends_on = [{ "hodate_3_years_or_more_exdate?" => true }] + @depends_on = [{ "hodate_3_years_or_more_saledate?" => true }] @informative_text = {} end diff --git a/app/models/validations/sales/soft_validations.rb b/app/models/validations/sales/soft_validations.rb index 1849b4ea0..a01209f65 100644 --- a/app/models/validations/sales/soft_validations.rb +++ b/app/models/validations/sales/soft_validations.rb @@ -47,12 +47,6 @@ module Validations::Sales::SoftValidations extrabor != 1 && mortgage + deposit > value - value * discount / 100 end - def hodate_3_years_or_more_exdate? - return unless hodate && exdate - - ((exdate.to_date - hodate.to_date).to_i / 365) >= 3 - end - def purchase_price_out_of_soft_range? return unless value && beds && la @@ -78,6 +72,8 @@ module Validations::Sales::SoftValidations def hodate_3_years_or_more_saledate? return unless hodate && saledate + + ((saledate.to_date - hodate.to_date).to_i / 365) >= 3 end def purchase_price_min_or_max_text