From 8d645159c7fdeafbdfa8d6a3cc1fa6ae9ea40eee Mon Sep 17 00:00:00 2001 From: gzbender Date: Wed, 12 Sep 2018 21:29:01 +0500 Subject: [PATCH] lil-583 --- apps/payment/models.py | 4 ++-- apps/user/views.py | 14 +++++--------- project/settings.py | 2 +- 3 files changed, 8 insertions(+), 12 deletions(-) diff --git a/apps/payment/models.py b/apps/payment/models.py index a0fa11d3..f1613793 100644 --- a/apps/payment/models.py +++ b/apps/payment/models.py @@ -213,9 +213,9 @@ class Payment(PolymorphicModel): if isinstance(self, SchoolPayment): self.weekdays = amount_data.get('weekdays') super().save(*args, **kwargs) - if isinstance(self, CoursePayment): + if isinstance(self, CoursePayment) and paid: author_balance = getattr(self, 'authorbalance', None) - if not author_balance and paid: + if not author_balance : AuthorBalance.objects.create( author=self.course.author, amount=self.amount, diff --git a/apps/user/views.py b/apps/user/views.py index 9d3361a3..b2765a79 100644 --- a/apps/user/views.py +++ b/apps/user/views.py @@ -5,19 +5,15 @@ from os.path import splitext from datetime import timedelta from paymentwall import Pingback import short_url -from urllib.parse import urljoin from django.conf import settings from django.contrib.auth import login -from django.core.exceptions import ValidationError -from django.shortcuts import render, reverse, redirect +from django.shortcuts import reverse, redirect from django.views import View from django.views.generic import DetailView, UpdateView, TemplateView, FormView from django.contrib import messages from django.contrib.auth import get_user_model -from django.contrib.auth.decorators import login_required, permission_required -from django.contrib.auth.hashers import check_password, make_password -from django.http import Http404 +from django.contrib.auth.decorators import login_required from django.db.models import F, Func from django.urls import reverse_lazy from django.utils.decorators import method_decorator @@ -308,7 +304,7 @@ class BonusHistoryView(TemplateView): def get(self, request, *args, **kwargs): context = self.get_context_data(**kwargs) context['bonuses'] = request.user.bonuses.all() - context['referrer_url'] = urljoin(settings.MAIN_HOST, '%s?referrer=%s' % ( - reverse('index'), short_url.encode_url(request.user.id) - )) + context['referrer_url'] = '%s%s?referrer=%s' % ( + settings.MAIN_HOST, reverse('index'), short_url.encode_url(request.user.id) + ) return self.render_to_response(context) diff --git a/project/settings.py b/project/settings.py index 837df261..cb9ac8d4 100644 --- a/project/settings.py +++ b/project/settings.py @@ -31,7 +31,7 @@ SECRET_KEY = os.getenv('SECRET_KEY', 'jelm*91lj(_-o20+6^a+bgv!4s6e_efry^#+f#=1ak DEBUG = os.getenv('DEBUG', False) ALLOWED_HOSTS = os.getenv('ALLOWED_HOSTS', '*').split(',') -MAIN_HOST = 'lil.school' +MAIN_HOST = os.getenv('MAIN_HOST', 'lil.school') # Application definition