Browse Source

Fix database error

devel
bashmak 8 years ago
parent
commit
ad7799bf39
  1. 20
      abonapp/migrations/0005_auto_20180123_1353.py
  2. 2
      abonapp/models.py
  3. 22
      abonapp/pay_systems.py

20
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'),
),
]

2
abonapp/models.py

@ -339,7 +339,7 @@ class AllTimePayLog(models.Model):
date_add = models.DateTimeField(auto_now_add=True) date_add = models.DateTimeField(auto_now_add=True)
summ = models.FloatField(default=0.0) summ = models.FloatField(default=0.0)
trade_point = models.CharField(_('Trade point'), max_length=20, default=None, null=True, blank=True) 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() objects = AllTimePayLogManager()

22
abonapp/pay_systems.py

@ -12,13 +12,17 @@ SERV_ID = getattr(settings, 'PAY_SERV_ID')
def allpay(request): def allpay(request):
def bad_ret(err_id):
def bad_ret(err_id, err_description=None):
current_date = timezone.now() current_date = timezone.now()
return "<?xml version='1.0' encoding='UTF-8'?>\n" \
"<pay-response>\n" \
" <status_code>%d</status_code>\n" % safe_int(err_id) +\
" <time_stamp>%s</time_stamp>\n" % current_date.strftime("%d.%m.%Y %H:%M:%S") +\
"</pay-response>"
res = [
"<?xml version='1.0' encoding='UTF-8'?>",
"<pay-response>",
" <status_code>%d</status_code>" % safe_int(err_id),
" <time_stamp>%s</time_stamp>" % current_date.strftime("%d.%m.%Y %H:%M:%S"),
" <description>%s</description>" % err_description if err_description is not None else '',
"</pay-response>"
]
return '\n'.join(res)
try: try:
serv_id = request.GET.get('SERVICE_ID') serv_id = request.GET.get('SERVICE_ID')
@ -36,8 +40,8 @@ def allpay(request):
if our_sign != sign: if our_sign != sign:
return bad_ret(-101) 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: if act == 1:
abon = Abon.objects.get(username=pay_account) abon = Abon.objects.get(username=pay_account)
@ -99,7 +103,7 @@ def allpay(request):
" </transaction>\n" \ " </transaction>\n" \
"</pay-response>" "</pay-response>"
else: else:
return bad_ret(-101)
return bad_ret(-101, 'ACT is not passed')
except Abon.DoesNotExist: except Abon.DoesNotExist:
return bad_ret(-40) return bad_ret(-40)

Loading…
Cancel
Save