X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/d16ae7b9a503ecb0bb10fa2710d3c8e3e9ee190f..3d0666c75bc51feb1ef512578e65c06a92c71cc8:/projects/stargazer/plugins/configuration/sgconfig/parser_users.cpp?ds=sidebyside diff --git a/projects/stargazer/plugins/configuration/sgconfig/parser_users.cpp b/projects/stargazer/plugins/configuration/sgconfig/parser_users.cpp index 18744106..5707b726 100644 --- 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->TariffChangelsAllowed(*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->TariffChangelsAllowed(*newTariff); GetStgLogger()("Tariff change is prohibited for user %s. %s", u->GetLogin().c_str(), message.c_str()); } }