Merge branch 'hotfix/lil-609' into 'master'

LIL-609 Некорректное время в комментария

See merge request lilcity/backend!87

apps/course/models.py

@@ -7,6 +7,7 @@ from django.utils.text import slugify
 from django.utils.timezone import now
 from django.contrib.auth import get_user_model
 from django.urls import reverse_lazy
+from django.conf import settings
 from polymorphic_tree.models import PolymorphicMPTTModel, PolymorphicTreeForeignKey
 
 from project.mixins import BaseModel, DeactivatedMixin
@@ -129,11 +130,11 @@ class Course(BaseModel, DeactivatedMixin):
 
     @property
     def deferred_start_at_humanize(self):
-        return arrow.get(self.deferred_start_at).humanize(locale='ru')
+        return arrow.get(self.deferred_start_at, settings.TIME_ZONE).humanize(locale='ru')
 
     @property
     def created_at_humanize(self):
-        return arrow.get(self.created_at).humanize(locale='ru')
+        return arrow.get(self.created_at, settings.TIME_ZONE).humanize(locale='ru')
 
     @property
     def is_deferred_start(self):
@@ -234,7 +235,7 @@ class Comment(PolymorphicMPTTModel, DeactivatedMixin):
 
     @property
     def created_at_humanize(self):
-        return arrow.get(self.created_at).humanize(locale='ru')
+        return arrow.get(self.created_at, settings.TIME_ZONE).humanize(locale='ru')
 
     def __str__(self):
         return self.content

apps/payment/models.py

@@ -9,6 +9,7 @@ from django.contrib.auth import get_user_model
 from django.contrib.postgres.fields import ArrayField, JSONField
 from django.core.validators import RegexValidator
 from django.utils.timezone import now
+from django.conf import settings
 
 from project.utils import weekday_in_date_range
 
@@ -198,4 +199,4 @@ class SchoolPayment(Payment):
 
     @property
     def date_end_humanize(self):
-        return arrow.get(self.date_end).humanize(locale='ru')
+        return arrow.get(self.date_end, settings.TIME_ZONE).humanize(locale='ru')

apps/payment/views.py

@@ -17,6 +17,7 @@ from django.views.decorators.csrf import csrf_exempt
 from django.urls import reverse_lazy
 from django.utils.decorators import method_decorator
 from django.utils.timezone import now
+from django.conf import settings
 
 from paymentwall import Pingback, Product, Widget
 
@@ -219,14 +220,14 @@ class PaymentwallCallbackView(View):
                             date_start = self.add_months(sourcedate=now().replace(hour=0, minute=0, day=1), months=1)
                             date_end = school_payment.date_end
                         else:
-                            date_start = arrow.get(school_payment.date_end).shift(days=1).datetime
+                            date_start = arrow.get(school_payment.date_end, settings.TIME_ZONE).shift(days=1).datetime
-                            date_end = arrow.get(date_start).shift(months=1).datetime
+                            date_end = arrow.get(date_start, settings.TIME_ZONE).shift(months=1).datetime
                     else:
                         #month = 0 if now().day >= 1 and now().day <= 10 else 1
                         # Логика июльского лагеря: до конца июля приобретаем только на текущий месяц
                         month = 0
                         date_start = self.add_months(sourcedate=now().replace(hour=0, minute=0, day=1), months=month)
-                        date_end = arrow.get(date_start).shift(months=1, minutes=-1).datetime
+                        date_end = arrow.get(date_start, settings.TIME_ZONE).shift(months=1, minutes=-1).datetime
                     payment.date_start = date_start
                     payment.date_end = date_end
             if product_type_name == 'course':

apps/school/templates/blocks/open_lesson.html

@@ -1,4 +1,4 @@
 <a
   class="timing__btn btn btn_light"
   href="{% url 'school:lesson-detail' live_lesson.id %}"
->смотреть урок</a>
+>подробнее</a>

apps/user/views.py

@@ -1,5 +1,3 @@
-import arrow
-
 from io import BytesIO
 from PIL import Image
 from uuid import uuid4