make payto addresses accept usernames

2 files changed, 4 insertions, 3 deletions

diff --git a/talerbank/app/templates/payto_wiretransfer.html b/talerbank/app/templates/payto_wiretransfer.html
index 0407a22..ecca8d2 100644
--- a/talerbank/app/templates/payto_wiretransfer.html
+++ b/talerbank/app/templates/payto_wiretransfer.html
@@ -31,7 +31,7 @@
       <p>{{ _("Transfer money via the payto system:") }}
       <br>
       <br>
-      <tt style="font-size: 15px">payto://x-taler-bank/[bank-hostname]/[account-number]?message=[subject]&amount=[{{ currency }}:X.Y]</tt>
+      <tt style="font-size: 15px">payto://x-taler-bank/[bank-hostname]/[receiver-username]?message=[subject]&amount=[{{ currency }}:X.Y]</tt>
       </p>
         <form action="{{ url('payto-transfer') }}"
               method="POST"
@@ -39,7 +39,7 @@
         <input type="hidden" name="csrfmiddlewaretoken" value="{{ csrf_token }}" />
         <input name="address"
                placeholder={{ _("payto address") }}
-               pattern="payto://x-taler-bank/[a-z\.]+(:[0-9]+)?/[0-9]+\?message=[a-zA-Z0-9]+&amount={{ currency }}:[0-9]+(\.[0-9]+)?" />
+               pattern="payto://x-taler-bank/[a-z\.]+(:[0-9]+)?/[0-9a-zA-Z]+\?message=[a-zA-Z0-9]+&amount={{ currency }}:[0-9]+(\.[0-9]+)?" />
         <input class="pure-button pure-button-primary"
                type="submit"
                value={{ _("Confirm") }} />
diff --git a/talerbank/app/views.py b/talerbank/app/views.py
index 318016e..bd5ea76 100644
--- a/talerbank/app/views.py
+++ b/talerbank/app/views.py
@@ -349,10 +349,11 @@ def payto_transfer(request):
         return redirect("profile")
 
     parsed_address = PaytoParse(data.cleaned_data.get("address"))
+    receiver_user = User.objects.get(username=parsed_address.target)
     wire_transfer(
         parsed_address.amount,
         BankAccount.objects.get(user=request.user),
-        BankAccount.objects.get(account_no=parsed_address.target),
+        BankAccount.objects.get(user=receiver_user),
         parsed_address.message,
     )
     set_session_hint(request, success=True, hint=gettext("Wire transfer successful!"))