[GNUnet-SVN] [taler-merchant-frontends] branch master updated: Fix import issue on donations, provide BO at /backoffice.

[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 0a71d06  Fix import issue on donations, provide BO at /backoffice.
     new 7cc0dfa  Merge branch 'master' of taler.net:merchant-frontends
0a71d06 is described below

commit 0a71d06af7caecc9197910160f1c18e9de665041
Author: Marcello Stanisci <address@hidden>
AuthorDate: Wed Mar 1 18:43:54 2017 +0100

    Fix import issue on donations, provide BO at /backoffice.
---
 talerfrontends/donations/donations.py         | 14 ++++++--------
 talerfrontends/donations/templates/index.html |  2 +-
 talerfrontends/errors.py                      | 18 +-----------------
 talerfrontends/helpers.py                     |  2 +-
 4 files changed, 9 insertions(+), 27 deletions(-)

diff --git a/talerfrontends/donations/donations.py 
b/talerfrontends/donations/donations.py
index d688317..8a5affa 100644
--- a/talerfrontends/donations/donations.py
+++ b/talerfrontends/donations/donations.py
@@ -25,19 +25,19 @@ import random
 import time
 from datetime import datetime
 import jinja2
-from talerfrontends.common_routes import tracking, history
 from talerfrontends.talerconfig import TalerConfig
-from talerfrontends.helpers import (make_url, frontend_common,
-        expect_parameter, BackendError, amount_to_string, amount_from_float,
-        amount_to_float, join_urlparts)
-from talerfrontends.common_routes import tracking
+from talerfrontends.errors import BackendError
+
+from talerfrontends.helpers import (make_url,
+expect_parameter, amount_to_string,
+amount_from_float, amount_to_float,
+join_urlparts)
 
 logger = logging.getLogger(__name__)
 
 base_dir = os.path.dirname(os.path.abspath(__file__))
 
 app = flask.Flask(__name__, template_folder=base_dir)
-app.register_blueprint(frontend_common)
 app.debug = True
 app.secret_key = base64.b64encode(os.urandom(64)).decode('utf-8')
 
@@ -172,5 +172,3 @@ def pay():
     print("received payment for", order_id)
 
     return r.text, 200
-
-app.add_url_rule('/history', 'history', history)
diff --git a/talerfrontends/donations/templates/index.html 
b/talerfrontends/donations/templates/index.html
index 4c835c8..0164392 100644
--- a/talerfrontends/donations/templates/index.html
+++ b/talerfrontends/donations/templates/index.html
@@ -24,7 +24,7 @@
     may also enjoy visiting the <tt>blog.demo.taler.net</tt>.
   </p>
   <h2>Back-office interface</h2>
-  <p>Try the <a href="/track">back-office</a>, in order to track
+  <p>Try the <a href="/backoffice">back-office</a>, in order to track
   your deposits!
   </p>
 </article>
diff --git a/talerfrontends/errors.py b/talerfrontends/errors.py
index 36f42fa..f2e80d0 100644
--- a/talerfrontends/errors.py
+++ b/talerfrontends/errors.py
@@ -16,7 +16,6 @@
 #  @author Marcello Stanisci
 
 from flask import make_response, Blueprint
-from . import helpers
 
 # This class is used when the wallet detects any error
 # and it calls the onError handler installed by the merchant
@@ -86,14 +85,6 @@ def make_400(ret):
     return make_response(ret, 400)
 
 
-frontend_common = Blueprint("talerfrontends-common",
-                             __name__,
-                            template_folder="templates",
-                            static_folder="static",
-                            static_url_path="/static-common")
-
-
address@hidden(MissingParameterError)
 def handle_missing_parameter_error(error):
     logger.warn("Missing parameter '%s' in request from client '%s'",
                 error.name,
@@ -103,7 +94,6 @@ def handle_missing_parameter_error(error):
                                          details=error.name))
 
 
address@hidden(NoSessionActiveError)
 def handle_no_session_active_error(error):
     logger.warn("No session active")
     return make_400(render_template("error.html",
@@ -111,7 +101,6 @@ def handle_no_session_active_error(error):
                                    details="purchase was not initiated 
correctly"))
 
 
address@hidden(MalformedParameterError)
 def handle_malformed_parameter_error(error):
     logger.warn("Malformed parameter '%s' in request from client '%s'",
                 error.name,
@@ -121,7 +110,6 @@ def handle_malformed_parameter_error(error):
                                     details=error.name))
 
 
address@hidden(MalformedDateError)
 def handle_malformed_parameter_error(error):
     logger.warn("Malformed date gotten")
     return make_400(render_template("error.html",
@@ -129,7 +117,6 @@ def handle_malformed_parameter_error(error):
                                     details="got '%s'" % error.date))
 
 
address@hidden(BackendError)
 def handle_backend_error(error):
     logger.warn("Backend error, status %s, body %s", error.status, 
repr(error.response))
     return make_response(render_template("error.html",
@@ -137,7 +124,6 @@ def handle_backend_error(error):
                                          details=error.response),
                          error.status)
 
address@hidden(CustomError)
 def handle_custom_error(error):
     logger.warn("Triggering custom error: %s, hint: %s, status code: %d" % 
(error.code, error.hint, error.status))
     return make_response(render_template("error.html",
@@ -145,14 +131,12 @@ def handle_custom_error(error):
                                          details=error.hint),
                                          error.status)                        
 
address@hidden(TrackNotReadyError)
 def handle_track_not_ready_error(error):
     logger.warn("Order %s has not been transferred yet" % error.order_id)
     return make_response(render_template("error.html",
                                          error = error.error_code,
                                          details = "Order %s is still waiting 
for being paid back" % error.order_id))
 
address@hidden(TrackTransactionConflictError)
 def handle_track_transaction_conflict_error(error):
     logger.warn("Transaction %s is conflicting" % error.transaction_id)
     return make_response(render_template("transaction_conflict.html",
@@ -161,7 +145,7 @@ def handle_track_transaction_conflict_error(error):
                                         error.status)
 
 
address@hidden(TrackTransferConflictError)
+from . import helpers
 def handle_track_transfer_conflict_error(error):
     logger.info(error)
     logger.warn("Transfer %s is conflicting" % error.wtid)
diff --git a/talerfrontends/helpers.py b/talerfrontends/helpers.py
index 774efc4..389fb7c 100644
--- a/talerfrontends/helpers.py
+++ b/talerfrontends/helpers.py
@@ -22,7 +22,7 @@ import requests
 import re
 import datetime
 import json
-from talerfrontends.talerconfig import TalerConfig
+from .talerconfig import TalerConfig
 from .errors import (MalformedDateError,
 MissingParameterError, MalformedParameterError)
 

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