diff --git a/abonapp/migrations/0005_auto_20180123_1353.py b/abonapp/migrations/0005_auto_20180123_1353.py new file mode 100644 index 0000000..b2705a6 --- /dev/null +++ b/abonapp/migrations/0005_auto_20180123_1353.py @@ -0,0 +1,20 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11 on 2018-01-23 13:53 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('abonapp', '0004_auto_20180122_1732'), + ] + + operations = [ + migrations.AlterField( + model_name='alltimepaylog', + name='receipt_num', + field=models.BigIntegerField(default=0, verbose_name='Receipt number'), + ), + ] diff --git a/abonapp/models.py b/abonapp/models.py index 34e59a1..676d23a 100644 --- a/abonapp/models.py +++ b/abonapp/models.py @@ -339,7 +339,7 @@ class AllTimePayLog(models.Model): date_add = models.DateTimeField(auto_now_add=True) summ = models.FloatField(default=0.0) trade_point = models.CharField(_('Trade point'), max_length=20, default=None, null=True, blank=True) - receipt_num = models.IntegerField(_('Receipt number'), default=0) + receipt_num = models.BigIntegerField(_('Receipt number'), default=0) objects = AllTimePayLogManager() diff --git a/abonapp/pay_systems.py b/abonapp/pay_systems.py index 261be3c..b5b4b62 100644 --- a/abonapp/pay_systems.py +++ b/abonapp/pay_systems.py @@ -12,13 +12,17 @@ SERV_ID = getattr(settings, 'PAY_SERV_ID') def allpay(request): - def bad_ret(err_id): + def bad_ret(err_id, err_description=None): current_date = timezone.now() - return "\n" \ - "\n" \ - " %d\n" % safe_int(err_id) +\ - " %s\n" % current_date.strftime("%d.%m.%Y %H:%M:%S") +\ - "" + res = [ + "", + "", + " %d" % safe_int(err_id), + " %s" % current_date.strftime("%d.%m.%Y %H:%M:%S"), + " %s" % err_description if err_description is not None else '', + "" + ] + return '\n'.join(res) try: serv_id = request.GET.get('SERVICE_ID') @@ -36,8 +40,8 @@ def allpay(request): if our_sign != sign: return bad_ret(-101) - if act <= 0: return bad_ret(-101) - if pay_account == 0: return bad_ret(-40) + if act <= 0: return bad_ret(-101, 'ACT less than zero') + if pay_account == 0: return bad_ret(-40, 'PAY_ACCOUNT is not passed') if act == 1: abon = Abon.objects.get(username=pay_account) @@ -99,7 +103,7 @@ def allpay(request): " \n" \ "" else: - return bad_ret(-101) + return bad_ret(-101, 'ACT is not passed') except Abon.DoesNotExist: return bad_ret(-40)