[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-taler-ops-www] branch master updated (2a5b45b -> 535cd9d)
|
From: |
gnunet |
|
Subject: |
[taler-taler-ops-www] branch master updated (2a5b45b -> 535cd9d) |
|
Date: |
Sat, 30 Mar 2024 22:36:09 +0100 |
This is an automated email from the git hooks/post-receive script.
nora-grothoff pushed a change to branch master
in repository taler-ops-www.
from 2a5b45b import screenshots from docs.git
new e2be20f resolve borked syntax
new 199ee54 mobile moment
new 11c999a format lol
new 535cd9d format some more
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
static/scss/pages/faq-util.scss | 4 +
template/fees.html.j2 | 168 +++++++++++++++++++---------------------
template/merchants.html.j2 | 86 +++++++++-----------
template/users.html.j2 | 71 +++++++----------
4 files changed, 147 insertions(+), 182 deletions(-)
diff --git a/static/scss/pages/faq-util.scss b/static/scss/pages/faq-util.scss
index 0e01ec6..6b87946 100644
--- a/static/scss/pages/faq-util.scss
+++ b/static/scss/pages/faq-util.scss
@@ -1,5 +1,9 @@
@mixin section() {
@apply flex-1 w-full max-w-screen-lg;
+ &,
+ .text.card {
+ max-width: calc(100vw - 16px);
+ }
.step {
@apply flex flex-col items-center justify-center gap-10 md:gap-12 w-full;
// assume 1st el is text, 2nd is graphic/img
diff --git a/template/fees.html.j2 b/template/fees.html.j2
index 8c655bf..7dde1cd 100644
--- a/template/fees.html.j2
+++ b/template/fees.html.j2
@@ -4,25 +4,21 @@
name="description"
content="{% trans %}Information about the fees Taler does, and does not
collect.{% endtrans %}"
/>
-{# <meta name="author" content="" /> #}
-{% endblock %}
-{% block body_content %}
+{# <meta name="author" content="" /> #} {% endblock %} {% block body_content %}
<main id="maincontent">
<section>
<h2>{% trans %}Wire transfer fee{% endtrans %}</h2>
<div class="toggle-content">
<p>
- {% trans %}
- A <b>wire fee</b> of <b>0.1 CHF</b> is charged by Taler
Operations on
- outgoing wire transfers when Taler is used to deposit funds into a bank
- account. Merchants are encouraged to allow Taler to delay and then
- aggregate many small payments into a single collective wire transfer to
- minimize wire transfer fees. For example, by configuring a
- <b>wire deadline</b> of one week, all payments within a week could be
- aggregated into a single wire transfer, and thus the wire
- transfer fee would only be charged once per week.
- The fee is simply subtracted from the total amount wired.
- {% endtrans %}
+ {% trans %} A <b>wire fee</b> of <b>0.1 CHF</b> is charged by
Taler
+ Operations on outgoing wire transfers when Taler is used to deposit
+ funds into a bank account. Merchants are encouraged to allow Taler to
+ delay and then aggregate many small payments into a single collective
+ wire transfer to minimize wire transfer fees. For example, by
+ configuring a <b>wire deadline</b> of one week, all payments within a
+ week could be aggregated into a single wire transfer, and thus the wire
+ transfer fee would only be charged once per week. The fee is simply
+ subtracted from the total amount wired. {% endtrans %}
</p>
</div>
</section>
@@ -30,77 +26,75 @@
<h2>{% trans %}Deposit fees{% endtrans %}</h2>
<div class="toggle-content">
<p>
- {% trans %}
- Withdrawing 5 CHF creates electronic coins with
+ {% trans %} Withdrawing 5 CHF creates electronic coins with
denominations of 0.04 CHF, 0.16 CHF, 0.32 CHF,
0.64 CHF, 1.28 CHF, and 2.56 CHF. Paying 3.23 CHF
might then use the 0.04 CHF, 0.64 CHF and 2.56 CHF
coins,
resulting in a total of 3.24 CHF with 0.01 CHF returned as
- change.
- {% endtrans %}
+ change. {% endtrans %}
</p>
<p>
{% trans %}
- <b>Deposit fees</b> charged by Taler payment
- providers depend on the electronic coins used in the transaction.
- Merchants can offer to pay deposit fees up to a specified limit;
customers
- have to pay deposit fees that exceed what the merchant is willing to
- cover. Taler wallets inform customers about applicable deposit fees
they
- have to pay before every transaction.
- {% endtrans %}
+ <b>Deposit fees</b> charged by Taler payment providers depend on the
+ electronic coins used in the transaction. Merchants can offer to pay
+ deposit fees up to a specified limit; customers have to pay deposit
fees
+ that exceed what the merchant is willing to cover. Taler wallets inform
+ customers about applicable deposit fees they have to pay before every
+ transaction. {% endtrans %}
</p>
<p>
- {% trans %}
- The following table shows the deposit fee structure used by Taler
Operations:
- {% endtrans %}
+ {% trans %} The following table shows the deposit fee structure used by
+ Taler Operations: {% endtrans %}
</p>
<table
class="border-spacing-2 border-separate border border-slate-500
rounded-3xl bg-slate-50 border-opacity-50"
>
- <tr>
- <th class="text-left p-2 bg-slate-200 bg-opacity-60 rounded-2xl">
- {% trans %}Coin denomination{% endtrans %}
- </th>
- <th class="text-left p-2 bg-slate-200 bg-opacity-60 rounded-2xl">
- {% trans %}Fee per Coin{% endtrans %}
- </th>
- </tr>
- <tr>
- <td class="p-2 bg-slate-200 bg-opacity-60 rounded-2xl">
- 0.0025 CHF - 0.64 CHF
- </td>
- <td class="p-2 bg-slate-200 bg-opacity-60 rounded-2xl">
- 0.0025 CHF
- </td>
- </tr>
- <tr>
- <td class="p-2 bg-slate-200 bg-opacity-60 rounded-2xl">
- 1.28 CHF - 10.24 CHF
- </td>
- <td class="p-2 bg-slate-200 bg-opacity-60 rounded-2xl">
- 0.0050 CHF
- </td>
- </tr>
- <tr>
- <td class="p-2 bg-slate-200 bg-opacity-60 rounded-2xl">
- 20.48 CHF - 655.36 CHF
- </td>
- <td class="p-2 bg-slate-200 bg-opacity-60 rounded-2xl">
- 0.0010 CHF
- </td>
- </tr>
+ <tr>
+ <th class="text-left p-2 bg-slate-200 bg-opacity-60 rounded-2xl">
+ {% trans %}Coin denomination{% endtrans %}
+ </th>
+ <th class="text-left p-2 bg-slate-200 bg-opacity-60 rounded-2xl">
+ {% trans %}Fee per Coin{% endtrans %}
+ </th>
+ </tr>
+ <tr>
+ <td class="p-2 bg-slate-200 bg-opacity-60 rounded-2xl">
+ 0.0025 CHF - 0.64 CHF
+ </td>
+ <td class="p-2 bg-slate-200 bg-opacity-60 rounded-2xl">
+ 0.0025 CHF
+ </td>
+ </tr>
+ <tr>
+ <td class="p-2 bg-slate-200 bg-opacity-60 rounded-2xl">
+ 1.28 CHF - 10.24 CHF
+ </td>
+ <td class="p-2 bg-slate-200 bg-opacity-60 rounded-2xl">
+ 0.0050 CHF
+ </td>
+ </tr>
+ <tr>
+ <td class="p-2 bg-slate-200 bg-opacity-60 rounded-2xl">
+ 20.48 CHF - 655.36 CHF
+ </td>
+ <td class="p-2 bg-slate-200 bg-opacity-60 rounded-2xl">
+ 0.0010 CHF
+ </td>
+ </tr>
</table>
<br />
<p>
- {% trans %}
- Merchants can set the merchant backend if they want to cover
+ {% trans %} Merchants can set the merchant backend if they want to
cover
customary fees. The backend will then over-approximate typical deposit
- and wire fees, ensuring that customers virtually never have
- to pay deposit fees. The following curve shows the customary
- fees for different net transaction amounts.
- {% endtrans %}
+ and wire fees, ensuring that customers virtually never have to pay
+ deposit fees. The following curve shows the customary fees for
different
+ net transaction amounts. {% endtrans %}
</p>
- <img alt="Customary fees for different net amounts" style="width:400px"
src="{{ url_static('images/stefan.svg') }}">
+ <img
+ alt="Customary fees for different net amounts"
+ style="width: 400px"
+ src="{{ url_static('images/stefan.svg') }}"
+ />
</div>
</section>
@@ -108,21 +102,18 @@
<h2>{% trans %}Bounce fee{% endtrans %}</h2>
<div class="toggle-content">
<p>
- {% trans %}
- A <b>bounce fee</b> of <b>0.1 CHF</b> is charged by Taler
Operations
- to wire transfers that return funds to customers when either the Taler
- wallet did not withdraw the amount after <b>4 weeks</b>, or immediately
- if a wire transfer subject was used that is missing the required code
to
- associate a wallet with the wire transfer. The fee is deducted from the
- amount transferred back to the original account.
- {% endtrans %}
+ {% trans %} A <b>bounce fee</b> of <b>0.1 CHF</b> is charged by
+ Taler Operations to wire transfers that return funds to customers when
+ either the Taler wallet did not withdraw the amount after
+ <b>4 weeks</b>, or immediately if a wire transfer subject was used that
+ is missing the required code to associate a wallet with the wire
+ transfer. The fee is deducted from the amount transferred back to the
+ original account. {% endtrans %}
</p>
<p>
- {% trans %}
- To avoid paying bounce fees payers should be careful when entering the
- wire transfer subject, and ensure that their wallet is online within a
month of
- initiating the withdrawal.
- {% endtrans %}
+ {% trans %} To avoid paying bounce fees payers should be careful when
+ entering the wire transfer subject, and ensure that their wallet is
+ online within a month of initiating the withdrawal. {% endtrans %}
</p>
</div>
</section>
@@ -131,16 +122,15 @@
<h2>{% trans %}Possible loss of e-money due to expiration{% endtrans
%}</h2>
<div class="toggle-content">
<p>
- {% trans %}
- Taler eCHF is issued by Taler Operations with a <b>1 year</b>
validity
- period. One month before the expiration date, you wallet should
- automatically exchange any eCHF that are about to expire for new eCHF
- with an extended validity period. However, if your wallet is offline
for
- an extended period of time, it may be unable to do so. Ensure your
- wallet is regularly online to avoid loosing money due to expiration!
- {% endtrans %}
+ {% trans %} Taler eCHF is issued by Taler Operations with a
+ <b>1 year</b> validity period. One month before the expiration
+ date, you wallet should automatically exchange any eCHF that are about
+ to expire for new eCHF with an extended validity period. However, if
+ your wallet is offline for an extended period of time, it may be unable
+ to do so. Ensure your wallet is regularly online to avoid loosing money
+ due to expiration! {% endtrans %}
</p>
</div>
- </section>
+ </div>
</main>
{% endblock body_content %}
diff --git a/template/merchants.html.j2 b/template/merchants.html.j2
index 74e452f..cbd5521 100644
--- a/template/merchants.html.j2
+++ b/template/merchants.html.j2
@@ -20,20 +20,23 @@
</h2>
<ul class="text-lg font-normal list-disc list-inside">
<li>
- {% trans %}
- Open Swiss bank account, ideally with support for <a target="_blank"
href="https://www.ebics.org/";>EBICS</a>.
- {% endtrans %}
+ {% trans %} Open Swiss bank account, ideally with support for
+ <a target="_blank" href="https://www.ebics.org/";>EBICS</a>. {%
+ endtrans %}
</li>
<li>
{% trans %}
- <a target="_blank"
href="https://docs.taler.net/taler-merchant-manual.html";>
- Taler merchant backend</a> configured with your Swiss IBAN number.
- {% endtrans %}
+ <a
+ target="_blank"
+ href="https://docs.taler.net/taler-merchant-manual.html";
+ >
+ Taler merchant backend</a
+ >
+ configured with your Swiss IBAN number. {% endtrans %}
</li>
<li>
- {% trans %}
- Offer Taler as a payment option in your payment process.
- {% endtrans %}
+ {% trans %} Offer Taler as a payment option in your payment process.
+ {% endtrans %}
</li>
</ul>
</div>
@@ -43,15 +46,12 @@
<div class="text">
<h2>{% trans %}For in-person sales{% endtrans %}</h2>
<p>
- {% trans %}
- The merchant backend can generate static QR codes customers
- can scan to pay you.
- {% endtrans %}
+ {% trans %} The merchant backend can generate static QR codes
+ customers can scan to pay you. {% endtrans %}
</p>
<p>
- {% trans %}
- You can hard-code a price or have the customer enter the price.
- {% endtrans %}
+ {% trans %} You can hard-code a price or have the customer enter the
+ price. {% endtrans %}
</p>
<p>
<a
@@ -77,14 +77,12 @@
<div class="text">
<h2>{% trans %}For WooCommerce{% endtrans %}</h2>
<p>
- {% trans %}
- A payment plugin is availalbe to add GNU Taler support to WooCommerce.
- {% endtrans %}
+ {% trans %} A payment plugin is availalbe to add GNU Taler support to
+ WooCommerce. {% endtrans %}
</p>
<p>
- {% trans %}
- You mostly need to configure access to your Taler merchant backend.
- {% endtrans %}
+ {% trans %} You mostly need to configure access to your Taler
merchant
+ backend. {% endtrans %}
</p>
<p>
<a
@@ -109,14 +107,12 @@
<div class="text">
<h2>{% trans %}For Pretix{% endtrans %}</h2>
<p>
- {% trans %}
- A payment plugin is availalbe to add GNU Taler support to Pretix.
- {% endtrans %}
+ {% trans %} A payment plugin is availalbe to add GNU Taler support to
+ Pretix. {% endtrans %}
</p>
<p>
- {% trans %}
- You mostly need to configure access to your Taler merchant backend.
- {% endtrans %}
+ {% trans %} You mostly need to configure access to your Taler
merchant
+ backend. {% endtrans %}
</p>
<p>
<a
@@ -142,14 +138,12 @@
<div class="text">
<h2>{% trans %}For Joomla!{% endtrans %}</h2>
<p>
- {% trans %}
- A payment plugin is availalbe to add GNU Taler support to Joomla!
with Payage.
- {% endtrans %}
+ {% trans %} A payment plugin is availalbe to add GNU Taler support to
+ Joomla! with Payage. {% endtrans %}
</p>
<p>
- {% trans %}
- You mostly need to configure access to your Taler merchant backend.
- {% endtrans %}
+ {% trans %} You mostly need to configure access to your Taler
merchant
+ backend. {% endtrans %}
</p>
<p>
<a
@@ -174,16 +168,12 @@
<div class="text">
<h2>{% trans %}For points of sale{% endtrans %}</h2>
<p>
- {% trans %}
- A point-of-sale App for Android can be used to quickly set
- up orders and handle payments.
- {% endtrans %}
+ {% trans %} A point-of-sale App for Android can be used to quickly
set
+ up orders and handle payments. {% endtrans %}
</p>
<p>
- {% trans %}
- The App was designed for restaurants, but might be useful
- for other types of in-person sales.
- {% endtrans %}
+ {% trans %} The App was designed for restaurants, but might be useful
+ for other types of in-person sales. {% endtrans %}
</p>
<p>
<a
@@ -208,15 +198,13 @@
<div class="text">
<h2>{% trans %}For developers{% endtrans %}</h2>
<p>
- {% trans %}
- The merchant backend offers a simple REST API to integrate
- GNU Taler into existing E-commerce systems.
- {% endtrans %}
+ {% trans %} The merchant backend offers a simple REST API to
integrate
+ GNU Taler into existing E-commerce systems. {% endtrans %}
</p>
<p>
- {% trans %}
- Documentation is available at <a target="_blank"
href="https://docs.taler.net/";>docs.taler.net</a>.
- {% endtrans %}
+ {% trans %} Documentation is available at
+ <a target="_blank" href="https://docs.taler.net/";>docs.taler.net</a>.
+ {% endtrans %}
</p>
<p>
<a
diff --git a/template/users.html.j2 b/template/users.html.j2
index 875d731..f3e8b82 100644
--- a/template/users.html.j2
+++ b/template/users.html.j2
@@ -129,15 +129,15 @@
>
</h2>
<p>
- {% trans %}As a first-time user, you need to add Taler
- Operations as a payment service provider. The easiest way to do so is
- to scan the QR code on the right which will also initiate the
- withdrawal process.{% endtrans %}
+ {% trans %}As a first-time user, you need to add Taler Operations as
a
+ payment service provider. The easiest way to do so is to scan the QR
+ code on the right which will also initiate the withdrawal process.{%
+ endtrans %}
</p>
<p>
{% trans %}If you already have a payment service provider for the
- "CHF" currency, you can withdraw digital cash by clicking
- the "add" button on the "CHF balance" screen.{% endtrans %}
+ "CHF" currency, you can withdraw digital cash by clicking the "add"
+ button on the "CHF balance" screen.{% endtrans %}
</p>
</div>
<div class="img">
@@ -254,9 +254,8 @@
</h2>
<p>{% trans %}Review and confirm the operation.{% endtrans %}</p>
<p>
- {% trans %}
- Depending on the payment service provider, you may be shown fees.
- {% endtrans %}
+ {% trans %} Depending on the payment service provider, you may be
+ shown fees. {% endtrans %}
</p>
</div>
<div class="img">
@@ -299,15 +298,12 @@
>
</h2>
<p>
- {% trans %}
- The wallet will show you the subject, target account and amount to
transfer.
- {% endtrans %}
+ {% trans %} The wallet will show you the subject, target account and
+ amount to transfer. {% endtrans %}
</p>
<p>
- {% trans %}
- Copy the information into your online banking application
- and wire the funds to the payment service provider.
- {% endtrans %}
+ {% trans %} Copy the information into your online banking application
+ and wire the funds to the payment service provider. {% endtrans %}
</p>
</div>
<div class="img">
@@ -348,16 +344,13 @@
<span class="step-description">{% trans %}Wait!{% endtrans %}</span>
</h2>
<p>
- {% trans %}
- The wallet will automatically receive the digital cash once
- your wire transfer has arrived at the payment service provider.
+ {% trans %} The wallet will automatically receive the digital cash
+ once your wire transfer has arrived at the payment service provider.
{% endtrans %}
</p>
<p>
- {% trans %}
- Depending on your bank, this may take a few days. You do
- not need to keep the wallet open.
- {% endtrans %}
+ {% trans %} Depending on your bank, this may take a few days. You do
+ not need to keep the wallet open. {% endtrans %}
</p>
</div>
<div class="img">
@@ -398,18 +391,14 @@
<span class="step-description">{% trans %}Shop{% endtrans %}</span>
</h2>
<p>
- {% trans %}
- When shopping, the wallet may be launched automatically or
+ {% trans %} When shopping, the wallet may be launched automatically
or
you may need to click a link, scan a QR code or even select the
wallet
- extension manually depending on the context.
- {% endtrans %}
+ extension manually depending on the context. {% endtrans %}
</p>
<p>
- {% trans %}
- The QR code scanner button can also be held to manually
+ {% trans %} The QR code scanner button can also be held to manually
enter a "<code>taler://</code>-URI", for example if you received one
- via text message.
- {% endtrans %}
+ via text message. {% endtrans %}
</p>
</div>
<div class="img">
@@ -450,15 +439,11 @@
<span class="step-description">{% trans %}Pay{% endtrans %}</span>
</h2>
<p>
- {% trans %}
- The wallet will show you details about what you are buying,
- including the price and applicable fees.
- {% endtrans %}
+ {% trans %} The wallet will show you details about what you are
+ buying, including the price and applicable fees. {% endtrans %}
</p>
<p>
- {% trans %}
- Simply press "Pay" to make the payment.
- {% endtrans %}
+ {% trans %} Simply press "Pay" to make the payment. {% endtrans %}
</p>
</div>
<div class="img">
@@ -499,14 +484,12 @@
<span class="step-description">{% trans %}Manage{% endtrans %}</span>
</h2>
<p>
- {% trans %}
- The wallet keeps track of your transaction history.
- {% endtrans %}
+ {% trans %} The wallet keeps track of your transaction history. {%
+ endtrans %}
</p>
<p>
- {% trans %}
- You can delete transactions, erasing any trace that you were the
buyer.
- {% endtrans %}
+ {% trans %} You can delete transactions, erasing any trace that you
+ were the buyer. {% endtrans %}
</p>
</div>
<div class="img">
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
- [taler-taler-ops-www] branch master updated (2a5b45b -> 535cd9d),
gnunet <=