changes for konica

abonapp/views.py

@@ -33,7 +33,7 @@ from djing.lib.mixins import (
 from group_app.models import Group
 from guardian.decorators import \
     permission_required_or_403 as permission_required
-from guardian.shortcuts import get_objects_for_user, assign_perm
+#from guardian.shortcuts import get_objects_for_user, assign_perm
 from gw_app.models import NASModel
 from gw_app.nas_managers import NasFailedResult, NasNetworkError
 from ip_pool.models import NetworkModel
@@ -89,12 +89,13 @@ class GroupListView(LoginRequiredMixin, OnlyAdminsMixin, OrderedFilteredList):
     template_name = 'abonapp/group_list.html'
 
     def get_queryset(self):
-        queryset = get_objects_for_user(
-            self.request.user,
-            'group_app.view_group', klass=Group,
-            use_groups=False,
-            accept_global_perms=False
-        )
+        #queryset = get_objects_for_user(
+        #    self.request.user,
+        #    'group_app.view_group', klass=Group,
+        #    use_groups=False,
+        #    accept_global_perms=False
+        #)
+        queryset = Group.objects.all()
         return queryset.annotate(usercount=Count('abon'))
 
 
@@ -131,10 +132,10 @@ class AbonCreateView(LoginRequiredMixin, OnlyAdminsMixin,
         try:
             abon = form.save()
             me = self.request.user
-            assign_perm("abonapp.change_abon", me, abon)
-            assign_perm("abonapp.delete_abon", me, abon)
-            assign_perm("abonapp.can_buy_tariff", me, abon)
-            assign_perm('abonapp.can_add_ballance', me, abon)
+            #assign_perm("abonapp.change_abon", me, abon)
+            #assign_perm("abonapp.delete_abon", me, abon)
+            #assign_perm("abonapp.can_buy_tariff", me, abon)
+            #assign_perm('abonapp.can_add_ballance', me, abon)
             me.log(self.request.META, 'cusr', '%s, "%s", %s' % (
                 abon.username, abon.fio,
                 abon.group.title if abon.group else ''

accounts_app/views.py

@@ -191,7 +191,7 @@ class AccountsListView(LoginRequiredMixin, OnlyAdminsMixin, ListView):
 
     def get_queryset(self):
         users = UserProfile.objects.filter(is_admin=True).exclude(pk=self.request.user.pk)
-        users = get_objects_for_user(self.request.user, 'accounts_app.view_userprofile', users)
+        #users = get_objects_for_user(self.request.user, 'accounts_app.view_userprofile', users)
         return users
 
 

devapp/views.py

@@ -27,7 +27,7 @@ from abonapp.models import Abon
 from accounts_app.models import UserProfile
 from messenger.tasks import multicast_viber_notify
 from guardian.decorators import permission_required_or_403 as permission_required
-from guardian.shortcuts import get_objects_for_user
+#from guardian.shortcuts import get_objects_for_user
 from devapp.forms import DeviceForm, PortForm, DeviceExtraDataForm, DeviceRebootForm
 from devapp.models import Device, Port, DeviceDBException, DeviceMonitoringException
 from devapp.tasks import onu_register
@@ -598,11 +598,11 @@ class GroupsListView(LoginAdminMixin, global_base_views.OrderedFilteredList):
     template_name = 'devapp/group_list.html'
     model = Group
 
-    def get_queryset(self):
-        groups = get_objects_for_user(self.request.user,
-                                      'group_app.view_group', klass=Group,
-                                      accept_global_perms=False)
-        return groups
+    #def get_queryset(self):
+    #    groups = get_objects_for_user(self.request.user,
+    #                                  'group_app.view_group', klass=Group,
+    #                                  accept_global_perms=False)
+    #    return groups
 
 
 @login_required

djing/settings.py

@@ -213,13 +213,13 @@ BOOTSTRAP3 = {
 
 
 # Email config
-EMAIL_HOST_USER = local_settings.EMAIL_HOST_USER
-EMAIL_HOST = local_settings.EMAIL_HOST
-EMAIL_PORT = local_settings.EMAIL_PORT
-EMAIL_HOST_PASSWORD = local_settings.EMAIL_HOST_PASSWORD
-EMAIL_USE_TLS = getattr(local_settings, 'EMAIL_USE_TLS', True)
+#EMAIL_HOST_USER = local_settings.EMAIL_HOST_USER
+#EMAIL_HOST = local_settings.EMAIL_HOST
+#EMAIL_PORT = local_settings.EMAIL_PORT
+#EMAIL_HOST_PASSWORD = local_settings.EMAIL_HOST_PASSWORD
+#EMAIL_USE_TLS = getattr(local_settings, 'EMAIL_USE_TLS', True)
 
-SERVER_EMAIL = getattr(local_settings, 'SERVER_EMAIL', EMAIL_HOST_USER)
+#SERVER_EMAIL = getattr(local_settings, 'SERVER_EMAIL', EMAIL_HOST_USER)
 
 # REDIS related settings
 REDIS_HOST = 'localhost'
@@ -230,7 +230,7 @@ CELERY_RESULT_BACKEND = 'redis://%s:%d/0' % (REDIS_HOST, REDIS_PORT)
 
 
 # public url for Viber Bot
-VIBER_BOT_PUBLIC_URL = local_settings.VIBER_BOT_PUBLIC_URL
+#VIBER_BOT_PUBLIC_URL = local_settings.VIBER_BOT_PUBLIC_URL
 
 
 # Encrypted fields

group_app/views.py

@@ -9,7 +9,7 @@ from django.contrib import messages
 from django.conf import settings
 from djing.lib.decorators import only_admins
 from guardian.decorators import permission_required_or_403 as permission_required
-from guardian.shortcuts import get_objects_for_user
+#from guardian.shortcuts import get_objects_for_user
 
 from djing.global_base_views import OrderedFilteredList
 from . import models
@@ -28,11 +28,11 @@ class GroupListView(OrderedFilteredList):
     model = models.Group
     context_object_name = 'groups'
 
-    def get_queryset(self):
-        queryset = get_objects_for_user(self.request.user,
-                                        'group_app.view_group', klass=self.model,
-                                        accept_global_perms=False)
-        return queryset
+    #def get_queryset(self):
+    #    queryset = get_objects_for_user(self.request.user,
+    #                                    'group_app.view_group', klass=self.model,
+    #                                    accept_global_perms=False)
+    #    return queryset
 
 
 @method_decorator(login_decs, name='dispatch')

install/install_debian.sh

@@ -58,7 +58,7 @@ python3 -m venv venv
 source ./venv/bin/activate
 pip3 install --upgrade pip
 export PYCURL_SSL_LIBRARY=openssl
-pip3 install -r requirements.txt
+#pip3 install -r requirements.txt
 cp djing/local_settings.py.example djing/local_settings.py
 sed -i "s/'PASSWORD': 'password',/'PASSWORD': '${dbpassw}',/" djing/local_settings.py
 chmod +x ./manage.py

tariff_app/custom_tariffs.py

@@ -1,10 +1,11 @@
 # -*- coding: utf-8 -*-
-from datetime import timedelta, datetime
+from datetime import timedelta, datetime, date
+from typing import AnyStr
+from calendar import monthrange
 
 from django.utils import timezone
 from django.utils.translation import gettext as _
 from .base_intr import TariffBase, PeriodicPayCalcBase
-from calendar import monthrange
 
 from random import uniform
 
@@ -65,7 +66,7 @@ class TariffCp(TariffDp):
     def calc_deadline(self) -> datetime:
         # делаем время окончания услуги на 10 лет вперёд
         nw = timezone.now()
-        long_long_time = datetime(year=nw.year + 10, month=nw.month, day=1,
+        long_long_time = datetime(year=nw.year + 10, month=nw.month, day=nw.day,
                                   hour=23, minute=59, second=59)
         return long_long_time
 
@@ -97,8 +98,10 @@ class PeriodicPayCalcDefault(PeriodicPayCalcBase):
         return model_object.amount
 
     def get_next_time_to_pay(self, model_object, last_time_payment) -> datetime:
-        # TODO: решить какой будет расёт периодических платежей
-        return datetime.now() + timedelta(days=30)
+        today = date.today()
+        nw = datetime(today.year, today.month, today.day)
+        days = monthrange(nw.year, nw.month)[1]
+        return nw + timedelta(days - nw.day+1)
 
 
 class PeriodicPayCalcCustom(PeriodicPayCalcDefault):

templates/all_base.html

@@ -42,10 +42,10 @@
                 {% url 'acc_app:other_profile' request.user.id as home_url %}
                 <li{% if home_url == request.path %} class="active"{% endif %}><a href="{{ home_url }}">{% trans 'Main page' %}</a></li>
 
-                {% if request.user.is_superuser %}
-                    {% url 'mapapp:home' as map_url %}
-                    <li{% if map_url == request.path %} class="active"{% endif %}><a href="{{ map_url }}" target="_blank">{% trans 'Map page' %}</a></li>
-                {% endif %}
+		{# {% if request.user.is_superuser %} #}
+		{#    {% url 'mapapp:home' as map_url %} #}
+		{#    <li{% if map_url == request.path %} class="active"{% endif %}><a href="{{ map_url }}" target="_blank">{% trans 'Map page' %}</a></li> #}
+		{# {% endif %} #}
 
                 <li class="dropdown">
                     <a href="#" class="dropdown-toggle" data-toggle="dropdown">{% trans 'Other' %} <b class="caret"></b></a>

templates/base.html

@@ -88,14 +88,14 @@
     		    </a>
             </li>
 
-            {% if perms.traf_stat.statcache_view %}
-                {% url 'traf_stat:home' as stathome %}
-                <li{% if stathome in request.path %} class="active"{% endif %}>
-                    <a href="{{ stathome }}">
-                        <span class="glyphicon glyphicon-dashboard"></span> {% trans 'Traffic' %}
-                    </a>
-                </li>
-            {% endif %}
+	    {# {% if perms.traf_stat.statcache_view %} #}
+	    {#    {% url 'traf_stat:home' as stathome %} #}
+	    {#    <li{% if stathome in request.path %} class="active"{% endif %}> #}
+	    {#        <a href="{{ stathome }}"> #}
+	    {#            <span class="glyphicon glyphicon-dashboard"></span> {% trans 'Traffic' %} #}
+	    {#        </a> #}
+	    {#    </li> #}
+	    {# {% endif %} #}
 
             {% url 'devapp:group_list' as devapp_groups %}
             <li{% if devapp_groups in request.path %} class="active"{% endif %}>