[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-merchant] branch master updated: dce
|
From: |
gnunet |
|
Subject: |
[taler-merchant] branch master updated: dce |
|
Date: |
Tue, 16 Aug 2022 19:12:38 +0200 |
This is an automated email from the git hooks/post-receive script.
grothoff pushed a commit to branch master
in repository merchant.
The following commit(s) were added to refs/heads/master by this push:
new 6a7e7e58 dce
6a7e7e58 is described below
commit 6a7e7e583e6095ec956cabf49e89b63508729114
Author: Christian Grothoff <christian@grothoff.org>
AuthorDate: Tue Aug 16 19:12:36 2022 +0200
dce
---
contrib/Makefile.am | 6 +--
contrib/copyright.html | 15 ------
contrib/css.html | 54 ----------------------
contrib/depleted_tip.en.mcpp | 21 ---------
contrib/footer.html | 6 ---
contrib/merchant-backoffice | 2 +-
contrib/offer_refund.en.mcpp | 73 -----------------------------
contrib/offer_tip.en.mcpp | 65 --------------------------
contrib/pure-min.css | 11 -----
contrib/request_payment.en.mcpp | 95 --------------------------------------
contrib/show_order_details.en.mcpp | 33 -------------
11 files changed, 4 insertions(+), 377 deletions(-)
diff --git a/contrib/Makefile.am b/contrib/Makefile.am
index 975b6586..e2f9659d 100644
--- a/contrib/Makefile.am
+++ b/contrib/Makefile.am
@@ -18,9 +18,9 @@ dist_tmplpkgdata_DATA = \
MAINTAINERCLEANFILES = \
$(dist_tmplpkgdata_DATA)
-# Note: if you update pure-min.css, you must also update the MCPP/MUST
templates above!
-dist_staticpkgdata_DATA = \
- pure-min.css
+# Note: historic mechanism for static resource files, currently not used.
+#dist_staticpkgdata_DATA = \
+# foo.css
# spa.html is the single-page-app imported from the merchant-backoffice.git
diff --git a/contrib/copyright.html b/contrib/copyright.html
deleted file mode 100644
index e25299fa..00000000
--- a/contrib/copyright.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<!--
- This file is part of GNU TALER.
- Copyright (C) 2014-2020 Taler Systems SA
-
- TALER is free software; you can redistribute it and/or modify it under the
- terms of the GNU Lesser General Public License as published by the Free
Software
- Foundation; either version 2.1, or (at your option) any later version.
-
- TALER is distributed in the hope that it will be useful, but WITHOUT ANY
- WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
details.
-
- You should have received a copy of the GNU Lesser General Public License
along with
- TALER; see the file COPYING. If not, see <http://www.gnu.org/licenses/>
--->
diff --git a/contrib/css.html b/contrib/css.html
deleted file mode 100644
index 1409f31a..00000000
--- a/contrib/css.html
+++ /dev/null
@@ -1,54 +0,0 @@
-<link rel="stylesheet"
- href="{{static_url}}pure-min.css"
-
integrity="sha384-cg6SkqEOCV1NbJoCu11+bm0NvBRc8IYLRGXkmNrqUBfTjmMYwNKPWBTIKyw9mHNJ"
- crossorigin="anonymous">
-<style>
-.talerbar {
- text-align: center;
-}
-.tt {
- font-family: 'Lucida Console', Monaco, monospace;
-}
-.content {
- overflow-x: auto;
- padding-left: 15%;
- padding-right: 15%;
-}
-.qr {
- margin: auto;
- text-align: center;
-}
-.qrtext {
- width: max-content;
- margin: auto;
- transition: font-size 0.2s;
- font-family: 'Lucida Console', Monaco, monospace;
- font-size: 0.5em;
-}
-.qrtext:hover {
- font-size: 1em;
-}
-.talerbar {
- margin: 0;
- bottom: 0;
- background-color: #033;
- color: white;
- width: 100%;
- padding: 1em;
- overflow: auto;
-}
-body {
- overflow-y: scroll;
-}
-@media (min-width: 500px) {
- .content {
- padding-bottom: 2em;
- margin-right: 1em;
- overflow-y: auto;
- }
-}
-#define EMPTY
-EMPTY#main a:link, #main a:visited, #main a:hover, #main a:active {
- color: black;
-}
-</style>
diff --git a/contrib/depleted_tip.en.mcpp b/contrib/depleted_tip.en.mcpp
deleted file mode 100644
index 71d7489f..00000000
--- a/contrib/depleted_tip.en.mcpp
+++ /dev/null
@@ -1,21 +0,0 @@
-<!DOCTYPE html>
-#include "copyright.html"
-<html>
-<head>
- <meta charset="UTF-8">
- <meta name="viewport" content="width=device-width, initial-scale=1.0">
- <noscript>
- <meta http-equiv="refresh" content="1">
- </noscript>
- <title>Status of your tip</title>
-#include "css.html"
-</head>
-
-<body>
-<section id="main" class="content">
- <h1 align="center">Tip already collected</h1>
- <div align="center">
- You have already collected this tip.
- </div>
-</section>
-#include "footer.html"
diff --git a/contrib/footer.html b/contrib/footer.html
deleted file mode 100644
index aed197f8..00000000
--- a/contrib/footer.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<div class="talerbar">
- <p>You can learn more about GNU Taler on our <a
href="https://taler.net/";>website</a>.<br>
- Copyright © 2014—2021 Taler Systems SA</p>
-</div>
-</body>
-</html>
diff --git a/contrib/merchant-backoffice b/contrib/merchant-backoffice
index 07df6b6b..8a683531 160000
--- a/contrib/merchant-backoffice
+++ b/contrib/merchant-backoffice
@@ -1 +1 @@
-Subproject commit 07df6b6b872aa088b42d716323a208d41243317a
+Subproject commit 8a6835316532d9e250bbdfe9ff55432a1acca62c
diff --git a/contrib/offer_refund.en.mcpp b/contrib/offer_refund.en.mcpp
deleted file mode 100644
index 5684f9b0..00000000
--- a/contrib/offer_refund.en.mcpp
+++ /dev/null
@@ -1,73 +0,0 @@
-<!DOCTYPE html>
-#include "copyright.html"
-<html>
-<head>
- <meta charset="UTF-8">
- <meta name="viewport" content="width=device-width, initial-scale=1.0">
- <noscript>
- <meta http-equiv="refresh" content="1">
- </noscript>
- <title>Refund available for {{order_summary}}</title>
-#include "css.html"
-</head>
-
-<body>
-<script>
- let checkUrl = new URL("{{& order_status_url }}");
- checkUrl.searchParams.set("await_refund_obtained", "yes");
- let delayMs = 500;
- function check() {
- let retried = false;
- function retryOnce() {
- if (!retried) {
- retried = true;
- check();
- }
- }
- let req = new XMLHttpRequest();
- req.onreadystatechange = function () {
- if (req.readyState === XMLHttpRequest.DONE) {
- if (req.status === 200) {
- try {
- let resp = JSON.parse(req.responseText);
- if (! resp.refund_pending) {
- window.location.reload(true);
- }
- } catch (e) {
- console.error("could not parse response:", e);
- }
- }
- setTimeout(retryOnce, delayMs);
- }
- };
- req.onerror = function () {
- setTimeout(retryOnce, delayMs);
- }
- req.open("GET", checkUrl.href);
- req.send();
- }
-
- setTimeout(check, delayMs);
-</script>
-
-<section id="main" class="content">
-<h1 align="center">Collect Taler refund</h1>
-<div align="center" class="taler-installed-hide">
- <p>
- Scan this QR code with your Taler mobile wallet:
- </p>
- <div class="qr">
- {{{taler_refund_qrcode_svg}}}
- </div>
- <p>
- <button onclick="window.location.href='{{taler_refund_uri}}';">
- Or open your Taler wallet
- </button>
- </p>
- <p>
- <a href="https://wallet.taler.net/";>Don't have a Taler wallet yet? Install
it!</a>
- </p>
-</div>
-<hr />
-</section>
-#include "footer.html"
diff --git a/contrib/offer_tip.en.mcpp b/contrib/offer_tip.en.mcpp
deleted file mode 100644
index ea6ec59a..00000000
--- a/contrib/offer_tip.en.mcpp
+++ /dev/null
@@ -1,65 +0,0 @@
-<!DOCTYPE html>
-#include "copyright.html"
-<html>
-<head>
- <meta charset="UTF-8">
- <meta name="viewport" content="width=device-width, initial-scale=1.0">
- <noscript>
- <meta http-equiv="refresh" content="1">
- </noscript>
- <title>Tip available</title>
-#include "css.html"
-</head>
-
-<body>
-<script>
- let checkUrl = "{{& tip_status_url }}";
- let delayMs = 500;
- function check() {
- let retried = false;
- function retryOnce() {
- if (!retried) {
- retried = true;
- check();
- }
- }
- let req = new XMLHttpRequest();
- req.onreadystatechange = function () {
- if (req.readyState === XMLHttpRequest.DONE) {
- if (req.status === 410) {
- window.location.reload(true);
- }
- setTimeout(retryOnce, delayMs);
- }
- };
- req.onerror = function () {
- setTimeout(retryOnce, delayMs);
- }
- req.open("GET", checkUrl);
- req.send();
- }
-
- setTimeout(check, delayMs);
-</script>
-
-<section id="main" class="content">
-<h1 align="center">Collect Taler tip</h1>
-<div align="center" class="taler-installed-hide">
- <p>
- Scan this QR code with your Taler mobile wallet:
- </p>
- <div class="qr">
- {{{taler_tip_qrcode_svg}}}
- </div>
- <p>
- <button onclick="window.location.href='{{taler_tip_uri}}';">
- Or open your Taller wallet
- </button>
- </p>
- <p>
- <a href="https://wallet.taler.net/";>Don't have a Taler wallet yet? Install
it!</a>
- </p>
-</div>
-<hr />
-</section>
-#include "footer.html"
diff --git a/contrib/pure-min.css b/contrib/pure-min.css
deleted file mode 100644
index 7b6e7b90..00000000
--- a/contrib/pure-min.css
+++ /dev/null
@@ -1,11 +0,0 @@
-/*!
-Pure v2.0.3
-Copyright 2013 Yahoo!
-Licensed under the BSD License.
-https://github.com/pure-css/pure/blob/master/LICENSE.md
-*/
-/*!
-normalize.css v | MIT License | git.io/normalize
-Copyright (c) Nicolas Gallagher and Jonathan Neal
-*/
-/*! normalize.css v8.0.1 | MIT License | github.com/necolas/normalize.css
*/html{line-height:1.15;-webkit-text-size-adjust:100%}body{margin:0}main{display:block}h1{font-size:2em;margin:.67em
0}hr{-webkit-box-sizing:content-box;box-sizing:content-box;height:0;overflow:visible}pre{font-family:monospace,monospace;font-size:1em}a{background-color:transparent}abbr[title]{border-bottom:none;text-decoration:underline;-webkit-text-decoration:underline
dotted;text-decoration:underline dotted}b,st [...]
\ No newline at end of file
diff --git a/contrib/request_payment.en.mcpp b/contrib/request_payment.en.mcpp
deleted file mode 100644
index 69bca792..00000000
--- a/contrib/request_payment.en.mcpp
+++ /dev/null
@@ -1,95 +0,0 @@
-<!DOCTYPE html>
-#include "copyright.html"
-<html>
-<head>
- <meta charset="UTF-8">
- <meta name="viewport" content="width=device-width, initial-scale=1.0">
- <noscript>
- <meta http-equiv="refresh" content="1">
- </noscript>
- <title>Payment requested for {{order_summary}}</title>
-#include "css.html"
-</head>
-<body>
-<script>
- let longpollDelayMs = 60000;
- let checkUrl = new URL("{{& order_status_url }}");
- checkUrl.searchParams.set("timeout_ms", longpollDelayMs.toString());
- function check() {
- let retried = false;
- function retryOnce() {
- if (!retried) {
- retried = true;
- check();
- }
- }
- let req = new XMLHttpRequest();
- req.onreadystatechange = function () {
- if (req.readyState === XMLHttpRequest.DONE) {
- if (req.status === 200) {
- try {
- let resp = JSON.parse(req.responseText);
- if (resp.fulfillment_url) {
- window.location.replace(resp.fulfillment_url);
- }
- } catch (e) {
- console.error("could not parse response:", e);
- }
- }
- if (req.status === 202) {
- try {
- let resp = JSON.parse(req.responseText);
- if (resp.fulfillment_url) {
- window.location.replace(resp.fulfillment_url);
- }
- } catch (e) {
- console.error("could not parse response:", e);
- }
- }
- if (req.status === 402) {
- try {
- let resp = JSON.parse(req.responseText);
- if (resp.already_paid_order_id && resp.fulfillment_url) {
- window.location.replace(resp.fulfillment_url);
- }
- } catch (e) {
- console.error("could not parse response:", e);
- }
- }
- setTimeout(retryOnce, 500);
- }
- };
- req.onerror = function () {
- setTimeout(retryOnce, 500);
- }
- req.ontimeout = function () {
- setTimeout(retryOnce, 500);
- }
- req.timeout = longpollDelayMs;
- req.open("GET", checkUrl.href);
- req.send();
- }
- setTimeout(check, 500);
-</script>
-
-<section id="main" class="content">
-<h1 align="center">Pay with Taler</h1>
-<div align="center" class="taler-installed-hide">
- <p>
- Scan this QR code with your mobile wallet:
- </p>
- <div class="qr">
- {{{taler_pay_qrcode_svg}}}
- </div>
- <p>
- <a href='{{taler_pay_uri}}'>
- Or open your Taller wallet
- </a>
- </p>
- <p>
- <a href="https://wallet.taler.net/";>Don't have a Taler wallet yet? Install
it!</a>
- </p>
-</div>
-<hr />
-</section>
-#include "footer.html"
diff --git a/contrib/show_order_details.en.mcpp
b/contrib/show_order_details.en.mcpp
deleted file mode 100644
index f0984839..00000000
--- a/contrib/show_order_details.en.mcpp
+++ /dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE html>
-#include "copyright.html"
-<html>
-<head>
- <meta charset="UTF-8">
- <meta name="viewport" content="width=device-width, initial-scale=1.0">
- <noscript>
- <meta http-equiv="refresh" content="1">
- </noscript>
- <title>Status of your order for {{order_summary}}</title>
-#include "css.html"
-</head>
-
-<body>
-<h1>Order details</h1>
-
-<div>
-This is the default status page for your order for <b>{{order_summary}}</b>.
-</div>
-
-
-<h2>Refund status</h2>
-<div>
-The merchant has granted you refunds on the purchase of
<b>{{refund_amount}}</b>.
-</div>
-
-<h2>Full contract details</h2>
-
-<!-- FIXME #6459: expand the contract JSON in all its glory here -->
-<pre>
- {{{ contract_terms!stringify }}}
-</pre>
-#include "footer.html"
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [taler-merchant] branch master updated: dce,
gnunet <=