C3L/C3L-Membership-Online-Form Changeset - 10cfc4437178 · Chaos Computer Club Lëtzebuerg Projects

Changeset - 10cfc4437178

Parent rev.

Child rev.

[Not reviewed]

crypto

0 3 0

Dennis Fink - 3 years ago 2022-01-17 22:47:32
dennis.fink@c3l.lu

Unify cryptocurrencies handling

This allows us to add new cryptocurrencies without adding new code

3 files changed with 28 insertions and 86 deletions:

c3l_membership/__init__.py

c3l_membership/templates/member.html

c3l_membership/views.py

0 comments (0 inline, 0 general)

c3l_membership/__init__.py

➞

Show inline comments

@@ @@ -36,23 +36,7 @@ def create_app(): @@
     app.config.setdefault("REGULAR_FEE", 120)
     app.config.setdefault("DIGICASH_ENABLED", True)
     app.config.setdefault("BITCOIN_ENABLED", True)
     app.config.setdefault("ETHEREUM_ENABLED", True)
     app.config.setdefault("MONERO_ENABLED", True)
     app.config.setdefault("ZCASH_ENABLED", True)
     app.config.setdefault(
         "BITCOIN_CONVERSION_SCRIPT", "/usr/local/share/btc/BTC_Membership.pl"
+    )
     app.config.setdefault(
         "ETHEREUM_CONVERSION_SCRIPT", "/usr/local/share/eth/ETH_Membership.pl"
+    )
     app.config.setdefault(
         "MONERO_CONVERSION_SCRIPT", "/usr/local/share/xmr/XMR_Membership.pl"
+    )
     app.config.setdefault(
         "ZCASH_CONVERSION_SCRIPT", "/usr/local/share/zcash/ZCASH_Membership.pl"
+    )
     app.config.setdefault("CRYPTOCURRENCIES", dict())
     @babel.localeselector
     def get_locale():

c3l_membership/templates/member.html

➞

Show inline comments

@@ @@ -87,57 +87,18 @@ @@
       </ul>
     {% elif form.payment.data == 'cash' %}
       <p>{% trans %}Please bring {{ price }}€ with you the next time you meet us!{% endtrans %}</p>
     {% elif form.payment.data == 'bitcoin' %}
       <div class="btccontainer">
         <div>
           <ul class="btctext">
             <li><b>{% trans %}Address:{% endtrans %}</b> {{ config["BITCOIN_ADDRESS"] }}</li>
             <li><b>{% trans %}Label:{% endtrans %}</b> Membership Fee</li>
             <li><b>{% trans %}Message:{% endtrans %}</b> {{ year }} {{ form.username.data }}</li>
             <li><b>{% trans %}Amount:{% endtrans %}</b> {{ price }} BTC</li>
           </ul>
         </div>
         {% set bitcoin_url="bitcoin:" + config["BITCOIN_ADDRESS"] + "?amount={amount}&label=Membership Fee {year} {username}&message=Membership Fee {year} {username}".format(amount=price, year=year, username=form.username.data) %}
         <div><img class="btcqrcode" src="{{ qrcode(bitcoin_url) }}" /></div>
       </div>
     {% elif form.payment.data == 'ethereum' %}
     {% elif form.payment.data in config["CRYPTOCURRENCIES"] %}
       <div class="btccontainer">
         <div>
           <ul class="btctext">
             <li><b>{% trans %}Address:{% endtrans %}</b> {{ config["ETHEREUM_ADDRESS"] }}</li>
             <li><b>{% trans %}Label:{% endtrans %}</b> Membership Fee</li>
             <li><b>{% trans %}Message:{% endtrans %}</b> {{ year }} {{ form.username.data }}</li>
             <li><b>{% trans %}Amount:{% endtrans %}</b> {{ price }} ETH</li>
           </ul>
         </div>
         {% set ethereum_url=config["ETHEREUM_ADDRESS"] %}
         <div><img class="btcqrcode" src="{{ qrcode(ethereum_url) }}" /></div>
       </div>
     {% elif form.payment.data == 'monero' %}
       <div class="btccontainer">
         <div>
           <ul class="btctext">
             <li><b>{% trans %}Address:{% endtrans %}</b> {{ config["MONERO_ADDRESS"] }}</li>
             <li><b>{% trans %}Address:{% endtrans %}</b> {{ config["CRYPTOCURRENCIES"][form.payment.data]["ADDRESS"] }}</li>
             <li><b>{% trans %}Label:{% endtrans %}</b> Membership Fee</li>
             <li><b>{% trans %}Message:{% endtrans %}</b> {{ year }} {{ form.username.data }}</li>
-            <li><b>{% trans %}Amount:{% endtrans %}</b> {{ price }} XMR</li>
+            <li><b>{% trans %}Amount:{% endtrans %}</b> {{ price }} {{ config["CRYPTOCURRENCIES"][form.payment.data]["COMMODITY"] }}</li>
           </ul>
         </div>
         {% set monero_url=config["MONERO_ADDRESS"] %}
         <div><img class="btcqrcode" src="{{ qrcode(monero_url) }}" /></div>
       </div>
     {% elif form.payment.data == 'zcash' %}
       <div class="btccontainer">
         <div>
           <ul class="btctext">
             <li><b>{% trans %}Address:{% endtrans %}</b> {{ config["ZCASH_ADDRESS"] }}</li>
             <li><b>{% trans %}Label:{% endtrans %}</b> Membership Fee</li>
             <li><b>{% trans %}Message:{% endtrans %}</b> {{ year }} {{ form.username.data }}</li>
             <li><b>{% trans %}Amount:{% endtrans %}</b> {{ price }} ZEC</li>
           </ul>
         </div>
         {% set zcash_url=config["ZCASH_ADDRESS"] %}
         <div><img class="btcqrcode" src="{{ qrcode(zcash_url) }}" /></div>
         {% set crypto_url={{ config["CRYPTOCURRENCIES"][form.payment.data]["URL"] }}.format(amount=price, year=year, username=form.username.data) %}
         <div><img class="btcqrcode" src="{{ qrcode(crypto_url) }}" /></div>
       </div>
     {% elif form.payment.data == 'digicash' %}
       <div class="digicash">

c3l_membership/views.py

➞

Show inline comments

@@ @@ -34,15 +34,18 @@ def index(): @@
         ("wire transfer", gettext("by wire transfer")),
+    ]
     for k, v in (
         ("DIGICASH_ENABLED", ("digicash", gettext("by DigiCash"))),
         ("BITCOIN_ENABLED", ("bitcoin", gettext("by bitcoin"))),
         ("ETHEREUM_ENABLED", ("ethereum", gettext("by ethereum"))),
         ("MONERO_ENABLED", ("monero", gettext("by monero"))),
         ("ZCASH_ENABLED", ("zcash", gettext("by zcash"))),
     ):
         if current_app.config[k]:
             choices.append(v)
     if current_app.config["DIGICASH_ENABLED"]:
         choices.append(("digicash", gettext("by DigiCash")))
     for cryptocurrency_label, options in current_app.config["CRYPTOCURRENCIES"].items():
         if options["ENABLED"]:
             choices.append(
+                (
                     cryptocurrency_label,
                     " ".format((gettext("by"), options)),
                 ),
+            )
     form.payment.choices = choices
     if form.validate_on_submit():
@@ @@ -87,22 +90,16 @@ def index(): @@
+        )
         xml_data["address"] = re.sub("\s+", " ", xml_data["address"])
         if form.payment.data == "bitcoin":
             price = subprocess.check_output(
                 [current_app.config["BITCOIN_CONVERSION_SCRIPT"], str(price)]
             ).decode("utf-8")
         elif form.payment.data == "ethereum":
             price = subprocess.check_output(
                 [current_app.config["ETHEREUM_CONVERSION_SCRIPT"], str(price)]
             ).decode("utf-8")
         elif form.payment.data == "monero":
             price = subprocess.check_output(
                 [current_app.config["MONERO_CONVERSION_SCRIPT"], str(price)]
             ).decode("utf-8")
         elif form.payment.data == "zcash":
             price = subprocess.check_output(
                 [current_app.config["ZCASH_CONVERSION_SCRIPT"], str(price)]
             ).decode("utf-8")
         if form.payment.data in current_app.config["CRYPTOCURRENCIES"]:
             price = subprocess.run(
+                [
                     current_app.config["CRYPTOCURRENCIES_CONVERSION_SCRIPT"],
                     str(price),
                     form.payment.data,
                 ],
                 capture_output=True,
                 encoding="utf-8",
             ).stdout
         elif form.payment.data == "digicash":
             price = price * 100

0 comments (0 inline, 0 general)