Rename tariff to tariffName

diff --git a/projects/stargazer/user_impl.cpp b/projects/stargazer/user_impl.cpp
index 30a3c171941720787cb664cc47ec2ce4fac29728..47f352284a1a96ed2bb2b4cbe0d240909dede687 100644 (file)
--- a/projects/stargazer/user_impl.cpp
+++ b/projects/stargazer/user_impl.cpp
@@ -1521,7 +1521,7 @@ std::string USER_IMPL::GetParamValue(const std::string & name) const
     if (lowerName == "login")       return login;
     if (lowerName == "currip")      return currIP.ToString();
     if (lowerName == "enableddirs") return GetEnabledDirs();
-    if (lowerName == "tariffname")  return property.GetPropertyValue("tarrif");
+    if (lowerName == "tariff")      return property.tariffName;
     if (property.Exists(lowerName))
         return property.GetPropertyValue(lowerName);
     else

diff --git a/projects/stargazer/user_property.cpp b/projects/stargazer/user_property.cpp
index feef2e598ab4ad39405036823601dd9b03d77a89..1f04facc65044a9d0c34ea62ad973c25dff7f5e5 100644 (file)
--- a/projects/stargazer/user_property.cpp
+++ b/projects/stargazer/user_property.cpp
@@ -17,8 +17,8 @@ USER_PROPERTIES::USER_PROPERTIES(const std::string & sd)
       disabled    (conf.disabled,     "disabled",     false, false, GetStgLogger(), sd, properties),
       disabledDetailStat(conf.disabledDetailStat, "DisabledDetailStat", false, false, GetStgLogger(), sd, properties),
       alwaysOnline(conf.alwaysOnline, "alwaysOnline", false, false, GetStgLogger(), sd, properties),
-      tariffName  (conf.tariffName,   "tariff",       false, false, GetStgLogger(), sd, properties),
-      nextTariff  (conf.nextTariff,   "nextTariff",  false, false, GetStgLogger(), sd, properties),
+      tariffName  (conf.tariffName,   "tariffName",       false, false, GetStgLogger(), sd, properties),
+      nextTariff  (conf.nextTariff,   "nextTariff",   false, false, GetStgLogger(), sd, properties),
       address     (conf.address,      "address",      false, false, GetStgLogger(), sd, properties),
       note        (conf.note,         "note",         false, false, GetStgLogger(), sd, properties),
       group       (conf.group,        "group",        false, false, GetStgLogger(), sd, properties),