From 261191562bdf47c68de6add1108e966f93e6e74c Mon Sep 17 00:00:00 2001 From: gzbender Date: Thu, 25 Oct 2018 11:13:51 +0500 Subject: [PATCH] =?UTF-8?q?LIL-680=20=D0=9F=D0=BE=D0=B4=D0=B0=D1=80=D0=BE?= =?UTF-8?q?=D1=87=D0=BD=D1=8B=D0=B5=20=D1=81=D0=B5=D1=80=D1=82=D0=B8=D1=84?= =?UTF-8?q?=D0=B8=D0=BA=D0=B0=D1=82=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/payment/models.py | 8 ++++++++ apps/payment/views.py | 11 +++++++++-- project/urls.py | 1 + 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/apps/payment/models.py b/apps/payment/models.py index a953d5e8..4ac9b6b9 100644 --- a/apps/payment/models.py +++ b/apps/payment/models.py @@ -292,3 +292,11 @@ class UserBonus(models.Model): class Meta: ordering = ('created_at',) + + +class GiftCertificate(models.Model): + user = models.ForeignKey(User, on_delete=models.CASCADE, related_name='bonuses') + recipient = models.EmailField() + amount = models.DecimalField(max_digits=8, decimal_places=2, default=0, editable=False) + payment = models.ForeignKey(Payment, on_delete=models.SET_NULL, null=True) + bonus_sended = models.ForeignKey(UserBonus, blank=True, null=True) diff --git a/apps/payment/views.py b/apps/payment/views.py index 6be7734f..2f90259c 100644 --- a/apps/payment/views.py +++ b/apps/payment/views.py @@ -14,7 +14,7 @@ from django.contrib import messages from django.contrib.auth.decorators import login_required from django.http import HttpResponse from django.shortcuts import redirect, get_object_or_404 -from django.views.generic import View, TemplateView +from django.views.generic import View, TemplateView, DetailView from django.views.decorators.csrf import csrf_exempt from django.urls import reverse_lazy from django.utils.decorators import method_decorator @@ -27,7 +27,7 @@ from apps.course.models import Course from apps.school.models import SchoolSchedule from apps.payment.tasks import transaction_to_mixpanel, product_payment_to_mixpanel, transaction_to_roistat -from .models import AuthorBalance, CoursePayment, SchoolPayment, Payment, UserBonus +from .models import AuthorBalance, CoursePayment, SchoolPayment, Payment, UserBonus, GiftCertificate logger = logging.getLogger('django') @@ -297,3 +297,10 @@ class PaymentwallCallbackView(View): else: raise DisallowedPingbackHost return HttpResponse(status=403) + + +class GiftCertificateGetView(DetailView): + model = GiftCertificate + + def get(self): + pass diff --git a/project/urls.py b/project/urls.py index 38773131..396530cb 100644 --- a/project/urls.py +++ b/project/urls.py @@ -91,6 +91,7 @@ urlpatterns = [ path('contest//', ContestView.as_view(), name='contest'), path('contest-work//', ContestWorkView.as_view(), name='contest_work'), path('contest-work//comment', contest_work_comment, name='contest_work_comment'), + path('gift//get', ContestView.as_view(), name='contest'), ]