Merge remote-tracking branch 'origin/master' into ticket

[stg.git] / projects / stargazer / tariff_impl.cpp

diff --git a/projects/stargazer/tariff_impl.cpp b/projects/stargazer/tariff_impl.cpp
index 271a1da08036752728c55de665ed8f43f5e55003..2daaeeb3756c6bc8f8e7da3dc19bf22a78444efa 100644 (file)
--- a/projects/stargazer/tariff_impl.cpp
+++ b/projects/stargazer/tariff_impl.cpp
@@ -145,8 +145,11 @@ else
     return tariffData.dirPrice[dir].priceDayA;
 }
 //-----------------------------------------------------------------------------
-std::string TARIFF_IMPL::TariffChangeIsAllowed(const TARIFF & to) const
+std::string TARIFF_IMPL::TariffChangeIsAllowed(const TARIFF & to, time_t currentTime) const
 {
+time_t timeout = GetChangePolicyTimeout();
+if ((currentTime > timeout) && (timeout != 0))
+    return "";
 switch (GetChangePolicy())
     {
     case TARIFF::ALLOW:
@@ -155,14 +158,14 @@ switch (GetChangePolicy())
         if (to.GetFee() < GetFee())
             return "";
         else
-            return "Current tariff " + GetName() + " is more cheap than new tariff " + to.GetName() + ". The policy is " + TARIFF::ChangePolicyToString(GetChangePolicy()) + ".";
+            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()) + ".";
+            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() + ". The policy is " + TARIFF::ChangePolicyToString(GetChangePolicy()) + ".";
+        return "Current tariff '" + GetName() + "', new tariff '" + to.GetName() + "'. The policy is '" + TARIFF::ChangePolicyToString(GetChangePolicy()) + "'.";
     }
 }
 //-----------------------------------------------------------------------------