From 3b44f33e040eb6b265517598462d1a2df6814fa5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=AD=C3=B0ir=20Valberg=20Gu=C3=B0mundsson?=
 <valberg@orn.li>
Date: Tue, 10 May 2016 21:11:19 +0200
Subject: [PATCH] Fix formatting of hashstring.

---
 tickets/views.py | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/tickets/views.py b/tickets/views.py
index 40d34a2b..4b666b16 100644
--- a/tickets/views.py
+++ b/tickets/views.py
@@ -84,15 +84,15 @@ class EpayView(TemplateView):
         description = str(ticket.user.pk)
 
         hashstring = (
-            '{merchantnumber}{description}11{amount}DKK'
+            '{merchant_number}{description}11{amount}DKK'
             '{order_id}{accept_url}{md5_secret}'
         ).format(
-            settings.EPAY_MERCHANT_NUMBER,
-            description,
-            str(amount),
-            str(order_id),
-            accept_url,
-            settings.EPAY_MD5_SECRET,
+            merchant_number=settings.EPAY_MERCHANT_NUMBER,
+            description=description,
+            amount=str(amount),
+            order_id=str(order_id),
+            accept_url=accept_url,
+            md5_secret=settings.EPAY_MD5_SECRET,
         )
         epay_hash = hashlib.md5(hashstring).hexdigest()
 
@@ -124,15 +124,15 @@ class EpayCallbackView(View):
             )
 
             hashstring = (
-                '{merchantnumber}{description}11{amount}DKK'
+                '{merchant_number}{description}11{amount}DKK'
                 '{order_id}{accept_url}{md5_secret}'
             ).format(
-                query.get('merchantnumber'),
-                query.get('description'),
-                query.get('amount'),
-                query.get('order_id'),
-                query.get('accept_url'),
-                settings.EPAY_MD5_SECRET,
+                merchant_number=query.get('merchantnumber'),
+                description=query.get('description'),
+                amount=query.get('amount'),
+                order_id=query.get('orderid'),
+                accept_url=query.get('accepturl'),
+                md5_secret=settings.EPAY_MD5_SECRET,
             )
             epay_hash = hashlib.md5(hashstring).hexdigest()