[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [taler-merchant-frontends] 01/02: adding form for cherry-pi
From: |
gnunet |
Subject: |
[GNUnet-SVN] [taler-merchant-frontends] 01/02: adding form for cherry-picking proposals in history. |
Date: |
Mon, 24 Apr 2017 15:43:51 +0200 |
This is an automated email from the git hooks/post-receive script.
marcello pushed a commit to branch master
in repository merchant-frontends.
commit 7759c1b83d88a1d4cc23727c60b5911f3b35c38c
Author: Marcello Stanisci <address@hidden>
AuthorDate: Mon Apr 24 14:07:47 2017 +0200
adding form for cherry-picking proposals in history.
---
talerfrontends/blog/static/backoffice.js | 14 ++++++++++++--
talerfrontends/blog/static/web-common | 2 +-
talerfrontends/blog/templates/backoffice.html | 5 ++++-
talerfrontends/donations/static/web-common | 2 +-
4 files changed, 18 insertions(+), 5 deletions(-)
diff --git a/talerfrontends/blog/static/backoffice.js
b/talerfrontends/blog/static/backoffice.js
index 2e63857..5402f6a 100644
--- a/talerfrontends/blog/static/backoffice.js
+++ b/talerfrontends/blog/static/backoffice.js
@@ -240,10 +240,20 @@ function fill_table(history, execution_time){
window.setTimeout(remove_loader, 900);
}
-function get_history(scroll){
+/**
+ * - cherryPick if true, the user wants to cherry-pick a
+ * particular proposal he entered in the form.
+ * - scroll if true, the logic tries to retrieve the
+ * "next page" of all the proposals known to the merchant.
+ */
+function get_history(scroll, cherryPick){
var loader = document.getElementsByClassName("loader")[0];
loader.style.visibility = "visible";
- var qs = `/history?&instance=${INSTANCE}&delta=${DELTA}`;
+ var qs = `/history?instance=${INSTANCE}&delta=${DELTA}`;
+ if(cherryPick){
+ var cp = document.getElementById("cherry-pick");
+ qs = `/history?order_id=${cp.value}`
+ }
if(scroll){
START = LAST;
qs += `&start=${START}`;
diff --git a/talerfrontends/blog/static/web-common
b/talerfrontends/blog/static/web-common
index d7e0135..0be9ac9 160000
--- a/talerfrontends/blog/static/web-common
+++ b/talerfrontends/blog/static/web-common
@@ -1 +1 @@
-Subproject commit d7e013594d15388b1a7342a44a0e9c8d4ecca82d
+Subproject commit 0be9ac9264a3bd9f495c37abf1ac864562e8c598
diff --git a/talerfrontends/blog/templates/backoffice.html
b/talerfrontends/blog/templates/backoffice.html
index 1578989..ff89f24 100644
--- a/talerfrontends/blog/templates/backoffice.html
+++ b/talerfrontends/blog/templates/backoffice.html
@@ -4,6 +4,10 @@
<p>This page simulates a backoffice facility. Through it,
the user can see the money flow from Taler transactions to
wire transfers and viceversa.</p>
+ <form action="">
+ <input id="cherry-pick" type="text"></input>
+ <input type="button" value="submit" onclick='get_history(false,
true)'></input>
+ </form>
<div id="history-container">
<table id="history" width="60%" style="visibility: hidden;">
<tbody>
@@ -39,7 +43,6 @@
</div>
</div>
</div>
- <a href="#" onclick="get_history(true);" style="margin-left: 90%;">Fake
scroll</a>
{% endblock main %}
{% block styles %}
diff --git a/talerfrontends/donations/static/web-common
b/talerfrontends/donations/static/web-common
index d7e0135..0be9ac9 160000
--- a/talerfrontends/donations/static/web-common
+++ b/talerfrontends/donations/static/web-common
@@ -1 +1 @@
-Subproject commit d7e013594d15388b1a7342a44a0e9c8d4ecca82d
+Subproject commit 0be9ac9264a3bd9f495c37abf1ac864562e8c598
--
To stop receiving notification emails like this one, please contact
address@hidden