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..2d923e99 100644 --- a/.gitignore +++ b/.gitignore @@ -44,6 +44,3 @@ secret-key !.gitkeep *.orig .vscode/settings.json -2024-* -2025-* -2023-* diff --git a/Dockerfile b/Dockerfile index 4c1a9a66..50b81cbb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,4 @@ -# FROM python:3.10.0-alpine3.15 -FROM python:3.5-alpine3.12 +FROM python:3.10.0-alpine3.15 WORKDIR /usr/src/app @@ -8,25 +7,12 @@ RUN apk add --update --no-cache \ build-base \ openldap-dev \ python3-dev \ - postgresql-dev \ - jpeg-dev \ - libxml2-dev \ - libxslt-dev \ - libmemcached-dev \ - zlib-dev \ + libpq-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 ./ - -# 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" - +RUN pip install --no-cache-dir -r requirements.txt COPY ./ . -COPY entrypoint.sh / - -ENTRYPOINT ["/entrypoint.sh" ] 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/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..5c333a63 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__) @@ -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/dynamicweb/settings/base.py b/dynamicweb/settings/base.py index b7705e17..f03042dc 100644 --- a/dynamicweb/settings/base.py +++ b/dynamicweb/settings/base.py @@ -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/entrypoint.sh b/entrypoint.sh deleted file mode 100755 index e207a457..00000000 --- a/entrypoint.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/sh - -set -uex - -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() == '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/models.py b/hosting/models.py index 12edba65..b51d8616 100644 --- a/hosting/models.py +++ b/hosting/models.py @@ -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/static/hosting/js/payment.js b/hosting/static/hosting/js/payment.js index 3c4d67da..2cac9e82 100644 --- a/hosting/static/hosting/js/payment.js +++ b/hosting/static/hosting/js/payment.js @@ -186,6 +186,7 @@ $(document).ready(function () { $form_new.submit(payWithPaymentIntent); window.result = ""; window.card = ""; +/* function payWithPaymentIntent(e) { e.preventDefault(); @@ -212,6 +213,81 @@ $(document).ready(function () { }); window.card = cardNumberElement; } +*/ + + function payWithPaymentIntent(e) { + e.preventDefault(); + + function stripePMHandler(paymentMethod) { + // Insert the token ID into the form so it gets submitted to the server + console.log(paymentMethod); + $('#id_payment_method').val(paymentMethod.id); + submitBillingForm(paymentMethod.id); + } + + stripe.createPaymentMethod({ + type: 'card', + card: cardNumberElement, + }).then(function(result) { + if (result.error) { + var errorElement = document.getElementById('card-errors'); + errorElement.textContent = result.error.message; + } else { + console.log("created paymentMethod " + result.paymentMethod.id); + + // Check if 3D Secure authentication is required + if (result.paymentMethod.threeDSecure === 'required' || result.paymentMethod.threeDSecure === 'recommended') { + // 3D Secure authentication is recommended or required, handle it + display3DSecureModal(result.paymentMethod); + } else { + // No 3D Secure authentication required, proceed with handling the payment method + stripePMHandler(result.paymentMethod); + } + } + }); + window.card = cardNumberElement; + } + + function display3DSecureModal(paymentMethod) { + // Code to display a modal or redirect user for 3D Secure authentication + console.log('3D Secure authentication is required or recommended for payment method:', paymentMethod); + + } + + function display3DSecureModal(paymentMethod) { + var iframe = document.createElement('iframe'); + iframe.setAttribute('style', 'border: 0; width: 100%; height: 100%;'); + iframe.src = paymentMethod.threeDSecure.redirect.url; + document.body.appendChild(iframe); + + window.addEventListener('message', function(event) { + if (event.origin === 'https://hooks.stripe.com') { + var data = JSON.parse(event.data); + if (data.type === 'stripe-3ds-complete') { + if (data.payload.error) { + // Handle 3D Secure authentication failure + console.error('3D Secure authentication failed:', data.payload.error); + handle3DSecureFailure(data.payload.error); // Call a function to handle the failure + } else { + var paymentMethodId = data.payload.paymentMethod.id; + stripePMHandler({ id: paymentMethodId }); + } + document.body.removeChild(iframe); + } + } + }); + } + + function handle3DSecureFailure(error) { + // Handle 3D Secure authentication failure based on the error received + // For example, display an error message to the user or take appropriate action + console.error('3D Secure authentication failed:', error.message); + + // Display an error message to the user + var errorMessageElement = document.getElementById('3ds-error-message'); + errorMessageElement.textContent = '3D Secure authentication failed: ' + error.message; + } + function payWithStripe_new(e) { e.preventDefault(); diff --git a/hosting/templates/hosting/includes/_card_input.html b/hosting/templates/hosting/includes/_card_input.html index 8cf2d55b..4e61a367 100644 --- a/hosting/templates/hosting/includes/_card_input.html +++ b/hosting/templates/hosting/includes/_card_input.html @@ -40,6 +40,9 @@ {% endif %} {% endfor %} +
+

+
@@ -47,4 +50,4 @@

- \ No newline at end of file + diff --git a/hosting/views.py b/hosting/views.py index c2470707..6b93fdb4 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: diff --git a/requirements.txt b/requirements.txt index 73cdf987..8d04a189 100644 --- a/requirements.txt +++ b/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 diff --git a/utils/stripe_utils.py b/utils/stripe_utils.py index 875a174e..5edb15bd 100644 --- a/utils/stripe_utils.py +++ b/utils/stripe_utils.py @@ -365,7 +365,15 @@ class StripeUtils(object): coupon=coupon, default_tax_rates=tax_rates, payment_behavior='allow_incomplete', - default_payment_method=default_payment_method + default_payment_method=default_payment_method, + # Enable 3DS2 + payment_settings={ + 'payment_method_options': { + 'card': { + 'request_three_d_secure': 'any' + } + } + } ) logger.debug("Done subscribing") return subscription_result