[GNUnet-SVN] [taler-merchant-frontends] branch stable updated (9f64467 -> 2d7427a)

[gnunet]

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

marcello pushed a change to branch stable
in repository merchant-frontends.

    from 9f64467  applying previous fix to donations as well
     add 8e89ca4  notify if taler is not chosen as payment method, non based on 
JS.
     add 2d7427a  style alert message

No new revisions were added by this update.

Summary of changes:
 talerfrontends/blog/static/web-common            |  2 +-
 talerfrontends/donations/donations.py            | 10 +++++++++-
 talerfrontends/donations/static/web-common       |  2 +-
 talerfrontends/donations/templates/checkout.html |  4 ++++
 4 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/talerfrontends/blog/static/web-common 
b/talerfrontends/blog/static/web-common
index 0be9ac9..43278f1 160000
--- a/talerfrontends/blog/static/web-common
+++ b/talerfrontends/blog/static/web-common
@@ -1 +1 @@
-Subproject commit 0be9ac9264a3bd9f495c37abf1ac864562e8c598
+Subproject commit 43278f112f1b3e3f9bbf35574c09413527e40294
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/static/web-common 
b/talerfrontends/donations/static/web-common
index 0be9ac9..43278f1 160000
--- a/talerfrontends/donations/static/web-common
+++ b/talerfrontends/donations/static/web-common
@@ -1 +1 @@
-Subproject commit 0be9ac9264a3bd9f495c37abf1ac864562e8c598
+Subproject commit 43278f112f1b3e3f9bbf35574c09413527e40294
diff --git a/talerfrontends/donations/templates/checkout.html 
b/talerfrontends/donations/templates/checkout.html
index 4a8e891..a7d009c 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="informational-fail">
+    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