diff --git a/app/models/case_log.rb b/app/models/case_log.rb index 898dc44af..e68190e10 100644 --- a/app/models/case_log.rb +++ b/app/models/case_log.rb @@ -263,7 +263,7 @@ private self.totchild = get_totchild self.totelder = get_totelder self.totadult = get_totadult - self.tcharge = brent.to_i + scharge.to_i + pscharge.to_i + supcharg.to_i + self.tcharge = brent.to_f + scharge.to_f + pscharge.to_f + supcharg.to_f self.has_benefits = get_has_benefits self.nocharge = household_charge == "Yes" ? "No" : "Yes" end diff --git a/spec/models/case_log_spec.rb b/spec/models/case_log_spec.rb index 2a0b5e43a..bd5ad8c23 100644 --- a/spec/models/case_log_spec.rb +++ b/spec/models/case_log_spec.rb @@ -1138,16 +1138,16 @@ RSpec.describe Form, type: :model do CaseLog.create({ managing_organisation: organisation, owning_organisation: organisation, - brent: 5, - scharge: 10, + brent: 5.77, + scharge: 10.01, pscharge: 3, - supcharg: 12, + supcharg: 12.2, }) end it "correctly sums rental charges" do record_from_db = ActiveRecord::Base.connection.execute("select tcharge from case_logs where id=#{case_log.id}").to_a[0] - expect(record_from_db["tcharge"]).to eq(30) + expect(record_from_db["tcharge"]).to eq(30.98) end end