]> git.stg.codes - stg.git/commitdiff
Ticket 37. TariffChangelsAllowed function name changed to
authorElena Mamontova <helenh463@gmail.com>
Mon, 8 Aug 2016 07:03:49 +0000 (10:03 +0300)
committerElena Mamontova <helenh463@gmail.com>
Mon, 8 Aug 2016 07:03:49 +0000 (10:03 +0300)
TariffChangeIsAllowed in the ApplyChanges() function.

projects/stargazer/plugins/configuration/sgconfig/parser_users.cpp

index 18744106daa4b37730b957e576d7634c0482187a..b30b4e86d0fed47a16112dd85a2744df06e82e7a 100644 (file)
@@ -598,7 +598,7 @@ int CHG_USER::ApplyChanges()
         const TARIFF * newTariff = m_tariffs.FindByName(m_ucr.tariffName.const_data());
         if (newTariff)
         {
         const TARIFF * newTariff = m_tariffs.FindByName(m_ucr.tariffName.const_data());
         if (newTariff)
         {
-            if (tariff->TariffChangelsAllowed(*newTariff) == "")
+            if (tariff->TariffChangeIsAllowed(*newTariff) == "")
             {
                 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 +606,7 @@ int CHG_USER::ApplyChanges()
             }
             else
             {
             }
             else
             {
-                std::string message = tariff->TariffChangelsAllowed(*newTariff);
+                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());
             }
         }