Ticket 37. The stgTime argument added in TariffChangeIsAllowed()

[stg.git] / 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 b30b4e86d0fed47a16112dd85a2744df06e82e7a..5707b726200e97b5792646496667f6ffe7aa2755 100644 (file)
--- a/projects/stargazer/plugins/configuration/sgconfig/parser_users.cpp
+++ b/projects/stargazer/plugins/configuration/sgconfig/parser_users.cpp
@@ -594,11 +594,12 @@ 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 (newTariff)
         {
-            if (tariff->TariffChangeIsAllowed(*newTariff) == "")
+            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;
@@ -606,7 +607,6 @@ int CHG_USER::ApplyChanges()
             }
             else
             {
-                std::string message = tariff->TariffChangeIsAllowed(*newTariff);
                 GetStgLogger()("Tariff change is prohibited for user %s. %s", u->GetLogin().c_str(), message.c_str());
             }
         }