.dockerignore

@@ -1,2 +1 @@
 .git
-.env

Changelog

@@ -1,5 +1,3 @@
-3.4: 2022-04-14
-   * 11566: Fix for ungleich.ch product section alignment
 3.2: 2021-02-07
    * 8816: Update order confirmation text to better prepared for payment dispute
    * supportticket#22990: Fix: can't add a deleted card

Dockerfile

@@ -1,5 +1,4 @@
-# FROM python:3.10.0-alpine3.15
+FROM python:3.10.0-alpine3.15
-FROM python:3.5-alpine3.12
 
 WORKDIR /usr/src/app
 
@@ -8,25 +7,12 @@ RUN apk add --update --no-cache \
     build-base \
     openldap-dev \
     python3-dev \
-    postgresql-dev \
+    libpq-dev \
-    jpeg-dev \
-    libxml2-dev \
-    libxslt-dev \
-    libmemcached-dev \
-    zlib-dev \
     && rm -rf /var/cache/apk/*
 
-## For alpine 3.15 replace postgresql-dev with libpq-dev
-
 # FIX https://github.com/python-ldap/python-ldap/issues/432
 RUN echo 'INPUT ( libldap.so )' > /usr/lib/libldap_r.so
 
 COPY requirements.txt ./
-
+RUN pip install --no-cache-dir -r requirements.txt
-# Pillow seems to need LIBRARY_PATH set as follows:  (see: https://github.com/python-pillow/Pillow/issues/1763#issuecomment-222383534)
-RUN LIBRARY_PATH=/lib:/usr/lib /bin/sh -c "pip install --no-cache-dir -r requirements.txt"
-
 COPY ./ .
-COPY entrypoint.sh /
-
-ENTRYPOINT ["/entrypoint.sh" ]

alplora/views.py

@@ -31,10 +31,9 @@ class ContactView(FormView):
         return context
 
     def form_valid(self, form):
-        print("alplora contactusform")
+        form.save()
-        #form.save()
+        form.send_email(email_to='info@alplora.ch')
-        #form.send_email(email_to='info@alplora.ch')
+        messages.add_message(self.request, messages.SUCCESS, self.success_message)
-        #messages.add_message(self.request, messages.SUCCESS, self.success_message)
         return render(self.request, 'alplora/contact_success.html', {})
 
 

build-image.sh

@@ -1,23 +0,0 @@
-#!/bin/sh
-
-if [ $# -lt 1 ]; then
-    echo "$0 imageversion [push]"
-    echo "Version could be: $(git describe --always)"
-    echo "If push is specified, also push to our harbor"
-    exit 1
-fi
-
-tagprefix=harbor.k8s.ungleich.ch/ungleich-public/dynamicweb
-version=$1; shift
-
-tag=${tagprefix}:${version}
-
-set -ex
-
-docker build -t "${tag}" .
-
-push=$1; shift
-
-if [ "$push" ]; then
-    docker push "${tag}"
-fi

datacenterlight/management/commands/fix_generic_stripe_plan_product_names.py

@@ -1,54 +0,0 @@
-from django.core.management.base import BaseCommand
-from datacenterlight.tasks import handle_metadata_and_emails
-from datacenterlight.models import StripePlan
-from opennebula_api.models import OpenNebulaManager
-from membership.models import CustomUser
-from hosting.models import GenericProduct
-import logging
-import json
-import sys
-import stripe
-
-logger = logging.getLogger(__name__)
-
-
-class Command(BaseCommand):
-    help = '''Stripe plans created before version 3.4 saved the plan name like generic-{subscription_id}-amount. This
-              command aims at replacing this with the actual product name
-              '''
-
-    def handle(self, *args, **options):
-        cnt = 0
-        self.stdout.write(
-            self.style.SUCCESS(
-                'In Fix generic stripe plan product names'
-            )
-        )
-        plans_to_change = StripePlan.objects.filter(stripe_plan_id__startswith='generic')
-        for plan in plans_to_change:
-            response = input("Press 'y' to continue: ")
-
-            # Check if the user entered 'y'
-            if response.lower() == 'y':
-                plan_name = plan.stripe_plan_id
-                first_index_hyphen = plan_name.index("-") + 1
-                product_id = plan_name[
-                             first_index_hyphen:(plan_name[first_index_hyphen:].index("-")) + first_index_hyphen]
-                gp = GenericProduct.objects.get(id=product_id)
-                if gp:
-                    cnt += 1
-                # update stripe
-                sp = stripe.Plan.retrieve(plan_name)
-                pr = stripe.Product.retrieve(sp.product)
-                pr.name = gp.product_name
-                pr.save()
-                # update local
-                spl = StripePlan.objects.get(stripe_plan_id=plan_name)
-                spl.stripe_plan_name = gp.product_name
-                spl.save()
-                print("%s. %s => %s" % (cnt, plan_name, gp.product_name))
-            else:
-                print("Invalid input. Please try again.")
-                sys.exit()
-
-        print("Done")

datacenterlight/templatetags/custom_tags.py

@@ -144,7 +144,7 @@ def get_line_item_from_stripe_invoice(invoice):
         """.format(
             vm_id=vm_id if vm_id > 0 else "",
             ip_addresses=mark_safe(get_ip_addresses(vm_id)) if vm_id > 0 else
-            mark_safe(get_product_name(plan_name)) if plan_name.startswith("generic-") else plan_name,
+            mark_safe(get_product_name(plan_name)),
             period=mark_safe("%s — %s" % (
                 datetime.datetime.fromtimestamp(start_date).strftime('%Y-%m-%d'),
                 datetime.datetime.fromtimestamp(end_date).strftime('%Y-%m-%d'))),
@@ -160,7 +160,8 @@ def get_product_name(plan_name):
     product_name = ""
     if plan_name and plan_name.startswith("generic-"):
         first_index_hyphen = plan_name.index("-") + 1
-        product_id = plan_name[first_index_hyphen:(plan_name[first_index_hyphen:].index("-")) + first_index_hyphen]
+        product_id = plan_name[first_index_hyphen:
+        (plan_name[first_index_hyphen:].index("-")) + first_index_hyphen]
         try:
             product = GenericProduct.objects.get(id=product_id)
             product_name = product.product_name

datacenterlight/views.py

@@ -42,8 +42,6 @@ from .utils import (
     get_cms_integration, create_vm, clear_all_session_vars, validate_vat_number
 )
 
-from datacenterlight.templatetags.custom_tags import get_product_name
-
 logger = logging.getLogger(__name__)
 
 
@@ -65,23 +63,23 @@ class ContactUsView(FormView):
             )
 
     def form_valid(self, form):
-        #form.save()
+        form.save()
-        #from_emails = {
+        from_emails = {
-        #    'glasfaser': 'glasfaser@ungleich.ch'
+            'glasfaser': 'glasfaser@ungleich.ch'
-        #}
+        }
-        #from_page = self.request.POST.get('from_page')
+        from_page = self.request.POST.get('from_page')
-        #email_data = {
+        email_data = {
-        #    'subject': "{dcl_text} Message from {sender}".format(
+            'subject': "{dcl_text} Message from {sender}".format(
-        #        dcl_text=settings.DCL_TEXT,
+                dcl_text=settings.DCL_TEXT,
-        #        sender=form.cleaned_data.get('email')
+                sender=form.cleaned_data.get('email')
-        #    ),
+            ),
-        #    'from_email': settings.DCL_SUPPORT_FROM_ADDRESS,
+            'from_email': settings.DCL_SUPPORT_FROM_ADDRESS,
-        #    'to': [from_emails.get(from_page, 'support@ungleich.ch')],
+            'to': [from_emails.get(from_page, 'support@ungleich.ch')],
-        #    'body': "\n".join(
+            'body': "\n".join(
-        #        ["%s=%s" % (k, v) for (k, v) in form.cleaned_data.items()]),
+                ["%s=%s" % (k, v) for (k, v) in form.cleaned_data.items()]),
-        #    'reply_to': [form.cleaned_data.get('email')],
+            'reply_to': [form.cleaned_data.get('email')],
-        #}
+        }
-        #send_plain_email_task.delay(email_data)
+        send_plain_email_task.delay(email_data)
         if self.request.is_ajax():
             return self.render_to_response(
                 self.get_context_data(success=True, contact_form=form))
@@ -902,21 +900,15 @@ class OrderConfirmationView(DetailView, FormView):
                         2
                     )
                 )
-                stripe_plan_id = "generic-{0}-{1:.2f}".format(
+                plan_name = "generic-{0}-{1:.2f}".format(
                     request.session['generic_payment_details']['product_id'],
                     amount_to_be_charged
                 )
-                try:
+                stripe_plan_id = plan_name
-                    product = GenericProduct.objects.get(id=request.session['generic_payment_details']['product_id'])
-                    plan_name = product.product_name
-                except Exception as ex:
-                    logger.debug("Error {}" % str(ex))
-                    plan_name = get_product_name(stripe_plan_id)
                 recurring_interval = request.session['generic_payment_details']['recurring_interval']
                 if recurring_interval == "year":
-                    stripe_plan_id = "{}-yearly".format(stripe_plan_id)
+                    plan_name = "{}-yearly".format(plan_name)
-                    plan_name = "{} (yearly)".format(plan_name)
+                    stripe_plan_id = plan_name
-                logger.debug("Plan name = {}, Stripe Plan id = {}".format(plan_name, stripe_plan_id))
             else:
                 template = request.session.get('template')
                 specs = request.session.get('specs')

digitalglarus/views.py

@@ -835,10 +835,9 @@ class ContactView(FormView):
     success_message = _('Message Successfully Sent')
 
     def form_valid(self, form):
-        print("digital glarus contactusform")
+        form.save()
-        #form.save()
+        form.send_email()
-        #form.send_email()
+        messages.add_message(self.request, messages.SUCCESS, self.success_message)
-        #messages.add_message(self.request, messages.SUCCESS, self.success_message)
         return super(ContactView, self).form_valid(form)
 
 

dynamicweb/settings/base.py

@@ -56,9 +56,6 @@ dotenv.load_dotenv("{0}/.env".format(PROJECT_DIR))
 
 from multisite import SiteID
 
-RECAPTCHA_PUBLIC_KEY = env('RECAPTCHA_PUBLIC_KEY')
-RECAPTCHA_PRIVATE_KEY = env('RECAPTCHA_PRIVATE_KEY')
-
 UNGLEICH_BLOG_SITE_ID = int_env("UNGLEICH_BLOG_SITE_ID")
 SITE_ID = SiteID(default=(UNGLEICH_BLOG_SITE_ID if
                           UNGLEICH_BLOG_SITE_ID > 0 else 1))
@@ -128,7 +125,6 @@ INSTALLED_APPS = (
     'djangocms_file',
     'djangocms_picture',
     'djangocms_video',
-    'django_recaptcha',
     # 'djangocms_flash',
     # 'djangocms_googlemap',
     # 'djangocms_inherit',
@@ -777,9 +773,3 @@ if DEBUG:
     from .local import *  # flake8: noqa
 else:
     from .prod import *  # flake8: noqa
-
-# Try to load dynamic configuration, if it exists
-try:
-    from .dynamic import * # flake8: noqa
-except ImportError:
-    pass

entrypoint.sh

@@ -1,19 +0,0 @@
-#!/bin/sh
-
-set -uex
-
-cd /usr/src/app/
-cat > dynamicweb/settings/dynamic.py <<EOF
-DATABASES = {
-    'default': {
-        'ENGINE': 'django.db.backends.postgresql_psycopg2',
-        'NAME': '${POSTGRES_DB}',
-        'USER': '${POSTGRES_USER}',
-        'PASSWORD': '${POSTGRES_PASSWORD}',
-        'HOST': '${POSTGRES_HOST}',
-        'PORT': '5432',
-    }
-}
-EOF
-
-exec "$@"

hosting/management/commands/change_ch_vatrate_2023.py

@@ -1,144 +0,0 @@
-from django.core.management.base import BaseCommand
-import datetime
-import csv
-import logging
-import stripe
-from hosting.models import VATRates
-from utils.hosting_utils import get_vat_rate_for_country
-from django.conf import settings
-from membership.models import CustomUser, StripeCustomer
-
-stripe.api_key = settings.STRIPE_API_PRIVATE_KEY
-
-logger = logging.getLogger(__name__)
-
-class Command(BaseCommand):
-    help = '''CH vat rate changes on 2024-01-01 from 7.7% to 8.1%. This commands makes the necessary changes'''
-
-    def handle(self, *args, **options):
-        MAKE_MODIFS=False
-        try:
-            country_to_change = 'CH'
-            currency_to_change = 'CHF'
-            new_rate = 0.081
-            user_country_vat_rate = get_vat_rate_for_country(country_to_change)
-            logger.debug("Existing VATRate for %s %s " % (country_to_change, user_country_vat_rate))
-            vat_rate = VATRates.objects.get(
-                territory_codes=country_to_change, start_date__isnull=False, stop_date=None
-            )
-            logger.debug("VAT rate for %s is %s" % (country_to_change, vat_rate.rate))
-            logger.debug("vat_rate object = %s" % vat_rate)
-            logger.debug("Create end date for the VATRate %s" % vat_rate.id)
-            #            if MAKE_MODIFS:
-            #                vat_rate.stop_date = datetime.date(2023, 12, 31)
-            #                vat_rate.save()
-            #                print("Creating a new VATRate for CH")
-            #                obj, created = VATRates.objects.get_or_create(
-            #                    start_date=datetime.date(2024, 1, 1),
-            #                    stop_date=None,
-            #                    territory_codes=country_to_change,
-            #                    currency_code=currency_to_change,
-            #                    rate=new_rate,
-            #                    rate_type="standard",
-            #                    description="Switzerland standard VAT (added manually on %s)" % datetime.datetime.now()
-            #                )
-            #                if created:
-            #                    logger.debug("Created new VAT Rate for %s with the new rate %s" % (country_to_change, new_rate))
-            #                    logger.debug(obj)
-            #                else:
-            #                    logger.debug("VAT Rate for %s already exists with the rate %s" % (country_to_change, new_rate))
-            #
-            logger.debug("Getting all subscriptions of %s that need a VAT Rate change")
-            subscriptions = stripe.Subscription.list(limit=100)  # Increase the limit to 100 per page (maximum)
-            ch_subs = []
-
-            while subscriptions:
-                for subscription in subscriptions:
-                    if len(subscription.default_tax_rates) > 0 and subscription.default_tax_rates[0].jurisdiction and subscription.default_tax_rates[0].jurisdiction.lower() == 'ch':
-                        ch_subs.append(subscription)
-                    elif len(subscription.default_tax_rates) > 0:
-                        print("subscription %s belongs to %s" % (subscription.id, subscription.default_tax_rates[0].jurisdiction))
-                    else:
-                        print("subscription %s does not have a tax rate" % subscription.id)
-                if subscriptions.has_more:
-                    print("FETCHING MORE")
-                    subscriptions = stripe.Subscription.list(limit=100, starting_after=subscriptions.data[-1])
-                else:
-                    break
-            logger.debug("There are %s ch subscription that need VAT rate update" % len(ch_subs))
-
-            # CSV column headers
-            csv_headers = [
-                "customer_name",
-                "customer_email",
-                "stripe_customer_id",
-                "subscription_id",
-                "subscription_name",
-                "amount",
-                "vat_rate"
-            ]
-            # CSV file name
-            csv_filename = "ch_subscriptions_change_2024.csv"
-            # Write subscription data to CSV file
-            with open(csv_filename, mode='w', newline='') as csv_file:
-                writer = csv.DictWriter(csv_file, fieldnames=csv_headers)
-                writer.writeheader()
-
-                for subscription in ch_subs:
-                    subscription_id = subscription["id"]
-                    stripe_customer_id = subscription.get("customer", "")
-                    vat_rate = subscription.get("tax_percent", "")
-                    c_user = CustomUser.objects.get(
-                        id=StripeCustomer.objects.filter(stripe_id=stripe_customer_id)[0].user.id)
-                    if c_user:
-                        customer_name = c_user.name.encode('utf-8')
-                        customer_email = c_user.email
-                        items = subscription.get("items", {}).get("data", [])
-                        for item in items:
-                            subscription_name = item.get("plan", {}).get("id", "")
-                            amount = item.get("plan", {}).get("amount", "")
-
-                            # Convert amount to a proper format (e.g., cents to dollars)
-                            amount_in_chf = amount / 100  # Adjust this conversion as needed
-
-                            # Writing to CSV
-                            writer.writerow({
-                                "customer_name": customer_name,
-                                "customer_email": customer_email,
-                                "stripe_customer_id": stripe_customer_id,
-                                "subscription_id": subscription_id,
-                                "subscription_name": subscription_name,
-                                "amount": amount_in_chf,
-                                "vat_rate": vat_rate  # Fill in VAT rate if available
-                            })
-                    else:
-                        print("No customuser for %s %s" % (stripe_customer_id, subscription_id))
-
-
-            if MAKE_MODIFS:
-                print("Making modifications now")
-                tax_rate_obj = stripe.TaxRate.create(
-                    display_name="VAT",
-                    description="VAT for %s" % country_to_change,
-                    jurisdiction=country_to_change,
-                    percentage=new_rate,
-                    inclusive=False,
-                )
-                stripe_tax_rate = StripeTaxRate.objects.create(
-                    display_name=tax_rate_obj.display_name,
-                    description=tax_rate_obj.description,
-                    jurisdiction=tax_rate_obj.jurisdiction,
-                    percentage=tax_rate_obj.percentage,
-                    inclusive=False,
-                    tax_rate_id=tax_rate_obj.id
-                )
-
-                for ch_sub in ch_subs:
-                    ch_sub.default_tax_rates = [stripe_tax_rate.tax_rate_id]
-                    ch_sub.save()
-                    logger.debug("Default tax rate updated for %s" % ch_sub.id)
-            else:
-                print("Not making any modifications because MAKE_MODIFS=False")
-
-        except Exception as e:
-            print(" *** Error occurred. Details {}".format(str(e)))

hosting/migrations/0066_auto_20230727_0812.py

@@ -1,25 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.4 on 2023-07-27 08:12
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('hosting', '0065_auto_20201231_1041'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='genericproduct',
-            name='product_price',
-            field=models.DecimalField(decimal_places=2, max_digits=10),
-        ),
-        migrations.AlterField(
-            model_name='genericproduct',
-            name='product_vat',
-            field=models.DecimalField(decimal_places=4, default=0, max_digits=10),
-        ),
-    ]

hosting/models.py

@@ -75,8 +75,8 @@ class GenericProduct(AssignPermissionsMixin, models.Model):
     )
     product_description = models.CharField(max_length=500, default="")
     created_at = models.DateTimeField(auto_now_add=True)
-    product_price = models.DecimalField(max_digits=10, decimal_places=2)
+    product_price = models.DecimalField(max_digits=6, decimal_places=2)
-    product_vat = models.DecimalField(max_digits=10, 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_subscription_interval = models.CharField(
         max_length=10, default="month",

hosting/templates/hosting/invoices.html

@@ -87,7 +87,7 @@
         <tbody>
             {% for ho, stripe_charge_data in invs_charge %}
                 <tr>
-                    {{ ho | get_line_item_from_hosting_order_charge }}
+                    {{ ho.id | get_line_item_from_hosting_order_charge }}
                 </tr>
             {% endfor %}
         </tbody>

hosting/templates/hosting/virtual_machine_detail.html

@@ -46,7 +46,7 @@
 				<div class="vm-vmid">
 					<div class="vm-item-subtitle">{% trans "Current Pricing" %}</div>
 					<div class="vm-item-lg">{{order.price|floatformat:2|intcomma}} CHF/{% if order.generic_product %}{% trans order.generic_product.product_subscription_interval %}{% else %}{% trans "Month" %}{% endif %}</div>
-					{% if inv_url %}<a class="btn btn-vm-invoice" href="{{inv_url}}" target="_blank">{% trans "See Invoice" %}</a>{%else%}{% trans "No invoice as of now" %}{% endif %}
+					<a class="btn btn-vm-invoice" href="{{inv_url}}" target="_blank">{% trans "See Invoice" %}</a>
 				</div>
 			</div>
 			<div class="vm-detail-item">

hosting/views.py

@@ -554,22 +554,13 @@ class SettingsView(LoginRequiredMixin, FormView):
         Check if the user already saved contact details. If so, then show
         the form populated with those details, to let user change them.
         """
-        username = self.request.GET.get('username')
-        if self.request.user.is_admin and username:
-            user = CustomUser.objects.get(username=username)
-        else:
-            user = self.request.user
         return form_class(
-            instance=user.billing_addresses.first(),
+            instance=self.request.user.billing_addresses.first(),
             **self.get_form_kwargs())
 
     def get_context_data(self, **kwargs):
         context = super(SettingsView, self).get_context_data(**kwargs)
         # Get user
-        username = self.request.GET.get('username')
-        if self.request.user.is_admin and username:
-            user = CustomUser.objects.get(username=username)
-        else:
         user = self.request.user
         stripe_customer = None
         if hasattr(user, 'stripecustomer'):
@@ -1544,12 +1535,7 @@ class VirtualMachinesPlanListView(LoginRequiredMixin, ListView):
     ordering = '-id'
 
     def get_queryset(self):
-        username = self.request.GET.get('username')
+        owner = self.request.user
-        if self.request.user.is_admin and username:
-            user = CustomUser.objects.get(username=username)
-        else:
-            user = self.request.user
-        owner = user
         manager = OpenNebulaManager(email=owner.username,
                                     password=owner.password)
         try:
@@ -1708,10 +1694,6 @@ class VirtualMachineView(LoginRequiredMixin, View):
     login_url = reverse_lazy('hosting:login')
 
     def get_object(self):
-        username = self.request.GET.get('username')
-        if self.request.user.is_admin and username:
-            owner = CustomUser.objects.get(username=username)
-        else:
         owner = self.request.user
         vm = None
         manager = OpenNebulaManager(
@@ -1768,10 +1750,7 @@ class VirtualMachineView(LoginRequiredMixin, View):
                    subscription=hosting_order.subscription_id,
                    count=1
                 )
-                if stripe_obj.data:
                 inv_url = stripe_obj.data[0].hosted_invoice_url
-                else:
-                    inv_url = ''
             elif hosting_order.stripe_charge_id:
                 stripe_obj = stripe.Charge.retrieve(
                     hosting_order.stripe_charge_id

requirements.txt

@@ -25,7 +25,7 @@ django-compressor==2.0
 django-debug-toolbar==1.4
 python-dotenv==0.10.3
 django-extensions==1.6.7
-django-filer==1.2.0
+django-filer==2.1.2
 django-filter==0.13.0
 django-formtools==1.0
 django-guardian==1.4.4

ungleich_page/templates/ungleich_page/ungleich/section_products.html

@@ -19,15 +19,13 @@
 
 
 <script>
-document.addEventListener("DOMContentLoaded", function() {
+$( document ).ready(function() {
-  var equalizer = ".sameheight-{{product_instance.pk}}";
+	var equalizer = ".sameheight-{{product_instance.pk}}"
-  var elements = document.querySelectorAll(equalizer);
+    var heights = $(equalizer).map(function() {
-  var heights = Array.from(elements).map(function(el) {
+        return $(this).height();
-    return el.offsetHeight;
+    }).get(),
-  });
+
-  var maxHeight = Math.max(...heights);
+    maxHeight = Math.max.apply(null, heights);
-  Array.from(elements).forEach(function(el) {
+    $(equalizer).height(maxHeight);
-    el.style.height = maxHeight + "px";
-  });
 });
 </script>

ungleich_page/views.py

@@ -25,10 +25,9 @@ class ContactView(FormView):
     success_message = _('Message Successfully Sent')
 
     def form_valid(self, form):
-        print("ungleich_page contactusform")
+        form.save()
-        #form.save()
+        form.send_email()
-        #form.send_email()
+        messages.add_message(self.request, messages.SUCCESS, self.success_message)
-        #messages.add_message(self.request, messages.SUCCESS, self.success_message)
         return super(ContactView, self).form_valid(form)
 
     def get_context_data(self, **kwargs):

utils/fields.py

@@ -1,8 +1,7 @@
 from django.utils.translation import ugettext as _
 from django.db import models
 
-# Old: http://xml.coverpages.org/country3166.html
+# http://xml.coverpages.org/country3166.html
-# 2023-12-29: Updated list of countries from https://en.wikipedia.org/wiki/List_of_ISO_3166_country_codes
 COUNTRIES = (
     ('AD', _('Andorra')),
     ('AE', _('United Arab Emirates')),
@@ -11,6 +10,7 @@ COUNTRIES = (
     ('AI', _('Anguilla')),
     ('AL', _('Albania')),
     ('AM', _('Armenia')),
+    ('AN', _('Netherlands Antilles')),
     ('AO', _('Angola')),
     ('AQ', _('Antarctica')),
     ('AR', _('Argentina')),
@@ -18,7 +18,6 @@ COUNTRIES = (
     ('AT', _('Austria')),
     ('AU', _('Australia')),
     ('AW', _('Aruba')),
-    ('AX', _('Aland Islands')),
     ('AZ', _('Azerbaijan')),
     ('BA', _('Bosnia and Herzegovina')),
     ('BB', _('Barbados')),
@@ -29,13 +28,11 @@ COUNTRIES = (
     ('BH', _('Bahrain')),
     ('BI', _('Burundi')),
     ('BJ', _('Benin')),
-    ('BL', _('St. Barts')),
     ('BM', _('Bermuda')),
-    ('BN', _('Brunei')),
+    ('BN', _('Brunei Darussalam')),
     ('BO', _('Bolivia')),
-    ('BQ', _('Caribbean Netherlands')),
     ('BR', _('Brazil')),
-    ('BS', _('Bahamas')),
+    ('BS', _('Bahama')),
     ('BT', _('Bhutan')),
     ('BV', _('Bouvet Island')),
     ('BW', _('Botswana')),
@@ -43,12 +40,11 @@ COUNTRIES = (
     ('BZ', _('Belize')),
     ('CA', _('Canada')),
     ('CC', _('Cocos (Keeling) Islands')),
-    ('CD', _('Congo - Kinshasa')),
     ('CF', _('Central African Republic')),
-    ('CG', _('Congo - Brazzaville')),
+    ('CG', _('Congo')),
     ('CH', _('Switzerland')),
     ('CI', _('Ivory Coast')),
-    ('CK', _('Cook Islands')),
+    ('CK', _('Cook Iislands')),
     ('CL', _('Chile')),
     ('CM', _('Cameroon')),
     ('CN', _('China')),
@@ -56,10 +52,9 @@ COUNTRIES = (
     ('CR', _('Costa Rica')),
     ('CU', _('Cuba')),
     ('CV', _('Cape Verde')),
-    ('CW', _('Curacao')),
     ('CX', _('Christmas Island')),
     ('CY', _('Cyprus')),
-    ('CZ', _('Czechia')),
+    ('CZ', _('Czech Republic')),
     ('DE', _('Germany')),
     ('DJ', _('Djibouti')),
     ('DK', _('Denmark')),
@@ -75,16 +70,16 @@ COUNTRIES = (
     ('ET', _('Ethiopia')),
     ('FI', _('Finland')),
     ('FJ', _('Fiji')),
-    ('FK', _('Falkland Islands')),
+    ('FK', _('Falkland Islands (Malvinas)')),
     ('FM', _('Micronesia')),
     ('FO', _('Faroe Islands')),
     ('FR', _('France')),
+    ('FX', _('France, Metropolitan')),
     ('GA', _('Gabon')),
-    ('GB', _('United Kingdom')),
+    ('GB', _('United Kingdom (Great Britain)')),
     ('GD', _('Grenada')),
     ('GE', _('Georgia')),
     ('GF', _('French Guiana')),
-    ('GG', _('Guernsey')),
     ('GH', _('Ghana')),
     ('GI', _('Gibraltar')),
     ('GL', _('Greenland')),
@@ -98,7 +93,7 @@ COUNTRIES = (
     ('GU', _('Guam')),
     ('GW', _('Guinea-Bissau')),
     ('GY', _('Guyana')),
-    ('HK', _('Hong Kong SAR China')),
+    ('HK', _('Hong Kong')),
     ('HM', _('Heard & McDonald Islands')),
     ('HN', _('Honduras')),
     ('HR', _('Croatia')),
@@ -107,14 +102,12 @@ COUNTRIES = (
     ('ID', _('Indonesia')),
     ('IE', _('Ireland')),
     ('IL', _('Israel')),
-    ('IM', _('Isle of Man')),
     ('IN', _('India')),
     ('IO', _('British Indian Ocean Territory')),
     ('IQ', _('Iraq')),
-    ('IR', _('Iran')),
+    ('IR', _('Islamic Republic of Iran')),
     ('IS', _('Iceland')),
     ('IT', _('Italy')),
-    ('JE', _('Jersey')),
     ('JM', _('Jamaica')),
     ('JO', _('Jordan')),
     ('JP', _('Japan')),
@@ -124,14 +117,14 @@ COUNTRIES = (
     ('KI', _('Kiribati')),
     ('KM', _('Comoros')),
     ('KN', _('St. Kitts and Nevis')),
-    ('KP', _('North Korea')),
+    ('KP', _('Korea, Democratic People\'s Republic of')),
-    ('KR', _('South Korea')),
+    ('KR', _('Korea, Republic of')),
     ('KW', _('Kuwait')),
     ('KY', _('Cayman Islands')),
     ('KZ', _('Kazakhstan')),
-    ('LA', _('Laos')),
+    ('LA', _('Lao People\'s Democratic Republic')),
     ('LB', _('Lebanon')),
-    ('LC', _('St. Lucia')),
+    ('LC', _('Saint Lucia')),
     ('LI', _('Liechtenstein')),
     ('LK', _('Sri Lanka')),
     ('LR', _('Liberia')),
@@ -139,23 +132,20 @@ COUNTRIES = (
     ('LT', _('Lithuania')),
     ('LU', _('Luxembourg')),
     ('LV', _('Latvia')),
-    ('LY', _('Libya')),
+    ('LY', _('Libyan Arab Jamahiriya')),
     ('MA', _('Morocco')),
     ('MC', _('Monaco')),
-    ('MD', _('Moldova')),
+    ('MD', _('Moldova, Republic of')),
-    ('ME', _('Montenegro')),
-    ('MF', _('St. Martin')),
     ('MG', _('Madagascar')),
     ('MH', _('Marshall Islands')),
-    ('MK', _('North Macedonia')),
     ('ML', _('Mali')),
-    ('MM', _('Myanmar (Burma)')),
     ('MN', _('Mongolia')),
-    ('MO', _('Macao SAR China')),
+    ('MM', _('Myanmar')),
+    ('MO', _('Macau')),
     ('MP', _('Northern Mariana Islands')),
     ('MQ', _('Martinique')),
     ('MR', _('Mauritania')),
-    ('MS', _('Montserrat')),
+    ('MS', _('Monserrat')),
     ('MT', _('Malta')),
     ('MU', _('Mauritius')),
     ('MV', _('Maldives')),
@@ -184,17 +174,15 @@ COUNTRIES = (
     ('PK', _('Pakistan')),
     ('PL', _('Poland')),
     ('PM', _('St. Pierre & Miquelon')),
-    ('PN', _('Pitcairn Islands')),
+    ('PN', _('Pitcairn')),
     ('PR', _('Puerto Rico')),
-    ('PS', _('Palestinian Territories')),
     ('PT', _('Portugal')),
     ('PW', _('Palau')),
     ('PY', _('Paraguay')),
     ('QA', _('Qatar')),
     ('RE', _('Reunion')),
     ('RO', _('Romania')),
-    ('RS', _('Serbia')),
+    ('RU', _('Russian Federation')),
-    ('RU', _('Russia')),
     ('RW', _('Rwanda')),
     ('SA', _('Saudi Arabia')),
     ('SB', _('Solomon Islands')),
@@ -204,19 +192,17 @@ COUNTRIES = (
     ('SG', _('Singapore')),
     ('SH', _('St. Helena')),
     ('SI', _('Slovenia')),
-    ('SJ', _('Svalbard and Jan Mayen')),
+    ('SJ', _('Svalbard & Jan Mayen Islands')),
     ('SK', _('Slovakia')),
     ('SL', _('Sierra Leone')),
     ('SM', _('San Marino')),
     ('SN', _('Senegal')),
     ('SO', _('Somalia')),
     ('SR', _('Suriname')),
-    ('SS', _('South Sudan')),
     ('ST', _('Sao Tome & Principe')),
     ('SV', _('El Salvador')),
-    ('SX', _('Sint Maarten')),
+    ('SY', _('Syrian Arab Republic')),
-    ('SY', _('Syria')),
+    ('SZ', _('Swaziland')),
-    ('SZ', _('Eswatini')),
     ('TC', _('Turks & Caicos Islands')),
     ('TD', _('Chad')),
     ('TF', _('French Southern Territories')),
@@ -224,34 +210,36 @@ COUNTRIES = (
     ('TH', _('Thailand')),
     ('TJ', _('Tajikistan')),
     ('TK', _('Tokelau')),
-    ('TL', _('Timor-Leste')),
     ('TM', _('Turkmenistan')),
     ('TN', _('Tunisia')),
     ('TO', _('Tonga')),
+    ('TP', _('East Timor')),
     ('TR', _('Turkey')),
     ('TT', _('Trinidad & Tobago')),
     ('TV', _('Tuvalu')),
-    ('TW', _('Taiwan')),
+    ('TW', _('Taiwan, Province of China')),
-    ('TZ', _('Tanzania')),
+    ('TZ', _('Tanzania, United Republic of')),
     ('UA', _('Ukraine')),
     ('UG', _('Uganda')),
-    ('UM', _('U.S. Outlying Islands')),
+    ('UM', _('United States Minor Outlying Islands')),
-    ('US', _('United States')),
+    ('US', _('United States of America')),
     ('UY', _('Uruguay')),
     ('UZ', _('Uzbekistan')),
-    ('VA', _('Vatican City')),
+    ('VA', _('Vatican City State (Holy See)')),
-    ('VC', _('St. Vincent & Grenadines')),
+    ('VC', _('St. Vincent & the Grenadines')),
     ('VE', _('Venezuela')),
     ('VG', _('British Virgin Islands')),
-    ('VI', _('U.S. Virgin Islands')),
+    ('VI', _('United States Virgin Islands')),
-    ('VN', _('Vietnam')),
+    ('VN', _('Viet Nam')),
     ('VU', _('Vanuatu')),
-    ('WF', _('Wallis & Futuna')),
+    ('WF', _('Wallis & Futuna Islands')),
     ('WS', _('Samoa')),
     ('YE', _('Yemen')),
     ('YT', _('Mayotte')),
+    ('YU', _('Yugoslavia')),
     ('ZA', _('South Africa')),
     ('ZM', _('Zambia')),
+    ('ZR', _('Zaire')),
     ('ZW', _('Zimbabwe')),
 )
 

utils/forms.py

@@ -4,8 +4,6 @@ from django.core.mail import EmailMultiAlternatives
 from django.template.loader import render_to_string
 from django.utils.translation import ugettext_lazy as _
 
-from django_recaptcha.fields import ReCaptchaField
-
 from membership.models import CustomUser
 from .models import ContactMessage, BillingAddress, UserBillingAddress
 
@@ -190,7 +188,6 @@ class UserBillingAddressForm(forms.ModelForm):
 
 class ContactUsForm(forms.ModelForm):
     error_css_class = 'autofocus'
-    captcha = ReCaptchaField()
 
     class Meta:
         model = ContactMessage
@@ -209,12 +206,11 @@ class ContactUsForm(forms.ModelForm):
         }
 
     def send_email(self, email_to='info@digitalglarus.ch'):
-        pass
+        text_content = render_to_string(
-        #text_content = render_to_string(
+            'emails/contact.txt', {'data': self.cleaned_data})
-        #    'emails/contact.txt', {'data': self.cleaned_data})
+        html_content = render_to_string(
-        #html_content = render_to_string(
+            'emails/contact.html', {'data': self.cleaned_data})
-        #    'emails/contact.html', {'data': self.cleaned_data})
+        email = EmailMultiAlternatives('Subject', text_content)
-        #email = EmailMultiAlternatives('Subject', text_content)
+        email.attach_alternative(html_content, "text/html")
-        #email.attach_alternative(html_content, "text/html")
+        email.to = [email_to]
-        #email.to = [email_to]
+        email.send()
-        #email.send()