From: Elena Mamontova Date: Mon, 8 Aug 2016 07:03:49 +0000 (+0300) Subject: Ticket 37. TariffChangelsAllowed function name changed to X-Git-Tag: 2.409~128 X-Git-Url: https://git.stg.codes/stg.git/commitdiff_plain/5d4c15726d59897e9b6b52aaf986a4c4ea2fb553?ds=sidebyside;hp=e80cfd8ff6b861b428d318a899128cf971fe22c8 Ticket 37. TariffChangelsAllowed function name changed to TariffChangeIsAllowed in the ApplyChanges() function. --- diff --git a/projects/stargazer/plugins/configuration/sgconfig/parser_users.cpp b/projects/stargazer/plugins/configuration/sgconfig/parser_users.cpp index 18744106..b30b4e86 100644 --- a/projects/stargazer/plugins/configuration/sgconfig/parser_users.cpp +++ b/projects/stargazer/plugins/configuration/sgconfig/parser_users.cpp @@ -598,7 +598,7 @@ int CHG_USER::ApplyChanges() 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; @@ -606,7 +606,7 @@ int CHG_USER::ApplyChanges() } 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()); } }