From d850ac1350f1b68fd8214407bdcb9dbfc426a4a7 Mon Sep 17 00:00:00 2001 From: Arthur Campbell Date: Thu, 2 Feb 2023 14:48:13 +0000 Subject: [PATCH] rename constant struct with same anme as existing variable --- app/models/sales_log.rb | 4 ++-- app/models/validations/sales/soft_validations.rb | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/app/models/sales_log.rb b/app/models/sales_log.rb index 5f4cacc99..ee9e6bef5 100644 --- a/app/models/sales_log.rb +++ b/app/models/sales_log.rb @@ -252,8 +252,8 @@ class SalesLog < Log def income_soft_min_for_ecstat(ecstat_field) economic_status_code = public_send(ecstat_field) - return unless ALLOWED_INCOME_RANGES + return unless ALLOWED_INCOME_RANGES_SALES - ALLOWED_INCOME_RANGES[economic_status_code]&.soft_min + ALLOWED_INCOME_RANGES_SALES[economic_status_code]&.soft_min end end diff --git a/app/models/validations/sales/soft_validations.rb b/app/models/validations/sales/soft_validations.rb index 61ac8bc3c..c1704d948 100644 --- a/app/models/validations/sales/soft_validations.rb +++ b/app/models/validations/sales/soft_validations.rb @@ -1,5 +1,5 @@ module Validations::Sales::SoftValidations - ALLOWED_INCOME_RANGES = { + ALLOWED_INCOME_RANGES_SALES = { 1 => OpenStruct.new(soft_min: 5000), 2 => OpenStruct.new(soft_min: 1500), 3 => OpenStruct.new(soft_min: 1000), @@ -8,15 +8,15 @@ module Validations::Sales::SoftValidations }.freeze def income1_under_soft_min? - return false unless ecstat1 && income1 && ALLOWED_INCOME_RANGES[ecstat1] + return false unless ecstat1 && income1 && ALLOWED_INCOME_RANGES_SALES[ecstat1] - income1 < ALLOWED_INCOME_RANGES[ecstat1][:soft_min] + income1 < ALLOWED_INCOME_RANGES_SALES[ecstat1][:soft_min] end def income2_under_soft_min? - return false unless ecstat2 && income2 && ALLOWED_INCOME_RANGES[ecstat2] + return false unless ecstat2 && income2 && ALLOWED_INCOME_RANGES_SALES[ecstat2] - income2 < ALLOWED_INCOME_RANGES[ecstat2][:soft_min] + income2 < ALLOWED_INCOME_RANGES_SALES[ecstat2][:soft_min] end def staircase_bought_above_fifty?