fix

[wolnelektury.git] / src / club / payu / models.py

diff --git a/src/club/payu/models.py b/src/club/payu/models.py
index 1a49dd7..b025bfc 100644 (file)
--- a/src/club/payu/models.py
+++ b/src/club/payu/models.py
@@ -7,7 +7,8 @@ from urllib.request import HTTPError
 from django.contrib.sites.models import Site
 from django.db import models
 from django.urls import reverse
 from django.contrib.sites.models import Site
 from django.db import models
 from django.urls import reverse

-from django.utils.translation import ugettext_lazy as _
+from django.utils.timezone import now
+from django.utils.translation import gettext_lazy as _

 from . import POSS
 
 
 from . import POSS
 
 


@@ -35,7 +36,11 @@ class Order(models.Model):
         ('COMPLETED', _('Completed')),
         ('CANCELED', _('Canceled')),
         ('REJECTED', _('Rejected')),
         ('COMPLETED', _('Completed')),
         ('CANCELED', _('Canceled')),
         ('REJECTED', _('Rejected')),

+
+        ('ERR-INVALID_TOKEN', _('Invalid token')),

     ])
     ])

+    created_at = models.DateTimeField(null=True, blank=True, auto_now_add=True)
+    completed_at = models.DateTimeField(null=True, blank=True)

 
     class Meta:
         abstract = True
 
     class Meta:
         abstract = True


@@ -72,6 +77,9 @@ class Order(models.Model):
     def get_notify_url(self):
         raise NotImplementedError
 
     def get_notify_url(self):
         raise NotImplementedError
 

+    def get_thanks_url(self):
+        raise NotImplementedError
+

     def status_updated(self):
         pass
 
     def status_updated(self):
         pass
 


@@ -80,6 +88,11 @@ class Order(models.Model):
     def get_pos(self):
         return POSS[self.pos_id]
 
     def get_pos(self):
         return POSS[self.pos_id]
 

+    def get_continue_url(self):
+        return "https://{}{}".format(
+            Site.objects.get_current().domain,
+            self.get_thanks_url())
+

     def get_representation(self, token=None):
         rep = {
             "notifyUrl": self.get_notify_url(),
     def get_representation(self, token=None):
         rep = {
             "notifyUrl": self.get_notify_url(),


@@ -87,7 +100,7 @@ class Order(models.Model):
             "merchantPosId": self.pos_id,
             "currencyCode": self.get_pos().currency_code,
             "totalAmount": str(int(self.get_amount() * 100)),
             "merchantPosId": self.pos_id,
             "currencyCode": self.get_pos().currency_code,
             "totalAmount": str(int(self.get_amount() * 100)),

-            "extOrderId": "wolne-lektury-rcz-%d" % self.pk,
+            "extOrderId": "wolne-lektury-%d" % self.pk,

 
             "buyer": self.get_buyer() or {},
             "continueUrl": self.get_continue_url(),
 
             "buyer": self.get_buyer() or {},
             "continueUrl": self.get_continue_url(),


@@ -124,11 +137,19 @@ class Order(models.Model):
                 token.save()
             # else?
 
                 token.save()
             # else?
 

-        self.order_id = response['orderId']
-        self.save()
+        if 'orderId' not in response:
+            code = response.get('status', {}).get('codeLiteral', '')
+            if code:
+                self.status = 'ERR-' + str(code)
+                self.save()
+                self.status_updated()
+            else:
+                raise ValueError("Expecting dict with `orderId` key, got: %s" % response)
+        else:
+            self.order_id = response['orderId']
+            self.save()

 
 

-        
-        return response.get('redirectUri', self.schedule.get_thanks_url())
+        return response.get('redirectUri', self.get_thanks_url())

 
 
 class Notification(models.Model):
 
 
 class Notification(models.Model):


@@ -148,5 +169,7 @@ class Notification(models.Model):
         status = self.get_status()
         if self.order.status not in (status, 'COMPLETED'):
             self.order.status = status
         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()
             self.order.save()
             self.order.status_updated()