diff --git a/apps/school/models.py b/apps/school/models.py index 199ceb5f..a51e2b09 100644 --- a/apps/school/models.py +++ b/apps/school/models.py @@ -23,3 +23,6 @@ class SchoolSchedule(models.Model): ordering = ('weekday',) verbose_name = 'Расписание' verbose_name_plural = 'Расписания' + + def __str__(self): + return dict(self.WEEKDAY_CHOICES).get(self.weekday, '') diff --git a/project/urls.py b/project/urls.py index 7619ecdf..90aafb7e 100644 --- a/project/urls.py +++ b/project/urls.py @@ -29,7 +29,8 @@ from apps.user.views import ( UserView, UserEditView, NotificationEditView, PaymentHistoryView, resend_email_verify, ) -from apps.payment.views import CourseBuyView, PaymentwallCallbackView +from apps.payment.views import CourseBuyView, PaymentwallCallbackView, SchoolBuyView +from apps.school.models import SchoolSchedule urlpatterns = [ path('admin/', admin.site.urls), @@ -49,6 +50,7 @@ urlpatterns = [ path('payments/ping', PaymentwallCallbackView.as_view(), name='payment-ping'), path('payments/success', TemplateView.as_view(template_name='payment/payment_success.html'), name='payment-success'), path('payments/error', TemplateView.as_view(template_name='payment/payment_error.html'), name='payment-error'), + path('school/checkout', SchoolBuyView.as_view(), name='school-checkout'), path('search/', SearchView.as_view(), name='search'), path('user//', UserView.as_view(), name='user'), path('user//edit', UserEditView.as_view(), name='user-edit-profile'), @@ -58,7 +60,15 @@ urlpatterns = [ path('privacy', TemplateView.as_view(template_name="templates/lilcity/privacy_policy.html"), name='privacy'), path('terms', TemplateView.as_view(template_name="templates/lilcity/terms.html"), name='terms'), path('refund-policy', TemplateView.as_view(template_name="templates/lilcity/refund_policy.html"), name='refund_policy'), - path('', TemplateView.as_view(template_name="templates/lilcity/main.html", extra_context={'course_items': Course.objects.all()[:3]}), name='index'), + path('', + TemplateView.as_view( + template_name="templates/lilcity/main.html", + extra_context={ + 'course_items': Course.objects.filter(status=Course.PUBLISHED)[:3], + 'school_schedules': SchoolSchedule.objects.all(), + }), + name='index' + ), path('api/v1/', include(('api.v1.urls', 'api_v1'))), path('test', TemplateView.as_view(template_name="templates/lilcity/test.html"), name='test'), ]