diff --git a/RELEASE b/RELEASE index 620cdbe6b..508177ec4 100644 --- a/RELEASE +++ b/RELEASE @@ -1 +1 @@ -0.7.8 rev 5109 +0.7.8 rev 5110 diff --git a/api/libs/api.exhorse.php b/api/libs/api.exhorse.php index 36a8c116b..c6510f461 100644 --- a/api/libs/api.exhorse.php +++ b/api/libs/api.exhorse.php @@ -207,7 +207,7 @@ protected function loadConfig() { if ($this->altCfg['UKV_ENABLED']) { $this->ukvFlag = true; $this->ukvComplex = $this->altCfg['UKV_COMPLEX_TARIFFID']; - $this->ukvIllegal = $this->altCfg['UKV_ILLEGEL_TARIFFID']; + $this->ukvIllegal = $this->altCfg['UKV_ILLEGAL_TARIFFID']; $this->ukvSocial = $this->altCfg['UKV_SOCIAL_TARIFFID']; $this->ukvDebtLimit = $this->altCfg['UKV_MONTH_DEBTLIMIT']; } diff --git a/config/alter.ini b/config/alter.ini index 2fc0555f8..d0c4c0a56 100644 --- a/config/alter.ini +++ b/config/alter.ini @@ -487,7 +487,7 @@ MG_PERCENT=15 ;Is exestential horse enabled? EXHORSE_ENABLED=0 ;UKV illegal users tariff id -UKV_ILLEGEL_TARIFFID=10 +UKV_ILLEGAL_TARIFFID=10 ;UKV complex users tariff id UKV_COMPLEX_TARIFFID=11 ;UKV socail service tariff id diff --git a/config/optsaltcfg b/config/optsaltcfg index 6eb67b8c7..ade894fe2 100755 --- a/config/optsaltcfg +++ b/config/optsaltcfg @@ -263,6 +263,10 @@ VLANMACHISTORY=TRIGGER|VLAN and MAC history enabled VLAN_ONLINE_IN_PROFILE=TRIGGER|Detect online in profile enabled SIGNAL_IN_PROFILE=TRIGGER|Show ONU signal in profile DEALWITHIT_ENABLED=TRIGGER|Delayed per-user actions management enabled +EXHORSE_ENABLED=TRIGGER|Is exestential horse enabled +UKV_ILLEGAL_TARIFFID=VARCHAR|UKV illegal users tariff id +UKV_COMPLEX_TARIFFID=VARCHAR|UKV complex users tariff id +UKV_SOCIAL_TARIFFID=VARCHAR|UKV socail service tariff id CHAPTEREND_BEH=true diff --git a/languages/russian/billing.php b/languages/russian/billing.php index 895f00284..836ceb62e 100755 --- a/languages/russian/billing.php +++ b/languages/russian/billing.php @@ -2256,9 +2256,10 @@ $lang['def']['DOCSIS Modems'] = 'DOCSIS модемы'; $lang['def']['right to use existential horse'] = 'Право использовать экзистенциального коня'; $lang['def']['Incoming calls'] = 'Входящих звонков'; +$lang['def']['Is exestential horse enabled'] = 'Экзистенциальный конь включен'; +$lang['def']['UKV illegal users tariff id'] = 'Тариф нелегальных пользователей УКВ'; +$lang['def']['UKV complex users tariff id'] = 'Тариф комплексных пользователей УКВ'; +$lang['def']['UKV socail service tariff id'] = 'Тариф социальных пользователей УКВ'; $lang['def'][''] = ''; $lang['def'][''] = ''; - - - ?> diff --git a/languages/ukrainian/billing.php b/languages/ukrainian/billing.php index ec1b97884..947dd5a8c 100755 --- a/languages/ukrainian/billing.php +++ b/languages/ukrainian/billing.php @@ -2271,5 +2271,9 @@ $lang['def']['DOCSIS Modems'] = 'DOCSIS модеми'; $lang['def']['right to use existential horse'] = 'Право використовувати екзистенціального коня'; $lang['def']['Incoming calls'] = 'Вхідних дзвінків'; +$lang['def']['Is exestential horse enabled'] = 'Екзистенціального коня ввімкнено'; +$lang['def']['UKV illegal users tariff id'] = 'Тариф нелегальних користувачів УКВ'; +$lang['def']['UKV complex users tariff id'] = 'Тариф комплексних користувачів УКВ'; +$lang['def']['UKV socail service tariff id'] = 'Тариф соціальних користувачів УКВ'; ?>