X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/0d5bff91a33dc190351adc0010f8218c81423799..040deac4b8ae0728e3ff7635bb16595ec08d5817:/projects/stargazer/user_impl.cpp

diff --git a/projects/stargazer/user_impl.cpp b/projects/stargazer/user_impl.cpp
index c160db75..aea25c78 100644
--- a/projects/stargazer/user_impl.cpp
+++ b/projects/stargazer/user_impl.cpp
@@ -1178,10 +1178,24 @@ if (nextTariff.ConstData() != "")
     {
     const TARIFF * nt = tariffs->FindByName(nextTariff);
     if (nt == NULL)
+        {
         WriteServLog("Cannot change tariff for user %s. Tariff %s not exist.",
                      login.c_str(), property.tariffName.Get().c_str());
+        }
     else
-        property.tariffName.Set(nextTariff, sysAdmin, login, store);
+        {
+        std::string message = tariff->TariffChangeIsAllowed(*nt);
+        if (message.empty())
+            {
+            property.tariffName.Set(nextTariff, sysAdmin, login, store);
+            }
+        else
+            {
+            WriteServLog("Tariff change is prohibited for user %s. %s",
+                         login.c_str(),
+                         message.c_str());
+            }
+        }
     ResetNextTariff();
     WriteConf();
     }
@@ -1328,75 +1342,6 @@ switch (settings->GetFeeChargeType())
 ResetPassiveTime();
 }
 //-----------------------------------------------------------------------------
-void USER_IMPL::ProcessServices()
-{
-struct tm tms;
-time_t t = stgTime;
-localtime_r(&t, &tms);
-
-double passiveTimePart = 1.0;
-if (!settings->GetFullFee())
-    {
-    passiveTimePart = GetPassiveTimePart();
-    }
-else
-    {
-    if (passive.ConstData())
-        {
-        printfd(__FILE__, "Don't charge fee `cause we are passive\n");
-        return;
-        }
-    }
-
-for (size_t i = 0; i < property.Conf().services.size(); ++i)
-    {
-    SERVICE_CONF conf;
-    if (m_services.Find(property.Conf().services[i], &conf))
-        continue;
-    if (conf.payDay == tms.tm_mday ||
-        (conf.payDay == 0 && tms.tm_mday == DaysInCurrentMonth()))
-        {
-        double c = cash;
-        double fee = conf.cost * passiveTimePart;
-        printfd(__FILE__, "Service fee. login: %8s Cash=%f Credit=%f  Fee=%f PassiveTimePart=%f fee=%f\n",
-                login.c_str(),
-                cash.ConstData(),
-                credit.ConstData(),
-                tariff->GetFee(),
-                passiveTimePart,
-                fee);
-        switch (settings->GetFeeChargeType())
-            {
-            case 0:
-                property.cash.Set(c - fee, sysAdmin, login, store, "Subscriber fee charge");
-                SetPrepaidTraff();
-                break;
-            case 1:
-                if (c + credit >= 0)
-                    {
-                    property.cash.Set(c - fee, sysAdmin, login, store, "Subscriber fee charge");
-                    SetPrepaidTraff();
-                    }
-                break;
-            case 2:
-                if (c + credit >= fee)
-                    {
-                    property.cash.Set(c - fee, sysAdmin, login, store, "Subscriber fee charge");
-                    SetPrepaidTraff();
-                    }
-                break;
-            case 3:
-                if (c >= 0)
-                    {
-                    property.cash.Set(c - fee, sysAdmin, login, store, "Subscriber fee charge");
-                    SetPrepaidTraff();
-                    }
-                break;
-            }
-        }
-    }
-}
-//-----------------------------------------------------------------------------
 void USER_IMPL::SetPrepaidTraff()
 {
 if (tariff != NULL)