From 3a436a5e4ebe23e52e07fb81f6e62ca5df16f1c8 Mon Sep 17 00:00:00 2001 From: Arthur Campbell Date: Thu, 26 Jan 2023 15:59:23 +0000 Subject: [PATCH] fix rebase conflicts --- app/models/validations/sales/soft_validations.rb | 6 ++++++ spec/models/form/sales/subsections/outright_sale_spec.rb | 1 + .../form/sales/subsections/shared_ownership_scheme_spec.rb | 1 + 3 files changed, 8 insertions(+) diff --git a/app/models/validations/sales/soft_validations.rb b/app/models/validations/sales/soft_validations.rb index 4ae681922..0ec6ae056 100644 --- a/app/models/validations/sales/soft_validations.rb +++ b/app/models/validations/sales/soft_validations.rb @@ -64,4 +64,10 @@ module Validations::Sales::SoftValidations !grant.between?(9_000, 16_000) end + + def extra_borrowing_expected? + return unless extrabor && mortgage && deposit && value && cashdis + + mortgage + deposit > value - value * discount / 100 + end end diff --git a/spec/models/form/sales/subsections/outright_sale_spec.rb b/spec/models/form/sales/subsections/outright_sale_spec.rb index 45a9f4ca0..3c11152e4 100644 --- a/spec/models/form/sales/subsections/outright_sale_spec.rb +++ b/spec/models/form/sales/subsections/outright_sale_spec.rb @@ -21,6 +21,7 @@ RSpec.describe Form::Sales::Subsections::OutrightSale, type: :model do mortgage_lender_other_outright_sale mortgage_length_outright_sale extra_borrowing_outright_sale + extra_borrowing_value_check_outright_sale about_deposit_outright_sale outright_sale_deposit_value_check leasehold_charges_outright_sale diff --git a/spec/models/form/sales/subsections/shared_ownership_scheme_spec.rb b/spec/models/form/sales/subsections/shared_ownership_scheme_spec.rb index d131bc605..227c88b37 100644 --- a/spec/models/form/sales/subsections/shared_ownership_scheme_spec.rb +++ b/spec/models/form/sales/subsections/shared_ownership_scheme_spec.rb @@ -35,6 +35,7 @@ RSpec.describe Form::Sales::Subsections::SharedOwnershipScheme, type: :model do mortgage_lender_other_shared_ownership mortgage_length_shared_ownership extra_borrowing_shared_ownership + extra_borrowing_value_check_shared_ownership about_deposit_with_discount about_deposit_shared_ownership deposit_value_check