X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/532591d204b34bd5d666b2e40eeeb6b047fd279c..26b7dcb329abea46e11695c4df61e54c9cf9fd6c:/projects/stargazer/tariff_impl.cpp

diff --git a/projects/stargazer/tariff_impl.cpp b/projects/stargazer/tariff_impl.cpp
index 32a52d8f..a3084fbc 100644
--- a/projects/stargazer/tariff_impl.cpp
+++ b/projects/stargazer/tariff_impl.cpp
@@ -145,32 +145,24 @@ else
     return tariffData.dirPrice[dir].priceDayA;
 }
 //-----------------------------------------------------------------------------
-std::string TARIFF_IMPL::TariffChangelsAllowed(const TARIFF & to) const
+std::string TARIFF_IMPL::TariffChangeIsAllowed(const TARIFF & to) const
 {
 switch (GetChangePolicy())
     {
     case TARIFF::ALLOW:
-        {
         return "";
-        }
     case TARIFF::TO_CHEAP:
-        {
         if (to.GetFee() < GetFee())
             return "";
         else
-            return "Current tariff " + GetName() + " is more cheap than new tariff " + to.GetName() + ". The policy is " + TARIFF::ChangePolicyToString(GetChangePolicy()).c_str() + ".";
-        }
+            return "New tariff '" + to.GetName() + "' is more expensive than current tariff '" + GetName() + "'. The policy is '" + TARIFF::ChangePolicyToString(GetChangePolicy()) + "'.";
     case TARIFF::TO_EXPENSIVE:
-        {
-        if (to.GetFee() > GetFee())
+        if (to.GetFee() >= GetFee())
             return "";
         else
-            return "Current tariff " + GetName() + " is more expensive than new tariff " + to.GetName() + ". The policy is " + TARIFF::ChangePolicyToString(GetChangePolicy()).c_str() + ".";
-        }
+            return "New tariff '" + to.GetName() + "' is more cheap than current tariff '" + GetName() + "'. The policy is '" + TARIFF::ChangePolicyToString(GetChangePolicy()) + "'.";
     case TARIFF::DENY:
-        {
-        return "Current tariff " + GetName() + ", new tariff " + to.GetName() + ".";
-        }
+        return "Current tariff '" + GetName() + "', new tariff '" + to.GetName() + "'. The policy is '" + TARIFF::ChangePolicyToString(GetChangePolicy()) + "'.";
     }
 }
 //-----------------------------------------------------------------------------