Merge remote-tracking branch 'origin/stg-2.409' into ticket37

[stg.git] / projects / stargazer / plugins / configuration / rpcconfig / users_methods.cpp

diff --git a/projects/stargazer/plugins/configuration/rpcconfig/users_methods.cpp b/projects/stargazer/plugins/configuration/rpcconfig/users_methods.cpp
index 5adbf44131905750cfa52fefbf1398b0842b2dd0..5a738d16d2b81220503c18177d63547b191a874e 100644 (file)
--- a/projects/stargazer/plugins/configuration/rpcconfig/users_methods.cpp
+++ b/projects/stargazer/plugins/configuration/rpcconfig/users_methods.cpp
@@ -381,16 +381,29 @@ if (tariffs->FindByName(tariff))
         }
     else
         {
         }
     else
         {

-        if (u->GetProperty().tariffName.Set(tariff,
+        const TARIFF * newTariff = tariffs->FindByName(tariff);
+        if (newTariff)
+            {
+            const TARIFF * currentTariff = u->GetTariff();
+            std::string message = currentTariff->TariffChangeIsAllowed(*newTariff);
+            if (message.empty())
+                {
+                if (u->GetProperty().tariffName.Set(tariff,

                                             admin,
                                             login,
                                             store,
                                             comment))
                                             admin,
                                             login,
                                             store,
                                             comment))

-            {
-            u->ResetNextTariff();
-            u->WriteConf();
-            *retvalPtr = xmlrpc_c::value_boolean(true);
-            return;
+                    {
+                    u->ResetNextTariff();
+                    u->WriteConf();
+                    *retvalPtr = xmlrpc_c::value_boolean(true);
+                    return;
+                    }
+                }
+            else
+                {
+                GetStgLogger()("Tariff change is prohibited for user %s. %s", u->GetLogin().c_str(), message.c_str());
+                }

             }
         }
     }
             }
         }
     }