X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/5c0444f61fac031c47cac726e0b0bb9188f6eb18..ee882f766d3173ed8ffb6e52b06749c10832f1bf:/projects/stargazer/tariff_impl.cpp diff --git a/projects/stargazer/tariff_impl.cpp b/projects/stargazer/tariff_impl.cpp index 34590975..7dbae0da 100644 --- 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: @@ -157,12 +160,13 @@ switch (GetChangePolicy()) else 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 "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 ""; } //-----------------------------------------------------------------------------