diff options
author | Florian Dold <florian.dold@gmail.com> | 2018-01-16 13:22:19 +0100 |
---|---|---|
committer | Florian Dold <florian.dold@gmail.com> | 2018-01-16 13:22:19 +0100 |
commit | bde92720a2bc83ff2f5a4322e5239dcaff52e666 (patch) | |
tree | 98553a7a1056b1795de4d359c2a29d88e6a6323e /talerblog/blog | |
parent | eeb391917146a54bdc06c3068ffa789627cf0af6 (diff) | |
download | blog-bde92720a2bc83ff2f5a4322e5239dcaff52e666.tar.gz blog-bde92720a2bc83ff2f5a4322e5239dcaff52e666.tar.bz2 blog-bde92720a2bc83ff2f5a4322e5239dcaff52e666.zip |
include resource url
Diffstat (limited to 'talerblog/blog')
-rw-r--r-- | talerblog/blog/blog.py | 5 | ||||
-rw-r--r-- | talerblog/blog/templates/purchase.html | 41 |
2 files changed, 3 insertions, 43 deletions
diff --git a/talerblog/blog/blog.py b/talerblog/blog/blog.py index 4cdb81d..9894a34 100644 --- a/talerblog/blog/blog.py +++ b/talerblog/blog/blog.py @@ -29,7 +29,7 @@ import base64 import requests import flask from talerblog.talerconfig import TalerConfig -from ..helpers import make_url, join_urlparts +from ..helpers import join_urlparts from ..blog.content import ARTICLES, get_article_file, get_image_file @@ -156,7 +156,7 @@ def article(article_name, data=None): if not order_id: order = dict( summary="Essay: " + article_name.replace("_", " "), - fulfillment_url=make_url("/essay/" + quote(article_name)), + fulfillment_url=flask.request.base_url, amount=ARTICLE_AMOUNT, instance=INSTANCE, ) @@ -167,6 +167,7 @@ def article(article_name, data=None): pay_params = dict( instance=INSTANCE, order_id=order_id, + ressource_url=flask.request.base_url, session_id=session_id, session_sig=session_sig, ) diff --git a/talerblog/blog/templates/purchase.html b/talerblog/blog/templates/purchase.html deleted file mode 100644 index d1baf38..0000000 --- a/talerblog/blog/templates/purchase.html +++ /dev/null @@ -1,41 +0,0 @@ -{% extends "templates/base.html" %} - -{% block main %} -<meta name="hc" value="{{ hc }}"> -<meta name="pay_url" value="{{ pay_url|safe }}"> -<meta name="offering_url" value="{{ offering_url|safe }}"> -<meta name="contract_url" value="{{ contract_url|safe }}"> -<meta name="no_contract" value="{{ no_contract }}"> -<div id="ccfakeform" class="fade"> - <p> - Oops, it looks like you don't have a Taler wallet installed. Why don't you enter - all your credit card details before reading the article? <em>You can also - use GNU Taler to complete the purchase at any time.</em> - </p> - - <form> - First name<br> <input type="text"></input><br> - Family name<br> <input type="text"></input><br> - Age<br> <input type="text"></input><br> - Nationality<br> <input type="text"></input><br> - Gender<br> <input type="radio" name"gender">Male</input> - CC number<br> <input type="text"></input><br> - <input type="radio" name="gender">Female</input><br> - </form> - <form method="get" action="/cc-payment/{{ article_name }}"> - <input type="submit"></input> - </form> -</div> - -<div id="talerwait"> - <em>Processing payment with GNU Taler, please wait <span id="action-indicator"></span></em> -</div> -{% endblock main %} - -{% block body_prelude %} - <script src="{{ url('/static/body-prelude.js') }}" type="application/javascript"></script> -{% endblock body_prelude %} - -{% block scripts %} - <script src="{{ url('/static/purchase.js') }}" type="application/javascript"></script> -{% endblock scripts %} |