[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [taler-bank] branch master updated: Fix wire transfer subje
From: |
gnunet |
Subject: |
[GNUnet-SVN] [taler-bank] branch master updated: Fix wire transfer subject. |
Date: |
Mon, 06 Mar 2017 20:12:25 +0100 |
This is an automated email from the git hooks/post-receive script.
marcello pushed a commit to branch master
in repository bank.
The following commit(s) were added to refs/heads/master by this push:
new 5cef379 Fix wire transfer subject.
5cef379 is described below
commit 5cef379f25966880d60469a4d51a9ecaec1d7f28
Author: Marcello Stanisci <address@hidden>
AuthorDate: Mon Mar 6 20:11:52 2017 +0100
Fix wire transfer subject.
---
talerbank/app/tests_admin.py | 10 +++++++++-
talerbank/app/views.py | 9 ++-------
2 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/talerbank/app/tests_admin.py b/talerbank/app/tests_admin.py
index 32ab545..8adbfe1 100644
--- a/talerbank/app/tests_admin.py
+++ b/talerbank/app/tests_admin.py
@@ -47,7 +47,15 @@ class AddIncomingTestCase(TestCase):
def test_add_incoming(self):
c = Client()
- data = '{"debit_account":1, "credit_account":2, "wtid":"TESTWTID",
"amount":{"value":1, "fraction":0, "currency":"%s"}}' % settings.TALER_CURRENCY
+ data = '{"debit_account":1, \
+ "credit_account":2, \
+ "wtid":"TESTWTID", \
+ "exchange_url":"https://exchange.test", \
+ "amount": \
+ {"value":1, \
+ "fraction":0, \
+ "currency":"%s"}}' \
+ % settings.TALER_CURRENCY
response = c.post(reverse("add-incoming", urlconf=urlsadmin),
data=data,
content_type="application/json",
diff --git a/talerbank/app/views.py b/talerbank/app/views.py
index e55b6d6..5b423ca 100644
--- a/talerbank/app/views.py
+++ b/talerbank/app/views.py
@@ -305,18 +305,13 @@ def add_incoming(request):
within the browser, and only over the private admin interface.
"""
logger.info("Handling /admin/add/incoming.")
- logger.info(request.body.decode("utf-8"))
data = json.loads(request.body.decode("utf-8"))
- logger.info(json.dumps(data))
+ subject = "%s %s" % (data["wtid"], data["exchange_url"])
+ logger.info("Submitting wire transfer: '%s'", subject)
try:
schemas.validate_incoming_request(data)
except ValueError:
return HttpResponseBadRequest()
- subject = dict(pub=data["wtid"], url=data["exchange_url"])
- logger.info("add_incoming for debit account %s and credit account %s, WTID
'%s'.",
- data["debit_account"],
- data["credit_account"],
- json.dumps(subject, separators=(",", ":")))
try:
debit_account = user_account =
BankAccount.objects.get(user=data["debit_account"])
credit_account = user_account =
BankAccount.objects.get(user=data["credit_account"])
--
To stop receiving notification emails like this one, please contact
address@hidden
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] [taler-bank] branch master updated: Fix wire transfer subject.,
gnunet <=