Ticket 37. In the ApplyChanges() function switch construction changed

to TariffChangelsAllowed() function call.

diff --git a/projects/stargazer/plugins/configuration/sgconfig/parser_users.cpp b/projects/stargazer/plugins/configuration/sgconfig/parser_users.cpp
index ce07b09452b0ad8ebf8d5c64a607e798af473d9a..18744106daa4b37730b957e576d7634c0482187a 100644 (file)
--- a/projects/stargazer/plugins/configuration/sgconfig/parser_users.cpp
+++ b/projects/stargazer/plugins/configuration/sgconfig/parser_users.cpp
@@ -598,54 +598,16 @@ int CHG_USER::ApplyChanges()
         const TARIFF * newTariff = m_tariffs.FindByName(m_ucr.tariffName.const_data());
         if (newTariff)
         {
-        switch (tariff->GetChangePolicy())
+            if (tariff->TariffChangelsAllowed(*newTariff) == "")
             {
-            case TARIFF::ALLOW:
-                {
                 if (!u->GetProperty().tariffName.Set(m_ucr.tariffName.const_data(), &m_currAdmin, m_login, &m_store))
                     return -1;
                 u->ResetNextTariff();
-                break;
-                }
-            case TARIFF::TO_CHEAP:
-                {
-                if (newTariff->GetFee() < tariff->GetFee())
-                    {
-                    if (!u->GetProperty().tariffName.Set(m_ucr.tariffName.const_data(), &m_currAdmin, m_login, &m_store))
-                        return -1;
-                u->ResetNextTariff();
-                    }
-                else
-                    GetStgLogger()("Tariff change is prohibited for user %s due to the policy %s. Current tariff %s is more cheap than new tariff %s.",
-                                 u->GetLogin().c_str(),
-                                 TARIFF::ChangePolicyToString(tariff->GetChangePolicy()).c_str(),
-                                 u->GetTariff()->GetName().c_str(),
-                                 newTariff->GetName().c_str());
-                break;
-                }
-            case TARIFF::TO_EXPENSIVE:
-                {
-                if (newTariff->GetFee() > tariff->GetFee())
-                {
-                     if (!u->GetProperty().tariffName.Set(m_ucr.tariffName.const_data(), &m_currAdmin, m_login, &m_store))
-                        return -1;
-                u->ResetNextTariff();
-                }
-                else
-                    GetStgLogger()("Tariff change is prohibited for user %s due to the policy %s. Current tariff %s is more expensive than new tariff %s.",
-                                 u->GetLogin().c_str(),
-                                 TARIFF::ChangePolicyToString(tariff->GetChangePolicy()).c_str(),
-                                 u->GetTariff()->GetName().c_str(),
-                                 newTariff->GetName().c_str());
-                break;
-                }
-            case TARIFF::DENY:
-                {
-                GetStgLogger()("Tariff change is prohibited for user %s. Tariff %s.",
-                             u->GetLogin().c_str(),
-                             u->GetTariff()->GetName().c_str());
-                break;
-                }
+            }
+            else
+            {
+                std::string message = tariff->TariffChangelsAllowed(*newTariff);
+                GetStgLogger()("Tariff change is prohibited for user %s. %s", u->GetLogin().c_str(), message.c_str());
             }
         }
         else