Add tariff change policy description.

[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 841fafa118c54734fe91d396dbc682060955bdb2..3a02fa18fd0c5ba33e58e69b5510b403502097f2 100644 (file)
--- a/projects/stargazer/plugins/configuration/sgconfig/parser_users.cpp
+++ b/projects/stargazer/plugins/configuration/sgconfig/parser_users.cpp
@@ -16,7 +16,7 @@
 
 /*
  *    Author : Boris Mikhailenko <stg34@stargazer.dp.ua>
 
 /*
  *    Author : Boris Mikhailenko <stg34@stargazer.dp.ua>

- *    Author : Maxim Mamontov <faust@stargazer.dp.ua>
+ *    Author : Maksym Mamontov <stg@madf.info>

  */
 
 #include "parser_users.h"
  */
 
 #include "parser_users.h"


@@ -598,7 +598,8 @@ int CHG_USER::ApplyChanges()
         if (newTariff)
         {
             const TARIFF * tariff = u->GetTariff();
         if (newTariff)
         {
             const TARIFF * tariff = u->GetTariff();

-            if (tariff->TariffChangeIsAllowed(*newTariff) == "")
+            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;
             {
                 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
             {
             }
             else
             {

-                std::string message = tariff->TariffChangeIsAllowed(*newTariff);

                 GetStgLogger()("Tariff change is prohibited for user %s. %s", u->GetLogin().c_str(), message.c_str());
             }
         }
                 GetStgLogger()("Tariff change is prohibited for user %s. %s", u->GetLogin().c_str(), message.c_str());
             }
         }