Add tests for fee charge rules with non-zero credit

[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 d16d883f480d4be0ead41f829cec7bb15e393621..4932e146ccfefce2d89428e3ef9de3c89297a931 100644 (file)
--- a/projects/stargazer/plugins/configuration/rpcconfig/users_methods.cpp
+++ b/projects/stargazer/plugins/configuration/rpcconfig/users_methods.cpp
@@ -1,17 +1,16 @@
 #include <cerrno>
 
 #include <cerrno>
 

-#include "users_methods.h"
-
-#include "users.h"
-#include "admins.h"
-#include "tariffs.h"
-#include "../../../user_property.h"
+#include "stg/users.h"
+#include "stg/admins.h"
+#include "stg/tariffs.h"
+#include "stg/user_ips.h"
+#include "stg/common.h"
+#include "stg/user_property.h"

 
 

+#include "users_methods.h"

 #include "rpcconfig.h"
 #include "user_helper.h"
 #include "rpcconfig.h"
 #include "user_helper.h"

-#include "user_ips.h"

 #include "utils.h"
 #include "utils.h"

-#include "common.h"

 
 //------------------------------------------------------------------------------
 
 
 //------------------------------------------------------------------------------
 


@@ -73,7 +72,7 @@ if (config->GetAdminInfo(cookie, &adminInfo))
 
 ADMIN * admin = NULL;
 
 
 ADMIN * admin = NULL;
 

-if (admins->FindAdmin(adminInfo.admin, &admin))
+if (admins->Find(adminInfo.admin, &admin))

     {
     *retvalPtr = xmlrpc_c::value_boolean(false);
     return;
     {
     *retvalPtr = xmlrpc_c::value_boolean(false);
     return;


@@ -117,7 +116,7 @@ if (config->GetAdminInfo(cookie, &adminInfo))
 
 ADMIN * admin;
 
 
 ADMIN * admin;
 

-if (admins->FindAdmin(adminInfo.admin, &admin))
+if (admins->Find(adminInfo.admin, &admin))

     {
     *retvalPtr = xmlrpc_c::value_boolean(false);
     return;
     {
     *retvalPtr = xmlrpc_c::value_boolean(false);
     return;


@@ -125,7 +124,7 @@ if (admins->FindAdmin(adminInfo.admin, &admin))
 
 USER_PTR u;
 
 
 USER_PTR u;
 

-if (users->FindByName(login, &u))
+if (!users->FindByName(login, &u))

     {
     users->Del(login, admin);
     *retvalPtr = xmlrpc_c::value_boolean(true);
     {
     users->Del(login, admin);
     *retvalPtr = xmlrpc_c::value_boolean(true);


@@ -209,7 +208,7 @@ if (config->GetAdminInfo(cookie, &adminInfo))
 
 ADMIN * admin;
 
 
 ADMIN * admin;
 

-if (admins->FindAdmin(adminInfo.admin, &admin))
+if (admins->Find(adminInfo.admin, &admin))

     {
     *retvalPtr = xmlrpc_c::value_boolean(false);
     return;
     {
     *retvalPtr = xmlrpc_c::value_boolean(false);
     return;


@@ -262,7 +261,7 @@ if (config->GetAdminInfo(cookie, &adminInfo))
 
 ADMIN * admin;
 
 
 ADMIN * admin;
 

-if (admins->FindAdmin(adminInfo.admin, &admin))
+if (admins->Find(adminInfo.admin, &admin))

     {
     *retvalPtr = xmlrpc_c::value_boolean(false);
     return;
     {
     *retvalPtr = xmlrpc_c::value_boolean(false);
     return;


@@ -312,7 +311,7 @@ if (config->GetAdminInfo(cookie, &adminInfo))
 
 ADMIN * admin;
 
 
 ADMIN * admin;
 

-if (admins->FindAdmin(adminInfo.admin, &admin))
+if (admins->Find(adminInfo.admin, &admin))

     {
     *retvalPtr = xmlrpc_c::value_boolean(false);
     return;
     {
     *retvalPtr = xmlrpc_c::value_boolean(false);
     return;


@@ -360,7 +359,7 @@ if (config->GetAdminInfo(cookie, &adminInfo))
 
 ADMIN * admin;
 
 
 ADMIN * admin;
 

-if (admins->FindAdmin(adminInfo.admin, &admin))
+if (admins->Find(adminInfo.admin, &admin))

     {
     *retvalPtr = xmlrpc_c::value_boolean(false);
     return;
     {
     *retvalPtr = xmlrpc_c::value_boolean(false);
     return;


@@ -395,6 +394,7 @@ if (tariffs->FindByName(tariff))
                                             login,
                                             store))
             {
                                             login,
                                             store))
             {

+            u->ResetNextTariff();

             u->WriteConf();
             *retvalPtr = xmlrpc_c::value_boolean(true);
             return;
             u->WriteConf();
             *retvalPtr = xmlrpc_c::value_boolean(true);
             return;