Merge pull request #22 from Jyrno42/usability-tweaks

Usability tweaks

Makefile

@@ -10,7 +10,7 @@ black:
 
 
 isort-run:
-	isort . $(cmd)
+	isort -p . $(cmd)
 
 
 isort:

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "django-thorbanks"
-version = "0.6.1"
+version = "0.6.2"
 description = "`django-thorbanks` provides a Django application for Estonian banklinks (iPizza protocol)."
 authors = ["Thorgate <info@thorgate.eu>"]
 license = "BSD-3-Clause"

thorbanks/abstract_models.py

@@ -40,6 +40,14 @@ class Meta:
         verbose_name = _("transaction")
         ordering = ["-last_modified"]
 
+    @property
+    def message(self):
+        return self.description
+
+    @message.setter
+    def message(self, value):
+        self.description = value
+
 
 class AbstractAuthentication(models.Model):
     STATUS_PENDING = "P"

thorbanks/forms.py

@@ -112,25 +112,29 @@ def finalize(self):
 
 class PaymentRequestBase(forms.Form):
     def __init__(self, *args, extra_fields=None, **kwargs):
-        self.transaction = settings.get_model("Transaction")()
-        self.transaction.bank_name = kwargs["bank_name"]
-        self.transaction.description = kwargs["message"]
-        self.transaction.amount = round(kwargs["amount"], 2)
-        self.transaction.currency = kwargs["currency"]
-        self.transaction.message = kwargs["message"]
+        if "existing_transaction" in kwargs:
+            self.transaction = kwargs.pop("existing_transaction")
 
-        self.transaction.redirect_after_success = kwargs["redirect_to"]
-        self.transaction.redirect_on_failure = kwargs["redirect_on_failure"]
+        else:
+            self.transaction = settings.get_model("Transaction")()
+            self.transaction.bank_name = kwargs["bank_name"]
+            self.transaction.description = kwargs["message"]
+            self.transaction.amount = round(kwargs["amount"], 2)
+            self.transaction.currency = kwargs["currency"]
+            self.transaction.message = kwargs["message"]
 
-        if extra_fields is not None:
-            for key, value in extra_fields.items():
-                setattr(self.transaction, key, value)
+            self.transaction.redirect_after_success = kwargs["redirect_to"]
+            self.transaction.redirect_on_failure = kwargs["redirect_on_failure"]
 
-        self.transaction.save()
+            if extra_fields is not None:
+                for key, value in extra_fields.items():
+                    setattr(self.transaction, key, value)
 
-        transaction_started.send(
-            settings.get_model("Transaction"), transaction=self.transaction
-        )
+            self.transaction.save()
+
+            transaction_started.send(
+                settings.get_model("Transaction"), transaction=self.transaction
+            )
 
         initial = self.prepare(self.transaction, kwargs["url"])
 

thorbanks/views.py

@@ -62,13 +62,13 @@ def response(request):
             # Mark purchase as complete
             transaction.status = klass.STATUS_COMPLETED
             transaction.save()
-            transaction_succeeded.send(klass, transaction=transaction)
+            transaction_succeeded.send(klass, transaction=transaction, request=request)
     elif data["VK_SERVICE"] == "1911":
         if transaction.status == klass.STATUS_PENDING:
             # Mark purchase as failed
             transaction.status = klass.STATUS_FAILED
             transaction.save()
-            transaction_failed.send(klass, transaction=transaction)
+            transaction_failed.send(klass, transaction=transaction, request=request)
     else:
         logging.critical(
             "thorbanks.views.response(): Got invalid VK_SERVICE code from bank: %s (transaction %s)",