Browse Source

rename constant struct with same anme as existing variable

pull/1101/head
Arthur Campbell 3 years ago
parent
commit
d850ac1350
  1. 4
      app/models/sales_log.rb
  2. 10
      app/models/validations/sales/soft_validations.rb

4
app/models/sales_log.rb

@ -252,8 +252,8 @@ class SalesLog < Log
def income_soft_min_for_ecstat(ecstat_field) def income_soft_min_for_ecstat(ecstat_field)
economic_status_code = public_send(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
end end

10
app/models/validations/sales/soft_validations.rb

@ -1,5 +1,5 @@
module Validations::Sales::SoftValidations module Validations::Sales::SoftValidations
ALLOWED_INCOME_RANGES = { ALLOWED_INCOME_RANGES_SALES = {
1 => OpenStruct.new(soft_min: 5000), 1 => OpenStruct.new(soft_min: 5000),
2 => OpenStruct.new(soft_min: 1500), 2 => OpenStruct.new(soft_min: 1500),
3 => OpenStruct.new(soft_min: 1000), 3 => OpenStruct.new(soft_min: 1000),
@ -8,15 +8,15 @@ module Validations::Sales::SoftValidations
}.freeze }.freeze
def income1_under_soft_min? 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 end
def income2_under_soft_min? 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 end
def staircase_bought_above_fifty? def staircase_bought_above_fifty?

Loading…
Cancel
Save