From 3a713f9623a1a57377a1dd37c3e662020a4bf90d Mon Sep 17 00:00:00 2001 From: Marat Date: Sun, 18 Feb 2018 14:19:40 +0000 Subject: [PATCH 1/4] Update Envoy.blade.php --- Envoy.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Envoy.blade.php b/Envoy.blade.php index b0de027..9c1d597 100644 --- a/Envoy.blade.php +++ b/Envoy.blade.php @@ -35,7 +35,7 @@ echo '>> Запускаем тесты' @task('update_symlinks', ['on' => 'localhost']) @if ($branch) - ln -nfs {{ $new_release_dir }}/lms/wsgi.py {{ $app_dir }}/configs/{{ $branch }}/wsgi.py + ln -nfs {{ $app_dir }}/configs/{{ $branch }}/wsgi.py {{ $new_release_dir }}/lms/wsgi.py echo '>> Создаем симлинк на папку текущего релиза' ln -nfs {{ $new_release_dir }} {{ $app_dir }}/current_{{ $branch }} echo '>> restart Supervisor' From 6026a2a39a81a0f4e7ce17ea6904b10328fb0e63 Mon Sep 17 00:00:00 2001 From: Marat Date: Sun, 18 Feb 2018 16:16:48 +0000 Subject: [PATCH 2/4] Update Envoy.blade.php --- Envoy.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Envoy.blade.php b/Envoy.blade.php index 5ac8684..04fd919 100644 --- a/Envoy.blade.php +++ b/Envoy.blade.php @@ -39,7 +39,7 @@ echo '>> Создание симлинков' echo '>> Запускаем тесты' @if ($branch) cd {{ $new_release_dir }} - source /www/servers/python-server/bin/activate && python manage.py test + source /www/servers/python-server/bin/activate && python manage.py migrate && python manage.py test @endif @endtask From 5336c2c48758f66f159028dbf1610f78cb43c91c Mon Sep 17 00:00:00 2001 From: andrey Date: Mon, 2 Apr 2018 20:52:24 +0300 Subject: [PATCH 3/4] fix 500 error --- finance/views.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/finance/views.py b/finance/views.py index c550fda..b10c9e3 100644 --- a/finance/views.py +++ b/finance/views.py @@ -19,7 +19,8 @@ from django.utils.html import strip_tags from courses.models import Course from courses.api import CourseParamsApi -from finance.models import Bill, Invoice, InvoiceRebilling +from finance.models import Bill, Invoice, +ebilling from finance.serializers import BillSerializer, InvoiceSerializer from finance.tasks import setup_periodic_billing from lms.global_decorators import transaction_decorator @@ -268,7 +269,7 @@ class YandexPay(APIView): pay = Payment.objects.get(id=pk) try: inv = InvoiceRebilling.objects.get(yandex_pay=pay) - except InvoiceRebilling: + except InvoiceRebilling.DoesNotExist: inv = None r = requests.post('https://money.yandex.ru/eshop.xml', data={ 'shopId': pay.shop_id, @@ -483,4 +484,4 @@ class DemoYandexCheckView(YandexCheckView): class DemoYandexAvisoView(YandexAvisoView): - pass \ No newline at end of file + pass From b9594633766e72e1a93bff1ffc08b262a16cde42 Mon Sep 17 00:00:00 2001 From: andrey Date: Mon, 2 Apr 2018 20:54:20 +0300 Subject: [PATCH 4/4] fix 500 error --- finance/views.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/finance/views.py b/finance/views.py index b10c9e3..02f3c69 100644 --- a/finance/views.py +++ b/finance/views.py @@ -19,8 +19,7 @@ from django.utils.html import strip_tags from courses.models import Course from courses.api import CourseParamsApi -from finance.models import Bill, Invoice, -ebilling +from finance.models import Bill, Invoice, InvoiceRebilling from finance.serializers import BillSerializer, InvoiceSerializer from finance.tasks import setup_periodic_billing from lms.global_decorators import transaction_decorator