X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/c949afc4f9940c71c63ce6dda771eb32e6fd8c65..3d0666c75bc51feb1ef512578e65c06a92c71cc8:/projects/stargazer/plugins/configuration/sgconfig/parser_users.cpp

diff --git a/projects/stargazer/plugins/configuration/sgconfig/parser_users.cpp b/projects/stargazer/plugins/configuration/sgconfig/parser_users.cpp
index dbd82b0b..5707b726 100644
--- a/projects/stargazer/plugins/configuration/sgconfig/parser_users.cpp
+++ b/projects/stargazer/plugins/configuration/sgconfig/parser_users.cpp
@@ -594,13 +594,21 @@ int CHG_USER::ApplyChanges()
 
     if (!m_ucr.tariffName.empty())
     {
-        const TARIFF * tariff = u->GetTariff();
         const TARIFF * newTariff = m_tariffs.FindByName(m_ucr.tariffName.const_data());
-        if (m_tariffs.FindByName(m_ucr.tariffName.const_data()))
+        if (newTariff)
         {
-            if (!u->GetProperty().tariffName.Set(m_ucr.tariffName.const_data(), &m_currAdmin, m_login, &m_store))
-                return -1;
-            u->ResetNextTariff();
+            const TARIFF * tariff = u->GetTariff();
+            std::string message = tariff->TariffChangeIsAllowed(*newTariff, stgTime);
+            if (message.empty())
+            {
+                if (!u->GetProperty().tariffName.Set(m_ucr.tariffName.const_data(), &m_currAdmin, m_login, &m_store))
+                    return -1;
+                u->ResetNextTariff();
+            }
+            else
+            {
+                GetStgLogger()("Tariff change is prohibited for user %s. %s", u->GetLogin().c_str(), message.c_str());
+            }
         }
         else
         {