[GNUnet-SVN] [taler-merchant-frontends] branch master updated: notify if taler is not chosen as payment method, non based on JS.

[gnunet]

This is an automated email from the git hooks/post-receive script.

marcello pushed a commit to branch master
in repository merchant-frontends.

The following commit(s) were added to refs/heads/master by this push:
     new 8e89ca4  notify if taler is not chosen as payment method, non based on 
JS.
8e89ca4 is described below

commit 8e89ca4ff4b6321c10ecc0cef5ab76d975dbdd58
Author: Marcello Stanisci <address@hidden>
AuthorDate: Thu Jun 1 15:53:23 2017 +0200

    notify if taler is not chosen as payment method, non based
    on JS.
---
 talerfrontends/donations/donations.py            | 10 +++++++++-
 talerfrontends/donations/templates/checkout.html |  4 ++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/talerfrontends/donations/donations.py 
b/talerfrontends/donations/donations.py
index ea91c3c..3bd8255 100644
--- a/talerfrontends/donations/donations.py
+++ b/talerfrontends/donations/donations.py
@@ -77,10 +77,12 @@ def checkout():
         logger.warn("Invalid amount ('%s')", amount_str)
         e = flask.jsonify(error="invalid amount")
         return flask.make_response(e, 400)
+    display_alert = flask.request.args.get("display_alert", None)
     return flask.render_template("templates/checkout.html",
             donation_amount=amount_str,
             donation_receiver=donation_receiver,
-            merchant_currency=CURRENCY)
+            merchant_currency=CURRENCY,
+            display_alert=display_alert)
 
 
 @app.route("/generate-contract", methods=["GET"])
@@ -122,6 +124,12 @@ def generate_contract():
 def donate():
     donation_receiver = expect_parameter("donation_receiver")
     donation_amount = expect_parameter("donation_amount")
+    payment_system = expect_parameter("payment_system")
+    if "taler" != payment_system:
+        return flask.redirect(make_url("checkout",
+                                       ("donation_receiver", 
donation_receiver),
+                                       ("donation_amount", donation_amount),
+                                       ("display_alert", True)))
     response = 
flask.make_response(flask.render_template('templates/fallback.html'), 402)
     response.headers["X-Taler-Contract-Url"] = \
     make_url("/generate-contract",
diff --git a/talerfrontends/donations/templates/checkout.html 
b/talerfrontends/donations/templates/checkout.html
index 4a8e891..7053932 100644
--- a/talerfrontends/donations/templates/checkout.html
+++ b/talerfrontends/donations/templates/checkout.html
@@ -27,6 +27,10 @@
     previous page (with the shopping cart), we just separated the
     two steps to keep each step as simple as possible.
   </p>
+  
+  <p {% if not display_alert %} style="display: none;" {% endif %} 
class="alert">
+    Only Taler system available in this demo!
+  </p>
 
   <form name="tform" action="{{ url('/donate') }}" method="get">
     <div id="opt-form" align="left"><br>

-- 
To stop receiving notification emails like this one, please contact
address@hidden