diff options
| author | MS <ms@taler.net> | 2021-06-02 19:16:20 +0200 |
|---|---|---|
| committer | MS <ms@taler.net> | 2021-06-02 19:16:20 +0200 |
| commit | 1e18bfe33255a4337302ecc65edf8cba53862fae (patch) | |
| tree | 4a91979c15e7b4a987fcd0a0e2dd36558c759aef | |
| parent | 8a07e2cb6cc33b5645717b8b54e722b47b5d319b (diff) | |
| download | bank-1e18bfe33255a4337302ecc65edf8cba53862fae.tar.gz bank-1e18bfe33255a4337302ecc65edf8cba53862fae.tar.bz2 bank-1e18bfe33255a4337302ecc65edf8cba53862fae.zip | |
not asking the currency to the user
| -rw-r--r-- | talerbank/app/templates/wiretransfer.html | 25 | ||||
| -rw-r--r-- | talerbank/app/views.py | 4 |
2 files changed, 17 insertions, 12 deletions
diff --git a/talerbank/app/templates/wiretransfer.html b/talerbank/app/templates/wiretransfer.html index 0813d97..ad25726 100644 --- a/talerbank/app/templates/wiretransfer.html +++ b/talerbank/app/templates/wiretransfer.html @@ -47,21 +47,24 @@ <br> <br> </p> - <form action="{{ url('wiretransfer-form') }}" - method="POST" - name="wire-transfer-form"> + <form action="{{ url('wiretransfer-form') }}" + method="POST" + name="wire-transfer-form"> <input type="hidden" name="csrfmiddlewaretoken" value="{{ csrf_token }}" /> <input name="receiver" placeholder={{ _("receiver") }} /> - <br> - <br> + <br> + <br> <input name="subject" placeholder={{ _("subject") }} /> - <br> - <br> + <br> + <br> <input name="amount" - placeholder={{ _("amount (CURRENCY:X.YY)") }} - pattern="{{ currency }}:[0-9]+(\.[0-9]+)?"/> - <br> - <br> + placeholder={{ _("amount") }} + pattern="[0-9]+(\.[0-9]+)?" /> + <input readonly="" + name="currency" + value={{ currency }} /> + <br> + <br> <input class="pure-button pure-button-primary" type="submit" value={{ _("Confirm") }} /> </form> <p><a href="{{ url('payto-form') }}">Want to try the raw payto://-format?</a></p> diff --git a/talerbank/app/views.py b/talerbank/app/views.py index e6a09ed..d03faee 100644 --- a/talerbank/app/views.py +++ b/talerbank/app/views.py @@ -307,7 +307,9 @@ def wiretransfer_form(request): # A payment was submitted. try: - amount = Amount.parse(request.POST.get("amount")) + amount = Amount.parse( + "{}:{}".format(request.POST.get("currency"), request.POST.get("amount") + )) except Exception: set_session_hint(request, success=False, hint="Wrong amount specified.") return redirect("wiretransfer-form") |