Reset delayed tariff change when setting new tariff immediately

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

diff --git a/projects/stargazer/plugins/configuration/rpcconfig/users_methods.h b/projects/stargazer/plugins/configuration/rpcconfig/users_methods.h
index ee8e656ec1ad98d3dbf4dbf0a9e752f41716f9f5..047258044747fa56505ed5bf846eeaff29dd7871 100644 (file)
--- a/projects/stargazer/plugins/configuration/rpcconfig/users_methods.h
+++ b/projects/stargazer/plugins/configuration/rpcconfig/users_methods.h
@@ -4,10 +4,12 @@
 #include <xmlrpc-c/base.hpp>
 #include <xmlrpc-c/registry.hpp>
 
-#include "../../../users.h"
-#include "../../../user.h"
-
 class RPC_CONFIG;
+class ADMINS;
+class TARIFFS;
+class USERS;
+class STORE;
+struct IP_MASK;
 
 class METHOD_USER_GET : public xmlrpc_c::method {
 public:
@@ -83,10 +85,12 @@ class METHOD_USER_CHG : public xmlrpc_c::method {
 public:
     METHOD_USER_CHG(RPC_CONFIG * c,
                     ADMINS * a,
-                    BASE_STORE * s,
+                    TARIFFS * t,
+                    STORE * s,
                     USERS * u)
         : config(c),
           admins(a),
+          tariffs(t),
           store(s),
           users(u)
     {
@@ -97,7 +101,8 @@ public:
 private:
     RPC_CONFIG * config;
     ADMINS * admins;
-    BASE_STORE * store;
+    TARIFFS * tariffs;
+    STORE * store;
     USERS * users;
 };
 
@@ -105,7 +110,7 @@ class METHOD_USER_CASH_ADD : public xmlrpc_c::method {
 public:
     METHOD_USER_CASH_ADD(RPC_CONFIG * c,
                          ADMINS * a,
-                         BASE_STORE * s,
+                         STORE * s,
                          USERS * u)
         : config(c),
           admins(a),
@@ -119,7 +124,7 @@ public:
 private:
     RPC_CONFIG * config;
     ADMINS * admins;
-    BASE_STORE * store;
+    STORE * store;
     USERS * users;
 };
 
@@ -127,7 +132,7 @@ class METHOD_USER_CASH_SET : public xmlrpc_c::method {
 public:
     METHOD_USER_CASH_SET(RPC_CONFIG * c,
                          ADMINS * a,
-                         BASE_STORE * s,
+                         STORE * s,
                          USERS * u)
         : config(c),
           admins(a),
@@ -141,7 +146,7 @@ public:
 private:
     RPC_CONFIG * config;
     ADMINS * admins;
-    BASE_STORE * store;
+    STORE * store;
     USERS * users;
 };
 
@@ -150,7 +155,7 @@ public:
     METHOD_USER_TARIFF_CHANGE(RPC_CONFIG * c,
                               ADMINS * a,
                               TARIFFS * t,
-                              BASE_STORE * s,
+                              STORE * s,
                               USERS * u)
         : config(c),
           admins(a),
@@ -166,7 +171,7 @@ private:
     RPC_CONFIG * config;
     ADMINS * admins;
     TARIFFS * tariffs;
-    BASE_STORE * store;
+    STORE * store;
     USERS * users;
 };