From: Maxim Mamontov <faust.madf@gmail.com>
Date: Sat, 20 Aug 2016 10:25:24 +0000 (+0300)
Subject: Merge branch 'stg-2.409'
X-Git-Url: https://git.stg.codes/stg.git/commitdiff_plain/6a24f530fab7ebff1617f6d3929d2fcad7ed4818?hp=-c

Merge branch 'stg-2.409'
---

6a24f530fab7ebff1617f6d3929d2fcad7ed4818
diff --combined projects/stargazer/user_impl.cpp
index 11f4385b,d7bc8ea2..fe197cc5
--- a/projects/stargazer/user_impl.cpp
+++ b/projects/stargazer/user_impl.cpp
@@@ -1328,75 -1328,6 +1328,75 @@@ 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)
@@@ -1563,13 -1494,18 +1563,18 @@@ else if (!oldValue && newValue && user-
  //-----------------------------------------------------------------------------
  void CHG_TARIFF_NOTIFIER::Notify(const std::string &, const std::string & newTariff)
  {
+ STG_LOCKER lock(&user->mutex);
  if (user->settings->GetReconnectOnTariffChange() && user->connected)
      user->Disconnect(false, "Change tariff");
  user->tariff = user->tariffs->FindByName(newTariff);
  if (user->settings->GetReconnectOnTariffChange() &&
      !user->authorizedBy.empty() &&
      user->IsInetable())
+     {
+     // This notifier gets called *before* changing the tariff, and in Connect we want to see new tariff name.
+     user->property.Conf().tariffName = newTariff;
      user->Connect(false);
+     }
  }
  //-----------------------------------------------------------------------------
  void CHG_CASH_NOTIFIER::Notify(const double & oldCash, const double & newCash)