X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/865084c6d12eccbb596fef57f620350d96b70555..fb965f74c4ed2331d9605942da3673d1ba7a1dfe:/projects/stargazer/tariff_impl.cpp diff --git a/projects/stargazer/tariff_impl.cpp b/projects/stargazer/tariff_impl.cpp index d619b32d..a3084fbc 100644 --- a/projects/stargazer/tariff_impl.cpp +++ b/projects/stargazer/tariff_impl.cpp @@ -150,27 +150,19 @@ 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()) + "'."; } } //-----------------------------------------------------------------------------