Compare commits
No commits in common. "master" and "aatish/dynamicweb-6213_alignment_fixes" have entirely different histories.
master
...
aatish/dyn
104 changed files with 565 additions and 4144 deletions
75
Changelog
75
Changelog
|
|
@ -1,78 +1,3 @@
|
||||||
2.6.9: 2019-11-15
|
|
||||||
* feature: Allow creating yearly subscriptions for Generic Products (MR!718)
|
|
||||||
Notes for deployment:
|
|
||||||
- do a db migrate for new column added to Generic Product model
|
|
||||||
./manage.py migrate hosting
|
|
||||||
2.6.8: 2019-11-15
|
|
||||||
* feature: [EU VAT] Add EU VAT feature for generic products (MR!717)
|
|
||||||
Notes for deployment:
|
|
||||||
- do a db migrate a to create VATRates table
|
|
||||||
./manage.py migrate hosting
|
|
||||||
- load vat_rates.csv
|
|
||||||
./manage.py import_vat_rates vat_rates.csv
|
|
||||||
2.6.7: 2019-11-04
|
|
||||||
* bugfix: [admin] Improve dumpuser: show proper dates + bugfix
|
|
||||||
* bugfix: [admin] Improve fetch_stripe_bills:
|
|
||||||
- fix wrong assigment of string to num_invoice_created
|
|
||||||
variable,
|
|
||||||
- return None (do not handle the case) if we don't have an
|
|
||||||
order
|
|
||||||
* bugfix: [admin] Improve deleteuser: do not delete order, bill and vm_detail
|
|
||||||
2.6.6: 2019-11-04
|
|
||||||
* feature: [admin] Add dumpuser management command that dumps a user's data in json (MR!716)
|
|
||||||
2.6.5: 2019-09-24
|
|
||||||
* #7169: [hosting] Fix server error while vm terminate takes longer than 30 seconds
|
|
||||||
* #7170: [hosting] Improve admin email body contents for hosting vm terminate error case
|
|
||||||
2.6.4: 2019-09-15
|
|
||||||
* #7147: [OpenBSD vm] Add an explanatory text for username puffy on OpenBSD (MR!714)
|
|
||||||
2.6.3: 2019-08-28
|
|
||||||
* #7032: [hosting] Bugfix: Reentering the same SSH key used before does allow user to proceed further; complains key exists (MR!712)
|
|
||||||
* #7070: [check_vm/api] Bugfix: Provide oneadmin credentials to check whether a user is the owner of a VM (MR!713)
|
|
||||||
2.6.2: 2019-08-22
|
|
||||||
* #7068: [django/node/rails] Remove public- prefix from OS template names (MR!711)
|
|
||||||
2.6.1: 2019-07-09
|
|
||||||
* #6941: [hosting dashboard] Show the card's expiry year & month too in the list of added cards (MR!710)
|
|
||||||
2.6: 2019-07-03
|
|
||||||
* #5509: Getting rid of our key by still supporting multiple user keys (MR!709)
|
|
||||||
2.5.11: 2019-06-11
|
|
||||||
* #6672: [api] Check VM belongs to user in the infrastructure directly (MR!707)
|
|
||||||
* #bugfix: DE translation fix "Learn mehr" -> "Lerne mehr" (MR!708)
|
|
||||||
2.5.10: 2019-05-16
|
|
||||||
* #6672: [api] REST endpoint for ungleich-cli to verify if a VM belongs to a user (MR!705)
|
|
||||||
* #6670: [hosting/save_ssh_key] Upgrade cdist version to 5.0.1 to manage keys on Alpine linux
|
|
||||||
2.5.9: 2019-05-09
|
|
||||||
* #6669: [hosting] Fix opennebula vm query takes long (MR!703)
|
|
||||||
* [hosting] Increase VMDetail model's configuration parameter length to 128 (MR!702)
|
|
||||||
2.5.8: 2019-05-06
|
|
||||||
* #6631: Add `deleteuser` management command (MR!701)
|
|
||||||
2.5.7: 2019-05-05
|
|
||||||
* #6657: [all] Remove dependency on code.jquery.com, maxcdn.bootstrapcdn.com and oss.maxcdn.com and add them locally (MR!700)
|
|
||||||
2.5.6: 2019-05-05
|
|
||||||
* [blog] Check if the blog page is IPv6.Blog and load header image accordingly
|
|
||||||
2.5.5: 2019-05-04
|
|
||||||
* [blog] Use modified djangocms_blog module to not show "Category - ... " (MR!699)
|
|
||||||
2.5.4: 2019-05-04
|
|
||||||
* #6124: [blog] Allow setting title, subtitle of the blog page by passing GET params (MR!698)
|
|
||||||
2.5.3: 2019-04-20
|
|
||||||
* #6561: [bills] Show mutiple line items in the invoice details (MR!697)
|
|
||||||
* #6561: [bills] Link line item to a Stripe Plan (MR!697)
|
|
||||||
2.5.2: 2019-04-20
|
|
||||||
* #6561: [bills] Fix fetch_stripe_bills to import bills containing multiple line items belonging to same subscription (MR!695)
|
|
||||||
2.5.1: 2019-04-17
|
|
||||||
* #6561: [hosting] Preparation for monthly invoices for customers (MR!689)
|
|
||||||
* [logging] Enhance logger, Include timestamp + module name in the logging messages (MR!693)
|
|
||||||
2.5: 2019-04-11
|
|
||||||
* #6589: [vm creation, listing] Fix obtaining ip address/template related info from oca api call (MR!690, MR!691 and MR!692)
|
|
||||||
[python-oca] VirtualMachinePool infoextended (https://github.com/ungleich/python-oca/pull/3)
|
|
||||||
2.4.10: 2019-02-14
|
|
||||||
* #6451: [dg, gdpr banner] Update phone number (MR!688 by pcoder)
|
|
||||||
2.4.9: 2019-02-01
|
|
||||||
* bugfix: Fix inconsistent styles in GDPR modal (MR!679 by pcoder)
|
|
||||||
2.4.8: 2019-01-31
|
|
||||||
* #5151: [all] Add GDPR banner (MR!678 by pcoder)
|
|
||||||
* #6059: [dcl] Change topnav font to 400 by default (MR! 680 by Sanghee)
|
|
||||||
2.4.7: 2019-01-30
|
|
||||||
* #6213: [cms] Make ungleich product items equal heights and add option to animate or not animate the contents (MR!682 by Aatish)
|
|
||||||
2.4.6: 2019-01-09
|
2.4.6: 2019-01-09
|
||||||
* #6261: Add ungleich black logo to blog template for mobile view (MR!685)
|
* #6261: Add ungleich black logo to blog template for mobile view (MR!685)
|
||||||
2.4.5: 2019-01-07
|
2.4.5: 2019-01-07
|
||||||
|
|
|
||||||
|
|
@ -6,6 +6,14 @@
|
||||||
{% block content_blog %}
|
{% block content_blog %}
|
||||||
<section class="blog-list">
|
<section class="blog-list">
|
||||||
{% block blog_title %}
|
{% block blog_title %}
|
||||||
|
<header>
|
||||||
|
<h2>
|
||||||
|
{% if author %}{% trans "Articles by" %} {{ author.get_full_name }}
|
||||||
|
{% elif archive_date %}{% trans "Archive" %} – {% if month %}{{ archive_date|date:'F' }} {% endif %}{{ year }}
|
||||||
|
{% elif tagged_entries %}{% trans "Tag" %} – {{ tagged_entries|capfirst }}
|
||||||
|
{% elif category %}{% trans "Category" %} – {{ category }}{% endif %}
|
||||||
|
</h2>
|
||||||
|
</header>
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
{% for post in post_list %}
|
{% for post in post_list %}
|
||||||
{% include "djangocms_blog/includes/blog_item.html" with post=post image="true" TRUNCWORDS_COUNT=TRUNCWORDS_COUNT %}
|
{% include "djangocms_blog/includes/blog_item.html" with post=post image="true" TRUNCWORDS_COUNT=TRUNCWORDS_COUNT %}
|
||||||
|
|
|
||||||
|
|
@ -8,7 +8,7 @@ msgid ""
|
||||||
msgstr ""
|
msgstr ""
|
||||||
"Project-Id-Version: PACKAGE VERSION\n"
|
"Project-Id-Version: PACKAGE VERSION\n"
|
||||||
"Report-Msgid-Bugs-To: \n"
|
"Report-Msgid-Bugs-To: \n"
|
||||||
"POT-Creation-Date: 2019-11-15 17:33+0000\n"
|
"POT-Creation-Date: 2018-09-26 20:44+0000\n"
|
||||||
"PO-Revision-Date: 2018-03-30 23:22+0000\n"
|
"PO-Revision-Date: 2018-03-30 23:22+0000\n"
|
||||||
"Last-Translator: b'Anonymous User <coder.purple+25@gmail.com>'\n"
|
"Last-Translator: b'Anonymous User <coder.purple+25@gmail.com>'\n"
|
||||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||||
|
|
@ -20,28 +20,12 @@ msgstr ""
|
||||||
"X-Translated-Using: django-rosetta 0.8.1\n"
|
"X-Translated-Using: django-rosetta 0.8.1\n"
|
||||||
|
|
||||||
msgid "CMS Favicon"
|
msgid "CMS Favicon"
|
||||||
msgstr "CMS Favicon"
|
msgstr ""
|
||||||
|
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "Your New VM %(vm_name)s at Data Center Light"
|
msgid "Your New VM %(vm_name)s at Data Center Light"
|
||||||
msgstr "Deine neue VM %(vm_name)s bei Data Center Light"
|
msgstr "Deine neue VM %(vm_name)s bei Data Center Light"
|
||||||
|
|
||||||
msgid "Your VM is almost ready!"
|
|
||||||
msgstr "Deine VM ist fast fertig!"
|
|
||||||
|
|
||||||
msgid ""
|
|
||||||
"You need to specify your public SSH key to access your VM. You can either "
|
|
||||||
"add your existing key, or generate a new key pair by clicking the generate "
|
|
||||||
"button below. After choosing your public SSH key option you’ll be directed "
|
|
||||||
"to the order confirmation page."
|
|
||||||
msgstr ""
|
|
||||||
"Du musst deinen öffentlichen SSH-Schlüssel angeben, um auf deine VM "
|
|
||||||
"zugreifen zu können. Du kannst entweder deinen vorhandenen Schlüssel "
|
|
||||||
"hinzufügen oder ein neues Schlüsselpaar generieren, indem du auf die "
|
|
||||||
"Schaltfläche \"Generieren\" unten klickst. Nachdem du deine öffentliche SSH-"
|
|
||||||
"Schlüsseloption ausgewählt hast, wirst du zur Bestellbestätigungsseite "
|
|
||||||
"weitergeleitet. "
|
|
||||||
|
|
||||||
msgid "All Rights Reserved"
|
msgid "All Rights Reserved"
|
||||||
msgstr "Alle Rechte vorbehalten"
|
msgstr "Alle Rechte vorbehalten"
|
||||||
|
|
||||||
|
|
@ -52,7 +36,7 @@ msgid "Login"
|
||||||
msgstr "Anmelden"
|
msgstr "Anmelden"
|
||||||
|
|
||||||
msgid "Dashboard"
|
msgid "Dashboard"
|
||||||
msgstr "Dashboard"
|
msgstr ""
|
||||||
|
|
||||||
msgid "Thank you for contacting us."
|
msgid "Thank you for contacting us."
|
||||||
msgstr "Nachricht gesendet."
|
msgstr "Nachricht gesendet."
|
||||||
|
|
@ -64,7 +48,7 @@ msgid "Get in touch with us!"
|
||||||
msgstr "Sende uns eine Nachricht."
|
msgstr "Sende uns eine Nachricht."
|
||||||
|
|
||||||
msgid "Name"
|
msgid "Name"
|
||||||
msgstr "Name"
|
msgstr ""
|
||||||
|
|
||||||
msgid "Please enter your name."
|
msgid "Please enter your name."
|
||||||
msgstr "Bitte gib Deinen Namen ein."
|
msgstr "Bitte gib Deinen Namen ein."
|
||||||
|
|
@ -108,7 +92,7 @@ msgid "Your account details are as follows"
|
||||||
msgstr "Deine Account Details sind unten aufgelistet"
|
msgstr "Deine Account Details sind unten aufgelistet"
|
||||||
|
|
||||||
msgid "Username"
|
msgid "Username"
|
||||||
msgstr "Benusername"
|
msgstr "Username"
|
||||||
|
|
||||||
msgid "Your email address"
|
msgid "Your email address"
|
||||||
msgstr "Deine E-Mail-Adresse"
|
msgstr "Deine E-Mail-Adresse"
|
||||||
|
|
@ -150,12 +134,8 @@ msgstr "Unser Angebot beginnt bei 15 CHF pro Monat. Probier's jetzt aus!"
|
||||||
msgid "ORDER VM"
|
msgid "ORDER VM"
|
||||||
msgstr "VM BESTELLEN"
|
msgstr "VM BESTELLEN"
|
||||||
|
|
||||||
#, python-format
|
|
||||||
msgid "Please enter a value in range %(min_ram)s - 200."
|
|
||||||
msgstr "Bitte gib einen Wert von %(min_ram)s bis 200 ein."
|
|
||||||
|
|
||||||
msgid "VM hosting"
|
msgid "VM hosting"
|
||||||
msgstr "VM Hosting"
|
msgstr ""
|
||||||
|
|
||||||
msgid "month"
|
msgid "month"
|
||||||
msgstr "Monat"
|
msgstr "Monat"
|
||||||
|
|
@ -172,6 +152,9 @@ msgstr "Standort: Schweiz"
|
||||||
msgid "Please enter a value in range 1 - 48."
|
msgid "Please enter a value in range 1 - 48."
|
||||||
msgstr "Bitte gib einen Wert von 1 bis 48 ein."
|
msgstr "Bitte gib einen Wert von 1 bis 48 ein."
|
||||||
|
|
||||||
|
msgid "Please enter a value in range 1 - 200."
|
||||||
|
msgstr "Bitte gib einen Wert von 1 bis 200 ein."
|
||||||
|
|
||||||
msgid "Please enter a value in range 10 - 2000."
|
msgid "Please enter a value in range 10 - 2000."
|
||||||
msgstr "Bitte gib einen Wert von 10 bis 2000 ein."
|
msgstr "Bitte gib einen Wert von 10 bis 2000 ein."
|
||||||
|
|
||||||
|
|
@ -207,14 +190,14 @@ msgstr ""
|
||||||
|
|
||||||
msgid "Only wants you to pay for what you actually need."
|
msgid "Only wants you to pay for what you actually need."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
"Du möchtest nur das bezahlen, was du auch wirklich brauchst: Wähle deine "
|
"Möchte, dass du nur bezahlst, was du auch wirklich brauchst: Wähle deine "
|
||||||
"Ressourcen individuell aus!
"
|
"Ressourcen individuell aus!
"
|
||||||
|
|
||||||
msgid ""
|
msgid ""
|
||||||
"Is creative, using a modern and alternative design for a data center in "
|
"Is creative, using a modern and alternative design for a data center in "
|
||||||
"order to make it more sustainable and affordable at the same time."
|
"order to make it more sustainable and affordable at the same time."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
"Es ist kreativ, da es sich ein modernes und alternatives Layout zu Nutze"
|
"Ist kreativ, indem es sich ein modernes und alternatives Layout zu Nutze "
|
||||||
"macht um Nachhaltigkeit zu fördern und somit erschwingliche Preise bieten zu "
|
"macht um Nachhaltigkeit zu fördern und somit erschwingliche Preise bieten zu "
|
||||||
"können.
"
|
"können.
"
|
||||||
|
|
||||||
|
|
@ -222,9 +205,9 @@ msgid ""
|
||||||
"Cuts down the costs for you by using FOSS (Free Open Source Software) "
|
"Cuts down the costs for you by using FOSS (Free Open Source Software) "
|
||||||
"exclusively, wherefore we can save money from paying licenses."
|
"exclusively, wherefore we can save money from paying licenses."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
"Um unnötige Kosten zu sparen werden, wird ausschliesslich Software auf"
|
"Sorgt dafür, dass unnötige Kosten erspart werden, indem es ausschliesslich "
|
||||||
"Basis von FOSS (Free Open Source Software) eingesetzt und dadurch können auf "
|
"mit FOSS (Free Open Source Software) arbeitet und wir daher auf "
|
||||||
"Lizenzgebühren verzichtet werden.
"
|
"Lizenzgebühren verzichten können.
"
|
||||||
|
|
||||||
msgid "Scale out"
|
msgid "Scale out"
|
||||||
msgstr "Skalierung"
|
msgstr "Skalierung"
|
||||||
|
|
@ -311,7 +294,7 @@ msgid "Billing Address"
|
||||||
msgstr "Rechnungsadresse"
|
msgstr "Rechnungsadresse"
|
||||||
|
|
||||||
msgid "Make a payment"
|
msgid "Make a payment"
|
||||||
msgstr "Tätige eine Bezahlung"
|
msgstr ""
|
||||||
|
|
||||||
msgid "Your Order"
|
msgid "Your Order"
|
||||||
msgstr "Deine Bestellung"
|
msgstr "Deine Bestellung"
|
||||||
|
|
@ -375,9 +358,6 @@ msgstr "Letzten"
|
||||||
msgid "Type"
|
msgid "Type"
|
||||||
msgstr "Typ"
|
msgstr "Typ"
|
||||||
|
|
||||||
msgid "Expiry"
|
|
||||||
msgstr "Ablaufdatum"
|
|
||||||
|
|
||||||
msgid "SELECT"
|
msgid "SELECT"
|
||||||
msgstr "AUSWÄHLEN"
|
msgstr "AUSWÄHLEN"
|
||||||
|
|
||||||
|
|
@ -418,23 +398,14 @@ msgstr "Bestellungsübersicht"
|
||||||
msgid "Product"
|
msgid "Product"
|
||||||
msgstr "Produkt"
|
msgstr "Produkt"
|
||||||
|
|
||||||
msgid "Price"
|
|
||||||
msgstr "Preise"
|
|
||||||
|
|
||||||
msgid "VAT for"
|
|
||||||
msgstr "MwSt für"
|
|
||||||
|
|
||||||
msgid "Total Amount"
|
|
||||||
msgstr "Gesamtsumme"
|
|
||||||
|
|
||||||
msgid "Amount"
|
msgid "Amount"
|
||||||
msgstr "Betrag"
|
msgstr ""
|
||||||
|
|
||||||
msgid "Description"
|
msgid "Description"
|
||||||
msgstr "Beschreibung"
|
msgstr ""
|
||||||
|
|
||||||
msgid "Recurring"
|
msgid "Recurring"
|
||||||
msgstr "Wiederholend"
|
msgstr ""
|
||||||
|
|
||||||
msgid "Subtotal"
|
msgid "Subtotal"
|
||||||
msgstr "Zwischensumme"
|
msgstr "Zwischensumme"
|
||||||
|
|
@ -442,29 +413,13 @@ msgstr "Zwischensumme"
|
||||||
msgid "VAT"
|
msgid "VAT"
|
||||||
msgstr "Mehrwertsteuer"
|
msgstr "Mehrwertsteuer"
|
||||||
|
|
||||||
#, fuzzy, python-format
|
|
||||||
#| msgid ""
|
|
||||||
#| "By clicking \"Place order\" this plan will charge your credit card "
|
|
||||||
#| "account with %(total_price)s CHF/month"
|
|
||||||
msgid ""
|
|
||||||
"By clicking \"Place order\" this plan will charge your credit card account "
|
|
||||||
"with %(total_price)s CHF/year"
|
|
||||||
msgstr ""
|
|
||||||
"Wenn Du \"bestellen\" auswählst, wird Deine Kreditkarte mit %(total_price)s "
|
|
||||||
"CHF pro Jahr belastet"
|
|
||||||
|
|
||||||
|
|
||||||
msgid ""
|
msgid ""
|
||||||
"By clicking \"Place order\" this plan will charge your credit card account "
|
"By clicking \"Place order\" this plan will charge your credit card account "
|
||||||
"with %(total_price)s CHF/month"
|
"with %(total_price)s CHF/month"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
"Wenn Du \"bestellen\" auswählst, wird Deine Kreditkarte mit %(total_price)s "
|
"Wenn Du \"bestellen\" auswählst, wird Deine Kreditkarte mit "
|
||||||
"CHF pro Monat belastet"
|
"%(vm_total_price)s CHF pro Monat belastet"
|
||||||
|
|
||||||
#, fuzzy, python-format
|
|
||||||
#| msgid ""
|
|
||||||
#| "By clicking \"Place order\" this payment will charge your credit card "
|
|
||||||
#| "account with a one time amount of %(total_price)s CHF"
|
|
||||||
msgid ""
|
msgid ""
|
||||||
"By clicking \"Place order\" this payment will charge your credit card "
|
"By clicking \"Place order\" this payment will charge your credit card "
|
||||||
"account with a one time amount of %(total_price)s CHF"
|
"account with a one time amount of %(total_price)s CHF"
|
||||||
|
|
@ -490,10 +445,10 @@ msgid "Hold tight, we are processing your request"
|
||||||
msgstr "Bitte warten - wir verarbeiten Deine Anfrage gerade"
|
msgstr "Bitte warten - wir verarbeiten Deine Anfrage gerade"
|
||||||
|
|
||||||
msgid "OK"
|
msgid "OK"
|
||||||
msgstr "Ok"
|
msgstr ""
|
||||||
|
|
||||||
msgid "Close"
|
msgid "Close"
|
||||||
msgstr "Schliessen"
|
msgstr ""
|
||||||
|
|
||||||
msgid "Some problem encountered. Please try again later."
|
msgid "Some problem encountered. Please try again later."
|
||||||
msgstr "Ein Problem ist aufgetreten. Bitte versuche es später noch einmal."
|
msgstr "Ein Problem ist aufgetreten. Bitte versuche es später noch einmal."
|
||||||
|
|
@ -505,7 +460,7 @@ msgid "Tech Stack"
|
||||||
msgstr "Tech Stack"
|
msgstr "Tech Stack"
|
||||||
|
|
||||||
msgid "We are seriously open source."
|
msgid "We are seriously open source."
|
||||||
msgstr "Wir sind vollends Open Source."
|
msgstr "Wir sind vollends opensource."
|
||||||
|
|
||||||
msgid ""
|
msgid ""
|
||||||
" Our full software stack is open source – We don't use anything that isn't "
|
" Our full software stack is open source – We don't use anything that isn't "
|
||||||
|
|
@ -575,14 +530,11 @@ msgid "Starting from only 15CHF per month. Try now."
|
||||||
msgstr "Unser Angebot beginnt bei 15 CHF pro Monat. Probier's jetzt aus!"
|
msgstr "Unser Angebot beginnt bei 15 CHF pro Monat. Probier's jetzt aus!"
|
||||||
|
|
||||||
msgid "Actions speak louder than words. Let's do it, try our VM now."
|
msgid "Actions speak louder than words. Let's do it, try our VM now."
|
||||||
msgstr "Taten sagen mehr als Worte – Teste jetzt unsere VM!"
|
msgstr "Tagen sagen mehr als Worte – Teste jetzt unsere VM!"
|
||||||
|
|
||||||
msgid "Invalid number of cores"
|
msgid "Invalid number of cores"
|
||||||
msgstr "Ungültige Anzahle CPU-Kerne"
|
msgstr "Ungültige Anzahle CPU-Kerne"
|
||||||
|
|
||||||
msgid "Invalid calculator properties"
|
|
||||||
msgstr "Ungültige Berechnungseigenschaften"
|
|
||||||
|
|
||||||
msgid "Invalid RAM size"
|
msgid "Invalid RAM size"
|
||||||
msgstr "Ungültige RAM-Grösse"
|
msgstr "Ungültige RAM-Grösse"
|
||||||
|
|
||||||
|
|
@ -591,7 +543,7 @@ msgstr "Ungültige Speicher-Grösse"
|
||||||
|
|
||||||
#, python-brace-format
|
#, python-brace-format
|
||||||
msgid "Incorrect pricing name. Please contact support{support_email}"
|
msgid "Incorrect pricing name. Please contact support{support_email}"
|
||||||
msgstr "Ungültige Preisbezeichnung. Bitte kontaktiere den Support{support_email}"
|
msgstr ""
|
||||||
|
|
||||||
#, python-brace-format
|
#, python-brace-format
|
||||||
msgid "{user} does not have permission to access the card"
|
msgid "{user} does not have permission to access the card"
|
||||||
|
|
@ -618,14 +570,11 @@ msgid "An error occurred while associating the card. Details: {details}"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
"Beim Verbinden der Karte ist ein Fehler aufgetreten. Details: {details}"
|
"Beim Verbinden der Karte ist ein Fehler aufgetreten. Details: {details}"
|
||||||
|
|
||||||
msgid " This is a monthly recurring plan."
|
|
||||||
msgstr "Dies ist ein monatlich wiederkehrender Plan."
|
|
||||||
|
|
||||||
msgid " This is an yearly recurring plan."
|
|
||||||
msgstr "Dies ist ein jährlich wiederkehrender Plan."
|
|
||||||
|
|
||||||
msgid "Confirmation of your payment"
|
msgid "Confirmation of your payment"
|
||||||
msgstr "Bestätigung deiner Zahlung"
|
msgstr ""
|
||||||
|
|
||||||
|
msgid " This is a monthly recurring plan."
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
#, python-brace-format
|
#, python-brace-format
|
||||||
msgid ""
|
msgid ""
|
||||||
|
|
@ -636,8 +585,7 @@ msgid ""
|
||||||
"\n"
|
"\n"
|
||||||
"Cheers,\n"
|
"Cheers,\n"
|
||||||
"Your Data Center Light team"
|
"Your Data Center Light team"
|
||||||
msgstr "Hallo {name},\n" "\n" "vielen Dank für deine Bestellung!\n" "Wir haben deine Bezahlung in Höhe von {amount:.2f} CHF erhalten. {recurring}\n" "\n" "Grüsse\n"
|
msgstr ""
|
||||||
"Dein Data Center Light Team"
|
|
||||||
|
|
||||||
msgid "Thank you for the payment."
|
msgid "Thank you for the payment."
|
||||||
msgstr "Danke für Deine Bestellung."
|
msgstr "Danke für Deine Bestellung."
|
||||||
|
|
@ -645,7 +593,7 @@ msgstr "Danke für Deine Bestellung."
|
||||||
msgid ""
|
msgid ""
|
||||||
"You will soon receive a confirmation email of the payment. You can always "
|
"You will soon receive a confirmation email of the payment. You can always "
|
||||||
"contact us at info@ungleich.ch for any question that you may have."
|
"contact us at info@ungleich.ch for any question that you may have."
|
||||||
msgstr "Du wirst bald eine Bestätigungs-E-Mail über die Zahlung erhalten. Du kannst jederzeit unter info@ungleich.ch kontaktieren."
|
msgstr ""
|
||||||
|
|
||||||
msgid "Thank you for the order."
|
msgid "Thank you for the order."
|
||||||
msgstr "Danke für Deine Bestellung."
|
msgstr "Danke für Deine Bestellung."
|
||||||
|
|
@ -668,6 +616,9 @@ msgstr ""
|
||||||
#~ msgid "Card Number"
|
#~ msgid "Card Number"
|
||||||
#~ msgstr "Kreditkartennummer"
|
#~ msgstr "Kreditkartennummer"
|
||||||
|
|
||||||
|
#~ msgid "Expiry Date"
|
||||||
|
#~ msgstr "Ablaufdatum"
|
||||||
|
|
||||||
#~ msgid ""
|
#~ msgid ""
|
||||||
#~ "You are not making any payment yet. After placing your order, you will be "
|
#~ "You are not making any payment yet. After placing your order, you will be "
|
||||||
#~ "taken to the Submit Payment Page."
|
#~ "taken to the Submit Payment Page."
|
||||||
|
|
@ -676,6 +627,9 @@ msgstr ""
|
||||||
#~ "ausgelöst, nachdem Du die Bestellung auf der nächsten Seite bestätigt "
|
#~ "ausgelöst, nachdem Du die Bestellung auf der nächsten Seite bestätigt "
|
||||||
#~ "hast."
|
#~ "hast."
|
||||||
|
|
||||||
|
#~ msgid "Pricing"
|
||||||
|
#~ msgstr "Preise"
|
||||||
|
|
||||||
#~ msgid "Order VM"
|
#~ msgid "Order VM"
|
||||||
#~ msgstr "VM bestellen"
|
#~ msgstr "VM bestellen"
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,141 +0,0 @@
|
||||||
import logging
|
|
||||||
import sys
|
|
||||||
import uuid
|
|
||||||
|
|
||||||
import oca
|
|
||||||
import stripe
|
|
||||||
from django.core.management.base import BaseCommand
|
|
||||||
|
|
||||||
from hosting.models import (
|
|
||||||
UserCardDetail, UserHostingKey
|
|
||||||
)
|
|
||||||
from membership.models import CustomUser, DeletedUser
|
|
||||||
from opennebula_api.models import OpenNebulaManager
|
|
||||||
|
|
||||||
logger = logging.getLogger(__name__)
|
|
||||||
|
|
||||||
|
|
||||||
def query_yes_no(question, default="yes"):
|
|
||||||
"""Ask a yes/no question via raw_input() and return their answer.
|
|
||||||
|
|
||||||
"question" is a string that is presented to the user.
|
|
||||||
"default" is the presumed answer if the user just hits <Enter>.
|
|
||||||
It must be "yes" (the default), "no" or None (meaning
|
|
||||||
an answer is required of the user).
|
|
||||||
|
|
||||||
The "answer" return value is True for "yes" or False for "no".
|
|
||||||
"""
|
|
||||||
valid = {"yes": True, "y": True, "ye": True,
|
|
||||||
"no": False, "n": False}
|
|
||||||
if default is None:
|
|
||||||
prompt = " [y/n] "
|
|
||||||
elif default == "yes":
|
|
||||||
prompt = " [Y/n] "
|
|
||||||
elif default == "no":
|
|
||||||
prompt = " [y/N] "
|
|
||||||
else:
|
|
||||||
raise ValueError("invalid default answer: '%s'" % default)
|
|
||||||
|
|
||||||
while True:
|
|
||||||
sys.stdout.write(question + prompt)
|
|
||||||
choice = input().lower()
|
|
||||||
if default is not None and choice == '':
|
|
||||||
return valid[default]
|
|
||||||
elif choice in valid:
|
|
||||||
return valid[choice]
|
|
||||||
else:
|
|
||||||
sys.stdout.write("Please respond with 'yes' or 'no' "
|
|
||||||
"(or 'y' or 'n').\n")
|
|
||||||
|
|
||||||
|
|
||||||
class Command(BaseCommand):
|
|
||||||
help = '''Deletes all resources of the user from the project'''
|
|
||||||
|
|
||||||
def add_arguments(self, parser):
|
|
||||||
parser.add_argument('customer_email', nargs='+', type=str)
|
|
||||||
|
|
||||||
def handle(self, *args, **options):
|
|
||||||
try:
|
|
||||||
for email in options['customer_email']:
|
|
||||||
r = query_yes_no("Are you sure you want to delete {} ?".format(
|
|
||||||
email, None
|
|
||||||
))
|
|
||||||
if r:
|
|
||||||
logger.debug("Deleting user {}".format(email))
|
|
||||||
# Get stripe customer instance and delete the customer
|
|
||||||
try:
|
|
||||||
cus_user = CustomUser.objects.get(email=email)
|
|
||||||
except CustomUser.DoesNotExist as dne:
|
|
||||||
logger.error("CustomUser with email {} does "
|
|
||||||
"not exist".format(email))
|
|
||||||
sys.exit(1)
|
|
||||||
stripe_customer = cus_user.stripecustomer
|
|
||||||
c = stripe.Customer.retrieve(
|
|
||||||
stripe_customer.stripe_id
|
|
||||||
)
|
|
||||||
cus_delete_obj = c.delete()
|
|
||||||
if cus_delete_obj.deleted:
|
|
||||||
logger.debug(
|
|
||||||
"StripeCustomer {} associated with {} deleted"
|
|
||||||
"".format(stripe_customer.stripe_id, email)
|
|
||||||
)
|
|
||||||
else:
|
|
||||||
logger.error("Error while deleting the StripeCustomer")
|
|
||||||
|
|
||||||
# delete UserCardDetail
|
|
||||||
ucds = UserCardDetail.objects.filter(
|
|
||||||
stripe_customer=stripe_customer
|
|
||||||
)
|
|
||||||
for ucd in ucds:
|
|
||||||
if ucd is not None:
|
|
||||||
logger.debug(
|
|
||||||
"User Card Detail {} associated with {} deleted"
|
|
||||||
"".format(ucd.id, email)
|
|
||||||
)
|
|
||||||
ucd.delete()
|
|
||||||
else:
|
|
||||||
logger.error(
|
|
||||||
"Error while deleting the User Card Detail")
|
|
||||||
|
|
||||||
# delete UserHostingKey
|
|
||||||
uhks = UserHostingKey.objects.filter(
|
|
||||||
user=cus_user
|
|
||||||
)
|
|
||||||
for uhk in uhks:
|
|
||||||
uhk.delete()
|
|
||||||
|
|
||||||
# delete stripe customer
|
|
||||||
stripe_customer.delete()
|
|
||||||
|
|
||||||
# add user to deleteduser
|
|
||||||
DeletedUser.objects.create(
|
|
||||||
email=cus_user.email, name=cus_user.name,
|
|
||||||
user_id = cus_user.id
|
|
||||||
)
|
|
||||||
|
|
||||||
# reset CustomUser
|
|
||||||
cus_user.email = str(uuid.uuid4())
|
|
||||||
cus_user.validated = 0
|
|
||||||
cus_user.save()
|
|
||||||
|
|
||||||
# remove user from OpenNebula
|
|
||||||
manager = OpenNebulaManager()
|
|
||||||
user_pool = manager._get_user_pool()
|
|
||||||
on_user = user_pool.get_by_name(email)
|
|
||||||
if on_user.id > 0:
|
|
||||||
logger.debug(
|
|
||||||
"Deleting user {} => ID={} from opennebula".format(
|
|
||||||
email, on_user.id)
|
|
||||||
)
|
|
||||||
manager.oneadmin_client.call(
|
|
||||||
oca.User.METHODS['delete'], on_user.id
|
|
||||||
)
|
|
||||||
else:
|
|
||||||
logger.error(
|
|
||||||
"User not found with email {}. "
|
|
||||||
"Not doing anything".format(email)
|
|
||||||
)
|
|
||||||
|
|
||||||
logger.debug("Deleted {} SUCCESSFULLY.".format(email))
|
|
||||||
except Exception as e:
|
|
||||||
print(" *** Error occurred. Details {}".format(str(e)))
|
|
||||||
|
|
@ -1,134 +0,0 @@
|
||||||
import json
|
|
||||||
import logging
|
|
||||||
import sys
|
|
||||||
|
|
||||||
from django.core.management.base import BaseCommand
|
|
||||||
from membership.models import CustomUser
|
|
||||||
from hosting.models import (
|
|
||||||
HostingOrder, VMDetail, UserCardDetail, UserHostingKey
|
|
||||||
)
|
|
||||||
logger = logging.getLogger(__name__)
|
|
||||||
|
|
||||||
|
|
||||||
class Command(BaseCommand):
|
|
||||||
help = '''Dumps the data of a customer into a json file'''
|
|
||||||
|
|
||||||
def add_arguments(self, parser):
|
|
||||||
parser.add_argument('customer_email', nargs='+', type=str)
|
|
||||||
|
|
||||||
def handle(self, *args, **options):
|
|
||||||
try:
|
|
||||||
for email in options['customer_email']:
|
|
||||||
try:
|
|
||||||
cus_user = CustomUser.objects.get(email=email)
|
|
||||||
except CustomUser.DoesNotExist as dne:
|
|
||||||
logger.error("CustomUser with email {} does "
|
|
||||||
"not exist".format(email))
|
|
||||||
sys.exit(1)
|
|
||||||
|
|
||||||
hosting_orders = HostingOrder.objects.filter(
|
|
||||||
customer=cus_user.stripecustomer.id
|
|
||||||
)
|
|
||||||
|
|
||||||
vm_ids = []
|
|
||||||
orders_dict = {}
|
|
||||||
for order in hosting_orders:
|
|
||||||
order_dict = {}
|
|
||||||
vm_ids.append(order.vm_id)
|
|
||||||
order_dict["VM_ID"] = order.vm_id
|
|
||||||
order_dict["Order Nr."] = order.id
|
|
||||||
order_dict["Created On"] = str(order.created_at)
|
|
||||||
order_dict["Price"] = order.price
|
|
||||||
order_dict["Payment card details"] = {
|
|
||||||
"last4": order.last4,
|
|
||||||
"brand": order.cc_brand
|
|
||||||
}
|
|
||||||
if order.subscription_id is not None and order.stripe_charge_id is None:
|
|
||||||
order_dict["Order type"] = "Monthly susbcription"
|
|
||||||
else:
|
|
||||||
order_dict["Order type"] = "One time payment"
|
|
||||||
|
|
||||||
# billing address
|
|
||||||
if order.billing_address is not None:
|
|
||||||
order_dict["Billing Address"] = {
|
|
||||||
"Street": order.billing_address.street_address,
|
|
||||||
"City": order.billing_address.city,
|
|
||||||
"Country": order.billing_address.country,
|
|
||||||
"Postal code": order.billing_address.postal_code,
|
|
||||||
"Card holder name": order.billing_address.cardholder_name
|
|
||||||
}
|
|
||||||
else:
|
|
||||||
logger.error(
|
|
||||||
"did not find billing_address")
|
|
||||||
|
|
||||||
# Order Detail
|
|
||||||
if order.order_detail is not None:
|
|
||||||
order_dict["Specifications"] = {
|
|
||||||
"RAM": "{} GB".format(order.order_detail.memory),
|
|
||||||
"Cores": order.order_detail.cores,
|
|
||||||
"Disk space (SSD)": "{} GB".format(
|
|
||||||
order.order_detail.ssd_size)
|
|
||||||
}
|
|
||||||
else:
|
|
||||||
logger.error(
|
|
||||||
"Did not find order_detail. None")
|
|
||||||
|
|
||||||
vm_detail = VMDetail.objects.get(vm_id=order.vm_id)
|
|
||||||
if vm_detail is not None:
|
|
||||||
order_dict["VM Details"] = {
|
|
||||||
"VM_ID": order.vm_id,
|
|
||||||
"IPv4": vm_detail.ipv4,
|
|
||||||
"IPv6": vm_detail.ipv6,
|
|
||||||
"OS": vm_detail.configuration,
|
|
||||||
}
|
|
||||||
order_dict["Terminated on"] = str(vm_detail.terminated_at)
|
|
||||||
|
|
||||||
orders_dict[order.vm_id] = order_dict
|
|
||||||
|
|
||||||
|
|
||||||
# UserCardDetail
|
|
||||||
cards = {}
|
|
||||||
ucds = UserCardDetail.objects.filter(
|
|
||||||
stripe_customer=cus_user.stripecustomer
|
|
||||||
)
|
|
||||||
for ucd in ucds:
|
|
||||||
card = {}
|
|
||||||
if ucd is not None:
|
|
||||||
card["Last 4"] = ucd.last4
|
|
||||||
card["Brand"] = ucd.brand
|
|
||||||
card["Expiry month"] = ucd.exp_month
|
|
||||||
card["Expiry year"] = ucd.exp_year
|
|
||||||
card["Preferred"] = ucd.preferred
|
|
||||||
cards[ucd.id] = card
|
|
||||||
else:
|
|
||||||
logger.error(
|
|
||||||
"Error while deleting the User Card Detail")
|
|
||||||
|
|
||||||
# UserHostingKey
|
|
||||||
keys = {}
|
|
||||||
uhks = UserHostingKey.objects.filter(
|
|
||||||
user=cus_user
|
|
||||||
)
|
|
||||||
for uhk in uhks:
|
|
||||||
key = {
|
|
||||||
"Public key": uhk.public_key,
|
|
||||||
"Name": uhk.name,
|
|
||||||
"Created on": str(uhk.created_at)
|
|
||||||
}
|
|
||||||
if uhk.private_key:
|
|
||||||
key["Private key"] = uhk.private_key
|
|
||||||
keys[uhk.name] = key
|
|
||||||
output_dict = {
|
|
||||||
"User details": {
|
|
||||||
"Name": cus_user.name,
|
|
||||||
"Email": cus_user.email,
|
|
||||||
"Activated": "yes" if cus_user.validated == 1 else "no",
|
|
||||||
"Last login": str(cus_user.last_login)
|
|
||||||
},
|
|
||||||
"Orders": orders_dict,
|
|
||||||
"Payment cards": cards,
|
|
||||||
"SSH Keys": keys
|
|
||||||
}
|
|
||||||
print(json.dumps(output_dict, indent=4))
|
|
||||||
except Exception as e:
|
|
||||||
print(" *** Error occurred. Details {}".format(str(e)))
|
|
||||||
|
|
@ -1,20 +0,0 @@
|
||||||
# -*- coding: utf-8 -*-
|
|
||||||
# Generated by Django 1.9.4 on 2019-04-20 09:52
|
|
||||||
from __future__ import unicode_literals
|
|
||||||
|
|
||||||
from django.db import migrations, models
|
|
||||||
|
|
||||||
|
|
||||||
class Migration(migrations.Migration):
|
|
||||||
|
|
||||||
dependencies = [
|
|
||||||
('datacenterlight', '0027_dclcalculatorpluginmodel_enable_512mb_ram'),
|
|
||||||
]
|
|
||||||
|
|
||||||
operations = [
|
|
||||||
migrations.AddField(
|
|
||||||
model_name='stripeplan',
|
|
||||||
name='stripe_plan_name',
|
|
||||||
field=models.CharField(default='', max_length=512, null=True),
|
|
||||||
),
|
|
||||||
]
|
|
||||||
|
|
@ -1,25 +0,0 @@
|
||||||
# -*- coding: utf-8 -*-
|
|
||||||
# Generated by Django 1.9.4 on 2019-04-20 10:22
|
|
||||||
from __future__ import unicode_literals
|
|
||||||
|
|
||||||
from django.db import migrations, models
|
|
||||||
|
|
||||||
|
|
||||||
class Migration(migrations.Migration):
|
|
||||||
|
|
||||||
dependencies = [
|
|
||||||
('datacenterlight', '0028_stripeplan_stripe_plan_name'),
|
|
||||||
]
|
|
||||||
|
|
||||||
operations = [
|
|
||||||
migrations.AddField(
|
|
||||||
model_name='stripeplan',
|
|
||||||
name='amount',
|
|
||||||
field=models.PositiveIntegerField(default=0),
|
|
||||||
),
|
|
||||||
migrations.AddField(
|
|
||||||
model_name='stripeplan',
|
|
||||||
name='interval',
|
|
||||||
field=models.CharField(default='', max_length=128, null=True),
|
|
||||||
),
|
|
||||||
]
|
|
||||||
|
|
@ -103,9 +103,6 @@ class StripePlan(models.Model):
|
||||||
A model to store Data Center Light's created Stripe plans
|
A model to store Data Center Light's created Stripe plans
|
||||||
"""
|
"""
|
||||||
stripe_plan_id = models.CharField(max_length=256, null=True)
|
stripe_plan_id = models.CharField(max_length=256, null=True)
|
||||||
stripe_plan_name = models.CharField(max_length=512, default="", null=True)
|
|
||||||
amount = models.PositiveIntegerField(default=0)
|
|
||||||
interval = models.CharField(max_length=128, default="", null=True)
|
|
||||||
|
|
||||||
@classmethod
|
@classmethod
|
||||||
def create(cls, stripe_plan_id):
|
def create(cls, stripe_plan_id):
|
||||||
|
|
|
||||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
Binary file not shown.
|
|
@ -1,288 +0,0 @@
|
||||||
<?xml version="1.0" standalone="no"?>
|
|
||||||
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
|
|
||||||
<svg xmlns="http://www.w3.org/2000/svg">
|
|
||||||
<metadata></metadata>
|
|
||||||
<defs>
|
|
||||||
<font id="glyphicons_halflingsregular" horiz-adv-x="1200" >
|
|
||||||
<font-face units-per-em="1200" ascent="960" descent="-240" />
|
|
||||||
<missing-glyph horiz-adv-x="500" />
|
|
||||||
<glyph horiz-adv-x="0" />
|
|
||||||
<glyph horiz-adv-x="400" />
|
|
||||||
<glyph unicode=" " />
|
|
||||||
<glyph unicode="*" d="M600 1100q15 0 34 -1.5t30 -3.5l11 -1q10 -2 17.5 -10.5t7.5 -18.5v-224l158 158q7 7 18 8t19 -6l106 -106q7 -8 6 -19t-8 -18l-158 -158h224q10 0 18.5 -7.5t10.5 -17.5q6 -41 6 -75q0 -15 -1.5 -34t-3.5 -30l-1 -11q-2 -10 -10.5 -17.5t-18.5 -7.5h-224l158 -158 q7 -7 8 -18t-6 -19l-106 -106q-8 -7 -19 -6t-18 8l-158 158v-224q0 -10 -7.5 -18.5t-17.5 -10.5q-41 -6 -75 -6q-15 0 -34 1.5t-30 3.5l-11 1q-10 2 -17.5 10.5t-7.5 18.5v224l-158 -158q-7 -7 -18 -8t-19 6l-106 106q-7 8 -6 19t8 18l158 158h-224q-10 0 -18.5 7.5 t-10.5 17.5q-6 41 -6 75q0 15 1.5 34t3.5 30l1 11q2 10 10.5 17.5t18.5 7.5h224l-158 158q-7 7 -8 18t6 19l106 106q8 7 19 6t18 -8l158 -158v224q0 10 7.5 18.5t17.5 10.5q41 6 75 6z" />
|
|
||||||
<glyph unicode="+" d="M450 1100h200q21 0 35.5 -14.5t14.5 -35.5v-350h350q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-350v-350q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v350h-350q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5 h350v350q0 21 14.5 35.5t35.5 14.5z" />
|
|
||||||
<glyph unicode=" " />
|
|
||||||
<glyph unicode="¥" d="M825 1100h250q10 0 12.5 -5t-5.5 -13l-364 -364q-6 -6 -11 -18h268q10 0 13 -6t-3 -14l-120 -160q-6 -8 -18 -14t-22 -6h-125v-100h275q10 0 13 -6t-3 -14l-120 -160q-6 -8 -18 -14t-22 -6h-125v-174q0 -11 -7.5 -18.5t-18.5 -7.5h-148q-11 0 -18.5 7.5t-7.5 18.5v174 h-275q-10 0 -13 6t3 14l120 160q6 8 18 14t22 6h125v100h-275q-10 0 -13 6t3 14l120 160q6 8 18 14t22 6h118q-5 12 -11 18l-364 364q-8 8 -5.5 13t12.5 5h250q25 0 43 -18l164 -164q8 -8 18 -8t18 8l164 164q18 18 43 18z" />
|
|
||||||
<glyph unicode=" " horiz-adv-x="650" />
|
|
||||||
<glyph unicode=" " horiz-adv-x="1300" />
|
|
||||||
<glyph unicode=" " horiz-adv-x="650" />
|
|
||||||
<glyph unicode=" " horiz-adv-x="1300" />
|
|
||||||
<glyph unicode=" " horiz-adv-x="433" />
|
|
||||||
<glyph unicode=" " horiz-adv-x="325" />
|
|
||||||
<glyph unicode=" " horiz-adv-x="216" />
|
|
||||||
<glyph unicode=" " horiz-adv-x="216" />
|
|
||||||
<glyph unicode=" " horiz-adv-x="162" />
|
|
||||||
<glyph unicode=" " horiz-adv-x="260" />
|
|
||||||
<glyph unicode=" " horiz-adv-x="72" />
|
|
||||||
<glyph unicode=" " horiz-adv-x="260" />
|
|
||||||
<glyph unicode=" " horiz-adv-x="325" />
|
|
||||||
<glyph unicode="€" d="M744 1198q242 0 354 -189q60 -104 66 -209h-181q0 45 -17.5 82.5t-43.5 61.5t-58 40.5t-60.5 24t-51.5 7.5q-19 0 -40.5 -5.5t-49.5 -20.5t-53 -38t-49 -62.5t-39 -89.5h379l-100 -100h-300q-6 -50 -6 -100h406l-100 -100h-300q9 -74 33 -132t52.5 -91t61.5 -54.5t59 -29 t47 -7.5q22 0 50.5 7.5t60.5 24.5t58 41t43.5 61t17.5 80h174q-30 -171 -128 -278q-107 -117 -274 -117q-206 0 -324 158q-36 48 -69 133t-45 204h-217l100 100h112q1 47 6 100h-218l100 100h134q20 87 51 153.5t62 103.5q117 141 297 141z" />
|
|
||||||
<glyph unicode="₽" d="M428 1200h350q67 0 120 -13t86 -31t57 -49.5t35 -56.5t17 -64.5t6.5 -60.5t0.5 -57v-16.5v-16.5q0 -36 -0.5 -57t-6.5 -61t-17 -65t-35 -57t-57 -50.5t-86 -31.5t-120 -13h-178l-2 -100h288q10 0 13 -6t-3 -14l-120 -160q-6 -8 -18 -14t-22 -6h-138v-175q0 -11 -5.5 -18 t-15.5 -7h-149q-10 0 -17.5 7.5t-7.5 17.5v175h-267q-10 0 -13 6t3 14l120 160q6 8 18 14t22 6h117v100h-267q-10 0 -13 6t3 14l120 160q6 8 18 14t22 6h117v475q0 10 7.5 17.5t17.5 7.5zM600 1000v-300h203q64 0 86.5 33t22.5 119q0 84 -22.5 116t-86.5 32h-203z" />
|
|
||||||
<glyph unicode="−" d="M250 700h800q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-800q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5z" />
|
|
||||||
<glyph unicode="⌛" d="M1000 1200v-150q0 -21 -14.5 -35.5t-35.5 -14.5h-50v-100q0 -91 -49.5 -165.5t-130.5 -109.5q81 -35 130.5 -109.5t49.5 -165.5v-150h50q21 0 35.5 -14.5t14.5 -35.5v-150h-800v150q0 21 14.5 35.5t35.5 14.5h50v150q0 91 49.5 165.5t130.5 109.5q-81 35 -130.5 109.5 t-49.5 165.5v100h-50q-21 0 -35.5 14.5t-14.5 35.5v150h800zM400 1000v-100q0 -60 32.5 -109.5t87.5 -73.5q28 -12 44 -37t16 -55t-16 -55t-44 -37q-55 -24 -87.5 -73.5t-32.5 -109.5v-150h400v150q0 60 -32.5 109.5t-87.5 73.5q-28 12 -44 37t-16 55t16 55t44 37 q55 24 87.5 73.5t32.5 109.5v100h-400z" />
|
|
||||||
<glyph unicode="◼" horiz-adv-x="500" d="M0 0z" />
|
|
||||||
<glyph unicode="☁" d="M503 1089q110 0 200.5 -59.5t134.5 -156.5q44 14 90 14q120 0 205 -86.5t85 -206.5q0 -121 -85 -207.5t-205 -86.5h-750q-79 0 -135.5 57t-56.5 137q0 69 42.5 122.5t108.5 67.5q-2 12 -2 37q0 153 108 260.5t260 107.5z" />
|
|
||||||
<glyph unicode="⛺" d="M774 1193.5q16 -9.5 20.5 -27t-5.5 -33.5l-136 -187l467 -746h30q20 0 35 -18.5t15 -39.5v-42h-1200v42q0 21 15 39.5t35 18.5h30l468 746l-135 183q-10 16 -5.5 34t20.5 28t34 5.5t28 -20.5l111 -148l112 150q9 16 27 20.5t34 -5zM600 200h377l-182 112l-195 534v-646z " />
|
|
||||||
<glyph unicode="✉" d="M25 1100h1150q10 0 12.5 -5t-5.5 -13l-564 -567q-8 -8 -18 -8t-18 8l-564 567q-8 8 -5.5 13t12.5 5zM18 882l264 -264q8 -8 8 -18t-8 -18l-264 -264q-8 -8 -13 -5.5t-5 12.5v550q0 10 5 12.5t13 -5.5zM918 618l264 264q8 8 13 5.5t5 -12.5v-550q0 -10 -5 -12.5t-13 5.5 l-264 264q-8 8 -8 18t8 18zM818 482l364 -364q8 -8 5.5 -13t-12.5 -5h-1150q-10 0 -12.5 5t5.5 13l364 364q8 8 18 8t18 -8l164 -164q8 -8 18 -8t18 8l164 164q8 8 18 8t18 -8z" />
|
|
||||||
<glyph unicode="✏" d="M1011 1210q19 0 33 -13l153 -153q13 -14 13 -33t-13 -33l-99 -92l-214 214l95 96q13 14 32 14zM1013 800l-615 -614l-214 214l614 614zM317 96l-333 -112l110 335z" />
|
|
||||||
<glyph unicode="" d="M700 650v-550h250q21 0 35.5 -14.5t14.5 -35.5v-50h-800v50q0 21 14.5 35.5t35.5 14.5h250v550l-500 550h1200z" />
|
|
||||||
<glyph unicode="" d="M368 1017l645 163q39 15 63 0t24 -49v-831q0 -55 -41.5 -95.5t-111.5 -63.5q-79 -25 -147 -4.5t-86 75t25.5 111.5t122.5 82q72 24 138 8v521l-600 -155v-606q0 -42 -44 -90t-109 -69q-79 -26 -147 -5.5t-86 75.5t25.5 111.5t122.5 82.5q72 24 138 7v639q0 38 14.5 59 t53.5 34z" />
|
|
||||||
<glyph unicode="" d="M500 1191q100 0 191 -39t156.5 -104.5t104.5 -156.5t39 -191l-1 -2l1 -5q0 -141 -78 -262l275 -274q23 -26 22.5 -44.5t-22.5 -42.5l-59 -58q-26 -20 -46.5 -20t-39.5 20l-275 274q-119 -77 -261 -77l-5 1l-2 -1q-100 0 -191 39t-156.5 104.5t-104.5 156.5t-39 191 t39 191t104.5 156.5t156.5 104.5t191 39zM500 1022q-88 0 -162 -43t-117 -117t-43 -162t43 -162t117 -117t162 -43t162 43t117 117t43 162t-43 162t-117 117t-162 43z" />
|
|
||||||
<glyph unicode="" d="M649 949q48 68 109.5 104t121.5 38.5t118.5 -20t102.5 -64t71 -100.5t27 -123q0 -57 -33.5 -117.5t-94 -124.5t-126.5 -127.5t-150 -152.5t-146 -174q-62 85 -145.5 174t-150 152.5t-126.5 127.5t-93.5 124.5t-33.5 117.5q0 64 28 123t73 100.5t104 64t119 20 t120.5 -38.5t104.5 -104z" />
|
|
||||||
<glyph unicode="" d="M407 800l131 353q7 19 17.5 19t17.5 -19l129 -353h421q21 0 24 -8.5t-14 -20.5l-342 -249l130 -401q7 -20 -0.5 -25.5t-24.5 6.5l-343 246l-342 -247q-17 -12 -24.5 -6.5t-0.5 25.5l130 400l-347 251q-17 12 -14 20.5t23 8.5h429z" />
|
|
||||||
<glyph unicode="" d="M407 800l131 353q7 19 17.5 19t17.5 -19l129 -353h421q21 0 24 -8.5t-14 -20.5l-342 -249l130 -401q7 -20 -0.5 -25.5t-24.5 6.5l-343 246l-342 -247q-17 -12 -24.5 -6.5t-0.5 25.5l130 400l-347 251q-17 12 -14 20.5t23 8.5h429zM477 700h-240l197 -142l-74 -226 l193 139l195 -140l-74 229l192 140h-234l-78 211z" />
|
|
||||||
<glyph unicode="" d="M600 1200q124 0 212 -88t88 -212v-250q0 -46 -31 -98t-69 -52v-75q0 -10 6 -21.5t15 -17.5l358 -230q9 -5 15 -16.5t6 -21.5v-93q0 -10 -7.5 -17.5t-17.5 -7.5h-1150q-10 0 -17.5 7.5t-7.5 17.5v93q0 10 6 21.5t15 16.5l358 230q9 6 15 17.5t6 21.5v75q-38 0 -69 52 t-31 98v250q0 124 88 212t212 88z" />
|
|
||||||
<glyph unicode="" d="M25 1100h1150q10 0 17.5 -7.5t7.5 -17.5v-1050q0 -10 -7.5 -17.5t-17.5 -7.5h-1150q-10 0 -17.5 7.5t-7.5 17.5v1050q0 10 7.5 17.5t17.5 7.5zM100 1000v-100h100v100h-100zM875 1000h-550q-10 0 -17.5 -7.5t-7.5 -17.5v-350q0 -10 7.5 -17.5t17.5 -7.5h550 q10 0 17.5 7.5t7.5 17.5v350q0 10 -7.5 17.5t-17.5 7.5zM1000 1000v-100h100v100h-100zM100 800v-100h100v100h-100zM1000 800v-100h100v100h-100zM100 600v-100h100v100h-100zM1000 600v-100h100v100h-100zM875 500h-550q-10 0 -17.5 -7.5t-7.5 -17.5v-350q0 -10 7.5 -17.5 t17.5 -7.5h550q10 0 17.5 7.5t7.5 17.5v350q0 10 -7.5 17.5t-17.5 7.5zM100 400v-100h100v100h-100zM1000 400v-100h100v100h-100zM100 200v-100h100v100h-100zM1000 200v-100h100v100h-100z" />
|
|
||||||
<glyph unicode="" d="M50 1100h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5zM650 1100h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5 35.5v400 q0 21 14.5 35.5t35.5 14.5zM50 500h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5zM650 500h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-400 q-21 0 -35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5z" />
|
|
||||||
<glyph unicode="" d="M50 1100h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM450 1100h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v200 q0 21 14.5 35.5t35.5 14.5zM850 1100h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM50 700h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200 q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM450 700h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM850 700h200q21 0 35.5 -14.5t14.5 -35.5v-200 q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM50 300h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM450 300h200 q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM850 300h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5 t35.5 14.5z" />
|
|
||||||
<glyph unicode="" d="M50 1100h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM450 1100h700q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-700q-21 0 -35.5 14.5t-14.5 35.5v200 q0 21 14.5 35.5t35.5 14.5zM50 700h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM450 700h700q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-700 q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM50 300h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM450 300h700q21 0 35.5 -14.5t14.5 -35.5v-200 q0 -21 -14.5 -35.5t-35.5 -14.5h-700q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5z" />
|
|
||||||
<glyph unicode="" d="M465 477l571 571q8 8 18 8t17 -8l177 -177q8 -7 8 -17t-8 -18l-783 -784q-7 -8 -17.5 -8t-17.5 8l-384 384q-8 8 -8 18t8 17l177 177q7 8 17 8t18 -8l171 -171q7 -7 18 -7t18 7z" />
|
|
||||||
<glyph unicode="" d="M904 1083l178 -179q8 -8 8 -18.5t-8 -17.5l-267 -268l267 -268q8 -7 8 -17.5t-8 -18.5l-178 -178q-8 -8 -18.5 -8t-17.5 8l-268 267l-268 -267q-7 -8 -17.5 -8t-18.5 8l-178 178q-8 8 -8 18.5t8 17.5l267 268l-267 268q-8 7 -8 17.5t8 18.5l178 178q8 8 18.5 8t17.5 -8 l268 -267l268 268q7 7 17.5 7t18.5 -7z" />
|
|
||||||
<glyph unicode="" d="M507 1177q98 0 187.5 -38.5t154.5 -103.5t103.5 -154.5t38.5 -187.5q0 -141 -78 -262l300 -299q8 -8 8 -18.5t-8 -18.5l-109 -108q-7 -8 -17.5 -8t-18.5 8l-300 299q-119 -77 -261 -77q-98 0 -188 38.5t-154.5 103t-103 154.5t-38.5 188t38.5 187.5t103 154.5 t154.5 103.5t188 38.5zM506.5 1023q-89.5 0 -165.5 -44t-120 -120.5t-44 -166t44 -165.5t120 -120t165.5 -44t166 44t120.5 120t44 165.5t-44 166t-120.5 120.5t-166 44zM425 900h150q10 0 17.5 -7.5t7.5 -17.5v-75h75q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5 t-17.5 -7.5h-75v-75q0 -10 -7.5 -17.5t-17.5 -7.5h-150q-10 0 -17.5 7.5t-7.5 17.5v75h-75q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5h75v75q0 10 7.5 17.5t17.5 7.5z" />
|
|
||||||
<glyph unicode="" d="M507 1177q98 0 187.5 -38.5t154.5 -103.5t103.5 -154.5t38.5 -187.5q0 -141 -78 -262l300 -299q8 -8 8 -18.5t-8 -18.5l-109 -108q-7 -8 -17.5 -8t-18.5 8l-300 299q-119 -77 -261 -77q-98 0 -188 38.5t-154.5 103t-103 154.5t-38.5 188t38.5 187.5t103 154.5 t154.5 103.5t188 38.5zM506.5 1023q-89.5 0 -165.5 -44t-120 -120.5t-44 -166t44 -165.5t120 -120t165.5 -44t166 44t120.5 120t44 165.5t-44 166t-120.5 120.5t-166 44zM325 800h350q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-350q-10 0 -17.5 7.5 t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5z" />
|
|
||||||
<glyph unicode="" d="M550 1200h100q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5zM800 975v166q167 -62 272 -209.5t105 -331.5q0 -117 -45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5 t-184.5 123t-123 184.5t-45.5 224q0 184 105 331.5t272 209.5v-166q-103 -55 -165 -155t-62 -220q0 -116 57 -214.5t155.5 -155.5t214.5 -57t214.5 57t155.5 155.5t57 214.5q0 120 -62 220t-165 155z" />
|
|
||||||
<glyph unicode="" d="M1025 1200h150q10 0 17.5 -7.5t7.5 -17.5v-1150q0 -10 -7.5 -17.5t-17.5 -7.5h-150q-10 0 -17.5 7.5t-7.5 17.5v1150q0 10 7.5 17.5t17.5 7.5zM725 800h150q10 0 17.5 -7.5t7.5 -17.5v-750q0 -10 -7.5 -17.5t-17.5 -7.5h-150q-10 0 -17.5 7.5t-7.5 17.5v750 q0 10 7.5 17.5t17.5 7.5zM425 500h150q10 0 17.5 -7.5t7.5 -17.5v-450q0 -10 -7.5 -17.5t-17.5 -7.5h-150q-10 0 -17.5 7.5t-7.5 17.5v450q0 10 7.5 17.5t17.5 7.5zM125 300h150q10 0 17.5 -7.5t7.5 -17.5v-250q0 -10 -7.5 -17.5t-17.5 -7.5h-150q-10 0 -17.5 7.5t-7.5 17.5 v250q0 10 7.5 17.5t17.5 7.5z" />
|
|
||||||
<glyph unicode="" d="M600 1174q33 0 74 -5l38 -152l5 -1q49 -14 94 -39l5 -2l134 80q61 -48 104 -105l-80 -134l3 -5q25 -44 39 -93l1 -6l152 -38q5 -43 5 -73q0 -34 -5 -74l-152 -38l-1 -6q-15 -49 -39 -93l-3 -5l80 -134q-48 -61 -104 -105l-134 81l-5 -3q-44 -25 -94 -39l-5 -2l-38 -151 q-43 -5 -74 -5q-33 0 -74 5l-38 151l-5 2q-49 14 -94 39l-5 3l-134 -81q-60 48 -104 105l80 134l-3 5q-25 45 -38 93l-2 6l-151 38q-6 42 -6 74q0 33 6 73l151 38l2 6q13 48 38 93l3 5l-80 134q47 61 105 105l133 -80l5 2q45 25 94 39l5 1l38 152q43 5 74 5zM600 815 q-89 0 -152 -63t-63 -151.5t63 -151.5t152 -63t152 63t63 151.5t-63 151.5t-152 63z" />
|
|
||||||
<glyph unicode="" d="M500 1300h300q41 0 70.5 -29.5t29.5 -70.5v-100h275q10 0 17.5 -7.5t7.5 -17.5v-75h-1100v75q0 10 7.5 17.5t17.5 7.5h275v100q0 41 29.5 70.5t70.5 29.5zM500 1200v-100h300v100h-300zM1100 900v-800q0 -41 -29.5 -70.5t-70.5 -29.5h-700q-41 0 -70.5 29.5t-29.5 70.5 v800h900zM300 800v-700h100v700h-100zM500 800v-700h100v700h-100zM700 800v-700h100v700h-100zM900 800v-700h100v700h-100z" />
|
|
||||||
<glyph unicode="" d="M18 618l620 608q8 7 18.5 7t17.5 -7l608 -608q8 -8 5.5 -13t-12.5 -5h-175v-575q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5t-7.5 17.5v375h-300v-375q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5t-7.5 17.5v575h-175q-10 0 -12.5 5t5.5 13z" />
|
|
||||||
<glyph unicode="" d="M600 1200v-400q0 -41 29.5 -70.5t70.5 -29.5h300v-650q0 -21 -14.5 -35.5t-35.5 -14.5h-800q-21 0 -35.5 14.5t-14.5 35.5v1100q0 21 14.5 35.5t35.5 14.5h450zM1000 800h-250q-21 0 -35.5 14.5t-14.5 35.5v250z" />
|
|
||||||
<glyph unicode="" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM600 1027q-116 0 -214.5 -57t-155.5 -155.5t-57 -214.5t57 -214.5 t155.5 -155.5t214.5 -57t214.5 57t155.5 155.5t57 214.5t-57 214.5t-155.5 155.5t-214.5 57zM525 900h50q10 0 17.5 -7.5t7.5 -17.5v-275h175q10 0 17.5 -7.5t7.5 -17.5v-50q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5t-7.5 17.5v350q0 10 7.5 17.5t17.5 7.5z" />
|
|
||||||
<glyph unicode="" d="M1300 0h-538l-41 400h-242l-41 -400h-538l431 1200h209l-21 -300h162l-20 300h208zM515 800l-27 -300h224l-27 300h-170z" />
|
|
||||||
<glyph unicode="" d="M550 1200h200q21 0 35.5 -14.5t14.5 -35.5v-450h191q20 0 25.5 -11.5t-7.5 -27.5l-327 -400q-13 -16 -32 -16t-32 16l-327 400q-13 16 -7.5 27.5t25.5 11.5h191v450q0 21 14.5 35.5t35.5 14.5zM1125 400h50q10 0 17.5 -7.5t7.5 -17.5v-350q0 -10 -7.5 -17.5t-17.5 -7.5 h-1050q-10 0 -17.5 7.5t-7.5 17.5v350q0 10 7.5 17.5t17.5 7.5h50q10 0 17.5 -7.5t7.5 -17.5v-175h900v175q0 10 7.5 17.5t17.5 7.5z" />
|
|
||||||
<glyph unicode="" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM600 1027q-116 0 -214.5 -57t-155.5 -155.5t-57 -214.5t57 -214.5 t155.5 -155.5t214.5 -57t214.5 57t155.5 155.5t57 214.5t-57 214.5t-155.5 155.5t-214.5 57zM525 900h150q10 0 17.5 -7.5t7.5 -17.5v-275h137q21 0 26 -11.5t-8 -27.5l-223 -275q-13 -16 -32 -16t-32 16l-223 275q-13 16 -8 27.5t26 11.5h137v275q0 10 7.5 17.5t17.5 7.5z " />
|
|
||||||
<glyph unicode="" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM600 1027q-116 0 -214.5 -57t-155.5 -155.5t-57 -214.5t57 -214.5 t155.5 -155.5t214.5 -57t214.5 57t155.5 155.5t57 214.5t-57 214.5t-155.5 155.5t-214.5 57zM632 914l223 -275q13 -16 8 -27.5t-26 -11.5h-137v-275q0 -10 -7.5 -17.5t-17.5 -7.5h-150q-10 0 -17.5 7.5t-7.5 17.5v275h-137q-21 0 -26 11.5t8 27.5l223 275q13 16 32 16 t32 -16z" />
|
|
||||||
<glyph unicode="" d="M225 1200h750q10 0 19.5 -7t12.5 -17l186 -652q7 -24 7 -49v-425q0 -12 -4 -27t-9 -17q-12 -6 -37 -6h-1100q-12 0 -27 4t-17 8q-6 13 -6 38l1 425q0 25 7 49l185 652q3 10 12.5 17t19.5 7zM878 1000h-556q-10 0 -19 -7t-11 -18l-87 -450q-2 -11 4 -18t16 -7h150 q10 0 19.5 -7t11.5 -17l38 -152q2 -10 11.5 -17t19.5 -7h250q10 0 19.5 7t11.5 17l38 152q2 10 11.5 17t19.5 7h150q10 0 16 7t4 18l-87 450q-2 11 -11 18t-19 7z" />
|
|
||||||
<glyph unicode="" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM600 1027q-116 0 -214.5 -57t-155.5 -155.5t-57 -214.5t57 -214.5 t155.5 -155.5t214.5 -57t214.5 57t155.5 155.5t57 214.5t-57 214.5t-155.5 155.5t-214.5 57zM540 820l253 -190q17 -12 17 -30t-17 -30l-253 -190q-16 -12 -28 -6.5t-12 26.5v400q0 21 12 26.5t28 -6.5z" />
|
|
||||||
<glyph unicode="" d="M947 1060l135 135q7 7 12.5 5t5.5 -13v-362q0 -10 -7.5 -17.5t-17.5 -7.5h-362q-11 0 -13 5.5t5 12.5l133 133q-109 76 -238 76q-116 0 -214.5 -57t-155.5 -155.5t-57 -214.5t57 -214.5t155.5 -155.5t214.5 -57t214.5 57t155.5 155.5t57 214.5h150q0 -117 -45.5 -224 t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5q192 0 347 -117z" />
|
|
||||||
<glyph unicode="" d="M947 1060l135 135q7 7 12.5 5t5.5 -13v-361q0 -11 -7.5 -18.5t-18.5 -7.5h-361q-11 0 -13 5.5t5 12.5l134 134q-110 75 -239 75q-116 0 -214.5 -57t-155.5 -155.5t-57 -214.5h-150q0 117 45.5 224t123 184.5t184.5 123t224 45.5q192 0 347 -117zM1027 600h150 q0 -117 -45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5q-192 0 -348 118l-134 -134q-7 -8 -12.5 -5.5t-5.5 12.5v360q0 11 7.5 18.5t18.5 7.5h360q10 0 12.5 -5.5t-5.5 -12.5l-133 -133q110 -76 240 -76q116 0 214.5 57t155.5 155.5t57 214.5z" />
|
|
||||||
<glyph unicode="" d="M125 1200h1050q10 0 17.5 -7.5t7.5 -17.5v-1150q0 -10 -7.5 -17.5t-17.5 -7.5h-1050q-10 0 -17.5 7.5t-7.5 17.5v1150q0 10 7.5 17.5t17.5 7.5zM1075 1000h-850q-10 0 -17.5 -7.5t-7.5 -17.5v-850q0 -10 7.5 -17.5t17.5 -7.5h850q10 0 17.5 7.5t7.5 17.5v850 q0 10 -7.5 17.5t-17.5 7.5zM325 900h50q10 0 17.5 -7.5t7.5 -17.5v-50q0 -10 -7.5 -17.5t-17.5 -7.5h-50q-10 0 -17.5 7.5t-7.5 17.5v50q0 10 7.5 17.5t17.5 7.5zM525 900h450q10 0 17.5 -7.5t7.5 -17.5v-50q0 -10 -7.5 -17.5t-17.5 -7.5h-450q-10 0 -17.5 7.5t-7.5 17.5v50 q0 10 7.5 17.5t17.5 7.5zM325 700h50q10 0 17.5 -7.5t7.5 -17.5v-50q0 -10 -7.5 -17.5t-17.5 -7.5h-50q-10 0 -17.5 7.5t-7.5 17.5v50q0 10 7.5 17.5t17.5 7.5zM525 700h450q10 0 17.5 -7.5t7.5 -17.5v-50q0 -10 -7.5 -17.5t-17.5 -7.5h-450q-10 0 -17.5 7.5t-7.5 17.5v50 q0 10 7.5 17.5t17.5 7.5zM325 500h50q10 0 17.5 -7.5t7.5 -17.5v-50q0 -10 -7.5 -17.5t-17.5 -7.5h-50q-10 0 -17.5 7.5t-7.5 17.5v50q0 10 7.5 17.5t17.5 7.5zM525 500h450q10 0 17.5 -7.5t7.5 -17.5v-50q0 -10 -7.5 -17.5t-17.5 -7.5h-450q-10 0 -17.5 7.5t-7.5 17.5v50 q0 10 7.5 17.5t17.5 7.5zM325 300h50q10 0 17.5 -7.5t7.5 -17.5v-50q0 -10 -7.5 -17.5t-17.5 -7.5h-50q-10 0 -17.5 7.5t-7.5 17.5v50q0 10 7.5 17.5t17.5 7.5zM525 300h450q10 0 17.5 -7.5t7.5 -17.5v-50q0 -10 -7.5 -17.5t-17.5 -7.5h-450q-10 0 -17.5 7.5t-7.5 17.5v50 q0 10 7.5 17.5t17.5 7.5z" />
|
|
||||||
<glyph unicode="" d="M900 800v200q0 83 -58.5 141.5t-141.5 58.5h-300q-82 0 -141 -59t-59 -141v-200h-100q-41 0 -70.5 -29.5t-29.5 -70.5v-600q0 -41 29.5 -70.5t70.5 -29.5h900q41 0 70.5 29.5t29.5 70.5v600q0 41 -29.5 70.5t-70.5 29.5h-100zM400 800v150q0 21 15 35.5t35 14.5h200 q20 0 35 -14.5t15 -35.5v-150h-300z" />
|
|
||||||
<glyph unicode="" d="M125 1100h50q10 0 17.5 -7.5t7.5 -17.5v-1075h-100v1075q0 10 7.5 17.5t17.5 7.5zM1075 1052q4 0 9 -2q16 -6 16 -23v-421q0 -6 -3 -12q-33 -59 -66.5 -99t-65.5 -58t-56.5 -24.5t-52.5 -6.5q-26 0 -57.5 6.5t-52.5 13.5t-60 21q-41 15 -63 22.5t-57.5 15t-65.5 7.5 q-85 0 -160 -57q-7 -5 -15 -5q-6 0 -11 3q-14 7 -14 22v438q22 55 82 98.5t119 46.5q23 2 43 0.5t43 -7t32.5 -8.5t38 -13t32.5 -11q41 -14 63.5 -21t57 -14t63.5 -7q103 0 183 87q7 8 18 8z" />
|
|
||||||
<glyph unicode="" d="M600 1175q116 0 227 -49.5t192.5 -131t131 -192.5t49.5 -227v-300q0 -10 -7.5 -17.5t-17.5 -7.5h-50q-10 0 -17.5 7.5t-7.5 17.5v300q0 127 -70.5 231.5t-184.5 161.5t-245 57t-245 -57t-184.5 -161.5t-70.5 -231.5v-300q0 -10 -7.5 -17.5t-17.5 -7.5h-50 q-10 0 -17.5 7.5t-7.5 17.5v300q0 116 49.5 227t131 192.5t192.5 131t227 49.5zM220 500h160q8 0 14 -6t6 -14v-460q0 -8 -6 -14t-14 -6h-160q-8 0 -14 6t-6 14v460q0 8 6 14t14 6zM820 500h160q8 0 14 -6t6 -14v-460q0 -8 -6 -14t-14 -6h-160q-8 0 -14 6t-6 14v460 q0 8 6 14t14 6z" />
|
|
||||||
<glyph unicode="" d="M321 814l258 172q9 6 15 2.5t6 -13.5v-750q0 -10 -6 -13.5t-15 2.5l-258 172q-21 14 -46 14h-250q-10 0 -17.5 7.5t-7.5 17.5v350q0 10 7.5 17.5t17.5 7.5h250q25 0 46 14zM900 668l120 120q7 7 17 7t17 -7l34 -34q7 -7 7 -17t-7 -17l-120 -120l120 -120q7 -7 7 -17 t-7 -17l-34 -34q-7 -7 -17 -7t-17 7l-120 119l-120 -119q-7 -7 -17 -7t-17 7l-34 34q-7 7 -7 17t7 17l119 120l-119 120q-7 7 -7 17t7 17l34 34q7 8 17 8t17 -8z" />
|
|
||||||
<glyph unicode="" d="M321 814l258 172q9 6 15 2.5t6 -13.5v-750q0 -10 -6 -13.5t-15 2.5l-258 172q-21 14 -46 14h-250q-10 0 -17.5 7.5t-7.5 17.5v350q0 10 7.5 17.5t17.5 7.5h250q25 0 46 14zM766 900h4q10 -1 16 -10q96 -129 96 -290q0 -154 -90 -281q-6 -9 -17 -10l-3 -1q-9 0 -16 6 l-29 23q-7 7 -8.5 16.5t4.5 17.5q72 103 72 229q0 132 -78 238q-6 8 -4.5 18t9.5 17l29 22q7 5 15 5z" />
|
|
||||||
<glyph unicode="" d="M967 1004h3q11 -1 17 -10q135 -179 135 -396q0 -105 -34 -206.5t-98 -185.5q-7 -9 -17 -10h-3q-9 0 -16 6l-42 34q-8 6 -9 16t5 18q111 150 111 328q0 90 -29.5 176t-84.5 157q-6 9 -5 19t10 16l42 33q7 5 15 5zM321 814l258 172q9 6 15 2.5t6 -13.5v-750q0 -10 -6 -13.5 t-15 2.5l-258 172q-21 14 -46 14h-250q-10 0 -17.5 7.5t-7.5 17.5v350q0 10 7.5 17.5t17.5 7.5h250q25 0 46 14zM766 900h4q10 -1 16 -10q96 -129 96 -290q0 -154 -90 -281q-6 -9 -17 -10l-3 -1q-9 0 -16 6l-29 23q-7 7 -8.5 16.5t4.5 17.5q72 103 72 229q0 132 -78 238 q-6 8 -4.5 18.5t9.5 16.5l29 22q7 5 15 5z" />
|
|
||||||
<glyph unicode="" d="M500 900h100v-100h-100v-100h-400v-100h-100v600h500v-300zM1200 700h-200v-100h200v-200h-300v300h-200v300h-100v200h600v-500zM100 1100v-300h300v300h-300zM800 1100v-300h300v300h-300zM300 900h-100v100h100v-100zM1000 900h-100v100h100v-100zM300 500h200v-500 h-500v500h200v100h100v-100zM800 300h200v-100h-100v-100h-200v100h-100v100h100v200h-200v100h300v-300zM100 400v-300h300v300h-300zM300 200h-100v100h100v-100zM1200 200h-100v100h100v-100zM700 0h-100v100h100v-100zM1200 0h-300v100h300v-100z" />
|
|
||||||
<glyph unicode="" d="M100 200h-100v1000h100v-1000zM300 200h-100v1000h100v-1000zM700 200h-200v1000h200v-1000zM900 200h-100v1000h100v-1000zM1200 200h-200v1000h200v-1000zM400 0h-300v100h300v-100zM600 0h-100v91h100v-91zM800 0h-100v91h100v-91zM1100 0h-200v91h200v-91z" />
|
|
||||||
<glyph unicode="" d="M500 1200l682 -682q8 -8 8 -18t-8 -18l-464 -464q-8 -8 -18 -8t-18 8l-682 682l1 475q0 10 7.5 17.5t17.5 7.5h474zM319.5 1024.5q-29.5 29.5 -71 29.5t-71 -29.5t-29.5 -71.5t29.5 -71.5t71 -29.5t71 29.5t29.5 71.5t-29.5 71.5z" />
|
|
||||||
<glyph unicode="" d="M500 1200l682 -682q8 -8 8 -18t-8 -18l-464 -464q-8 -8 -18 -8t-18 8l-682 682l1 475q0 10 7.5 17.5t17.5 7.5h474zM800 1200l682 -682q8 -8 8 -18t-8 -18l-464 -464q-8 -8 -18 -8t-18 8l-56 56l424 426l-700 700h150zM319.5 1024.5q-29.5 29.5 -71 29.5t-71 -29.5 t-29.5 -71.5t29.5 -71.5t71 -29.5t71 29.5t29.5 71.5t-29.5 71.5z" />
|
|
||||||
<glyph unicode="" d="M300 1200h825q75 0 75 -75v-900q0 -25 -18 -43l-64 -64q-8 -8 -13 -5.5t-5 12.5v950q0 10 -7.5 17.5t-17.5 7.5h-700q-25 0 -43 -18l-64 -64q-8 -8 -5.5 -13t12.5 -5h700q10 0 17.5 -7.5t7.5 -17.5v-950q0 -10 -7.5 -17.5t-17.5 -7.5h-850q-10 0 -17.5 7.5t-7.5 17.5v975 q0 25 18 43l139 139q18 18 43 18z" />
|
|
||||||
<glyph unicode="" d="M250 1200h800q21 0 35.5 -14.5t14.5 -35.5v-1150l-450 444l-450 -445v1151q0 21 14.5 35.5t35.5 14.5z" />
|
|
||||||
<glyph unicode="" d="M822 1200h-444q-11 0 -19 -7.5t-9 -17.5l-78 -301q-7 -24 7 -45l57 -108q6 -9 17.5 -15t21.5 -6h450q10 0 21.5 6t17.5 15l62 108q14 21 7 45l-83 301q-1 10 -9 17.5t-19 7.5zM1175 800h-150q-10 0 -21 -6.5t-15 -15.5l-78 -156q-4 -9 -15 -15.5t-21 -6.5h-550 q-10 0 -21 6.5t-15 15.5l-78 156q-4 9 -15 15.5t-21 6.5h-150q-10 0 -17.5 -7.5t-7.5 -17.5v-650q0 -10 7.5 -17.5t17.5 -7.5h150q10 0 17.5 7.5t7.5 17.5v150q0 10 7.5 17.5t17.5 7.5h750q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 7.5 -17.5t17.5 -7.5h150q10 0 17.5 7.5 t7.5 17.5v650q0 10 -7.5 17.5t-17.5 7.5zM850 200h-500q-10 0 -19.5 -7t-11.5 -17l-38 -152q-2 -10 3.5 -17t15.5 -7h600q10 0 15.5 7t3.5 17l-38 152q-2 10 -11.5 17t-19.5 7z" />
|
|
||||||
<glyph unicode="" d="M500 1100h200q56 0 102.5 -20.5t72.5 -50t44 -59t25 -50.5l6 -20h150q41 0 70.5 -29.5t29.5 -70.5v-600q0 -41 -29.5 -70.5t-70.5 -29.5h-1000q-41 0 -70.5 29.5t-29.5 70.5v600q0 41 29.5 70.5t70.5 29.5h150q2 8 6.5 21.5t24 48t45 61t72 48t102.5 21.5zM900 800v-100 h100v100h-100zM600 730q-95 0 -162.5 -67.5t-67.5 -162.5t67.5 -162.5t162.5 -67.5t162.5 67.5t67.5 162.5t-67.5 162.5t-162.5 67.5zM600 603q43 0 73 -30t30 -73t-30 -73t-73 -30t-73 30t-30 73t30 73t73 30z" />
|
|
||||||
<glyph unicode="" d="M681 1199l385 -998q20 -50 60 -92q18 -19 36.5 -29.5t27.5 -11.5l10 -2v-66h-417v66q53 0 75 43.5t5 88.5l-82 222h-391q-58 -145 -92 -234q-11 -34 -6.5 -57t25.5 -37t46 -20t55 -6v-66h-365v66q56 24 84 52q12 12 25 30.5t20 31.5l7 13l399 1006h93zM416 521h340 l-162 457z" />
|
|
||||||
<glyph unicode="" d="M753 641q5 -1 14.5 -4.5t36 -15.5t50.5 -26.5t53.5 -40t50.5 -54.5t35.5 -70t14.5 -87q0 -67 -27.5 -125.5t-71.5 -97.5t-98.5 -66.5t-108.5 -40.5t-102 -13h-500v89q41 7 70.5 32.5t29.5 65.5v827q0 24 -0.5 34t-3.5 24t-8.5 19.5t-17 13.5t-28 12.5t-42.5 11.5v71 l471 -1q57 0 115.5 -20.5t108 -57t80.5 -94t31 -124.5q0 -51 -15.5 -96.5t-38 -74.5t-45 -50.5t-38.5 -30.5zM400 700h139q78 0 130.5 48.5t52.5 122.5q0 41 -8.5 70.5t-29.5 55.5t-62.5 39.5t-103.5 13.5h-118v-350zM400 200h216q80 0 121 50.5t41 130.5q0 90 -62.5 154.5 t-156.5 64.5h-159v-400z" />
|
|
||||||
<glyph unicode="" d="M877 1200l2 -57q-83 -19 -116 -45.5t-40 -66.5l-132 -839q-9 -49 13 -69t96 -26v-97h-500v97q186 16 200 98l173 832q3 17 3 30t-1.5 22.5t-9 17.5t-13.5 12.5t-21.5 10t-26 8.5t-33.5 10q-13 3 -19 5v57h425z" />
|
|
||||||
<glyph unicode="" d="M1300 900h-50q0 21 -4 37t-9.5 26.5t-18 17.5t-22 11t-28.5 5.5t-31 2t-37 0.5h-200v-850q0 -22 25 -34.5t50 -13.5l25 -2v-100h-400v100q4 0 11 0.5t24 3t30 7t24 15t11 24.5v850h-200q-25 0 -37 -0.5t-31 -2t-28.5 -5.5t-22 -11t-18 -17.5t-9.5 -26.5t-4 -37h-50v300 h1000v-300zM175 1000h-75v-800h75l-125 -167l-125 167h75v800h-75l125 167z" />
|
|
||||||
<glyph unicode="" d="M1100 900h-50q0 21 -4 37t-9.5 26.5t-18 17.5t-22 11t-28.5 5.5t-31 2t-37 0.5h-200v-650q0 -22 25 -34.5t50 -13.5l25 -2v-100h-400v100q4 0 11 0.5t24 3t30 7t24 15t11 24.5v650h-200q-25 0 -37 -0.5t-31 -2t-28.5 -5.5t-22 -11t-18 -17.5t-9.5 -26.5t-4 -37h-50v300 h1000v-300zM1167 50l-167 -125v75h-800v-75l-167 125l167 125v-75h800v75z" />
|
|
||||||
<glyph unicode="" d="M50 1100h600q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-600q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM50 800h1000q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1000q-21 0 -35.5 14.5t-14.5 35.5v100 q0 21 14.5 35.5t35.5 14.5zM50 500h800q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-800q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM50 200h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1100 q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5z" />
|
|
||||||
<glyph unicode="" d="M250 1100h700q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-700q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM50 800h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1100q-21 0 -35.5 14.5t-14.5 35.5v100 q0 21 14.5 35.5t35.5 14.5zM250 500h700q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-700q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM50 200h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1100 q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5z" />
|
|
||||||
<glyph unicode="" d="M500 950v100q0 21 14.5 35.5t35.5 14.5h600q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-600q-21 0 -35.5 14.5t-14.5 35.5zM100 650v100q0 21 14.5 35.5t35.5 14.5h1000q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1000 q-21 0 -35.5 14.5t-14.5 35.5zM300 350v100q0 21 14.5 35.5t35.5 14.5h800q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-800q-21 0 -35.5 14.5t-14.5 35.5zM0 50v100q0 21 14.5 35.5t35.5 14.5h1100q21 0 35.5 -14.5t14.5 -35.5v-100 q0 -21 -14.5 -35.5t-35.5 -14.5h-1100q-21 0 -35.5 14.5t-14.5 35.5z" />
|
|
||||||
<glyph unicode="" d="M50 1100h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1100q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM50 800h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1100q-21 0 -35.5 14.5t-14.5 35.5v100 q0 21 14.5 35.5t35.5 14.5zM50 500h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1100q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM50 200h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1100 q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5z" />
|
|
||||||
<glyph unicode="" d="M50 1100h100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM350 1100h800q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-800q-21 0 -35.5 14.5t-14.5 35.5v100 q0 21 14.5 35.5t35.5 14.5zM50 800h100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM350 800h800q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-800 q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM50 500h100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM350 500h800q21 0 35.5 -14.5t14.5 -35.5v-100 q0 -21 -14.5 -35.5t-35.5 -14.5h-800q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM50 200h100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM350 200h800 q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-800q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5z" />
|
|
||||||
<glyph unicode="" d="M400 0h-100v1100h100v-1100zM550 1100h100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM550 800h500q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-500 q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM267 550l-167 -125v75h-200v100h200v75zM550 500h300q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-300q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM550 200h600 q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-600q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5z" />
|
|
||||||
<glyph unicode="" d="M50 1100h100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM900 0h-100v1100h100v-1100zM50 800h500q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-500 q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM1100 600h200v-100h-200v-75l-167 125l167 125v-75zM50 500h300q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-300q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM50 200h600 q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-600q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5z" />
|
|
||||||
<glyph unicode="" d="M75 1000h750q31 0 53 -22t22 -53v-650q0 -31 -22 -53t-53 -22h-750q-31 0 -53 22t-22 53v650q0 31 22 53t53 22zM1200 300l-300 300l300 300v-600z" />
|
|
||||||
<glyph unicode="" d="M44 1100h1112q18 0 31 -13t13 -31v-1012q0 -18 -13 -31t-31 -13h-1112q-18 0 -31 13t-13 31v1012q0 18 13 31t31 13zM100 1000v-737l247 182l298 -131l-74 156l293 318l236 -288v500h-1000zM342 884q56 0 95 -39t39 -94.5t-39 -95t-95 -39.5t-95 39.5t-39 95t39 94.5 t95 39z" />
|
|
||||||
<glyph unicode="" d="M648 1169q117 0 216 -60t156.5 -161t57.5 -218q0 -115 -70 -258q-69 -109 -158 -225.5t-143 -179.5l-54 -62q-9 8 -25.5 24.5t-63.5 67.5t-91 103t-98.5 128t-95.5 148q-60 132 -60 249q0 88 34 169.5t91.5 142t137 96.5t166.5 36zM652.5 974q-91.5 0 -156.5 -65 t-65 -157t65 -156.5t156.5 -64.5t156.5 64.5t65 156.5t-65 157t-156.5 65z" />
|
|
||||||
<glyph unicode="" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM600 173v854q-116 0 -214.5 -57t-155.5 -155.5t-57 -214.5t57 -214.5 t155.5 -155.5t214.5 -57z" />
|
|
||||||
<glyph unicode="" d="M554 1295q21 -72 57.5 -143.5t76 -130t83 -118t82.5 -117t70 -116t49.5 -126t18.5 -136.5q0 -71 -25.5 -135t-68.5 -111t-99 -82t-118.5 -54t-125.5 -23q-84 5 -161.5 34t-139.5 78.5t-99 125t-37 164.5q0 69 18 136.5t49.5 126.5t69.5 116.5t81.5 117.5t83.5 119 t76.5 131t58.5 143zM344 710q-23 -33 -43.5 -70.5t-40.5 -102.5t-17 -123q1 -37 14.5 -69.5t30 -52t41 -37t38.5 -24.5t33 -15q21 -7 32 -1t13 22l6 34q2 10 -2.5 22t-13.5 19q-5 4 -14 12t-29.5 40.5t-32.5 73.5q-26 89 6 271q2 11 -6 11q-8 1 -15 -10z" />
|
|
||||||
<glyph unicode="" d="M1000 1013l108 115q2 1 5 2t13 2t20.5 -1t25 -9.5t28.5 -21.5q22 -22 27 -43t0 -32l-6 -10l-108 -115zM350 1100h400q50 0 105 -13l-187 -187h-368q-41 0 -70.5 -29.5t-29.5 -70.5v-500q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5v182l200 200v-332 q0 -165 -93.5 -257.5t-256.5 -92.5h-400q-165 0 -257.5 92.5t-92.5 257.5v400q0 165 92.5 257.5t257.5 92.5zM1009 803l-362 -362l-161 -50l55 170l355 355z" />
|
|
||||||
<glyph unicode="" d="M350 1100h361q-164 -146 -216 -200h-195q-41 0 -70.5 -29.5t-29.5 -70.5v-500q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5l200 153v-103q0 -165 -92.5 -257.5t-257.5 -92.5h-400q-165 0 -257.5 92.5t-92.5 257.5v400q0 165 92.5 257.5t257.5 92.5z M824 1073l339 -301q8 -7 8 -17.5t-8 -17.5l-340 -306q-7 -6 -12.5 -4t-6.5 11v203q-26 1 -54.5 0t-78.5 -7.5t-92 -17.5t-86 -35t-70 -57q10 59 33 108t51.5 81.5t65 58.5t68.5 40.5t67 24.5t56 13.5t40 4.5v210q1 10 6.5 12.5t13.5 -4.5z" />
|
|
||||||
<glyph unicode="" d="M350 1100h350q60 0 127 -23l-178 -177h-349q-41 0 -70.5 -29.5t-29.5 -70.5v-500q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5v69l200 200v-219q0 -165 -92.5 -257.5t-257.5 -92.5h-400q-165 0 -257.5 92.5t-92.5 257.5v400q0 165 92.5 257.5t257.5 92.5z M643 639l395 395q7 7 17.5 7t17.5 -7l101 -101q7 -7 7 -17.5t-7 -17.5l-531 -532q-7 -7 -17.5 -7t-17.5 7l-248 248q-7 7 -7 17.5t7 17.5l101 101q7 7 17.5 7t17.5 -7l111 -111q8 -7 18 -7t18 7z" />
|
|
||||||
<glyph unicode="" d="M318 918l264 264q8 8 18 8t18 -8l260 -264q7 -8 4.5 -13t-12.5 -5h-170v-200h200v173q0 10 5 12t13 -5l264 -260q8 -7 8 -17.5t-8 -17.5l-264 -265q-8 -7 -13 -5t-5 12v173h-200v-200h170q10 0 12.5 -5t-4.5 -13l-260 -264q-8 -8 -18 -8t-18 8l-264 264q-8 8 -5.5 13 t12.5 5h175v200h-200v-173q0 -10 -5 -12t-13 5l-264 265q-8 7 -8 17.5t8 17.5l264 260q8 7 13 5t5 -12v-173h200v200h-175q-10 0 -12.5 5t5.5 13z" />
|
|
||||||
<glyph unicode="" d="M250 1100h100q21 0 35.5 -14.5t14.5 -35.5v-438l464 453q15 14 25.5 10t10.5 -25v-1000q0 -21 -10.5 -25t-25.5 10l-464 453v-438q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v1000q0 21 14.5 35.5t35.5 14.5z" />
|
|
||||||
<glyph unicode="" d="M50 1100h100q21 0 35.5 -14.5t14.5 -35.5v-438l464 453q15 14 25.5 10t10.5 -25v-438l464 453q15 14 25.5 10t10.5 -25v-1000q0 -21 -10.5 -25t-25.5 10l-464 453v-438q0 -21 -10.5 -25t-25.5 10l-464 453v-438q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5 t-14.5 35.5v1000q0 21 14.5 35.5t35.5 14.5z" />
|
|
||||||
<glyph unicode="" d="M1200 1050v-1000q0 -21 -10.5 -25t-25.5 10l-464 453v-438q0 -21 -10.5 -25t-25.5 10l-492 480q-15 14 -15 35t15 35l492 480q15 14 25.5 10t10.5 -25v-438l464 453q15 14 25.5 10t10.5 -25z" />
|
|
||||||
<glyph unicode="" d="M243 1074l814 -498q18 -11 18 -26t-18 -26l-814 -498q-18 -11 -30.5 -4t-12.5 28v1000q0 21 12.5 28t30.5 -4z" />
|
|
||||||
<glyph unicode="" d="M250 1000h200q21 0 35.5 -14.5t14.5 -35.5v-800q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v800q0 21 14.5 35.5t35.5 14.5zM650 1000h200q21 0 35.5 -14.5t14.5 -35.5v-800q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v800 q0 21 14.5 35.5t35.5 14.5z" />
|
|
||||||
<glyph unicode="" d="M1100 950v-800q0 -21 -14.5 -35.5t-35.5 -14.5h-800q-21 0 -35.5 14.5t-14.5 35.5v800q0 21 14.5 35.5t35.5 14.5h800q21 0 35.5 -14.5t14.5 -35.5z" />
|
|
||||||
<glyph unicode="" d="M500 612v438q0 21 10.5 25t25.5 -10l492 -480q15 -14 15 -35t-15 -35l-492 -480q-15 -14 -25.5 -10t-10.5 25v438l-464 -453q-15 -14 -25.5 -10t-10.5 25v1000q0 21 10.5 25t25.5 -10z" />
|
|
||||||
<glyph unicode="" d="M1048 1102l100 1q20 0 35 -14.5t15 -35.5l5 -1000q0 -21 -14.5 -35.5t-35.5 -14.5l-100 -1q-21 0 -35.5 14.5t-14.5 35.5l-2 437l-463 -454q-14 -15 -24.5 -10.5t-10.5 25.5l-2 437l-462 -455q-15 -14 -25.5 -9.5t-10.5 24.5l-5 1000q0 21 10.5 25.5t25.5 -10.5l466 -450 l-2 438q0 20 10.5 24.5t25.5 -9.5l466 -451l-2 438q0 21 14.5 35.5t35.5 14.5z" />
|
|
||||||
<glyph unicode="" d="M850 1100h100q21 0 35.5 -14.5t14.5 -35.5v-1000q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v438l-464 -453q-15 -14 -25.5 -10t-10.5 25v1000q0 21 10.5 25t25.5 -10l464 -453v438q0 21 14.5 35.5t35.5 14.5z" />
|
|
||||||
<glyph unicode="" d="M686 1081l501 -540q15 -15 10.5 -26t-26.5 -11h-1042q-22 0 -26.5 11t10.5 26l501 540q15 15 36 15t36 -15zM150 400h1000q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1000q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5z" />
|
|
||||||
<glyph unicode="" d="M885 900l-352 -353l352 -353l-197 -198l-552 552l552 550z" />
|
|
||||||
<glyph unicode="" d="M1064 547l-551 -551l-198 198l353 353l-353 353l198 198z" />
|
|
||||||
<glyph unicode="" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM650 900h-100q-21 0 -35.5 -14.5t-14.5 -35.5v-150h-150 q-21 0 -35.5 -14.5t-14.5 -35.5v-100q0 -21 14.5 -35.5t35.5 -14.5h150v-150q0 -21 14.5 -35.5t35.5 -14.5h100q21 0 35.5 14.5t14.5 35.5v150h150q21 0 35.5 14.5t14.5 35.5v100q0 21 -14.5 35.5t-35.5 14.5h-150v150q0 21 -14.5 35.5t-35.5 14.5z" />
|
|
||||||
<glyph unicode="" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM850 700h-500q-21 0 -35.5 -14.5t-14.5 -35.5v-100q0 -21 14.5 -35.5 t35.5 -14.5h500q21 0 35.5 14.5t14.5 35.5v100q0 21 -14.5 35.5t-35.5 14.5z" />
|
|
||||||
<glyph unicode="" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM741.5 913q-12.5 0 -21.5 -9l-120 -120l-120 120q-9 9 -21.5 9 t-21.5 -9l-141 -141q-9 -9 -9 -21.5t9 -21.5l120 -120l-120 -120q-9 -9 -9 -21.5t9 -21.5l141 -141q9 -9 21.5 -9t21.5 9l120 120l120 -120q9 -9 21.5 -9t21.5 9l141 141q9 9 9 21.5t-9 21.5l-120 120l120 120q9 9 9 21.5t-9 21.5l-141 141q-9 9 -21.5 9z" />
|
|
||||||
<glyph unicode="" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM546 623l-84 85q-7 7 -17.5 7t-18.5 -7l-139 -139q-7 -8 -7 -18t7 -18 l242 -241q7 -8 17.5 -8t17.5 8l375 375q7 7 7 17.5t-7 18.5l-139 139q-7 7 -17.5 7t-17.5 -7z" />
|
|
||||||
<glyph unicode="" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM588 941q-29 0 -59 -5.5t-63 -20.5t-58 -38.5t-41.5 -63t-16.5 -89.5 q0 -25 20 -25h131q30 -5 35 11q6 20 20.5 28t45.5 8q20 0 31.5 -10.5t11.5 -28.5q0 -23 -7 -34t-26 -18q-1 0 -13.5 -4t-19.5 -7.5t-20 -10.5t-22 -17t-18.5 -24t-15.5 -35t-8 -46q-1 -8 5.5 -16.5t20.5 -8.5h173q7 0 22 8t35 28t37.5 48t29.5 74t12 100q0 47 -17 83 t-42.5 57t-59.5 34.5t-64 18t-59 4.5zM675 400h-150q-10 0 -17.5 -7.5t-7.5 -17.5v-150q0 -10 7.5 -17.5t17.5 -7.5h150q10 0 17.5 7.5t7.5 17.5v150q0 10 -7.5 17.5t-17.5 7.5z" />
|
|
||||||
<glyph unicode="" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM675 1000h-150q-10 0 -17.5 -7.5t-7.5 -17.5v-150q0 -10 7.5 -17.5 t17.5 -7.5h150q10 0 17.5 7.5t7.5 17.5v150q0 10 -7.5 17.5t-17.5 7.5zM675 700h-250q-10 0 -17.5 -7.5t-7.5 -17.5v-50q0 -10 7.5 -17.5t17.5 -7.5h75v-200h-75q-10 0 -17.5 -7.5t-7.5 -17.5v-50q0 -10 7.5 -17.5t17.5 -7.5h350q10 0 17.5 7.5t7.5 17.5v50q0 10 -7.5 17.5 t-17.5 7.5h-75v275q0 10 -7.5 17.5t-17.5 7.5z" />
|
|
||||||
<glyph unicode="" d="M525 1200h150q10 0 17.5 -7.5t7.5 -17.5v-194q103 -27 178.5 -102.5t102.5 -178.5h194q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-194q-27 -103 -102.5 -178.5t-178.5 -102.5v-194q0 -10 -7.5 -17.5t-17.5 -7.5h-150q-10 0 -17.5 7.5t-7.5 17.5v194 q-103 27 -178.5 102.5t-102.5 178.5h-194q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5h194q27 103 102.5 178.5t178.5 102.5v194q0 10 7.5 17.5t17.5 7.5zM700 893v-168q0 -10 -7.5 -17.5t-17.5 -7.5h-150q-10 0 -17.5 7.5t-7.5 17.5v168q-68 -23 -119 -74 t-74 -119h168q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-168q23 -68 74 -119t119 -74v168q0 10 7.5 17.5t17.5 7.5h150q10 0 17.5 -7.5t7.5 -17.5v-168q68 23 119 74t74 119h-168q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5h168 q-23 68 -74 119t-119 74z" />
|
|
||||||
<glyph unicode="" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM600 1027q-116 0 -214.5 -57t-155.5 -155.5t-57 -214.5t57 -214.5 t155.5 -155.5t214.5 -57t214.5 57t155.5 155.5t57 214.5t-57 214.5t-155.5 155.5t-214.5 57zM759 823l64 -64q7 -7 7 -17.5t-7 -17.5l-124 -124l124 -124q7 -7 7 -17.5t-7 -17.5l-64 -64q-7 -7 -17.5 -7t-17.5 7l-124 124l-124 -124q-7 -7 -17.5 -7t-17.5 7l-64 64 q-7 7 -7 17.5t7 17.5l124 124l-124 124q-7 7 -7 17.5t7 17.5l64 64q7 7 17.5 7t17.5 -7l124 -124l124 124q7 7 17.5 7t17.5 -7z" />
|
|
||||||
<glyph unicode="" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM600 1027q-116 0 -214.5 -57t-155.5 -155.5t-57 -214.5t57 -214.5 t155.5 -155.5t214.5 -57t214.5 57t155.5 155.5t57 214.5t-57 214.5t-155.5 155.5t-214.5 57zM782 788l106 -106q7 -7 7 -17.5t-7 -17.5l-320 -321q-8 -7 -18 -7t-18 7l-202 203q-8 7 -8 17.5t8 17.5l106 106q7 8 17.5 8t17.5 -8l79 -79l197 197q7 7 17.5 7t17.5 -7z" />
|
|
||||||
<glyph unicode="" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM600 1027q-116 0 -214.5 -57t-155.5 -155.5t-57 -214.5q0 -120 65 -225 l587 587q-105 65 -225 65zM965 819l-584 -584q104 -62 219 -62q116 0 214.5 57t155.5 155.5t57 214.5q0 115 -62 219z" />
|
|
||||||
<glyph unicode="" d="M39 582l522 427q16 13 27.5 8t11.5 -26v-291h550q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-550v-291q0 -21 -11.5 -26t-27.5 8l-522 427q-16 13 -16 32t16 32z" />
|
|
||||||
<glyph unicode="" d="M639 1009l522 -427q16 -13 16 -32t-16 -32l-522 -427q-16 -13 -27.5 -8t-11.5 26v291h-550q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5h550v291q0 21 11.5 26t27.5 -8z" />
|
|
||||||
<glyph unicode="" d="M682 1161l427 -522q13 -16 8 -27.5t-26 -11.5h-291v-550q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v550h-291q-21 0 -26 11.5t8 27.5l427 522q13 16 32 16t32 -16z" />
|
|
||||||
<glyph unicode="" d="M550 1200h200q21 0 35.5 -14.5t14.5 -35.5v-550h291q21 0 26 -11.5t-8 -27.5l-427 -522q-13 -16 -32 -16t-32 16l-427 522q-13 16 -8 27.5t26 11.5h291v550q0 21 14.5 35.5t35.5 14.5z" />
|
|
||||||
<glyph unicode="" d="M639 1109l522 -427q16 -13 16 -32t-16 -32l-522 -427q-16 -13 -27.5 -8t-11.5 26v291q-94 -2 -182 -20t-170.5 -52t-147 -92.5t-100.5 -135.5q5 105 27 193.5t67.5 167t113 135t167 91.5t225.5 42v262q0 21 11.5 26t27.5 -8z" />
|
|
||||||
<glyph unicode="" d="M850 1200h300q21 0 35.5 -14.5t14.5 -35.5v-300q0 -21 -10.5 -25t-24.5 10l-94 94l-249 -249q-8 -7 -18 -7t-18 7l-106 106q-7 8 -7 18t7 18l249 249l-94 94q-14 14 -10 24.5t25 10.5zM350 0h-300q-21 0 -35.5 14.5t-14.5 35.5v300q0 21 10.5 25t24.5 -10l94 -94l249 249 q8 7 18 7t18 -7l106 -106q7 -8 7 -18t-7 -18l-249 -249l94 -94q14 -14 10 -24.5t-25 -10.5z" />
|
|
||||||
<glyph unicode="" d="M1014 1120l106 -106q7 -8 7 -18t-7 -18l-249 -249l94 -94q14 -14 10 -24.5t-25 -10.5h-300q-21 0 -35.5 14.5t-14.5 35.5v300q0 21 10.5 25t24.5 -10l94 -94l249 249q8 7 18 7t18 -7zM250 600h300q21 0 35.5 -14.5t14.5 -35.5v-300q0 -21 -10.5 -25t-24.5 10l-94 94 l-249 -249q-8 -7 -18 -7t-18 7l-106 106q-7 8 -7 18t7 18l249 249l-94 94q-14 14 -10 24.5t25 10.5z" />
|
|
||||||
<glyph unicode="" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM704 900h-208q-20 0 -32 -14.5t-8 -34.5l58 -302q4 -20 21.5 -34.5 t37.5 -14.5h54q20 0 37.5 14.5t21.5 34.5l58 302q4 20 -8 34.5t-32 14.5zM675 400h-150q-10 0 -17.5 -7.5t-7.5 -17.5v-150q0 -10 7.5 -17.5t17.5 -7.5h150q10 0 17.5 7.5t7.5 17.5v150q0 10 -7.5 17.5t-17.5 7.5z" />
|
|
||||||
<glyph unicode="" d="M260 1200q9 0 19 -2t15 -4l5 -2q22 -10 44 -23l196 -118q21 -13 36 -24q29 -21 37 -12q11 13 49 35l196 118q22 13 45 23q17 7 38 7q23 0 47 -16.5t37 -33.5l13 -16q14 -21 18 -45l25 -123l8 -44q1 -9 8.5 -14.5t17.5 -5.5h61q10 0 17.5 -7.5t7.5 -17.5v-50 q0 -10 -7.5 -17.5t-17.5 -7.5h-50q-10 0 -17.5 -7.5t-7.5 -17.5v-175h-400v300h-200v-300h-400v175q0 10 -7.5 17.5t-17.5 7.5h-50q-10 0 -17.5 7.5t-7.5 17.5v50q0 10 7.5 17.5t17.5 7.5h61q11 0 18 3t7 8q0 4 9 52l25 128q5 25 19 45q2 3 5 7t13.5 15t21.5 19.5t26.5 15.5 t29.5 7zM915 1079l-166 -162q-7 -7 -5 -12t12 -5h219q10 0 15 7t2 17l-51 149q-3 10 -11 12t-15 -6zM463 917l-177 157q-8 7 -16 5t-11 -12l-51 -143q-3 -10 2 -17t15 -7h231q11 0 12.5 5t-5.5 12zM500 0h-375q-10 0 -17.5 7.5t-7.5 17.5v375h400v-400zM1100 400v-375 q0 -10 -7.5 -17.5t-17.5 -7.5h-375v400h400z" />
|
|
||||||
<glyph unicode="" d="M1165 1190q8 3 21 -6.5t13 -17.5q-2 -178 -24.5 -323.5t-55.5 -245.5t-87 -174.5t-102.5 -118.5t-118 -68.5t-118.5 -33t-120 -4.5t-105 9.5t-90 16.5q-61 12 -78 11q-4 1 -12.5 0t-34 -14.5t-52.5 -40.5l-153 -153q-26 -24 -37 -14.5t-11 43.5q0 64 42 102q8 8 50.5 45 t66.5 58q19 17 35 47t13 61q-9 55 -10 102.5t7 111t37 130t78 129.5q39 51 80 88t89.5 63.5t94.5 45t113.5 36t129 31t157.5 37t182 47.5zM1116 1098q-8 9 -22.5 -3t-45.5 -50q-38 -47 -119 -103.5t-142 -89.5l-62 -33q-56 -30 -102 -57t-104 -68t-102.5 -80.5t-85.5 -91 t-64 -104.5q-24 -56 -31 -86t2 -32t31.5 17.5t55.5 59.5q25 30 94 75.5t125.5 77.5t147.5 81q70 37 118.5 69t102 79.5t99 111t86.5 148.5q22 50 24 60t-6 19z" />
|
|
||||||
<glyph unicode="" d="M653 1231q-39 -67 -54.5 -131t-10.5 -114.5t24.5 -96.5t47.5 -80t63.5 -62.5t68.5 -46.5t65 -30q-4 7 -17.5 35t-18.5 39.5t-17 39.5t-17 43t-13 42t-9.5 44.5t-2 42t4 43t13.5 39t23 38.5q96 -42 165 -107.5t105 -138t52 -156t13 -159t-19 -149.5q-13 -55 -44 -106.5 t-68 -87t-78.5 -64.5t-72.5 -45t-53 -22q-72 -22 -127 -11q-31 6 -13 19q6 3 17 7q13 5 32.5 21t41 44t38.5 63.5t21.5 81.5t-6.5 94.5t-50 107t-104 115.5q10 -104 -0.5 -189t-37 -140.5t-65 -93t-84 -52t-93.5 -11t-95 24.5q-80 36 -131.5 114t-53.5 171q-2 23 0 49.5 t4.5 52.5t13.5 56t27.5 60t46 64.5t69.5 68.5q-8 -53 -5 -102.5t17.5 -90t34 -68.5t44.5 -39t49 -2q31 13 38.5 36t-4.5 55t-29 64.5t-36 75t-26 75.5q-15 85 2 161.5t53.5 128.5t85.5 92.5t93.5 61t81.5 25.5z" />
|
|
||||||
<glyph unicode="" d="M600 1094q82 0 160.5 -22.5t140 -59t116.5 -82.5t94.5 -95t68 -95t42.5 -82.5t14 -57.5t-14 -57.5t-43 -82.5t-68.5 -95t-94.5 -95t-116.5 -82.5t-140 -59t-159.5 -22.5t-159.5 22.5t-140 59t-116.5 82.5t-94.5 95t-68.5 95t-43 82.5t-14 57.5t14 57.5t42.5 82.5t68 95 t94.5 95t116.5 82.5t140 59t160.5 22.5zM888 829q-15 15 -18 12t5 -22q25 -57 25 -119q0 -124 -88 -212t-212 -88t-212 88t-88 212q0 59 23 114q8 19 4.5 22t-17.5 -12q-70 -69 -160 -184q-13 -16 -15 -40.5t9 -42.5q22 -36 47 -71t70 -82t92.5 -81t113 -58.5t133.5 -24.5 t133.5 24t113 58.5t92.5 81.5t70 81.5t47 70.5q11 18 9 42.5t-14 41.5q-90 117 -163 189zM448 727l-35 -36q-15 -15 -19.5 -38.5t4.5 -41.5q37 -68 93 -116q16 -13 38.5 -11t36.5 17l35 34q14 15 12.5 33.5t-16.5 33.5q-44 44 -89 117q-11 18 -28 20t-32 -12z" />
|
|
||||||
<glyph unicode="" d="M592 0h-148l31 120q-91 20 -175.5 68.5t-143.5 106.5t-103.5 119t-66.5 110t-22 76q0 21 14 57.5t42.5 82.5t68 95t94.5 95t116.5 82.5t140 59t160.5 22.5q61 0 126 -15l32 121h148zM944 770l47 181q108 -85 176.5 -192t68.5 -159q0 -26 -19.5 -71t-59.5 -102t-93 -112 t-129 -104.5t-158 -75.5l46 173q77 49 136 117t97 131q11 18 9 42.5t-14 41.5q-54 70 -107 130zM310 824q-70 -69 -160 -184q-13 -16 -15 -40.5t9 -42.5q18 -30 39 -60t57 -70.5t74 -73t90 -61t105 -41.5l41 154q-107 18 -178.5 101.5t-71.5 193.5q0 59 23 114q8 19 4.5 22 t-17.5 -12zM448 727l-35 -36q-15 -15 -19.5 -38.5t4.5 -41.5q37 -68 93 -116q16 -13 38.5 -11t36.5 17l12 11l22 86l-3 4q-44 44 -89 117q-11 18 -28 20t-32 -12z" />
|
|
||||||
<glyph unicode="" d="M-90 100l642 1066q20 31 48 28.5t48 -35.5l642 -1056q21 -32 7.5 -67.5t-50.5 -35.5h-1294q-37 0 -50.5 34t7.5 66zM155 200h345v75q0 10 7.5 17.5t17.5 7.5h150q10 0 17.5 -7.5t7.5 -17.5v-75h345l-445 723zM496 700h208q20 0 32 -14.5t8 -34.5l-58 -252 q-4 -20 -21.5 -34.5t-37.5 -14.5h-54q-20 0 -37.5 14.5t-21.5 34.5l-58 252q-4 20 8 34.5t32 14.5z" />
|
|
||||||
<glyph unicode="" d="M650 1200q62 0 106 -44t44 -106v-339l363 -325q15 -14 26 -38.5t11 -44.5v-41q0 -20 -12 -26.5t-29 5.5l-359 249v-263q100 -93 100 -113v-64q0 -21 -13 -29t-32 1l-205 128l-205 -128q-19 -9 -32 -1t-13 29v64q0 20 100 113v263l-359 -249q-17 -12 -29 -5.5t-12 26.5v41 q0 20 11 44.5t26 38.5l363 325v339q0 62 44 106t106 44z" />
|
|
||||||
<glyph unicode="" d="M850 1200h100q21 0 35.5 -14.5t14.5 -35.5v-50h50q21 0 35.5 -14.5t14.5 -35.5v-150h-1100v150q0 21 14.5 35.5t35.5 14.5h50v50q0 21 14.5 35.5t35.5 14.5h100q21 0 35.5 -14.5t14.5 -35.5v-50h500v50q0 21 14.5 35.5t35.5 14.5zM1100 800v-750q0 -21 -14.5 -35.5 t-35.5 -14.5h-1000q-21 0 -35.5 14.5t-14.5 35.5v750h1100zM100 600v-100h100v100h-100zM300 600v-100h100v100h-100zM500 600v-100h100v100h-100zM700 600v-100h100v100h-100zM900 600v-100h100v100h-100zM100 400v-100h100v100h-100zM300 400v-100h100v100h-100zM500 400 v-100h100v100h-100zM700 400v-100h100v100h-100zM900 400v-100h100v100h-100zM100 200v-100h100v100h-100zM300 200v-100h100v100h-100zM500 200v-100h100v100h-100zM700 200v-100h100v100h-100zM900 200v-100h100v100h-100z" />
|
|
||||||
<glyph unicode="" d="M1135 1165l249 -230q15 -14 15 -35t-15 -35l-249 -230q-14 -14 -24.5 -10t-10.5 25v150h-159l-600 -600h-291q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5h209l600 600h241v150q0 21 10.5 25t24.5 -10zM522 819l-141 -141l-122 122h-209q-21 0 -35.5 14.5 t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5h291zM1135 565l249 -230q15 -14 15 -35t-15 -35l-249 -230q-14 -14 -24.5 -10t-10.5 25v150h-241l-181 181l141 141l122 -122h159v150q0 21 10.5 25t24.5 -10z" />
|
|
||||||
<glyph unicode="" d="M100 1100h1000q41 0 70.5 -29.5t29.5 -70.5v-600q0 -41 -29.5 -70.5t-70.5 -29.5h-596l-304 -300v300h-100q-41 0 -70.5 29.5t-29.5 70.5v600q0 41 29.5 70.5t70.5 29.5z" />
|
|
||||||
<glyph unicode="" d="M150 1200h200q21 0 35.5 -14.5t14.5 -35.5v-250h-300v250q0 21 14.5 35.5t35.5 14.5zM850 1200h200q21 0 35.5 -14.5t14.5 -35.5v-250h-300v250q0 21 14.5 35.5t35.5 14.5zM1100 800v-300q0 -41 -3 -77.5t-15 -89.5t-32 -96t-58 -89t-89 -77t-129 -51t-174 -20t-174 20 t-129 51t-89 77t-58 89t-32 96t-15 89.5t-3 77.5v300h300v-250v-27v-42.5t1.5 -41t5 -38t10 -35t16.5 -30t25.5 -24.5t35 -19t46.5 -12t60 -4t60 4.5t46.5 12.5t35 19.5t25 25.5t17 30.5t10 35t5 38t2 40.5t-0.5 42v25v250h300z" />
|
|
||||||
<glyph unicode="" d="M1100 411l-198 -199l-353 353l-353 -353l-197 199l551 551z" />
|
|
||||||
<glyph unicode="" d="M1101 789l-550 -551l-551 551l198 199l353 -353l353 353z" />
|
|
||||||
<glyph unicode="" d="M404 1000h746q21 0 35.5 -14.5t14.5 -35.5v-551h150q21 0 25 -10.5t-10 -24.5l-230 -249q-14 -15 -35 -15t-35 15l-230 249q-14 14 -10 24.5t25 10.5h150v401h-381zM135 984l230 -249q14 -14 10 -24.5t-25 -10.5h-150v-400h385l215 -200h-750q-21 0 -35.5 14.5 t-14.5 35.5v550h-150q-21 0 -25 10.5t10 24.5l230 249q14 15 35 15t35 -15z" />
|
|
||||||
<glyph unicode="" d="M56 1200h94q17 0 31 -11t18 -27l38 -162h896q24 0 39 -18.5t10 -42.5l-100 -475q-5 -21 -27 -42.5t-55 -21.5h-633l48 -200h535q21 0 35.5 -14.5t14.5 -35.5t-14.5 -35.5t-35.5 -14.5h-50v-50q0 -21 -14.5 -35.5t-35.5 -14.5t-35.5 14.5t-14.5 35.5v50h-300v-50 q0 -21 -14.5 -35.5t-35.5 -14.5t-35.5 14.5t-14.5 35.5v50h-31q-18 0 -32.5 10t-20.5 19l-5 10l-201 961h-54q-20 0 -35 14.5t-15 35.5t15 35.5t35 14.5z" />
|
|
||||||
<glyph unicode="" d="M1200 1000v-100h-1200v100h200q0 41 29.5 70.5t70.5 29.5h300q41 0 70.5 -29.5t29.5 -70.5h500zM0 800h1200v-800h-1200v800z" />
|
|
||||||
<glyph unicode="" d="M200 800l-200 -400v600h200q0 41 29.5 70.5t70.5 29.5h300q42 0 71 -29.5t29 -70.5h500v-200h-1000zM1500 700l-300 -700h-1200l300 700h1200z" />
|
|
||||||
<glyph unicode="" d="M635 1184l230 -249q14 -14 10 -24.5t-25 -10.5h-150v-601h150q21 0 25 -10.5t-10 -24.5l-230 -249q-14 -15 -35 -15t-35 15l-230 249q-14 14 -10 24.5t25 10.5h150v601h-150q-21 0 -25 10.5t10 24.5l230 249q14 15 35 15t35 -15z" />
|
|
||||||
<glyph unicode="" d="M936 864l249 -229q14 -15 14 -35.5t-14 -35.5l-249 -229q-15 -15 -25.5 -10.5t-10.5 24.5v151h-600v-151q0 -20 -10.5 -24.5t-25.5 10.5l-249 229q-14 15 -14 35.5t14 35.5l249 229q15 15 25.5 10.5t10.5 -25.5v-149h600v149q0 21 10.5 25.5t25.5 -10.5z" />
|
|
||||||
<glyph unicode="" d="M1169 400l-172 732q-5 23 -23 45.5t-38 22.5h-672q-20 0 -38 -20t-23 -41l-172 -739h1138zM1100 300h-1000q-41 0 -70.5 -29.5t-29.5 -70.5v-100q0 -41 29.5 -70.5t70.5 -29.5h1000q41 0 70.5 29.5t29.5 70.5v100q0 41 -29.5 70.5t-70.5 29.5zM800 100v100h100v-100h-100 zM1000 100v100h100v-100h-100z" />
|
|
||||||
<glyph unicode="" d="M1150 1100q21 0 35.5 -14.5t14.5 -35.5v-850q0 -21 -14.5 -35.5t-35.5 -14.5t-35.5 14.5t-14.5 35.5v850q0 21 14.5 35.5t35.5 14.5zM1000 200l-675 200h-38l47 -276q3 -16 -5.5 -20t-29.5 -4h-7h-84q-20 0 -34.5 14t-18.5 35q-55 337 -55 351v250v6q0 16 1 23.5t6.5 14 t17.5 6.5h200l675 250v-850zM0 750v-250q-4 0 -11 0.5t-24 6t-30 15t-24 30t-11 48.5v50q0 26 10.5 46t25 30t29 16t25.5 7z" />
|
|
||||||
<glyph unicode="" d="M553 1200h94q20 0 29 -10.5t3 -29.5l-18 -37q83 -19 144 -82.5t76 -140.5l63 -327l118 -173h17q19 0 33 -14.5t14 -35t-13 -40.5t-31 -27q-8 -4 -23 -9.5t-65 -19.5t-103 -25t-132.5 -20t-158.5 -9q-57 0 -115 5t-104 12t-88.5 15.5t-73.5 17.5t-54.5 16t-35.5 12l-11 4 q-18 8 -31 28t-13 40.5t14 35t33 14.5h17l118 173l63 327q15 77 76 140t144 83l-18 32q-6 19 3.5 32t28.5 13zM498 110q50 -6 102 -6q53 0 102 6q-12 -49 -39.5 -79.5t-62.5 -30.5t-63 30.5t-39 79.5z" />
|
|
||||||
<glyph unicode="" d="M800 946l224 78l-78 -224l234 -45l-180 -155l180 -155l-234 -45l78 -224l-224 78l-45 -234l-155 180l-155 -180l-45 234l-224 -78l78 224l-234 45l180 155l-180 155l234 45l-78 224l224 -78l45 234l155 -180l155 180z" />
|
|
||||||
<glyph unicode="" d="M650 1200h50q40 0 70 -40.5t30 -84.5v-150l-28 -125h328q40 0 70 -40.5t30 -84.5v-100q0 -45 -29 -74l-238 -344q-16 -24 -38 -40.5t-45 -16.5h-250q-7 0 -42 25t-66 50l-31 25h-61q-45 0 -72.5 18t-27.5 57v400q0 36 20 63l145 196l96 198q13 28 37.5 48t51.5 20z M650 1100l-100 -212l-150 -213v-375h100l136 -100h214l250 375v125h-450l50 225v175h-50zM50 800h100q21 0 35.5 -14.5t14.5 -35.5v-500q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v500q0 21 14.5 35.5t35.5 14.5z" />
|
|
||||||
<glyph unicode="" d="M600 1100h250q23 0 45 -16.5t38 -40.5l238 -344q29 -29 29 -74v-100q0 -44 -30 -84.5t-70 -40.5h-328q28 -118 28 -125v-150q0 -44 -30 -84.5t-70 -40.5h-50q-27 0 -51.5 20t-37.5 48l-96 198l-145 196q-20 27 -20 63v400q0 39 27.5 57t72.5 18h61q124 100 139 100z M50 1000h100q21 0 35.5 -14.5t14.5 -35.5v-500q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v500q0 21 14.5 35.5t35.5 14.5zM636 1000l-136 -100h-100v-375l150 -213l100 -212h50v175l-50 225h450v125l-250 375h-214z" />
|
|
||||||
<glyph unicode="" d="M356 873l363 230q31 16 53 -6l110 -112q13 -13 13.5 -32t-11.5 -34l-84 -121h302q84 0 138 -38t54 -110t-55 -111t-139 -39h-106l-131 -339q-6 -21 -19.5 -41t-28.5 -20h-342q-7 0 -90 81t-83 94v525q0 17 14 35.5t28 28.5zM400 792v-503l100 -89h293l131 339 q6 21 19.5 41t28.5 20h203q21 0 30.5 25t0.5 50t-31 25h-456h-7h-6h-5.5t-6 0.5t-5 1.5t-5 2t-4 2.5t-4 4t-2.5 4.5q-12 25 5 47l146 183l-86 83zM50 800h100q21 0 35.5 -14.5t14.5 -35.5v-500q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v500 q0 21 14.5 35.5t35.5 14.5z" />
|
|
||||||
<glyph unicode="" d="M475 1103l366 -230q2 -1 6 -3.5t14 -10.5t18 -16.5t14.5 -20t6.5 -22.5v-525q0 -13 -86 -94t-93 -81h-342q-15 0 -28.5 20t-19.5 41l-131 339h-106q-85 0 -139.5 39t-54.5 111t54 110t138 38h302l-85 121q-11 15 -10.5 34t13.5 32l110 112q22 22 53 6zM370 945l146 -183 q17 -22 5 -47q-2 -2 -3.5 -4.5t-4 -4t-4 -2.5t-5 -2t-5 -1.5t-6 -0.5h-6h-6.5h-6h-475v-100h221q15 0 29 -20t20 -41l130 -339h294l106 89v503l-342 236zM1050 800h100q21 0 35.5 -14.5t14.5 -35.5v-500q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5 v500q0 21 14.5 35.5t35.5 14.5z" />
|
|
||||||
<glyph unicode="" d="M550 1294q72 0 111 -55t39 -139v-106l339 -131q21 -6 41 -19.5t20 -28.5v-342q0 -7 -81 -90t-94 -83h-525q-17 0 -35.5 14t-28.5 28l-9 14l-230 363q-16 31 6 53l112 110q13 13 32 13.5t34 -11.5l121 -84v302q0 84 38 138t110 54zM600 972v203q0 21 -25 30.5t-50 0.5 t-25 -31v-456v-7v-6v-5.5t-0.5 -6t-1.5 -5t-2 -5t-2.5 -4t-4 -4t-4.5 -2.5q-25 -12 -47 5l-183 146l-83 -86l236 -339h503l89 100v293l-339 131q-21 6 -41 19.5t-20 28.5zM450 200h500q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-500 q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5z" />
|
|
||||||
<glyph unicode="" d="M350 1100h500q21 0 35.5 14.5t14.5 35.5v100q0 21 -14.5 35.5t-35.5 14.5h-500q-21 0 -35.5 -14.5t-14.5 -35.5v-100q0 -21 14.5 -35.5t35.5 -14.5zM600 306v-106q0 -84 -39 -139t-111 -55t-110 54t-38 138v302l-121 -84q-15 -12 -34 -11.5t-32 13.5l-112 110 q-22 22 -6 53l230 363q1 2 3.5 6t10.5 13.5t16.5 17t20 13.5t22.5 6h525q13 0 94 -83t81 -90v-342q0 -15 -20 -28.5t-41 -19.5zM308 900l-236 -339l83 -86l183 146q22 17 47 5q2 -1 4.5 -2.5t4 -4t2.5 -4t2 -5t1.5 -5t0.5 -6v-5.5v-6v-7v-456q0 -22 25 -31t50 0.5t25 30.5 v203q0 15 20 28.5t41 19.5l339 131v293l-89 100h-503z" />
|
|
||||||
<glyph unicode="" d="M600 1178q118 0 225 -45.5t184.5 -123t123 -184.5t45.5 -225t-45.5 -225t-123 -184.5t-184.5 -123t-225 -45.5t-225 45.5t-184.5 123t-123 184.5t-45.5 225t45.5 225t123 184.5t184.5 123t225 45.5zM914 632l-275 223q-16 13 -27.5 8t-11.5 -26v-137h-275 q-10 0 -17.5 -7.5t-7.5 -17.5v-150q0 -10 7.5 -17.5t17.5 -7.5h275v-137q0 -21 11.5 -26t27.5 8l275 223q16 13 16 32t-16 32z" />
|
|
||||||
<glyph unicode="" d="M600 1178q118 0 225 -45.5t184.5 -123t123 -184.5t45.5 -225t-45.5 -225t-123 -184.5t-184.5 -123t-225 -45.5t-225 45.5t-184.5 123t-123 184.5t-45.5 225t45.5 225t123 184.5t184.5 123t225 45.5zM561 855l-275 -223q-16 -13 -16 -32t16 -32l275 -223q16 -13 27.5 -8 t11.5 26v137h275q10 0 17.5 7.5t7.5 17.5v150q0 10 -7.5 17.5t-17.5 7.5h-275v137q0 21 -11.5 26t-27.5 -8z" />
|
|
||||||
<glyph unicode="" d="M600 1178q118 0 225 -45.5t184.5 -123t123 -184.5t45.5 -225t-45.5 -225t-123 -184.5t-184.5 -123t-225 -45.5t-225 45.5t-184.5 123t-123 184.5t-45.5 225t45.5 225t123 184.5t184.5 123t225 45.5zM855 639l-223 275q-13 16 -32 16t-32 -16l-223 -275q-13 -16 -8 -27.5 t26 -11.5h137v-275q0 -10 7.5 -17.5t17.5 -7.5h150q10 0 17.5 7.5t7.5 17.5v275h137q21 0 26 11.5t-8 27.5z" />
|
|
||||||
<glyph unicode="" d="M600 1178q118 0 225 -45.5t184.5 -123t123 -184.5t45.5 -225t-45.5 -225t-123 -184.5t-184.5 -123t-225 -45.5t-225 45.5t-184.5 123t-123 184.5t-45.5 225t45.5 225t123 184.5t184.5 123t225 45.5zM675 900h-150q-10 0 -17.5 -7.5t-7.5 -17.5v-275h-137q-21 0 -26 -11.5 t8 -27.5l223 -275q13 -16 32 -16t32 16l223 275q13 16 8 27.5t-26 11.5h-137v275q0 10 -7.5 17.5t-17.5 7.5z" />
|
|
||||||
<glyph unicode="" d="M600 1176q116 0 222.5 -46t184 -123.5t123.5 -184t46 -222.5t-46 -222.5t-123.5 -184t-184 -123.5t-222.5 -46t-222.5 46t-184 123.5t-123.5 184t-46 222.5t46 222.5t123.5 184t184 123.5t222.5 46zM627 1101q-15 -12 -36.5 -20.5t-35.5 -12t-43 -8t-39 -6.5 q-15 -3 -45.5 0t-45.5 -2q-20 -7 -51.5 -26.5t-34.5 -34.5q-3 -11 6.5 -22.5t8.5 -18.5q-3 -34 -27.5 -91t-29.5 -79q-9 -34 5 -93t8 -87q0 -9 17 -44.5t16 -59.5q12 0 23 -5t23.5 -15t19.5 -14q16 -8 33 -15t40.5 -15t34.5 -12q21 -9 52.5 -32t60 -38t57.5 -11 q7 -15 -3 -34t-22.5 -40t-9.5 -38q13 -21 23 -34.5t27.5 -27.5t36.5 -18q0 -7 -3.5 -16t-3.5 -14t5 -17q104 -2 221 112q30 29 46.5 47t34.5 49t21 63q-13 8 -37 8.5t-36 7.5q-15 7 -49.5 15t-51.5 19q-18 0 -41 -0.5t-43 -1.5t-42 -6.5t-38 -16.5q-51 -35 -66 -12 q-4 1 -3.5 25.5t0.5 25.5q-6 13 -26.5 17.5t-24.5 6.5q1 15 -0.5 30.5t-7 28t-18.5 11.5t-31 -21q-23 -25 -42 4q-19 28 -8 58q6 16 22 22q6 -1 26 -1.5t33.5 -4t19.5 -13.5q7 -12 18 -24t21.5 -20.5t20 -15t15.5 -10.5l5 -3q2 12 7.5 30.5t8 34.5t-0.5 32q-3 18 3.5 29 t18 22.5t15.5 24.5q6 14 10.5 35t8 31t15.5 22.5t34 22.5q-6 18 10 36q8 0 24 -1.5t24.5 -1.5t20 4.5t20.5 15.5q-10 23 -31 42.5t-37.5 29.5t-49 27t-43.5 23q0 1 2 8t3 11.5t1.5 10.5t-1 9.5t-4.5 4.5q31 -13 58.5 -14.5t38.5 2.5l12 5q5 28 -9.5 46t-36.5 24t-50 15 t-41 20q-18 -4 -37 0zM613 994q0 -17 8 -42t17 -45t9 -23q-8 1 -39.5 5.5t-52.5 10t-37 16.5q3 11 16 29.5t16 25.5q10 -10 19 -10t14 6t13.5 14.5t16.5 12.5z" />
|
|
||||||
<glyph unicode="" d="M756 1157q164 92 306 -9l-259 -138l145 -232l251 126q6 -89 -34 -156.5t-117 -110.5q-60 -34 -127 -39.5t-126 16.5l-596 -596q-15 -16 -36.5 -16t-36.5 16l-111 110q-15 15 -15 36.5t15 37.5l600 599q-34 101 5.5 201.5t135.5 154.5z" />
|
|
||||||
<glyph unicode="" horiz-adv-x="1220" d="M100 1196h1000q41 0 70.5 -29.5t29.5 -70.5v-100q0 -41 -29.5 -70.5t-70.5 -29.5h-1000q-41 0 -70.5 29.5t-29.5 70.5v100q0 41 29.5 70.5t70.5 29.5zM1100 1096h-200v-100h200v100zM100 796h1000q41 0 70.5 -29.5t29.5 -70.5v-100q0 -41 -29.5 -70.5t-70.5 -29.5h-1000 q-41 0 -70.5 29.5t-29.5 70.5v100q0 41 29.5 70.5t70.5 29.5zM1100 696h-500v-100h500v100zM100 396h1000q41 0 70.5 -29.5t29.5 -70.5v-100q0 -41 -29.5 -70.5t-70.5 -29.5h-1000q-41 0 -70.5 29.5t-29.5 70.5v100q0 41 29.5 70.5t70.5 29.5zM1100 296h-300v-100h300v100z " />
|
|
||||||
<glyph unicode="" d="M150 1200h900q21 0 35.5 -14.5t14.5 -35.5t-14.5 -35.5t-35.5 -14.5h-900q-21 0 -35.5 14.5t-14.5 35.5t14.5 35.5t35.5 14.5zM700 500v-300l-200 -200v500l-350 500h900z" />
|
|
||||||
<glyph unicode="" d="M500 1200h200q41 0 70.5 -29.5t29.5 -70.5v-100h300q41 0 70.5 -29.5t29.5 -70.5v-400h-500v100h-200v-100h-500v400q0 41 29.5 70.5t70.5 29.5h300v100q0 41 29.5 70.5t70.5 29.5zM500 1100v-100h200v100h-200zM1200 400v-200q0 -41 -29.5 -70.5t-70.5 -29.5h-1000 q-41 0 -70.5 29.5t-29.5 70.5v200h1200z" />
|
|
||||||
<glyph unicode="" d="M50 1200h300q21 0 25 -10.5t-10 -24.5l-94 -94l199 -199q7 -8 7 -18t-7 -18l-106 -106q-8 -7 -18 -7t-18 7l-199 199l-94 -94q-14 -14 -24.5 -10t-10.5 25v300q0 21 14.5 35.5t35.5 14.5zM850 1200h300q21 0 35.5 -14.5t14.5 -35.5v-300q0 -21 -10.5 -25t-24.5 10l-94 94 l-199 -199q-8 -7 -18 -7t-18 7l-106 106q-7 8 -7 18t7 18l199 199l-94 94q-14 14 -10 24.5t25 10.5zM364 470l106 -106q7 -8 7 -18t-7 -18l-199 -199l94 -94q14 -14 10 -24.5t-25 -10.5h-300q-21 0 -35.5 14.5t-14.5 35.5v300q0 21 10.5 25t24.5 -10l94 -94l199 199 q8 7 18 7t18 -7zM1071 271l94 94q14 14 24.5 10t10.5 -25v-300q0 -21 -14.5 -35.5t-35.5 -14.5h-300q-21 0 -25 10.5t10 24.5l94 94l-199 199q-7 8 -7 18t7 18l106 106q8 7 18 7t18 -7z" />
|
|
||||||
<glyph unicode="" d="M596 1192q121 0 231.5 -47.5t190 -127t127 -190t47.5 -231.5t-47.5 -231.5t-127 -190.5t-190 -127t-231.5 -47t-231.5 47t-190.5 127t-127 190.5t-47 231.5t47 231.5t127 190t190.5 127t231.5 47.5zM596 1010q-112 0 -207.5 -55.5t-151 -151t-55.5 -207.5t55.5 -207.5 t151 -151t207.5 -55.5t207.5 55.5t151 151t55.5 207.5t-55.5 207.5t-151 151t-207.5 55.5zM454.5 905q22.5 0 38.5 -16t16 -38.5t-16 -39t-38.5 -16.5t-38.5 16.5t-16 39t16 38.5t38.5 16zM754.5 905q22.5 0 38.5 -16t16 -38.5t-16 -39t-38 -16.5q-14 0 -29 10l-55 -145 q17 -23 17 -51q0 -36 -25.5 -61.5t-61.5 -25.5t-61.5 25.5t-25.5 61.5q0 32 20.5 56.5t51.5 29.5l122 126l1 1q-9 14 -9 28q0 23 16 39t38.5 16zM345.5 709q22.5 0 38.5 -16t16 -38.5t-16 -38.5t-38.5 -16t-38.5 16t-16 38.5t16 38.5t38.5 16zM854.5 709q22.5 0 38.5 -16 t16 -38.5t-16 -38.5t-38.5 -16t-38.5 16t-16 38.5t16 38.5t38.5 16z" />
|
|
||||||
<glyph unicode="" d="M546 173l469 470q91 91 99 192q7 98 -52 175.5t-154 94.5q-22 4 -47 4q-34 0 -66.5 -10t-56.5 -23t-55.5 -38t-48 -41.5t-48.5 -47.5q-376 -375 -391 -390q-30 -27 -45 -41.5t-37.5 -41t-32 -46.5t-16 -47.5t-1.5 -56.5q9 -62 53.5 -95t99.5 -33q74 0 125 51l548 548 q36 36 20 75q-7 16 -21.5 26t-32.5 10q-26 0 -50 -23q-13 -12 -39 -38l-341 -338q-15 -15 -35.5 -15.5t-34.5 13.5t-14 34.5t14 34.5q327 333 361 367q35 35 67.5 51.5t78.5 16.5q14 0 29 -1q44 -8 74.5 -35.5t43.5 -68.5q14 -47 2 -96.5t-47 -84.5q-12 -11 -32 -32 t-79.5 -81t-114.5 -115t-124.5 -123.5t-123 -119.5t-96.5 -89t-57 -45q-56 -27 -120 -27q-70 0 -129 32t-93 89q-48 78 -35 173t81 163l511 511q71 72 111 96q91 55 198 55q80 0 152 -33q78 -36 129.5 -103t66.5 -154q17 -93 -11 -183.5t-94 -156.5l-482 -476 q-15 -15 -36 -16t-37 14t-17.5 34t14.5 35z" />
|
|
||||||
<glyph unicode="" d="M649 949q48 68 109.5 104t121.5 38.5t118.5 -20t102.5 -64t71 -100.5t27 -123q0 -57 -33.5 -117.5t-94 -124.5t-126.5 -127.5t-150 -152.5t-146 -174q-62 85 -145.5 174t-150 152.5t-126.5 127.5t-93.5 124.5t-33.5 117.5q0 64 28 123t73 100.5t104 64t119 20 t120.5 -38.5t104.5 -104zM896 972q-33 0 -64.5 -19t-56.5 -46t-47.5 -53.5t-43.5 -45.5t-37.5 -19t-36 19t-40 45.5t-43 53.5t-54 46t-65.5 19q-67 0 -122.5 -55.5t-55.5 -132.5q0 -23 13.5 -51t46 -65t57.5 -63t76 -75l22 -22q15 -14 44 -44t50.5 -51t46 -44t41 -35t23 -12 t23.5 12t42.5 36t46 44t52.5 52t44 43q4 4 12 13q43 41 63.5 62t52 55t46 55t26 46t11.5 44q0 79 -53 133.5t-120 54.5z" />
|
|
||||||
<glyph unicode="" d="M776.5 1214q93.5 0 159.5 -66l141 -141q66 -66 66 -160q0 -42 -28 -95.5t-62 -87.5l-29 -29q-31 53 -77 99l-18 18l95 95l-247 248l-389 -389l212 -212l-105 -106l-19 18l-141 141q-66 66 -66 159t66 159l283 283q65 66 158.5 66zM600 706l105 105q10 -8 19 -17l141 -141 q66 -66 66 -159t-66 -159l-283 -283q-66 -66 -159 -66t-159 66l-141 141q-66 66 -66 159.5t66 159.5l55 55q29 -55 75 -102l18 -17l-95 -95l247 -248l389 389z" />
|
|
||||||
<glyph unicode="" d="M603 1200q85 0 162 -15t127 -38t79 -48t29 -46v-953q0 -41 -29.5 -70.5t-70.5 -29.5h-600q-41 0 -70.5 29.5t-29.5 70.5v953q0 21 30 46.5t81 48t129 37.5t163 15zM300 1000v-700h600v700h-600zM600 254q-43 0 -73.5 -30.5t-30.5 -73.5t30.5 -73.5t73.5 -30.5t73.5 30.5 t30.5 73.5t-30.5 73.5t-73.5 30.5z" />
|
|
||||||
<glyph unicode="" d="M902 1185l283 -282q15 -15 15 -36t-14.5 -35.5t-35.5 -14.5t-35 15l-36 35l-279 -267v-300l-212 210l-308 -307l-280 -203l203 280l307 308l-210 212h300l267 279l-35 36q-15 14 -15 35t14.5 35.5t35.5 14.5t35 -15z" />
|
|
||||||
<glyph unicode="" d="M700 1248v-78q38 -5 72.5 -14.5t75.5 -31.5t71 -53.5t52 -84t24 -118.5h-159q-4 36 -10.5 59t-21 45t-40 35.5t-64.5 20.5v-307l64 -13q34 -7 64 -16.5t70 -32t67.5 -52.5t47.5 -80t20 -112q0 -139 -89 -224t-244 -97v-77h-100v79q-150 16 -237 103q-40 40 -52.5 93.5 t-15.5 139.5h139q5 -77 48.5 -126t117.5 -65v335l-27 8q-46 14 -79 26.5t-72 36t-63 52t-40 72.5t-16 98q0 70 25 126t67.5 92t94.5 57t110 27v77h100zM600 754v274q-29 -4 -50 -11t-42 -21.5t-31.5 -41.5t-10.5 -65q0 -29 7 -50.5t16.5 -34t28.5 -22.5t31.5 -14t37.5 -10 q9 -3 13 -4zM700 547v-310q22 2 42.5 6.5t45 15.5t41.5 27t29 42t12 59.5t-12.5 59.5t-38 44.5t-53 31t-66.5 24.5z" />
|
|
||||||
<glyph unicode="" d="M561 1197q84 0 160.5 -40t123.5 -109.5t47 -147.5h-153q0 40 -19.5 71.5t-49.5 48.5t-59.5 26t-55.5 9q-37 0 -79 -14.5t-62 -35.5q-41 -44 -41 -101q0 -26 13.5 -63t26.5 -61t37 -66q6 -9 9 -14h241v-100h-197q8 -50 -2.5 -115t-31.5 -95q-45 -62 -99 -112 q34 10 83 17.5t71 7.5q32 1 102 -16t104 -17q83 0 136 30l50 -147q-31 -19 -58 -30.5t-55 -15.5t-42 -4.5t-46 -0.5q-23 0 -76 17t-111 32.5t-96 11.5q-39 -3 -82 -16t-67 -25l-23 -11l-55 145q4 3 16 11t15.5 10.5t13 9t15.5 12t14.5 14t17.5 18.5q48 55 54 126.5 t-30 142.5h-221v100h166q-23 47 -44 104q-7 20 -12 41.5t-6 55.5t6 66.5t29.5 70.5t58.5 71q97 88 263 88z" />
|
|
||||||
<glyph unicode="" d="M400 300h150q21 0 25 -11t-10 -25l-230 -250q-14 -15 -35 -15t-35 15l-230 250q-14 14 -10 25t25 11h150v900h200v-900zM935 1184l230 -249q14 -14 10 -24.5t-25 -10.5h-150v-900h-200v900h-150q-21 0 -25 10.5t10 24.5l230 249q14 15 35 15t35 -15z" />
|
|
||||||
<glyph unicode="" d="M1000 700h-100v100h-100v-100h-100v500h300v-500zM400 300h150q21 0 25 -11t-10 -25l-230 -250q-14 -15 -35 -15t-35 15l-230 250q-14 14 -10 25t25 11h150v900h200v-900zM801 1100v-200h100v200h-100zM1000 350l-200 -250h200v-100h-300v150l200 250h-200v100h300v-150z " />
|
|
||||||
<glyph unicode="" d="M400 300h150q21 0 25 -11t-10 -25l-230 -250q-14 -15 -35 -15t-35 15l-230 250q-14 14 -10 25t25 11h150v900h200v-900zM1000 1050l-200 -250h200v-100h-300v150l200 250h-200v100h300v-150zM1000 0h-100v100h-100v-100h-100v500h300v-500zM801 400v-200h100v200h-100z " />
|
|
||||||
<glyph unicode="" d="M400 300h150q21 0 25 -11t-10 -25l-230 -250q-14 -15 -35 -15t-35 15l-230 250q-14 14 -10 25t25 11h150v900h200v-900zM1000 700h-100v400h-100v100h200v-500zM1100 0h-100v100h-200v400h300v-500zM901 400v-200h100v200h-100z" />
|
|
||||||
<glyph unicode="" d="M400 300h150q21 0 25 -11t-10 -25l-230 -250q-14 -15 -35 -15t-35 15l-230 250q-14 14 -10 25t25 11h150v900h200v-900zM1100 700h-100v100h-200v400h300v-500zM901 1100v-200h100v200h-100zM1000 0h-100v400h-100v100h200v-500z" />
|
|
||||||
<glyph unicode="" d="M400 300h150q21 0 25 -11t-10 -25l-230 -250q-14 -15 -35 -15t-35 15l-230 250q-14 14 -10 25t25 11h150v900h200v-900zM900 1000h-200v200h200v-200zM1000 700h-300v200h300v-200zM1100 400h-400v200h400v-200zM1200 100h-500v200h500v-200z" />
|
|
||||||
<glyph unicode="" d="M400 300h150q21 0 25 -11t-10 -25l-230 -250q-14 -15 -35 -15t-35 15l-230 250q-14 14 -10 25t25 11h150v900h200v-900zM1200 1000h-500v200h500v-200zM1100 700h-400v200h400v-200zM1000 400h-300v200h300v-200zM900 100h-200v200h200v-200z" />
|
|
||||||
<glyph unicode="" d="M350 1100h400q162 0 256 -93.5t94 -256.5v-400q0 -165 -93.5 -257.5t-256.5 -92.5h-400q-165 0 -257.5 92.5t-92.5 257.5v400q0 165 92.5 257.5t257.5 92.5zM800 900h-500q-41 0 -70.5 -29.5t-29.5 -70.5v-500q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5 v500q0 41 -29.5 70.5t-70.5 29.5z" />
|
|
||||||
<glyph unicode="" d="M350 1100h400q165 0 257.5 -92.5t92.5 -257.5v-400q0 -165 -92.5 -257.5t-257.5 -92.5h-400q-163 0 -256.5 92.5t-93.5 257.5v400q0 163 94 256.5t256 93.5zM800 900h-500q-41 0 -70.5 -29.5t-29.5 -70.5v-500q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5 v500q0 41 -29.5 70.5t-70.5 29.5zM440 770l253 -190q17 -12 17 -30t-17 -30l-253 -190q-16 -12 -28 -6.5t-12 26.5v400q0 21 12 26.5t28 -6.5z" />
|
|
||||||
<glyph unicode="" d="M350 1100h400q163 0 256.5 -94t93.5 -256v-400q0 -165 -92.5 -257.5t-257.5 -92.5h-400q-165 0 -257.5 92.5t-92.5 257.5v400q0 163 92.5 256.5t257.5 93.5zM800 900h-500q-41 0 -70.5 -29.5t-29.5 -70.5v-500q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5 v500q0 41 -29.5 70.5t-70.5 29.5zM350 700h400q21 0 26.5 -12t-6.5 -28l-190 -253q-12 -17 -30 -17t-30 17l-190 253q-12 16 -6.5 28t26.5 12z" />
|
|
||||||
<glyph unicode="" d="M350 1100h400q165 0 257.5 -92.5t92.5 -257.5v-400q0 -163 -92.5 -256.5t-257.5 -93.5h-400q-163 0 -256.5 94t-93.5 256v400q0 165 92.5 257.5t257.5 92.5zM800 900h-500q-41 0 -70.5 -29.5t-29.5 -70.5v-500q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5 v500q0 41 -29.5 70.5t-70.5 29.5zM580 693l190 -253q12 -16 6.5 -28t-26.5 -12h-400q-21 0 -26.5 12t6.5 28l190 253q12 17 30 17t30 -17z" />
|
|
||||||
<glyph unicode="" d="M550 1100h400q165 0 257.5 -92.5t92.5 -257.5v-400q0 -165 -92.5 -257.5t-257.5 -92.5h-400q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5h450q41 0 70.5 29.5t29.5 70.5v500q0 41 -29.5 70.5t-70.5 29.5h-450q-21 0 -35.5 14.5t-14.5 35.5v100 q0 21 14.5 35.5t35.5 14.5zM338 867l324 -284q16 -14 16 -33t-16 -33l-324 -284q-16 -14 -27 -9t-11 26v150h-250q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5h250v150q0 21 11 26t27 -9z" />
|
|
||||||
<glyph unicode="" d="M793 1182l9 -9q8 -10 5 -27q-3 -11 -79 -225.5t-78 -221.5l300 1q24 0 32.5 -17.5t-5.5 -35.5q-1 0 -133.5 -155t-267 -312.5t-138.5 -162.5q-12 -15 -26 -15h-9l-9 8q-9 11 -4 32q2 9 42 123.5t79 224.5l39 110h-302q-23 0 -31 19q-10 21 6 41q75 86 209.5 237.5 t228 257t98.5 111.5q9 16 25 16h9z" />
|
|
||||||
<glyph unicode="" d="M350 1100h400q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-450q-41 0 -70.5 -29.5t-29.5 -70.5v-500q0 -41 29.5 -70.5t70.5 -29.5h450q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-165 0 -257.5 92.5t-92.5 257.5v400 q0 165 92.5 257.5t257.5 92.5zM938 867l324 -284q16 -14 16 -33t-16 -33l-324 -284q-16 -14 -27 -9t-11 26v150h-250q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5h250v150q0 21 11 26t27 -9z" />
|
|
||||||
<glyph unicode="" d="M750 1200h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -10.5 -25t-24.5 10l-109 109l-312 -312q-15 -15 -35.5 -15t-35.5 15l-141 141q-15 15 -15 35.5t15 35.5l312 312l-109 109q-14 14 -10 24.5t25 10.5zM456 900h-156q-41 0 -70.5 -29.5t-29.5 -70.5v-500 q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5v148l200 200v-298q0 -165 -93.5 -257.5t-256.5 -92.5h-400q-165 0 -257.5 92.5t-92.5 257.5v400q0 165 92.5 257.5t257.5 92.5h300z" />
|
|
||||||
<glyph unicode="" d="M600 1186q119 0 227.5 -46.5t187 -125t125 -187t46.5 -227.5t-46.5 -227.5t-125 -187t-187 -125t-227.5 -46.5t-227.5 46.5t-187 125t-125 187t-46.5 227.5t46.5 227.5t125 187t187 125t227.5 46.5zM600 1022q-115 0 -212 -56.5t-153.5 -153.5t-56.5 -212t56.5 -212 t153.5 -153.5t212 -56.5t212 56.5t153.5 153.5t56.5 212t-56.5 212t-153.5 153.5t-212 56.5zM600 794q80 0 137 -57t57 -137t-57 -137t-137 -57t-137 57t-57 137t57 137t137 57z" />
|
|
||||||
<glyph unicode="" d="M450 1200h200q21 0 35.5 -14.5t14.5 -35.5v-350h245q20 0 25 -11t-9 -26l-383 -426q-14 -15 -33.5 -15t-32.5 15l-379 426q-13 15 -8.5 26t25.5 11h250v350q0 21 14.5 35.5t35.5 14.5zM50 300h1000q21 0 35.5 -14.5t14.5 -35.5v-250h-1100v250q0 21 14.5 35.5t35.5 14.5z M900 200v-50h100v50h-100z" />
|
|
||||||
<glyph unicode="" d="M583 1182l378 -435q14 -15 9 -31t-26 -16h-244v-250q0 -20 -17 -35t-39 -15h-200q-20 0 -32 14.5t-12 35.5v250h-250q-20 0 -25.5 16.5t8.5 31.5l383 431q14 16 33.5 17t33.5 -14zM50 300h1000q21 0 35.5 -14.5t14.5 -35.5v-250h-1100v250q0 21 14.5 35.5t35.5 14.5z M900 200v-50h100v50h-100z" />
|
|
||||||
<glyph unicode="" d="M396 723l369 369q7 7 17.5 7t17.5 -7l139 -139q7 -8 7 -18.5t-7 -17.5l-525 -525q-7 -8 -17.5 -8t-17.5 8l-292 291q-7 8 -7 18t7 18l139 139q8 7 18.5 7t17.5 -7zM50 300h1000q21 0 35.5 -14.5t14.5 -35.5v-250h-1100v250q0 21 14.5 35.5t35.5 14.5zM900 200v-50h100v50 h-100z" />
|
|
||||||
<glyph unicode="" d="M135 1023l142 142q14 14 35 14t35 -14l77 -77l-212 -212l-77 76q-14 15 -14 36t14 35zM655 855l210 210q14 14 24.5 10t10.5 -25l-2 -599q-1 -20 -15.5 -35t-35.5 -15l-597 -1q-21 0 -25 10.5t10 24.5l208 208l-154 155l212 212zM50 300h1000q21 0 35.5 -14.5t14.5 -35.5 v-250h-1100v250q0 21 14.5 35.5t35.5 14.5zM900 200v-50h100v50h-100z" />
|
|
||||||
<glyph unicode="" d="M350 1200l599 -2q20 -1 35 -15.5t15 -35.5l1 -597q0 -21 -10.5 -25t-24.5 10l-208 208l-155 -154l-212 212l155 154l-210 210q-14 14 -10 24.5t25 10.5zM524 512l-76 -77q-15 -14 -36 -14t-35 14l-142 142q-14 14 -14 35t14 35l77 77zM50 300h1000q21 0 35.5 -14.5 t14.5 -35.5v-250h-1100v250q0 21 14.5 35.5t35.5 14.5zM900 200v-50h100v50h-100z" />
|
|
||||||
<glyph unicode="" d="M1200 103l-483 276l-314 -399v423h-399l1196 796v-1096zM483 424v-230l683 953z" />
|
|
||||||
<glyph unicode="" d="M1100 1000v-850q0 -21 -14.5 -35.5t-35.5 -14.5h-150v400h-700v-400h-150q-21 0 -35.5 14.5t-14.5 35.5v1000q0 20 14.5 35t35.5 15h250v-300h500v300h100zM700 1000h-100v200h100v-200z" />
|
|
||||||
<glyph unicode="" d="M1100 1000l-2 -149l-299 -299l-95 95q-9 9 -21.5 9t-21.5 -9l-149 -147h-312v-400h-150q-21 0 -35.5 14.5t-14.5 35.5v1000q0 20 14.5 35t35.5 15h250v-300h500v300h100zM700 1000h-100v200h100v-200zM1132 638l106 -106q7 -7 7 -17.5t-7 -17.5l-420 -421q-8 -7 -18 -7 t-18 7l-202 203q-8 7 -8 17.5t8 17.5l106 106q7 8 17.5 8t17.5 -8l79 -79l297 297q7 7 17.5 7t17.5 -7z" />
|
|
||||||
<glyph unicode="" d="M1100 1000v-269l-103 -103l-134 134q-15 15 -33.5 16.5t-34.5 -12.5l-266 -266h-329v-400h-150q-21 0 -35.5 14.5t-14.5 35.5v1000q0 20 14.5 35t35.5 15h250v-300h500v300h100zM700 1000h-100v200h100v-200zM1202 572l70 -70q15 -15 15 -35.5t-15 -35.5l-131 -131 l131 -131q15 -15 15 -35.5t-15 -35.5l-70 -70q-15 -15 -35.5 -15t-35.5 15l-131 131l-131 -131q-15 -15 -35.5 -15t-35.5 15l-70 70q-15 15 -15 35.5t15 35.5l131 131l-131 131q-15 15 -15 35.5t15 35.5l70 70q15 15 35.5 15t35.5 -15l131 -131l131 131q15 15 35.5 15 t35.5 -15z" />
|
|
||||||
<glyph unicode="" d="M1100 1000v-300h-350q-21 0 -35.5 -14.5t-14.5 -35.5v-150h-500v-400h-150q-21 0 -35.5 14.5t-14.5 35.5v1000q0 20 14.5 35t35.5 15h250v-300h500v300h100zM700 1000h-100v200h100v-200zM850 600h100q21 0 35.5 -14.5t14.5 -35.5v-250h150q21 0 25 -10.5t-10 -24.5 l-230 -230q-14 -14 -35 -14t-35 14l-230 230q-14 14 -10 24.5t25 10.5h150v250q0 21 14.5 35.5t35.5 14.5z" />
|
|
||||||
<glyph unicode="" d="M1100 1000v-400l-165 165q-14 15 -35 15t-35 -15l-263 -265h-402v-400h-150q-21 0 -35.5 14.5t-14.5 35.5v1000q0 20 14.5 35t35.5 15h250v-300h500v300h100zM700 1000h-100v200h100v-200zM935 565l230 -229q14 -15 10 -25.5t-25 -10.5h-150v-250q0 -20 -14.5 -35 t-35.5 -15h-100q-21 0 -35.5 15t-14.5 35v250h-150q-21 0 -25 10.5t10 25.5l230 229q14 15 35 15t35 -15z" />
|
|
||||||
<glyph unicode="" d="M50 1100h1100q21 0 35.5 -14.5t14.5 -35.5v-150h-1200v150q0 21 14.5 35.5t35.5 14.5zM1200 800v-550q0 -21 -14.5 -35.5t-35.5 -14.5h-1100q-21 0 -35.5 14.5t-14.5 35.5v550h1200zM100 500v-200h400v200h-400z" />
|
|
||||||
<glyph unicode="" d="M935 1165l248 -230q14 -14 14 -35t-14 -35l-248 -230q-14 -14 -24.5 -10t-10.5 25v150h-400v200h400v150q0 21 10.5 25t24.5 -10zM200 800h-50q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5h50v-200zM400 800h-100v200h100v-200zM18 435l247 230 q14 14 24.5 10t10.5 -25v-150h400v-200h-400v-150q0 -21 -10.5 -25t-24.5 10l-247 230q-15 14 -15 35t15 35zM900 300h-100v200h100v-200zM1000 500h51q20 0 34.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-34.5 -14.5h-51v200z" />
|
|
||||||
<glyph unicode="" d="M862 1073l276 116q25 18 43.5 8t18.5 -41v-1106q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v397q-4 1 -11 5t-24 17.5t-30 29t-24 42t-11 56.5v359q0 31 18.5 65t43.5 52zM550 1200q22 0 34.5 -12.5t14.5 -24.5l1 -13v-450q0 -28 -10.5 -59.5 t-25 -56t-29 -45t-25.5 -31.5l-10 -11v-447q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v447q-4 4 -11 11.5t-24 30.5t-30 46t-24 55t-11 60v450q0 2 0.5 5.5t4 12t8.5 15t14.5 12t22.5 5.5q20 0 32.5 -12.5t14.5 -24.5l3 -13v-350h100v350v5.5t2.5 12 t7 15t15 12t25.5 5.5q23 0 35.5 -12.5t13.5 -24.5l1 -13v-350h100v350q0 2 0.5 5.5t3 12t7 15t15 12t24.5 5.5z" />
|
|
||||||
<glyph unicode="" d="M1200 1100v-56q-4 0 -11 -0.5t-24 -3t-30 -7.5t-24 -15t-11 -24v-888q0 -22 25 -34.5t50 -13.5l25 -2v-56h-400v56q75 0 87.5 6.5t12.5 43.5v394h-500v-394q0 -37 12.5 -43.5t87.5 -6.5v-56h-400v56q4 0 11 0.5t24 3t30 7.5t24 15t11 24v888q0 22 -25 34.5t-50 13.5 l-25 2v56h400v-56q-75 0 -87.5 -6.5t-12.5 -43.5v-394h500v394q0 37 -12.5 43.5t-87.5 6.5v56h400z" />
|
|
||||||
<glyph unicode="" d="M675 1000h375q21 0 35.5 -14.5t14.5 -35.5v-150h-105l-295 -98v98l-200 200h-400l100 100h375zM100 900h300q41 0 70.5 -29.5t29.5 -70.5v-500q0 -41 -29.5 -70.5t-70.5 -29.5h-300q-41 0 -70.5 29.5t-29.5 70.5v500q0 41 29.5 70.5t70.5 29.5zM100 800v-200h300v200 h-300zM1100 535l-400 -133v163l400 133v-163zM100 500v-200h300v200h-300zM1100 398v-248q0 -21 -14.5 -35.5t-35.5 -14.5h-375l-100 -100h-375l-100 100h400l200 200h105z" />
|
|
||||||
<glyph unicode="" d="M17 1007l162 162q17 17 40 14t37 -22l139 -194q14 -20 11 -44.5t-20 -41.5l-119 -118q102 -142 228 -268t267 -227l119 118q17 17 42.5 19t44.5 -12l192 -136q19 -14 22.5 -37.5t-13.5 -40.5l-163 -162q-3 -1 -9.5 -1t-29.5 2t-47.5 6t-62.5 14.5t-77.5 26.5t-90 42.5 t-101.5 60t-111 83t-119 108.5q-74 74 -133.5 150.5t-94.5 138.5t-60 119.5t-34.5 100t-15 74.5t-4.5 48z" />
|
|
||||||
<glyph unicode="" d="M600 1100q92 0 175 -10.5t141.5 -27t108.5 -36.5t81.5 -40t53.5 -37t31 -27l9 -10v-200q0 -21 -14.5 -33t-34.5 -9l-202 34q-20 3 -34.5 20t-14.5 38v146q-141 24 -300 24t-300 -24v-146q0 -21 -14.5 -38t-34.5 -20l-202 -34q-20 -3 -34.5 9t-14.5 33v200q3 4 9.5 10.5 t31 26t54 37.5t80.5 39.5t109 37.5t141 26.5t175 10.5zM600 795q56 0 97 -9.5t60 -23.5t30 -28t12 -24l1 -10v-50l365 -303q14 -15 24.5 -40t10.5 -45v-212q0 -21 -14.5 -35.5t-35.5 -14.5h-1100q-21 0 -35.5 14.5t-14.5 35.5v212q0 20 10.5 45t24.5 40l365 303v50 q0 4 1 10.5t12 23t30 29t60 22.5t97 10z" />
|
|
||||||
<glyph unicode="" d="M1100 700l-200 -200h-600l-200 200v500h200v-200h200v200h200v-200h200v200h200v-500zM250 400h700q21 0 35.5 -14.5t14.5 -35.5t-14.5 -35.5t-35.5 -14.5h-12l137 -100h-950l137 100h-12q-21 0 -35.5 14.5t-14.5 35.5t14.5 35.5t35.5 14.5zM50 100h1100q21 0 35.5 -14.5 t14.5 -35.5v-50h-1200v50q0 21 14.5 35.5t35.5 14.5z" />
|
|
||||||
<glyph unicode="" d="M700 1100h-100q-41 0 -70.5 -29.5t-29.5 -70.5v-1000h300v1000q0 41 -29.5 70.5t-70.5 29.5zM1100 800h-100q-41 0 -70.5 -29.5t-29.5 -70.5v-700h300v700q0 41 -29.5 70.5t-70.5 29.5zM400 0h-300v400q0 41 29.5 70.5t70.5 29.5h100q41 0 70.5 -29.5t29.5 -70.5v-400z " />
|
|
||||||
<glyph unicode="" d="M200 1100h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212v500q0 124 88 212t212 88zM100 900v-700h900v700h-900zM500 700h-200v-100h200v-300h-300v100h200v100h-200v300h300v-100zM900 700v-300l-100 -100h-200v500h200z M700 700v-300h100v300h-100z" />
|
|
||||||
<glyph unicode="" d="M200 1100h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212v500q0 124 88 212t212 88zM100 900v-700h900v700h-900zM500 300h-100v200h-100v-200h-100v500h100v-200h100v200h100v-500zM900 700v-300l-100 -100h-200v500h200z M700 700v-300h100v300h-100z" />
|
|
||||||
<glyph unicode="" d="M200 1100h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212v500q0 124 88 212t212 88zM100 900v-700h900v700h-900zM500 700h-200v-300h200v-100h-300v500h300v-100zM900 700h-200v-300h200v-100h-300v500h300v-100z" />
|
|
||||||
<glyph unicode="" d="M200 1100h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212v500q0 124 88 212t212 88zM100 900v-700h900v700h-900zM500 400l-300 150l300 150v-300zM900 550l-300 -150v300z" />
|
|
||||||
<glyph unicode="" d="M200 1100h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212v500q0 124 88 212t212 88zM100 900v-700h900v700h-900zM900 300h-700v500h700v-500zM800 700h-130q-38 0 -66.5 -43t-28.5 -108t27 -107t68 -42h130v300zM300 700v-300 h130q41 0 68 42t27 107t-28.5 108t-66.5 43h-130z" />
|
|
||||||
<glyph unicode="" d="M200 1100h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212v500q0 124 88 212t212 88zM100 900v-700h900v700h-900zM500 700h-200v-100h200v-300h-300v100h200v100h-200v300h300v-100zM900 300h-100v400h-100v100h200v-500z M700 300h-100v100h100v-100z" />
|
|
||||||
<glyph unicode="" d="M200 1100h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212v500q0 124 88 212t212 88zM100 900v-700h900v700h-900zM300 700h200v-400h-300v500h100v-100zM900 300h-100v400h-100v100h200v-500zM300 600v-200h100v200h-100z M700 300h-100v100h100v-100z" />
|
|
||||||
<glyph unicode="" d="M200 1100h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212v500q0 124 88 212t212 88zM100 900v-700h900v700h-900zM500 500l-199 -200h-100v50l199 200v150h-200v100h300v-300zM900 300h-100v400h-100v100h200v-500zM701 300h-100 v100h100v-100z" />
|
|
||||||
<glyph unicode="" d="M600 1191q120 0 229.5 -47t188.5 -126t126 -188.5t47 -229.5t-47 -229.5t-126 -188.5t-188.5 -126t-229.5 -47t-229.5 47t-188.5 126t-126 188.5t-47 229.5t47 229.5t126 188.5t188.5 126t229.5 47zM600 1021q-114 0 -211 -56.5t-153.5 -153.5t-56.5 -211t56.5 -211 t153.5 -153.5t211 -56.5t211 56.5t153.5 153.5t56.5 211t-56.5 211t-153.5 153.5t-211 56.5zM800 700h-300v-200h300v-100h-300l-100 100v200l100 100h300v-100z" />
|
|
||||||
<glyph unicode="" d="M600 1191q120 0 229.5 -47t188.5 -126t126 -188.5t47 -229.5t-47 -229.5t-126 -188.5t-188.5 -126t-229.5 -47t-229.5 47t-188.5 126t-126 188.5t-47 229.5t47 229.5t126 188.5t188.5 126t229.5 47zM600 1021q-114 0 -211 -56.5t-153.5 -153.5t-56.5 -211t56.5 -211 t153.5 -153.5t211 -56.5t211 56.5t153.5 153.5t56.5 211t-56.5 211t-153.5 153.5t-211 56.5zM800 700v-100l-50 -50l100 -100v-50h-100l-100 100h-150v-100h-100v400h300zM500 700v-100h200v100h-200z" />
|
|
||||||
<glyph unicode="" d="M503 1089q110 0 200.5 -59.5t134.5 -156.5q44 14 90 14q120 0 205 -86.5t85 -207t-85 -207t-205 -86.5h-128v250q0 21 -14.5 35.5t-35.5 14.5h-300q-21 0 -35.5 -14.5t-14.5 -35.5v-250h-222q-80 0 -136 57.5t-56 136.5q0 69 43 122.5t108 67.5q-2 19 -2 37q0 100 49 185 t134 134t185 49zM525 500h150q10 0 17.5 -7.5t7.5 -17.5v-275h137q21 0 26 -11.5t-8 -27.5l-223 -244q-13 -16 -32 -16t-32 16l-223 244q-13 16 -8 27.5t26 11.5h137v275q0 10 7.5 17.5t17.5 7.5z" />
|
|
||||||
<glyph unicode="" d="M502 1089q110 0 201 -59.5t135 -156.5q43 15 89 15q121 0 206 -86.5t86 -206.5q0 -99 -60 -181t-150 -110l-378 360q-13 16 -31.5 16t-31.5 -16l-381 -365h-9q-79 0 -135.5 57.5t-56.5 136.5q0 69 43 122.5t108 67.5q-2 19 -2 38q0 100 49 184.5t133.5 134t184.5 49.5z M632 467l223 -228q13 -16 8 -27.5t-26 -11.5h-137v-275q0 -10 -7.5 -17.5t-17.5 -7.5h-150q-10 0 -17.5 7.5t-7.5 17.5v275h-137q-21 0 -26 11.5t8 27.5q199 204 223 228q19 19 31.5 19t32.5 -19z" />
|
|
||||||
<glyph unicode="" d="M700 100v100h400l-270 300h170l-270 300h170l-300 333l-300 -333h170l-270 -300h170l-270 -300h400v-100h-50q-21 0 -35.5 -14.5t-14.5 -35.5v-50h400v50q0 21 -14.5 35.5t-35.5 14.5h-50z" />
|
|
||||||
<glyph unicode="" d="M600 1179q94 0 167.5 -56.5t99.5 -145.5q89 -6 150.5 -71.5t61.5 -155.5q0 -61 -29.5 -112.5t-79.5 -82.5q9 -29 9 -55q0 -74 -52.5 -126.5t-126.5 -52.5q-55 0 -100 30v-251q21 0 35.5 -14.5t14.5 -35.5v-50h-300v50q0 21 14.5 35.5t35.5 14.5v251q-45 -30 -100 -30 q-74 0 -126.5 52.5t-52.5 126.5q0 18 4 38q-47 21 -75.5 65t-28.5 97q0 74 52.5 126.5t126.5 52.5q5 0 23 -2q0 2 -1 10t-1 13q0 116 81.5 197.5t197.5 81.5z" />
|
|
||||||
<glyph unicode="" d="M1010 1010q111 -111 150.5 -260.5t0 -299t-150.5 -260.5q-83 -83 -191.5 -126.5t-218.5 -43.5t-218.5 43.5t-191.5 126.5q-111 111 -150.5 260.5t0 299t150.5 260.5q83 83 191.5 126.5t218.5 43.5t218.5 -43.5t191.5 -126.5zM476 1065q-4 0 -8 -1q-121 -34 -209.5 -122.5 t-122.5 -209.5q-4 -12 2.5 -23t18.5 -14l36 -9q3 -1 7 -1q23 0 29 22q27 96 98 166q70 71 166 98q11 3 17.5 13.5t3.5 22.5l-9 35q-3 13 -14 19q-7 4 -15 4zM512 920q-4 0 -9 -2q-80 -24 -138.5 -82.5t-82.5 -138.5q-4 -13 2 -24t19 -14l34 -9q4 -1 8 -1q22 0 28 21 q18 58 58.5 98.5t97.5 58.5q12 3 18 13.5t3 21.5l-9 35q-3 12 -14 19q-7 4 -15 4zM719.5 719.5q-49.5 49.5 -119.5 49.5t-119.5 -49.5t-49.5 -119.5t49.5 -119.5t119.5 -49.5t119.5 49.5t49.5 119.5t-49.5 119.5zM855 551q-22 0 -28 -21q-18 -58 -58.5 -98.5t-98.5 -57.5 q-11 -4 -17 -14.5t-3 -21.5l9 -35q3 -12 14 -19q7 -4 15 -4q4 0 9 2q80 24 138.5 82.5t82.5 138.5q4 13 -2.5 24t-18.5 14l-34 9q-4 1 -8 1zM1000 515q-23 0 -29 -22q-27 -96 -98 -166q-70 -71 -166 -98q-11 -3 -17.5 -13.5t-3.5 -22.5l9 -35q3 -13 14 -19q7 -4 15 -4 q4 0 8 1q121 34 209.5 122.5t122.5 209.5q4 12 -2.5 23t-18.5 14l-36 9q-3 1 -7 1z" />
|
|
||||||
<glyph unicode="" d="M700 800h300v-380h-180v200h-340v-200h-380v755q0 10 7.5 17.5t17.5 7.5h575v-400zM1000 900h-200v200zM700 300h162l-212 -212l-212 212h162v200h100v-200zM520 0h-395q-10 0 -17.5 7.5t-7.5 17.5v395zM1000 220v-195q0 -10 -7.5 -17.5t-17.5 -7.5h-195z" />
|
|
||||||
<glyph unicode="" d="M700 800h300v-520l-350 350l-550 -550v1095q0 10 7.5 17.5t17.5 7.5h575v-400zM1000 900h-200v200zM862 200h-162v-200h-100v200h-162l212 212zM480 0h-355q-10 0 -17.5 7.5t-7.5 17.5v55h380v-80zM1000 80v-55q0 -10 -7.5 -17.5t-17.5 -7.5h-155v80h180z" />
|
|
||||||
<glyph unicode="" d="M1162 800h-162v-200h100l100 -100h-300v300h-162l212 212zM200 800h200q27 0 40 -2t29.5 -10.5t23.5 -30t7 -57.5h300v-100h-600l-200 -350v450h100q0 36 7 57.5t23.5 30t29.5 10.5t40 2zM800 400h240l-240 -400h-800l300 500h500v-100z" />
|
|
||||||
<glyph unicode="" d="M650 1100h100q21 0 35.5 -14.5t14.5 -35.5v-50h50q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-300q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5h50v50q0 21 14.5 35.5t35.5 14.5zM1000 850v150q41 0 70.5 -29.5t29.5 -70.5v-800 q0 -41 -29.5 -70.5t-70.5 -29.5h-600q-1 0 -20 4l246 246l-326 326v324q0 41 29.5 70.5t70.5 29.5v-150q0 -62 44 -106t106 -44h300q62 0 106 44t44 106zM412 250l-212 -212v162h-200v100h200v162z" />
|
|
||||||
<glyph unicode="" d="M450 1100h100q21 0 35.5 -14.5t14.5 -35.5v-50h50q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-300q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5h50v50q0 21 14.5 35.5t35.5 14.5zM800 850v150q41 0 70.5 -29.5t29.5 -70.5v-500 h-200v-300h200q0 -36 -7 -57.5t-23.5 -30t-29.5 -10.5t-40 -2h-600q-41 0 -70.5 29.5t-29.5 70.5v800q0 41 29.5 70.5t70.5 29.5v-150q0 -62 44 -106t106 -44h300q62 0 106 44t44 106zM1212 250l-212 -212v162h-200v100h200v162z" />
|
|
||||||
<glyph unicode="" d="M658 1197l637 -1104q23 -38 7 -65.5t-60 -27.5h-1276q-44 0 -60 27.5t7 65.5l637 1104q22 39 54 39t54 -39zM704 800h-208q-20 0 -32 -14.5t-8 -34.5l58 -302q4 -20 21.5 -34.5t37.5 -14.5h54q20 0 37.5 14.5t21.5 34.5l58 302q4 20 -8 34.5t-32 14.5zM500 300v-100h200 v100h-200z" />
|
|
||||||
<glyph unicode="" d="M425 1100h250q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5zM425 800h250q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5 t17.5 7.5zM825 800h250q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5zM25 500h250q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5t-7.5 17.5v150 q0 10 7.5 17.5t17.5 7.5zM425 500h250q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5zM825 500h250q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5t-7.5 17.5 v150q0 10 7.5 17.5t17.5 7.5zM25 200h250q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5zM425 200h250q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5 t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5zM825 200h250q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5z" />
|
|
||||||
<glyph unicode="" d="M700 1200h100v-200h-100v-100h350q62 0 86.5 -39.5t-3.5 -94.5l-66 -132q-41 -83 -81 -134h-772q-40 51 -81 134l-66 132q-28 55 -3.5 94.5t86.5 39.5h350v100h-100v200h100v100h200v-100zM250 400h700q21 0 35.5 -14.5t14.5 -35.5t-14.5 -35.5t-35.5 -14.5h-12l137 -100 h-950l138 100h-13q-21 0 -35.5 14.5t-14.5 35.5t14.5 35.5t35.5 14.5zM50 100h1100q21 0 35.5 -14.5t14.5 -35.5v-50h-1200v50q0 21 14.5 35.5t35.5 14.5z" />
|
|
||||||
<glyph unicode="" d="M600 1300q40 0 68.5 -29.5t28.5 -70.5h-194q0 41 28.5 70.5t68.5 29.5zM443 1100h314q18 -37 18 -75q0 -8 -3 -25h328q41 0 44.5 -16.5t-30.5 -38.5l-175 -145h-678l-178 145q-34 22 -29 38.5t46 16.5h328q-3 17 -3 25q0 38 18 75zM250 700h700q21 0 35.5 -14.5 t14.5 -35.5t-14.5 -35.5t-35.5 -14.5h-150v-200l275 -200h-950l275 200v200h-150q-21 0 -35.5 14.5t-14.5 35.5t14.5 35.5t35.5 14.5zM50 100h1100q21 0 35.5 -14.5t14.5 -35.5v-50h-1200v50q0 21 14.5 35.5t35.5 14.5z" />
|
|
||||||
<glyph unicode="" d="M600 1181q75 0 128 -53t53 -128t-53 -128t-128 -53t-128 53t-53 128t53 128t128 53zM602 798h46q34 0 55.5 -28.5t21.5 -86.5q0 -76 39 -183h-324q39 107 39 183q0 58 21.5 86.5t56.5 28.5h45zM250 400h700q21 0 35.5 -14.5t14.5 -35.5t-14.5 -35.5t-35.5 -14.5h-13 l138 -100h-950l137 100h-12q-21 0 -35.5 14.5t-14.5 35.5t14.5 35.5t35.5 14.5zM50 100h1100q21 0 35.5 -14.5t14.5 -35.5v-50h-1200v50q0 21 14.5 35.5t35.5 14.5z" />
|
|
||||||
<glyph unicode="" d="M600 1300q47 0 92.5 -53.5t71 -123t25.5 -123.5q0 -78 -55.5 -133.5t-133.5 -55.5t-133.5 55.5t-55.5 133.5q0 62 34 143l144 -143l111 111l-163 163q34 26 63 26zM602 798h46q34 0 55.5 -28.5t21.5 -86.5q0 -76 39 -183h-324q39 107 39 183q0 58 21.5 86.5t56.5 28.5h45 zM250 400h700q21 0 35.5 -14.5t14.5 -35.5t-14.5 -35.5t-35.5 -14.5h-13l138 -100h-950l137 100h-12q-21 0 -35.5 14.5t-14.5 35.5t14.5 35.5t35.5 14.5zM50 100h1100q21 0 35.5 -14.5t14.5 -35.5v-50h-1200v50q0 21 14.5 35.5t35.5 14.5z" />
|
|
||||||
<glyph unicode="" d="M600 1200l300 -161v-139h-300q0 -57 18.5 -108t50 -91.5t63 -72t70 -67.5t57.5 -61h-530q-60 83 -90.5 177.5t-30.5 178.5t33 164.5t87.5 139.5t126 96.5t145.5 41.5v-98zM250 400h700q21 0 35.5 -14.5t14.5 -35.5t-14.5 -35.5t-35.5 -14.5h-13l138 -100h-950l137 100 h-12q-21 0 -35.5 14.5t-14.5 35.5t14.5 35.5t35.5 14.5zM50 100h1100q21 0 35.5 -14.5t14.5 -35.5v-50h-1200v50q0 21 14.5 35.5t35.5 14.5z" />
|
|
||||||
<glyph unicode="" d="M600 1300q41 0 70.5 -29.5t29.5 -70.5v-78q46 -26 73 -72t27 -100v-50h-400v50q0 54 27 100t73 72v78q0 41 29.5 70.5t70.5 29.5zM400 800h400q54 0 100 -27t72 -73h-172v-100h200v-100h-200v-100h200v-100h-200v-100h200q0 -83 -58.5 -141.5t-141.5 -58.5h-400 q-83 0 -141.5 58.5t-58.5 141.5v400q0 83 58.5 141.5t141.5 58.5z" />
|
|
||||||
<glyph unicode="" d="M150 1100h900q21 0 35.5 -14.5t14.5 -35.5v-500q0 -21 -14.5 -35.5t-35.5 -14.5h-900q-21 0 -35.5 14.5t-14.5 35.5v500q0 21 14.5 35.5t35.5 14.5zM125 400h950q10 0 17.5 -7.5t7.5 -17.5v-50q0 -10 -7.5 -17.5t-17.5 -7.5h-283l224 -224q13 -13 13 -31.5t-13 -32 t-31.5 -13.5t-31.5 13l-88 88h-524l-87 -88q-13 -13 -32 -13t-32 13.5t-13 32t13 31.5l224 224h-289q-10 0 -17.5 7.5t-7.5 17.5v50q0 10 7.5 17.5t17.5 7.5zM541 300l-100 -100h324l-100 100h-124z" />
|
|
||||||
<glyph unicode="" d="M200 1100h800q83 0 141.5 -58.5t58.5 -141.5v-200h-100q0 41 -29.5 70.5t-70.5 29.5h-250q-41 0 -70.5 -29.5t-29.5 -70.5h-100q0 41 -29.5 70.5t-70.5 29.5h-250q-41 0 -70.5 -29.5t-29.5 -70.5h-100v200q0 83 58.5 141.5t141.5 58.5zM100 600h1000q41 0 70.5 -29.5 t29.5 -70.5v-300h-1200v300q0 41 29.5 70.5t70.5 29.5zM300 100v-50q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v50h200zM1100 100v-50q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v50h200z" />
|
|
||||||
<glyph unicode="" d="M480 1165l682 -683q31 -31 31 -75.5t-31 -75.5l-131 -131h-481l-517 518q-32 31 -32 75.5t32 75.5l295 296q31 31 75.5 31t76.5 -31zM108 794l342 -342l303 304l-341 341zM250 100h800q21 0 35.5 -14.5t14.5 -35.5v-50h-900v50q0 21 14.5 35.5t35.5 14.5z" />
|
|
||||||
<glyph unicode="" d="M1057 647l-189 506q-8 19 -27.5 33t-40.5 14h-400q-21 0 -40.5 -14t-27.5 -33l-189 -506q-8 -19 1.5 -33t30.5 -14h625v-150q0 -21 14.5 -35.5t35.5 -14.5t35.5 14.5t14.5 35.5v150h125q21 0 30.5 14t1.5 33zM897 0h-595v50q0 21 14.5 35.5t35.5 14.5h50v50 q0 21 14.5 35.5t35.5 14.5h48v300h200v-300h47q21 0 35.5 -14.5t14.5 -35.5v-50h50q21 0 35.5 -14.5t14.5 -35.5v-50z" />
|
|
||||||
<glyph unicode="" d="M900 800h300v-575q0 -10 -7.5 -17.5t-17.5 -7.5h-375v591l-300 300v84q0 10 7.5 17.5t17.5 7.5h375v-400zM1200 900h-200v200zM400 600h300v-575q0 -10 -7.5 -17.5t-17.5 -7.5h-650q-10 0 -17.5 7.5t-7.5 17.5v950q0 10 7.5 17.5t17.5 7.5h375v-400zM700 700h-200v200z " />
|
|
||||||
<glyph unicode="" d="M484 1095h195q75 0 146 -32.5t124 -86t89.5 -122.5t48.5 -142q18 -14 35 -20q31 -10 64.5 6.5t43.5 48.5q10 34 -15 71q-19 27 -9 43q5 8 12.5 11t19 -1t23.5 -16q41 -44 39 -105q-3 -63 -46 -106.5t-104 -43.5h-62q-7 -55 -35 -117t-56 -100l-39 -234q-3 -20 -20 -34.5 t-38 -14.5h-100q-21 0 -33 14.5t-9 34.5l12 70q-49 -14 -91 -14h-195q-24 0 -65 8l-11 -64q-3 -20 -20 -34.5t-38 -14.5h-100q-21 0 -33 14.5t-9 34.5l26 157q-84 74 -128 175l-159 53q-19 7 -33 26t-14 40v50q0 21 14.5 35.5t35.5 14.5h124q11 87 56 166l-111 95 q-16 14 -12.5 23.5t24.5 9.5h203q116 101 250 101zM675 1000h-250q-10 0 -17.5 -7.5t-7.5 -17.5v-50q0 -10 7.5 -17.5t17.5 -7.5h250q10 0 17.5 7.5t7.5 17.5v50q0 10 -7.5 17.5t-17.5 7.5z" />
|
|
||||||
<glyph unicode="" d="M641 900l423 247q19 8 42 2.5t37 -21.5l32 -38q14 -15 12.5 -36t-17.5 -34l-139 -120h-390zM50 1100h106q67 0 103 -17t66 -71l102 -212h823q21 0 35.5 -14.5t14.5 -35.5v-50q0 -21 -14 -40t-33 -26l-737 -132q-23 -4 -40 6t-26 25q-42 67 -100 67h-300q-62 0 -106 44 t-44 106v200q0 62 44 106t106 44zM173 928h-80q-19 0 -28 -14t-9 -35v-56q0 -51 42 -51h134q16 0 21.5 8t5.5 24q0 11 -16 45t-27 51q-18 28 -43 28zM550 727q-32 0 -54.5 -22.5t-22.5 -54.5t22.5 -54.5t54.5 -22.5t54.5 22.5t22.5 54.5t-22.5 54.5t-54.5 22.5zM130 389 l152 130q18 19 34 24t31 -3.5t24.5 -17.5t25.5 -28q28 -35 50.5 -51t48.5 -13l63 5l48 -179q13 -61 -3.5 -97.5t-67.5 -79.5l-80 -69q-47 -40 -109 -35.5t-103 51.5l-130 151q-40 47 -35.5 109.5t51.5 102.5zM380 377l-102 -88q-31 -27 2 -65l37 -43q13 -15 27.5 -19.5 t31.5 6.5l61 53q19 16 14 49q-2 20 -12 56t-17 45q-11 12 -19 14t-23 -8z" />
|
|
||||||
<glyph unicode="" d="M625 1200h150q10 0 17.5 -7.5t7.5 -17.5v-109q79 -33 131 -87.5t53 -128.5q1 -46 -15 -84.5t-39 -61t-46 -38t-39 -21.5l-17 -6q6 0 15 -1.5t35 -9t50 -17.5t53 -30t50 -45t35.5 -64t14.5 -84q0 -59 -11.5 -105.5t-28.5 -76.5t-44 -51t-49.5 -31.5t-54.5 -16t-49.5 -6.5 t-43.5 -1v-75q0 -10 -7.5 -17.5t-17.5 -7.5h-150q-10 0 -17.5 7.5t-7.5 17.5v75h-100v-75q0 -10 -7.5 -17.5t-17.5 -7.5h-150q-10 0 -17.5 7.5t-7.5 17.5v75h-175q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5h75v600h-75q-10 0 -17.5 7.5t-7.5 17.5v150 q0 10 7.5 17.5t17.5 7.5h175v75q0 10 7.5 17.5t17.5 7.5h150q10 0 17.5 -7.5t7.5 -17.5v-75h100v75q0 10 7.5 17.5t17.5 7.5zM400 900v-200h263q28 0 48.5 10.5t30 25t15 29t5.5 25.5l1 10q0 4 -0.5 11t-6 24t-15 30t-30 24t-48.5 11h-263zM400 500v-200h363q28 0 48.5 10.5 t30 25t15 29t5.5 25.5l1 10q0 4 -0.5 11t-6 24t-15 30t-30 24t-48.5 11h-363z" />
|
|
||||||
<glyph unicode="" d="M212 1198h780q86 0 147 -61t61 -147v-416q0 -51 -18 -142.5t-36 -157.5l-18 -66q-29 -87 -93.5 -146.5t-146.5 -59.5h-572q-82 0 -147 59t-93 147q-8 28 -20 73t-32 143.5t-20 149.5v416q0 86 61 147t147 61zM600 1045q-70 0 -132.5 -11.5t-105.5 -30.5t-78.5 -41.5 t-57 -45t-36 -41t-20.5 -30.5l-6 -12l156 -243h560l156 243q-2 5 -6 12.5t-20 29.5t-36.5 42t-57 44.5t-79 42t-105 29.5t-132.5 12zM762 703h-157l195 261z" />
|
|
||||||
<glyph unicode="" d="M475 1300h150q103 0 189 -86t86 -189v-500q0 -41 -42 -83t-83 -42h-450q-41 0 -83 42t-42 83v500q0 103 86 189t189 86zM700 300v-225q0 -21 -27 -48t-48 -27h-150q-21 0 -48 27t-27 48v225h300z" />
|
|
||||||
<glyph unicode="" d="M475 1300h96q0 -150 89.5 -239.5t239.5 -89.5v-446q0 -41 -42 -83t-83 -42h-450q-41 0 -83 42t-42 83v500q0 103 86 189t189 86zM700 300v-225q0 -21 -27 -48t-48 -27h-150q-21 0 -48 27t-27 48v225h300z" />
|
|
||||||
<glyph unicode="" d="M1294 767l-638 -283l-378 170l-78 -60v-224l100 -150v-199l-150 148l-150 -149v200l100 150v250q0 4 -0.5 10.5t0 9.5t1 8t3 8t6.5 6l47 40l-147 65l642 283zM1000 380l-350 -166l-350 166v147l350 -165l350 165v-147z" />
|
|
||||||
<glyph unicode="" d="M250 800q62 0 106 -44t44 -106t-44 -106t-106 -44t-106 44t-44 106t44 106t106 44zM650 800q62 0 106 -44t44 -106t-44 -106t-106 -44t-106 44t-44 106t44 106t106 44zM1050 800q62 0 106 -44t44 -106t-44 -106t-106 -44t-106 44t-44 106t44 106t106 44z" />
|
|
||||||
<glyph unicode="" d="M550 1100q62 0 106 -44t44 -106t-44 -106t-106 -44t-106 44t-44 106t44 106t106 44zM550 700q62 0 106 -44t44 -106t-44 -106t-106 -44t-106 44t-44 106t44 106t106 44zM550 300q62 0 106 -44t44 -106t-44 -106t-106 -44t-106 44t-44 106t44 106t106 44z" />
|
|
||||||
<glyph unicode="" d="M125 1100h950q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-950q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5zM125 700h950q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-950q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5 t17.5 7.5zM125 300h950q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-950q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5z" />
|
|
||||||
<glyph unicode="" d="M350 1200h500q162 0 256 -93.5t94 -256.5v-500q0 -165 -93.5 -257.5t-256.5 -92.5h-500q-165 0 -257.5 92.5t-92.5 257.5v500q0 165 92.5 257.5t257.5 92.5zM900 1000h-600q-41 0 -70.5 -29.5t-29.5 -70.5v-600q0 -41 29.5 -70.5t70.5 -29.5h600q41 0 70.5 29.5 t29.5 70.5v600q0 41 -29.5 70.5t-70.5 29.5zM350 900h500q21 0 35.5 -14.5t14.5 -35.5v-300q0 -21 -14.5 -35.5t-35.5 -14.5h-500q-21 0 -35.5 14.5t-14.5 35.5v300q0 21 14.5 35.5t35.5 14.5zM400 800v-200h400v200h-400z" />
|
|
||||||
<glyph unicode="" d="M150 1100h1000q21 0 35.5 -14.5t14.5 -35.5t-14.5 -35.5t-35.5 -14.5h-50v-200h50q21 0 35.5 -14.5t14.5 -35.5t-14.5 -35.5t-35.5 -14.5h-50v-200h50q21 0 35.5 -14.5t14.5 -35.5t-14.5 -35.5t-35.5 -14.5h-50v-200h50q21 0 35.5 -14.5t14.5 -35.5t-14.5 -35.5 t-35.5 -14.5h-1000q-21 0 -35.5 14.5t-14.5 35.5t14.5 35.5t35.5 14.5h50v200h-50q-21 0 -35.5 14.5t-14.5 35.5t14.5 35.5t35.5 14.5h50v200h-50q-21 0 -35.5 14.5t-14.5 35.5t14.5 35.5t35.5 14.5h50v200h-50q-21 0 -35.5 14.5t-14.5 35.5t14.5 35.5t35.5 14.5z" />
|
|
||||||
<glyph unicode="" d="M650 1187q87 -67 118.5 -156t0 -178t-118.5 -155q-87 66 -118.5 155t0 178t118.5 156zM300 800q124 0 212 -88t88 -212q-124 0 -212 88t-88 212zM1000 800q0 -124 -88 -212t-212 -88q0 124 88 212t212 88zM300 500q124 0 212 -88t88 -212q-124 0 -212 88t-88 212z M1000 500q0 -124 -88 -212t-212 -88q0 124 88 212t212 88zM700 199v-144q0 -21 -14.5 -35.5t-35.5 -14.5t-35.5 14.5t-14.5 35.5v142q40 -4 43 -4q17 0 57 6z" />
|
|
||||||
<glyph unicode="" d="M745 878l69 19q25 6 45 -12l298 -295q11 -11 15 -26.5t-2 -30.5q-5 -14 -18 -23.5t-28 -9.5h-8q1 0 1 -13q0 -29 -2 -56t-8.5 -62t-20 -63t-33 -53t-51 -39t-72.5 -14h-146q-184 0 -184 288q0 24 10 47q-20 4 -62 4t-63 -4q11 -24 11 -47q0 -288 -184 -288h-142 q-48 0 -84.5 21t-56 51t-32 71.5t-16 75t-3.5 68.5q0 13 2 13h-7q-15 0 -27.5 9.5t-18.5 23.5q-6 15 -2 30.5t15 25.5l298 296q20 18 46 11l76 -19q20 -5 30.5 -22.5t5.5 -37.5t-22.5 -31t-37.5 -5l-51 12l-182 -193h891l-182 193l-44 -12q-20 -5 -37.5 6t-22.5 31t6 37.5 t31 22.5z" />
|
|
||||||
<glyph unicode="" d="M1200 900h-50q0 21 -4 37t-9.5 26.5t-18 17.5t-22 11t-28.5 5.5t-31 2t-37 0.5h-200v-850q0 -22 25 -34.5t50 -13.5l25 -2v-100h-400v100q4 0 11 0.5t24 3t30 7t24 15t11 24.5v850h-200q-25 0 -37 -0.5t-31 -2t-28.5 -5.5t-22 -11t-18 -17.5t-9.5 -26.5t-4 -37h-50v300 h1000v-300zM500 450h-25q0 15 -4 24.5t-9 14.5t-17 7.5t-20 3t-25 0.5h-100v-425q0 -11 12.5 -17.5t25.5 -7.5h12v-50h-200v50q50 0 50 25v425h-100q-17 0 -25 -0.5t-20 -3t-17 -7.5t-9 -14.5t-4 -24.5h-25v150h500v-150z" />
|
|
||||||
<glyph unicode="" d="M1000 300v50q-25 0 -55 32q-14 14 -25 31t-16 27l-4 11l-289 747h-69l-300 -754q-18 -35 -39 -56q-9 -9 -24.5 -18.5t-26.5 -14.5l-11 -5v-50h273v50q-49 0 -78.5 21.5t-11.5 67.5l69 176h293l61 -166q13 -34 -3.5 -66.5t-55.5 -32.5v-50h312zM412 691l134 342l121 -342 h-255zM1100 150v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1000q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5h1000q21 0 35.5 -14.5t14.5 -35.5z" />
|
|
||||||
<glyph unicode="" d="M50 1200h1100q21 0 35.5 -14.5t14.5 -35.5v-1100q0 -21 -14.5 -35.5t-35.5 -14.5h-1100q-21 0 -35.5 14.5t-14.5 35.5v1100q0 21 14.5 35.5t35.5 14.5zM611 1118h-70q-13 0 -18 -12l-299 -753q-17 -32 -35 -51q-18 -18 -56 -34q-12 -5 -12 -18v-50q0 -8 5.5 -14t14.5 -6 h273q8 0 14 6t6 14v50q0 8 -6 14t-14 6q-55 0 -71 23q-10 14 0 39l63 163h266l57 -153q11 -31 -6 -55q-12 -17 -36 -17q-8 0 -14 -6t-6 -14v-50q0 -8 6 -14t14 -6h313q8 0 14 6t6 14v50q0 7 -5.5 13t-13.5 7q-17 0 -42 25q-25 27 -40 63h-1l-288 748q-5 12 -19 12zM639 611 h-197l103 264z" />
|
|
||||||
<glyph unicode="" d="M1200 1100h-1200v100h1200v-100zM50 1000h400q21 0 35.5 -14.5t14.5 -35.5v-900q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5 35.5v900q0 21 14.5 35.5t35.5 14.5zM650 1000h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-400 q-21 0 -35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5zM700 900v-300h300v300h-300z" />
|
|
||||||
<glyph unicode="" d="M50 1200h400q21 0 35.5 -14.5t14.5 -35.5v-900q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5 35.5v900q0 21 14.5 35.5t35.5 14.5zM650 700h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5 35.5v400 q0 21 14.5 35.5t35.5 14.5zM700 600v-300h300v300h-300zM1200 0h-1200v100h1200v-100z" />
|
|
||||||
<glyph unicode="" d="M50 1000h400q21 0 35.5 -14.5t14.5 -35.5v-350h100v150q0 21 14.5 35.5t35.5 14.5h400q21 0 35.5 -14.5t14.5 -35.5v-150h100v-100h-100v-150q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5 35.5v150h-100v-350q0 -21 -14.5 -35.5t-35.5 -14.5h-400 q-21 0 -35.5 14.5t-14.5 35.5v800q0 21 14.5 35.5t35.5 14.5zM700 700v-300h300v300h-300z" />
|
|
||||||
<glyph unicode="" d="M100 0h-100v1200h100v-1200zM250 1100h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5zM300 1000v-300h300v300h-300zM250 500h900q21 0 35.5 -14.5t14.5 -35.5v-400 q0 -21 -14.5 -35.5t-35.5 -14.5h-900q-21 0 -35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5z" />
|
|
||||||
<glyph unicode="" d="M600 1100h150q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-150v-100h450q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-900q-21 0 -35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5h350v100h-150q-21 0 -35.5 14.5 t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5h150v100h100v-100zM400 1000v-300h300v300h-300z" />
|
|
||||||
<glyph unicode="" d="M1200 0h-100v1200h100v-1200zM550 1100h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5zM600 1000v-300h300v300h-300zM50 500h900q21 0 35.5 -14.5t14.5 -35.5v-400 q0 -21 -14.5 -35.5t-35.5 -14.5h-900q-21 0 -35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5z" />
|
|
||||||
<glyph unicode="" d="M865 565l-494 -494q-23 -23 -41 -23q-14 0 -22 13.5t-8 38.5v1000q0 25 8 38.5t22 13.5q18 0 41 -23l494 -494q14 -14 14 -35t-14 -35z" />
|
|
||||||
<glyph unicode="" d="M335 635l494 494q29 29 50 20.5t21 -49.5v-1000q0 -41 -21 -49.5t-50 20.5l-494 494q-14 14 -14 35t14 35z" />
|
|
||||||
<glyph unicode="" d="M100 900h1000q41 0 49.5 -21t-20.5 -50l-494 -494q-14 -14 -35 -14t-35 14l-494 494q-29 29 -20.5 50t49.5 21z" />
|
|
||||||
<glyph unicode="" d="M635 865l494 -494q29 -29 20.5 -50t-49.5 -21h-1000q-41 0 -49.5 21t20.5 50l494 494q14 14 35 14t35 -14z" />
|
|
||||||
<glyph unicode="" d="M700 741v-182l-692 -323v221l413 193l-413 193v221zM1200 0h-800v200h800v-200z" />
|
|
||||||
<glyph unicode="" d="M1200 900h-200v-100h200v-100h-300v300h200v100h-200v100h300v-300zM0 700h50q0 21 4 37t9.5 26.5t18 17.5t22 11t28.5 5.5t31 2t37 0.5h100v-550q0 -22 -25 -34.5t-50 -13.5l-25 -2v-100h400v100q-4 0 -11 0.5t-24 3t-30 7t-24 15t-11 24.5v550h100q25 0 37 -0.5t31 -2 t28.5 -5.5t22 -11t18 -17.5t9.5 -26.5t4 -37h50v300h-800v-300z" />
|
|
||||||
<glyph unicode="" d="M800 700h-50q0 21 -4 37t-9.5 26.5t-18 17.5t-22 11t-28.5 5.5t-31 2t-37 0.5h-100v-550q0 -22 25 -34.5t50 -14.5l25 -1v-100h-400v100q4 0 11 0.5t24 3t30 7t24 15t11 24.5v550h-100q-25 0 -37 -0.5t-31 -2t-28.5 -5.5t-22 -11t-18 -17.5t-9.5 -26.5t-4 -37h-50v300 h800v-300zM1100 200h-200v-100h200v-100h-300v300h200v100h-200v100h300v-300z" />
|
|
||||||
<glyph unicode="" d="M701 1098h160q16 0 21 -11t-7 -23l-464 -464l464 -464q12 -12 7 -23t-21 -11h-160q-13 0 -23 9l-471 471q-7 8 -7 18t7 18l471 471q10 9 23 9z" />
|
|
||||||
<glyph unicode="" d="M339 1098h160q13 0 23 -9l471 -471q7 -8 7 -18t-7 -18l-471 -471q-10 -9 -23 -9h-160q-16 0 -21 11t7 23l464 464l-464 464q-12 12 -7 23t21 11z" />
|
|
||||||
<glyph unicode="" d="M1087 882q11 -5 11 -21v-160q0 -13 -9 -23l-471 -471q-8 -7 -18 -7t-18 7l-471 471q-9 10 -9 23v160q0 16 11 21t23 -7l464 -464l464 464q12 12 23 7z" />
|
|
||||||
<glyph unicode="" d="M618 993l471 -471q9 -10 9 -23v-160q0 -16 -11 -21t-23 7l-464 464l-464 -464q-12 -12 -23 -7t-11 21v160q0 13 9 23l471 471q8 7 18 7t18 -7z" />
|
|
||||||
<glyph unicode="" d="M1000 1200q0 -124 -88 -212t-212 -88q0 124 88 212t212 88zM450 1000h100q21 0 40 -14t26 -33l79 -194q5 1 16 3q34 6 54 9.5t60 7t65.5 1t61 -10t56.5 -23t42.5 -42t29 -64t5 -92t-19.5 -121.5q-1 -7 -3 -19.5t-11 -50t-20.5 -73t-32.5 -81.5t-46.5 -83t-64 -70 t-82.5 -50q-13 -5 -42 -5t-65.5 2.5t-47.5 2.5q-14 0 -49.5 -3.5t-63 -3.5t-43.5 7q-57 25 -104.5 78.5t-75 111.5t-46.5 112t-26 90l-7 35q-15 63 -18 115t4.5 88.5t26 64t39.5 43.5t52 25.5t58.5 13t62.5 2t59.5 -4.5t55.5 -8l-147 192q-12 18 -5.5 30t27.5 12z" />
|
|
||||||
<glyph unicode="🔑" d="M250 1200h600q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-150v-500l-255 -178q-19 -9 -32 -1t-13 29v650h-150q-21 0 -35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5zM400 1100v-100h300v100h-300z" />
|
|
||||||
<glyph unicode="🚪" d="M250 1200h750q39 0 69.5 -40.5t30.5 -84.5v-933l-700 -117v950l600 125h-700v-1000h-100v1025q0 23 15.5 49t34.5 26zM500 525v-100l100 20v100z" />
|
|
||||||
</font>
|
|
||||||
</defs></svg>
|
|
||||||
|
Before Width: | Height: | Size: 106 KiB |
Binary file not shown.
Binary file not shown.
Binary file not shown.
File diff suppressed because one or more lines are too long
|
|
@ -186,8 +186,3 @@ footer .dcl-link-separator::before {
|
||||||
background: transparent !important;
|
background: transparent !important;
|
||||||
resize: none;
|
resize: none;
|
||||||
}
|
}
|
||||||
|
|
||||||
.existing-keys-title {
|
|
||||||
font-weight: bold;
|
|
||||||
font-size: 14px;
|
|
||||||
}
|
|
||||||
|
|
|
||||||
|
|
@ -73,7 +73,6 @@ textarea {
|
||||||
|
|
||||||
.navbar {
|
.navbar {
|
||||||
transition: all .3s ease-in;
|
transition: all .3s ease-in;
|
||||||
font-weight: 400;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.navbar-default .navbar-nav>.open>a,
|
.navbar-default .navbar-nav>.open>a,
|
||||||
|
|
|
||||||
|
|
@ -1,8 +0,0 @@
|
||||||
/*
|
|
||||||
HTML5 Shiv v3.7.0 | @afarkas @jdalton @jon_neal @rem | MIT/GPL2 Licensed
|
|
||||||
*/
|
|
||||||
(function(l,f){function m(){var a=e.elements;return"string"==typeof a?a.split(" "):a}function i(a){var b=n[a[o]];b||(b={},h++,a[o]=h,n[h]=b);return b}function p(a,b,c){b||(b=f);if(g)return b.createElement(a);c||(c=i(b));b=c.cache[a]?c.cache[a].cloneNode():r.test(a)?(c.cache[a]=c.createElem(a)).cloneNode():c.createElem(a);return b.canHaveChildren&&!s.test(a)?c.frag.appendChild(b):b}function t(a,b){if(!b.cache)b.cache={},b.createElem=a.createElement,b.createFrag=a.createDocumentFragment,b.frag=b.createFrag();
|
|
||||||
a.createElement=function(c){return!e.shivMethods?b.createElem(c):p(c,a,b)};a.createDocumentFragment=Function("h,f","return function(){var n=f.cloneNode(),c=n.createElement;h.shivMethods&&("+m().join().replace(/[\w\-]+/g,function(a){b.createElem(a);b.frag.createElement(a);return'c("'+a+'")'})+");return n}")(e,b.frag)}function q(a){a||(a=f);var b=i(a);if(e.shivCSS&&!j&&!b.hasCSS){var c,d=a;c=d.createElement("p");d=d.getElementsByTagName("head")[0]||d.documentElement;c.innerHTML="x<style>article,aside,dialog,figcaption,figure,footer,header,hgroup,main,nav,section{display:block}mark{background:#FF0;color:#000}template{display:none}</style>";
|
|
||||||
c=d.insertBefore(c.lastChild,d.firstChild);b.hasCSS=!!c}g||t(a,b);return a}var k=l.html5||{},s=/^<|^(?:button|map|select|textarea|object|iframe|option|optgroup)$/i,r=/^(?:a|b|code|div|fieldset|h1|h2|h3|h4|h5|h6|i|label|li|ol|p|q|span|strong|style|table|tbody|td|th|tr|ul)$/i,j,o="_html5shiv",h=0,n={},g;(function(){try{var a=f.createElement("a");a.innerHTML="<xyz></xyz>";j="hidden"in a;var b;if(!(b=1==a.childNodes.length)){f.createElement("a");var c=f.createDocumentFragment();b="undefined"==typeof c.cloneNode||
|
|
||||||
"undefined"==typeof c.createDocumentFragment||"undefined"==typeof c.createElement}g=b}catch(d){g=j=!0}})();var e={elements:k.elements||"abbr article aside audio bdi canvas data datalist details dialog figcaption figure footer header hgroup main mark meter nav output progress section summary template time video",version:"3.7.0",shivCSS:!1!==k.shivCSS,supportsUnknownElements:g,shivMethods:!1!==k.shivMethods,type:"default",shivDocument:q,createElement:p,createDocumentFragment:function(a,b){a||(a=f);
|
|
||||||
if(g)return a.createDocumentFragment();for(var b=b||i(a),c=b.frag.cloneNode(),d=0,e=m(),h=e.length;d<h;d++)c.createElement(e[d]);return c}};l.html5=e;q(f)})(this,document);
|
|
||||||
File diff suppressed because one or more lines are too long
|
|
@ -1,5 +0,0 @@
|
||||||
/*! Respond.js v1.4.2: min/max-width media query polyfill * Copyright 2013 Scott Jehl
|
|
||||||
* Licensed under https://github.com/scottjehl/Respond/blob/master/LICENSE-MIT
|
|
||||||
* */
|
|
||||||
|
|
||||||
!function(a){"use strict";a.matchMedia=a.matchMedia||function(a){var b,c=a.documentElement,d=c.firstElementChild||c.firstChild,e=a.createElement("body"),f=a.createElement("div");return f.id="mq-test-1",f.style.cssText="position:absolute;top:-100em",e.style.background="none",e.appendChild(f),function(a){return f.innerHTML='­<style media="'+a+'"> #mq-test-1 { width: 42px; }</style>',c.insertBefore(e,d),b=42===f.offsetWidth,c.removeChild(e),{matches:b,media:a}}}(a.document)}(this),function(a){"use strict";function b(){u(!0)}var c={};a.respond=c,c.update=function(){};var d=[],e=function(){var b=!1;try{b=new a.XMLHttpRequest}catch(c){b=new a.ActiveXObject("Microsoft.XMLHTTP")}return function(){return b}}(),f=function(a,b){var c=e();c&&(c.open("GET",a,!0),c.onreadystatechange=function(){4!==c.readyState||200!==c.status&&304!==c.status||b(c.responseText)},4!==c.readyState&&c.send(null))};if(c.ajax=f,c.queue=d,c.regex={media:/@media[^\{]+\{([^\{\}]*\{[^\}\{]*\})+/gi,keyframes:/@(?:\-(?:o|moz|webkit)\-)?keyframes[^\{]+\{(?:[^\{\}]*\{[^\}\{]*\})+[^\}]*\}/gi,urls:/(url\()['"]?([^\/\)'"][^:\)'"]+)['"]?(\))/g,findStyles:/@media *([^\{]+)\{([\S\s]+?)$/,only:/(only\s+)?([a-zA-Z]+)\s?/,minw:/\([\s]*min\-width\s*:[\s]*([\s]*[0-9\.]+)(px|em)[\s]*\)/,maxw:/\([\s]*max\-width\s*:[\s]*([\s]*[0-9\.]+)(px|em)[\s]*\)/},c.mediaQueriesSupported=a.matchMedia&&null!==a.matchMedia("only all")&&a.matchMedia("only all").matches,!c.mediaQueriesSupported){var g,h,i,j=a.document,k=j.documentElement,l=[],m=[],n=[],o={},p=30,q=j.getElementsByTagName("head")[0]||k,r=j.getElementsByTagName("base")[0],s=q.getElementsByTagName("link"),t=function(){var a,b=j.createElement("div"),c=j.body,d=k.style.fontSize,e=c&&c.style.fontSize,f=!1;return b.style.cssText="position:absolute;font-size:1em;width:1em",c||(c=f=j.createElement("body"),c.style.background="none"),k.style.fontSize="100%",c.style.fontSize="100%",c.appendChild(b),f&&k.insertBefore(c,k.firstChild),a=b.offsetWidth,f?k.removeChild(c):c.removeChild(b),k.style.fontSize=d,e&&(c.style.fontSize=e),a=i=parseFloat(a)},u=function(b){var c="clientWidth",d=k[c],e="CSS1Compat"===j.compatMode&&d||j.body[c]||d,f={},o=s[s.length-1],r=(new Date).getTime();if(b&&g&&p>r-g)return a.clearTimeout(h),h=a.setTimeout(u,p),void 0;g=r;for(var v in l)if(l.hasOwnProperty(v)){var w=l[v],x=w.minw,y=w.maxw,z=null===x,A=null===y,B="em";x&&(x=parseFloat(x)*(x.indexOf(B)>-1?i||t():1)),y&&(y=parseFloat(y)*(y.indexOf(B)>-1?i||t():1)),w.hasquery&&(z&&A||!(z||e>=x)||!(A||y>=e))||(f[w.media]||(f[w.media]=[]),f[w.media].push(m[w.rules]))}for(var C in n)n.hasOwnProperty(C)&&n[C]&&n[C].parentNode===q&&q.removeChild(n[C]);n.length=0;for(var D in f)if(f.hasOwnProperty(D)){var E=j.createElement("style"),F=f[D].join("\n");E.type="text/css",E.media=D,q.insertBefore(E,o.nextSibling),E.styleSheet?E.styleSheet.cssText=F:E.appendChild(j.createTextNode(F)),n.push(E)}},v=function(a,b,d){var e=a.replace(c.regex.keyframes,"").match(c.regex.media),f=e&&e.length||0;b=b.substring(0,b.lastIndexOf("/"));var g=function(a){return a.replace(c.regex.urls,"$1"+b+"$2$3")},h=!f&&d;b.length&&(b+="/"),h&&(f=1);for(var i=0;f>i;i++){var j,k,n,o;h?(j=d,m.push(g(a))):(j=e[i].match(c.regex.findStyles)&&RegExp.$1,m.push(RegExp.$2&&g(RegExp.$2))),n=j.split(","),o=n.length;for(var p=0;o>p;p++)k=n[p],l.push({media:k.split("(")[0].match(c.regex.only)&&RegExp.$2||"all",rules:m.length-1,hasquery:k.indexOf("(")>-1,minw:k.match(c.regex.minw)&&parseFloat(RegExp.$1)+(RegExp.$2||""),maxw:k.match(c.regex.maxw)&&parseFloat(RegExp.$1)+(RegExp.$2||"")})}u()},w=function(){if(d.length){var b=d.shift();f(b.href,function(c){v(c,b.href,b.media),o[b.href]=!0,a.setTimeout(function(){w()},0)})}},x=function(){for(var b=0;b<s.length;b++){var c=s[b],e=c.href,f=c.media,g=c.rel&&"stylesheet"===c.rel.toLowerCase();e&&g&&!o[e]&&(c.styleSheet&&c.styleSheet.rawCssText?(v(c.styleSheet.rawCssText,e,f),o[e]=!0):(!/^([a-zA-Z:]*\/\/)/.test(e)&&!r||e.replace(RegExp.$1,"").split("/")[0]===a.location.host)&&("//"===e.substring(0,2)&&(e=a.location.protocol+e),d.push({href:e,media:f})))}w()};x(),c.update=x,c.getEmValue=t,a.addEventListener?a.addEventListener("resize",b,!1):a.attachEvent&&a.attachEvent("onresize",b)}}(this);
|
|
||||||
|
|
@ -8,6 +8,7 @@ from django.core.mail import EmailMessage
|
||||||
from django.core.urlresolvers import reverse
|
from django.core.urlresolvers import reverse
|
||||||
from django.utils import translation
|
from django.utils import translation
|
||||||
from django.utils.translation import ugettext_lazy as _
|
from django.utils.translation import ugettext_lazy as _
|
||||||
|
from time import sleep
|
||||||
|
|
||||||
from dynamicweb.celery import app
|
from dynamicweb.celery import app
|
||||||
from hosting.models import HostingOrder
|
from hosting.models import HostingOrder
|
||||||
|
|
@ -15,7 +16,7 @@ from membership.models import CustomUser
|
||||||
from opennebula_api.models import OpenNebulaManager
|
from opennebula_api.models import OpenNebulaManager
|
||||||
from opennebula_api.serializers import VirtualMachineSerializer
|
from opennebula_api.serializers import VirtualMachineSerializer
|
||||||
from utils.hosting_utils import (
|
from utils.hosting_utils import (
|
||||||
get_all_public_keys, get_or_create_vm_detail
|
get_all_public_keys, get_or_create_vm_detail, ping_ok
|
||||||
)
|
)
|
||||||
from utils.mailer import BaseEmail
|
from utils.mailer import BaseEmail
|
||||||
from utils.stripe_utils import StripeUtils
|
from utils.stripe_utils import StripeUtils
|
||||||
|
|
@ -78,14 +79,10 @@ def create_vm_task(self, vm_template_id, user, specs, template, order_id):
|
||||||
# Create OpenNebulaManager
|
# Create OpenNebulaManager
|
||||||
manager = OpenNebulaManager(email=on_user, password=on_pass)
|
manager = OpenNebulaManager(email=on_user, password=on_pass)
|
||||||
|
|
||||||
custom_user = CustomUser.objects.get(email=user.get('email'))
|
|
||||||
pub_keys = get_all_public_keys(custom_user)
|
|
||||||
if manager.email != settings.OPENNEBULA_USERNAME:
|
|
||||||
manager.save_key_in_opennebula_user('\n'.join(pub_keys))
|
|
||||||
vm_id = manager.create_vm(
|
vm_id = manager.create_vm(
|
||||||
template_id=vm_template_id,
|
template_id=vm_template_id,
|
||||||
specs=specs,
|
specs=specs,
|
||||||
ssh_key='\n'.join(pub_keys),
|
ssh_key=settings.ONEADMIN_USER_SSH_PUBLIC_KEY,
|
||||||
vm_name=vm_name
|
vm_name=vm_name
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
@ -191,9 +188,63 @@ def create_vm_task(self, vm_template_id, user, specs, template, order_id):
|
||||||
email = BaseEmail(**email_data)
|
email = BaseEmail(**email_data)
|
||||||
email.send()
|
email.send()
|
||||||
|
|
||||||
|
# try to see if we have the IPv6 of the new vm and that if the ssh
|
||||||
|
# keys can be configured
|
||||||
|
vm_ipv6 = manager.get_ipv6(vm_id)
|
||||||
logger.debug("New VM ID is {vm_id}".format(vm_id=vm_id))
|
logger.debug("New VM ID is {vm_id}".format(vm_id=vm_id))
|
||||||
if vm_id > 0:
|
if vm_ipv6 is not None:
|
||||||
|
custom_user = CustomUser.objects.get(email=user.get('email'))
|
||||||
get_or_create_vm_detail(custom_user, manager, vm_id)
|
get_or_create_vm_detail(custom_user, manager, vm_id)
|
||||||
|
if custom_user is not None:
|
||||||
|
public_keys = get_all_public_keys(custom_user)
|
||||||
|
keys = [{'value': key, 'state': True} for key in
|
||||||
|
public_keys]
|
||||||
|
if len(keys) > 0:
|
||||||
|
logger.debug(
|
||||||
|
"Calling configure on {host} for "
|
||||||
|
"{num_keys} keys".format(
|
||||||
|
host=vm_ipv6, num_keys=len(keys)
|
||||||
|
)
|
||||||
|
)
|
||||||
|
# Let's wait until the IP responds to ping before we
|
||||||
|
# run the cdist configure on the host
|
||||||
|
did_manage_public_key = False
|
||||||
|
for i in range(0, 15):
|
||||||
|
if ping_ok(vm_ipv6):
|
||||||
|
logger.debug(
|
||||||
|
"{} is pingable. Doing a "
|
||||||
|
"manage_public_key".format(vm_ipv6)
|
||||||
|
)
|
||||||
|
sleep(10)
|
||||||
|
manager.manage_public_key(
|
||||||
|
keys, hosts=[vm_ipv6]
|
||||||
|
)
|
||||||
|
did_manage_public_key = True
|
||||||
|
break
|
||||||
|
else:
|
||||||
|
logger.debug(
|
||||||
|
"Can't ping {}. Wait 5 secs".format(
|
||||||
|
vm_ipv6
|
||||||
|
)
|
||||||
|
)
|
||||||
|
sleep(5)
|
||||||
|
if not did_manage_public_key:
|
||||||
|
emsg = ("Waited for over 75 seconds for {} to be "
|
||||||
|
"pingable. But the VM was not reachable. "
|
||||||
|
"So, gave up manage_public_key. Please do "
|
||||||
|
"this manually".format(vm_ipv6))
|
||||||
|
logger.error(emsg)
|
||||||
|
email_data = {
|
||||||
|
'subject': '{} CELERY TASK INCOMPLETE: {} not '
|
||||||
|
'pingable for 75 seconds'.format(
|
||||||
|
settings.DCL_TEXT, vm_ipv6
|
||||||
|
),
|
||||||
|
'from_email': current_task.request.hostname,
|
||||||
|
'to': settings.DCL_ERROR_EMAILS_TO_LIST,
|
||||||
|
'body': emsg
|
||||||
|
}
|
||||||
|
email = EmailMessage(**email_data)
|
||||||
|
email.send()
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
logger.error(str(e))
|
logger.error(str(e))
|
||||||
try:
|
try:
|
||||||
|
|
|
||||||
|
|
@ -1,10 +0,0 @@
|
||||||
|
|
||||||
{% load staticfiles bootstrap3 i18n custom_tags humanize %}
|
|
||||||
|
|
||||||
{% block content %}
|
|
||||||
{% block userkey_form %}
|
|
||||||
{% with form_title=_("Your VM is almost ready!") form_sub_title=_("You need to specify your public SSH key to access your VM. You can either add your existing key, or generate a new key pair by clicking the generate button below. After choosing your public SSH key option you’ll be directed to the order confirmation page.") %}
|
|
||||||
{% include 'hosting/user_key.html' with title=form_title sub_title=form_sub_title %}
|
|
||||||
{% endwith %}
|
|
||||||
{% endblock userkey_form %}
|
|
||||||
{%endblock%}
|
|
||||||
|
|
@ -43,7 +43,7 @@
|
||||||
</head>
|
</head>
|
||||||
|
|
||||||
<body>
|
<body>
|
||||||
{% include "gdpr_banner.html" %}
|
|
||||||
{% block navbar %}
|
{% block navbar %}
|
||||||
{% include "datacenterlight/includes/_navbar.html" %}
|
{% include "datacenterlight/includes/_navbar.html" %}
|
||||||
{% endblock navbar %}
|
{% endblock navbar %}
|
||||||
|
|
|
||||||
|
|
@ -49,7 +49,6 @@
|
||||||
</head>
|
</head>
|
||||||
|
|
||||||
<body>
|
<body>
|
||||||
{% include "gdpr_banner.html" %}
|
|
||||||
{% cms_toolbar %}
|
{% cms_toolbar %}
|
||||||
|
|
||||||
{% render_placeholder cms_integration.navbar_placeholder %}
|
{% render_placeholder cms_integration.navbar_placeholder %}
|
||||||
|
|
|
||||||
|
|
@ -49,7 +49,6 @@
|
||||||
</head>
|
</head>
|
||||||
|
|
||||||
<body>
|
<body>
|
||||||
{% include "gdpr_banner.html" %}
|
|
||||||
{% cms_toolbar %}
|
{% cms_toolbar %}
|
||||||
|
|
||||||
{% placeholder 'datacenterlight_navbar' %}
|
{% placeholder 'datacenterlight_navbar' %}
|
||||||
|
|
|
||||||
|
|
@ -131,7 +131,6 @@
|
||||||
<h5 class="billing-head">{% trans "Credit Card" %}</h5>
|
<h5 class="billing-head">{% trans "Credit Card" %}</h5>
|
||||||
<h5 class="membership-lead">{% trans "Last" %} 4: ***** {{card.last4}}</h5>
|
<h5 class="membership-lead">{% trans "Last" %} 4: ***** {{card.last4}}</h5>
|
||||||
<h5 class="membership-lead">{% trans "Type" %}: {{card.brand}}</h5>
|
<h5 class="membership-lead">{% trans "Type" %}: {{card.brand}}</h5>
|
||||||
<h5 class="membership-lead">{% trans "Expiry" %}: {{card.exp_month}}/{{card.exp_year}}</h5>
|
|
||||||
</div>
|
</div>
|
||||||
<div class="col-xs-6 text-right align-bottom">
|
<div class="col-xs-6 text-right align-bottom">
|
||||||
<a class="btn choice-btn choice-btn-faded" href="#" data-id_card="{{card.id}}">{% trans "SELECT" %}</a>
|
<a class="btn choice-btn choice-btn-faded" href="#" data-id_card="{{card.id}}">{% trans "SELECT" %}</a>
|
||||||
|
|
|
||||||
|
|
@ -41,7 +41,6 @@
|
||||||
<h4>{% trans "Payment method" %}:</h4>
|
<h4>{% trans "Payment method" %}:</h4>
|
||||||
<p>
|
<p>
|
||||||
{{cc_brand|default:_('Credit Card')}} {% trans "ending in" %} ****{{cc_last4}}<br>
|
{{cc_brand|default:_('Credit Card')}} {% trans "ending in" %} ****{{cc_last4}}<br>
|
||||||
{% trans "Expiry" %} {{cc_exp_year}}/{{cc_exp_month}}<br/>
|
|
||||||
{{request.user.email}}
|
{{request.user.email}}
|
||||||
</p>
|
</p>
|
||||||
</div>
|
</div>
|
||||||
|
|
@ -55,25 +54,10 @@
|
||||||
</p>
|
</p>
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="col-sm-6">
|
<div class="col-sm-6">
|
||||||
{% if generic_payment_details.vat_rate > 0 %}
|
|
||||||
<p>
|
|
||||||
<span>{% trans "Price" %}: </span>
|
|
||||||
<strong class="pull-right">CHF {{generic_payment_details.amount_before_vat|floatformat:2|intcomma}}</strong>
|
|
||||||
</p>
|
|
||||||
<p>
|
|
||||||
<span>{% trans "VAT for" %} {{generic_payment_details.vat_country}} ({{generic_payment_details.vat_rate}}%) : </span>
|
|
||||||
<strong class="pull-right">CHF {{generic_payment_details.vat_amount|floatformat:2|intcomma}}</strong>
|
|
||||||
</p>
|
|
||||||
<p>
|
|
||||||
<span>{% trans "Total Amount" %} : </span>
|
|
||||||
<strong class="pull-right">CHF {{generic_payment_details.amount|floatformat:2|intcomma}}</strong>
|
|
||||||
</p>
|
|
||||||
{% else %}
|
|
||||||
<p>
|
<p>
|
||||||
<span>{% trans "Amount" %}: </span>
|
<span>{% trans "Amount" %}: </span>
|
||||||
<strong class="pull-right">CHF {{generic_payment_details.amount|floatformat:2|intcomma}}</strong>
|
<strong class="pull-right">CHF {{generic_payment_details.amount|floatformat:2|intcomma}}</strong>
|
||||||
</p>
|
</p>
|
||||||
{% endif %}
|
|
||||||
{% if generic_payment_details.description %}
|
{% if generic_payment_details.description %}
|
||||||
<p>
|
<p>
|
||||||
<span>{% trans "Description" %}: </span>
|
<span>{% trans "Description" %}: </span>
|
||||||
|
|
@ -154,11 +138,7 @@
|
||||||
<div class="col-sm-8">
|
<div class="col-sm-8">
|
||||||
{% if generic_payment_details %}
|
{% if generic_payment_details %}
|
||||||
{% if generic_payment_details.recurring %}
|
{% if generic_payment_details.recurring %}
|
||||||
{% if generic_payment_details.recurring_interval == 'year' %}
|
<div class="dcl-place-order-text">{% blocktrans with total_price=generic_payment_details.amount|floatformat:2|intcomma %}By clicking "Place order" this plan will charge your credit card account with {{total_price}} CHF/month{% endblocktrans %}.</div>
|
||||||
<div class="dcl-place-order-text">{% blocktrans with total_price=generic_payment_details.amount|floatformat:2|intcomma %}By clicking "Place order" this plan will charge your credit card account with {{total_price}} CHF/year{% endblocktrans %}.</div>
|
|
||||||
{% else %}
|
|
||||||
<div class="dcl-place-order-text">{% blocktrans with total_price=generic_payment_details.amount|floatformat:2|intcomma %}By clicking "Place order" this plan will charge your credit card account with {{total_price}} CHF/month{% endblocktrans %}.</div>
|
|
||||||
{% endif %}
|
|
||||||
{% else %}
|
{% else %}
|
||||||
<div class="dcl-place-order-text">{% blocktrans with total_price=generic_payment_details.amount|floatformat:2|intcomma %}By clicking "Place order" this payment will charge your credit card account with a one time amount of {{total_price}} CHF{% endblocktrans %}.</div>
|
<div class="dcl-place-order-text">{% blocktrans with total_price=generic_payment_details.amount|floatformat:2|intcomma %}By clicking "Place order" this payment will charge your credit card account with a one time amount of {{total_price}} CHF{% endblocktrans %}.</div>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
|
||||||
|
|
@ -1,12 +1,12 @@
|
||||||
from django.conf.urls import url
|
from django.conf.urls import url
|
||||||
from django.views.generic import TemplateView, RedirectView
|
from django.views.generic import TemplateView, RedirectView
|
||||||
|
|
||||||
from utils.views import AskSSHKeyView
|
|
||||||
from .views import (
|
from .views import (
|
||||||
IndexView, PaymentOrderView, OrderConfirmationView,
|
IndexView, PaymentOrderView, OrderConfirmationView,
|
||||||
WhyDataCenterLightView, ContactUsView
|
WhyDataCenterLightView, ContactUsView
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
urlpatterns = [
|
urlpatterns = [
|
||||||
url(r'^$', IndexView.as_view(), name='index'),
|
url(r'^$', IndexView.as_view(), name='index'),
|
||||||
url(r'^t/$', IndexView.as_view(), name='index_t'),
|
url(r'^t/$', IndexView.as_view(), name='index_t'),
|
||||||
|
|
@ -20,8 +20,6 @@ urlpatterns = [
|
||||||
url(r'^payment/?$', PaymentOrderView.as_view(), name='payment'),
|
url(r'^payment/?$', PaymentOrderView.as_view(), name='payment'),
|
||||||
url(r'^order-confirmation/?$', OrderConfirmationView.as_view(),
|
url(r'^order-confirmation/?$', OrderConfirmationView.as_view(),
|
||||||
name='order_confirmation'),
|
name='order_confirmation'),
|
||||||
url(r'^add-ssh-key/?$', AskSSHKeyView.as_view(),
|
|
||||||
name='add_ssh_key'),
|
|
||||||
url(r'^contact/?$', ContactUsView.as_view(), name='contact_us'),
|
url(r'^contact/?$', ContactUsView.as_view(), name='contact_us'),
|
||||||
url(r'glasfaser/?$',
|
url(r'glasfaser/?$',
|
||||||
TemplateView.as_view(template_name='ungleich_page/glasfaser.html'),
|
TemplateView.as_view(template_name='ungleich_page/glasfaser.html'),
|
||||||
|
|
|
||||||
|
|
@ -1,8 +1,4 @@
|
||||||
import logging
|
import logging
|
||||||
|
|
||||||
import pyotp
|
|
||||||
import requests
|
|
||||||
from django.conf import settings
|
|
||||||
from django.contrib.sites.models import Site
|
from django.contrib.sites.models import Site
|
||||||
|
|
||||||
from datacenterlight.tasks import create_vm_task
|
from datacenterlight.tasks import create_vm_task
|
||||||
|
|
@ -15,6 +11,7 @@ from .models import VMPricing, VMTemplate
|
||||||
|
|
||||||
logger = logging.getLogger(__name__)
|
logger = logging.getLogger(__name__)
|
||||||
|
|
||||||
|
|
||||||
def get_cms_integration(name):
|
def get_cms_integration(name):
|
||||||
current_site = Site.objects.get_current()
|
current_site = Site.objects.get_current()
|
||||||
try:
|
try:
|
||||||
|
|
@ -100,26 +97,6 @@ def clear_all_session_vars(request):
|
||||||
for session_var in ['specs', 'template', 'billing_address',
|
for session_var in ['specs', 'template', 'billing_address',
|
||||||
'billing_address_data', 'card_id',
|
'billing_address_data', 'card_id',
|
||||||
'token', 'customer', 'generic_payment_type',
|
'token', 'customer', 'generic_payment_type',
|
||||||
'generic_payment_details', 'product_id',
|
'generic_payment_details', 'product_id']:
|
||||||
'order_confirm_url', 'new_user_hosting_key_id']:
|
|
||||||
if session_var in request.session:
|
if session_var in request.session:
|
||||||
del request.session[session_var]
|
del request.session[session_var]
|
||||||
|
|
||||||
|
|
||||||
def check_otp(name, realm, token):
|
|
||||||
data = {
|
|
||||||
"auth_name": settings.AUTH_NAME,
|
|
||||||
"auth_token": pyotp.TOTP(settings.AUTH_SEED).now(),
|
|
||||||
"auth_realm": settings.AUTH_REALM,
|
|
||||||
"name": name,
|
|
||||||
"realm": realm,
|
|
||||||
"token": token
|
|
||||||
}
|
|
||||||
response = requests.post(
|
|
||||||
"https://{OTP_SERVER}{OTP_VERIFY_ENDPOINT}".format(
|
|
||||||
OTP_SERVER=settings.OTP_SERVER,
|
|
||||||
OTP_VERIFY_ENDPOINT=settings.OTP_VERIFY_ENDPOINT
|
|
||||||
),
|
|
||||||
data=data
|
|
||||||
)
|
|
||||||
return response.status_code
|
|
||||||
|
|
|
||||||
|
|
@ -13,22 +13,18 @@ from django.views.decorators.cache import cache_control
|
||||||
from django.views.generic import FormView, CreateView, DetailView
|
from django.views.generic import FormView, CreateView, DetailView
|
||||||
|
|
||||||
from hosting.forms import (
|
from hosting.forms import (
|
||||||
HostingUserLoginForm, GenericPaymentForm, ProductPaymentForm,
|
HostingUserLoginForm, GenericPaymentForm, ProductPaymentForm
|
||||||
UserHostingKeyForm
|
|
||||||
)
|
)
|
||||||
from hosting.models import (
|
from hosting.models import (
|
||||||
HostingBill, HostingOrder, UserCardDetail, GenericProduct, UserHostingKey
|
HostingBill, HostingOrder, UserCardDetail, GenericProduct
|
||||||
)
|
)
|
||||||
from membership.models import CustomUser, StripeCustomer
|
from membership.models import CustomUser, StripeCustomer
|
||||||
from opennebula_api.models import OpenNebulaManager
|
|
||||||
from opennebula_api.serializers import VMTemplateSerializer
|
from opennebula_api.serializers import VMTemplateSerializer
|
||||||
from utils.forms import (
|
from utils.forms import (
|
||||||
BillingAddressForm, BillingAddressFormSignup, UserBillingAddressForm,
|
BillingAddressForm, BillingAddressFormSignup, UserBillingAddressForm,
|
||||||
BillingAddress
|
BillingAddress
|
||||||
)
|
)
|
||||||
from utils.hosting_utils import (
|
from utils.hosting_utils import get_vm_price_with_vat
|
||||||
get_vm_price_with_vat, get_all_public_keys, get_vat_rate_for_country
|
|
||||||
)
|
|
||||||
from utils.stripe_utils import StripeUtils
|
from utils.stripe_utils import StripeUtils
|
||||||
from utils.tasks import send_plain_email_task
|
from utils.tasks import send_plain_email_task
|
||||||
from .cms_models import DCLCalculatorPluginModel
|
from .cms_models import DCLCalculatorPluginModel
|
||||||
|
|
@ -414,21 +410,10 @@ class PaymentOrderView(FormView):
|
||||||
product = generic_payment_form.cleaned_data.get(
|
product = generic_payment_form.cleaned_data.get(
|
||||||
'product_name'
|
'product_name'
|
||||||
)
|
)
|
||||||
user_country_vat_rate = get_vat_rate_for_country(
|
|
||||||
address_form.cleaned_data["country"]
|
|
||||||
)
|
|
||||||
gp_details = {
|
gp_details = {
|
||||||
"product_name": product.product_name,
|
"product_name": product.product_name,
|
||||||
"vat_rate": user_country_vat_rate * 100,
|
"amount": generic_payment_form.cleaned_data.get(
|
||||||
"vat_amount": round(
|
'amount'
|
||||||
float(product.product_price) *
|
|
||||||
user_country_vat_rate, 2),
|
|
||||||
"vat_country": address_form.cleaned_data["country"],
|
|
||||||
"amount_before_vat": round(
|
|
||||||
float(product.product_price), 2),
|
|
||||||
"amount": product.get_actual_price(
|
|
||||||
vat_rate=get_vat_rate_for_country(
|
|
||||||
address_form.cleaned_data["country"])
|
|
||||||
),
|
),
|
||||||
"recurring": generic_payment_form.cleaned_data.get(
|
"recurring": generic_payment_form.cleaned_data.get(
|
||||||
'recurring'
|
'recurring'
|
||||||
|
|
@ -437,9 +422,7 @@ class PaymentOrderView(FormView):
|
||||||
'description'
|
'description'
|
||||||
),
|
),
|
||||||
"product_id": product.id,
|
"product_id": product.id,
|
||||||
"product_slug": product.product_slug,
|
"product_slug": product.product_slug
|
||||||
"recurring_interval":
|
|
||||||
product.product_subscription_interval
|
|
||||||
}
|
}
|
||||||
request.session["generic_payment_details"] = (
|
request.session["generic_payment_details"] = (
|
||||||
gp_details
|
gp_details
|
||||||
|
|
@ -538,34 +521,20 @@ class PaymentOrderView(FormView):
|
||||||
request.session['customer'] = customer.stripe_id
|
request.session['customer'] = customer.stripe_id
|
||||||
else:
|
else:
|
||||||
request.session['customer'] = customer
|
request.session['customer'] = customer
|
||||||
|
return HttpResponseRedirect(
|
||||||
# For generic payment we take the user directly to confirmation
|
reverse('datacenterlight:order_confirmation'))
|
||||||
if ('generic_payment_type' in request.session and
|
|
||||||
self.request.session['generic_payment_type'] == 'generic'):
|
|
||||||
return HttpResponseRedirect(
|
|
||||||
reverse('datacenterlight:order_confirmation'))
|
|
||||||
else:
|
|
||||||
self.request.session['order_confirm_url'] = reverse('datacenterlight:order_confirmation')
|
|
||||||
return HttpResponseRedirect(
|
|
||||||
reverse('datacenterlight:add_ssh_key'))
|
|
||||||
else:
|
else:
|
||||||
context = self.get_context_data()
|
context = self.get_context_data()
|
||||||
context['billing_address_form'] = address_form
|
context['billing_address_form'] = address_form
|
||||||
return self.render_to_response(context)
|
return self.render_to_response(context)
|
||||||
|
|
||||||
|
|
||||||
class OrderConfirmationView(DetailView, FormView):
|
class OrderConfirmationView(DetailView):
|
||||||
form_class = UserHostingKeyForm
|
|
||||||
template_name = "datacenterlight/order_detail.html"
|
template_name = "datacenterlight/order_detail.html"
|
||||||
payment_template_name = 'datacenterlight/landing_payment.html'
|
payment_template_name = 'datacenterlight/landing_payment.html'
|
||||||
context_object_name = "order"
|
context_object_name = "order"
|
||||||
model = HostingOrder
|
model = HostingOrder
|
||||||
|
|
||||||
def get_form_kwargs(self):
|
|
||||||
kwargs = super(OrderConfirmationView, self).get_form_kwargs()
|
|
||||||
kwargs.update({'request': self.request})
|
|
||||||
return kwargs
|
|
||||||
|
|
||||||
@cache_control(no_cache=True, must_revalidate=True, no_store=True)
|
@cache_control(no_cache=True, must_revalidate=True, no_store=True)
|
||||||
def get(self, request, *args, **kwargs):
|
def get(self, request, *args, **kwargs):
|
||||||
context = {}
|
context = {}
|
||||||
|
|
@ -583,15 +552,11 @@ class OrderConfirmationView(DetailView, FormView):
|
||||||
card_details_response = card_details['response_object']
|
card_details_response = card_details['response_object']
|
||||||
context['cc_last4'] = card_details_response['last4']
|
context['cc_last4'] = card_details_response['last4']
|
||||||
context['cc_brand'] = card_details_response['brand']
|
context['cc_brand'] = card_details_response['brand']
|
||||||
context['cc_exp_year'] = card_details_response['exp_year']
|
|
||||||
context['cc_exp_month'] = '{:02d}'.format(card_details_response['exp_month'])
|
|
||||||
else:
|
else:
|
||||||
card_id = self.request.session.get('card_id')
|
card_id = self.request.session.get('card_id')
|
||||||
card_detail = UserCardDetail.objects.get(id=card_id)
|
card_detail = UserCardDetail.objects.get(id=card_id)
|
||||||
context['cc_last4'] = card_detail.last4
|
context['cc_last4'] = card_detail.last4
|
||||||
context['cc_brand'] = card_detail.brand
|
context['cc_brand'] = card_detail.brand
|
||||||
context['cc_exp_year'] = card_detail.exp_year
|
|
||||||
context['cc_exp_month'] ='{:02d}'.format(card_detail.exp_month)
|
|
||||||
|
|
||||||
if ('generic_payment_type' in request.session and
|
if ('generic_payment_type' in request.session and
|
||||||
self.request.session['generic_payment_type'] == 'generic'):
|
self.request.session['generic_payment_type'] == 'generic'):
|
||||||
|
|
@ -602,8 +567,6 @@ class OrderConfirmationView(DetailView, FormView):
|
||||||
else:
|
else:
|
||||||
context.update({
|
context.update({
|
||||||
'vm': request.session.get('specs'),
|
'vm': request.session.get('specs'),
|
||||||
'form': UserHostingKeyForm(request=self.request),
|
|
||||||
'keys': get_all_public_keys(self.request.user)
|
|
||||||
})
|
})
|
||||||
context.update({
|
context.update({
|
||||||
'site_url': reverse('datacenterlight:index'),
|
'site_url': reverse('datacenterlight:index'),
|
||||||
|
|
@ -758,7 +721,6 @@ class OrderConfirmationView(DetailView, FormView):
|
||||||
|
|
||||||
if ('generic_payment_type' not in request.session or
|
if ('generic_payment_type' not in request.session or
|
||||||
(request.session['generic_payment_details']['recurring'])):
|
(request.session['generic_payment_details']['recurring'])):
|
||||||
recurring_interval = 'month'
|
|
||||||
if 'generic_payment_details' in request.session:
|
if 'generic_payment_details' in request.session:
|
||||||
amount_to_be_charged = (
|
amount_to_be_charged = (
|
||||||
round(
|
round(
|
||||||
|
|
@ -771,10 +733,6 @@ class OrderConfirmationView(DetailView, FormView):
|
||||||
amount_to_be_charged
|
amount_to_be_charged
|
||||||
)
|
)
|
||||||
stripe_plan_id = plan_name
|
stripe_plan_id = plan_name
|
||||||
recurring_interval = request.session['generic_payment_details']['recurring_interval']
|
|
||||||
if recurring_interval == "year":
|
|
||||||
plan_name = "{}-yearly".format(plan_name)
|
|
||||||
stripe_plan_id = plan_name
|
|
||||||
else:
|
else:
|
||||||
template = request.session.get('template')
|
template = request.session.get('template')
|
||||||
specs = request.session.get('specs')
|
specs = request.session.get('specs')
|
||||||
|
|
@ -801,9 +759,7 @@ class OrderConfirmationView(DetailView, FormView):
|
||||||
stripe_plan = stripe_utils.get_or_create_stripe_plan(
|
stripe_plan = stripe_utils.get_or_create_stripe_plan(
|
||||||
amount=amount_to_be_charged,
|
amount=amount_to_be_charged,
|
||||||
name=plan_name,
|
name=plan_name,
|
||||||
stripe_plan_id=stripe_plan_id,
|
stripe_plan_id=stripe_plan_id)
|
||||||
interval=recurring_interval
|
|
||||||
)
|
|
||||||
subscription_result = stripe_utils.subscribe_customer_to_plan(
|
subscription_result = stripe_utils.subscribe_customer_to_plan(
|
||||||
stripe_api_cus_id,
|
stripe_api_cus_id,
|
||||||
[{"plan": stripe_plan.get(
|
[{"plan": stripe_plan.get(
|
||||||
|
|
@ -874,18 +830,6 @@ class OrderConfirmationView(DetailView, FormView):
|
||||||
new_user = authenticate(username=custom_user.email,
|
new_user = authenticate(username=custom_user.email,
|
||||||
password=password)
|
password=password)
|
||||||
login(request, new_user)
|
login(request, new_user)
|
||||||
if 'new_user_hosting_key_id' in self.request.session:
|
|
||||||
user_hosting_key = UserHostingKey.objects.get(id=self.request.session['new_user_hosting_key_id'])
|
|
||||||
user_hosting_key.user = new_user
|
|
||||||
user_hosting_key.save()
|
|
||||||
|
|
||||||
owner = new_user
|
|
||||||
manager = OpenNebulaManager(
|
|
||||||
email=owner.email,
|
|
||||||
password=owner.password
|
|
||||||
)
|
|
||||||
keys_to_save = get_all_public_keys(new_user)
|
|
||||||
manager.save_key_in_opennebula_user('\n'.join(keys_to_save))
|
|
||||||
else:
|
else:
|
||||||
# We assume that if the user is here, his/her StripeCustomer
|
# We assume that if the user is here, his/her StripeCustomer
|
||||||
# object already exists
|
# object already exists
|
||||||
|
|
@ -994,9 +938,6 @@ class OrderConfirmationView(DetailView, FormView):
|
||||||
'reply_to': [context['email']],
|
'reply_to': [context['email']],
|
||||||
}
|
}
|
||||||
send_plain_email_task.delay(email_data)
|
send_plain_email_task.delay(email_data)
|
||||||
recurring_text = _(" This is a monthly recurring plan.")
|
|
||||||
if gp_details['recurring_interval'] == "year":
|
|
||||||
recurring_text = _(" This is an yearly recurring plan.")
|
|
||||||
|
|
||||||
email_data = {
|
email_data = {
|
||||||
'subject': _("Confirmation of your payment"),
|
'subject': _("Confirmation of your payment"),
|
||||||
|
|
@ -1010,7 +951,7 @@ class OrderConfirmationView(DetailView, FormView):
|
||||||
name=user.get('name'),
|
name=user.get('name'),
|
||||||
amount=gp_details['amount'],
|
amount=gp_details['amount'],
|
||||||
recurring=(
|
recurring=(
|
||||||
recurring_text
|
_(' This is a monthly recurring plan.')
|
||||||
if gp_details['recurring'] else ''
|
if gp_details['recurring'] else ''
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
|
|
|
||||||
|
|
@ -8,7 +8,7 @@ msgid ""
|
||||||
msgstr ""
|
msgstr ""
|
||||||
"Project-Id-Version: PACKAGE VERSION\n"
|
"Project-Id-Version: PACKAGE VERSION\n"
|
||||||
"Report-Msgid-Bugs-To: \n"
|
"Report-Msgid-Bugs-To: \n"
|
||||||
"POT-Creation-Date: 2019-01-31 23:53+0000\n"
|
"POT-Creation-Date: 2017-11-06 00:24+0530\n"
|
||||||
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
|
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
|
||||||
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
||||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||||
|
|
@ -51,12 +51,62 @@ msgstr "weiterlesen"
|
||||||
msgid "by"
|
msgid "by"
|
||||||
msgstr "von"
|
msgstr "von"
|
||||||
|
|
||||||
msgid "Digital Glarus Gallery"
|
msgid "US English"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
msgid "Digital Glarus Supporters"
|
msgid "German"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
msgid "Content"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
msgid "default"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
msgid "2 Column"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
msgid "3 Column"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
msgid "DG.About"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#, fuzzy
|
||||||
|
#| msgid "contact/?$"
|
||||||
|
msgid "DG.Contact"
|
||||||
|
msgstr "kontakt/?$"
|
||||||
|
|
||||||
|
msgid "DG.Home"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
msgid "DG.CoWork"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
msgid "DG.OneColumn"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
msgid "Blog"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
msgid "Page"
|
||||||
|
msgstr "Seite"
|
||||||
|
|
||||||
|
msgid "Data Center Light"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
msgid "Glasfaser"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
msgid "English"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
msgid "Deutsch"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
msgid "Amount"
|
||||||
|
msgstr "Betrag"
|
||||||
|
|
||||||
msgid "Street Address"
|
msgid "Street Address"
|
||||||
msgstr "Adresse"
|
msgstr "Adresse"
|
||||||
|
|
||||||
|
|
@ -69,33 +119,148 @@ msgstr "Postleitzahl"
|
||||||
msgid "Country"
|
msgid "Country"
|
||||||
msgstr "Land"
|
msgstr "Land"
|
||||||
|
|
||||||
msgid "You haven been logged out"
|
msgid "My Donations"
|
||||||
msgstr "Sie wurden abgemeldet"
|
msgstr ""
|
||||||
|
|
||||||
|
msgid "Logout"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
msgid "Set your new password"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
msgid "Reset"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
msgid "Already have an account ?"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
msgid "Log in"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
msgid "Invoice"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
msgid "Donation #"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
msgid "Billing Address:"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
msgid "Date:"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
msgid "Payment Method:"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
msgid "Donation summary"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
msgid "Donation"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
msgid "Total"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
msgid "Finish Configuration"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
msgid ""
|
||||||
|
"Thanks for you donation, you can cancel your monthly donation at any time "
|
||||||
|
"going to profile > subscription "
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
msgid "View Donations"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
msgid "Cancel Donation"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
msgid "Donate"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
msgid "Donations Made"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
msgid "Date"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
msgid "View Detail"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
msgid "previous"
|
msgid "previous"
|
||||||
msgstr "vorherige"
|
msgstr "vorherige"
|
||||||
|
|
||||||
msgid "Page"
|
|
||||||
msgstr "Seite"
|
|
||||||
|
|
||||||
msgid "of"
|
|
||||||
msgstr "vom"
|
|
||||||
|
|
||||||
msgid "next"
|
msgid "next"
|
||||||
msgstr "nächste"
|
msgstr "nächste"
|
||||||
|
|
||||||
|
msgid "Reanude Donation"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#, python-format
|
||||||
|
msgid ""
|
||||||
|
"You're receiving this email because you requested a password reset for your "
|
||||||
|
"user account at %(site_name)s."
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
msgid "Please go to the following page and choose a new password:"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
msgid "Thanks for using our site!"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#, python-format
|
||||||
|
msgid "The %(site_name)s team"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
msgid "You haven been logged out"
|
||||||
|
msgstr "Sie wurden abgemeldet"
|
||||||
|
|
||||||
|
msgid "Log in "
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
msgid "Login"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
msgid "Don't have an account yet ? "
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
msgid "Sign up"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
msgid "Forgot your password ? "
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
msgid "Reset your password"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
msgid "DG.Detail"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
msgid "Page Header"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
msgid "Change to language:"
|
msgid "Change to language:"
|
||||||
msgstr "Sprache wechseln zu: "
|
msgstr "Sprache wechseln zu: "
|
||||||
|
|
||||||
|
#, python-format
|
||||||
|
msgid "No %(verbose_name)s found matching the query"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
msgid "Digital Glarus Gallery"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
msgid "Digital Glarus Supporters"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
msgid "of"
|
||||||
|
msgstr "vom"
|
||||||
|
|
||||||
msgid "Bookings"
|
msgid "Bookings"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
msgid "Membership"
|
msgid "Membership"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
msgid "Logout"
|
|
||||||
msgstr ""
|
|
||||||
|
|
||||||
msgid "booking/payment/edit/?$"
|
msgid "booking/payment/edit/?$"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -164,644 +329,6 @@ msgstr "befurworter/?$"
|
||||||
msgid "Message Successfully Sent"
|
msgid "Message Successfully Sent"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
msgid "US English"
|
|
||||||
msgstr ""
|
|
||||||
|
|
||||||
msgid "German"
|
|
||||||
msgstr ""
|
|
||||||
|
|
||||||
msgid "Content"
|
|
||||||
msgstr ""
|
|
||||||
|
|
||||||
msgid "default"
|
|
||||||
msgstr ""
|
|
||||||
|
|
||||||
msgid "2 Column"
|
|
||||||
msgstr ""
|
|
||||||
|
|
||||||
msgid "3 Column"
|
|
||||||
msgstr ""
|
|
||||||
|
|
||||||
msgid "DG.About"
|
|
||||||
msgstr ""
|
|
||||||
|
|
||||||
#, fuzzy
|
|
||||||
#| msgid "contact/?$"
|
|
||||||
msgid "DG.Contact"
|
|
||||||
msgstr "kontakt/?$"
|
|
||||||
|
|
||||||
msgid "DG.Home"
|
|
||||||
msgstr ""
|
|
||||||
|
|
||||||
msgid "DG.CoWork"
|
|
||||||
msgstr ""
|
|
||||||
|
|
||||||
msgid "DG.OneColumn"
|
|
||||||
msgstr ""
|
|
||||||
|
|
||||||
msgid "Blog"
|
|
||||||
msgstr ""
|
|
||||||
|
|
||||||
msgid "Data Center Light"
|
|
||||||
msgstr ""
|
|
||||||
|
|
||||||
msgid "Glasfaser"
|
|
||||||
msgstr ""
|
|
||||||
|
|
||||||
msgid "ungleich"
|
|
||||||
msgstr ""
|
|
||||||
|
|
||||||
msgid "English"
|
|
||||||
msgstr ""
|
|
||||||
|
|
||||||
msgid "Deutsch"
|
|
||||||
msgstr ""
|
|
||||||
|
|
||||||
msgid "Datacenterlight Navbar"
|
|
||||||
msgstr ""
|
|
||||||
|
|
||||||
msgid "Datacenterlight Footer"
|
|
||||||
msgstr ""
|
|
||||||
|
|
||||||
msgid "Datacenterlight Calculator"
|
|
||||||
msgstr ""
|
|
||||||
|
|
||||||
msgid "Amount"
|
|
||||||
msgstr "Betrag"
|
|
||||||
|
|
||||||
msgid "My Donations"
|
|
||||||
msgstr ""
|
|
||||||
|
|
||||||
msgid "Set your new password"
|
|
||||||
msgstr ""
|
|
||||||
|
|
||||||
msgid "Reset"
|
|
||||||
msgstr ""
|
|
||||||
|
|
||||||
msgid "Already have an account ?"
|
|
||||||
msgstr ""
|
|
||||||
|
|
||||||
msgid "Log in"
|
|
||||||
msgstr ""
|
|
||||||
|
|
||||||
msgid "Invoice"
|
|
||||||
msgstr ""
|
|
||||||
|
|
||||||
msgid "Donation #"
|
|
||||||
msgstr ""
|
|
||||||
|
|
||||||
msgid "Billing Address:"
|
|
||||||
msgstr ""
|
|
||||||
|
|
||||||
msgid "Date:"
|
|
||||||
msgstr ""
|
|
||||||
|
|
||||||
msgid "Payment Method:"
|
|
||||||
msgstr ""
|
|
||||||
|
|
||||||
msgid "Donation summary"
|
|
||||||
msgstr ""
|
|
||||||
|
|
||||||
msgid "Donation"
|
|
||||||
msgstr ""
|
|
||||||
|
|
||||||
msgid "Total"
|
|
||||||
msgstr ""
|
|
||||||
|
|
||||||
msgid "Finish Configuration"
|
|
||||||
msgstr ""
|
|
||||||
|
|
||||||
msgid ""
|
|
||||||
"Thanks for you donation, you can cancel your monthly donation at any time "
|
|
||||||
"going to profile > subscription "
|
|
||||||
msgstr ""
|
|
||||||
|
|
||||||
msgid "View Donations"
|
|
||||||
msgstr ""
|
|
||||||
|
|
||||||
msgid "Cancel Donation"
|
|
||||||
msgstr ""
|
|
||||||
|
|
||||||
msgid "Donate"
|
|
||||||
msgstr ""
|
|
||||||
|
|
||||||
msgid "Donations Made"
|
|
||||||
msgstr ""
|
|
||||||
|
|
||||||
msgid "Date"
|
|
||||||
msgstr ""
|
|
||||||
|
|
||||||
msgid "View Detail"
|
|
||||||
msgstr ""
|
|
||||||
|
|
||||||
msgid "Reanude Donation"
|
|
||||||
msgstr ""
|
|
||||||
|
|
||||||
#, python-format
|
|
||||||
msgid ""
|
|
||||||
"You're receiving this email because you requested a password reset for your "
|
|
||||||
"user account at %(site_name)s."
|
|
||||||
msgstr ""
|
|
||||||
|
|
||||||
msgid "Please go to the following page and choose a new password:"
|
|
||||||
msgstr ""
|
|
||||||
|
|
||||||
msgid "Thanks for using our site!"
|
|
||||||
msgstr ""
|
|
||||||
|
|
||||||
#, python-format
|
|
||||||
msgid "The %(site_name)s team"
|
|
||||||
msgstr ""
|
|
||||||
|
|
||||||
msgid "Log in "
|
|
||||||
msgstr ""
|
|
||||||
|
|
||||||
msgid "Login"
|
|
||||||
msgstr ""
|
|
||||||
|
|
||||||
msgid "Don't have an account yet ? "
|
|
||||||
msgstr ""
|
|
||||||
|
|
||||||
msgid "Sign up"
|
|
||||||
msgstr ""
|
|
||||||
|
|
||||||
msgid "Forgot your password ? "
|
|
||||||
msgstr ""
|
|
||||||
|
|
||||||
msgid "Reset your password"
|
|
||||||
msgstr ""
|
|
||||||
|
|
||||||
msgid "DG.Detail"
|
|
||||||
msgstr ""
|
|
||||||
|
|
||||||
msgid ""
|
|
||||||
"This site uses cookies for analytics. By continuing to\n"
|
|
||||||
" browse this site, you agree to use this."
|
|
||||||
msgstr ""
|
|
||||||
"Diese Website verwendet Cookies für Analysezwecke. Mit dem weiterem Besuch "
|
|
||||||
"dieser Website erklärst Du Dich damit einverstanden, diese zu nutzen."
|
|
||||||
|
|
||||||
msgid "Learn more"
|
|
||||||
msgstr "Lerne mehr"
|
|
||||||
|
|
||||||
msgid "OK"
|
|
||||||
msgstr ""
|
|
||||||
|
|
||||||
msgid "Privacy policy"
|
|
||||||
msgstr "Datenschutz-Bestimmungen"
|
|
||||||
|
|
||||||
msgid ""
|
|
||||||
"\n"
|
|
||||||
" <strong>1. Responsibility and scope</strong><br/>\n"
|
|
||||||
" <br/>\n"
|
|
||||||
" Responsible in regards to EU General Data Protection\n"
|
|
||||||
" Regulation (\"GDPR\") and other applicable data "
|
|
||||||
"protection\n"
|
|
||||||
" laws:<br/>\n"
|
|
||||||
" <br/>\n"
|
|
||||||
" ungleich glarus ag<br/>\n"
|
|
||||||
" Bahnhofstrasse 1<br/>\n"
|
|
||||||
" 8783 Linthal (CH)<br/>\n"
|
|
||||||
" Tel.: +41 55 505 6266<br/>\n"
|
|
||||||
" E-Mail: info@ungleich.ch<br/>\n"
|
|
||||||
" <br/>\n"
|
|
||||||
" This privacy statement applies to the web content of\n"
|
|
||||||
" ungleich glarus ag, available at the<br/>\n"
|
|
||||||
" following domains:<br/>\n"
|
|
||||||
" <br/>\n"
|
|
||||||
" ungleich.ch<br/>\n"
|
|
||||||
" datacenterlight.ch<br/>\n"
|
|
||||||
" devuanhosting.com<br/>\n"
|
|
||||||
" devuanhosting.ch<br/>\n"
|
|
||||||
" digitalglarus.ch<br/>\n"
|
|
||||||
" hack4lgarus.ch<br/>\n"
|
|
||||||
" ipv6onlyhosting.com<br/>\n"
|
|
||||||
" ipv6onlyhosting.ch<br/>\n"
|
|
||||||
" ipv6onlyhosting.net<br/>\n"
|
|
||||||
" django-hosting.ch<br/>\n"
|
|
||||||
" rails-hosting.ch<br/>\n"
|
|
||||||
" node-hosting.ch<br/>\n"
|
|
||||||
" blog.ungleich.ch<br/>\n"
|
|
||||||
" <br/>\n"
|
|
||||||
" The Data Privacy Officer:<br/>\n"
|
|
||||||
" <br/>\n"
|
|
||||||
" Sanghee Kim<br/>\n"
|
|
||||||
" ungleich glarus ag<br/>\n"
|
|
||||||
" Bahnhofstrasse 1<br/>\n"
|
|
||||||
" 8783 Linthal (CH)<br/>\n"
|
|
||||||
" E-Mail: <a href=\"mailto:sanghee.kim@ungleich.ch"
|
|
||||||
"\">sanghee.kim@ungleich.ch</a><br/>\n"
|
|
||||||
" <br/>\n"
|
|
||||||
" <br/>\n"
|
|
||||||
" <strong>2. General</strong><br/>\n"
|
|
||||||
" <br/>\n"
|
|
||||||
" User data is personal data which is necessary to "
|
|
||||||
"establish\n"
|
|
||||||
" or change the contractual relations\n"
|
|
||||||
" between ungleich glarus ag (\"us\") and you. This "
|
|
||||||
"includes\n"
|
|
||||||
" among other things for example the\n"
|
|
||||||
" name, the address, the date of birth, the e-mail address "
|
|
||||||
"or\n"
|
|
||||||
" the IP address. We save and use\n"
|
|
||||||
" your personal data only for the processing of your "
|
|
||||||
"orders\n"
|
|
||||||
" or for getting in contact with you.<br/>\n"
|
|
||||||
" <br/>\n"
|
|
||||||
" <br/>\n"
|
|
||||||
" <strong>3. Processing of personal data</strong><br/>\n"
|
|
||||||
" <br/>\n"
|
|
||||||
" When you call one of our websites we collect your IP\n"
|
|
||||||
" address. When you register an account with us your "
|
|
||||||
"contact\n"
|
|
||||||
" data will be stored. When you order products on our\n"
|
|
||||||
" platform we also collect among others your address and "
|
|
||||||
"your\n"
|
|
||||||
" payment details.<br/>\n"
|
|
||||||
" <br/>\n"
|
|
||||||
" <strong>I. Registration data</strong><br/>\n"
|
|
||||||
" <br/>\n"
|
|
||||||
" In the process of registration we need to collect some "
|
|
||||||
"of\n"
|
|
||||||
" your personal data. For example we collect your name, "
|
|
||||||
"your\n"
|
|
||||||
" address, your telephone number, your e-mail address and\n"
|
|
||||||
" your payment details to process orders. We do not "
|
|
||||||
"collect\n"
|
|
||||||
" your payment details such as credit card number, "
|
|
||||||
"expiration\n"
|
|
||||||
" date or the cvv code when you pay with credit card. You\n"
|
|
||||||
" expose those data directly to the respective payment\n"
|
|
||||||
" processor. Payments with credit card are processed by\n"
|
|
||||||
" Stripe Payments Europe Ltd. (\"Stripe\").<br/>\n"
|
|
||||||
" <br/>\n"
|
|
||||||
" <br/>\n"
|
|
||||||
" <strong>II. Server log files</strong><br/>\n"
|
|
||||||
" <br/>\n"
|
|
||||||
" When you call one of our websites we automatically save\n"
|
|
||||||
" traffic data. Normally the IP address, the type and "
|
|
||||||
"version\n"
|
|
||||||
" of your browser, the time and the website that lead to "
|
|
||||||
"our\n"
|
|
||||||
" website (\"Referer\") will be saved. Your IP address is\n"
|
|
||||||
" collected anonymously so that we cannot match it with "
|
|
||||||
"your\n"
|
|
||||||
" person. The collection of those data is necessary to\n"
|
|
||||||
" provide our websites and services, according to Art. 6 "
|
|
||||||
"par.\n"
|
|
||||||
" 1 lit. f GDPR.<br/>\n"
|
|
||||||
" <br/>\n"
|
|
||||||
" <br/>\n"
|
|
||||||
" <strong>4. Storage durations</strong><br/>\n"
|
|
||||||
" <br/>\n"
|
|
||||||
" Your data will be deleted immediately, as soon as it "
|
|
||||||
"isn't\n"
|
|
||||||
" relevant anymore for any contract between you and us. "
|
|
||||||
"In\n"
|
|
||||||
" some cases it could be necessary to store your data\n"
|
|
||||||
" further, to comply with our contractual or other legal\n"
|
|
||||||
" obligatons.<br/>\n"
|
|
||||||
" <br/>\n"
|
|
||||||
" <br/>\n"
|
|
||||||
" <strong>5. Disclosure of your personal data</strong><br/"
|
|
||||||
">\n"
|
|
||||||
" <br/>\n"
|
|
||||||
" We don't disclose your personal data to third parties,\n"
|
|
||||||
" except:<br/>\n"
|
|
||||||
" <br/>\n"
|
|
||||||
" a) You grant us your explicit permission according to "
|
|
||||||
"Art.\n"
|
|
||||||
" 6 par. 1 S. 1 lit. a GDPR.<br/>\n"
|
|
||||||
" <br/>\n"
|
|
||||||
" b) The disclosure of your data is legal and it is "
|
|
||||||
"necessary\n"
|
|
||||||
" to comply with our contractual or other legal "
|
|
||||||
"obligations,\n"
|
|
||||||
" according to Art. 6 par. 1 S. 1 lit b GDPR.<br/>\n"
|
|
||||||
" <br/>\n"
|
|
||||||
" c) There is a law or legal obligation to disclose your "
|
|
||||||
"data\n"
|
|
||||||
" or the disclosure is necessary for the performance of a\n"
|
|
||||||
" task carried out in the public interest or in the "
|
|
||||||
"exercise\n"
|
|
||||||
" of an official authority according to Art. 6 par. 1 S. "
|
|
||||||
"1\n"
|
|
||||||
" lit. c GDPR.<br/>\n"
|
|
||||||
" <br/>\n"
|
|
||||||
" d) The disclosure of your data is necessary for the\n"
|
|
||||||
" purposes of the legitimate interests pursued by us or by "
|
|
||||||
"a\n"
|
|
||||||
" third party, except where such interests are overridden "
|
|
||||||
"by\n"
|
|
||||||
" the interests or your fundamental right according to "
|
|
||||||
"Art.\n"
|
|
||||||
" 6. par. 1 S. 1 lit. f GDPR.<br/>\n"
|
|
||||||
" <br/>\n"
|
|
||||||
" <br/>\n"
|
|
||||||
" <strong>6. Cookies, Google Analytics, Twitter</"
|
|
||||||
"strong><br/>\n"
|
|
||||||
" <br/>\n"
|
|
||||||
" We use Cookies. When you visit one of our websites,\n"
|
|
||||||
" information is stored on your terminal device in the "
|
|
||||||
"form\n"
|
|
||||||
" of a \"cookie\". Cookies are small text files that are "
|
|
||||||
"stored\n"
|
|
||||||
" on your terminal device by your browser. You can opt-out "
|
|
||||||
"of\n"
|
|
||||||
" the storage of cookies in the settings of your\n"
|
|
||||||
" browser-software, but however, in this case you might "
|
|
||||||
"not\n"
|
|
||||||
" be able to fully use all functions and services on our\n"
|
|
||||||
" website.<br/>\n"
|
|
||||||
" <br/>\n"
|
|
||||||
" We use Google Analytics, a service provided by Google "
|
|
||||||
"Inc.,\n"
|
|
||||||
" 1600 Amphitheatre Parkway, Mountainview, CA 94043, USA\n"
|
|
||||||
" (\"Google\"). Google uses Cookies. Google will use "
|
|
||||||
"these\n"
|
|
||||||
" cookies on our behalf to analyse how you use our "
|
|
||||||
"websites\n"
|
|
||||||
" and to generate reports about the activities on our\n"
|
|
||||||
" websites. The information collected by those cookies "
|
|
||||||
"will\n"
|
|
||||||
" be transmitted to a Google server in the United States "
|
|
||||||
"of\n"
|
|
||||||
" America. We have Google's IP anonymization activated, "
|
|
||||||
"so\n"
|
|
||||||
" your IP address will be shortened before transmitting "
|
|
||||||
"to\n"
|
|
||||||
" Google. Only in exceptional cases the full IP address "
|
|
||||||
"will\n"
|
|
||||||
" be transmitted and then shortened afterwards. <br/>\n"
|
|
||||||
" <br/>\n"
|
|
||||||
" You may opt out from thecollection of these cookies by\n"
|
|
||||||
" downloading and installing a browser plugin available "
|
|
||||||
"at\n"
|
|
||||||
" the following link:<br/>\n"
|
|
||||||
" <br/>\n"
|
|
||||||
" <a href=\"http://tools.google.com/dlpage/gaoptout"
|
|
||||||
"\">http://tools.google.com/dlpage/gaoptout</a><br/>\n"
|
|
||||||
" <br/>\n"
|
|
||||||
" You may find further information about the processing "
|
|
||||||
"of\n"
|
|
||||||
" your personal data at the following links:<br/>\n"
|
|
||||||
" <br/>\n"
|
|
||||||
" <a href=\"https://policies.google.com/technologies/ads"
|
|
||||||
"\">https://policies.google.com/technologies/ads</a><br/>\n"
|
|
||||||
" <br/>\n"
|
|
||||||
" <a href=\"https://www.privacyshield.gov/participant?"
|
|
||||||
"id=a2zt000000001L5AAI&status=Active\">https://www.privacyshield.gov/"
|
|
||||||
"participant?id=a2zt000000001L5AAI&status=Active</a><br/>\n"
|
|
||||||
" <br/>\n"
|
|
||||||
" <a href=\"https://adssettings.google.com/authenticated"
|
|
||||||
"\">https://adssettings.google.com/authenticated</a><br/>\n"
|
|
||||||
" <br/>\n"
|
|
||||||
" The collected personal data will be deleted or "
|
|
||||||
"anonymized\n"
|
|
||||||
" after 14 months according to Art. 6 par. 1 lit. f\n"
|
|
||||||
" GDPR.<br/>\n"
|
|
||||||
" <br/>\n"
|
|
||||||
" Our websites use several functions from the social "
|
|
||||||
"network\n"
|
|
||||||
" Twitter, a service provided by Twitter Inc., 1355 "
|
|
||||||
"Market\n"
|
|
||||||
" Street, Suite 900, San Francisco, CA 94103, USA. We may\n"
|
|
||||||
" embed content of Twitter in our websites, such as "
|
|
||||||
"photos,\n"
|
|
||||||
" videos, texts or buttons. If you are registered with\n"
|
|
||||||
" Twitter, they may combine your use of these "
|
|
||||||
"functionalities\n"
|
|
||||||
" on our websites with your Twitter account. You may find\n"
|
|
||||||
" further information at https://twitter.com/de/privacy."
|
|
||||||
"<br/>\n"
|
|
||||||
" <br/>\n"
|
|
||||||
" <br/>\n"
|
|
||||||
" <strong>7. Your rights concerning your personal\n"
|
|
||||||
" data</strong><br/>\n"
|
|
||||||
" <br/>\n"
|
|
||||||
" Under applicable GDPR you may have the right to:<br/>\n"
|
|
||||||
" <br/>\n"
|
|
||||||
" a) Obtain confirmation as to whether or not personal "
|
|
||||||
"data\n"
|
|
||||||
" concerning you are being processed, and where that is "
|
|
||||||
"the\n"
|
|
||||||
" case, access to the personal data, according to Art. 15\n"
|
|
||||||
" GDPR.<br/>\n"
|
|
||||||
" <br/>\n"
|
|
||||||
" b) Obtain the rectification of false or inaccurate data\n"
|
|
||||||
" concerning you, according to Art. 15, Art. 16 GDPR.<br/"
|
|
||||||
">\n"
|
|
||||||
" <br/>\n"
|
|
||||||
" c) Obtain the deletion of your personal data, according "
|
|
||||||
"to\n"
|
|
||||||
" Art. 17 GDPR.<br/>\n"
|
|
||||||
" <br/>\n"
|
|
||||||
" d) Obtain the restriction of processing your personal "
|
|
||||||
"data,\n"
|
|
||||||
" according to Art. 18 GDPR.<br/>\n"
|
|
||||||
" <br/>\n"
|
|
||||||
" e) Obtain a digital copy of your personal data processed "
|
|
||||||
"by\n"
|
|
||||||
" us, according to Art. 20 GDPR.<br/>\n"
|
|
||||||
" <br/>\n"
|
|
||||||
" f) Revoke a granted permission regarding your personal "
|
|
||||||
"data\n"
|
|
||||||
" at any time, according to Art. 7 par. 3 GDPR.<br/>\n"
|
|
||||||
" <br/>\n"
|
|
||||||
" g) Complain at a data protection authority, according "
|
|
||||||
"to\n"
|
|
||||||
" Art. 77 GDPR.<br/>\n"
|
|
||||||
" <br/>\n"
|
|
||||||
" <br/>\n"
|
|
||||||
" <br/>\n"
|
|
||||||
" <strong>8. Hyperlinks / Disclaimer</strong><br/>\n"
|
|
||||||
" <br/>\n"
|
|
||||||
" This privacy policy applies only to our websites and not "
|
|
||||||
"to\n"
|
|
||||||
" other websites or applications operated by third "
|
|
||||||
"parties.\n"
|
|
||||||
" We may provide links to other websites but we are not\n"
|
|
||||||
" responsible for the privacy practices of such other\n"
|
|
||||||
" websites.<br/>\n"
|
|
||||||
" <br/>\n"
|
|
||||||
" <br/>\n"
|
|
||||||
" "
|
|
||||||
msgstr ""
|
|
||||||
"\n"
|
|
||||||
"<strong>1. Verantwortung und Geltungsbereich</strong><br/><br/"
|
|
||||||
">Verantwortlich im Sinne der EU-Datenschutzgrundverordnung („DSGVO“) und "
|
|
||||||
"sonstiger datenschutzrechtlicher Bestimmungen ist:<br/><br/>ungleich glarus "
|
|
||||||
"ag<br/>Bahnhofstrasse 1<br/>8783 Linthal (CH)<br/>Tel.: +41 55 505 6266<br/"
|
|
||||||
">E-Mail: info@ungleich.ch<br/><br/>Diese Datenschutzerklärung gilt für das "
|
|
||||||
"Internetangebot der ungleich glarus ag, welches unter den nachfolgenden "
|
|
||||||
"Domains erreichbar ist:<br/><br/>ungleich.ch<br/>datacenterlight.ch<br/"
|
|
||||||
">devuanhosting.com<br/>devuanhosting.ch<br/>digitalglarus.ch<br/>hack4lgarus."
|
|
||||||
"ch<br/>ipv6onlyhosting.com<br/>ipv6onlyhosting.ch<br/>ipv6onlyhosting.net<br/"
|
|
||||||
">django-hosting.ch<br/>rails-hosting.ch<br/>node-hosting.ch<br/>blog."
|
|
||||||
"ungleich.ch<br/><br/>Der Datenschutzbeauftragte des Verantwortlichen ist:<br/"
|
|
||||||
"><br/>Sanghee Kim<br/>ungleich glarus ag<br/>Bahnhofstrasse 1<br/>8783 "
|
|
||||||
"Linthal (CH)<br/>E-Mail: <a href=\"mailto:sanghee.kim@ungleich.ch\">sanghee."
|
|
||||||
"kim@ungleich.ch</a><br/><br/><br/><strong>2. Grundsätzliches</strong><br/"
|
|
||||||
"><br/>Bei personenbezogenen Daten handelt es sich um alle Informationen, die "
|
|
||||||
"sich auf eine identifizierte oder identifizierbare natürliche Person "
|
|
||||||
"beziehen. Hierzu gehört zum Beispiel dein Name, deine Anschrift, dein "
|
|
||||||
"Geburtsdatum, deine E-Mail-Adresse oder deine IP-Adresse. Wir speichern und "
|
|
||||||
"verwenden deine personenbezogenen Daten ausschließlich für die Bearbeitung "
|
|
||||||
"deiner Aufträge und für die Kontaktaufnahme mit dir.<br/><br/><br/"
|
|
||||||
"><strong>3. Verarbeitung deiner personenbezogenen Daten</strong><br/><br/"
|
|
||||||
">Bei jedem Aufruf einer unserer Internetseiten wird u. a. deine IP-Adresse "
|
|
||||||
"gespeichert. Wenn du dich bei uns registrierst, werden deine Kontaktdaten "
|
|
||||||
"gespeichert. Wenn du Aufträge an uns richtest oder Produkte bei uns "
|
|
||||||
"bestellst, werden darüber hinaus auch deine Anschrift und deine<br/"
|
|
||||||
">Zahlungsdaten gespeichert.<br/><br/><strong>I. Registrierungsdaten</"
|
|
||||||
"strong><br/><br/>Im Rahmen der Registrierung müssen wir einige "
|
|
||||||
"personenbezogene Daten von dir erheben und verarbeiten. Beispielsweise "
|
|
||||||
"benötigen wir deinen Namen, deine Anschrift, deine Telefonnummer, deine E-"
|
|
||||||
"Mail-Adresse und deine Zahlungsdaten um deine Aufträge zu verarbeiten. <br/"
|
|
||||||
">Bei der Zahlung mittels Kreditkarte erfassen und speichern wir keine "
|
|
||||||
"Zahlungsverkehrsinformationen wie Kreditkartennummern, das Ablaufdatum oder "
|
|
||||||
"die Prüfziffer. Diese gibst du ausschließlich direkt dem entsprechenden "
|
|
||||||
"Zahlungsdienstleister bekannt. Bei der Bezahlung mit Kreditkarte erfolgt die "
|
|
||||||
"Abwicklung der Bezahlung durch einen externen Dienstleister. <br/>Für die "
|
|
||||||
"Kreditkartenzahlung werden deine Angaben direkt vom Diensteanbieter Stripe "
|
|
||||||
"Payments Europe Ltd. („Stripe“) verarbeitet.<br/><br/><strong>II. "
|
|
||||||
"Serverlogdateien</strong><br/><br/>Bei jedem Aufruf einer unserer "
|
|
||||||
"Internetseiten speichern wir automatisch bestimmte Daten. Dazu gehören u. a. "
|
|
||||||
"deine IP-Adresse, Typ und Version des verwendeten Browsers, Uhrzeit, Datum "
|
|
||||||
"und die Webseite von der du auf unsere Seite gelangst (sog. „Referer“). "
|
|
||||||
"Deine IP-Adresse wird bei uns nur anonymisiert gespeichert, sodass ein "
|
|
||||||
"Personenbezug nicht mehr herstellbar ist. Die Erfassung der Daten zur "
|
|
||||||
"Bereitstellung unserer Internetseiten und die Speicherung der Daten in den "
|
|
||||||
"Server Logfiles ist für den Betrieb der Internetseite zwingend erforderlich "
|
|
||||||
"und dient damit der Wahrung eines berechtigten Interesses unseres "
|
|
||||||
"Unternehmens. Die Rechtsgrundlage für diese Verarbeitung ist Art. 6. Abs. 1 "
|
|
||||||
"lit. f DSGVO.<br/><br/><br/><strong>4. Speicherdauer</strong><br/><br/"
|
|
||||||
">Sofern die verarbeiteten personenbezogenen Daten für die Durchführung eines "
|
|
||||||
"ggf.<br/>geschlossenen Vertrages nicht mehr erforderlich sind, werden sie "
|
|
||||||
"umgehend gelöscht. Jedoch kann es auch nach Abschluss des Vertrags "
|
|
||||||
"erforderlich sein, personenbezogene Daten von dir zu speichern, um unseren "
|
|
||||||
"vertraglichen oder gesetzlichen Verpflichtungen nachzukommen.<br/><br/><br/"
|
|
||||||
"><strong>5. Weitergabe von personenbezogenen Daten</strong><br/><br/>Wir "
|
|
||||||
"geben deine personenbezogenen Daten grundsätzlich nicht an Dritte weiter, es "
|
|
||||||
"sei denn:<br/><br/>a) Du erteilst uns hierzu deine ausdrückliche "
|
|
||||||
"Einwilligung nach Art. 6 Abs. 1 S. 1 lit. a DSGVO.<br/><br/>b) Die "
|
|
||||||
"Weitergabe der Daten ist gesetzlich zulässig und nach Art. 6. Abs. 1 S. 1 "
|
|
||||||
"lit b DSGVO zur Erfüllung unserer vertraglichen Pflichten mit Ihnen "
|
|
||||||
"erforderlich.<br/><br/>c) Für die Weitergabe der Daten besteht nach Art. 6. "
|
|
||||||
"Abs. 1 S. 1 lit. c DSGVO eine gesetzliche Verpflichtung.<br/><br/>d) Die "
|
|
||||||
"Weitergabe der Daten ist nach Art. 6. Abs. 1 S. 1 lit. f DSGVO zur Wahrung "
|
|
||||||
"unserer berechtigten Interessen, sowie zur Geltendmachung, Ausübung oder "
|
|
||||||
"<Verteidigung von Rechtsansprüchen erforderlich und darüber hinaus kein "
|
|
||||||
"Grund zu der Annahme besteht, dass du ein überwiegendes schutzwürdiges "
|
|
||||||
"Interesse an der Nichtweitergabe deiner Daten hast.<br/><br/><br/><br/"
|
|
||||||
"><strong>6. Cookies, Google Analytics und Twitter</strong><br/><br/>Wir "
|
|
||||||
"setzen auf unseren Internetseiten sog. „Cookies“ ein. Cookies sind kleine "
|
|
||||||
"Textdateien, die im Rahmen deines Besuchs einer unserer Internetseiten von "
|
|
||||||
"uns an den Browser deines Endgeräts gesendet und dort gespeichert werden. "
|
|
||||||
"Einige Funktionen unseres Angebots können ohne den Einsatz bestimmter "
|
|
||||||
"Cookies grundsätzlich aus technischen Gründen nicht angeboten werden. Du "
|
|
||||||
"kannst deinen Browser allerdings so konfigurieren, dass er nur noch "
|
|
||||||
"bestimmte oder auch gar keine Cookies mehr akzeptiert. Es kann jedoch "
|
|
||||||
"passieren, dass du dadurch möglicherweise nicht mehr alle Funktionen unserer "
|
|
||||||
"Internetseiten nutzen kannst.<br/>Andere Cookies ermöglichen es uns hingegen "
|
|
||||||
"verschiedene Analysen deines Verhaltens oder etwa eine Verbindung zu deinen "
|
|
||||||
"sozialen Netzwerken aufzubauen. Mithilfe dieser Cookies können wir "
|
|
||||||
"beispielsweise unser Internetangebot für dich nutzerfreundlicher und "
|
|
||||||
"effektiver gestalten. Daraus folgt, dass wir auf Grundlage unserer "
|
|
||||||
"berechtigten Unternehmensinteressen (Optimierung und wirtschaftlicher "
|
|
||||||
"Betrieb unseres Internetangebots) den Werbeanalysedienst „Google Analytics“ "
|
|
||||||
"der Google Inc., 1600 Amphitheatre Parkway, Mountainview, CA 94043, "
|
|
||||||
"Vereinigte Staaten von Amerika („Google“) einsetzen. Google verwendet "
|
|
||||||
"Cookies. Die durch das Cookie erzeugten Informationen werden an einen Server "
|
|
||||||
"von Google in den Vereinigten Staaten von Amerika übertragen und dort "
|
|
||||||
"erhoben und gespeichert. Google nutzt dies Informationen in unserem Auftrag "
|
|
||||||
"dafür, die Nutzung unseres Internetangebots auszuwerten und Berichte über "
|
|
||||||
"die Aktivitäten auf unserem Onlineangebot uns gegenüber zu erbringen.<br/"
|
|
||||||
">Dabei werden aus den verarbeiteten Daten anonymisierte bzw. pseudonyme "
|
|
||||||
"Nutzungsprofile einiger Nutzer erstellt. Diese Nutzungsprofile sind nicht "
|
|
||||||
"auf eine IP-Adresse oder einen spezifischen Nutzer zurückzuführen. Darüber "
|
|
||||||
"hinaus setzen wir Google Analytics nur mit IP-Anonymisierung ein. Das heißt, "
|
|
||||||
"dass die IP-Adresse von Google gekürzt wird. Nur in wenigen Ausnahmefällen "
|
|
||||||
"wird die vollständige IP-Adresse an Google übertragen und dort gekürzt. Du "
|
|
||||||
"kannst der Verarbeitung von deinen erfassten Daten durch die Installation "
|
|
||||||
"dieses Browserplugins widersprechen: <a href=\"http://tools.google.com/"
|
|
||||||
"dlpage/gaoptout?hl=de\">http://tools.google.com/dlpage/gaoptout?hl=de</a><br/"
|
|
||||||
"><br/>Weitere Informationen zur Nutzung der Daten durch Google und "
|
|
||||||
"weiterführende Widerspruchsmöglichkeiten erhältst du in der "
|
|
||||||
"Datenschutzerklärung von Google:<br/><br/><a href=\"https://policies.google."
|
|
||||||
"com/technologies/ads\">https://policies.google.com/technologies/ads</a><br/"
|
|
||||||
"><br/>und auf den folgenden Webseiten:<br/><br/><a href=\"https://www."
|
|
||||||
"privacyshield.gov/participant?id=a2zt000000001L5AAI&status=Active\">https://"
|
|
||||||
"www.privacyshield.gov/participant?id=a2zt000000001L5AAI&status=Active</a><br/"
|
|
||||||
"><br/><a href=\"https://adssettings.google.com/authenticated\">https://"
|
|
||||||
"adssettings.google.com/authenticated</a><br/><br/>Die personenbezogenen "
|
|
||||||
"Daten werden nach 14 Monaten gelöscht oder anonymisiert.<br/>Rechtliche "
|
|
||||||
"Grundlage hierfür ist Art. 6 Abs. 1 lit. f DSGVO.<br/><br/>Innerhalb unseres "
|
|
||||||
"Onlineangebots können Funktionen und Inhalte des Dienstes Twitter "
|
|
||||||
"eingebunden werden. Twitter ist ein Dienst der Twitter Inc., 1355 Market "
|
|
||||||
"Street, Suite 900, San Francisco, CA 94103, Vereinigte Staaten von Amerika. "
|
|
||||||
"Hierzu können beispielsweise Inhalte wie Bilder, Videos oder Texte und "
|
|
||||||
"Schaltflächen gehören. Sofern du Mitglied der Plattform Twitter bist, kann "
|
|
||||||
"Twitter den Aufruf der Funktionalitäten deinem dortigen Profil zuordnen.<br/"
|
|
||||||
">Weitere Informationen zum Datenschutz bei Twitter, findest du in der "
|
|
||||||
"Datenschutzerklärung von<br/>Twitter unter <a href=\"https://twitter.com/de/"
|
|
||||||
"privacy\">https://twitter.com/de/privacy</a>.<br/><br/><br/><br/><strong>7. "
|
|
||||||
"Rechte des Betroffenen</strong><br/><br/>Aus der DSGVO ergeben sich für dich "
|
|
||||||
"als Betroffener die folgenden Rechte:<br/><br/>a) Du kannst gem. Art. 15 "
|
|
||||||
"DSGVO Auskunft über deine von uns verarbeiteten personenbezogenen Daten "
|
|
||||||
"verlangen. Du kannst insbesondere Auskunft über den Zweck der Verarbeitung, "
|
|
||||||
"die Kategorien der erhobenen personenbezogenen Daten, die Kategorien von "
|
|
||||||
"Dritten, gegenüber denen deine Daten offengelegt werden und die "
|
|
||||||
"voraussichtliche Speicherdauer verlangen.<br/><br/>b) Du hast gem. Art. 15 "
|
|
||||||
"u. Art. 16 DSGVO ein Recht auf Berichtigung, Vervollständigung, Löschung und "
|
|
||||||
"die Bestimmung von Einschränkungen hinsichtlich der Verarbeitung deiner "
|
|
||||||
"personenbezogenen Daten.<br/><br/>c) Gemäß Art. 17 DSGVO kannst du von uns "
|
|
||||||
"die Löschung deiner bei uns gespeicherten personenbezogenen Daten verlangen, "
|
|
||||||
"soweit die Verarbeitung nicht zur Erfüllung unserer rechtlichen "
|
|
||||||
"Verpflichtungen, aus Gründen des öffentlichen Interesses oder zur "
|
|
||||||
"Geltendmachung, Ausübung oder Verteidigung von Rechtsansprüchen erforderlich "
|
|
||||||
"ist.<br/><br/>d) Gemäß Art. 18 DSGVO kannst du von uns die Einschränkung der "
|
|
||||||
"Verarbeitung deiner personenbezogenen Daten verlangen, soweit die "
|
|
||||||
"Richtigkeit der Daten von dir bestritten wird, die Verarbeitung "
|
|
||||||
"grundsätzlich unrechtmäßig ist oder die Löschung deiner<br/"
|
|
||||||
">personenbezogenen Daten durch uns ablehnen, weil du diese zur "
|
|
||||||
"Geltendmachung, Ausübung oder Verteidigung von Rechtsansprüchen benötigst."
|
|
||||||
"<br/><br/>e) Gemäß Art. 20 DSGVO kannst du von uns verlangen, dass deine "
|
|
||||||
"personenbezogenen Daten, die du uns zur Verfügung gestellt hast, in einem "
|
|
||||||
"strukturierten, maschinenlesbaren und gängigen Format zu erhalten oder du "
|
|
||||||
"kannst die Übermittlung an eine andere Stelle verlangen.<br/><br/>f) Gemäß "
|
|
||||||
"Art. 7 Abs. 3 DSGVO kannst du deine erteilte Einwilligung gegenüber uns "
|
|
||||||
"jederzeit widerrufen. Dies hat zur Folge, dass wir die auf dieser "
|
|
||||||
"Einwilligung beruhende Datenverarbeitung für die Zukunft nicht mehr "
|
|
||||||
"fortführen dürfen.<br/><br/>g) Gemäß Art. 77 DSGVO steht dir das Recht zu, "
|
|
||||||
"dich bei einer Aufsichtsbehörde zu beschweren.<br/><br/><br/><strong>8. "
|
|
||||||
"Hyperlinks und Haftungsausschluss</strong><br/><br/>Auf unseren "
|
|
||||||
"Internetseiten befinden sich sog. „Hyperlinks“, also Verbindungen bzw.<br/"
|
|
||||||
">Weiterleitungen zu den Internetseiten Dritter. Bei Aktivierung dieser "
|
|
||||||
"Hyperlinks durch Anklicken, wirst du von unserer Internetseite direkt auf "
|
|
||||||
"die Internetseite eines Dritten weitergeleitet. Wir können keine "
|
|
||||||
"Verantwortung für den vertraulichen Umgang deiner Daten auf diesen Webseiten "
|
|
||||||
"Dritter übernehmen, da wir keinen Einfluss darauf haben, dass diese "
|
|
||||||
"Unternehmen die Datenschutzbestimmungen der DSGVO einhalten. Wir weisen dich "
|
|
||||||
"außerdem darauf hin, dass es aufgrund der Struktur des Internets möglich "
|
|
||||||
"ist, dass die Regelungen des Datenschutzes bzw. der DSGVO von anderen, "
|
|
||||||
"dritten Personen oder Institutionen die nicht innerhalb unseres "
|
|
||||||
"Verantwortungsbereichs liegen nicht beachtet werden, oder dass sich spontan, "
|
|
||||||
"kurzfristig schwerwiegende Sicherheitslücken in verbreiteten Standards und "
|
|
||||||
"technischen Protokollen auftun, die die Datenintegrität gefährden könnten."
|
|
||||||
"<br/> <br/>\n"
|
|
||||||
" "
|
|
||||||
|
|
||||||
msgid "Page Header"
|
|
||||||
msgstr ""
|
|
||||||
|
|
||||||
#, python-format
|
|
||||||
msgid "No %(verbose_name)s found matching the query"
|
|
||||||
msgstr ""
|
|
||||||
|
|
||||||
#~ msgid "Accept"
|
|
||||||
#~ msgstr "Annehmen"
|
|
||||||
|
|
||||||
#~ msgid "Enter your name or company name"
|
#~ msgid "Enter your name or company name"
|
||||||
#~ msgstr "Geben Sie Ihren Namen oder der Ihrer Firma ein"
|
#~ msgstr "Geben Sie Ihren Namen oder der Ihrer Firma ein"
|
||||||
|
|
||||||
|
|
|
||||||
Binary file not shown.
|
Before Width: | Height: | Size: 280 KiB |
File diff suppressed because one or more lines are too long
|
|
@ -53,7 +53,7 @@
|
||||||
<span class="map-caption">In der Au 7 Schwanden 8762 Switzerland
|
<span class="map-caption">In der Au 7 Schwanden 8762 Switzerland
|
||||||
<br>info@digitalglarus.ch
|
<br>info@digitalglarus.ch
|
||||||
<br>
|
<br>
|
||||||
+41 55 505 6266
|
(044) 534-66-22
|
||||||
<p> </p>
|
<p> </p>
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
||||||
|
|
@ -203,7 +203,7 @@
|
||||||
<span class="map-caption">In der Au 7 Schwanden 8762 Switzerland
|
<span class="map-caption">In der Au 7 Schwanden 8762 Switzerland
|
||||||
<br>info@digitalglarus.ch
|
<br>info@digitalglarus.ch
|
||||||
<br>
|
<br>
|
||||||
+41 55 505 6266
|
(044) 534-66-22
|
||||||
<p> </p>
|
<p> </p>
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
||||||
|
|
@ -214,7 +214,7 @@
|
||||||
<span class="map-caption">In der Au 7 Schwanden 8762 Switzerland
|
<span class="map-caption">In der Au 7 Schwanden 8762 Switzerland
|
||||||
<br>info@digitalglarus.ch
|
<br>info@digitalglarus.ch
|
||||||
<br>
|
<br>
|
||||||
+41 55 505 6266
|
(044) 534-66-22
|
||||||
<p> </p>
|
<p> </p>
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
||||||
|
|
@ -43,7 +43,7 @@
|
||||||
<span class="map-caption">In der Au 7 Schwanden 8762 Switzerland
|
<span class="map-caption">In der Au 7 Schwanden 8762 Switzerland
|
||||||
<br>info@digitalglarus.ch
|
<br>info@digitalglarus.ch
|
||||||
<br>
|
<br>
|
||||||
+41 55 505 6266
|
(044) 534-66-22
|
||||||
<p> </p>
|
<p> </p>
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
||||||
|
|
@ -101,7 +101,7 @@
|
||||||
<span class="map-caption">In der Au 7 Schwanden 8762 Switzerland
|
<span class="map-caption">In der Au 7 Schwanden 8762 Switzerland
|
||||||
<br>info@digitalglarus.ch
|
<br>info@digitalglarus.ch
|
||||||
<br>
|
<br>
|
||||||
+41 55 505 6266
|
(044) 534-66-22
|
||||||
<p> </p>
|
<p> </p>
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
||||||
|
|
@ -169,7 +169,7 @@
|
||||||
<span class="map-caption">In der Au 7 Schwanden 8762 Switzerland
|
<span class="map-caption">In der Au 7 Schwanden 8762 Switzerland
|
||||||
<br>info@digitalglarus.ch
|
<br>info@digitalglarus.ch
|
||||||
<br>
|
<br>
|
||||||
+41 55 505 6266
|
(044) 534-66-22
|
||||||
<p> </p>
|
<p> </p>
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
||||||
|
|
@ -139,7 +139,7 @@
|
||||||
In der Au 7 Schwanden 8762 Switzerland
|
In der Au 7 Schwanden 8762 Switzerland
|
||||||
<br>info@digitalglarus.ch
|
<br>info@digitalglarus.ch
|
||||||
<br>
|
<br>
|
||||||
+41 55 505 6266
|
(044) 534-66-22
|
||||||
<br>
|
<br>
|
||||||
</span>
|
</span>
|
||||||
<p> </p>
|
<p> </p>
|
||||||
|
|
|
||||||
|
|
@ -453,7 +453,7 @@
|
||||||
<span class="map-caption">In der Au 7 Schwanden 8762 Switzerland
|
<span class="map-caption">In der Au 7 Schwanden 8762 Switzerland
|
||||||
<br>info@digitalglarus.ch
|
<br>info@digitalglarus.ch
|
||||||
<br>
|
<br>
|
||||||
+41 55 505 6266
|
(044) 534-66-22
|
||||||
<p> </p>
|
<p> </p>
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
||||||
|
|
@ -130,7 +130,7 @@
|
||||||
<span class="map-caption">In der Au 7 Schwanden 8762 Switzerland
|
<span class="map-caption">In der Au 7 Schwanden 8762 Switzerland
|
||||||
<br>info@digitalglarus.ch
|
<br>info@digitalglarus.ch
|
||||||
<br>
|
<br>
|
||||||
+41 55 505 6266
|
(044) 534-66-22
|
||||||
<p> </p>
|
<p> </p>
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
||||||
|
|
@ -68,7 +68,7 @@
|
||||||
<span class="map-caption">In der Au 7 Schwanden 8762 Switzerland
|
<span class="map-caption">In der Au 7 Schwanden 8762 Switzerland
|
||||||
<br>info@digitalglarus.ch
|
<br>info@digitalglarus.ch
|
||||||
<br>
|
<br>
|
||||||
+41 55 505 6266
|
(044) 534-66-22
|
||||||
<p> </p>
|
<p> </p>
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
||||||
|
|
@ -45,7 +45,7 @@
|
||||||
<span class="map-caption">In der Au 7 Schwanden 8762 Switzerland
|
<span class="map-caption">In der Au 7 Schwanden 8762 Switzerland
|
||||||
<br>info@digitalglarus.ch
|
<br>info@digitalglarus.ch
|
||||||
<br>
|
<br>
|
||||||
+41 55 505 6266
|
(044) 534-66-22
|
||||||
<p> </p>
|
<p> </p>
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
||||||
|
|
@ -101,7 +101,7 @@
|
||||||
<span class="map-caption">In der Au 7 Schwanden 8762 Switzerland
|
<span class="map-caption">In der Au 7 Schwanden 8762 Switzerland
|
||||||
<br>info@digitalglarus.ch
|
<br>info@digitalglarus.ch
|
||||||
<br>
|
<br>
|
||||||
+41 55 505 6266
|
(044) 534-66-22
|
||||||
<p> </p>
|
<p> </p>
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
||||||
|
|
@ -42,7 +42,7 @@
|
||||||
<span class="map-caption">In der Au 7 Schwanden 8762 Switzerland
|
<span class="map-caption">In der Au 7 Schwanden 8762 Switzerland
|
||||||
<br>info@digitalglarus.ch
|
<br>info@digitalglarus.ch
|
||||||
<br>
|
<br>
|
||||||
+41 55 505 6266
|
(044) 534-66-22
|
||||||
<p> </p>
|
<p> </p>
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
||||||
|
|
@ -238,7 +238,7 @@
|
||||||
<span class="map-caption">In der Au 7 Schwanden 8762 Switzerland
|
<span class="map-caption">In der Au 7 Schwanden 8762 Switzerland
|
||||||
<br>info@digitalglarus.ch
|
<br>info@digitalglarus.ch
|
||||||
<br>
|
<br>
|
||||||
+41 55 505 6266
|
(044) 534-66-22
|
||||||
<p> </p>
|
<p> </p>
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
||||||
|
|
@ -123,7 +123,7 @@
|
||||||
<span class="map-caption">In der Au 7 Schwanden 8762 Switzerland
|
<span class="map-caption">In der Au 7 Schwanden 8762 Switzerland
|
||||||
<br>info@digitalglarus.ch
|
<br>info@digitalglarus.ch
|
||||||
<br>
|
<br>
|
||||||
+41 55 505 6266
|
(044) 534-66-22
|
||||||
<p> </p>
|
<p> </p>
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
||||||
|
|
@ -46,7 +46,7 @@
|
||||||
<span class="map-caption">In der Au 7 Schwanden 8762 Switzerland
|
<span class="map-caption">In der Au 7 Schwanden 8762 Switzerland
|
||||||
<br>info@digitalglarus.ch
|
<br>info@digitalglarus.ch
|
||||||
<br>
|
<br>
|
||||||
+41 55 505 6266
|
(044) 534-66-22
|
||||||
<p> </p>
|
<p> </p>
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
||||||
|
|
@ -50,7 +50,7 @@
|
||||||
<span class="map-caption">In der Au 7 Schwanden 8762 Switzerland
|
<span class="map-caption">In der Au 7 Schwanden 8762 Switzerland
|
||||||
<br>info@digitalglarus.ch
|
<br>info@digitalglarus.ch
|
||||||
<br>
|
<br>
|
||||||
+41 55 505 6266
|
(044) 534-66-22
|
||||||
<p> </p>
|
<p> </p>
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
||||||
|
|
@ -78,7 +78,7 @@
|
||||||
<span class="map-caption">In der Au 7 Schwanden 8762 Switzerland
|
<span class="map-caption">In der Au 7 Schwanden 8762 Switzerland
|
||||||
<br>info@digitalglarus.ch
|
<br>info@digitalglarus.ch
|
||||||
<br>
|
<br>
|
||||||
+41 55 505 6266
|
(044) 534-66-22
|
||||||
<p> </p>
|
<p> </p>
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
||||||
|
|
@ -112,7 +112,7 @@
|
||||||
|
|
||||||
|
|
||||||
<body id="page-top" class="index">
|
<body id="page-top" class="index">
|
||||||
{% include "gdpr_banner.html" %}
|
|
||||||
<!-- Navigation -->
|
<!-- Navigation -->
|
||||||
<nav class="navbar navbar-default navbar-fixed-top">
|
<nav class="navbar navbar-default navbar-fixed-top">
|
||||||
<div style="margin-left: 0px; margin-right: 0px;">
|
<div style="margin-left: 0px; margin-right: 0px;">
|
||||||
|
|
|
||||||
|
|
@ -194,7 +194,6 @@ TEMPLATES = [
|
||||||
os.path.join(PROJECT_DIR, 'templates/analytics'),
|
os.path.join(PROJECT_DIR, 'templates/analytics'),
|
||||||
os.path.join(PROJECT_DIR, 'cms_templates/'),
|
os.path.join(PROJECT_DIR, 'cms_templates/'),
|
||||||
os.path.join(PROJECT_DIR, 'cms_templates/djangocms_blog/'),
|
os.path.join(PROJECT_DIR, 'cms_templates/djangocms_blog/'),
|
||||||
os.path.join(PROJECT_DIR, 'templates/gdpr'),
|
|
||||||
],
|
],
|
||||||
'APP_DIRS': True,
|
'APP_DIRS': True,
|
||||||
'OPTIONS': {
|
'OPTIONS': {
|
||||||
|
|
@ -451,10 +450,10 @@ USE_X_FORWARDED_HOST = True
|
||||||
BOOTSTRAP3 = {
|
BOOTSTRAP3 = {
|
||||||
|
|
||||||
# The URL to the jQuery JavaScript file
|
# The URL to the jQuery JavaScript file
|
||||||
'jquery_url': '%sdatacenterlight/js/jquery-1.11.1.min.js' % STATIC_URL,
|
'jquery_url': '//code.jquery.com/jquery.min.js',
|
||||||
|
|
||||||
# The Bootstrap base URL
|
# The Bootstrap base URL
|
||||||
'base_url': '%sdatacenterlight/bootstrap-3.3.4/' % STATIC_URL,
|
'base_url': '//maxcdn.bootstrapcdn.com/bootstrap/3.3.4/',
|
||||||
|
|
||||||
# The complete URL to the Bootstrap CSS file
|
# The complete URL to the Bootstrap CSS file
|
||||||
# (None means derive it from base_url)
|
# (None means derive it from base_url)
|
||||||
|
|
@ -648,7 +647,6 @@ CELERY_RESULT_SERIALIZER = 'json'
|
||||||
CELERY_MAX_RETRIES = int_env('CELERY_MAX_RETRIES', 5)
|
CELERY_MAX_RETRIES = int_env('CELERY_MAX_RETRIES', 5)
|
||||||
|
|
||||||
DCL_ERROR_EMAILS_TO = env('DCL_ERROR_EMAILS_TO')
|
DCL_ERROR_EMAILS_TO = env('DCL_ERROR_EMAILS_TO')
|
||||||
ADMIN_EMAIL = env('ADMIN_EMAIL')
|
|
||||||
|
|
||||||
DCL_ERROR_EMAILS_TO_LIST = []
|
DCL_ERROR_EMAILS_TO_LIST = []
|
||||||
if DCL_ERROR_EMAILS_TO is not None:
|
if DCL_ERROR_EMAILS_TO is not None:
|
||||||
|
|
@ -686,26 +684,18 @@ if ENABLE_LOGGING:
|
||||||
custom_handler_item = {
|
custom_handler_item = {
|
||||||
'custom_file': {
|
'custom_file': {
|
||||||
'level': LOG_LEVEL,
|
'level': LOG_LEVEL,
|
||||||
'class': 'logging.handlers.RotatingFileHandler',
|
'class': 'logging.FileHandler',
|
||||||
'filename':
|
'filename':
|
||||||
"{PROJECT_DIR}/logs/{LEVEL}.log".format(
|
"{PROJECT_DIR}/{LEVEL}.log".format(
|
||||||
LEVEL=LOG_LEVEL.lower(),
|
LEVEL=LOG_LEVEL.lower(),
|
||||||
PROJECT_DIR=PROJECT_DIR
|
PROJECT_DIR=PROJECT_DIR
|
||||||
),
|
)
|
||||||
'maxBytes': 1024 * 1024 * 5,
|
|
||||||
'backupCount': 10,
|
|
||||||
'formatter': 'standard',
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
handlers_dict.update(custom_handler_item)
|
handlers_dict.update(custom_handler_item)
|
||||||
LOGGING = {
|
LOGGING = {
|
||||||
'version': 1,
|
'version': 1,
|
||||||
'disable_existing_loggers': False,
|
'disable_existing_loggers': False,
|
||||||
'formatters': {
|
|
||||||
'standard': {
|
|
||||||
'format': '%(asctime)s %(levelname)s %(name)s: %(message)s'
|
|
||||||
}
|
|
||||||
},
|
|
||||||
'handlers': handlers_dict,
|
'handlers': handlers_dict,
|
||||||
'loggers': loggers_dict
|
'loggers': loggers_dict
|
||||||
}
|
}
|
||||||
|
|
@ -721,14 +711,6 @@ X_FRAME_OPTIONS = ('SAMEORIGIN' if X_FRAME_OPTIONS_ALLOW_FROM_URI is None else
|
||||||
|
|
||||||
DEBUG = bool_env('DEBUG')
|
DEBUG = bool_env('DEBUG')
|
||||||
|
|
||||||
READ_VM_REALM = env('READ_VM_REALM')
|
|
||||||
AUTH_NAME = env('AUTH_NAME')
|
|
||||||
AUTH_SEED = env('AUTH_SEED')
|
|
||||||
AUTH_REALM = env('AUTH_REALM')
|
|
||||||
OTP_SERVER = env('OTP_SERVER')
|
|
||||||
OTP_VERIFY_ENDPOINT = env('OTP_VERIFY_ENDPOINT')
|
|
||||||
|
|
||||||
|
|
||||||
if DEBUG:
|
if DEBUG:
|
||||||
from .local import * # flake8: noqa
|
from .local import * # flake8: noqa
|
||||||
else:
|
else:
|
||||||
|
|
|
||||||
|
|
@ -1,14 +1,15 @@
|
||||||
import datetime
|
import datetime
|
||||||
import logging
|
import logging
|
||||||
import subprocess
|
import subprocess
|
||||||
import tempfile
|
|
||||||
|
|
||||||
|
import tempfile
|
||||||
from django import forms
|
from django import forms
|
||||||
from django.conf import settings
|
from django.conf import settings
|
||||||
from django.contrib.auth import authenticate
|
from django.contrib.auth import authenticate
|
||||||
from django.utils.translation import ugettext_lazy as _
|
from django.utils.translation import ugettext_lazy as _
|
||||||
|
|
||||||
from membership.models import CustomUser
|
from membership.models import CustomUser
|
||||||
|
from utils.hosting_utils import get_all_public_keys
|
||||||
from .models import UserHostingKey, GenericProduct
|
from .models import UserHostingKey, GenericProduct
|
||||||
|
|
||||||
logger = logging.getLogger(__name__)
|
logger = logging.getLogger(__name__)
|
||||||
|
|
@ -109,14 +110,9 @@ class ProductPaymentForm(GenericPaymentForm):
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
if self.product.product_is_subscription:
|
if self.product.product_is_subscription:
|
||||||
payment_type = "month"
|
|
||||||
if self.product.product_subscription_interval == "month":
|
|
||||||
payment_type = _('Monthly subscription')
|
|
||||||
elif self.product.product_subscription_interval == "year":
|
|
||||||
payment_type = _('Yearly subscription')
|
|
||||||
self.fields['amount'].label = "{amt} ({payment_type})".format(
|
self.fields['amount'].label = "{amt} ({payment_type})".format(
|
||||||
amt=_('Amount in CHF'),
|
amt=_('Amount in CHF'),
|
||||||
payment_type=payment_type
|
payment_type=_('Monthly subscription')
|
||||||
)
|
)
|
||||||
else:
|
else:
|
||||||
self.fields['amount'].label = "{amt} ({payment_type})".format(
|
self.fields['amount'].label = "{amt} ({payment_type})".format(
|
||||||
|
|
@ -191,12 +187,20 @@ class UserHostingKeyForm(forms.ModelForm):
|
||||||
alerts the user of it.
|
alerts the user of it.
|
||||||
:return:
|
:return:
|
||||||
"""
|
"""
|
||||||
if ('generate' in self.request.POST
|
if 'generate' in self.request.POST:
|
||||||
or not self.fields['public_key'].required):
|
|
||||||
return self.data.get('public_key')
|
return self.data.get('public_key')
|
||||||
KEY_ERROR_MESSAGE = _("Please input a proper SSH key")
|
KEY_ERROR_MESSAGE = _("Please input a proper SSH key")
|
||||||
openssh_pubkey_str = self.data.get('public_key').strip()
|
openssh_pubkey_str = self.data.get('public_key').strip()
|
||||||
|
|
||||||
|
if openssh_pubkey_str in get_all_public_keys(self.request.user):
|
||||||
|
key_name = UserHostingKey.objects.filter(
|
||||||
|
user_id=self.request.user.id,
|
||||||
|
public_key=openssh_pubkey_str).first().name
|
||||||
|
KEY_EXISTS_MESSAGE = _(
|
||||||
|
"This key exists already with the name \"%(name)s\"") % {
|
||||||
|
'name': key_name}
|
||||||
|
raise forms.ValidationError(KEY_EXISTS_MESSAGE)
|
||||||
|
|
||||||
with tempfile.NamedTemporaryFile(delete=True) as tmp_public_key_file:
|
with tempfile.NamedTemporaryFile(delete=True) as tmp_public_key_file:
|
||||||
tmp_public_key_file.write(openssh_pubkey_str.encode('utf-8'))
|
tmp_public_key_file.write(openssh_pubkey_str.encode('utf-8'))
|
||||||
tmp_public_key_file.flush()
|
tmp_public_key_file.flush()
|
||||||
|
|
@ -210,14 +214,10 @@ class UserHostingKeyForm(forms.ModelForm):
|
||||||
return openssh_pubkey_str
|
return openssh_pubkey_str
|
||||||
|
|
||||||
def clean_name(self):
|
def clean_name(self):
|
||||||
INVALID_NAME_MESSAGE = _("Comma not accepted in the name of the key")
|
|
||||||
if "," in self.data.get('name'):
|
|
||||||
logger.debug(INVALID_NAME_MESSAGE)
|
|
||||||
raise forms.ValidationError(INVALID_NAME_MESSAGE)
|
|
||||||
return self.data.get('name')
|
return self.data.get('name')
|
||||||
|
|
||||||
def clean_user(self):
|
def clean_user(self):
|
||||||
return self.request.user if self.request.user.is_authenticated() else None
|
return self.request.user
|
||||||
|
|
||||||
def clean(self):
|
def clean(self):
|
||||||
cleaned_data = self.cleaned_data
|
cleaned_data = self.cleaned_data
|
||||||
|
|
|
||||||
|
|
@ -8,7 +8,7 @@ msgid ""
|
||||||
msgstr ""
|
msgstr ""
|
||||||
"Project-Id-Version: PACKAGE VERSION\n"
|
"Project-Id-Version: PACKAGE VERSION\n"
|
||||||
"Report-Msgid-Bugs-To: \n"
|
"Report-Msgid-Bugs-To: \n"
|
||||||
"POT-Creation-Date: 2019-11-15 16:40+0000\n"
|
"POT-Creation-Date: 2018-09-08 08:45+0000\n"
|
||||||
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
|
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
|
||||||
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
||||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||||
|
|
@ -27,33 +27,6 @@ msgstr "Dein Account wurde noch nicht aktiviert."
|
||||||
msgid "User does not exist"
|
msgid "User does not exist"
|
||||||
msgstr "Der Benutzer existiert nicht"
|
msgstr "Der Benutzer existiert nicht"
|
||||||
|
|
||||||
msgid "Choose a product"
|
|
||||||
msgstr "Wähle ein Produkt"
|
|
||||||
|
|
||||||
msgid "Amount in CHF"
|
|
||||||
msgstr "Betrag"
|
|
||||||
|
|
||||||
msgid "Recurring monthly"
|
|
||||||
msgstr "monatlich wiederkehrend"
|
|
||||||
|
|
||||||
msgid "Amount field does not match"
|
|
||||||
msgstr "Betragsfeld stimmt nicht überein"
|
|
||||||
|
|
||||||
msgid "Recurring field does not match"
|
|
||||||
msgstr "Betragsfeld stimmt nicht überein"
|
|
||||||
|
|
||||||
msgid "Product name"
|
|
||||||
msgstr "Produkt"
|
|
||||||
|
|
||||||
msgid "Monthly subscription"
|
|
||||||
msgstr "Monatliches Abonnement"
|
|
||||||
|
|
||||||
msgid "Yearly subscription"
|
|
||||||
msgstr "Jährliches Abonnement"
|
|
||||||
|
|
||||||
msgid "One time payment"
|
|
||||||
msgstr "Einmalzahlung"
|
|
||||||
|
|
||||||
msgid "Confirm Password"
|
msgid "Confirm Password"
|
||||||
msgstr "Passwort Bestätigung"
|
msgstr "Passwort Bestätigung"
|
||||||
|
|
||||||
|
|
@ -75,8 +48,9 @@ msgstr "Key-Name"
|
||||||
msgid "Please input a proper SSH key"
|
msgid "Please input a proper SSH key"
|
||||||
msgstr "Bitte verwende einen gültigen SSH-Key"
|
msgstr "Bitte verwende einen gültigen SSH-Key"
|
||||||
|
|
||||||
msgid "Comma not accepted in the name of the key"
|
#, python-format
|
||||||
msgstr "Komma im Namen des Keys wird nicht akzeptiert"
|
msgid "This key exists already with the name \"%(name)s\""
|
||||||
|
msgstr "Der SSH-Key mit dem Name \"%(name)s\" existiert bereits"
|
||||||
|
|
||||||
msgid "All Rights Reserved"
|
msgid "All Rights Reserved"
|
||||||
msgstr "Alle Rechte vorbehalten"
|
msgstr "Alle Rechte vorbehalten"
|
||||||
|
|
@ -235,16 +209,11 @@ msgstr "Du hast eine neue virtuelle Maschine bestellt!"
|
||||||
|
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "Your order of <strong>%(vm_name)s</strong> has been charged."
|
msgid "Your order of <strong>%(vm_name)s</strong> has been charged."
|
||||||
msgstr ""
|
msgstr "Deine Bestellung von <strong>%(vm_name)s</strong> wurde entgegengenommen."
|
||||||
"Deine Bestellung von <strong>%(vm_name)s</strong> wurde entgegengenommen."
|
|
||||||
|
|
||||||
msgid "You can view your VM detail by clicking the button below."
|
msgid "You can view your VM detail by clicking the button below."
|
||||||
msgstr "Um die Rechnung zu sehen, klicke auf den Button unten."
|
msgstr "Um die Rechnung zu sehen, klicke auf den Button unten."
|
||||||
|
|
||||||
msgid "You can log in to your VM by the username <strong>puffy</strong>."
|
|
||||||
msgstr ""
|
|
||||||
"Du kannst Dich auf Deiner VM mit dem user <strong>puffy</strong> einloggen."
|
|
||||||
|
|
||||||
msgid "View Detail"
|
msgid "View Detail"
|
||||||
msgstr "Details anzeigen"
|
msgstr "Details anzeigen"
|
||||||
|
|
||||||
|
|
@ -258,9 +227,6 @@ msgstr "Deine Bestellung von %(vm_name)s wurde entgegengenommen."
|
||||||
msgid "You can view your VM detail by following the link below."
|
msgid "You can view your VM detail by following the link below."
|
||||||
msgstr "Um die Rechnung zu sehen, klicke auf den Link unten."
|
msgstr "Um die Rechnung zu sehen, klicke auf den Link unten."
|
||||||
|
|
||||||
msgid "You can log in to your VM by the username puffy."
|
|
||||||
msgstr "Du kannst Dich auf Deiner VM mit dem user puffy einloggen."
|
|
||||||
|
|
||||||
msgid "Password Reset"
|
msgid "Password Reset"
|
||||||
msgstr "Passwort zurücksetzen"
|
msgstr "Passwort zurücksetzen"
|
||||||
|
|
||||||
|
|
@ -339,103 +305,6 @@ msgstr "Dashboard"
|
||||||
msgid "Logout"
|
msgid "Logout"
|
||||||
msgstr "Abmelden"
|
msgstr "Abmelden"
|
||||||
|
|
||||||
#, python-format
|
|
||||||
msgid "%(page_header_text)s"
|
|
||||||
msgstr ""
|
|
||||||
|
|
||||||
msgid "Invoice #"
|
|
||||||
msgstr "Rechnung"
|
|
||||||
|
|
||||||
msgid "Date"
|
|
||||||
msgstr "Datum"
|
|
||||||
|
|
||||||
msgid "Status"
|
|
||||||
msgstr ""
|
|
||||||
|
|
||||||
msgid "Terminated"
|
|
||||||
msgstr "Beendet"
|
|
||||||
|
|
||||||
msgid "Approved"
|
|
||||||
msgstr "Akzeptiert"
|
|
||||||
|
|
||||||
msgid "Declined"
|
|
||||||
msgstr "Abgelehnt"
|
|
||||||
|
|
||||||
msgid "Billed to"
|
|
||||||
msgstr "Rechnungsadresse"
|
|
||||||
|
|
||||||
msgid "Payment method"
|
|
||||||
msgstr "Bezahlmethode"
|
|
||||||
|
|
||||||
msgid "ending in"
|
|
||||||
msgstr "endend in"
|
|
||||||
|
|
||||||
msgid "Invoice summary"
|
|
||||||
msgstr ""
|
|
||||||
|
|
||||||
msgid "Product"
|
|
||||||
msgstr "Produkt"
|
|
||||||
|
|
||||||
msgid "Period"
|
|
||||||
msgstr "Periode"
|
|
||||||
|
|
||||||
msgid "Cores"
|
|
||||||
msgstr "Prozessorkerne"
|
|
||||||
|
|
||||||
msgid "Memory"
|
|
||||||
msgstr "Arbeitsspeicher"
|
|
||||||
|
|
||||||
msgid "Disk space"
|
|
||||||
msgstr "Festplattenkapazität"
|
|
||||||
|
|
||||||
msgid "Subtotal"
|
|
||||||
msgstr "Zwischensumme"
|
|
||||||
|
|
||||||
msgid "VAT"
|
|
||||||
msgstr "Mehrwertsteuer"
|
|
||||||
|
|
||||||
msgid "Discount"
|
|
||||||
msgstr "Rabatt"
|
|
||||||
|
|
||||||
msgid "Total"
|
|
||||||
msgstr "Gesamt"
|
|
||||||
|
|
||||||
msgid "Amount"
|
|
||||||
msgstr "Betrag"
|
|
||||||
|
|
||||||
msgid "Description"
|
|
||||||
msgstr "Beschreibung"
|
|
||||||
|
|
||||||
msgid "Recurring"
|
|
||||||
msgstr "wiederkehrend"
|
|
||||||
|
|
||||||
msgid "of"
|
|
||||||
msgstr "von"
|
|
||||||
|
|
||||||
msgid "each year"
|
|
||||||
msgstr "jedes Jahr"
|
|
||||||
|
|
||||||
msgid "of every month"
|
|
||||||
msgstr "jeden Monat"
|
|
||||||
|
|
||||||
msgid "BACK TO LIST"
|
|
||||||
msgstr "ZURÜCK ZUR LISTE"
|
|
||||||
|
|
||||||
msgid "Some problem encountered. Please try again later."
|
|
||||||
msgstr "Ein Problem ist aufgetreten. Bitte versuche es später noch einmal."
|
|
||||||
|
|
||||||
msgid "VM ID"
|
|
||||||
msgstr ""
|
|
||||||
|
|
||||||
msgid "IP Address"
|
|
||||||
msgstr "IP-Adresse"
|
|
||||||
|
|
||||||
msgid "See Invoice"
|
|
||||||
msgstr "Siehe Rechnung"
|
|
||||||
|
|
||||||
msgid "Page"
|
|
||||||
msgstr "Seite"
|
|
||||||
|
|
||||||
msgid "Log in"
|
msgid "Log in"
|
||||||
msgstr "Anmelden"
|
msgstr "Anmelden"
|
||||||
|
|
||||||
|
|
@ -469,15 +338,67 @@ msgstr "Als gelesen markieren"
|
||||||
msgid "All notifications"
|
msgid "All notifications"
|
||||||
msgstr "Alle Benachrichtigungen"
|
msgstr "Alle Benachrichtigungen"
|
||||||
|
|
||||||
|
#, python-format
|
||||||
|
msgid "%(page_header_text)s"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
msgid "Date"
|
||||||
|
msgstr "Datum"
|
||||||
|
|
||||||
|
msgid "Status"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
msgid "Terminated"
|
||||||
|
msgstr "Beendet"
|
||||||
|
|
||||||
|
msgid "Approved"
|
||||||
|
msgstr "Akzeptiert"
|
||||||
|
|
||||||
|
msgid "Declined"
|
||||||
|
msgstr "Abgelehnt"
|
||||||
|
|
||||||
|
msgid "Billed to"
|
||||||
|
msgstr "Rechnungsadresse"
|
||||||
|
|
||||||
|
msgid "Payment method"
|
||||||
|
msgstr "Bezahlmethode"
|
||||||
|
|
||||||
|
msgid "ending in"
|
||||||
|
msgstr "endend in"
|
||||||
|
|
||||||
msgid "Credit Card"
|
msgid "Credit Card"
|
||||||
msgstr "Kreditkarte"
|
msgstr "Kreditkarte"
|
||||||
|
|
||||||
msgid "Expiry"
|
|
||||||
msgstr "Gültig bis"
|
|
||||||
|
|
||||||
msgid "Order summary"
|
msgid "Order summary"
|
||||||
msgstr "Bestellungsübersicht"
|
msgstr "Bestellungsübersicht"
|
||||||
|
|
||||||
|
msgid "Product"
|
||||||
|
msgstr "Produkt"
|
||||||
|
|
||||||
|
msgid "Period"
|
||||||
|
msgstr "Periode"
|
||||||
|
|
||||||
|
msgid "Cores"
|
||||||
|
msgstr "Prozessorkerne"
|
||||||
|
|
||||||
|
msgid "Memory"
|
||||||
|
msgstr "Arbeitsspeicher"
|
||||||
|
|
||||||
|
msgid "Disk space"
|
||||||
|
msgstr "Festplattenkapazität"
|
||||||
|
|
||||||
|
msgid "Subtotal"
|
||||||
|
msgstr "Zwischensumme"
|
||||||
|
|
||||||
|
msgid "VAT"
|
||||||
|
msgstr "Mehrwertsteuer"
|
||||||
|
|
||||||
|
msgid "Discount"
|
||||||
|
msgstr "Rabatt"
|
||||||
|
|
||||||
|
msgid "Total"
|
||||||
|
msgstr "Gesamt"
|
||||||
|
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid ""
|
msgid ""
|
||||||
"By clicking \"Place order\" this plan will charge your credit card account "
|
"By clicking \"Place order\" this plan will charge your credit card account "
|
||||||
|
|
@ -489,6 +410,9 @@ msgstr ""
|
||||||
msgid "Place order"
|
msgid "Place order"
|
||||||
msgstr "Bestellen"
|
msgstr "Bestellen"
|
||||||
|
|
||||||
|
msgid "BACK TO LIST"
|
||||||
|
msgstr "ZURÜCK ZUR LISTE"
|
||||||
|
|
||||||
msgid "Processing..."
|
msgid "Processing..."
|
||||||
msgstr "Abarbeitung..."
|
msgstr "Abarbeitung..."
|
||||||
|
|
||||||
|
|
@ -496,14 +420,29 @@ msgid "Hold tight, we are processing your request"
|
||||||
msgstr "Bitte warten - wir bearbeiten Deine Anfrage gerade"
|
msgstr "Bitte warten - wir bearbeiten Deine Anfrage gerade"
|
||||||
|
|
||||||
msgid "OK"
|
msgid "OK"
|
||||||
msgstr "Ok"
|
msgstr ""
|
||||||
|
|
||||||
msgid "Close"
|
msgid "Close"
|
||||||
msgstr "Schliessen"
|
msgstr "Schliessen"
|
||||||
|
|
||||||
|
msgid "Some problem encountered. Please try again later."
|
||||||
|
msgstr "Ein Problem ist aufgetreten. Bitte versuche es später noch einmal."
|
||||||
|
|
||||||
msgid "Order Nr."
|
msgid "Order Nr."
|
||||||
msgstr "Bestellung Nr."
|
msgstr "Bestellung Nr."
|
||||||
|
|
||||||
|
msgid "Amount"
|
||||||
|
msgstr "Betrag"
|
||||||
|
|
||||||
|
msgid "See Invoice"
|
||||||
|
msgstr "Siehe Rechnung"
|
||||||
|
|
||||||
|
msgid "Page"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
msgid "of"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
msgid "Your Order"
|
msgid "Your Order"
|
||||||
msgstr "Deine Bestellung"
|
msgstr "Deine Bestellung"
|
||||||
|
|
||||||
|
|
@ -600,6 +539,9 @@ msgstr ""
|
||||||
"Wir nutzen <a href=\"https://stripe.com\" target=\"_blank\">Stripe</a> für "
|
"Wir nutzen <a href=\"https://stripe.com\" target=\"_blank\">Stripe</a> für "
|
||||||
"die Bezahlung und speichern keine Informationen in unserer Datenbank."
|
"die Bezahlung und speichern keine Informationen in unserer Datenbank."
|
||||||
|
|
||||||
|
msgid "Add your public SSH key"
|
||||||
|
msgstr "Füge deinen öffentlichen SSH-Key hinzu"
|
||||||
|
|
||||||
msgid "Use your created key to access to the VM"
|
msgid "Use your created key to access to the VM"
|
||||||
msgstr "Benutze deinen erstellten SSH-Key um auf deine VM zugreifen zu können"
|
msgstr "Benutze deinen erstellten SSH-Key um auf deine VM zugreifen zu können"
|
||||||
|
|
||||||
|
|
@ -841,9 +783,6 @@ msgstr ""
|
||||||
msgid "Invalid number of cores"
|
msgid "Invalid number of cores"
|
||||||
msgstr "Ungültige Anzahle CPU-Kerne"
|
msgstr "Ungültige Anzahle CPU-Kerne"
|
||||||
|
|
||||||
msgid "Invalid calculator properties"
|
|
||||||
msgstr ""
|
|
||||||
|
|
||||||
msgid "Invalid RAM size"
|
msgid "Invalid RAM size"
|
||||||
msgstr "Ungültige RAM-Grösse"
|
msgstr "Ungültige RAM-Grösse"
|
||||||
|
|
||||||
|
|
@ -852,7 +791,7 @@ msgstr "Ungültige Speicher-Grösse"
|
||||||
|
|
||||||
#, python-brace-format
|
#, python-brace-format
|
||||||
msgid "Incorrect pricing name. Please contact support{support_email}"
|
msgid "Incorrect pricing name. Please contact support{support_email}"
|
||||||
msgstr "Ungültige Preisbezeichnung. Bitte kontaktiere den Support{support_email}"
|
msgstr ""
|
||||||
|
|
||||||
msgid ""
|
msgid ""
|
||||||
"We could not find the requested VM. Please "
|
"We could not find the requested VM. Please "
|
||||||
|
|
@ -871,7 +810,7 @@ msgstr "Fehler beenden VM"
|
||||||
msgid ""
|
msgid ""
|
||||||
"VM terminate action timed out. Please contact support@datacenterlight.ch for "
|
"VM terminate action timed out. Please contact support@datacenterlight.ch for "
|
||||||
"further information."
|
"further information."
|
||||||
msgstr "VM beendet wegen Zeitüberschreitung. Bitte kontaktiere support@datacenterlight.ch für weitere Informationen."
|
msgstr ""
|
||||||
|
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "Virtual Machine %(vm_name)s Cancelled"
|
msgid "Virtual Machine %(vm_name)s Cancelled"
|
||||||
|
|
@ -882,13 +821,6 @@ msgstr ""
|
||||||
"Es gab einen Fehler bei der Bearbeitung Deine Anfrage. Bitte versuche es "
|
"Es gab einen Fehler bei der Bearbeitung Deine Anfrage. Bitte versuche es "
|
||||||
"noch einmal."
|
"noch einmal."
|
||||||
|
|
||||||
#, python-format
|
|
||||||
#~ msgid "This key exists already with the name \"%(name)s\""
|
|
||||||
#~ msgstr "Der SSH-Key mit dem Name \"%(name)s\" existiert bereits"
|
|
||||||
|
|
||||||
#~ msgid "Add your public SSH key"
|
|
||||||
#~ msgstr "Füge deinen öffentlichen SSH-Key hinzu"
|
|
||||||
|
|
||||||
#~ msgid "Do you want to cancel your Virtual Machine"
|
#~ msgid "Do you want to cancel your Virtual Machine"
|
||||||
#~ msgstr "Bist Du sicher, dass Du Deine virtuelle Maschine beenden willst"
|
#~ msgstr "Bist Du sicher, dass Du Deine virtuelle Maschine beenden willst"
|
||||||
|
|
||||||
|
|
@ -898,6 +830,9 @@ msgstr ""
|
||||||
#~ msgid "My VM page"
|
#~ msgid "My VM page"
|
||||||
#~ msgstr "Meine VM page"
|
#~ msgstr "Meine VM page"
|
||||||
|
|
||||||
|
#~ msgid "Invoice Date"
|
||||||
|
#~ msgstr "Rechnung Datum"
|
||||||
|
|
||||||
#~ msgid "VM %(VM_ID)s terminated successfully"
|
#~ msgid "VM %(VM_ID)s terminated successfully"
|
||||||
#~ msgstr "VM %(VM_ID)s erfolgreich beendet"
|
#~ msgstr "VM %(VM_ID)s erfolgreich beendet"
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,66 +0,0 @@
|
||||||
import logging
|
|
||||||
|
|
||||||
from django.core.management.base import BaseCommand
|
|
||||||
|
|
||||||
from hosting.models import MonthlyHostingBill
|
|
||||||
from membership.models import CustomUser
|
|
||||||
from utils.stripe_utils import StripeUtils
|
|
||||||
|
|
||||||
logger = logging.getLogger(__name__)
|
|
||||||
|
|
||||||
|
|
||||||
class Command(BaseCommand):
|
|
||||||
help = '''Fetches invoices from Stripe and creates bills for a given
|
|
||||||
customer in the MonthlyHostingBill model'''
|
|
||||||
|
|
||||||
def add_arguments(self, parser):
|
|
||||||
parser.add_argument('customer_email', nargs='+', type=str)
|
|
||||||
|
|
||||||
def handle(self, *args, **options):
|
|
||||||
try:
|
|
||||||
for email in options['customer_email']:
|
|
||||||
stripe_utils = StripeUtils()
|
|
||||||
user = CustomUser.objects.get(email=email)
|
|
||||||
if hasattr(user, 'stripecustomer'):
|
|
||||||
self.stdout.write(self.style.SUCCESS(
|
|
||||||
'Found %s. Fetching bills for him.' % email))
|
|
||||||
mhb = MonthlyHostingBill.objects.filter(
|
|
||||||
customer=user.stripecustomer).last()
|
|
||||||
created_gt = {}
|
|
||||||
if mhb is not None:
|
|
||||||
# fetch only invoices which is created after
|
|
||||||
# mhb.created, because we already have invoices till
|
|
||||||
# this date
|
|
||||||
created_gt = int(mhb.created.timestamp())
|
|
||||||
|
|
||||||
all_invoices_response = stripe_utils.get_all_invoices(
|
|
||||||
user.stripecustomer.stripe_id,
|
|
||||||
created_gt=created_gt
|
|
||||||
)
|
|
||||||
if all_invoices_response['error'] is not None:
|
|
||||||
self.stdout.write(self.style.ERROR(all_invoices_response['error']))
|
|
||||||
exit(1)
|
|
||||||
all_invoices = all_invoices_response['response_object']
|
|
||||||
self.stdout.write(self.style.SUCCESS("Obtained {} invoices".format(len(all_invoices) if all_invoices is not None else 0)))
|
|
||||||
num_invoice_created = 0
|
|
||||||
for invoice in all_invoices:
|
|
||||||
invoice['customer'] = user.stripecustomer
|
|
||||||
try:
|
|
||||||
existing_mhb = MonthlyHostingBill.objects.get(invoice_id=invoice['invoice_id'])
|
|
||||||
logger.debug("Invoice %s exists already. Not importing." % invoice['invoice_id'])
|
|
||||||
except MonthlyHostingBill.DoesNotExist as dne:
|
|
||||||
logger.debug("Invoice id %s does not exist" % invoice['invoice_id'])
|
|
||||||
|
|
||||||
if MonthlyHostingBill.create(invoice) is not None:
|
|
||||||
num_invoice_created += 1
|
|
||||||
else:
|
|
||||||
logger.error("Did not import invoice for %s"
|
|
||||||
"" % str(invoice))
|
|
||||||
self.stdout.write(
|
|
||||||
self.style.SUCCESS("Number of invoices imported = %s" % num_invoice_created)
|
|
||||||
)
|
|
||||||
else:
|
|
||||||
self.stdout.write(self.style.SUCCESS(
|
|
||||||
'Customer email %s does not have a stripe customer.' % email))
|
|
||||||
except Exception as e:
|
|
||||||
print(" *** Error occurred. Details {}".format(str(e)))
|
|
||||||
|
|
@ -1,44 +0,0 @@
|
||||||
from django.core.management.base import BaseCommand
|
|
||||||
import csv
|
|
||||||
from hosting.models import VATRates
|
|
||||||
|
|
||||||
|
|
||||||
class Command(BaseCommand):
|
|
||||||
help = '''Imports VAT Rates. Assume vat rates of format https://github.com/kdeldycke/vat-rates/blob/master/vat_rates.csv'''
|
|
||||||
|
|
||||||
def add_arguments(self, parser):
|
|
||||||
parser.add_argument('csv_file', nargs='+', type=str)
|
|
||||||
|
|
||||||
def handle(self, *args, **options):
|
|
||||||
try:
|
|
||||||
for c_file in options['csv_file']:
|
|
||||||
print("c_file = %s" % c_file)
|
|
||||||
with open(c_file, mode='r') as csv_file:
|
|
||||||
csv_reader = csv.DictReader(csv_file)
|
|
||||||
line_count = 0
|
|
||||||
for row in csv_reader:
|
|
||||||
if line_count == 0:
|
|
||||||
line_count += 1
|
|
||||||
obj, created = VATRates.objects.get_or_create(
|
|
||||||
start_date=row["start_date"],
|
|
||||||
stop_date=row["stop_date"] if row["stop_date"] is not "" else None,
|
|
||||||
territory_codes=row["territory_codes"],
|
|
||||||
currency_code=row["currency_code"],
|
|
||||||
rate=row["rate"],
|
|
||||||
rate_type=row["rate_type"],
|
|
||||||
description=row["description"]
|
|
||||||
)
|
|
||||||
if created:
|
|
||||||
self.stdout.write(self.style.SUCCESS(
|
|
||||||
'%s. %s - %s - %s - %s' % (
|
|
||||||
line_count,
|
|
||||||
obj.start_date,
|
|
||||||
obj.stop_date,
|
|
||||||
obj.territory_codes,
|
|
||||||
obj.rate
|
|
||||||
)
|
|
||||||
))
|
|
||||||
line_count+=1
|
|
||||||
|
|
||||||
except Exception as e:
|
|
||||||
print(" *** Error occurred. Details {}".format(str(e)))
|
|
||||||
|
|
@ -1,42 +0,0 @@
|
||||||
# -*- coding: utf-8 -*-
|
|
||||||
# Generated by Django 1.9.4 on 2019-04-03 03:47
|
|
||||||
from __future__ import unicode_literals
|
|
||||||
|
|
||||||
from django.db import migrations, models
|
|
||||||
import django.db.models.deletion
|
|
||||||
import utils.mixins
|
|
||||||
|
|
||||||
|
|
||||||
class Migration(migrations.Migration):
|
|
||||||
|
|
||||||
dependencies = [
|
|
||||||
('membership', '0007_auto_20180213_0128'),
|
|
||||||
('hosting', '0049_auto_20181005_0736'),
|
|
||||||
]
|
|
||||||
|
|
||||||
operations = [
|
|
||||||
migrations.CreateModel(
|
|
||||||
name='MonthlyHostingBill',
|
|
||||||
fields=[
|
|
||||||
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
|
|
||||||
('created', models.DateTimeField(help_text='When the invoice was created')),
|
|
||||||
('receipt_number', models.CharField(help_text='The receipt number that is generated on Stripe', max_length=100)),
|
|
||||||
('invoice_number', models.CharField(help_text='The invoice number that is generated on Stripe', max_length=100)),
|
|
||||||
('paid_at', models.DateTimeField(help_text='Date on which the bill was paid')),
|
|
||||||
('period_start', models.DateTimeField()),
|
|
||||||
('period_end', models.DateTimeField()),
|
|
||||||
('billing_reason', models.CharField(max_length=25)),
|
|
||||||
('discount', models.PositiveIntegerField()),
|
|
||||||
('total', models.IntegerField()),
|
|
||||||
('lines_data_count', models.IntegerField()),
|
|
||||||
('invoice_id', models.CharField(max_length=100, unique=True)),
|
|
||||||
('lines_meta_data_csv', models.TextField()),
|
|
||||||
('customer', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='membership.StripeCustomer')),
|
|
||||||
('order', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='hosting.HostingOrder')),
|
|
||||||
],
|
|
||||||
options={
|
|
||||||
'permissions': (('view_monthlyhostingbill', 'View Monthly Hosting'),),
|
|
||||||
},
|
|
||||||
bases=(utils.mixins.AssignPermissionsMixin, models.Model),
|
|
||||||
),
|
|
||||||
]
|
|
||||||
|
|
@ -1,25 +0,0 @@
|
||||||
# -*- coding: utf-8 -*-
|
|
||||||
# Generated by Django 1.9.4 on 2019-04-03 07:03
|
|
||||||
from __future__ import unicode_literals
|
|
||||||
|
|
||||||
from django.db import migrations, models
|
|
||||||
|
|
||||||
|
|
||||||
class Migration(migrations.Migration):
|
|
||||||
|
|
||||||
dependencies = [
|
|
||||||
('hosting', '0050_monthlyhostingbill'),
|
|
||||||
]
|
|
||||||
|
|
||||||
operations = [
|
|
||||||
migrations.AddField(
|
|
||||||
model_name='monthlyhostingbill',
|
|
||||||
name='subscription_ids_csv',
|
|
||||||
field=models.TextField(default=''),
|
|
||||||
),
|
|
||||||
migrations.AlterField(
|
|
||||||
model_name='monthlyhostingbill',
|
|
||||||
name='lines_meta_data_csv',
|
|
||||||
field=models.TextField(default=''),
|
|
||||||
),
|
|
||||||
]
|
|
||||||
|
|
@ -1,37 +0,0 @@
|
||||||
# -*- coding: utf-8 -*-
|
|
||||||
# Generated by Django 1.9.4 on 2019-04-13 11:38
|
|
||||||
from __future__ import unicode_literals
|
|
||||||
|
|
||||||
from django.db import migrations, models
|
|
||||||
import django.db.models.deletion
|
|
||||||
import utils.mixins
|
|
||||||
|
|
||||||
|
|
||||||
class Migration(migrations.Migration):
|
|
||||||
|
|
||||||
dependencies = [
|
|
||||||
('hosting', '0051_auto_20190403_0703'),
|
|
||||||
]
|
|
||||||
|
|
||||||
operations = [
|
|
||||||
migrations.CreateModel(
|
|
||||||
name='HostingBillLineItem',
|
|
||||||
fields=[
|
|
||||||
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
|
|
||||||
('amount', models.PositiveSmallIntegerField()),
|
|
||||||
('description', models.CharField(max_length=255)),
|
|
||||||
('discountable', models.BooleanField()),
|
|
||||||
('metadata', models.CharField(max_length=128)),
|
|
||||||
('period_start', models.DateTimeField()),
|
|
||||||
('period_end', models.DateTimeField()),
|
|
||||||
('proration', models.BooleanField()),
|
|
||||||
('quantity', models.PositiveIntegerField()),
|
|
||||||
('unit_amount', models.PositiveIntegerField()),
|
|
||||||
('monthly_hosting_bill', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='hosting.MonthlyHostingBill')),
|
|
||||||
],
|
|
||||||
options={
|
|
||||||
'permissions': (('view_hostingbilllineitem', 'View Monthly Hosting Bill Line Item'),),
|
|
||||||
},
|
|
||||||
bases=(utils.mixins.AssignPermissionsMixin, models.Model),
|
|
||||||
),
|
|
||||||
]
|
|
||||||
|
|
@ -1,22 +0,0 @@
|
||||||
# -*- coding: utf-8 -*-
|
|
||||||
# Generated by Django 1.9.4 on 2019-04-20 10:10
|
|
||||||
from __future__ import unicode_literals
|
|
||||||
|
|
||||||
from django.db import migrations, models
|
|
||||||
import django.db.models.deletion
|
|
||||||
|
|
||||||
|
|
||||||
class Migration(migrations.Migration):
|
|
||||||
|
|
||||||
dependencies = [
|
|
||||||
('datacenterlight', '0028_stripeplan_stripe_plan_name'),
|
|
||||||
('hosting', '0052_hostingbilllineitem'),
|
|
||||||
]
|
|
||||||
|
|
||||||
operations = [
|
|
||||||
migrations.AddField(
|
|
||||||
model_name='hostingbilllineitem',
|
|
||||||
name='stripe_plan',
|
|
||||||
field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='datacenterlight.StripePlan'),
|
|
||||||
),
|
|
||||||
]
|
|
||||||
|
|
@ -1,20 +0,0 @@
|
||||||
# -*- coding: utf-8 -*-
|
|
||||||
# Generated by Django 1.9.4 on 2019-05-08 21:41
|
|
||||||
from __future__ import unicode_literals
|
|
||||||
|
|
||||||
from django.db import migrations, models
|
|
||||||
|
|
||||||
|
|
||||||
class Migration(migrations.Migration):
|
|
||||||
|
|
||||||
dependencies = [
|
|
||||||
('hosting', '0053_hostingbilllineitem_stripe_plan'),
|
|
||||||
]
|
|
||||||
|
|
||||||
operations = [
|
|
||||||
migrations.AlterField(
|
|
||||||
model_name='vmdetail',
|
|
||||||
name='configuration',
|
|
||||||
field=models.CharField(default='', max_length=128),
|
|
||||||
),
|
|
||||||
]
|
|
||||||
|
|
@ -1,22 +0,0 @@
|
||||||
# -*- coding: utf-8 -*-
|
|
||||||
# Generated by Django 1.9.4 on 2019-07-01 16:14
|
|
||||||
from __future__ import unicode_literals
|
|
||||||
|
|
||||||
from django.conf import settings
|
|
||||||
from django.db import migrations, models
|
|
||||||
import django.db.models.deletion
|
|
||||||
|
|
||||||
|
|
||||||
class Migration(migrations.Migration):
|
|
||||||
|
|
||||||
dependencies = [
|
|
||||||
('hosting', '0054_auto_20190508_2141'),
|
|
||||||
]
|
|
||||||
|
|
||||||
operations = [
|
|
||||||
migrations.AlterField(
|
|
||||||
model_name='userhostingkey',
|
|
||||||
name='user',
|
|
||||||
field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL),
|
|
||||||
),
|
|
||||||
]
|
|
||||||
|
|
@ -1,20 +0,0 @@
|
||||||
# -*- coding: utf-8 -*-
|
|
||||||
# Generated by Django 1.9.4 on 2019-10-26 04:54
|
|
||||||
from __future__ import unicode_literals
|
|
||||||
|
|
||||||
from django.db import migrations, models
|
|
||||||
|
|
||||||
|
|
||||||
class Migration(migrations.Migration):
|
|
||||||
|
|
||||||
dependencies = [
|
|
||||||
('hosting', '0055_auto_20190701_1614'),
|
|
||||||
]
|
|
||||||
|
|
||||||
operations = [
|
|
||||||
migrations.AlterField(
|
|
||||||
model_name='hostingbilllineitem',
|
|
||||||
name='amount',
|
|
||||||
field=models.IntegerField(),
|
|
||||||
),
|
|
||||||
]
|
|
||||||
|
|
@ -1,30 +0,0 @@
|
||||||
# -*- coding: utf-8 -*-
|
|
||||||
# Generated by Django 1.9.4 on 2019-11-15 05:16
|
|
||||||
from __future__ import unicode_literals
|
|
||||||
|
|
||||||
from django.db import migrations, models
|
|
||||||
import utils.mixins
|
|
||||||
|
|
||||||
|
|
||||||
class Migration(migrations.Migration):
|
|
||||||
|
|
||||||
dependencies = [
|
|
||||||
('hosting', '0056_auto_20191026_0454'),
|
|
||||||
]
|
|
||||||
|
|
||||||
operations = [
|
|
||||||
migrations.CreateModel(
|
|
||||||
name='VATRates',
|
|
||||||
fields=[
|
|
||||||
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
|
|
||||||
('start_date', models.DateField(blank=True, null=True)),
|
|
||||||
('stop_date', models.DateField(blank=True, null=True)),
|
|
||||||
('territory_codes', models.TextField(blank=True, default='')),
|
|
||||||
('currency_code', models.CharField(max_length=10)),
|
|
||||||
('rate', models.FloatField()),
|
|
||||||
('rate_type', models.TextField(blank=True, default='')),
|
|
||||||
('description', models.TextField(blank=True, default='')),
|
|
||||||
],
|
|
||||||
bases=(utils.mixins.AssignPermissionsMixin, models.Model),
|
|
||||||
),
|
|
||||||
]
|
|
||||||
|
|
@ -1,20 +0,0 @@
|
||||||
# -*- coding: utf-8 -*-
|
|
||||||
# Generated by Django 1.9.4 on 2019-11-15 14:57
|
|
||||||
from __future__ import unicode_literals
|
|
||||||
|
|
||||||
from django.db import migrations, models
|
|
||||||
|
|
||||||
|
|
||||||
class Migration(migrations.Migration):
|
|
||||||
|
|
||||||
dependencies = [
|
|
||||||
('hosting', '0057_vatrates'),
|
|
||||||
]
|
|
||||||
|
|
||||||
operations = [
|
|
||||||
migrations.AddField(
|
|
||||||
model_name='genericproduct',
|
|
||||||
name='product_subscription_interval',
|
|
||||||
field=models.CharField(default='month', help_text='Choose between `year` and `month`', max_length=10),
|
|
||||||
),
|
|
||||||
]
|
|
||||||
|
|
@ -1,17 +1,13 @@
|
||||||
import decimal
|
|
||||||
import json
|
|
||||||
import logging
|
import logging
|
||||||
import os
|
import os
|
||||||
from datetime import datetime
|
|
||||||
|
|
||||||
import pytz
|
|
||||||
from Crypto.PublicKey import RSA
|
from Crypto.PublicKey import RSA
|
||||||
from dateutil.relativedelta import relativedelta
|
from dateutil.relativedelta import relativedelta
|
||||||
from django.db import models
|
from django.db import models
|
||||||
from django.utils import timezone
|
from django.utils import timezone
|
||||||
from django.utils.functional import cached_property
|
from django.utils.functional import cached_property
|
||||||
|
|
||||||
from datacenterlight.models import VMPricing, VMTemplate, StripePlan
|
from datacenterlight.models import VMPricing, VMTemplate
|
||||||
from membership.models import StripeCustomer, CustomUser
|
from membership.models import StripeCustomer, CustomUser
|
||||||
from utils.mixins import AssignPermissionsMixin
|
from utils.mixins import AssignPermissionsMixin
|
||||||
from utils.models import BillingAddress
|
from utils.models import BillingAddress
|
||||||
|
|
@ -79,17 +75,13 @@ class GenericProduct(AssignPermissionsMixin, models.Model):
|
||||||
product_price = models.DecimalField(max_digits=6, decimal_places=2)
|
product_price = models.DecimalField(max_digits=6, decimal_places=2)
|
||||||
product_vat = models.DecimalField(max_digits=6, decimal_places=4, default=0)
|
product_vat = models.DecimalField(max_digits=6, decimal_places=4, default=0)
|
||||||
product_is_subscription = models.BooleanField(default=True)
|
product_is_subscription = models.BooleanField(default=True)
|
||||||
product_subscription_interval = models.CharField(
|
|
||||||
max_length=10, default="month",
|
|
||||||
help_text="Choose between `year` and `month`")
|
|
||||||
|
|
||||||
def __str__(self):
|
def __str__(self):
|
||||||
return self.product_name
|
return self.product_name
|
||||||
|
|
||||||
def get_actual_price(self, vat_rate=None):
|
def get_actual_price(self):
|
||||||
VAT = vat_rate if vat_rate is not None else self.product_vat
|
|
||||||
return round(
|
return round(
|
||||||
float(self.product_price) + float(self.product_price) * float(VAT), 2
|
self.product_price + (self.product_price * self.product_vat), 2
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -192,7 +184,7 @@ class HostingOrder(AssignPermissionsMixin, models.Model):
|
||||||
|
|
||||||
|
|
||||||
class UserHostingKey(models.Model):
|
class UserHostingKey(models.Model):
|
||||||
user = models.ForeignKey(CustomUser, blank=True, null=True)
|
user = models.ForeignKey(CustomUser)
|
||||||
public_key = models.TextField()
|
public_key = models.TextField()
|
||||||
private_key = models.FileField(upload_to='private_keys', blank=True)
|
private_key = models.FileField(upload_to='private_keys', blank=True)
|
||||||
created_at = models.DateTimeField(auto_now_add=True)
|
created_at = models.DateTimeField(auto_now_add=True)
|
||||||
|
|
@ -217,15 +209,6 @@ class UserHostingKey(models.Model):
|
||||||
# self.save(update_fields=['public_key'])
|
# self.save(update_fields=['public_key'])
|
||||||
return private_key, public_key
|
return private_key, public_key
|
||||||
|
|
||||||
def delete(self,*args,**kwargs):
|
|
||||||
if bool(self.private_key) and os.path.isfile(self.private_key.path):
|
|
||||||
logger.debug("Removing private key {}".format(self.private_key.path))
|
|
||||||
os.remove(self.private_key.path)
|
|
||||||
else:
|
|
||||||
logger.debug("No private_key to remove")
|
|
||||||
|
|
||||||
super(UserHostingKey, self).delete(*args,**kwargs)
|
|
||||||
|
|
||||||
|
|
||||||
class HostingBill(AssignPermissionsMixin, models.Model):
|
class HostingBill(AssignPermissionsMixin, models.Model):
|
||||||
customer = models.ForeignKey(StripeCustomer)
|
customer = models.ForeignKey(StripeCustomer)
|
||||||
|
|
@ -249,304 +232,13 @@ class HostingBill(AssignPermissionsMixin, models.Model):
|
||||||
return instance
|
return instance
|
||||||
|
|
||||||
|
|
||||||
class MonthlyHostingBill(AssignPermissionsMixin, models.Model):
|
|
||||||
"""
|
|
||||||
Corresponds to Invoice object of Stripe
|
|
||||||
"""
|
|
||||||
customer = models.ForeignKey(StripeCustomer)
|
|
||||||
order = models.ForeignKey(HostingOrder)
|
|
||||||
created = models.DateTimeField(help_text="When the invoice was created")
|
|
||||||
receipt_number = models.CharField(
|
|
||||||
help_text="The receipt number that is generated on Stripe",
|
|
||||||
max_length=100
|
|
||||||
)
|
|
||||||
invoice_number = models.CharField(
|
|
||||||
help_text="The invoice number that is generated on Stripe",
|
|
||||||
max_length=100
|
|
||||||
)
|
|
||||||
paid_at = models.DateTimeField(help_text="Date on which the bill was paid")
|
|
||||||
period_start = models.DateTimeField()
|
|
||||||
period_end = models.DateTimeField()
|
|
||||||
billing_reason = models.CharField(max_length=25)
|
|
||||||
discount = models.PositiveIntegerField()
|
|
||||||
total = models.IntegerField()
|
|
||||||
lines_data_count = models.IntegerField()
|
|
||||||
invoice_id = models.CharField(unique=True, max_length=100)
|
|
||||||
lines_meta_data_csv = models.TextField(default="")
|
|
||||||
subscription_ids_csv = models.TextField(default="")
|
|
||||||
|
|
||||||
permissions = ('view_monthlyhostingbill',)
|
|
||||||
|
|
||||||
class Meta:
|
|
||||||
permissions = (
|
|
||||||
('view_monthlyhostingbill', 'View Monthly Hosting'),
|
|
||||||
)
|
|
||||||
|
|
||||||
@classmethod
|
|
||||||
def create(cls, args):
|
|
||||||
# Try to infer the HostingOrder from subscription id or VM_ID
|
|
||||||
if len(args['subscription_ids_csv']) > 0:
|
|
||||||
sub_ids = [sub_id.strip() for sub_id in args['subscription_ids_csv'].split(",")]
|
|
||||||
set_sub_ids = set(sub_ids)
|
|
||||||
if len(set_sub_ids) == 1:
|
|
||||||
# the multiple line items belong to the same subscription
|
|
||||||
sub_id = set_sub_ids.pop()
|
|
||||||
try:
|
|
||||||
args['order'] = HostingOrder.objects.get(
|
|
||||||
subscription_id=sub_id
|
|
||||||
)
|
|
||||||
except HostingOrder.DoesNotExist as dne:
|
|
||||||
logger.error("Hosting order for {} doesn't exist".format(
|
|
||||||
sub_id
|
|
||||||
))
|
|
||||||
args['order'] = None
|
|
||||||
else:
|
|
||||||
logger.debug(
|
|
||||||
"More than one subscriptions"
|
|
||||||
"for MonthlyHostingBill {}".format(args['invoice_id'])
|
|
||||||
)
|
|
||||||
logger.debug("SUB_IDS={}".format(','.join(sub_ids)))
|
|
||||||
logger.debug("Not importing invoices")
|
|
||||||
return None
|
|
||||||
elif len(args['lines_meta_data_csv']) > 0:
|
|
||||||
vm_ids = [vm_id.strip() for vm_id in args['lines_meta_data_csv'].split(",")]
|
|
||||||
if len(vm_ids) == 1:
|
|
||||||
args['order'] = HostingOrder.objects.get(vm_id=vm_ids[0])
|
|
||||||
else:
|
|
||||||
logger.debug(
|
|
||||||
"More than one VM_ID"
|
|
||||||
"for MonthlyHostingBill {}".format(args['invoice_id'])
|
|
||||||
)
|
|
||||||
logger.debug("VM_IDS={}".format(','.join(vm_ids)))
|
|
||||||
logger.debug("Not importing invoices")
|
|
||||||
return None
|
|
||||||
else:
|
|
||||||
logger.debug("Neither subscription id nor vm_id available")
|
|
||||||
logger.debug("Can't import invoice")
|
|
||||||
return None
|
|
||||||
if args['order'] is None:
|
|
||||||
logger.error(
|
|
||||||
"Order is None for {}".format(args['invoice_id']))
|
|
||||||
return None
|
|
||||||
instance = cls.objects.create(
|
|
||||||
created=datetime.utcfromtimestamp(
|
|
||||||
args['created']).replace(tzinfo=pytz.utc),
|
|
||||||
receipt_number=(
|
|
||||||
args['receipt_number']
|
|
||||||
if args['receipt_number'] is not None else ''
|
|
||||||
),
|
|
||||||
invoice_number=(
|
|
||||||
args['invoice_number']
|
|
||||||
if args['invoice_number'] is not None else ''
|
|
||||||
),
|
|
||||||
paid_at=datetime.utcfromtimestamp(
|
|
||||||
args['paid_at']).replace(tzinfo=pytz.utc),
|
|
||||||
period_start=datetime.utcfromtimestamp(
|
|
||||||
args['period_start']).replace(tzinfo=pytz.utc),
|
|
||||||
period_end=datetime.utcfromtimestamp(
|
|
||||||
args['period_end']).replace(tzinfo=pytz.utc),
|
|
||||||
billing_reason=args['billing_reason'],
|
|
||||||
discount=args['discount'],
|
|
||||||
total=args['total'],
|
|
||||||
lines_data_count=args['lines_data_count'],
|
|
||||||
invoice_id=args['invoice_id'],
|
|
||||||
lines_meta_data_csv=args['lines_meta_data_csv'],
|
|
||||||
customer=args['customer'],
|
|
||||||
order=args['order'],
|
|
||||||
subscription_ids_csv=args['subscription_ids_csv'],
|
|
||||||
)
|
|
||||||
|
|
||||||
if 'line_items' in args:
|
|
||||||
line_items = args['line_items']
|
|
||||||
for item in line_items:
|
|
||||||
stripe_plan = None
|
|
||||||
if item.type == "subscription" or item.type == "invoiceitem":
|
|
||||||
# Check stripe plan and prepare it for linking to bill item
|
|
||||||
stripe_plan_id = item.plan.id
|
|
||||||
try:
|
|
||||||
stripe_plan = StripePlan.objects.get(
|
|
||||||
stripe_plan_id=stripe_plan_id
|
|
||||||
)
|
|
||||||
except StripePlan.DoesNotExist as dne:
|
|
||||||
logger.error(
|
|
||||||
"StripePlan %s doesn't exist" % stripe_plan_id
|
|
||||||
)
|
|
||||||
if stripe_plan_id is not None:
|
|
||||||
# Create Stripe Plan because we don't have it
|
|
||||||
stripe_plan = StripePlan.objects.create(
|
|
||||||
stripe_plan_id=stripe_plan_id,
|
|
||||||
stripe_plan_name=item.plan.name,
|
|
||||||
amount=item.plan.amount,
|
|
||||||
interval=item.plan.interval
|
|
||||||
)
|
|
||||||
logger.debug("Creatd StripePlan " + stripe_plan_id)
|
|
||||||
line_item_instance = HostingBillLineItem.objects.create(
|
|
||||||
monthly_hosting_bill=instance,
|
|
||||||
amount=item.amount,
|
|
||||||
# description seems to be set to null in the Stripe
|
|
||||||
# response for an invoice
|
|
||||||
description="" if item.description is None else item.description,
|
|
||||||
discountable=item.discountable,
|
|
||||||
metadata=json.dumps(item.metadata),
|
|
||||||
period_start=datetime.utcfromtimestamp(item.period.start).replace(tzinfo=pytz.utc), period_end=datetime.utcfromtimestamp(item.period.end).replace(tzinfo=pytz.utc),
|
|
||||||
proration=item.proration,
|
|
||||||
quantity=item.quantity,
|
|
||||||
# Strange that line item does not have unit_amount but api
|
|
||||||
# states that it is present
|
|
||||||
# https://stripe.com/docs/api/invoiceitems/object#invoiceitem_object-unit_amount
|
|
||||||
# So, for the time being I set the unit_amount to 0 if not
|
|
||||||
# found in the line item
|
|
||||||
unit_amount=item.unit_amount if hasattr(item, "unit_amount") else 0,
|
|
||||||
stripe_plan=stripe_plan
|
|
||||||
)
|
|
||||||
line_item_instance.assign_permissions(instance.customer.user)
|
|
||||||
instance.assign_permissions(instance.customer.user)
|
|
||||||
return instance
|
|
||||||
|
|
||||||
def total_in_chf(self):
|
|
||||||
"""
|
|
||||||
Returns amount in chf. The total amount in this model is in cents.
|
|
||||||
Hence we multiply it by 0.01 to obtain the result
|
|
||||||
|
|
||||||
:return:
|
|
||||||
"""
|
|
||||||
return self.total * 0.01
|
|
||||||
|
|
||||||
def discount_in_chf(self):
|
|
||||||
"""
|
|
||||||
Returns discount in chf.
|
|
||||||
|
|
||||||
:return:
|
|
||||||
"""
|
|
||||||
return self.discount * 0.01
|
|
||||||
|
|
||||||
def get_vm_id(self):
|
|
||||||
"""
|
|
||||||
Returns the VM_ID metadata if set in this MHB else returns None
|
|
||||||
:return:
|
|
||||||
"""
|
|
||||||
return_value = None
|
|
||||||
if len(self.lines_meta_data_csv) > 0:
|
|
||||||
vm_ids = [vm_id.strip() for vm_id in
|
|
||||||
self.lines_meta_data_csv.split(",")]
|
|
||||||
unique_vm_ids=set(vm_ids)
|
|
||||||
unique_vm_ids.discard("")
|
|
||||||
if len(unique_vm_ids) == 1:
|
|
||||||
vm_id = unique_vm_ids.pop()
|
|
||||||
logger.debug("Getting invoice for {}".format(vm_id))
|
|
||||||
return vm_id
|
|
||||||
else:
|
|
||||||
logger.debug(
|
|
||||||
"More than one VM_ID"
|
|
||||||
"for MonthlyHostingBill {}".format(self.invoice_id)
|
|
||||||
)
|
|
||||||
logger.debug("VM_IDS={}".format(unique_vm_ids))
|
|
||||||
return return_value
|
|
||||||
|
|
||||||
def get_period_start(self):
|
|
||||||
"""
|
|
||||||
Return the period start of the invoice for the line items
|
|
||||||
:return:
|
|
||||||
"""
|
|
||||||
items = HostingBillLineItem.objects.filter(monthly_hosting_bill=self)
|
|
||||||
if len(items) > 0:
|
|
||||||
return items[0].period_start
|
|
||||||
else:
|
|
||||||
return self.period_start
|
|
||||||
|
|
||||||
def get_period_end(self):
|
|
||||||
"""
|
|
||||||
Return the period end of the invoice for the line items
|
|
||||||
:return:
|
|
||||||
"""
|
|
||||||
items = HostingBillLineItem.objects.filter(monthly_hosting_bill=self)
|
|
||||||
if len(items) > 0:
|
|
||||||
return items[0].period_end
|
|
||||||
else:
|
|
||||||
return self.period_end
|
|
||||||
|
|
||||||
|
|
||||||
class HostingBillLineItem(AssignPermissionsMixin, models.Model):
|
|
||||||
"""
|
|
||||||
Corresponds to InvoiceItem object of Stripe
|
|
||||||
"""
|
|
||||||
monthly_hosting_bill = models.ForeignKey(MonthlyHostingBill,
|
|
||||||
on_delete=models.CASCADE)
|
|
||||||
stripe_plan = models.ForeignKey(StripePlan, null=True,
|
|
||||||
on_delete=models.CASCADE)
|
|
||||||
amount = models.IntegerField()
|
|
||||||
description = models.CharField(max_length=255)
|
|
||||||
discountable = models.BooleanField()
|
|
||||||
metadata = models.CharField(max_length=128)
|
|
||||||
period_start = models.DateTimeField()
|
|
||||||
period_end = models.DateTimeField()
|
|
||||||
proration = models.BooleanField()
|
|
||||||
quantity = models.PositiveIntegerField()
|
|
||||||
unit_amount = models.PositiveIntegerField()
|
|
||||||
permissions = ('view_hostingbilllineitem',)
|
|
||||||
|
|
||||||
class Meta:
|
|
||||||
permissions = (
|
|
||||||
('view_hostingbilllineitem', 'View Monthly Hosting Bill Line Item'),
|
|
||||||
)
|
|
||||||
|
|
||||||
def amount_in_chf(self):
|
|
||||||
"""
|
|
||||||
Returns amount in chf. The amount in this model is in cents (as in
|
|
||||||
Stripe). Hence we multiply it by 0.01 to obtain the result
|
|
||||||
|
|
||||||
:return:
|
|
||||||
"""
|
|
||||||
return self.amount * 0.01
|
|
||||||
|
|
||||||
def unit_amount_in_chf(self):
|
|
||||||
"""
|
|
||||||
Returns unit amount in chf. If its 0, we obtain it from amount and
|
|
||||||
quantity.
|
|
||||||
|
|
||||||
:return:
|
|
||||||
"""
|
|
||||||
if self.unit_amount == 0:
|
|
||||||
return round((self.amount / self.quantity) * 0.01, 2)
|
|
||||||
else:
|
|
||||||
return self.unit_amount * 0.01
|
|
||||||
|
|
||||||
def get_item_detail_str(self):
|
|
||||||
"""
|
|
||||||
Returns line item html string representation
|
|
||||||
:return:
|
|
||||||
"""
|
|
||||||
item_detail = ""
|
|
||||||
# metadata is a dict; a dict with nothing has two chars at least {}
|
|
||||||
if self.metadata is not None and len(self.metadata) > 2:
|
|
||||||
try:
|
|
||||||
vm_dict = json.loads(self.metadata)
|
|
||||||
item_detail = "VM ID: {}<br/>".format(vm_dict["VM_ID"])
|
|
||||||
except ValueError as ve:
|
|
||||||
logger.error(
|
|
||||||
"Could not parse VM in metadata {}. Detail {}".format(
|
|
||||||
self.metadata, str(ve)
|
|
||||||
)
|
|
||||||
)
|
|
||||||
vm_conf = StripeUtils.get_vm_config_from_stripe_id(
|
|
||||||
self.stripe_plan.stripe_plan_id
|
|
||||||
)
|
|
||||||
if vm_conf is not None:
|
|
||||||
item_detail += ("<b>Cores</b>: {}<br/><b>RAM</b>: {} GB<br/>"
|
|
||||||
"<b>SSD</b>: {} GB<br/>").format(
|
|
||||||
vm_conf['cores'], int(float(vm_conf['ram'])),
|
|
||||||
vm_conf['ssd']
|
|
||||||
)
|
|
||||||
return item_detail
|
|
||||||
|
|
||||||
|
|
||||||
class VMDetail(models.Model):
|
class VMDetail(models.Model):
|
||||||
user = models.ForeignKey(CustomUser)
|
user = models.ForeignKey(CustomUser)
|
||||||
vm_id = models.IntegerField(default=0)
|
vm_id = models.IntegerField(default=0)
|
||||||
disk_size = models.FloatField(default=0.0)
|
disk_size = models.FloatField(default=0.0)
|
||||||
cores = models.FloatField(default=0.0)
|
cores = models.FloatField(default=0.0)
|
||||||
memory = models.FloatField(default=0.0)
|
memory = models.FloatField(default=0.0)
|
||||||
configuration = models.CharField(default='', max_length=128)
|
configuration = models.CharField(default='', max_length=25)
|
||||||
ipv4 = models.TextField(default='')
|
ipv4 = models.TextField(default='')
|
||||||
ipv6 = models.TextField(default='')
|
ipv6 = models.TextField(default='')
|
||||||
created_at = models.DateTimeField(auto_now_add=True)
|
created_at = models.DateTimeField(auto_now_add=True)
|
||||||
|
|
@ -605,8 +297,6 @@ class UserCardDetail(AssignPermissionsMixin, models.Model):
|
||||||
for card in user_card_details:
|
for card in user_card_details:
|
||||||
cards_list.append({
|
cards_list.append({
|
||||||
'last4': card.last4, 'brand': card.brand, 'id': card.id,
|
'last4': card.last4, 'brand': card.brand, 'id': card.id,
|
||||||
'exp_year': card.exp_year,
|
|
||||||
'exp_month': '{:02d}'.format(card.exp_month),
|
|
||||||
'preferred': card.preferred
|
'preferred': card.preferred
|
||||||
})
|
})
|
||||||
return cards_list
|
return cards_list
|
||||||
|
|
@ -712,13 +402,3 @@ class UserCardDetail(AssignPermissionsMixin, models.Model):
|
||||||
return ucd
|
return ucd
|
||||||
except UserCardDetail.DoesNotExist:
|
except UserCardDetail.DoesNotExist:
|
||||||
return None
|
return None
|
||||||
|
|
||||||
|
|
||||||
class VATRates(AssignPermissionsMixin, models.Model):
|
|
||||||
start_date = models.DateField(blank=True, null=True)
|
|
||||||
stop_date = models.DateField(blank=True, null=True)
|
|
||||||
territory_codes = models.TextField(blank=True, default='')
|
|
||||||
currency_code = models.CharField(max_length=10)
|
|
||||||
rate = models.FloatField()
|
|
||||||
rate_type = models.TextField(blank=True, default='')
|
|
||||||
description = models.TextField(blank=True, default='')
|
|
||||||
|
|
@ -112,17 +112,4 @@
|
||||||
|
|
||||||
.dcl-place-order-text {
|
.dcl-place-order-text {
|
||||||
color: #808080;
|
color: #808080;
|
||||||
}
|
|
||||||
|
|
||||||
table {
|
|
||||||
border-collapse: collapse;
|
|
||||||
}
|
|
||||||
|
|
||||||
tr.border_bottom td {
|
|
||||||
border-bottom:1pt solid #eee;
|
|
||||||
}
|
|
||||||
|
|
||||||
tr.grand-total-padding td {
|
|
||||||
padding-top: 10px;
|
|
||||||
font-weight: bold;
|
|
||||||
}
|
}
|
||||||
|
|
@ -109,11 +109,8 @@ $(document).ready(function() {
|
||||||
modal_btn = $('#createvm-modal-done-btn');
|
modal_btn = $('#createvm-modal-done-btn');
|
||||||
$('#createvm-modal-title').text(data.msg_title);
|
$('#createvm-modal-title').text(data.msg_title);
|
||||||
$('#createvm-modal-body').html(data.msg_body);
|
$('#createvm-modal-body').html(data.msg_body);
|
||||||
if (data.redirect) {
|
modal_btn.attr('href', data.redirect)
|
||||||
modal_btn.attr('href', data.redirect).removeClass('hide');
|
.removeClass('hide');
|
||||||
} else {
|
|
||||||
modal_btn.attr('href', "");
|
|
||||||
}
|
|
||||||
if (data.status === true) {
|
if (data.status === true) {
|
||||||
fa_icon.attr('class', 'checkmark');
|
fa_icon.attr('class', 'checkmark');
|
||||||
} else {
|
} else {
|
||||||
|
|
|
||||||
|
|
@ -48,7 +48,6 @@
|
||||||
|
|
||||||
</head>
|
</head>
|
||||||
<body>
|
<body>
|
||||||
{% include "gdpr_banner.html" %}
|
|
||||||
|
|
||||||
<!-- Navigation -->
|
<!-- Navigation -->
|
||||||
{% include "hosting/includes/_navbar.html" %}
|
{% include "hosting/includes/_navbar.html" %}
|
||||||
|
|
|
||||||
|
|
@ -51,7 +51,6 @@
|
||||||
</head>
|
</head>
|
||||||
|
|
||||||
<body>
|
<body>
|
||||||
{% include "gdpr_banner.html" %}
|
|
||||||
{% cms_toolbar %}
|
{% cms_toolbar %}
|
||||||
|
|
||||||
{% block navbar %}
|
{% block navbar %}
|
||||||
|
|
|
||||||
|
|
@ -26,7 +26,7 @@
|
||||||
<img class="svg-img" src="{% static 'hosting/img/key.svg' %}">
|
<img class="svg-img" src="{% static 'hosting/img/key.svg' %}">
|
||||||
</div>
|
</div>
|
||||||
</a>
|
</a>
|
||||||
<a href="{% if has_invoices %}{% url 'hosting:invoices' %}{% else %}{% url 'hosting:orders' %}{% endif %}" class="hosting-dashboard-item">
|
<a href="{% url 'hosting:orders' %}" class="hosting-dashboard-item">
|
||||||
<h2>{% trans "My Bills" %}</h2>
|
<h2>{% trans "My Bills" %}</h2>
|
||||||
<div class="hosting-dashboard-image">
|
<div class="hosting-dashboard-image">
|
||||||
<img class="svg-img" src="{% static 'hosting/img/billing.svg' %}">
|
<img class="svg-img" src="{% static 'hosting/img/billing.svg' %}">
|
||||||
|
|
|
||||||
|
|
@ -33,11 +33,6 @@
|
||||||
<p style="line-height: 1.75; font-family: Lato, Arial, sans-serif; font-weight: 300; margin: 0;">
|
<p style="line-height: 1.75; font-family: Lato, Arial, sans-serif; font-weight: 300; margin: 0;">
|
||||||
{% blocktrans %}You can view your VM detail by clicking the button below.{% endblocktrans %}
|
{% blocktrans %}You can view your VM detail by clicking the button below.{% endblocktrans %}
|
||||||
</p>
|
</p>
|
||||||
{% if 'OpenBSD' in vm_name %}
|
|
||||||
<p style="line-height: 1.75; font-family: Lato, Arial, sans-serif; font-weight: 300; margin: 0;">
|
|
||||||
{% blocktrans %}You can log in to your VM by the username <strong>puffy</strong>.{% endblocktrans %}
|
|
||||||
</p>
|
|
||||||
{% endif %}
|
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
|
|
|
||||||
|
|
@ -5,9 +5,6 @@
|
||||||
{% blocktrans %}You have ordered a new virtual machine!{% endblocktrans %}
|
{% blocktrans %}You have ordered a new virtual machine!{% endblocktrans %}
|
||||||
{% blocktrans %}Your order of {{vm_name}} has been charged.{% endblocktrans %}
|
{% blocktrans %}Your order of {{vm_name}} has been charged.{% endblocktrans %}
|
||||||
{% blocktrans %}You can view your VM detail by following the link below.{% endblocktrans %}
|
{% blocktrans %}You can view your VM detail by following the link below.{% endblocktrans %}
|
||||||
{% if 'OpenBSD' in vm_name %}
|
|
||||||
{% blocktrans %}You can log in to your VM by the username puffy.{% endblocktrans %}
|
|
||||||
{% endif %}
|
|
||||||
|
|
||||||
{{ base_url }}{{ order_url }}
|
{{ base_url }}{{ order_url }}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -57,7 +57,7 @@
|
||||||
<label for="configuration">Configuration: </label>
|
<label for="configuration">Configuration: </label>
|
||||||
<select class="form-control" name="vm_template_id" id="{{vm.hosting_company}}-configuration" data-vm-type="{{vm.hosting_company}}">
|
<select class="form-control" name="vm_template_id" id="{{vm.hosting_company}}-configuration" data-vm-type="{{vm.hosting_company}}">
|
||||||
{% for template in templates %}
|
{% for template in templates %}
|
||||||
<option value="{{template.id}}">{{ template.name|cut:'public-' }}</option>
|
<option value="{{template.id}}">{{ template.name }}</option>
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
</select>
|
</select>
|
||||||
</li>
|
</li>
|
||||||
|
|
|
||||||
|
|
@ -1,240 +0,0 @@
|
||||||
{% extends "hosting/base_short.html" %}
|
|
||||||
{% load staticfiles bootstrap3 humanize i18n custom_tags %}
|
|
||||||
|
|
||||||
|
|
||||||
{% block content %}
|
|
||||||
<div id="order-detail{{invoice.invoice_number}}" class="order-detail-container">
|
|
||||||
{% if messages %}
|
|
||||||
<div class="alert alert-warning">
|
|
||||||
{% for message in messages %}
|
|
||||||
<span>{{ message }}</span>
|
|
||||||
{% endfor %}
|
|
||||||
</div>
|
|
||||||
{% endif %}
|
|
||||||
{% if not error %}
|
|
||||||
<div class="dashboard-container-head">
|
|
||||||
<h1 class="dashboard-title-thin">
|
|
||||||
<img src="{% static 'hosting/img/billing.svg' %}" class="un-icon">
|
|
||||||
{% blocktrans with page_header_text=page_header_text|default:"Invoice" %}{{page_header_text}}{% endblocktrans %}
|
|
||||||
</h1>
|
|
||||||
{% if invoice %}
|
|
||||||
<div class="dashboard-container-options">
|
|
||||||
<button type="button" class="btn-plain btn-pdf"
|
|
||||||
data-target="#order-detail{{invoice.invoice_number}}"><img
|
|
||||||
src="{% static 'hosting/img/icon-pdf.svg' %}"
|
|
||||||
class="svg-img"></button>
|
|
||||||
<button type="button" class="btn-plain btn-print"><img
|
|
||||||
src="{% static 'hosting/img/icon-print.svg' %}"
|
|
||||||
class="svg-img"></button>
|
|
||||||
</div>
|
|
||||||
{% endif %}
|
|
||||||
</div>
|
|
||||||
<div class="order-details">
|
|
||||||
{% if invoice %}
|
|
||||||
<p>
|
|
||||||
<strong>{% trans "Invoice #" %} {{invoice.invoice_number}}</strong>
|
|
||||||
</p>
|
|
||||||
{% endif %}
|
|
||||||
<p>
|
|
||||||
<strong>{% trans "Date" %}:</strong>
|
|
||||||
<span class="locale_date">
|
|
||||||
{% if invoice %}
|
|
||||||
{{invoice.paid_at|date:'Y-m-d h:i a'}}
|
|
||||||
{% else %}
|
|
||||||
{% now "Y-m-d h:i a" %}
|
|
||||||
{% endif %}
|
|
||||||
</span>
|
|
||||||
</p>
|
|
||||||
{% if invoice and vm %}
|
|
||||||
<p>
|
|
||||||
<strong>{% trans "Status" %}: </strong>
|
|
||||||
<strong>
|
|
||||||
{% if vm.terminated_at %}
|
|
||||||
<span class="vm-color-failed">{% trans "Terminated" %}</span>
|
|
||||||
{% elif invoice.order.status == 'Approved' %}
|
|
||||||
<span class="vm-color-online">{% trans "Approved" %}</span>
|
|
||||||
{% else %}
|
|
||||||
<span class="vm-status-failed">{% trans "Declined" %}</span>
|
|
||||||
{% endif %}
|
|
||||||
</strong>
|
|
||||||
</p>
|
|
||||||
{% endif %}
|
|
||||||
<hr>
|
|
||||||
<div>
|
|
||||||
<address>
|
|
||||||
<h4>{% trans "Billed to" %}:</h4>
|
|
||||||
<p>
|
|
||||||
{% if invoice.order %}
|
|
||||||
{{invoice.customer.user.name}}<br>
|
|
||||||
{{invoice.order.billing_address.street_address}},
|
|
||||||
{{invoice.order.billing_address.postal_code}}<br>
|
|
||||||
{{invoice.order.billing_address.city}},
|
|
||||||
{{invoice.order.billing_address.country}}
|
|
||||||
{% endif %}
|
|
||||||
</p>
|
|
||||||
</address>
|
|
||||||
</div>
|
|
||||||
<hr>
|
|
||||||
<div>
|
|
||||||
<h4>{% trans "Payment method" %}:</h4>
|
|
||||||
<p>
|
|
||||||
{% if invoice.order %}
|
|
||||||
{{invoice.order.cc_brand}} {% trans "ending in" %} ****
|
|
||||||
{{invoice.order.last4}}<br>
|
|
||||||
{{invoice.customer.user.email}}
|
|
||||||
{% endif %}
|
|
||||||
</p>
|
|
||||||
</div>
|
|
||||||
<hr>
|
|
||||||
<div>
|
|
||||||
<h4>{% trans "Invoice summary" %}</h4>
|
|
||||||
{% if vm %}
|
|
||||||
{% if line_items %}
|
|
||||||
<table>
|
|
||||||
<tr><th style="width: 35%">Product</th><th style="width: 20%">Period</th><th style="text-align: center; width: 10%">Qty</th><th align="center" style="width: 10%; text-align: center;">Unit Price</th><th style="width: 10%; text-align: right;">Total</th></tr>
|
|
||||||
{% for line_item in line_items %}
|
|
||||||
<tr class="border_bottom"><td>{% if line_item.description|length > 0 %}{{line_item.description}}{% elif line_item.stripe_plan.stripe_plan_name|length > 0 %}{{line_item.stripe_plan.stripe_plan_name}}{% else %}{{line_item.get_item_detail_str|safe}}{% endif %}</td><td>{{ line_item.period_start | date:'Y-m-d' }} — {{ line_item.period_end | date:'Y-m-d' }}</td><td align="center">{{line_item.quantity}}</td><td align="center">{{line_item.unit_amount_in_chf}}</td><td align="right">{{line_item.amount_in_chf|floatformat:2}}</td></tr>
|
|
||||||
|
|
||||||
{% endfor %}
|
|
||||||
<tr class="grand-total-padding"><td colspan="4">Grand Total</td><td align="right">{{total_in_chf|floatformat:2}}</td></tr>
|
|
||||||
</table>
|
|
||||||
{% else %}
|
|
||||||
<p>
|
|
||||||
<strong>{% trans "Product" %}:</strong>
|
|
||||||
{% if vm.name %}
|
|
||||||
{{ vm.name }}
|
|
||||||
{% endif %}
|
|
||||||
</p>
|
|
||||||
<div class="row">
|
|
||||||
<div class="col-sm-6">
|
|
||||||
{% if period_start %}
|
|
||||||
<p>
|
|
||||||
<span>{% trans "Period" %}: </span>
|
|
||||||
<span>
|
|
||||||
<span class="locale_date"
|
|
||||||
data-format="YYYY/MM/DD">{{ period_start|date:'Y-m-d h:i a' }}</span> - <span
|
|
||||||
class="locale_date" data-format="YYYY/MM/DD">{{ period_end|date:'Y-m-d h:i a' }}</span>
|
|
||||||
</span>
|
|
||||||
</p>
|
|
||||||
{% endif %}
|
|
||||||
<p>
|
|
||||||
<span>{% trans "Cores" %}: </span>
|
|
||||||
{% if vm.cores %}
|
|
||||||
<strong class="pull-right">{{vm.cores|floatformat}}</strong>
|
|
||||||
{% else %}
|
|
||||||
<strong class="pull-right">{{vm.cpu|floatformat}}</strong>
|
|
||||||
{% endif %}
|
|
||||||
</p>
|
|
||||||
<p>
|
|
||||||
<span>{% trans "Memory" %}: </span>
|
|
||||||
<strong class="pull-right">{{vm.memory}} GB</strong>
|
|
||||||
</p>
|
|
||||||
<p>
|
|
||||||
<span>{% trans "Disk space" %}: </span>
|
|
||||||
<strong class="pull-right">{{vm.disk_size}} GB</strong>
|
|
||||||
</p>
|
|
||||||
</div>
|
|
||||||
<div class="col-sm-12">
|
|
||||||
<hr class="thin-hr">
|
|
||||||
</div>
|
|
||||||
{% if vm.vat > 0 or vm.discount.amount > 0 %}
|
|
||||||
<div class="col-sm-6">
|
|
||||||
<div class="subtotal-price">
|
|
||||||
{% if vm.vat > 0 %}
|
|
||||||
<p>
|
|
||||||
<strong>{% trans "Subtotal" %} </strong>
|
|
||||||
<strong class="pull-right">{{vm.price|floatformat:2|intcomma}}
|
|
||||||
CHF</strong>
|
|
||||||
</p>
|
|
||||||
<p>
|
|
||||||
<small>{% trans "VAT" %} ({{ vm.vat_percent|floatformat:2|intcomma }}%)
|
|
||||||
</small>
|
|
||||||
<strong class="pull-right">{{vm.vat|floatformat:2|intcomma}} CHF</strong>
|
|
||||||
</p>
|
|
||||||
{% endif %}
|
|
||||||
{% if vm.discount.amount > 0 %}
|
|
||||||
<p class="text-primary">
|
|
||||||
{%trans "Discount" as discount_name %}
|
|
||||||
<strong>{{ vm.discount.name|default:discount_name }} </strong>
|
|
||||||
<strong class="pull-right">- {{ vm.discount.amount }} CHF</strong>
|
|
||||||
</p>
|
|
||||||
{% endif %}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="col-sm-12">
|
|
||||||
<hr class="thin-hr">
|
|
||||||
</div>
|
|
||||||
{% endif %}
|
|
||||||
<div class="col-sm-6">
|
|
||||||
<p class="total-price">
|
|
||||||
<strong>{% trans "Total" %} </strong>
|
|
||||||
<strong class="pull-right">{% if vm.total_price %}{{vm.total_price|floatformat:2|intcomma}}{% else %}{{vm.price|floatformat:2|intcomma}}{% endif %}
|
|
||||||
CHF</strong>
|
|
||||||
</p>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
{% endif %}
|
|
||||||
{% else %}
|
|
||||||
<p>
|
|
||||||
<strong>{% trans "Product" %}:</strong>
|
|
||||||
{{ product_name }}
|
|
||||||
</p>
|
|
||||||
<div class="row">
|
|
||||||
<div class="col-sm-6">
|
|
||||||
<p>
|
|
||||||
<span>{% trans "Amount" %}: </span>
|
|
||||||
<strong class="pull-right">{{total_in_chf|floatformat:2|intcomma}}
|
|
||||||
CHF</strong>
|
|
||||||
</p>
|
|
||||||
{% if invoice.order.generic_payment_description %}
|
|
||||||
<p>
|
|
||||||
<span>{% trans "Description" %}: </span>
|
|
||||||
<strong class="pull-right">{{invoice.order.generic_payment_description}}</strong>
|
|
||||||
</p>
|
|
||||||
{% endif %}
|
|
||||||
{% if invoice.order.subscription_id %}
|
|
||||||
<p>
|
|
||||||
<span>{% trans "Recurring" %}: </span>
|
|
||||||
{% if invoice.order.generic_product.product_subscription_interval == 'year' %}
|
|
||||||
<strong class="pull-right">{{invoice.order.created_at|date:'d'|ordinal}} {% trans "of" %} {{invoice.order.created_at|date:'b'|title}}
|
|
||||||
{% trans "each year" %}</strong>
|
|
||||||
{% else %}
|
|
||||||
<strong class="pull-right">{{invoice.order.created_at|date:'d'|ordinal}}
|
|
||||||
{% trans "of every month" %}</strong>
|
|
||||||
{% endif %}
|
|
||||||
</p>
|
|
||||||
{% endif %}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
{% endif %}
|
|
||||||
</div>
|
|
||||||
<hr class="thin-hr">
|
|
||||||
</div>
|
|
||||||
<div class="order_detail_footer">
|
|
||||||
<strong>ungleich glarus ag</strong> Bahnhofstrasse 1, 8783
|
|
||||||
Linthal, Switzerland<br>
|
|
||||||
www.datacenterlight.ch | info@datacenterlight.ch | <small>
|
|
||||||
CHE-156.970.649 MWST
|
|
||||||
</small>
|
|
||||||
</div>
|
|
||||||
{% endif %}
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="text-center" style="margin-bottom: 50px;">
|
|
||||||
<a class="btn btn-vm-back" href="{% url 'hosting:invoices' %}">{% trans "BACK TO LIST" %}</a>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<script type="text/javascript">
|
|
||||||
{% trans "Some problem encountered. Please try again later." as err_msg %}
|
|
||||||
var create_vm_error_message = '{{err_msg|safe}}';
|
|
||||||
</script>
|
|
||||||
{%endblock%}
|
|
||||||
|
|
||||||
{% block js_extra %}
|
|
||||||
{% if invoice.order %}
|
|
||||||
<script src="https://cdnjs.cloudflare.com/ajax/libs/jspdf/1.3.5/jspdf.min.js"></script>
|
|
||||||
<script src="{% static 'hosting/js/html2canvas.min.js' %}"></script>
|
|
||||||
<script src="{% static 'hosting/js/html2pdf.min.js' %}"></script>
|
|
||||||
<script src="{% static 'hosting/js/order.js' %}"></script>
|
|
||||||
{% endif %}
|
|
||||||
{% endblock js_extra %}
|
|
||||||
|
|
@ -1,61 +0,0 @@
|
||||||
{% extends "hosting/base_short.html" %}
|
|
||||||
{% load staticfiles bootstrap3 humanize i18n custom_tags %}
|
|
||||||
|
|
||||||
{% block content %}
|
|
||||||
<div class="dashboard-container">
|
|
||||||
<div class="dashboard-container-head">
|
|
||||||
<h3 class="dashboard-title-thin"><img src="{% static 'hosting/img/shopping-cart.svg' %}" class="un-icon" style="margin-top: -4px; width: 30px;"> {% trans "My Bills" %}</h3>
|
|
||||||
{% if messages %}
|
|
||||||
<div class="alert alert-warning">
|
|
||||||
{% for message in messages %}
|
|
||||||
<span>{{ message }}</span>
|
|
||||||
{% endfor %}
|
|
||||||
</div>
|
|
||||||
{% endif %}
|
|
||||||
<div class="dashboard-subtitle"></div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<table class="table table-switch">
|
|
||||||
<thead>
|
|
||||||
<tr>
|
|
||||||
<th>{% trans "VM ID" %}</th>
|
|
||||||
<th>{% trans "IP Address" %}</th>
|
|
||||||
<th>{% trans "Period" %}</th>
|
|
||||||
<th>{% trans "Amount" %}</th>
|
|
||||||
<th></th>
|
|
||||||
</tr>
|
|
||||||
</thead>
|
|
||||||
<tbody>
|
|
||||||
{% for invoice in invoices %}
|
|
||||||
<tr>
|
|
||||||
<td class="xs-td-inline" data-header="{% trans 'VM ID' %}">{{ invoice.order.vm_id }}</td>
|
|
||||||
<td class="xs-td-inline" data-header="{% trans 'IP Address' %}">{{ ips|get_value_from_dict:invoice.invoice_number|join:"<br/>" }}</td>
|
|
||||||
{% with period|get_value_from_dict:invoice.invoice_number as period_to_show %}
|
|
||||||
<td class="xs-td-inline" data-header="{% trans 'Period' %}">{{ period_to_show.period_start | date:'Y-m-d' }} — {{ period_to_show.period_end | date:'Y-m-d' }}</td>
|
|
||||||
{% endwith %}
|
|
||||||
<td class="xs-td-inline" data-header="{% trans 'Amount' %}">{{ invoice.total_in_chf|floatformat:2|intcomma }}</td>
|
|
||||||
<td class="text-right last-td">
|
|
||||||
<a class="btn btn-order-detail" href="{% url 'hosting:invoices' invoice.invoice_number %}">{% trans 'See Invoice' %}</a>
|
|
||||||
</td>
|
|
||||||
</tr>
|
|
||||||
{% endfor %}
|
|
||||||
</tbody>
|
|
||||||
</table>
|
|
||||||
|
|
||||||
{% if is_paginated %}
|
|
||||||
<div class="pagination">
|
|
||||||
<span class="page-links">
|
|
||||||
{% if page_obj.has_previous %}
|
|
||||||
<a href="{{request.path}}?page={{ page_obj.previous_page_number }}">{% trans "previous" %}</a>
|
|
||||||
{% endif %}
|
|
||||||
<span class="page-current">
|
|
||||||
{% trans "Page" %} {{ page_obj.number }} {% trans "of" %} {{ page_obj.paginator.num_pages }}.
|
|
||||||
</span>
|
|
||||||
{% if page_obj.has_next %}
|
|
||||||
<a href="{{request.path}}?page={{ page_obj.next_page_number }}">{% trans "next" %}</a>
|
|
||||||
{% endif %}
|
|
||||||
</span>
|
|
||||||
</div>
|
|
||||||
{% endif %}
|
|
||||||
</div>
|
|
||||||
{% endblock %}
|
|
||||||
|
|
@ -82,7 +82,6 @@
|
||||||
{{user.email}}
|
{{user.email}}
|
||||||
{% else %}
|
{% else %}
|
||||||
{{cc_brand|default:_('Credit Card')}} {% trans "ending in" %} ****{{cc_last4}}<br>
|
{{cc_brand|default:_('Credit Card')}} {% trans "ending in" %} ****{{cc_last4}}<br>
|
||||||
{% trans "Expiry" %} {{cc_exp_year}}/{{cc_exp_month}}<br/>
|
|
||||||
{% if request.user.is_authenticated %}
|
{% if request.user.is_authenticated %}
|
||||||
{{request.user.email}}
|
{{request.user.email}}
|
||||||
{% else %}
|
{% else %}
|
||||||
|
|
@ -186,13 +185,7 @@
|
||||||
{% if order.subscription_id %}
|
{% if order.subscription_id %}
|
||||||
<p>
|
<p>
|
||||||
<span>{% trans "Recurring" %}: </span>
|
<span>{% trans "Recurring" %}: </span>
|
||||||
{% if order.generic_product.product_subscription_interval == 'year' %}
|
<strong class="pull-right">{{order.created_at|date:'d'|ordinal}} {% trans "of every month" %}</strong>
|
||||||
<strong class="pull-right">{{order.created_at|date:'d'|ordinal}} {% trans "of" %} {{order.created_at|date:'b'|title}}
|
|
||||||
{% trans "each year" %}</strong>
|
|
||||||
{% else %}
|
|
||||||
<strong class="pull-right">{{order.created_at|date:'d'|ordinal}}
|
|
||||||
{% trans "of every month" %}</strong>
|
|
||||||
{% endif %}
|
|
||||||
</p>
|
</p>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
</div>
|
</div>
|
||||||
|
|
|
||||||
|
|
@ -131,7 +131,6 @@
|
||||||
<h5 class="billing-head">{% trans "Credit Card" %}</h5>
|
<h5 class="billing-head">{% trans "Credit Card" %}</h5>
|
||||||
<h5 class="membership-lead">{% trans "Last" %} 4: ***** {{card.last4}}</h5>
|
<h5 class="membership-lead">{% trans "Last" %} 4: ***** {{card.last4}}</h5>
|
||||||
<h5 class="membership-lead">{% trans "Type" %}: {{card.brand}}</h5>
|
<h5 class="membership-lead">{% trans "Type" %}: {{card.brand}}</h5>
|
||||||
<h5 class="membership-lead">{% trans "Expiry" %}: {{card.exp_month}}/{{card.exp_year}}</h5>
|
|
||||||
</div>
|
</div>
|
||||||
<div class="col-xs-6 text-right align-bottom">
|
<div class="col-xs-6 text-right align-bottom">
|
||||||
<a class="btn choice-btn choice-btn-faded" href="#" data-id_card="{{card.id}}">{% trans "SELECT" %}</a>
|
<a class="btn choice-btn choice-btn-faded" href="#" data-id_card="{{card.id}}">{% trans "SELECT" %}</a>
|
||||||
|
|
|
||||||
|
|
@ -37,7 +37,6 @@
|
||||||
<h5 class="billing-head">{% trans "Credit Card" %}</h5>
|
<h5 class="billing-head">{% trans "Credit Card" %}</h5>
|
||||||
<h5 class="membership-lead">{% trans "Last" %} 4: ***** {{card.last4}}</h5>
|
<h5 class="membership-lead">{% trans "Last" %} 4: ***** {{card.last4}}</h5>
|
||||||
<h5 class="membership-lead">{% trans "Type" %}: {{card.brand}}</h5>
|
<h5 class="membership-lead">{% trans "Type" %}: {{card.brand}}</h5>
|
||||||
<h5 class="membership-lead">{% trans "Expiry" %}: {{card.exp_month}}/{{card.exp_year}}</h5>
|
|
||||||
<div class="credit-card-details-opt">
|
<div class="credit-card-details-opt">
|
||||||
<div class="row">
|
<div class="row">
|
||||||
{% if card_list_len > 1 %}
|
{% if card_list_len > 1 %}
|
||||||
|
|
|
||||||
|
|
@ -8,8 +8,7 @@
|
||||||
<form method="POST" action="" novalidate class="form-ssh">
|
<form method="POST" action="" novalidate class="form-ssh">
|
||||||
{% csrf_token %}
|
{% csrf_token %}
|
||||||
<div class="page-header">
|
<div class="page-header">
|
||||||
<h1 class="h1-thin"><i class="fa fa-key" aria-hidden="true"></i> {% if title %}{% trans title %}{% else %} {% endif %}</h1>
|
<h1 class="h1-thin"><i class="fa fa-key" aria-hidden="true"></i> {% trans "Add your public SSH key" %}</h1>
|
||||||
{% if sub_title %}<span>{% trans sub_title %}</span>{% else %}{% endif %}
|
|
||||||
</div>
|
</div>
|
||||||
{% if messages %}
|
{% if messages %}
|
||||||
<div class="alert alert-warning">
|
<div class="alert alert-warning">
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,5 @@
|
||||||
from django.conf.urls import url
|
from django.conf.urls import url
|
||||||
from django.contrib.auth import views as auth_views
|
from django.contrib.auth import views as auth_views
|
||||||
|
|
||||||
from utils.views import SSHKeyCreateView, AskSSHKeyView
|
|
||||||
from .views import (
|
from .views import (
|
||||||
DjangoHostingView, RailsHostingView, PaymentVMView, NodeJSHostingView,
|
DjangoHostingView, RailsHostingView, PaymentVMView, NodeJSHostingView,
|
||||||
LoginView, SignupView, SignupValidateView, SignupValidatedView, IndexView,
|
LoginView, SignupView, SignupValidateView, SignupValidatedView, IndexView,
|
||||||
|
|
@ -9,15 +7,14 @@ from .views import (
|
||||||
VirtualMachinesPlanListView, VirtualMachineView, OrdersHostingDeleteView,
|
VirtualMachinesPlanListView, VirtualMachineView, OrdersHostingDeleteView,
|
||||||
MarkAsReadNotificationView, PasswordResetView, PasswordResetConfirmView,
|
MarkAsReadNotificationView, PasswordResetView, PasswordResetConfirmView,
|
||||||
HostingPricingView, CreateVirtualMachinesView, HostingBillListView,
|
HostingPricingView, CreateVirtualMachinesView, HostingBillListView,
|
||||||
HostingBillDetailView, SSHKeyDeleteView, SSHKeyListView,
|
HostingBillDetailView, SSHKeyDeleteView, SSHKeyCreateView, SSHKeyListView,
|
||||||
SSHKeyChoiceView, DashboardView, SettingsView, ResendActivationEmailView,
|
SSHKeyChoiceView, DashboardView, SettingsView, ResendActivationEmailView
|
||||||
InvoiceListView, InvoiceDetailView, CheckUserVM
|
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
urlpatterns = [
|
urlpatterns = [
|
||||||
url(r'index/?$', IndexView.as_view(), name='index'),
|
url(r'index/?$', IndexView.as_view(), name='index'),
|
||||||
url(r'django/?$', DjangoHostingView.as_view(), name='djangohosting'),
|
url(r'django/?$', DjangoHostingView.as_view(), name='djangohosting'),
|
||||||
url(r'checkvm/?$', CheckUserVM.as_view(), name='check_vm'),
|
|
||||||
url(r'dashboard/?$', DashboardView.as_view(), name='dashboard'),
|
url(r'dashboard/?$', DashboardView.as_view(), name='dashboard'),
|
||||||
url(r'nodejs/?$', NodeJSHostingView.as_view(), name='nodejshosting'),
|
url(r'nodejs/?$', NodeJSHostingView.as_view(), name='nodejshosting'),
|
||||||
url(r'rails/?$', RailsHostingView.as_view(), name='railshosting'),
|
url(r'rails/?$', RailsHostingView.as_view(), name='railshosting'),
|
||||||
|
|
@ -25,15 +22,10 @@ urlpatterns = [
|
||||||
url(r'payment/?$', PaymentVMView.as_view(), name='payment'),
|
url(r'payment/?$', PaymentVMView.as_view(), name='payment'),
|
||||||
url(r'settings/?$', SettingsView.as_view(), name='settings'),
|
url(r'settings/?$', SettingsView.as_view(), name='settings'),
|
||||||
url(r'orders/?$', OrdersHostingListView.as_view(), name='orders'),
|
url(r'orders/?$', OrdersHostingListView.as_view(), name='orders'),
|
||||||
url(r'invoices/?$', InvoiceListView.as_view(), name='invoices'),
|
|
||||||
url(r'order-confirmation/?$', OrdersHostingDetailView.as_view(),
|
url(r'order-confirmation/?$', OrdersHostingDetailView.as_view(),
|
||||||
name='order-confirmation'),
|
name='order-confirmation'),
|
||||||
url(r'^add-ssh-key/?$', AskSSHKeyView.as_view(),
|
|
||||||
name='add_ssh_key'),
|
|
||||||
url(r'orders/(?P<pk>\d+)/?$', OrdersHostingDetailView.as_view(),
|
url(r'orders/(?P<pk>\d+)/?$', OrdersHostingDetailView.as_view(),
|
||||||
name='orders'),
|
name='orders'),
|
||||||
url(r'invoice/(?P<invoice_id>[-\w]+)/?$', InvoiceDetailView.as_view(),
|
|
||||||
name='invoices'),
|
|
||||||
url(r'bills/?$', HostingBillListView.as_view(), name='bills'),
|
url(r'bills/?$', HostingBillListView.as_view(), name='bills'),
|
||||||
url(r'bills/(?P<pk>\d+)/?$', HostingBillDetailView.as_view(),
|
url(r'bills/(?P<pk>\d+)/?$', HostingBillDetailView.as_view(),
|
||||||
name='bills'),
|
name='bills'),
|
||||||
|
|
|
||||||
360
hosting/views.py
360
hosting/views.py
|
|
@ -28,16 +28,13 @@ from django.views.generic import (
|
||||||
)
|
)
|
||||||
from guardian.mixins import PermissionRequiredMixin
|
from guardian.mixins import PermissionRequiredMixin
|
||||||
from oca.pool import WrongIdError
|
from oca.pool import WrongIdError
|
||||||
from rest_framework.renderers import JSONRenderer
|
|
||||||
from rest_framework.response import Response
|
|
||||||
from rest_framework.views import APIView
|
|
||||||
from stored_messages.api import mark_read
|
from stored_messages.api import mark_read
|
||||||
from stored_messages.models import Message
|
from stored_messages.models import Message
|
||||||
from stored_messages.settings import stored_messages_settings
|
from stored_messages.settings import stored_messages_settings
|
||||||
|
|
||||||
from datacenterlight.cms_models import DCLCalculatorPluginModel
|
from datacenterlight.cms_models import DCLCalculatorPluginModel
|
||||||
from datacenterlight.models import VMTemplate, VMPricing
|
from datacenterlight.models import VMTemplate, VMPricing
|
||||||
from datacenterlight.utils import create_vm, get_cms_integration, check_otp
|
from datacenterlight.utils import create_vm, get_cms_integration
|
||||||
from hosting.models import UserCardDetail
|
from hosting.models import UserCardDetail
|
||||||
from membership.models import CustomUser, StripeCustomer
|
from membership.models import CustomUser, StripeCustomer
|
||||||
from opennebula_api.models import OpenNebulaManager
|
from opennebula_api.models import OpenNebulaManager
|
||||||
|
|
@ -49,7 +46,6 @@ from utils.forms import (
|
||||||
BillingAddressForm, PasswordResetRequestForm, UserBillingAddressForm,
|
BillingAddressForm, PasswordResetRequestForm, UserBillingAddressForm,
|
||||||
ResendActivationEmailForm
|
ResendActivationEmailForm
|
||||||
)
|
)
|
||||||
from utils.hosting_utils import get_all_public_keys
|
|
||||||
from utils.hosting_utils import get_vm_price_with_vat, HostingUtils
|
from utils.hosting_utils import get_vm_price_with_vat, HostingUtils
|
||||||
from utils.mailer import BaseEmail
|
from utils.mailer import BaseEmail
|
||||||
from utils.stripe_utils import StripeUtils
|
from utils.stripe_utils import StripeUtils
|
||||||
|
|
@ -65,17 +61,14 @@ from .forms import (
|
||||||
from .mixins import ProcessVMSelectionMixin, HostingContextMixin
|
from .mixins import ProcessVMSelectionMixin, HostingContextMixin
|
||||||
from .models import (
|
from .models import (
|
||||||
HostingOrder, HostingBill, HostingPlan, UserHostingKey, VMDetail,
|
HostingOrder, HostingBill, HostingPlan, UserHostingKey, VMDetail,
|
||||||
GenericProduct, MonthlyHostingBill, HostingBillLineItem
|
GenericProduct
|
||||||
)
|
)
|
||||||
|
|
||||||
logger = logging.getLogger(__name__)
|
logger = logging.getLogger(__name__)
|
||||||
|
|
||||||
|
|
||||||
CONNECTION_ERROR = "Your VMs cannot be displayed at the moment due to a \
|
CONNECTION_ERROR = "Your VMs cannot be displayed at the moment due to a \
|
||||||
backend connection error. please try again in a few \
|
backend connection error. please try again in a few \
|
||||||
minutes."
|
minutes."
|
||||||
|
|
||||||
|
|
||||||
decorators = [never_cache]
|
decorators = [never_cache]
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -90,19 +83,6 @@ class DashboardView(LoginRequiredMixin, View):
|
||||||
@method_decorator(decorators)
|
@method_decorator(decorators)
|
||||||
def get(self, request, *args, **kwargs):
|
def get(self, request, *args, **kwargs):
|
||||||
context = self.get_context_data()
|
context = self.get_context_data()
|
||||||
context['has_invoices'] = False
|
|
||||||
try:
|
|
||||||
bills = []
|
|
||||||
if hasattr(self.request.user, 'stripecustomer'):
|
|
||||||
bills = MonthlyHostingBill.objects.filter(
|
|
||||||
customer=self.request.user.stripecustomer
|
|
||||||
)
|
|
||||||
if len(bills) > 0:
|
|
||||||
context['has_invoices'] = True
|
|
||||||
except MonthlyHostingBill.DoesNotExist as dne:
|
|
||||||
logger.error("{}'s monthly hosting bill not imported ?".format(
|
|
||||||
self.request.user.email
|
|
||||||
))
|
|
||||||
return render(request, self.template_name, context)
|
return render(request, self.template_name, context)
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -467,9 +447,7 @@ class SSHKeyDeleteView(LoginRequiredMixin, DeleteView):
|
||||||
pk = self.kwargs.get('pk')
|
pk = self.kwargs.get('pk')
|
||||||
# Get user ssh key
|
# Get user ssh key
|
||||||
public_key = UserHostingKey.objects.get(pk=pk).public_key
|
public_key = UserHostingKey.objects.get(pk=pk).public_key
|
||||||
keys = UserHostingKey.objects.filter(user=self.request.user)
|
manager.manage_public_key([{'value': public_key, 'state': False}])
|
||||||
keys_to_save = [k.public_key for k in keys if k.public_key != public_key]
|
|
||||||
manager.save_key_in_opennebula_user('\n'.join(keys_to_save), update_type=0)
|
|
||||||
|
|
||||||
return super(SSHKeyDeleteView, self).delete(request, *args, **kwargs)
|
return super(SSHKeyDeleteView, self).delete(request, *args, **kwargs)
|
||||||
|
|
||||||
|
|
@ -518,11 +496,74 @@ class SSHKeyChoiceView(LoginRequiredMixin, View):
|
||||||
email=owner.email,
|
email=owner.email,
|
||||||
password=owner.password
|
password=owner.password
|
||||||
)
|
)
|
||||||
keys = get_all_public_keys(request.user)
|
public_key_str = public_key.decode()
|
||||||
manager.save_key_in_opennebula_user('\n'.join(keys))
|
manager.manage_public_key([{'value': public_key_str, 'state': True}])
|
||||||
return redirect(reverse_lazy('hosting:ssh_keys'), foo='bar')
|
return redirect(reverse_lazy('hosting:ssh_keys'), foo='bar')
|
||||||
|
|
||||||
|
|
||||||
|
@method_decorator(decorators, name='dispatch')
|
||||||
|
class SSHKeyCreateView(LoginRequiredMixin, FormView):
|
||||||
|
form_class = UserHostingKeyForm
|
||||||
|
model = UserHostingKey
|
||||||
|
template_name = 'hosting/user_key.html'
|
||||||
|
login_url = reverse_lazy('hosting:login')
|
||||||
|
context_object_name = "virtual_machine"
|
||||||
|
success_url = reverse_lazy('hosting:ssh_keys')
|
||||||
|
|
||||||
|
def get_form_kwargs(self):
|
||||||
|
kwargs = super(SSHKeyCreateView, self).get_form_kwargs()
|
||||||
|
kwargs.update({'request': self.request})
|
||||||
|
return kwargs
|
||||||
|
|
||||||
|
def form_valid(self, form):
|
||||||
|
form.save()
|
||||||
|
if settings.DCL_SSH_KEY_NAME_PREFIX in form.instance.name:
|
||||||
|
content = ContentFile(form.cleaned_data.get('private_key'))
|
||||||
|
filename = form.cleaned_data.get(
|
||||||
|
'name') + '_' + str(uuid.uuid4())[:8] + '_private.pem'
|
||||||
|
form.instance.private_key.save(filename, content)
|
||||||
|
context = self.get_context_data()
|
||||||
|
|
||||||
|
next_url = self.request.session.get(
|
||||||
|
'next',
|
||||||
|
reverse('hosting:create_virtual_machine')
|
||||||
|
)
|
||||||
|
|
||||||
|
if 'next' in self.request.session:
|
||||||
|
context.update({
|
||||||
|
'next_url': next_url
|
||||||
|
})
|
||||||
|
del (self.request.session['next'])
|
||||||
|
|
||||||
|
if form.cleaned_data.get('private_key'):
|
||||||
|
context.update({
|
||||||
|
'private_key': form.cleaned_data.get('private_key'),
|
||||||
|
'key_name': form.cleaned_data.get('name'),
|
||||||
|
'form': UserHostingKeyForm(request=self.request),
|
||||||
|
})
|
||||||
|
|
||||||
|
owner = self.request.user
|
||||||
|
manager = OpenNebulaManager(
|
||||||
|
email=owner.email,
|
||||||
|
password=owner.password
|
||||||
|
)
|
||||||
|
public_key = form.cleaned_data['public_key']
|
||||||
|
if type(public_key) is bytes:
|
||||||
|
public_key = public_key.decode()
|
||||||
|
manager.manage_public_key([{'value': public_key, 'state': True}])
|
||||||
|
return HttpResponseRedirect(self.success_url)
|
||||||
|
|
||||||
|
def post(self, request, *args, **kwargs):
|
||||||
|
form = self.get_form()
|
||||||
|
required = 'add_ssh' in self.request.POST
|
||||||
|
form.fields['name'].required = required
|
||||||
|
form.fields['public_key'].required = required
|
||||||
|
if form.is_valid():
|
||||||
|
return self.form_valid(form)
|
||||||
|
else:
|
||||||
|
return self.form_invalid(form)
|
||||||
|
|
||||||
|
|
||||||
@method_decorator(decorators, name='dispatch')
|
@method_decorator(decorators, name='dispatch')
|
||||||
class SettingsView(LoginRequiredMixin, FormView):
|
class SettingsView(LoginRequiredMixin, FormView):
|
||||||
template_name = "hosting/settings.html"
|
template_name = "hosting/settings.html"
|
||||||
|
|
@ -769,27 +810,21 @@ class PaymentVMView(LoginRequiredMixin, FormView):
|
||||||
reverse('hosting:payment') + '#payment_error')
|
reverse('hosting:payment') + '#payment_error')
|
||||||
request.session['token'] = token
|
request.session['token'] = token
|
||||||
request.session['billing_address_data'] = billing_address_data
|
request.session['billing_address_data'] = billing_address_data
|
||||||
self.request.session['order_confirm_url'] = "{url}?{query_params}".format(
|
return HttpResponseRedirect("{url}?{query_params}".format(
|
||||||
url=reverse('hosting:order-confirmation'),
|
url=reverse('hosting:order-confirmation'),
|
||||||
query_params='page=payment')
|
query_params='page=payment')
|
||||||
return HttpResponseRedirect(reverse('hosting:add_ssh_key'))
|
)
|
||||||
else:
|
else:
|
||||||
return self.form_invalid(form)
|
return self.form_invalid(form)
|
||||||
|
|
||||||
|
|
||||||
class OrdersHostingDetailView(LoginRequiredMixin, DetailView, FormView):
|
class OrdersHostingDetailView(LoginRequiredMixin, DetailView):
|
||||||
form_class = UserHostingKeyForm
|
|
||||||
template_name = "hosting/order_detail.html"
|
template_name = "hosting/order_detail.html"
|
||||||
context_object_name = "order"
|
context_object_name = "order"
|
||||||
login_url = reverse_lazy('hosting:login')
|
login_url = reverse_lazy('hosting:login')
|
||||||
permission_required = ['view_hostingorder']
|
permission_required = ['view_hostingorder']
|
||||||
model = HostingOrder
|
model = HostingOrder
|
||||||
|
|
||||||
def get_form_kwargs(self):
|
|
||||||
kwargs = super(OrdersHostingDetailView, self).get_form_kwargs()
|
|
||||||
kwargs.update({'request': self.request})
|
|
||||||
return kwargs
|
|
||||||
|
|
||||||
def get_object(self, queryset=None):
|
def get_object(self, queryset=None):
|
||||||
order_id = self.kwargs.get('pk')
|
order_id = self.kwargs.get('pk')
|
||||||
try:
|
try:
|
||||||
|
|
@ -814,8 +849,6 @@ class OrdersHostingDetailView(LoginRequiredMixin, DetailView, FormView):
|
||||||
|
|
||||||
if self.request.GET.get('page') == 'payment':
|
if self.request.GET.get('page') == 'payment':
|
||||||
context['page_header_text'] = _('Confirm Order')
|
context['page_header_text'] = _('Confirm Order')
|
||||||
context['form'] = UserHostingKeyForm(request=self.request)
|
|
||||||
context['keys'] = get_all_public_keys(self.request.user)
|
|
||||||
else:
|
else:
|
||||||
context['page_header_text'] = _('Invoice')
|
context['page_header_text'] = _('Invoice')
|
||||||
if not self.request.user.has_perm(
|
if not self.request.user.has_perm(
|
||||||
|
|
@ -906,15 +939,11 @@ class OrdersHostingDetailView(LoginRequiredMixin, DetailView, FormView):
|
||||||
card_details_response = card_details['response_object']
|
card_details_response = card_details['response_object']
|
||||||
context['cc_last4'] = card_details_response['last4']
|
context['cc_last4'] = card_details_response['last4']
|
||||||
context['cc_brand'] = card_details_response['brand']
|
context['cc_brand'] = card_details_response['brand']
|
||||||
context['cc_exp_year'] = card_details_response['exp_year']
|
|
||||||
context['cc_exp_month'] = card_details_response['exp_month']
|
|
||||||
else:
|
else:
|
||||||
card_id = self.request.session.get('card_id')
|
card_id = self.request.session.get('card_id')
|
||||||
card_detail = UserCardDetail.objects.get(id=card_id)
|
card_detail = UserCardDetail.objects.get(id=card_id)
|
||||||
context['cc_last4'] = card_detail.last4
|
context['cc_last4'] = card_detail.last4
|
||||||
context['cc_brand'] = card_detail.brand
|
context['cc_brand'] = card_detail.brand
|
||||||
context['cc_exp_year'] = card_detail.exp_year
|
|
||||||
context['cc_exp_month'] = '{:02d}'.format(card_detail.exp_month)
|
|
||||||
context['site_url'] = reverse('hosting:create_virtual_machine')
|
context['site_url'] = reverse('hosting:create_virtual_machine')
|
||||||
context['vm'] = self.request.session.get('specs')
|
context['vm'] = self.request.session.get('specs')
|
||||||
return context
|
return context
|
||||||
|
|
@ -1117,194 +1146,6 @@ class OrdersHostingListView(LoginRequiredMixin, ListView):
|
||||||
return super(OrdersHostingListView, self).get(request, *args, **kwargs)
|
return super(OrdersHostingListView, self).get(request, *args, **kwargs)
|
||||||
|
|
||||||
|
|
||||||
class InvoiceListView(LoginRequiredMixin, ListView):
|
|
||||||
template_name = "hosting/invoices.html"
|
|
||||||
login_url = reverse_lazy('hosting:login')
|
|
||||||
context_object_name = "invoices"
|
|
||||||
paginate_by = 10
|
|
||||||
ordering = '-created'
|
|
||||||
|
|
||||||
def get_context_data(self, **kwargs):
|
|
||||||
context = super(InvoiceListView, self).get_context_data(**kwargs)
|
|
||||||
if ('user_email' in self.request.GET
|
|
||||||
and self.request.user.email == settings.ADMIN_EMAIL):
|
|
||||||
user_email = self.request.GET['user_email']
|
|
||||||
logger.debug(
|
|
||||||
"user_email = {}".format(user_email)
|
|
||||||
)
|
|
||||||
try:
|
|
||||||
cu = CustomUser.objects.get(email=user_email)
|
|
||||||
except CustomUser.DoesNotExist as dne:
|
|
||||||
logger.debug("User does not exist")
|
|
||||||
cu = self.request.user
|
|
||||||
mhbs = MonthlyHostingBill.objects.filter(customer__user=cu)
|
|
||||||
else:
|
|
||||||
mhbs = MonthlyHostingBill.objects.filter(
|
|
||||||
customer__user=self.request.user
|
|
||||||
)
|
|
||||||
ips_dict = {}
|
|
||||||
line_item_period_dict = {}
|
|
||||||
for mhb in mhbs:
|
|
||||||
try:
|
|
||||||
vm_detail = VMDetail.objects.get(vm_id=mhb.order.vm_id)
|
|
||||||
ips_dict[mhb.invoice_number] = [vm_detail.ipv6, vm_detail.ipv4]
|
|
||||||
all_line_items = HostingBillLineItem.objects.filter(monthly_hosting_bill=mhb)
|
|
||||||
for line_item in all_line_items:
|
|
||||||
if line_item.get_item_detail_str() != "":
|
|
||||||
line_item_period_dict[mhb.invoice_number] = {
|
|
||||||
"period_start": line_item.period_start,
|
|
||||||
"period_end": line_item.period_end
|
|
||||||
}
|
|
||||||
break
|
|
||||||
except VMDetail.DoesNotExist as dne:
|
|
||||||
ips_dict[mhb.invoice_number] = ['--']
|
|
||||||
logger.debug("VMDetail for {} doesn't exist".format(
|
|
||||||
mhb.order.vm_id
|
|
||||||
))
|
|
||||||
context['ips'] = ips_dict
|
|
||||||
context['period'] = line_item_period_dict
|
|
||||||
return context
|
|
||||||
|
|
||||||
def get_queryset(self):
|
|
||||||
user = self.request.user
|
|
||||||
if ('user_email' in self.request.GET
|
|
||||||
and self.request.user.email == settings.ADMIN_EMAIL):
|
|
||||||
user_email = self.request.GET['user_email']
|
|
||||||
logger.debug(
|
|
||||||
"user_email = {}".format(user_email)
|
|
||||||
)
|
|
||||||
try:
|
|
||||||
cu = CustomUser.objects.get(email=user_email)
|
|
||||||
except CustomUser.DoesNotExist as dne:
|
|
||||||
logger.debug("User does not exist")
|
|
||||||
cu = self.request.user
|
|
||||||
self.queryset = MonthlyHostingBill.objects.filter(customer__user=cu)
|
|
||||||
else:
|
|
||||||
self.queryset = MonthlyHostingBill.objects.filter(
|
|
||||||
customer__user=self.request.user
|
|
||||||
)
|
|
||||||
return super(InvoiceListView, self).get_queryset()
|
|
||||||
|
|
||||||
@method_decorator(decorators)
|
|
||||||
def get(self, request, *args, **kwargs):
|
|
||||||
return super(InvoiceListView, self).get(request, *args, **kwargs)
|
|
||||||
|
|
||||||
|
|
||||||
class InvoiceDetailView(LoginRequiredMixin, DetailView):
|
|
||||||
template_name = "hosting/invoice_detail.html"
|
|
||||||
context_object_name = "invoice"
|
|
||||||
login_url = reverse_lazy('hosting:login')
|
|
||||||
permission_required = ['view_monthlyhostingbill']
|
|
||||||
# model = MonthlyHostingBill
|
|
||||||
|
|
||||||
def get_object(self, queryset=None):
|
|
||||||
invoice_id = self.kwargs.get('invoice_id')
|
|
||||||
try:
|
|
||||||
invoice_obj = MonthlyHostingBill.objects.get(
|
|
||||||
invoice_number=invoice_id
|
|
||||||
)
|
|
||||||
logger.debug("Found MHB for id {invoice_id}".format(
|
|
||||||
invoice_id=invoice_id
|
|
||||||
))
|
|
||||||
if self.request.user.has_perm(
|
|
||||||
self.permission_required[0], invoice_obj
|
|
||||||
) or self.request.user.email == settings.ADMIN_EMAIL:
|
|
||||||
logger.debug("User has permission to invoice_obj")
|
|
||||||
else:
|
|
||||||
logger.error("User does not have permission to access")
|
|
||||||
invoice_obj = None
|
|
||||||
except MonthlyHostingBill.DoesNotExist as dne:
|
|
||||||
logger.debug("MHB not found for id {invoice_id}".format(
|
|
||||||
invoice_id=invoice_id
|
|
||||||
))
|
|
||||||
invoice_obj = None
|
|
||||||
return invoice_obj
|
|
||||||
|
|
||||||
def get_context_data(self, **kwargs):
|
|
||||||
# Get context
|
|
||||||
context = super(InvoiceDetailView, self).get_context_data(**kwargs)
|
|
||||||
obj = self.get_object()
|
|
||||||
|
|
||||||
if obj is not None:
|
|
||||||
vm_id = obj.get_vm_id()
|
|
||||||
try:
|
|
||||||
# Try to get vm details from database
|
|
||||||
vm_detail = VMDetail.objects.get(vm_id=vm_id)
|
|
||||||
context['vm'] = vm_detail.__dict__
|
|
||||||
context['vm']['name'] = '{}-{}'.format(
|
|
||||||
context['vm']['configuration'], context['vm']['vm_id'])
|
|
||||||
price, vat, vat_percent, discount = get_vm_price_with_vat(
|
|
||||||
cpu=context['vm']['cores'],
|
|
||||||
ssd_size=context['vm']['disk_size'],
|
|
||||||
memory=context['vm']['memory'],
|
|
||||||
pricing_name=(obj.order.vm_pricing.name
|
|
||||||
if obj.order.vm_pricing else 'default')
|
|
||||||
)
|
|
||||||
context['vm']['vat'] = vat
|
|
||||||
context['vm']['price'] = price
|
|
||||||
context['vm']['discount'] = discount
|
|
||||||
context['vm']['vat_percent'] = vat_percent
|
|
||||||
context['vm']['total_price'] = price + vat - discount['amount']
|
|
||||||
except VMDetail.DoesNotExist:
|
|
||||||
# fallback to get it from the infrastructure
|
|
||||||
try:
|
|
||||||
manager = OpenNebulaManager(
|
|
||||||
email=self.request.user.email,
|
|
||||||
password=self.request.user.password
|
|
||||||
)
|
|
||||||
vm = manager.get_vm(vm_id)
|
|
||||||
context['vm'] = VirtualMachineSerializer(vm).data
|
|
||||||
price, vat, vat_percent, discount = get_vm_price_with_vat(
|
|
||||||
cpu=context['vm']['cores'],
|
|
||||||
ssd_size=context['vm']['disk_size'],
|
|
||||||
memory=context['vm']['memory'],
|
|
||||||
pricing_name=(obj.order.vm_pricing.name
|
|
||||||
if obj.order.vm_pricing else 'default')
|
|
||||||
)
|
|
||||||
context['vm']['vat'] = vat
|
|
||||||
context['vm']['price'] = price
|
|
||||||
context['vm']['discount'] = discount
|
|
||||||
context['vm']['vat_percent'] = vat_percent
|
|
||||||
context['vm']['total_price'] = (
|
|
||||||
price + vat - discount['amount']
|
|
||||||
)
|
|
||||||
except TypeError:
|
|
||||||
logger.error("Type error. Probably we "
|
|
||||||
"came from a generic product. "
|
|
||||||
"Invoice ID %s" % obj.invoice_id)
|
|
||||||
except WrongIdError:
|
|
||||||
logger.error("WrongIdError while accessing "
|
|
||||||
"invoice {}".format(obj.invoice_id))
|
|
||||||
messages.error(
|
|
||||||
self.request,
|
|
||||||
_('The VM you are looking for is unavailable at the '
|
|
||||||
'moment. Please contact Data Center Light support.')
|
|
||||||
)
|
|
||||||
self.kwargs['error'] = 'WrongIdError'
|
|
||||||
context['error'] = 'WrongIdError'
|
|
||||||
return context
|
|
||||||
|
|
||||||
# add context params from monthly hosting bill
|
|
||||||
context['period_start'] = obj.get_period_start()
|
|
||||||
context['period_end'] = obj.get_period_end()
|
|
||||||
context['paid_at'] = obj.paid_at
|
|
||||||
context['total_in_chf'] = obj.total_in_chf()
|
|
||||||
context['invoice_number'] = obj.invoice_number
|
|
||||||
context['discount_on_stripe'] = obj.discount_in_chf()
|
|
||||||
if obj.lines_data_count > 1:
|
|
||||||
# special case, we pass the details of each of the line items
|
|
||||||
context['line_items'] = obj.hostingbilllineitem_set.all()
|
|
||||||
return context
|
|
||||||
else:
|
|
||||||
raise Http404
|
|
||||||
|
|
||||||
@method_decorator(decorators)
|
|
||||||
def get(self, request, *args, **kwargs):
|
|
||||||
self.object = self.get_object()
|
|
||||||
context = self.get_context_data(object=self.get_object())
|
|
||||||
return self.render_to_response(context)
|
|
||||||
|
|
||||||
|
|
||||||
class OrdersHostingDeleteView(LoginRequiredMixin, DeleteView):
|
class OrdersHostingDeleteView(LoginRequiredMixin, DeleteView):
|
||||||
login_url = reverse_lazy('hosting:login')
|
login_url = reverse_lazy('hosting:login')
|
||||||
success_url = reverse_lazy('hosting:orders')
|
success_url = reverse_lazy('hosting:orders')
|
||||||
|
|
@ -1529,8 +1370,7 @@ class VirtualMachineView(LoginRequiredMixin, View):
|
||||||
'virtual_machine': serializer.data,
|
'virtual_machine': serializer.data,
|
||||||
'order': HostingOrder.objects.get(
|
'order': HostingOrder.objects.get(
|
||||||
vm_id=serializer.data['vm_id']
|
vm_id=serializer.data['vm_id']
|
||||||
),
|
)
|
||||||
'keys': UserHostingKey.objects.filter(user=request.user)
|
|
||||||
}
|
}
|
||||||
except Exception as ex:
|
except Exception as ex:
|
||||||
logger.debug("Exception generated {}".format(str(ex)))
|
logger.debug("Exception generated {}".format(str(ex)))
|
||||||
|
|
@ -1562,7 +1402,6 @@ class VirtualMachineView(LoginRequiredMixin, View):
|
||||||
|
|
||||||
# Cancel Stripe subscription
|
# Cancel Stripe subscription
|
||||||
stripe_utils = StripeUtils()
|
stripe_utils = StripeUtils()
|
||||||
hosting_order = None
|
|
||||||
try:
|
try:
|
||||||
hosting_order = HostingOrder.objects.get(
|
hosting_order = HostingOrder.objects.get(
|
||||||
vm_id=vm.id
|
vm_id=vm.id
|
||||||
|
|
@ -1597,7 +1436,7 @@ class VirtualMachineView(LoginRequiredMixin, View):
|
||||||
"manager.delete_vm returned False. Hence, error making "
|
"manager.delete_vm returned False. Hence, error making "
|
||||||
"xml-rpc call to delete vm failed."
|
"xml-rpc call to delete vm failed."
|
||||||
)
|
)
|
||||||
response['text'] = str(_('Error terminating VM')) + str(vm.id)
|
response['text'] = ugettext('Error terminating VM') + vm.id
|
||||||
else:
|
else:
|
||||||
for t in range(15):
|
for t in range(15):
|
||||||
try:
|
try:
|
||||||
|
|
@ -1624,10 +1463,9 @@ class VirtualMachineView(LoginRequiredMixin, View):
|
||||||
else:
|
else:
|
||||||
sleep(2)
|
sleep(2)
|
||||||
if not response['status']:
|
if not response['status']:
|
||||||
response['text'] = str(_("VM terminate action timed out. "
|
response['text'] = _("VM terminate action timed out. Please "
|
||||||
"Please contact "
|
"contact support@datacenterlight.ch for "
|
||||||
"support@datacenterlight.ch for "
|
"further information.")
|
||||||
"further information."))
|
|
||||||
context = {
|
context = {
|
||||||
'vm_name': vm_name,
|
'vm_name': vm_name,
|
||||||
'base_url': "{0}://{1}".format(
|
'base_url': "{0}://{1}".format(
|
||||||
|
|
@ -1648,11 +1486,6 @@ class VirtualMachineView(LoginRequiredMixin, View):
|
||||||
email = BaseEmail(**email_data)
|
email = BaseEmail(**email_data)
|
||||||
email.send()
|
email.send()
|
||||||
admin_email_body.update(response)
|
admin_email_body.update(response)
|
||||||
admin_email_body["customer_email"] = owner.email
|
|
||||||
admin_email_body["VM_ID"] = vm.id
|
|
||||||
admin_email_body["VM_created_at"] = (str(hosting_order.created_at) if
|
|
||||||
hosting_order is not None
|
|
||||||
else "unknown")
|
|
||||||
admin_msg_sub = "VM and Subscription for VM {} and user: {}".format(
|
admin_msg_sub = "VM and Subscription for VM {} and user: {}".format(
|
||||||
vm.id,
|
vm.id,
|
||||||
owner.email
|
owner.email
|
||||||
|
|
@ -1725,40 +1558,3 @@ def forbidden_view(request, exception=None, reason=''):
|
||||||
'again.')
|
'again.')
|
||||||
messages.add_message(request, messages.ERROR, err_msg)
|
messages.add_message(request, messages.ERROR, err_msg)
|
||||||
return HttpResponseRedirect(request.get_full_path())
|
return HttpResponseRedirect(request.get_full_path())
|
||||||
|
|
||||||
|
|
||||||
class CheckUserVM(APIView):
|
|
||||||
renderer_classes = (JSONRenderer, )
|
|
||||||
|
|
||||||
def get(self, request):
|
|
||||||
try:
|
|
||||||
email = request.data['email']
|
|
||||||
ip = request.data['ip']
|
|
||||||
user = request.data['user']
|
|
||||||
realm = request.data['realm']
|
|
||||||
token = request.data['token']
|
|
||||||
if realm != settings.READ_VM_REALM:
|
|
||||||
return Response("User not allowed", 403)
|
|
||||||
response = check_otp(user, realm, token)
|
|
||||||
if response != 200:
|
|
||||||
return Response('Invalid token', 403)
|
|
||||||
manager = OpenNebulaManager(settings.OPENNEBULA_USERNAME,
|
|
||||||
settings.OPENNEBULA_PASSWORD)
|
|
||||||
# not the best way to lookup vms by ip
|
|
||||||
# TODO: make this optimal
|
|
||||||
vms = manager.get_vms()
|
|
||||||
users_vms = [vm for vm in vms if vm.uname == email]
|
|
||||||
if len(users_vms) == 0:
|
|
||||||
return Response('No VM found with the given email address',
|
|
||||||
404)
|
|
||||||
for vm in users_vms:
|
|
||||||
for nic in vm.template.nics:
|
|
||||||
if hasattr(nic, 'ip6_global'):
|
|
||||||
if nic.ip6_global == ip:
|
|
||||||
return Response('success', 200)
|
|
||||||
elif hasattr(nic, 'ip'):
|
|
||||||
if nic.ip == ip:
|
|
||||||
return Response('success', 200)
|
|
||||||
return Response('No VM found matching the ip address provided', 404)
|
|
||||||
except KeyError:
|
|
||||||
return Response('Not enough data provided', 400)
|
|
||||||
|
|
|
||||||
|
|
@ -1,13 +0,0 @@
|
||||||
from django.db import migrations
|
|
||||||
|
|
||||||
|
|
||||||
class Migration(migrations.Migration):
|
|
||||||
dependencies = [('membership', '0007_auto_20180213_0128'),
|
|
||||||
('djangocms_blog', '0032_auto_20180109_0023'),
|
|
||||||
]
|
|
||||||
|
|
||||||
operations = [
|
|
||||||
migrations.RunSQL(
|
|
||||||
"ALTER TABLE djangocms_blog_authorentriesplugin_authors "
|
|
||||||
"RENAME COLUMN user_id TO customuser_id;"),
|
|
||||||
]
|
|
||||||
|
|
@ -1,25 +0,0 @@
|
||||||
# -*- coding: utf-8 -*-
|
|
||||||
# Generated by Django 1.9.4 on 2019-05-06 06:06
|
|
||||||
from __future__ import unicode_literals
|
|
||||||
|
|
||||||
from django.db import migrations, models
|
|
||||||
|
|
||||||
|
|
||||||
class Migration(migrations.Migration):
|
|
||||||
|
|
||||||
dependencies = [
|
|
||||||
('membership', '0008_change_user_id_to_customer_id_in_djangocms_blog'),
|
|
||||||
]
|
|
||||||
|
|
||||||
operations = [
|
|
||||||
migrations.CreateModel(
|
|
||||||
name='DeletedUser',
|
|
||||||
fields=[
|
|
||||||
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
|
|
||||||
('user_id', models.PositiveIntegerField()),
|
|
||||||
('name', models.CharField(max_length=254)),
|
|
||||||
('email', models.EmailField(max_length=254, unique=True)),
|
|
||||||
('deleted_at', models.DateTimeField(auto_now_add=True)),
|
|
||||||
],
|
|
||||||
),
|
|
||||||
]
|
|
||||||
|
|
@ -265,15 +265,6 @@ class CreditCards(models.Model):
|
||||||
pass
|
pass
|
||||||
|
|
||||||
|
|
||||||
class DeletedUser(models.Model):
|
|
||||||
user_id = models.PositiveIntegerField()
|
|
||||||
|
|
||||||
# why 254 ? => to be consistent with legacy code
|
|
||||||
name = models.CharField(max_length=254)
|
|
||||||
email = models.EmailField(unique=True, max_length=254)
|
|
||||||
deleted_at = models.DateTimeField(auto_now_add=True)
|
|
||||||
|
|
||||||
|
|
||||||
class Calendar(models.Model):
|
class Calendar(models.Model):
|
||||||
datebooked = models.DateField()
|
datebooked = models.DateField()
|
||||||
user = models.ForeignKey(CustomUser)
|
user = models.ForeignKey(CustomUser)
|
||||||
|
|
|
||||||
|
|
@ -168,47 +168,20 @@ class OpenNebulaManager():
|
||||||
raise
|
raise
|
||||||
return user_pool
|
return user_pool
|
||||||
|
|
||||||
def _get_vm_pool(self, infoextended=True):
|
def _get_vm_pool(self):
|
||||||
"""
|
|
||||||
# filter:
|
|
||||||
# -4: Resources belonging to the user’s primary group
|
|
||||||
# -3: Resources belonging to the user
|
|
||||||
# -2: All resources
|
|
||||||
# -1: Resources belonging to the user and any of his groups
|
|
||||||
# >= 0: UID User’s Resources
|
|
||||||
|
|
||||||
# vm states:
|
|
||||||
# *-2 Any state, including DONE
|
|
||||||
# *-1 Any state, except DONE (Default)
|
|
||||||
# *0 INIT
|
|
||||||
# *1 PENDING
|
|
||||||
# *2 HOLD
|
|
||||||
# *3 ACTIVE
|
|
||||||
# *4 STOPPED
|
|
||||||
# *5 SUSPENDED
|
|
||||||
# *6 DONE
|
|
||||||
# *7 FAILED
|
|
||||||
# *8 POWEROFF
|
|
||||||
# *9 UNDEPLOYED
|
|
||||||
|
|
||||||
:param infoextended: When True calls infoextended api method introduced
|
|
||||||
in OpenNebula 5.8 else falls back to info which has limited attributes
|
|
||||||
of a VM
|
|
||||||
|
|
||||||
:return: the oca VirtualMachinePool object
|
|
||||||
"""
|
|
||||||
try:
|
try:
|
||||||
vm_pool = oca.VirtualMachinePool(self.client)
|
vm_pool = oca.VirtualMachinePool(self.client)
|
||||||
if infoextended:
|
vm_pool.info()
|
||||||
vm_pool.infoextended(
|
|
||||||
filter=-1, # User's resources and any of his groups
|
|
||||||
vm_state=-1 # Look for VMs in any state, except DONE
|
|
||||||
)
|
|
||||||
else:
|
|
||||||
vm_pool.info()
|
|
||||||
return vm_pool
|
return vm_pool
|
||||||
except AttributeError as ae:
|
except AttributeError:
|
||||||
logger.error("AttributeError : %s" % str(ae))
|
logger.error('Could not connect via client, using oneadmin instead')
|
||||||
|
try:
|
||||||
|
vm_pool = oca.VirtualMachinePool(self.oneadmin_client)
|
||||||
|
vm_pool.info(filter=-2)
|
||||||
|
return vm_pool
|
||||||
|
except:
|
||||||
|
raise ConnectionRefusedError
|
||||||
|
|
||||||
except ConnectionRefusedError:
|
except ConnectionRefusedError:
|
||||||
logger.error(
|
logger.error(
|
||||||
'Could not connect to host: {host} via protocol {protocol}'.format(
|
'Could not connect to host: {host} via protocol {protocol}'.format(
|
||||||
|
|
@ -363,31 +336,6 @@ class OpenNebulaManager():
|
||||||
|
|
||||||
return vm_terminated
|
return vm_terminated
|
||||||
|
|
||||||
def save_key_in_opennebula_user(self, ssh_key, update_type=1):
|
|
||||||
"""
|
|
||||||
Save the given ssh key in OpenNebula user
|
|
||||||
|
|
||||||
# Update type: 0: Replace the whole template.
|
|
||||||
1: Merge new template with the existing one.
|
|
||||||
:param ssh_key: The ssh key to be saved
|
|
||||||
:param update_type: The update type as explained above
|
|
||||||
|
|
||||||
:return:
|
|
||||||
"""
|
|
||||||
return_value = self.oneadmin_client.call(
|
|
||||||
'user.update',
|
|
||||||
self.opennebula_user if type(self.opennebula_user) == int else self.opennebula_user.id,
|
|
||||||
'<CONTEXT><SSH_PUBLIC_KEY>%s</SSH_PUBLIC_KEY></CONTEXT>' % ssh_key,
|
|
||||||
update_type
|
|
||||||
)
|
|
||||||
if type(return_value) == int:
|
|
||||||
logger.debug(
|
|
||||||
"Saved the key in opennebula successfully : %s" % return_value)
|
|
||||||
else:
|
|
||||||
logger.error(
|
|
||||||
"Could not save the key in opennebula. %s" % return_value)
|
|
||||||
return
|
|
||||||
|
|
||||||
def _get_template_pool(self):
|
def _get_template_pool(self):
|
||||||
try:
|
try:
|
||||||
template_pool = oca.VmTemplatePool(self.oneadmin_client)
|
template_pool = oca.VmTemplatePool(self.oneadmin_client)
|
||||||
|
|
|
||||||
|
|
@ -96,6 +96,5 @@ pyflakes==1.5.0
|
||||||
billiard==3.5.0.3
|
billiard==3.5.0.3
|
||||||
amqp==2.2.1
|
amqp==2.2.1
|
||||||
vine==1.1.4
|
vine==1.1.4
|
||||||
cdist==5.0.1
|
cdist==4.7.0
|
||||||
git+https://github.com/ungleich/djangocms-multisite.git#egg=djangocms_multisite
|
git+https://github.com/ungleich/djangocms-multisite.git#egg=djangocms_multisite
|
||||||
pyotp
|
|
||||||
|
|
|
||||||
|
|
@ -10,7 +10,7 @@
|
||||||
{% addtoblock "external-css" %}
|
{% addtoblock "external-css" %}
|
||||||
{% bootstrap_css %}
|
{% bootstrap_css %}
|
||||||
|
|
||||||
<link href='{% static "digitalglarus/font-awesome-4.1.0/css/font-awesome.min.css" %}' rel="stylesheet" type="text/css">
|
<link href='//maxcdn.bootstrapcdn.com/font-awesome/4.1.0/css/font-awesome.min.css' rel="stylesheet" type="text/css">
|
||||||
<link href='//fonts.googleapis.com/css?family=Lora:400,700,400italic,700italic' rel='stylesheet' type='text/css'>
|
<link href='//fonts.googleapis.com/css?family=Lora:400,700,400italic,700italic' rel='stylesheet' type='text/css'>
|
||||||
<link href='//fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,600italic,700italic,800italic,400,300,600,700,800'
|
<link href='//fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,600italic,700italic,800italic,400,300,600,700,800'
|
||||||
rel='stylesheet' type='text/css'>
|
rel='stylesheet' type='text/css'>
|
||||||
|
|
@ -18,8 +18,8 @@
|
||||||
<!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
|
<!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
|
||||||
<!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
|
<!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
|
||||||
<!--[if lt IE 9]>
|
<!--[if lt IE 9]>
|
||||||
<script src="{% static 'datacenterlight/js/html5shiv-3.7.0.js' %}"></script>
|
<script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script>
|
||||||
<script src="{% static 'datacenterlight/js/respond-1.4.2.min.js' %}"></script>
|
<script src="https://oss.maxcdn.com/libs/respond.js/1.4.2/respond.min.js"></script>
|
||||||
<![endif]-->
|
<![endif]-->
|
||||||
{% endaddtoblock %}
|
{% endaddtoblock %}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,363 +0,0 @@
|
||||||
{% load i18n %}
|
|
||||||
{% if request.COOKIES.gdpr_accepted or IS_TENANT_SITE %}
|
|
||||||
{% else %}
|
|
||||||
<style>
|
|
||||||
.gdpr {
|
|
||||||
font-family: "Lato", sans-serif;
|
|
||||||
font-size: 14px;
|
|
||||||
font-weight: 300;
|
|
||||||
line-height: 1.5;
|
|
||||||
text-transform: none;
|
|
||||||
}
|
|
||||||
|
|
||||||
h1.gdpr, h2.gpdr, h3.gpdr, h4.gdpr, h5.gdpr, h6.gdpr {
|
|
||||||
font-family: "Lato", sans-serif !important;
|
|
||||||
font-weight: 300 !important;
|
|
||||||
text-transform: none !important;
|
|
||||||
}
|
|
||||||
|
|
||||||
.gdpr-para {
|
|
||||||
margin: 0 !important;
|
|
||||||
font-family: "Lato", sans-serif !important;
|
|
||||||
font-size: 14px !important;
|
|
||||||
font-weight: 300 !important;
|
|
||||||
line-height: 1.5 !important;
|
|
||||||
text-transform: none !important;
|
|
||||||
}
|
|
||||||
|
|
||||||
div#gdprBanner {
|
|
||||||
position: fixed;
|
|
||||||
bottom: 0;
|
|
||||||
width: 100%;
|
|
||||||
padding: 10px;
|
|
||||||
background-color: #26262766;
|
|
||||||
z-index: 999;
|
|
||||||
color: #ffffff;
|
|
||||||
}
|
|
||||||
|
|
||||||
#gdprBanner a {
|
|
||||||
cursor: pointer;
|
|
||||||
color: #ffffff;
|
|
||||||
font-weight: 600;
|
|
||||||
}
|
|
||||||
|
|
||||||
#gdprBanner button {
|
|
||||||
background-color: #3f44466e;
|
|
||||||
margin-left: 25px;
|
|
||||||
display: inline-block;
|
|
||||||
padding: 3px 6px;
|
|
||||||
margin-bottom: 0;
|
|
||||||
font-size: 14px;
|
|
||||||
font-weight: 400;
|
|
||||||
line-height: 1.42857143;
|
|
||||||
text-align: center;
|
|
||||||
white-space: nowrap;
|
|
||||||
vertical-align: middle;
|
|
||||||
-ms-touch-action: manipulation;
|
|
||||||
touch-action: manipulation;
|
|
||||||
cursor: pointer;
|
|
||||||
border: 1.5px solid #fdfeffe3;
|
|
||||||
border-radius: 4px;
|
|
||||||
box-shadow: unset;
|
|
||||||
}
|
|
||||||
|
|
||||||
.gdpr-text-letter-spacing {
|
|
||||||
letter-spacing: 0.5px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.gdpr-button-text-letter-spacing {
|
|
||||||
letter-spacing: 0.6px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.gdpr-button:hover {
|
|
||||||
color: #333;
|
|
||||||
background-color: #e6e6e6;
|
|
||||||
border-color: #adadad;
|
|
||||||
}
|
|
||||||
.gdpr-button {
|
|
||||||
color: #333;
|
|
||||||
background-color: #fff;
|
|
||||||
font-family: "Lato", sans-serif;
|
|
||||||
text-transform: none;
|
|
||||||
font-size: 14px;
|
|
||||||
font-weight: 300;
|
|
||||||
letter-spacing: 1px;
|
|
||||||
border-radius: 4px;
|
|
||||||
border-width: 1px;
|
|
||||||
}
|
|
||||||
</style>
|
|
||||||
<link href="//fonts.googleapis.com/css?family=Lato:300,400,600,700" rel="stylesheet" type="text/css" />
|
|
||||||
<div class="gdpr gdprBanner text-center gdpr-text-letter-spacing"
|
|
||||||
id="gdprBanner">
|
|
||||||
{% blocktrans %}This site uses cookies for analytics. By continuing to
|
|
||||||
browse this site, you agree to use this.{% endblocktrans %}
|
|
||||||
<a data-toggle="modal" data-target="#gdprModal">{% trans "Learn more" %}</a>
|
|
||||||
<button onclick="cookieManager.createGDPRCookie();" type="button"
|
|
||||||
class="btn btn-info gdpr-button-text-letter-spacing"
|
|
||||||
data-dismiss="modal">{% trans "OK" %}
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
<div class="gdpr modal fade" id="gdprModal" role="dialog">
|
|
||||||
<div class="modal-dialog">
|
|
||||||
|
|
||||||
<!-- Modal content-->
|
|
||||||
<div class="modal-content">
|
|
||||||
<div class="modal-header gdpr">
|
|
||||||
<button type="button" class="close" data-dismiss="modal">
|
|
||||||
×
|
|
||||||
</button>
|
|
||||||
<h4 class="gdpr modal-title">{% trans "Privacy policy" %}</h4>
|
|
||||||
</div>
|
|
||||||
<div class="gdpr modal-body">
|
|
||||||
<p class="gdpr-para">
|
|
||||||
{% blocktrans %}
|
|
||||||
<strong>1. Responsibility and scope</strong><br/>
|
|
||||||
<br/>
|
|
||||||
Responsible in regards to EU General Data Protection
|
|
||||||
Regulation ("GDPR") and other applicable data protection
|
|
||||||
laws:<br/>
|
|
||||||
<br/>
|
|
||||||
ungleich glarus ag<br/>
|
|
||||||
Bahnhofstrasse 1<br/>
|
|
||||||
8783 Linthal (CH)<br/>
|
|
||||||
Tel.: +41 55 505 6266<br/>
|
|
||||||
E-Mail: info@ungleich.ch<br/>
|
|
||||||
<br/>
|
|
||||||
This privacy statement applies to the web content of
|
|
||||||
ungleich glarus ag, available at the<br/>
|
|
||||||
following domains:<br/>
|
|
||||||
<br/>
|
|
||||||
ungleich.ch<br/>
|
|
||||||
datacenterlight.ch<br/>
|
|
||||||
devuanhosting.com<br/>
|
|
||||||
devuanhosting.ch<br/>
|
|
||||||
digitalglarus.ch<br/>
|
|
||||||
hack4lgarus.ch<br/>
|
|
||||||
ipv6onlyhosting.com<br/>
|
|
||||||
ipv6onlyhosting.ch<br/>
|
|
||||||
ipv6onlyhosting.net<br/>
|
|
||||||
django-hosting.ch<br/>
|
|
||||||
rails-hosting.ch<br/>
|
|
||||||
node-hosting.ch<br/>
|
|
||||||
blog.ungleich.ch<br/>
|
|
||||||
<br/>
|
|
||||||
The Data Privacy Officer:<br/>
|
|
||||||
<br/>
|
|
||||||
Sanghee Kim<br/>
|
|
||||||
ungleich glarus ag<br/>
|
|
||||||
Bahnhofstrasse 1<br/>
|
|
||||||
8783 Linthal (CH)<br/>
|
|
||||||
E-Mail: <a href="mailto:sanghee.kim@ungleich.ch">sanghee.kim@ungleich.ch</a><br/>
|
|
||||||
<br/>
|
|
||||||
<br/>
|
|
||||||
<strong>2. General</strong><br/>
|
|
||||||
<br/>
|
|
||||||
User data is personal data which is necessary to establish
|
|
||||||
or change the contractual relations
|
|
||||||
between ungleich glarus ag ("us") and you. This includes
|
|
||||||
among other things for example the
|
|
||||||
name, the address, the date of birth, the e-mail address or
|
|
||||||
the IP address. We save and use
|
|
||||||
your personal data only for the processing of your orders
|
|
||||||
or for getting in contact with you.<br/>
|
|
||||||
<br/>
|
|
||||||
<br/>
|
|
||||||
<strong>3. Processing of personal data</strong><br/>
|
|
||||||
<br/>
|
|
||||||
When you call one of our websites we collect your IP
|
|
||||||
address. When you register an account with us your contact
|
|
||||||
data will be stored. When you order products on our
|
|
||||||
platform we also collect among others your address and your
|
|
||||||
payment details.<br/>
|
|
||||||
<br/>
|
|
||||||
<strong>I. Registration data</strong><br/>
|
|
||||||
<br/>
|
|
||||||
In the process of registration we need to collect some of
|
|
||||||
your personal data. For example we collect your name, your
|
|
||||||
address, your telephone number, your e-mail address and
|
|
||||||
your payment details to process orders. We do not collect
|
|
||||||
your payment details such as credit card number, expiration
|
|
||||||
date or the cvv code when you pay with credit card. You
|
|
||||||
expose those data directly to the respective payment
|
|
||||||
processor. Payments with credit card are processed by
|
|
||||||
Stripe Payments Europe Ltd. ("Stripe").<br/>
|
|
||||||
<br/>
|
|
||||||
<br/>
|
|
||||||
<strong>II. Server log files</strong><br/>
|
|
||||||
<br/>
|
|
||||||
When you call one of our websites we automatically save
|
|
||||||
traffic data. Normally the IP address, the type and version
|
|
||||||
of your browser, the time and the website that lead to our
|
|
||||||
website ("Referer") will be saved. Your IP address is
|
|
||||||
collected anonymously so that we cannot match it with your
|
|
||||||
person. The collection of those data is necessary to
|
|
||||||
provide our websites and services, according to Art. 6 par.
|
|
||||||
1 lit. f GDPR.<br/>
|
|
||||||
<br/>
|
|
||||||
<br/>
|
|
||||||
<strong>4. Storage durations</strong><br/>
|
|
||||||
<br/>
|
|
||||||
Your data will be deleted immediately, as soon as it isn't
|
|
||||||
relevant anymore for any contract between you and us. In
|
|
||||||
some cases it could be necessary to store your data
|
|
||||||
further, to comply with our contractual or other legal
|
|
||||||
obligatons.<br/>
|
|
||||||
<br/>
|
|
||||||
<br/>
|
|
||||||
<strong>5. Disclosure of your personal data</strong><br/>
|
|
||||||
<br/>
|
|
||||||
We don't disclose your personal data to third parties,
|
|
||||||
except:<br/>
|
|
||||||
<br/>
|
|
||||||
a) You grant us your explicit permission according to Art.
|
|
||||||
6 par. 1 S. 1 lit. a GDPR.<br/>
|
|
||||||
<br/>
|
|
||||||
b) The disclosure of your data is legal and it is necessary
|
|
||||||
to comply with our contractual or other legal obligations,
|
|
||||||
according to Art. 6 par. 1 S. 1 lit b GDPR.<br/>
|
|
||||||
<br/>
|
|
||||||
c) There is a law or legal obligation to disclose your data
|
|
||||||
or the disclosure is necessary for the performance of a
|
|
||||||
task carried out in the public interest or in the exercise
|
|
||||||
of an official authority according to Art. 6 par. 1 S. 1
|
|
||||||
lit. c GDPR.<br/>
|
|
||||||
<br/>
|
|
||||||
d) The disclosure of your data is necessary for the
|
|
||||||
purposes of the legitimate interests pursued by us or by a
|
|
||||||
third party, except where such interests are overridden by
|
|
||||||
the interests or your fundamental right according to Art.
|
|
||||||
6. par. 1 S. 1 lit. f GDPR.<br/>
|
|
||||||
<br/>
|
|
||||||
<br/>
|
|
||||||
<strong>6. Cookies, Google Analytics, Twitter</strong><br/>
|
|
||||||
<br/>
|
|
||||||
We use Cookies. When you visit one of our websites,
|
|
||||||
information is stored on your terminal device in the form
|
|
||||||
of a "cookie". Cookies are small text files that are stored
|
|
||||||
on your terminal device by your browser. You can opt-out of
|
|
||||||
the storage of cookies in the settings of your
|
|
||||||
browser-software, but however, in this case you might not
|
|
||||||
be able to fully use all functions and services on our
|
|
||||||
website.<br/>
|
|
||||||
<br/>
|
|
||||||
We use Google Analytics, a service provided by Google Inc.,
|
|
||||||
1600 Amphitheatre Parkway, Mountainview, CA 94043, USA
|
|
||||||
("Google"). Google uses Cookies. Google will use these
|
|
||||||
cookies on our behalf to analyse how you use our websites
|
|
||||||
and to generate reports about the activities on our
|
|
||||||
websites. The information collected by those cookies will
|
|
||||||
be transmitted to a Google server in the United States of
|
|
||||||
America. We have Google's IP anonymization activated, so
|
|
||||||
your IP address will be shortened before transmitting to
|
|
||||||
Google. Only in exceptional cases the full IP address will
|
|
||||||
be transmitted and then shortened afterwards. <br/>
|
|
||||||
<br/>
|
|
||||||
You may opt out from thecollection of these cookies by
|
|
||||||
downloading and installing a browser plugin available at
|
|
||||||
the following link:<br/>
|
|
||||||
<br/>
|
|
||||||
<a href="http://tools.google.com/dlpage/gaoptout">http://tools.google.com/dlpage/gaoptout</a><br/>
|
|
||||||
<br/>
|
|
||||||
You may find further information about the processing of
|
|
||||||
your personal data at the following links:<br/>
|
|
||||||
<br/>
|
|
||||||
<a href="https://policies.google.com/technologies/ads">https://policies.google.com/technologies/ads</a><br/>
|
|
||||||
<br/>
|
|
||||||
<a href="https://www.privacyshield.gov/participant?id=a2zt000000001L5AAI&status=Active">https://www.privacyshield.gov/participant?id=a2zt000000001L5AAI&status=Active</a><br/>
|
|
||||||
<br/>
|
|
||||||
<a href="https://adssettings.google.com/authenticated">https://adssettings.google.com/authenticated</a><br/>
|
|
||||||
<br/>
|
|
||||||
The collected personal data will be deleted or anonymized
|
|
||||||
after 14 months according to Art. 6 par. 1 lit. f
|
|
||||||
GDPR.<br/>
|
|
||||||
<br/>
|
|
||||||
Our websites use several functions from the social network
|
|
||||||
Twitter, a service provided by Twitter Inc., 1355 Market
|
|
||||||
Street, Suite 900, San Francisco, CA 94103, USA. We may
|
|
||||||
embed content of Twitter in our websites, such as photos,
|
|
||||||
videos, texts or buttons. If you are registered with
|
|
||||||
Twitter, they may combine your use of these functionalities
|
|
||||||
on our websites with your Twitter account. You may find
|
|
||||||
further information at https://twitter.com/de/privacy.<br/>
|
|
||||||
<br/>
|
|
||||||
<br/>
|
|
||||||
<strong>7. Your rights concerning your personal
|
|
||||||
data</strong><br/>
|
|
||||||
<br/>
|
|
||||||
Under applicable GDPR you may have the right to:<br/>
|
|
||||||
<br/>
|
|
||||||
a) Obtain confirmation as to whether or not personal data
|
|
||||||
concerning you are being processed, and where that is the
|
|
||||||
case, access to the personal data, according to Art. 15
|
|
||||||
GDPR.<br/>
|
|
||||||
<br/>
|
|
||||||
b) Obtain the rectification of false or inaccurate data
|
|
||||||
concerning you, according to Art. 15, Art. 16 GDPR.<br/>
|
|
||||||
<br/>
|
|
||||||
c) Obtain the deletion of your personal data, according to
|
|
||||||
Art. 17 GDPR.<br/>
|
|
||||||
<br/>
|
|
||||||
d) Obtain the restriction of processing your personal data,
|
|
||||||
according to Art. 18 GDPR.<br/>
|
|
||||||
<br/>
|
|
||||||
e) Obtain a digital copy of your personal data processed by
|
|
||||||
us, according to Art. 20 GDPR.<br/>
|
|
||||||
<br/>
|
|
||||||
f) Revoke a granted permission regarding your personal data
|
|
||||||
at any time, according to Art. 7 par. 3 GDPR.<br/>
|
|
||||||
<br/>
|
|
||||||
g) Complain at a data protection authority, according to
|
|
||||||
Art. 77 GDPR.<br/>
|
|
||||||
<br/>
|
|
||||||
<br/>
|
|
||||||
<br/>
|
|
||||||
<strong>8. Hyperlinks / Disclaimer</strong><br/>
|
|
||||||
<br/>
|
|
||||||
This privacy policy applies only to our websites and not to
|
|
||||||
other websites or applications operated by third parties.
|
|
||||||
We may provide links to other websites but we are not
|
|
||||||
responsible for the privacy practices of such other
|
|
||||||
websites.<br/>
|
|
||||||
<br/>
|
|
||||||
<br/>
|
|
||||||
{% endblocktrans %}
|
|
||||||
</p>
|
|
||||||
</div>
|
|
||||||
<div class="modal-footer">
|
|
||||||
<button type="button" class="gdpr-button btn-default"
|
|
||||||
data-dismiss="modal">Close
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<script type="text/javascript">
|
|
||||||
var cookieManager = {
|
|
||||||
|
|
||||||
createCookie: function (name, value, days) {
|
|
||||||
var date = new Date(),
|
|
||||||
expires = '';
|
|
||||||
if (days) {
|
|
||||||
date.setTime(date.getTime() + (days * 24 * 60 * 60 * 1000));
|
|
||||||
expires = "; expires=" + date.toGMTString();
|
|
||||||
} else {
|
|
||||||
expires = "";
|
|
||||||
}
|
|
||||||
document.cookie = name + "=" + value + expires + "; path=/";
|
|
||||||
},
|
|
||||||
|
|
||||||
createGDPRCookie: function () {
|
|
||||||
this.createCookie('gdpr_accepted', '1', 10 * 365);
|
|
||||||
|
|
||||||
if (typeof (window.jQuery) === 'function') {
|
|
||||||
jQuery('#gdprBanner').slideUp();
|
|
||||||
} else {
|
|
||||||
document.getElementById('gdprBanner').style.display = 'none';
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
};
|
|
||||||
</script>
|
|
||||||
{% endif %}
|
|
||||||
|
|
@ -2,13 +2,11 @@
|
||||||
<!-- Page Header -->
|
<!-- Page Header -->
|
||||||
<!-- Set your background image for this header on the line below. -->
|
<!-- Set your background image for this header on the line below. -->
|
||||||
<header class="intro-header"
|
<header class="intro-header"
|
||||||
{% if request.current_page.ungleichpage %}
|
{% if request.current_page.pagemeta.image.url %}
|
||||||
style="background-image: url('{{ request.current_page.ungleichpage.image.url }}');"
|
style="background-image: url('{{ request.current_page.pagemeta.image.url }}');"
|
||||||
{% elif request.GET.page_title == 'IPv6.Blog' %}
|
{% else %}
|
||||||
style="background-image: url('{% static 'blog.ungleich.ch/img/ipv6-train-tunnel-darkened-bg.jpg' %}');"
|
style="background-image: url('{% static 'blog.ungleich.ch/img/home-bg.jpg' %}');"
|
||||||
{% else %}
|
{% endif %}
|
||||||
style="background-image: url('{% static 'blog.ungleich.ch/img/home-bg.jpg' %}');"
|
|
||||||
{% endif %}
|
|
||||||
>
|
>
|
||||||
|
|
||||||
<div class="container">
|
<div class="container">
|
||||||
|
|
@ -30,9 +28,9 @@
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
|
|
||||||
<h1>{% if request.GET.page_title %}{{request.GET.page_title}}{% else %}{% page_attribute 'page_title' %}{% endif %}</h1>
|
<h1> {% page_attribute 'page_title' %} </h1>
|
||||||
<hr class="small">
|
<hr class="small">
|
||||||
<span class="subheading">{% if request.GET.page_subtitle %}{{request.GET.page_subtitle}}{% else %}{% page_attribute 'meta_description' %}{% endif %}</span>
|
<span class="subheading"> {% page_attribute 'meta_description' %}</span>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
||||||
|
|
@ -9,13 +9,13 @@
|
||||||
<meta name="author" content="ungleich glarus ag">
|
<meta name="author" content="ungleich glarus ag">
|
||||||
<title>
|
<title>
|
||||||
{% block title %}
|
{% block title %}
|
||||||
{% if request.GET.page_title %}{{request.GET.page_title}}{% else %}{% page_attribute "page_title" %}{% endif %}
|
{% page_attribute "page_title" %}
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
</title>
|
</title>
|
||||||
{% addtoblock "external-css" %}
|
{% addtoblock "external-css" %}
|
||||||
{% bootstrap_css %}
|
{% bootstrap_css %}
|
||||||
|
|
||||||
<link href='{% static "digitalglarus/font-awesome-4.1.0/css/font-awesome.min.css" %}' rel="stylesheet" type="text/css">
|
<link href='//maxcdn.bootstrapcdn.com/font-awesome/4.1.0/css/font-awesome.min.css' rel="stylesheet" type="text/css">
|
||||||
<link href='//fonts.googleapis.com/css?family=Lora:400,700,400italic,700italic' rel='stylesheet' type='text/css'>
|
<link href='//fonts.googleapis.com/css?family=Lora:400,700,400italic,700italic' rel='stylesheet' type='text/css'>
|
||||||
<link href='//fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,600italic,700italic,800italic,400,300,600,700,800'
|
<link href='//fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,600italic,700italic,800italic,400,300,600,700,800'
|
||||||
rel='stylesheet' type='text/css'>
|
rel='stylesheet' type='text/css'>
|
||||||
|
|
@ -23,8 +23,8 @@
|
||||||
<!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
|
<!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
|
||||||
<!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
|
<!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
|
||||||
<!--[if lt IE 9]>
|
<!--[if lt IE 9]>
|
||||||
<script src="{% static 'datacenterlight/js/html5shiv-3.7.0.js' %}"></script>
|
<script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script>
|
||||||
<script src="{% static 'datacenterlight/js/respond-1.4.2.min.js' %}"></script>
|
<script src="https://oss.maxcdn.com/libs/respond.js/1.4.2/respond.min.js"></script>
|
||||||
<![endif]-->
|
<![endif]-->
|
||||||
{% endaddtoblock %}
|
{% endaddtoblock %}
|
||||||
|
|
||||||
|
|
@ -48,7 +48,6 @@
|
||||||
</head>
|
</head>
|
||||||
<body>
|
<body>
|
||||||
|
|
||||||
{% include "gdpr_banner.html" %}
|
|
||||||
{% cms_toolbar %}
|
{% cms_toolbar %}
|
||||||
{% show_menu 0 0 0 1 "cms/ungleichch/_menu.html" %}
|
{% show_menu 0 0 0 1 "cms/ungleichch/_menu.html" %}
|
||||||
<!-- body -->
|
<!-- body -->
|
||||||
|
|
|
||||||
|
|
@ -40,7 +40,6 @@
|
||||||
</head>
|
</head>
|
||||||
|
|
||||||
<body id="page-top" class="index">
|
<body id="page-top" class="index">
|
||||||
{% include "gdpr_banner.html" %}
|
|
||||||
<nav class="navbar navbar-default navbar-fixed-top topnav navbar-transparent">
|
<nav class="navbar navbar-default navbar-fixed-top topnav navbar-transparent">
|
||||||
<div class="topnav">
|
<div class="topnav">
|
||||||
<!-- Brand and toggle get grouped for better mobile display -->
|
<!-- Brand and toggle get grouped for better mobile display -->
|
||||||
|
|
|
||||||
|
|
@ -43,7 +43,6 @@
|
||||||
</head>
|
</head>
|
||||||
|
|
||||||
<body id="page-top" class="index">
|
<body id="page-top" class="index">
|
||||||
{% include "gdpr_banner.html" %}
|
|
||||||
{% cms_toolbar %}
|
{% cms_toolbar %}
|
||||||
<nav class="navbar navbar-default navbar-fixed-top topnav navbar-transparent">
|
<nav class="navbar navbar-default navbar-fixed-top topnav navbar-transparent">
|
||||||
<div class="topnav">
|
<div class="topnav">
|
||||||
|
|
|
||||||
|
|
@ -22,7 +22,7 @@
|
||||||
<a href="mailto:info@ungleich.ch"><i class="fa fa-envelope"></i> info@ungleich.ch</a>
|
<a href="mailto:info@ungleich.ch"><i class="fa fa-envelope"></i> info@ungleich.ch</a>
|
||||||
</h3>
|
</h3>
|
||||||
|
|
||||||
<h3 class="intro-smallcap sm_left"><i class="fa fa-phone"></i> +41 55 505 6266</h3>
|
<h3 class="intro-smallcap sm_left"><i class="fa fa-phone"></i> (044) 534-66-22</h3>
|
||||||
<!-- <h3 class="intro-smallcap">{% trans "or" %}</h3> -->
|
<!-- <h3 class="intro-smallcap">{% trans "or" %}</h3> -->
|
||||||
|
|
||||||
<!-- <h3 class="intro-smallcap">{% trans "Contact Us" %}</h3> -->
|
<!-- <h3 class="intro-smallcap">{% trans "Contact Us" %}</h3> -->
|
||||||
|
|
|
||||||
|
|
@ -37,7 +37,7 @@
|
||||||
</head>
|
</head>
|
||||||
|
|
||||||
<body id="page-top" class="index">
|
<body id="page-top" class="index">
|
||||||
{% include "gdpr_banner.html" %}
|
|
||||||
<!-- Navigation -->
|
<!-- Navigation -->
|
||||||
<nav class="navbar navbar-default navbar-fixed-top">
|
<nav class="navbar navbar-default navbar-fixed-top">
|
||||||
<div class="container">
|
<div class="container">
|
||||||
|
|
|
||||||
|
|
@ -42,9 +42,7 @@
|
||||||
</head>
|
</head>
|
||||||
|
|
||||||
<body id="page-top" class="index">
|
<body id="page-top" class="index">
|
||||||
{% include "gdpr_banner.html" %}
|
{% cms_toolbar %}
|
||||||
|
|
||||||
{% cms_toolbar %}
|
|
||||||
{% placeholder 'Ungleich Page Contents' %}
|
{% placeholder 'Ungleich Page Contents' %}
|
||||||
|
|
||||||
<!-- Footer -->
|
<!-- Footer -->
|
||||||
|
|
|
||||||
|
|
@ -5,27 +5,18 @@ def google_analytics(request):
|
||||||
"""
|
"""
|
||||||
Use the variables returned in this function to
|
Use the variables returned in this function to
|
||||||
render your Google Analytics tracking code template.
|
render your Google Analytics tracking code template.
|
||||||
|
|
||||||
Also check whether the site is a tenant site and create a corresponding
|
|
||||||
variable to indicate this
|
|
||||||
"""
|
"""
|
||||||
host = request.get_host()
|
host = request.get_host()
|
||||||
ga_prop_id = getattr(settings, 'GOOGLE_ANALYTICS_PROPERTY_IDS', False).get(
|
ga_prop_id = getattr(settings, 'GOOGLE_ANALYTICS_PROPERTY_IDS', False).get(
|
||||||
host)
|
host)
|
||||||
which_urlspy = settings.MULTISITE_CMS_URLS.get(host)
|
|
||||||
if ga_prop_id is None:
|
if ga_prop_id is None:
|
||||||
# Try checking if we have a www in host, if yes we remove
|
# Try checking if we have a www in host, if yes we remove
|
||||||
# that and check in the dict again
|
# that and check in the dict again
|
||||||
if host.startswith('www.'):
|
if host.startswith('www.'):
|
||||||
ga_prop_id = getattr(settings, 'GOOGLE_ANALYTICS_PROPERTY_IDS',
|
ga_prop_id = getattr(settings, 'GOOGLE_ANALYTICS_PROPERTY_IDS',
|
||||||
False).get(host[4:])
|
False).get(host[4:])
|
||||||
which_urlspy = settings.MULTISITE_CMS_URLS.get(host[4:])
|
|
||||||
return_dict = {}
|
|
||||||
if not settings.DEBUG and ga_prop_id:
|
if not settings.DEBUG and ga_prop_id:
|
||||||
return_dict['GOOGLE_ANALYTICS_PROPERTY_ID'] = ga_prop_id
|
return {
|
||||||
|
'GOOGLE_ANALYTICS_PROPERTY_ID': ga_prop_id
|
||||||
if which_urlspy:
|
}
|
||||||
if which_urlspy.endswith("multi"):
|
return {}
|
||||||
return_dict['IS_TENANT_SITE'] = True
|
|
||||||
|
|
||||||
return return_dict
|
|
||||||
|
|
|
||||||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue