Merge pull request #6 from OniriCorpe/master

Dynamic currency system

config.ini.example

@@ -31,6 +31,11 @@ connection-string=postgresql://postgres@localhost/fosspay
 stripe-secret=
 stripe-publish=
 
+# Currency to use
+# "usd" for dollar, "eur" for euro
+# refer to stripe documentation for details : https://stripe.com/docs/currencies
+currency=usd
+
 # Separate with spaces
 default-amounts=3 5 10 20
 # Which one to pick when they arrive?

contrib/fr/overrides/admin.html

@@ -64,24 +64,24 @@
                     <tr>
                         <td><button type="button" class="close">&times;</button></td>
                         <td>{{ project.name }}</td>
-                        <td>{{ "{:.2f}".format(one_times(project) / 100) }}€</td>
-                        <td>{{ "{:.2f}".format(recurring(project) / 100) }}€</td>
-                        <td>{{ "{:.2f}".format(recurring_ever(project) / 100) }}€</td>
+                        <td>{{ currency.amount("{:.2f}".format(one_times(project) / 100)) }}</td>
+                        <td>{{ currency.amount("{:.2f}".format(recurring(project) / 100)) }}</td>
+                        <td>{{ currency.amount("{:.2f}".format(recurring_ever(project) / 100)) }}</td>
                     </tr>
                     {% endfor %}
                     <tr>
                         <td></td>
                         <td>(non précisé)</td>
-                        <td>{{ "{:.2f}".format(unspecified_one_times / 100) }}€</td>
-                        <td>{{ "{:.2f}".format(unspecified_recurring / 100) }}€</td>
-                        <td>{{ "{:.2f}".format(unspecified_recurring_ever / 100) }}€</td>
+                        <td>{{ currency.amount("{:.2f}".format(unspecified_one_times / 100)) }}</td>
+                        <td>{{ currency.amount("{:.2f}".format(unspecified_recurring / 100)) }}</td>
+                        <td>{{ currency.amount("{:.2f}".format(unspecified_recurring_ever / 100)) }}</td>
                     </tr>
                     <tr>
                         <td></td>
                         <td><strong>Total</strong></td>
-                        <td>{{ "{:.2f}".format(total_one_time / 100) }}€</td>
-                        <td>{{ "{:.2f}".format(total_recurring / 100) }}€</td>
-                        <td>{{ "{:.2f}".format(total_recurring_ever / 100) }}€</td>
+                        <td>{{ currency.amount("{:.2f}".format(total_one_time / 100)) }}</td>
+                        <td>{{ currency.amount("{:.2f}".format(total_recurring / 100)) }}</td>
+                        <td>{{ currency.amount("{:.2f}".format(total_recurring_ever / 100)) }}</td>
                     </tr>
                 </tbody>
             </table>
@@ -117,7 +117,7 @@
                 <td><a href="mailto:{{ donation.user.email }}">{{ donation.user.email }}</a></td>
                 <td>{{ donation.project.name if donation.project else "" }}</td>
                 <td title="{{ donation.comment }}">{{ donation.comment if donation.comment else "" }}</td>
-                <td>{{ "{:.2f}".format(donation.amount / 100) }}€</td>
+                <td>{{ currency.amount("{:.2f}".format(donation.amount / 100)) }}</td>
                 <td>
                     {{ "Unique" if str(donation.type) == "DonationType.one_time" else "Mensuel" }}
                     {{ "(cancelled)" if not donation.active else "" }}

contrib/fr/overrides/goal.html

@@ -23,21 +23,21 @@
           class="progress-bar progress-bar-primary"
           style="width: {{ recurring_progress * 100 }}%; line-height: 2.5"
         >
-          <span>{{ "{:.0f}".format(recurring_sum / 100) }}€</span>
+          <span>{{ currency.amount("{:.0f}".format(recurring_sum / 100)) }}</span>
         </div>
 
         <div
           class="progress-bar progress-bar-info"
           style="width: {{ patreon_progress * 100 }}%; line-height: 2.5"
         >
-          <span>{{ "{:.0f}".format(patreon_sum / 100) }}€</span>
+          <span>{{ currency.amount("{:.0f}".format(patreon_sum / 100)) }}</span>
         </div>
 
         <div
           class="progress-bar progress-bar-warning"
           style="width: {{ lp_progress * 100 }}%; line-height: 2.5"
         >
-          <span>{{ "{:.0f}".format(lp_sum / 100) }}€</span>
+          <span>{{ currency.amount("{:.0f}".format(lp_sum / 100)) }}</span>
         </div>
       </div>
       {% endif %}
@@ -47,13 +47,13 @@
     <div class="col-md-6 col-md-offset-3">
       {% if patreon_count or lp_count %}
       <p>
-        {{ "{:.2f}".format(recurring_sum / 100) }}€ par mois
+        {{ currency.amount("{:.2f}".format(recurring_sum / 100)) }} par mois
         via <strong class="text-primary">{{ domain }}</strong>
         ({{ recurring_count }} donateurice{{ "s" if recurring_count != 1 else "" }})
       </p>
       {% if patreon_count %}
       <p>
-        {{ "{:.2f}".format(patreon_sum / 100) }}€ par mois
+        {{ currency.amount("{:.2f}".format(patreon_sum / 100)) }} par mois
         via
         <strong><a
           href="https://patreon.com/{{ _cfg("patreon-campaign") }}"
@@ -64,7 +64,7 @@
       {% endif %}
       {% if lp_count %}
       <p>
-        {{ "{:.2f}".format(lp_sum / 100) }}€ par mois
+        {{ currency.amount("{:.2f}".format(lp_sum / 100)) }} par mois
         via
         <strong><a
           class="text-warning"
@@ -76,14 +76,14 @@
       {% endif %}
       {% if goal %}
       <p class="{{ "text-center" if not patreon_sum else "" }}">
-        {{ "{:.2f}".format(total_sum / 100)}}€ par mois
+        {{ currency.amount("{:.2f}".format(total_sum / 100))}} par mois
         sur l'objectif de
-        {{ "{:.2f}".format(goal / 100) }}€.
+        {{ currency.amount("{:.2f}".format(goal / 100)) }}.
       </p>
       {% else %}
       <p>
-        Supported with ${{ "{:.2f}".format(total_sum / 100) }}
-        from {{ total_count }} supporters!
+        Soutenu par {{ total_count }} personne{{ "s" if total_count != 1 else "" }}
+        pour un montant total de {{ currency.amount("{:.2f}".format(total_sum / 100)) }}
       </p>
       {% endif %}
     </div>

contrib/fr/overrides/index.html

@@ -17,6 +17,8 @@ const i18n = {
 };
 // Fin de traduction
 
+const currency = "{{ _cfg("currency") }}";
+
 {% if user %}
 window.email = "{{user.email}}";
 {% endif %}
@@ -66,7 +68,7 @@ window.email = "{{user.email}}";
         <div class="btn-group" role="group">
           <button data-amount="{{ amt }}" type="button"
             class="btn btn-default {{"active" if _cfg("default-amount") == amt else ""}}"
-          >{{ amt }}€</button>
+          >{{ currency.amount(amt) }}</button>
         </div>
         {% endfor %}
         <div class="btn-group" role="group">
@@ -79,7 +81,7 @@ window.email = "{{user.email}}";
     <div class="col-md-4 col-md-offset-4">
       <div class="form-group">
         <div class="input-group">
-          <span class="input-group-addon">€</span>
+          <span class="input-group-addon">{{ currency.symbol }}</span>
           <input id="custom-amount-text" type="text" value="13.12"
               class="form-control" placeholder="Montant" />
         </div>

contrib/fr/overrides/layout.html

@@ -5,7 +5,7 @@
         <meta name="viewport" content="width=device-width, initial-scale=1" />
         <link rel="icon" href="static/icon.png" type="image/png" />
         {% block title %}
-        <title>Donations pour {{_cfg("your-name")}}</title>
+        <title>Donner au {{_cfg("your-name")}}</title>
         {% endblock %}
         <link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/bootstrap/3.3.5/css/bootstrap.min.css" />
         {% block styles %}{% endblock %}

contrib/fr/overrides/panel.html

@@ -30,7 +30,7 @@
                     </form>
                 </td>
                 <td>{{ donation.created.strftime("%d-%m-%Y") }}</td>
-                <td>{{ "{:.2f}".format(donation.amount / 100) }}€</td>
+                <td>{{ currency.amount("{:.2f}".format(donation.amount / 100)) }}</td>
                 <td>{{ donation.project.name if donation.project else "Non précisé" }}</td>
             </tr>
         {% endfor %}
@@ -51,7 +51,7 @@
         {% for donation in one_times(user) %}
             <tr>
                 <td>{{ donation.created.strftime("%d-%m-%Y") }}</td>
-                <td>{{ "{:.2f}".format(donation.amount / 100) }}€</td>
+                <td>{{ currency.amount("{:.2f}".format(donation.amount / 100)) }}</td>
                 <td>{{ donation.project.name if donation.project else "Non précisé" }}</td>
             </tr>
         {% endfor %}

emails/declined

@@ -1,5 +1,5 @@
 An attempt was just made to charge your card for your monthly donation to
-{{your_name}} for ${{amount}}. Unfortunately, your card was declined.
+{{your_name}} for {{amount}}. Unfortunately, your card was declined.
 
 The donation has been disabled. If you would like to, you may create a new
 recurring donation here:

emails/thank-you

@@ -3,10 +3,10 @@ Thank you for donating!
 Receipt:
 
 {{#monthly}}
-Monthly donation                ${{amount}}
+Monthly donation                {{amount}}
 {{/monthly}}
 {{^monthly}}
-One-time donation               ${{amount}}
+One-time donation               {{amount}}
 {{/monthly}}
 
 You can view and manage your donations online here:

fosspay/blueprints/html.py

@@ -6,6 +6,7 @@ from fosspay.database import db
 from fosspay.common import *
 from fosspay.config import _cfg, load_config
 from fosspay.email import send_thank_you, send_password_reset
+from fosspay.currency import currency
 
 import os
 import locale
@@ -75,7 +76,7 @@ def index():
             patreon_count=patreon_count,
             patreon_sum=patreon_sum,
             lp_count=lp_count,
-            lp_sum=lp_sum)
+            lp_sum=lp_sum, currency=currency)
 
 @html.route("/setup", methods=["POST"])
 def setup():
@@ -103,6 +104,7 @@ def admin():
         first=first,
         projects=projects,
         donations=donations,
+        currency=currency,
         one_times=lambda p: sum([d.amount for d in p.donations if d.type == DonationType.one_time]),
         recurring=lambda p: sum([d.amount for d in p.donations if d.type == DonationType.monthly and d.active]),
         recurring_ever=lambda p: sum([d.amount * d.payments for d in p.donations if d.type == DonationType.monthly]),
@@ -202,7 +204,7 @@ def donate():
     try:
         charge = stripe.Charge.create(
             amount=amount,
-            currency="usd",
+            currency=_cfg("currency"),
             customer=user.stripe_customer,
             description="Donation to " + _cfg("your-name")
         )
@@ -276,7 +278,8 @@ def reset_password(token):
 def panel():
     return render_template("panel.html",
         one_times=lambda u: [d for d in u.donations if d.type == DonationType.one_time],
-        recurring=lambda u: [d for d in u.donations if d.type == DonationType.monthly and d.active])
+        recurring=lambda u: [d for d in u.donations if d.type == DonationType.monthly and d.active],
+        currency=currency)
 
 @html.route("/cancel/<id>")
 @loginrequired

fosspay/currency.py

@@ -0,0 +1,21 @@
+from fosspay.config import _cfg
+
+class Currency:
+    def __init__(self, symbol, position):
+        self.symbol = symbol
+        self.position = position
+    
+    def amount(self, amount):
+        if self.position == "right":
+            return amount + self.symbol
+        else:
+            return self.symbol + amount
+
+currencies = {
+    'usd' : Currency("$", "left"),
+    'eur' : Currency("€", "right")
+    # ... More currencies can be added here
+}
+
+currency = currencies[_cfg("currency")]
+

fosspay/email.py

@@ -10,6 +10,7 @@ from flask import url_for
 from fosspay.database import db
 from fosspay.objects import User
 from fosspay.config import _cfg, _cfgi
+from fosspay.currency import currency
 
 def send_thank_you(user, amount, monthly):
     if _cfg("smtp-host") == "":
@@ -24,7 +25,7 @@ def send_thank_you(user, amount, monthly):
                 "user": user,
                 "root": _cfg("protocol") + "://" + _cfg("domain"),
                 "your_name": _cfg("your-name"),
-                "amount": "{:.2f}".format(amount / 100),
+                "amount": currency.amount("{:.2f}".format(amount / 100)),
                 "monthly": monthly,
                 "your_email": _cfg("your-email")
             })))
@@ -70,7 +71,7 @@ def send_declined(user, amount):
                 "user": user,
                 "root": _cfg("protocol") + "://" + _cfg("domain"),
                 "your_name": _cfg("your-name"),
-                "amount": "{:.2f}".format(amount / 100)
+                "amount": currency.amount("{:.2f}".format(amount / 100))
             })))
     message['Subject'] = "Your monthly donation was declined."
     message['From'] = _cfg("smtp-from")

scripts/index.js

@@ -78,6 +78,7 @@
             description: donation.type == "monthly" ? i18n["Monthly Donation"] : i18n["One-time Donation"],
             panelLabel: i18n["Donate "] + "{{amount}}",
             amount: donation.amount,
+            currency: currency,
             token: function(token) {
                 e.target.setAttribute("disabled", "");
                 e.target.textContent = i18n["Submitting..."];

templates/admin.html

@@ -65,24 +65,24 @@
                     <tr>
                         <td><button type="button" class="close">&times;</button></td>
                         <td>{{ project.name }}</td>
-                        <td>${{ "{:.2f}".format(one_times(project) / 100) }}</td>
-                        <td>${{ "{:.2f}".format(recurring(project) / 100) }}</td>
-                        <td>${{ "{:.2f}".format(recurring_ever(project) / 100) }}</td>
+                        <td>{{ currency.amount("{:.2f}".format(one_times(project) / 100)) }}</td>
+                        <td>{{ currency.amount("{:.2f}".format(recurring(project) / 100)) }}</td>
+                        <td>{{ currency.amount("{:.2f}".format(recurring_ever(project) / 100)) }}</td>
                     </tr>
                     {% endfor %}
                     <tr>
                         <td></td>
                         <td>(not specified)</td>
-                        <td>${{ "{:.2f}".format(unspecified_one_times / 100) }}</td>
-                        <td>${{ "{:.2f}".format(unspecified_recurring / 100) }}</td>
-                        <td>${{ "{:.2f}".format(unspecified_recurring_ever / 100) }}</td>
+                        <td>{{ currency.amount("{:.2f}".format(unspecified_one_times / 100)) }}</td>
+                        <td>{{ currency.amount("{:.2f}".format(unspecified_recurring / 100)) }}</td>
+                        <td>{{ currency.amount("{:.2f}".format(unspecified_recurring_ever / 100)) }}</td>
                     </tr>
                     <tr>
                         <td></td>
                         <td><strong>Total</strong></td>
-                        <td>${{ "{:.2f}".format(total_one_time / 100) }}</td>
-                        <td>${{ "{:.2f}".format(total_recurring / 100) }}</td>
-                        <td>${{ "{:.2f}".format(total_recurring_ever / 100) }}</td>
+                        <td>{{ currency.amount("{:.2f}".format(total_one_time / 100)) }}</td>
+                        <td>{{ currency.amount("{:.2f}".format(total_recurring / 100)) }}</td>
+                        <td>{{ currency.amount("{:.2f}".format(total_recurring_ever / 100)) }}</td>
                     </tr>
                 </tbody>
             </table>
@@ -118,7 +118,7 @@
                 <td><a href="mailto:{{ donation.user.email }}">{{ donation.user.email }}</a></td>
                 <td>{{ donation.project.name if donation.project else "" }}</td>
                 <td title="{{ donation.comment }}">{{ donation.comment if donation.comment else "" }}</td>
-                <td>${{ "{:.2f}".format(donation.amount / 100) }}</td>
+                <td>{{ currency.amount("{:.2f}".format(donation.amount / 100)) }}</td>
                 <td>
                     {{ "Once" if str(donation.type) == "DonationType.one_time" else "Monthly" }}
                     {{ "(cancelled)" if not donation.active else "" }}

templates/goal.html

@@ -23,21 +23,21 @@
           class="progress-bar progress-bar-primary"
           style="width: {{ recurring_progress * 100 }}%; line-height: 2.5"
         >
-          <span>${{ "{:.0f}".format(recurring_sum / 100) }}</span>
+          <span>{{ currency.amount("{:.0f}".format(recurring_sum / 100)) }}</span>
         </div>
 
         <div
           class="progress-bar progress-bar-info"
           style="width: {{ patreon_progress * 100 }}%; line-height: 2.5"
         >
-          <span>${{ "{:.0f}".format(patreon_sum / 100) }}</span>
+          <span>{{ currency.amount("{:.0f}".format(patreon_sum / 100)) }}</span>
         </div>
 
         <div
           class="progress-bar progress-bar-warning"
           style="width: {{ lp_progress * 100 }}%; line-height: 2.5"
         >
-          <span>${{ "{:.0f}".format(lp_sum / 100) }}</span>
+          <span>{{ currency.amount("{:.0f}".format(lp_sum / 100)) }}</span>
         </div>
       </div>
       {% endif %}
@@ -47,13 +47,13 @@
     <div class="col-md-6 col-md-offset-3">
       {% if patreon_count or lp_count %}
       <p>
-        ${{ "{:.2f}".format(recurring_sum / 100) }}/mo
+        {{ currency.amount("{:.2f}".format(recurring_sum / 100)) }}/mo
         via <strong class="text-primary">{{ domain }}</strong>
         ({{ recurring_count }} supporter{{ "s" if recurring_count != 1 else "" }})
       </p>
       {% if patreon_count %}
       <p>
-        ${{ "{:.2f}".format(patreon_sum / 100) }}/mo
+        {{ currency.amount("{:.2f}".format(patreon_sum / 100)) }}/mo
         via
         <strong><a
           href="https://patreon.com/{{ _cfg("patreon-campaign") }}"
@@ -64,7 +64,7 @@
       {% endif %}
       {% if lp_count %}
       <p>
-        ${{ "{:.2f}".format(lp_sum / 100) }}/mo
+        {{ currency.amount("{:.2f}".format(lp_sum / 100)) }}/mo
         via
         <strong><a
           class="text-warning"
@@ -76,14 +76,14 @@
       {% endif %}
       {% if goal %}
       <p class="{{ "text-center" if not patreon_sum else "" }}">
-        ${{ "{:.2f}".format(total_sum / 100)}}/mo
+        {{ currency.amount("{:.2f}".format(total_sum / 100))}}/mo
         of
-        ${{ "{:.2f}".format(goal / 100) }}/mo
+        {{ currency.amount("{:.2f}".format(goal / 100)) }}/mo
         goal
       </p>
       {% else %}
       <p>
-        Supported with ${{ "{:.2f}".format(total_sum / 100) }}
+        Supported with {{ currency.amount("{:.2f}".format(total_sum / 100)) }}
         from {{ total_count }} supporters!
       </p>
       {% endif %}

templates/index.html

@@ -15,6 +15,9 @@ const i18n = {
     "Submitting...": "Submitting...",
     "Donate": "Donate"
 };
+// End of translation of index.js
+
+const currency = "{{ _cfg("currency") }}";
 
 {% if user %}
 window.email = "{{user.email}}";
@@ -65,7 +68,7 @@ window.email = "{{user.email}}";
         <div class="btn-group" role="group">
           <button data-amount="{{ amt }}" type="button"
             class="btn btn-default {{"active" if _cfg("default-amount") == amt else ""}}"
-          >${{ amt }}</button>
+            >{{ currency.amount(amt) }}</button>
         </div>
         {% endfor %}
         <div class="btn-group" role="group">
@@ -78,7 +81,7 @@ window.email = "{{user.email}}";
     <div class="col-md-4 col-md-offset-4">
       <div class="form-group">
         <div class="input-group">
-          <span class="input-group-addon">$</span>
+          <span class="input-group-addon">{{ currency.symbol }}</span>
           <input id="custom-amount-text" type="text" value="13.37"
               class="form-control" placeholder="Amount" />
         </div>

templates/panel.html

@@ -30,7 +30,7 @@
                     </form>
                 </td>
                 <td>{{ donation.created.strftime("%Y-%m-%d") }}</td>
-                <td>${{ "{:.2f}".format(donation.amount / 100) }}</td>
+                <td>{{ currency.amount("{:.2f}".format(donation.amount / 100)) }}</td>
                 <td>{{ donation.project.name if donation.project else "Not specified" }}</td>
             </tr>
         {% endfor %}
@@ -51,7 +51,7 @@
         {% for donation in one_times(user) %}
             <tr>
                 <td>{{ donation.created.strftime("%Y-%m-%d") }}</td>
-                <td>${{ "{:.2f}".format(donation.amount / 100) }}</td>
+                <td>{{ currency.amount("{:.2f}".format(donation.amount / 100)) }}</td>
                 <td>{{ donation.project.name if donation.project else "Not specified" }}</td>
             </tr>
         {% endfor %}