From 115cefc0cf3c62ef32cab55654b490973866c80a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Karl=20Erik=20=C3=95unapuu?= <karlerik@kreative.ee>
Date: Mon, 8 Feb 2021 12:01:19 +0200
Subject: [PATCH] Fix some CC issues

---
 .../domains/check_balance/single_domain.rb            | 11 +++++++----
 test/integration/repp/v1/domains/bulk_renew_test.rb   |  2 +-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/app/interactions/domains/check_balance/single_domain.rb b/app/interactions/domains/check_balance/single_domain.rb
index d9b1fbb24..411318d66 100644
--- a/app/interactions/domains/check_balance/single_domain.rb
+++ b/app/interactions/domains/check_balance/single_domain.rb
@@ -12,9 +12,6 @@ module Domains
         if domain_pricelist.try(:price)
           price = domain_pricelist.price.amount
           return price if balance_ok?(price)
-
-          domain.add_epp_error(2104, nil, nil, I18n.t(:not_enough_funds))
-          errors.add(:domain, I18n.t(:billing_failure_credit_balance_low, domain: domain.name))
         else
           domain.add_epp_error(2104, nil, nil, I18n.t(:active_price_missing_for_this_operation))
           errors.add(:domain, I18n.t(:active_price_missing_for_operation_with_domain,
@@ -27,7 +24,13 @@ module Domains
       private
 
       def balance_ok?(price)
-        domain.registrar.cash_account.balance >= price
+        if domain.registrar.cash_account.balance >= price
+          true
+        else
+          domain.add_epp_error(2104, nil, nil, I18n.t(:not_enough_funds))
+          errors.add(:domain, I18n.t(:billing_failure_credit_balance_low, domain: domain.name))
+          false
+        end
       end
 
       def domain_pricelist
diff --git a/test/integration/repp/v1/domains/bulk_renew_test.rb b/test/integration/repp/v1/domains/bulk_renew_test.rb
index 4cec91914..26a34dd39 100644
--- a/test/integration/repp/v1/domains/bulk_renew_test.rb
+++ b/test/integration/repp/v1/domains/bulk_renew_test.rb
@@ -69,7 +69,7 @@ class ReppV1DomainsBulkRenewTest < ActionDispatch::IntegrationTest
 
       assert_response :bad_request
       assert_equal 2002, json[:code]
-      assert_equal 'Not enough funds for renew domains', json[:message]
+      assert_equal 'Domain Billing failure - credit balance low', json[:message]
     end
   end