# Date 2021-07-01 20:35:01 # Node ID 587a9a50643fcc3adfc4ec645aa9aa9ee44b9c46 # Parent 2dd5f5d2503abd0f647367cf20b4c1d8809da3ec Use flexbox layout and add qrcode for automatic data import into MeVeSc diff --git a/c3l_membership/static/pdf.css b/c3l_membership/static/pdf.css --- a/c3l_membership/static/pdf.css +++ b/c3l_membership/static/pdf.css @@ -12,8 +12,6 @@ body { img { width: 250px; - margin-left: auto; - margin-right: auto; display: block; margin-bottom: 1.5em; } @@ -28,23 +26,27 @@ p { margin-bottom: 1em; } -dl { - margin-top: 0; - margin-bottom: 1em; +.logos { + display: flex; + justify-content: space-between; + align-items: center; } -dt { - float: left; - width: 360px; - clear: left; - text-align: left; - font-weight: 700; - margin-bottom: 1px; +.data { + margin-top: 0; + margin-bottom: 1em; + display: flex; + justify-content: space-between; + flex-direction: column; } -dd { - margin-left: 240px; - margin-bottom: 1px; +.data > div { + display: flex; + justify-content: space-between; +} + +.data > div > div:first-child { + font-weight: 700; } footer { @@ -55,6 +57,10 @@ footer { width: 100%; } +.signature { + padding-top: 1em; +} + .membersignature { height: 2em; width: 45%; @@ -81,20 +87,29 @@ footer { padding: 0; } + +.btccontainer { + display: flex; + justify-content: space-between; +} + .btctext { list-style-type: none; margin: 0; padding: 0; - position: relative; - float: left; - width: 45%; } .btcqrcode { - position: relative; - float: left; - width: 25%; - padding-left: 10em; + width: 10em; +} + +.digicash { + display: flex; + justify-content: space-evenly; +} + +.digicash img { + width: 10em; } a { diff --git a/c3l_membership/templates/member.html b/c3l_membership/templates/member.html --- a/c3l_membership/templates/member.html +++ b/c3l_membership/templates/member.html @@ -5,40 +5,77 @@ -

Membership Application

Username:: {{ form.username.data }}
E-Mail:: {{ form.email.data }}
Full Name:: {{ form.fullname.data }}
Birthday:: {{ form.birthday.data }}
Street:: {{ form.street.data if form.street.data else "Not specified"|safe }}
ZIP-Code:: {{ form.zip.data if form.zip.data else "Not specified"|safe }}
City:: {{ form.city.data if form.city.data else "Not specified"|safe }}
State/County/Province:: {{ form.state.data if form.state.data else "Not specified"|safe }}
Country:: {{ form.country.data if form.country.data else "Not specified"|safe }}
Membership Plan:: {{ form.membership.data }}
Student:: {{ "Yes" if form.student.data else "No" }}
Starving:: {{ "Yes" if form.starving.data else "No" }}
Payment:: {{ form.payment.data }}
Agreed to Terms & Conditions:: {{ "Yes" if form.terms.data else "No" }}
Minor Member:: {{ "Yes" if form.minor_member.data else "No" }}

Username:

E-Mail:

Full Name:

Birthday:

Street:

{{ form.street.data if form.street.data else "Not specified"|safe }}

ZIP-Code:

City:

{{ form.city.data if form.city.data else "Not specified"|safe }}

State/County/Province:

{{ form.state.data if form.state.data else "Not specified"|safe }}

Country:

{{ form.country.data if form.country.data else "Not specified"|safe }}

Membership Plan:

Student:

Starving:

Payment:

Agreed to Terms & Conditions:

Minor Member:

Send this document to the Chaos Computer Club Lëtzebuerg!

{% if form.payment.data == 'wire transfer' %}

Please bring {{ price }}€ with you the next time you meet us!

Address: 3BV5UPToMUmXJiqUVndHjSSq2HqDW8npRd
Label: Membership Fee
Message: {{ year }} {{ form.username.data }}
Amount: {{ price }} BTC

- {% set bitcoin_url= 'bitcoin:3BV5UPToMUmXJiqUVndHjSSq2HqDW8npRd?amount={amount}&label=Membership Fee {year} {username}&message=Membership Fee {year} {username}'.format(amount=price, year=year, username=form.username.data) %} -

Address: 0x1C05b4C236914B218B57e0E25948d416B4885655
Label: Membership Fee
Message: {{ year }} {{ form.username.data }}
Amount: {{ price }} ETH

- {% set ethereum_url= '0x1C05b4C236914B218B57e0E25948d416B4885655' %} -

Address: 0x1C05b4C236914B218B57e0E25948d416B4885655
Label: Membership Fee
Message: {{ year }} {{ form.username.data }}
Amount: {{ price }} ETH

+ {% set ethereum_url="0x1C05b4C236914B218B57e0E25948d416B4885655" %} +

{% set digicash_url='https://pos.digica.sh/qrcode/generator?merchantId=CHAOSPC1&amount={amount}&transactionReference=Membership_{username}'.format(amount=price, username=form.username.data) %} -

Pay with digicash!

{% endif %} -

Luxembourg, the

diff --git a/c3l_membership/views.py b/c3l_membership/views.py --- a/c3l_membership/views.py +++ b/c3l_membership/views.py @@ -1,3 +1,4 @@ +import re import subprocess from datetime import date @@ -8,24 +9,54 @@ from .forms import MembershipForm root_page = Blueprint("root", __name__) +xml_template = "{name}{birthday:%d.%m.%Y}

{address}

{username}{email}{status}{voting}" + @root_page.route("/", methods=("GET", "POST")) def index(): form = MembershipForm() if form.validate_on_submit(): + xml_data = {} + if ( form.minor_member.data or form.student.data or form.membership.data == "supporting" ): price = 40 + xml_data["voting"] = 0 elif form.membership.data == "regular": price = 120 + xml_data["voting"] = 1 if form.starving.data: price = 1 + if form.starving.data: + xml_data["status"] = "Starving" + elif form.minor_member.data or form.student.data: + xml_data["status"] = "Student" + elif form.membership.data == "supporting": + xml_data["status"] = "Supporter" + else: + xml_data["status"] = "Regular" + + xml_data["name"] = form.fullname.data + xml_data["birthday"] = form.birthday.data + xml_data["username"] = form.username.data + xml_data["email"] = form.email.data + xml_data["address"] = " ".join( + ( + form.street.data, + form.zip.data, + form.city.data, + form.state.data, + form.country.data, + ) + ) + xml_data["address"] = re.sub("\s+", " ", xml_data["address"]) + if form.payment.data == "bitcoin": price = subprocess.check_output( ["/usr/local/share/btc/BTC_Membership.pl", str(price)] @@ -34,11 +65,20 @@ def index(): price = subprocess.check_output( ["/usr/local/share/eth/ETH_Membership.pl", str(price)] ).decode("utf-8") + elif form.payment.data == "monero": + price = subprocess.check_output( + ["/usr/local/share/xmr/XMR_Membership.pl", str(price)] + ).decode("utf-8") elif form.payment.data == "digicash": price = price * 100 - year = date.today().year + now = date.today() + year = now.year + xml_data["date"] = now - html = render_template("member.html", form=form, price=price, year=year) + xml = xml_template.format(**xml_data) + html = render_template( + "member.html", form=form, price=price, year=year, xml=xml + ) return render_pdf(HTML(string=html)) return render_template("index.html", form=form)