From b2714cd75b432ead84944ec9dd5f4a3c74b34f93 Mon Sep 17 00:00:00 2001 From: natdeanlewissoftwire Date: Fri, 21 Apr 2023 14:55:24 +0100 Subject: [PATCH] feat: make combined_income nil safe --- app/models/sales_log.rb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/models/sales_log.rb b/app/models/sales_log.rb index c10d3b755..6cf659bf6 100644 --- a/app/models/sales_log.rb +++ b/app/models/sales_log.rb @@ -358,6 +358,9 @@ class SalesLog < Log end def combined_income - income1 + income2 + buyer_1_income = income1 || 0 + buyer_2_income = income2 || 0 + + buyer_1_income + buyer_2_income end end