Merge branch 'feature/drawing-camp' into 'master'

рисовальный лагерь

See merge request lilschool/site!301

apps/payment/models.py

@@ -1,4 +1,4 @@
-from datetime import timedelta, date
+from datetime import timedelta, date, datetime
 from decimal import Decimal
 
 import arrow
@@ -147,6 +147,8 @@ class Payment(PolymorphicModel):
         camp_start = date(now().year, 6, 1)
         camp_end = date(now().year, 8, 31)
         date_start = date_start or now().date()
+        if isinstance(date_start, datetime):
+            date_start = date_start.date()
         if is_camp:
             if date_start < camp_start:
                 date_start = camp_start