X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/6d42bc478e3d1bd90eb294464748c21e4de0fc63..7875aab03fcc043840567f873c9e38e4ee9f638c:/src/club/payu/models.py?ds=inline diff --git a/src/club/payu/models.py b/src/club/payu/models.py index 1cd689dde..5764f8842 100644 --- a/src/club/payu/models.py +++ b/src/club/payu/models.py @@ -7,35 +7,42 @@ from urllib.request import HTTPError from django.contrib.sites.models import Site from django.db import models from django.urls import reverse +from django.utils.timezone import now +from django.utils.translation import ugettext_lazy as _ from . import POSS class CardToken(models.Model): """ This should be attached to a payment schedule. """ - pos_id = models.CharField(max_length=255) - disposable_token = models.CharField(max_length=255) - reusable_token = models.CharField(max_length=255, null=True, blank=True) - created_at = models.DateTimeField(auto_now_add=True) + pos_id = models.CharField(_('POS id'), max_length=255) + disposable_token = models.CharField(_('disposable token'), max_length=255) + reusable_token = models.CharField(_('reusable token'), max_length=255, null=True, blank=True) + created_at = models.DateTimeField(_('created_at'), auto_now_add=True) class Meta: abstract = True + verbose_name = _('PayU card token') + verbose_name_plural = _('PayU card tokens') class Order(models.Model): - pos_id = models.CharField(max_length=255) # TODO: redundant? - customer_ip = models.GenericIPAddressField() - order_id = models.CharField(max_length=255, blank=True) + pos_id = models.CharField(_('POS id'), max_length=255) # TODO: redundant? + customer_ip = models.GenericIPAddressField(_('customer IP')) + order_id = models.CharField(_('order ID'), max_length=255, blank=True) status = models.CharField(max_length=128, blank=True, choices=[ - ('PENDING', 'Pending'), - ('WAITING_FOR_CONFIRMATION', 'Waiting for confirmation'), - ('COMPLETED', 'Completed'), - ('CANCELED', 'Canceled'), - ('REJECTED', 'Rejected'), + ('PENDING', _('Pending')), + ('WAITING_FOR_CONFIRMATION', _('Waiting for confirmation')), + ('COMPLETED', _('Completed')), + ('CANCELED', _('Canceled')), + ('REJECTED', _('Rejected')), ]) + completed_at = models.DateTimeField(null=True, blank=True) class Meta: abstract = True + verbose_name = _('PayU order') + verbose_name_plural = _('PayU orders') # These need to be provided in a subclass. @@ -119,6 +126,8 @@ class Order(models.Model): token.save() # else? + if 'orderId' not in response: + raise ValueError("Expecting dict with `orderId` key, got: %s" % response) self.order_id = response['orderId'] self.save() @@ -128,11 +137,13 @@ class Order(models.Model): class Notification(models.Model): """ Add `order` FK to real Order model. """ - body = models.TextField() - received_at = models.DateTimeField(auto_now_add=True) + body = models.TextField(_('body')) + received_at = models.DateTimeField(_('received_at'), auto_now_add=True) class Meta: abstract = True + verbose_name = _('PayU notification') + verbose_name_plural = _('PayU notifications') def get_status(self): return json.loads(self.body)['order']['status'] @@ -141,5 +152,7 @@ class Notification(models.Model): status = self.get_status() if self.order.status not in (status, 'COMPLETED'): self.order.status = status + if status == 'COMPLETED': + self.order.completed_at = now() self.order.save() self.order.status_updated()