[GNUnet-SVN] [taler-merchant-frontends] branch master updated: Addressing #5068.

[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 1243fb4  Addressing #5068.
1243fb4 is described below

commit 1243fb482991d8c23f5182cc3cc3301fc541c297
Author: Marcello Stanisci <address@hidden>
AuthorDate: Fri Jun 23 11:36:50 2017 +0200

    Addressing #5068.
---
 talerfrontends/blog/blog.py              | 4 +++-
 talerfrontends/blog/static/backoffice.js | 2 +-
 talerfrontends/donations/donations.py    | 1 +
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/talerfrontends/blog/blog.py b/talerfrontends/blog/blog.py
index c74acd3..452176a 100644
--- a/talerfrontends/blog/blog.py
+++ b/talerfrontends/blog/blog.py
@@ -118,13 +118,15 @@ def refund():
 @app.route("/generate-contract", methods=["GET"])
 def generate_contract():
     article_name = expect_parameter("article_name")
+    pretty_name = article_name.replace("_", " ")
     order = dict(
+        summary=pretty_name,
         nonce=flask.request.args.get("nonce"),
         amount=ARTICLE_AMOUNT,
         max_fee=dict(value=1, fraction=0, currency=CURRENCY),
         products=[
             dict(
-                description="Essay: " + article_name.replace("_", " "),
+                description="Essay: " + pretty_name,
                 quantity=1,
                 product_id=0,
                 price=ARTICLE_AMOUNT,
diff --git a/talerfrontends/blog/static/backoffice.js 
b/talerfrontends/blog/static/backoffice.js
index 4554bb0..3c6e493 100644
--- a/talerfrontends/blog/static/backoffice.js
+++ b/talerfrontends/blog/static/backoffice.js
@@ -230,7 +230,7 @@ function fill_table(history, execution_time){
     var td_date = document.createElement("td");
     td_date.className = "date";
     td_order_id.innerHTML = `<a href="#${i}" 
onclick='track_order("${entry.order_id}", "FSF");'>${entry.order_id}</a>`;
-    td_summary.innerHTML = "TBD";
+    td_summary.innerHTML = entry.summary;
     td_amount.innerHTML = amount_to_string(entry.amount || 
entry.deposit_value);
     td_date.innerHTML = parse_date(entry.timestamp || execution_time);
     row.appendChild(td_order_id);
diff --git a/talerfrontends/donations/donations.py 
b/talerfrontends/donations/donations.py
index 3bd8255..b98888a 100644
--- a/talerfrontends/donations/donations.py
+++ b/talerfrontends/donations/donations.py
@@ -95,6 +95,7 @@ def generate_contract():
                random.randint(0, 0xFFFFFFFF),
                datetime.today().strftime('%H_%M_%S'))
     order = dict(
+        summary="Donation!",
         nonce=flask.request.args.get("nonce"),
         amount=amount,
         max_fee=dict(value=1, fraction=0, currency=CURRENCY),

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