X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/ac3670b33981698a02c5e95ab4f11cb3fe57562d..92430d277d40e31dcdcd527047e40ee5a19af399:/projects/stargazer/user_impl.cpp?ds=sidebyside diff --git a/projects/stargazer/user_impl.cpp b/projects/stargazer/user_impl.cpp index f3410368..36c0f84f 100644 --- a/projects/stargazer/user_impl.cpp +++ b/projects/stargazer/user_impl.cpp @@ -1184,7 +1184,7 @@ if (nextTariff.ConstData() != "") } else { - std::string message = tariff->TariffChangeIsAllowed(*nt); + std::string message = tariff->TariffChangeIsAllowed(*nt, stgTime); if (message.empty()) { property.tariffName.Set(nextTariff, sysAdmin, login, store); @@ -1342,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)