diff --git a/.dockerignore b/.dockerignore index a715c9d7..6b8710a7 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,2 +1 @@ .git -.env diff --git a/.gitignore b/.gitignore index a41d813d..41f41c20 100644 --- a/.gitignore +++ b/.gitignore @@ -15,6 +15,7 @@ media/ !media/keep /CACHE/ /static/ +/venv/ \#*# .\#* @@ -44,6 +45,3 @@ secret-key !.gitkeep *.orig .vscode/settings.json -2024-* -2025-* -2023-* diff --git a/Dockerfile b/Dockerfile index 4c1a9a66..bd4bcd21 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,32 +1,44 @@ -# FROM python:3.10.0-alpine3.15 -FROM python:3.5-alpine3.12 +FROM python:3.7-alpine3.15 -WORKDIR /usr/src/app +WORKDIR /app + +COPY . /app/ RUN apk add --update --no-cache \ git \ build-base \ openldap-dev \ python3-dev \ - postgresql-dev \ - jpeg-dev \ + libpq-dev \ + libjpeg \ + libmemcached-dev \ libxml2-dev \ libxslt-dev \ - libmemcached-dev \ + zlib \ + jpeg-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 LIBRARY_PATH=/lib:/usr/lib /bin/sh -c "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" +# Create a virtual environment +RUN python3 -m venv /venv -COPY ./ . -COPY entrypoint.sh / +ENV PATH="/venv/bin:$PATH" + +RUN pip install --no-cache-dir --upgrade pip + +#RUN CFLAGS="-Wno-cpp -Wno-unused-function -Wno-unused-variable -Wno-missing-noreturn -I/usr/include/libxml2" pip install lxml + +RUN pip install --no-cache-dir -r requirements.txt + +# Copy entrypoint.sh script and grant execute permissions +COPY entrypoint.sh /entrypoint.sh +RUN chmod +x /entrypoint.sh + +# Run migrations and start the server +ENTRYPOINT ["/entrypoint.sh"] -ENTRYPOINT ["/entrypoint.sh" ] diff --git a/alplora/views.py b/alplora/views.py index d628cffc..0a10b4e0 100644 --- a/alplora/views.py +++ b/alplora/views.py @@ -31,10 +31,9 @@ class ContactView(FormView): return context def form_valid(self, form): - print("alplora contactusform") - #form.save() - #form.send_email(email_to='info@alplora.ch') - #messages.add_message(self.request, messages.SUCCESS, self.success_message) + form.save() + form.send_email(email_to='info@alplora.ch') + messages.add_message(self.request, messages.SUCCESS, self.success_message) return render(self.request, 'alplora/contact_success.html', {}) diff --git a/build-image.sh b/build-image.sh deleted file mode 100755 index 64a67fd6..00000000 --- a/build-image.sh +++ /dev/null @@ -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 diff --git a/datacenterlight/management/commands/check_vm_templates.py b/datacenterlight/management/commands/check_vm_templates.py index d30e5b0d..db36fde8 100644 --- a/datacenterlight/management/commands/check_vm_templates.py +++ b/datacenterlight/management/commands/check_vm_templates.py @@ -1,9 +1,8 @@ from django.core.management.base import BaseCommand from opennebula_api.models import OpenNebulaManager from datacenterlight.models import VMTemplate -from datacenterlight.cms_models import DCLCalculatorPluginModel from membership.models import CustomUser -from utils.tasks import send_plain_email_task + from django.conf import settings from time import sleep import datetime @@ -22,7 +21,6 @@ class Command(BaseCommand): def handle(self, *args, **options): result_dict = {} - error_dict = {} user_email = options['user_email'] if 'user_email' in options else "" if user_email: @@ -33,12 +31,8 @@ class Command(BaseCommand): PROJECT_PATH = os.path.abspath(os.path.dirname(__name__)) if not os.path.exists("%s/outputs" % PROJECT_PATH): os.mkdir("%s/outputs" % PROJECT_PATH) - public_templates_plugin = DCLCalculatorPluginModel.objects.filter(cmsplugin_ptr_id=23356).first() - ipv6_templates_plugin = DCLCalculatorPluginModel.objects.filter(cmsplugin_ptr_id=21943).first() - templates = public_templates_plugin.vm_templates_to_show + ipv6_templates_plugin.vm_templates_to_show - vm_templates = VMTemplate.objects.filter(opennebula_vm_template_id__in=templates) - for vm_template in vm_templates: - vm_name = 'test-%s-%s' % (vm_template.vm_type, vm_template.name) + for vm_template in VMTemplate.objects.all(): + vm_name = 'test-%s' % vm_template.name vm_id = manager.create_vm( template_id=vm_template.opennebula_vm_template_id, specs=specs, @@ -58,7 +52,6 @@ class Command(BaseCommand): %s %s''' % (vm_name, vm_template.opennebula_vm_template_id, vm_template.vm_type) - error_dict[vm_name] = result_dict[vm_name] self.stdout.write(self.style.ERROR(result_dict[vm_name])) sleep(1) date_str = datetime.datetime.strftime( @@ -69,12 +62,4 @@ class Command(BaseCommand): 'w', encoding='utf-8') as f: f.write(json.dumps(result_dict)) - if error_dict: - email_data = { - 'subject': 'Check VM Templates ERROR', - 'from_email': settings.DCL_SUPPORT_FROM_ADDRESS, - 'to': [settings.ADMIN_EMAIL], - 'body': json.dumps(error_dict), - } - send_plain_email_task.delay(email_data) self.stdout.write(self.style.SUCCESS("Done")) diff --git a/datacenterlight/management/commands/fix_generic_stripe_plan_product_names.py b/datacenterlight/management/commands/fix_generic_stripe_plan_product_names.py deleted file mode 100644 index 2773009d..00000000 --- a/datacenterlight/management/commands/fix_generic_stripe_plan_product_names.py +++ /dev/null @@ -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") \ No newline at end of file diff --git a/datacenterlight/tasks.py b/datacenterlight/tasks.py index 899b506f..c9613ee8 100644 --- a/datacenterlight/tasks.py +++ b/datacenterlight/tasks.py @@ -9,7 +9,7 @@ from django.core.urlresolvers import reverse from django.utils import translation from django.utils.translation import ugettext_lazy as _ -from dynamicweb.celery import app +from dynamicweb.pr_celery import app from hosting.models import HostingOrder from membership.models import CustomUser from opennebula_api.models import OpenNebulaManager diff --git a/datacenterlight/templatetags/custom_tags.py b/datacenterlight/templatetags/custom_tags.py index fc39eec7..120cabbf 100644 --- a/datacenterlight/templatetags/custom_tags.py +++ b/datacenterlight/templatetags/custom_tags.py @@ -73,7 +73,6 @@ def get_line_item_from_hosting_order_charge(hosting_order_id): :return: """ try: - print("Hositng order id = %s" % hosting_order_id) hosting_order = HostingOrder.objects.get(id = hosting_order_id) if hosting_order.stripe_charge_id: return mark_safe(""" @@ -145,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'))), @@ -161,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 diff --git a/datacenterlight/views.py b/datacenterlight/views.py index c708ff6a..5bf68e0a 100644 --- a/datacenterlight/views.py +++ b/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() - #from_emails = { - # 'glasfaser': 'glasfaser@ungleich.ch' - #} - #from_page = self.request.POST.get('from_page') - #email_data = { - # 'subject': "{dcl_text} Message from {sender}".format( - # dcl_text=settings.DCL_TEXT, - # sender=form.cleaned_data.get('email') - # ), - # 'from_email': settings.DCL_SUPPORT_FROM_ADDRESS, - # 'to': [from_emails.get(from_page, 'support@ungleich.ch')], - # 'body': "\n".join( - # ["%s=%s" % (k, v) for (k, v) in form.cleaned_data.items()]), - # 'reply_to': [form.cleaned_data.get('email')], - #} - #send_plain_email_task.delay(email_data) + form.save() + from_emails = { + 'glasfaser': 'glasfaser@ungleich.ch' + } + from_page = self.request.POST.get('from_page') + email_data = { + 'subject': "{dcl_text} Message from {sender}".format( + dcl_text=settings.DCL_TEXT, + sender=form.cleaned_data.get('email') + ), + 'from_email': settings.DCL_SUPPORT_FROM_ADDRESS, + 'to': [from_emails.get(from_page, 'support@ungleich.ch')], + 'body': "\n".join( + ["%s=%s" % (k, v) for (k, v) in form.cleaned_data.items()]), + 'reply_to': [form.cleaned_data.get('email')], + } + 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)) @@ -201,8 +199,6 @@ class IndexView(CreateView): ssd_size=storage, pricing_name=vm_pricing_name ) - if request.user.id == 51: - print("User is test") specs = { 'cpu': cores, 'memory': memory, @@ -590,9 +586,6 @@ class OrderConfirmationView(DetailView, FormView): context = {} # this is amount to be charge/subscribed before VAT and discount # and expressed in chf. To convert to cents, multiply by 100 - print("******************************") - print("User = {}, ID = {}".format(request.user, request.user.id)) - print("******************************") amount_to_charge = 0 vm_specs = None if (('specs' not in request.session or 'user' not in request.session) @@ -618,7 +611,7 @@ class OrderConfirmationView(DetailView, FormView): # TODO check when we go through this case (to me, it seems useless) card_id = self.request.session.get('card_id') logger.debug("NO id_payment_method, using card: %s" % card_id) - card_detail = UserCardDetail.get_ucd_from_card_id(card_id=card_id) + card_detail = UserCardDetail.objects.get(id=card_id) context['cc_last4'] = card_detail.last4 context['cc_brand'] = card_detail.brand context['cc_exp_year'] = card_detail.exp_year @@ -652,8 +645,6 @@ class OrderConfirmationView(DetailView, FormView): pricing_name=vm_specs['pricing_name'], vat_rate=user_country_vat_rate * 100 ) - if request.user.id == 51: - print("User is test") vm_specs["price"] = price vm_specs["price_after_discount"] = price - discount["amount"] amount_to_charge = price @@ -859,7 +850,7 @@ class OrderConfirmationView(DetailView, FormView): return show_error(msg, self.request) elif 'card_id' in request.session: card_id = request.session.get('card_id') - user_card_detail = UserCardDetail.get_ucd_from_card_id(card_id=card_id) + user_card_detail = UserCardDetail.objects.get(id=card_id) card_details_dict = { 'last4': user_card_detail.last4, 'brand': user_card_detail.brand, @@ -909,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: - product = GenericProduct.objects.get(id=request.session['generic_payment_details']['product_id']) - plan_name = product.product_name - except Exception as ex: - logger.debug("Errori {}" % str(ex)) - plan_name = get_product_name(stripe_plan_id) + stripe_plan_id = plan_name 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) - logger.debug("Plan name = {}, Stripe Plan id = {}".format(plan_name, stripe_plan_id)) + plan_name = "{}-yearly".format(plan_name) + stripe_plan_id = plan_name else: template = request.session.get('template') specs = request.session.get('specs') @@ -1016,8 +1001,6 @@ class OrderConfirmationView(DetailView, FormView): # due to some reason. So, we would want to dissociate this card # here. # ... - logger.debug("In 1 ***") - logger.debug("stripe_subscription_obj == %s" % stripe_subscription_obj) msg = subscription_result.get('error') return show_error(msg, self.request) elif stripe_subscription_obj.status == 'incomplete': @@ -1211,10 +1194,9 @@ def get_or_create_custom_user(request, stripe_api_cus_id): def set_user_card(card_id, stripe_api_cus_id, custom_user, card_details_response): - logger.debug(":: set_user_card") if card_id: logger.debug("card_id %s was in request" % card_id) - user_card_detail = UserCardDetail.get_ucd_from_card_id(card_id=card_id) + user_card_detail = UserCardDetail.objects.get(id=card_id) card_details_dict = { 'last4': user_card_detail.last4, 'brand': user_card_detail.brand, @@ -1226,24 +1208,21 @@ def set_user_card(card_id, stripe_api_cus_id, custom_user, stripe_source_id=user_card_detail.card_id ) else: - logger.debug(" card_id was NOT in request, using " + logger.debug("card_id was NOT in request, using " "card_details_response") ucd = UserCardDetail.get_or_create_user_card_detail( stripe_customer=custom_user.stripecustomer, card_details=card_details_response ) - logger.debug(" ucd = %s" % ucd) UserCardDetail.save_default_card_local( custom_user.stripecustomer.stripe_id, ucd.card_id ) - logger.debug(" after save_default_card_local") card_details_dict = { 'last4': ucd.last4, 'brand': ucd.brand, 'card_id': ucd.card_id } - logger.debug("card_detail_dict = %s" % card_details_dict) return card_details_dict @@ -1437,30 +1416,6 @@ def do_provisioning(request, stripe_api_cus_id, card_details_response, """ logger.debug("do_provisioning") - - try: - params = { - 'request': request, - 'stripe_api_cus_id': stripe_api_cus_id, - 'card_details_response': card_details_response, - 'stripe_subscription_obj': stripe_subscription_obj, - 'stripe_onetime_charge': stripe_onetime_charge, - 'gp_details': gp_details, - 'specs': specs, - 'vm_template_id': vm_template_id, - 'template': template, - 'billing_address_data': billing_address_data, - 'real_request': real_request - } - print("Input Parameters:") - for key, value in params.items(): - try: - print("{}: {}".format(key, value)) - except Exception as e: - print("{}: [Error printing value: {}]".format(key, str(e))) - except Exception as e: - print("Error printing parameters: {}".format(str(e))) - user = request.get('user', None) # Create user if the user is not logged in and if he is not already @@ -1472,7 +1427,6 @@ def do_provisioning(request, stripe_api_cus_id, card_details_response, card_details_dict = set_user_card(card_id, stripe_api_cus_id, custom_user, card_details_response) - logger.debug("after set_user_card %s" % card_details_dict) # Save billing address billing_address_data.update({ @@ -1495,7 +1449,6 @@ def do_provisioning(request, stripe_api_cus_id, card_details_response, vat_number=billing_address_data['vat_number'] ) billing_address.save() - logger.debug("billing_address saved") order = HostingOrder.create( price=request['generic_payment_details']['amount'], @@ -1503,7 +1456,6 @@ def do_provisioning(request, stripe_api_cus_id, card_details_response, billing_address=billing_address, vm_pricing=VMPricing.get_default_pricing() ) - logger.debug("hosting order created") # Create a Hosting Bill HostingBill.create(customer=stripe_cus, @@ -1560,9 +1512,7 @@ def do_provisioning(request, stripe_api_cus_id, card_details_response, ["%s=%s" % (k, v) for (k, v) in context.items()]), 'reply_to': [context['email']], } - logger.debug("Sending email") send_plain_email_task.delay(email_data) - logger.debug("After Sending email") recurring_text = _(" This is a monthly recurring plan.") if gp_details['recurring_interval'] == "year": recurring_text = _(" This is an yearly recurring plan.") @@ -1586,7 +1536,6 @@ def do_provisioning(request, stripe_api_cus_id, card_details_response, ), 'reply_to': ['info@ungleich.ch'], } - logger.debug("Before Sending customer email") send_plain_email_task.delay(email_data) redirect_url = reverse('datacenterlight:index') logger.debug("Sent user/admin emails") @@ -1630,7 +1579,7 @@ def do_provisioning(request, stripe_api_cus_id, card_details_response, def get_error_response_dict(msg, request): - logger.debug("Init get_error_response_dict {}".format(msg)) + logger.error(msg) response = { 'status': False, 'redirect': "{url}#{section}".format( diff --git a/digitalglarus/views.py b/digitalglarus/views.py index bf3ed2c6..299327e6 100644 --- a/digitalglarus/views.py +++ b/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.send_email() - #messages.add_message(self.request, messages.SUCCESS, self.success_message) + form.save() + form.send_email() + messages.add_message(self.request, messages.SUCCESS, self.success_message) return super(ContactView, self).form_valid(form) diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 00000000..a8000ac5 --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,42 @@ +version: '3' + +services: + # Django app service + web: + build: + context: . + dockerfile: Dockerfile + container_name: dynamicweb + command: python manage.py runserver 0.0.0.0:8000 + volumes: + - .:/app + ports: + - "8000:8000" + depends_on: + - db + + # PostgreSQL database service + db: + image: postgres:13 + container_name: my_postgres_db + environment: + POSTGRES_USER: your_postgres_username + POSTGRES_PASSWORD: your_postgres_password + POSTGRES_DB: your_database_name + volumes: + - postgres_data:/var/lib/postgresql/data + + # Nginx service + nginx: + image: nginx:latest + container_name: my_nginx_server + volumes: + - ./nginx/default.conf:/etc/nginx/conf.d/default.conf + ports: + - "80:80" + depends_on: + - web + +volumes: + postgres_data: + diff --git a/dynamicweb/__init__.py b/dynamicweb/__init__.py index 1a6c551d..ab570876 100644 --- a/dynamicweb/__init__.py +++ b/dynamicweb/__init__.py @@ -1,5 +1,5 @@ # This will make sure the app is always imported when # Django starts so that shared_task will use this app. -from .celery import app as celery_app - -__all__ = ['celery_app'] +#from .celery import app as celery_app +# +#__all__ = ['celery_app'] diff --git a/dynamicweb/celery.py b/dynamicweb/pr_celery.py similarity index 100% rename from dynamicweb/celery.py rename to dynamicweb/pr_celery.py diff --git a/dynamicweb/settings/base.py b/dynamicweb/settings/base.py index b7705e17..5d5af9a3 100644 --- a/dynamicweb/settings/base.py +++ b/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)) @@ -116,7 +113,7 @@ INSTALLED_APPS = ( 'aldryn_common', 'aldryn_newsblog', 'aldryn_people', - 'aldryn_reversion', + #'aldryn_reversion', 'aldryn_translation_tools', 'treebeard', # utilities for implementing a tree 'sekizai', # for javascript and css management @@ -128,7 +125,6 @@ INSTALLED_APPS = ( 'djangocms_file', 'djangocms_picture', 'djangocms_video', - 'django_recaptcha', # 'djangocms_flash', # 'djangocms_googlemap', # 'djangocms_inherit', @@ -160,7 +156,7 @@ INSTALLED_APPS = ( 'webhook', ) -MIDDLEWARE_CLASSES = ( +MIDDLEWARE = ( 'django.contrib.sessions.middleware.SessionMiddleware', 'utils.middleware.MultipleProxyMiddleware', 'django.middleware.common.CommonMiddleware', @@ -243,8 +239,12 @@ CMS_TEMPLATES = ( DATABASES = { 'default': { - 'ENGINE': 'django.db.backends.postgresql_psycopg2', - 'NAME': 'app', + 'ENGINE': 'django.db.backends.postgresql', + 'NAME': 'your_database_name', + 'USER': 'your_postgres_username', + 'PASSWORD': 'your_postgres_password', + 'HOST': 'db', + 'PORT': '5432' } } @@ -777,9 +777,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 diff --git a/dynamicweb/settings/local.py b/dynamicweb/settings/local.py index 4ea3dc7e..9f38f87d 100644 --- a/dynamicweb/settings/local.py +++ b/dynamicweb/settings/local.py @@ -15,7 +15,7 @@ CACHES = { } } -MIDDLEWARE_CLASSES += ("debug_toolbar.middleware.DebugToolbarMiddleware",) +MIDDLEWARE += ("debug_toolbar.middleware.DebugToolbarMiddleware",) INSTALLED_APPS += ( 'django_extensions', diff --git a/entrypoint.sh b/entrypoint.sh old mode 100755 new mode 100644 index e207a457..f546bbea --- a/entrypoint.sh +++ b/entrypoint.sh @@ -1,19 +1,15 @@ #!/bin/sh -set -uex +# Wait for the database to be available +while ! nc -z db 5432; do + sleep 0.1 +done -cd /usr/src/app/ -cat > dynamicweb/settings/dynamic.py < 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))) diff --git a/hosting/management/commands/change_fi_vatrate_2024.py b/hosting/management/commands/change_fi_vatrate_2024.py deleted file mode 100644 index 6947b6eb..00000000 --- a/hosting/management/commands/change_fi_vatrate_2024.py +++ /dev/null @@ -1,143 +0,0 @@ -from django.core.management.base import BaseCommand -import datetime -import csv -import logging -import stripe -from hosting.models import VATRates, StripeTaxRate -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 = '''FI vat rate changes on 2024-09-01 from 24% to 25.5%. This commands makes the necessary changes''' - - def handle(self, *args, **options): - MAKE_MODIFS=False - try: - country_to_change = 'FI' - currency_to_change = 'EUR' - new_rate = 25.5 - 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(2024, 8, 31) - # vat_rate.save() - # print("Creating a new VATRate for FI") - # obj, created = VATRates.objects.get_or_create( - # start_date=datetime.date(2024, 9, 1), - # stop_date=None, - # territory_codes=country_to_change, - # currency_code=currency_to_change, - # rate=new_rate * 0.01, - # rate_type="standard", - # description="FINLAND 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) - fi_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() == 'fi': - fi_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 FI subscription that need VAT rate update" % len(fi_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 = "fi_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 fi_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 fi_sub in fi_subs: - fi_sub.default_tax_rates = [stripe_tax_rate.tax_rate_id] - fi_sub.save() - logger.debug("Default tax rate updated for %s" % fi_sub.id) - else: - print("Not making any modifications because MAKE_MODIFS=False") - - except Exception as e: - print(" *** Error occurred. Details {}".format(str(e))) diff --git a/hosting/migrations/0066_auto_20230727_0812.py b/hosting/migrations/0066_auto_20230727_0812.py deleted file mode 100644 index 795b1785..00000000 --- a/hosting/migrations/0066_auto_20230727_0812.py +++ /dev/null @@ -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), - ), - ] diff --git a/hosting/models.py b/hosting/models.py index 12edba65..48238afe 100644 --- a/hosting/models.py +++ b/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_vat = models.DecimalField(max_digits=10, decimal_places=4, default=0) + product_price = models.DecimalField(max_digits=6, decimal_places=2) + 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", @@ -699,116 +699,15 @@ class UserCardDetail(AssignPermissionsMixin, models.Model): @staticmethod def save_default_card_local(stripe_api_cus_id, card_id): - print("save_default_card_local {}, {}".format(stripe_api_cus_id, card_id)) stripe_cust = StripeCustomer.objects.get(stripe_id=stripe_api_cus_id) - print(" stripe_cust={}".format(stripe_cust)) - user_card_detail = UserCardDetail.get_ucd_from_stripe_cust_n_card_id( - stripe_cust, card_id + user_card_detail = UserCardDetail.objects.get( + stripe_customer=stripe_cust, card_id=card_id ) - print(" user_card_detail={}".format(user_card_detail.__dict__)) for card in stripe_cust.usercarddetail_set.all(): card.preferred = False card.save() user_card_detail.preferred = True user_card_detail.save() - print(" save_default_card_local DONE") - - @staticmethod - def get_ucd_from_card_id(card_id): - try: - user_card_details = UserCardDetail.objects.filter( - card_id=card_id - ).order_by('-id') - - if user_card_details.count() > 1: - # Log a warning about the duplicate entries - logger.warning( - "Multiple UserCardDetail objects found for card_id={}. " - "Found {} objects. Using the latest one.".format( - card_id, user_card_details.count() - ) - ) - # Use the first object found - user_card_detail = user_card_details.first() - elif user_card_details.count() == 1: - # Exactly one object found, proceed as intended - user_card_detail = user_card_details.first() - else: - # No object found for the given customer and card_id. - # Depending on expected behavior, you might want to raise an error or handle this case. - # If the original get() call happened here, it would raise DoesNotExist. - logger.error( - "No UserCardDetail found for card_id={}.".format(card_id) - ) - raise UserCardDetail.DoesNotExist("No UserCardDetail found for card {}".format(card_id)) - if user_card_details.count() > 1: - # Log a warning about the duplicate entries - logger.warning( - "Multiple UserCardDetail objects found for card_id={}. " - "Found {} objects. Using the first one.".format( - card_id, user_card_details.count() - ) - ) - # Use the first object found - user_card_detail = user_card_details.first() - elif user_card_details.count() == 1: - # Exactly one object found, proceed as intended - user_card_detail = user_card_details.first() - else: - # No object found for the given customer and card_id. - # Depending on expected behavior, you might want to raise an error or handle this case. - # If the original get() call happened here, it would raise DoesNotExist. - logger.error( - "No UserCardDetail found for card_id={}.".format(card_id) - ) - raise UserCardDetail.DoesNotExist("No UserCardDetail found for card {}".format(card_id)) - except Exception as e: - # Catch other potential exceptions during the filter/get process if necessary - logger.error("An unexpected error occurred while fetching UserCardDetail: {}".format(e)) - raise - return user_card_detail - - @staticmethod - def get_ucd_from_stripe_cust_n_card_id(stripe_cust, card_id): - try: - user_card_details = UserCardDetail.objects.filter( - stripe_customer=stripe_cust, card_id=card_id - ).order_by('-id') - - if user_card_details.count() > 1: - # Log a warning about the duplicate entries - logger.warning( - "Multiple UserCardDetail objects found for stripe_customer_id={} and card_id={}. " - "Found {} objects. Using the first one.".format( - stripe_cust.id, card_id, user_card_details.count() - ) - ) - # Use the first object found - user_card_detail = user_card_details.first() - elif user_card_details.count() == 1: - # Exactly one object found, proceed as intended - user_card_detail = user_card_details.first() - else: - # No object found for the given customer and card_id. - # Depending on expected behavior, you might want to raise an error or handle this case. - # If the original get() call happened here, it would raise DoesNotExist. - logger.error( - "No UserCardDetail found for stripe_customer_id={} and card_id={}.".format( - stripe_cust.id, card_id - ) - ) - raise UserCardDetail.DoesNotExist( - "No UserCardDetail found for customer {}, card {}".format( - stripe_cust.id, card_id - ) - ) - - except Exception as e: - # Catch other potential exceptions during the filter/get process if necessary - logger.error("An unexpected error occurred while fetching UserCardDetail: {}".format(e)) - raise - return user_card_detail - @staticmethod def get_user_card_details(stripe_customer, card_details): diff --git a/hosting/templates/hosting/virtual_machine_detail.html b/hosting/templates/hosting/virtual_machine_detail.html index 6b41af95..24b2c6ad 100644 --- a/hosting/templates/hosting/virtual_machine_detail.html +++ b/hosting/templates/hosting/virtual_machine_detail.html @@ -46,7 +46,7 @@
{% trans "Current Pricing" %}
{{order.price|floatformat:2|intcomma}} CHF/{% if order.generic_product %}{% trans order.generic_product.product_subscription_interval %}{% else %}{% trans "Month" %}{% endif %}
- {% if inv_url %}{% trans "See Invoice" %}{%else%}{% trans "No invoice as of now" %}{% endif %} + {% trans "See Invoice" %}
diff --git a/hosting/views.py b/hosting/views.py index c2470707..e2f6e13b 100644 --- a/hosting/views.py +++ b/hosting/views.py @@ -554,23 +554,14 @@ 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 + user = self.request.user stripe_customer = None if hasattr(user, 'stripecustomer'): stripe_customer = user.stripecustomer @@ -810,7 +801,7 @@ class PaymentVMView(LoginRequiredMixin, FormView): card_id = form.cleaned_data.get('card') customer = owner.stripecustomer try: - user_card_detail = UserCardDetail.get_ucd_from_card_id(card_id=card_id) + user_card_detail = UserCardDetail.objects.get(id=card_id) if not request.user.has_perm( 'view_usercarddetail', user_card_detail ): @@ -1014,7 +1005,7 @@ class OrdersHostingDetailView(LoginRequiredMixin, DetailView, FormView): context['cc_exp_month'] = card_details_response['exp_month'] else: card_id = self.request.session.get('card_id') - card_detail = UserCardDetail.get_ucd_from_card_id(card_id=card_id) + card_detail = UserCardDetail.objects.get(id=card_id) context['cc_last4'] = card_detail.last4 context['cc_brand'] = card_detail.brand context['cc_exp_year'] = card_detail.exp_year @@ -1128,7 +1119,7 @@ class OrdersHostingDetailView(LoginRequiredMixin, DetailView, FormView): return JsonResponse(response) else: card_id = request.session.get('card_id') - user_card_detail = UserCardDetail.get_ucd_from_card_id(card_id=card_id) + user_card_detail = UserCardDetail.objects.get(id=card_id) card_details_dict = { 'last4': user_card_detail.last4, 'brand': user_card_detail.brand, @@ -1339,7 +1330,7 @@ class InvoiceListView(LoginRequiredMixin, TemplateView): ).order_by('-created_at') stripe_chgs = [] for ho in hosting_orders: - stripe_chgs.append({ho: stripe.Charge.retrieve(ho.stripe_charge_id)}) + stripe_chgs.append({ho.id: stripe.Charge.retrieve(ho.stripe_charge_id)}) paginator_charges = Paginator(stripe_chgs, 10) try: @@ -1544,12 +1535,7 @@ class VirtualMachinesPlanListView(LoginRequiredMixin, ListView): ordering = '-id' def get_queryset(self): - 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 - owner = user + owner = self.request.user manager = OpenNebulaManager(email=owner.username, password=owner.password) try: @@ -1708,11 +1694,7 @@ 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 + owner = self.request.user vm = None manager = OpenNebulaManager( email=owner.username, @@ -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 = '' + inv_url = stripe_obj.data[0].hosted_invoice_url elif hosting_order.stripe_charge_id: stripe_obj = stripe.Charge.retrieve( hosting_order.stripe_charge_id diff --git a/requirements.txt b/requirements.txt index 73cdf987..7fdaf6f4 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,56 +1,57 @@ +setuptools<58.0.0 Babel==2.3.4 -Django==1.9.4 +Django==1.11.18 Django-Select2==4.3.2 -Pillow==3.2.0 +Pillow==9.5.0 URLObject==2.4.0 -Unidecode==0.04.19 +Unidecode==1.0.23 YURL==0.13 -aldryn-apphooks-config==0.2.7 -aldryn-boilerplates==0.7.4 -aldryn-categories==1.0.3 -aldryn-common==1.0.1 -aldryn-newsblog==1.2.1 -aldryn-people==1.2.0 -aldryn-reversion==1.0.8 +#aldryn-apphooks-config==0.2.7 +#aldryn-boilerplates==0.7.4 +aldryn-categories==1.2.0 +aldryn-common==1.0.5 +aldryn-newsblog==2.2.1 +aldryn-people==2.2.0 +#aldryn-reversion==1.0.8 aldryn-search==0.2.11 -aldryn-translation-tools==0.2.1 +aldryn-translation-tools==0.3.0 backport-collections==0.1 -cmsplugin-filer==1.0.1 +#cmsplugin-filer==1.1.3 django-appconf==1.0.2 -django-appdata==0.1.5 +django-appdata==0.2.1 django-bootstrap3==7.0.1 django-classy-tags==0.7.2 -django-cms==3.2.5 +django-cms==3.6.0 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==1.5.0 django-filter==0.13.0 -django-formtools==1.0 +django-formtools==2.1 django-guardian==1.4.4 django-haystack==2.4.1 django-meta==1.2 django-meta-mixin==0.3.0 django-model-utils==2.5 -django-mptt==0.8.4 -django-parler==1.6.3 +django-mptt==0.11 +django-parler==1.9.2 django-phonenumber-field==1.1.0 -django-polymorphic==0.9.2 +django-polymorphic==2.0.2 django-reversion==1.10.2 django-sekizai==0.9.0 -django-sortedm2m==1.2.2 +django-sortedm2m==3.1.1 django-spurl==0.6.4 django-standard-form==1.1.1 django-stored-messages==1.4.0 -django-taggit==0.18.3 +django-taggit==0.23.0 django-taggit-autosuggest==0.2.8 django-taggit-templatetags==0.2.5 django-templatetag-sugar==1.0 -django-treebeard==4.0.1 -djangocms-admin-style==1.1.1 +django-treebeard==4.3 +djangocms-admin-style>=1.2 djangocms-apphook-setup==0.1.2 -djangocms-blog==0.9.0 +djangocms-blog==0.8.13 djangocms-file==1.0 djangocms-flash==0.3.0 djangocms-googlemap==0.4.0 @@ -59,26 +60,25 @@ djangocms-link==1.7.2 djangocms-page-meta==0.5.11 djangocms-picture==1.0.0 djangocms-teaser==0.2.0 -djangocms-text-ckeditor==2.9.3 +djangocms-text-ckeditor==3.7.0 djangocms-video==1.0.0 -easy-thumbnails==2.3 -html5lib==0.9999999 +easy-thumbnails==2.4.1 +html5lib==0.999999999 ldap3==2.6.1 -lxml==3.6.0 +lxml model-mommy==1.2.6 -phonenumbers==7.4.0 -phonenumberslite==7.4.0 -psycopg2==2.7.3.2 -pycryptodome==3.6.6 -pylibmc==1.5.1 +phonenumbers==8.13.11 +psycopg2==2.8.4 +pycryptodome==3.8.0 +pylibmc==1.6.3 python-dateutil==2.5.3 -python-slugify==1.2.0 -pytz==2016.4 +python-slugify==1.2.6 +pytz>=2023.3 rcssmin==1.0.6 -requests==2.10.0 +requests>=2.20 rjsmin==1.0.12 six==1.10.0 -sqlparse==0.1.19 +sqlparse==0.4.4 stripe==2.41.0 wheel==0.29.0 django-admin-honeypot==1.0.0 @@ -87,16 +87,17 @@ git+https://github.com/ungleich/python-oca.git#egg=oca djangorestframework==3.6.3 flake8==3.3.0 python-memcached==1.58 -celery==4.0.2 +celery==4.4.7 redis==2.10.5 -django-celery-results==1.0.1 -kombu==4.1.0 +django-celery-results==1.0.2 +kombu>=4.6.10 mccabe==0.6.1 pycodestyle==2.3.1 pyflakes==1.5.0 -billiard==3.5.0.3 -amqp==2.2.1 -vine==1.1.4 +billiard==3.6.4.0 +amqp>=2.6.0 +vine==1.3.0 cdist==5.0.1 git+https://github.com/ungleich/djangocms-multisite.git#egg=djangocms_multisite pyotp +importlib_metadata<5 diff --git a/ungleich_page/views.py b/ungleich_page/views.py index 01d1138d..e5a99d8d 100644 --- a/ungleich_page/views.py +++ b/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.send_email() - #messages.add_message(self.request, messages.SUCCESS, self.success_message) + form.save() + form.send_email() + messages.add_message(self.request, messages.SUCCESS, self.success_message) return super(ContactView, self).form_valid(form) def get_context_data(self, **kwargs): diff --git a/utils/fields.py b/utils/fields.py index ca1115de..48a606cc 100644 --- a/utils/fields.py +++ b/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 -# 2023-12-29: Updated list of countries from https://en.wikipedia.org/wiki/List_of_ISO_3166_country_codes +# http://xml.coverpages.org/country3166.html 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')), - ('KR', _('South Korea')), + ('KP', _('Korea, Democratic People\'s Republic of')), + ('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')), - ('ME', _('Montenegro')), - ('MF', _('St. Martin')), + ('MD', _('Moldova, Republic of')), ('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', _('Russia')), + ('RU', _('Russian Federation')), ('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', _('Syria')), - ('SZ', _('Eswatini')), + ('SY', _('Syrian Arab Republic')), + ('SZ', _('Swaziland')), ('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')), - ('TZ', _('Tanzania')), + ('TW', _('Taiwan, Province of China')), + ('TZ', _('Tanzania, United Republic of')), ('UA', _('Ukraine')), ('UG', _('Uganda')), - ('UM', _('U.S. Outlying Islands')), - ('US', _('United States')), + ('UM', _('United States Minor Outlying Islands')), + ('US', _('United States of America')), ('UY', _('Uruguay')), ('UZ', _('Uzbekistan')), - ('VA', _('Vatican City')), - ('VC', _('St. Vincent & Grenadines')), + ('VA', _('Vatican City State (Holy See)')), + ('VC', _('St. Vincent & the Grenadines')), ('VE', _('Venezuela')), ('VG', _('British Virgin Islands')), - ('VI', _('U.S. Virgin Islands')), - ('VN', _('Vietnam')), + ('VI', _('United States Virgin Islands')), + ('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')), ) diff --git a/utils/forms.py b/utils/forms.py index 3cc57578..f35c90f4 100644 --- a/utils/forms.py +++ b/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( - # 'emails/contact.txt', {'data': self.cleaned_data}) - #html_content = render_to_string( - # 'emails/contact.html', {'data': self.cleaned_data}) - #email = EmailMultiAlternatives('Subject', text_content) - #email.attach_alternative(html_content, "text/html") - #email.to = [email_to] - #email.send() + text_content = render_to_string( + 'emails/contact.txt', {'data': self.cleaned_data}) + html_content = render_to_string( + 'emails/contact.html', {'data': self.cleaned_data}) + email = EmailMultiAlternatives('Subject', text_content) + email.attach_alternative(html_content, "text/html") + email.to = [email_to] + email.send() diff --git a/utils/tasks.py b/utils/tasks.py index 23deac51..2ae86916 100644 --- a/utils/tasks.py +++ b/utils/tasks.py @@ -8,7 +8,7 @@ from celery.utils.log import get_task_logger from django.conf import settings from django.core.mail import EmailMessage -from dynamicweb.celery import app +from dynamicweb.pr_celery import app logger = get_task_logger(__name__)