From c3e574ab7d495ad723a9e23ea6b6e1450a6981ff Mon Sep 17 00:00:00 2001 From: PCoder Date: Wed, 15 Nov 2023 16:40:46 +0530 Subject: [PATCH 01/38] Enable 3ds for subscription create --- utils/stripe_utils.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) 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 From a47087c551759298da362bd3dc46e36ac599d4bb Mon Sep 17 00:00:00 2001 From: PCoder Date: Wed, 15 Nov 2023 18:18:21 +0530 Subject: [PATCH 02/38] Attempt 3ds on payment intents --- hosting/static/hosting/js/payment.js | 76 +++++++++++++++++++ .../hosting/includes/_card_input.html | 5 +- 2 files changed, 80 insertions(+), 1 deletion(-) 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 + From 96af882e6ddf3160c77d719d14ec062a6cec4c7e Mon Sep 17 00:00:00 2001 From: PCoder Date: Fri, 9 Feb 2024 21:03:17 +0530 Subject: [PATCH 03/38] Fix mistake is obtaining the correct hosting order id --- hosting/templates/hosting/invoices.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosting/templates/hosting/invoices.html b/hosting/templates/hosting/invoices.html index 347b1ff4..69ed4577 100644 --- a/hosting/templates/hosting/invoices.html +++ b/hosting/templates/hosting/invoices.html @@ -87,7 +87,7 @@ {% for ho, stripe_charge_data in invs_charge %} - {{ ho.id | get_line_item_from_hosting_order_charge }} + {{ ho | get_line_item_from_hosting_order_charge }} {% endfor %} From 7afa9d2f4c10115cfce7b07b5a095ccaf9f52c0d Mon Sep 17 00:00:00 2001 From: "app@dynamicweb-production" Date: Fri, 9 Feb 2024 16:37:34 +0100 Subject: [PATCH 04/38] Show settings view for admin --- hosting/views.py | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/hosting/views.py b/hosting/views.py index 6b93fdb4..3ac8c023 100644 --- a/hosting/views.py +++ b/hosting/views.py @@ -554,14 +554,23 @@ 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=self.request.user.billing_addresses.first(), + instance=user.billing_addresses.first(), **self.get_form_kwargs()) def get_context_data(self, **kwargs): context = super(SettingsView, self).get_context_data(**kwargs) # Get user - user = self.request.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'): stripe_customer = user.stripecustomer From 41461538a3c8480fb5650026ef3ce1fbead0f637 Mon Sep 17 00:00:00 2001 From: "app@dynamicweb-production" Date: Fri, 9 Feb 2024 16:38:10 +0100 Subject: [PATCH 05/38] Changes on prod --- .../commands/change_ch_vatrate_2023.py | 38 +++++++++---------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/hosting/management/commands/change_ch_vatrate_2023.py b/hosting/management/commands/change_ch_vatrate_2023.py index 46ca2312..612b246e 100644 --- a/hosting/management/commands/change_ch_vatrate_2023.py +++ b/hosting/management/commands/change_ch_vatrate_2023.py @@ -29,25 +29,25 @@ class Command(BaseCommand): 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)) - + # 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 = [] From 10d2c25556ca6138107267a063cdf1ee17994cef Mon Sep 17 00:00:00 2001 From: PCoder Date: Fri, 16 Feb 2024 16:23:02 +0530 Subject: [PATCH 06/38] Get product name from id it starts with generic otherwise use as is --- datacenterlight/templatetags/custom_tags.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/datacenterlight/templatetags/custom_tags.py b/datacenterlight/templatetags/custom_tags.py index 120cabbf..5d0c01b3 100644 --- a/datacenterlight/templatetags/custom_tags.py +++ b/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)), + mark_safe(get_product_name(plan_name)) if plan_name.startswith("generic-") else 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'))), From 6a374f7fa0010ef62def8bbed09151b6b69ad60b Mon Sep 17 00:00:00 2001 From: PCoder Date: Fri, 16 Feb 2024 16:23:19 +0530 Subject: [PATCH 07/38] Rearrange --- datacenterlight/templatetags/custom_tags.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/datacenterlight/templatetags/custom_tags.py b/datacenterlight/templatetags/custom_tags.py index 5d0c01b3..4fcf05a2 100644 --- a/datacenterlight/templatetags/custom_tags.py +++ b/datacenterlight/templatetags/custom_tags.py @@ -160,8 +160,7 @@ 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 From fdb790bac72473a39a33c4755a413d557169e3d8 Mon Sep 17 00:00:00 2001 From: PCoder Date: Fri, 16 Feb 2024 16:24:37 +0530 Subject: [PATCH 08/38] Use the actual plan name instead of the generic plan id --- datacenterlight/views.py | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/datacenterlight/views.py b/datacenterlight/views.py index 5c333a63..941f6fae 100644 --- a/datacenterlight/views.py +++ b/datacenterlight/views.py @@ -42,6 +42,8 @@ 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__) @@ -900,15 +902,21 @@ class OrderConfirmationView(DetailView, FormView): 2 ) ) - plan_name = "generic-{0}-{1:.2f}".format( + stripe_plan_id = "generic-{0}-{1:.2f}".format( request.session['generic_payment_details']['product_id'], amount_to_be_charged ) - stripe_plan_id = plan_name + try: + 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": - plan_name = "{}-yearly".format(plan_name) - stripe_plan_id = plan_name + 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)) else: template = request.session.get('template') specs = request.session.get('specs') From 169dc6b1ee536fea1475828f753260d4dc6eb439 Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Sat, 17 Feb 2024 18:27:44 +0900 Subject: [PATCH 09/38] Add initial script for image building --- build-image.sh | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100755 build-image.sh diff --git a/build-image.sh b/build-image.sh new file mode 100755 index 00000000..acfb789a --- /dev/null +++ b/build-image.sh @@ -0,0 +1,14 @@ +#!/bin/sh + +if [ $# -lt 1 ]; then + echo "$0 imageversion [push]" + 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} + +docker build -t "${tag}" . From bd4d81c286d833d97a15750d3145c53344133eb0 Mon Sep 17 00:00:00 2001 From: "app@dynamicweb-production" Date: Sat, 17 Feb 2024 11:20:12 +0100 Subject: [PATCH 10/38] Show virtual machine plan page for admin --- hosting/views.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/hosting/views.py b/hosting/views.py index 3ac8c023..ce59b0d9 100644 --- a/hosting/views.py +++ b/hosting/views.py @@ -1544,7 +1544,12 @@ class VirtualMachinesPlanListView(LoginRequiredMixin, ListView): ordering = '-id' def get_queryset(self): - owner = self.request.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 + owner = user manager = OpenNebulaManager(email=owner.username, password=owner.password) try: From 4eb470df1632ff055eac6b2a5f1f02b4df618d2e Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Sat, 17 Feb 2024 20:48:17 +0900 Subject: [PATCH 11/38] [docker] switch to python 3.5 --- Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 50b81cbb..d12c54ff 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,5 @@ -FROM python:3.10.0-alpine3.15 +# FROM python:3.10.0-alpine3.15 +FROM python:3.5-alpine3.12 WORKDIR /usr/src/app From 0d7f10776c3c0ec0b4b1aaa82a07bddf45169071 Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Sat, 17 Feb 2024 20:49:31 +0900 Subject: [PATCH 12/38] [docker] push if build is ok --- build-image.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/build-image.sh b/build-image.sh index acfb789a..0ac898ed 100755 --- a/build-image.sh +++ b/build-image.sh @@ -2,6 +2,7 @@ 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 @@ -11,4 +12,7 @@ version=$1; shift tag=${tagprefix}:${version} +set -ex + docker build -t "${tag}" . +docker push "${tag}" From f178be8395a95e5023756e2824efbadac2b44216 Mon Sep 17 00:00:00 2001 From: PCoder Date: Mon, 19 Feb 2024 20:42:34 +0530 Subject: [PATCH 13/38] Update .dockerignore: ignore .env --- .dockerignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.dockerignore b/.dockerignore index 6b8710a7..a715c9d7 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1 +1,2 @@ .git +.env From 893c8168469382426d59b93606baf2e1e6dc4520 Mon Sep 17 00:00:00 2001 From: PCoder Date: Mon, 19 Feb 2024 20:43:33 +0530 Subject: [PATCH 14/38] Add apks required for the build on alpine 3.12 --- Dockerfile | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index d12c54ff..bee11218 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,7 +8,12 @@ RUN apk add --update --no-cache \ build-base \ openldap-dev \ python3-dev \ - libpq-dev \ + postgresql-dev \ + jpeg-dev \ + libxml2-dev \ + libxslt-dev \ + libmemcached-dev \ + zlib-dev \ && rm -rf /var/cache/apk/* # FIX https://github.com/python-ldap/python-ldap/issues/432 From b6ff2b62c1da90a8a4c5bfebe10f6edb573d57fa Mon Sep 17 00:00:00 2001 From: PCoder Date: Mon, 19 Feb 2024 20:44:17 +0530 Subject: [PATCH 15/38] Add comment for alpine 3.14 requirement --- Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Dockerfile b/Dockerfile index bee11218..7b5440af 100644 --- a/Dockerfile +++ b/Dockerfile @@ -16,6 +16,8 @@ RUN apk add --update --no-cache \ 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 From 8d13629c8b775c63cc8dd8fda7412c36fd09aefa Mon Sep 17 00:00:00 2001 From: PCoder Date: Mon, 19 Feb 2024 20:49:29 +0530 Subject: [PATCH 16/38] Use proper library path for Pillow --- Dockerfile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 7b5440af..395ebcc9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -22,5 +22,8 @@ RUN apk add --update --no-cache \ 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 ./ . From 9e98125b13e400d0c083589b252527872fa58a56 Mon Sep 17 00:00:00 2001 From: PCoder Date: Mon, 19 Feb 2024 20:50:10 +0530 Subject: [PATCH 17/38] Use the same django-filer version being used on production --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 8d04a189..73cdf987 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==2.1.2 +django-filer==1.2.0 django-filter==0.13.0 django-formtools==1.0 django-guardian==1.4.4 From 26f3a1881decdcc98c0ae9add4a627af0833a4b7 Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Tue, 20 Feb 2024 16:25:13 +0900 Subject: [PATCH 18/38] make build image only push if push is specified --- build-image.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/build-image.sh b/build-image.sh index 0ac898ed..64a67fd6 100755 --- a/build-image.sh +++ b/build-image.sh @@ -15,4 +15,9 @@ tag=${tagprefix}:${version} set -ex docker build -t "${tag}" . -docker push "${tag}" + +push=$1; shift + +if [ "$push" ]; then + docker push "${tag}" +fi From 8b06c2c6e9b599ce887f8e26f451878511ba3557 Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Tue, 20 Feb 2024 17:18:29 +0900 Subject: [PATCH 19/38] docker: add entrypoint and add support for dynamic config --- Dockerfile | 3 +++ dynamicweb/settings/base.py | 6 ++++++ entrypoint.sh | 19 +++++++++++++++++++ 3 files changed, 28 insertions(+) create mode 100644 entrypoint.sh diff --git a/Dockerfile b/Dockerfile index 395ebcc9..4c1a9a66 100644 --- a/Dockerfile +++ b/Dockerfile @@ -27,3 +27,6 @@ COPY requirements.txt ./ RUN LIBRARY_PATH=/lib:/usr/lib /bin/sh -c "pip install --no-cache-dir -r requirements.txt" COPY ./ . +COPY entrypoint.sh / + +ENTRYPOINT ["/entrypoint.sh" ] diff --git a/dynamicweb/settings/base.py b/dynamicweb/settings/base.py index f03042dc..b7705e17 100644 --- a/dynamicweb/settings/base.py +++ b/dynamicweb/settings/base.py @@ -777,3 +777,9 @@ 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 new file mode 100644 index 00000000..e207a457 --- /dev/null +++ b/entrypoint.sh @@ -0,0 +1,19 @@ +#!/bin/sh + +set -uex + +cd /usr/src/app/ +cat > dynamicweb/settings/dynamic.py < Date: Tue, 20 Feb 2024 17:19:05 +0900 Subject: [PATCH 20/38] entrypoint: make executable --- entrypoint.sh | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 entrypoint.sh diff --git a/entrypoint.sh b/entrypoint.sh old mode 100644 new mode 100755 From c4f6780a0e0c4ac91b6636e2725dc0b581a6c361 Mon Sep 17 00:00:00 2001 From: PCoder Date: Fri, 22 Mar 2024 16:54:54 +0530 Subject: [PATCH 21/38] Add management command fix_generic_stripe_plan_product_names.py --- .../fix_generic_stripe_plan_product_names.py | 54 +++++++++++++++++++ 1 file changed, 54 insertions(+) create mode 100644 datacenterlight/management/commands/fix_generic_stripe_plan_product_names.py diff --git a/datacenterlight/management/commands/fix_generic_stripe_plan_product_names.py b/datacenterlight/management/commands/fix_generic_stripe_plan_product_names.py new file mode 100644 index 00000000..2773009d --- /dev/null +++ b/datacenterlight/management/commands/fix_generic_stripe_plan_product_names.py @@ -0,0 +1,54 @@ +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 From 92cfe71bbe0012b4fcab5a37c26b1f000e60641e Mon Sep 17 00:00:00 2001 From: "app@dynamicweb-production" Date: Wed, 8 May 2024 09:57:56 +0200 Subject: [PATCH 22/38] Fix invoices list not showing one time charges --- hosting/templates/hosting/invoices.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosting/templates/hosting/invoices.html b/hosting/templates/hosting/invoices.html index 69ed4577..347b1ff4 100644 --- a/hosting/templates/hosting/invoices.html +++ b/hosting/templates/hosting/invoices.html @@ -87,7 +87,7 @@ {% for ho, stripe_charge_data in invs_charge %} - {{ ho | get_line_item_from_hosting_order_charge }} + {{ ho.id | get_line_item_from_hosting_order_charge }} {% endfor %} From 4f8bd3b45fda38ef5391ddb6a37424f02259ffa5 Mon Sep 17 00:00:00 2001 From: "app@dynamicweb-production" Date: Thu, 20 Jun 2024 13:58:19 +0200 Subject: [PATCH 23/38] Fix stripe_chgs object; make it consistent --- hosting/views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosting/views.py b/hosting/views.py index ce59b0d9..637a112b 100644 --- a/hosting/views.py +++ b/hosting/views.py @@ -1339,7 +1339,7 @@ class InvoiceListView(LoginRequiredMixin, TemplateView): ).order_by('-created_at') stripe_chgs = [] for ho in hosting_orders: - stripe_chgs.append({ho.id: stripe.Charge.retrieve(ho.stripe_charge_id)}) + stripe_chgs.append({ho: stripe.Charge.retrieve(ho.stripe_charge_id)}) paginator_charges = Paginator(stripe_chgs, 10) try: From 3736f522ddee781c086d0f2bc9f22b470fe78e4a Mon Sep 17 00:00:00 2001 From: "app@dynamicweb-production" Date: Thu, 20 Jun 2024 14:00:50 +0200 Subject: [PATCH 24/38] Debug messages --- datacenterlight/templatetags/custom_tags.py | 1 + datacenterlight/views.py | 12 +++++++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/datacenterlight/templatetags/custom_tags.py b/datacenterlight/templatetags/custom_tags.py index 4fcf05a2..fc39eec7 100644 --- a/datacenterlight/templatetags/custom_tags.py +++ b/datacenterlight/templatetags/custom_tags.py @@ -73,6 +73,7 @@ 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(""" diff --git a/datacenterlight/views.py b/datacenterlight/views.py index 941f6fae..1c770b3a 100644 --- a/datacenterlight/views.py +++ b/datacenterlight/views.py @@ -910,7 +910,7 @@ class OrderConfirmationView(DetailView, FormView): 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)) + logger.debug("Errori {}" % str(ex)) plan_name = get_product_name(stripe_plan_id) recurring_interval = request.session['generic_payment_details']['recurring_interval'] if recurring_interval == "year": @@ -1009,6 +1009,8 @@ 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': @@ -1222,6 +1224,7 @@ def set_user_card(card_id, stripe_api_cus_id, custom_user, 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 @@ -1231,6 +1234,7 @@ def set_user_card(card_id, stripe_api_cus_id, custom_user, 'brand': ucd.brand, 'card_id': ucd.card_id } + logger.debug("card_detail_dict = %s" % card_details_dict) return card_details_dict @@ -1435,6 +1439,7 @@ 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({ @@ -1457,6 +1462,7 @@ 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'], @@ -1464,6 +1470,7 @@ 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, @@ -1520,7 +1527,9 @@ 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.") @@ -1544,6 +1553,7 @@ 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") From 94a9ac31473d470840f08bc837c2ed086bfbe636 Mon Sep 17 00:00:00 2001 From: "app@dynamicweb-production" Date: Thu, 26 Sep 2024 11:13:56 +0200 Subject: [PATCH 25/38] Add change_fi_vatrate_2024.py management command --- .../commands/change_fi_vatrate_2024.py | 143 ++++++++++++++++++ 1 file changed, 143 insertions(+) create mode 100644 hosting/management/commands/change_fi_vatrate_2024.py diff --git a/hosting/management/commands/change_fi_vatrate_2024.py b/hosting/management/commands/change_fi_vatrate_2024.py new file mode 100644 index 00000000..6947b6eb --- /dev/null +++ b/hosting/management/commands/change_fi_vatrate_2024.py @@ -0,0 +1,143 @@ +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))) From 86836f3d1eadf2988a491258a966678b7ef5e2d4 Mon Sep 17 00:00:00 2001 From: PCoder Date: Thu, 27 Mar 2025 15:39:24 +0530 Subject: [PATCH 26/38] Check those VMs that are displayed to the public --- datacenterlight/management/commands/check_vm_templates.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/datacenterlight/management/commands/check_vm_templates.py b/datacenterlight/management/commands/check_vm_templates.py index db36fde8..c550cd5d 100644 --- a/datacenterlight/management/commands/check_vm_templates.py +++ b/datacenterlight/management/commands/check_vm_templates.py @@ -1,6 +1,7 @@ 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 django.conf import settings @@ -31,7 +32,11 @@ 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) - for vm_template in VMTemplate.objects.all(): + 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' % vm_template.name vm_id = manager.create_vm( template_id=vm_template.opennebula_vm_template_id, From 8e9315b12de1670837722e2e5163f679381b26a8 Mon Sep 17 00:00:00 2001 From: PCoder Date: Thu, 27 Mar 2025 16:13:22 +0530 Subject: [PATCH 27/38] Fix separate messages for errors and inform admin about errors --- .../management/commands/check_vm_templates.py | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/datacenterlight/management/commands/check_vm_templates.py b/datacenterlight/management/commands/check_vm_templates.py index c550cd5d..365ca1f6 100644 --- a/datacenterlight/management/commands/check_vm_templates.py +++ b/datacenterlight/management/commands/check_vm_templates.py @@ -3,7 +3,7 @@ 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,6 +22,7 @@ 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: @@ -37,7 +38,7 @@ class Command(BaseCommand): 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' % vm_template.name + vm_name = 'test-%s-%s' % (vm_template.vm_type, vm_template.name) vm_id = manager.create_vm( template_id=vm_template.opennebula_vm_template_id, specs=specs, @@ -57,6 +58,7 @@ 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( @@ -67,4 +69,11 @@ class Command(BaseCommand): 'w', encoding='utf-8') as f: f.write(json.dumps(result_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")) From ca099d8c83a5d92651a22855b88b9ca84f6b9004 Mon Sep 17 00:00:00 2001 From: PCoder Date: Thu, 27 Mar 2025 16:21:33 +0530 Subject: [PATCH 28/38] Send error message only if there is an error --- .../management/commands/check_vm_templates.py | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/datacenterlight/management/commands/check_vm_templates.py b/datacenterlight/management/commands/check_vm_templates.py index 365ca1f6..d30e5b0d 100644 --- a/datacenterlight/management/commands/check_vm_templates.py +++ b/datacenterlight/management/commands/check_vm_templates.py @@ -69,11 +69,12 @@ class Command(BaseCommand): 'w', encoding='utf-8') as f: f.write(json.dumps(result_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) + 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")) From fc1dc37840619cf5999aa00ab9582f0c067b4aa2 Mon Sep 17 00:00:00 2001 From: PCoder Date: Sat, 29 Mar 2025 12:55:17 +0530 Subject: [PATCH 29/38] Update .gitignore --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index 2d923e99..a41d813d 100644 --- a/.gitignore +++ b/.gitignore @@ -44,3 +44,6 @@ secret-key !.gitkeep *.orig .vscode/settings.json +2024-* +2025-* +2023-* From 60ddfa78b066849630857e7595fd121a93079810 Mon Sep 17 00:00:00 2001 From: PCoder Date: Fri, 16 May 2025 16:05:50 +0530 Subject: [PATCH 30/38] Handle getting the correct user_card_detail Fixes Traceback (most recent call last): File "", line 2, in File "/home/app/pyvenv/lib/python3.5/site-packages/django/db/models/manager.py", line 122, in manager_method return getattr(self.get_queryset(), name)(*args, **kwargs) File "/home/app/pyvenv/lib/python3.5/site-packages/django/db/models/query.py", line 391, in get (self.model._meta.object_name, num) hosting.models.MultipleObjectsReturned: get() returned more than one UserCardDetail -- it returned 2! --- datacenterlight/views.py | 6 +-- hosting/models.py | 88 +++++++++++++++++++++++++++++++++++++++- hosting/views.py | 6 +-- 3 files changed, 93 insertions(+), 7 deletions(-) diff --git a/datacenterlight/views.py b/datacenterlight/views.py index 1c770b3a..709d1c44 100644 --- a/datacenterlight/views.py +++ b/datacenterlight/views.py @@ -613,7 +613,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.objects.get(id=card_id) + card_detail = UserCardDetail.get_ucd_from_card_id(card_id=card_id) context['cc_last4'] = card_detail.last4 context['cc_brand'] = card_detail.brand context['cc_exp_year'] = card_detail.exp_year @@ -852,7 +852,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.objects.get(id=card_id) + user_card_detail = UserCardDetail.get_ucd_from_card_id(card_id=card_id) card_details_dict = { 'last4': user_card_detail.last4, 'brand': user_card_detail.brand, @@ -1206,7 +1206,7 @@ def set_user_card(card_id, stripe_api_cus_id, custom_user, card_details_response): if card_id: logger.debug("card_id %s was in request" % card_id) - user_card_detail = UserCardDetail.objects.get(id=card_id) + user_card_detail = UserCardDetail.get_ucd_from_card_id(card_id=card_id) card_details_dict = { 'last4': user_card_detail.last4, 'brand': user_card_detail.brand, diff --git a/hosting/models.py b/hosting/models.py index b51d8616..5cc3d0fd 100644 --- a/hosting/models.py +++ b/hosting/models.py @@ -700,7 +700,7 @@ class UserCardDetail(AssignPermissionsMixin, models.Model): @staticmethod def save_default_card_local(stripe_api_cus_id, card_id): stripe_cust = StripeCustomer.objects.get(stripe_id=stripe_api_cus_id) - user_card_detail = UserCardDetail.objects.get( + user_card_detail = UserCardDetail.get_ucd_from_stripe_cust_n_card_id( stripe_customer=stripe_cust, card_id=card_id ) for card in stripe_cust.usercarddetail_set.all(): @@ -709,6 +709,92 @@ class UserCardDetail(AssignPermissionsMixin, models.Model): user_card_detail.preferred = True user_card_detail.save() + @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( + f"Multiple UserCardDetail objects found for card_id={card_id}. " + f"Found {user_card_details.count()} objects. Using the latest one." + ) + # 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( + f"No UserCardDetail found for card_id={card_id}." + ) + raise UserCardDetail.DoesNotExist(f"No UserCardDetail found for card {card_id}") + if user_card_details.count() > 1: + # Log a warning about the duplicate entries + logger.warning( + f"Multiple UserCardDetail objects found for card_id={card_id}. " + f"Found {user_card_details.count()} objects. Using the first one." + ) + # 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( + f"No UserCardDetail found for card_id={card_id}." + ) + raise UserCardDetail.DoesNotExist(f"No UserCardDetail found for card {card_id}") + except Exception as e: + # Catch other potential exceptions during the filter/get process if necessary + logger.error(f"An unexpected error occurred while fetching UserCardDetail: {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( + f"Multiple UserCardDetail objects found for stripe_customer_id={stripe_cust.id} and card_id={card_id}. " + f"Found {user_card_details.count()} objects. Using the first one." + ) + # 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( + f"No UserCardDetail found for stripe_customer_id={stripe_cust.id} and card_id={card_id}." + ) + raise UserCardDetail.DoesNotExist(f"No UserCardDetail found for customer {stripe_cust.id}, card {card_id}") + + except Exception as e: + # Catch other potential exceptions during the filter/get process if necessary + logger.error(f"An unexpected error occurred while fetching UserCardDetail: {e}") + raise + return user_card_detail + + @staticmethod def get_user_card_details(stripe_customer, card_details): """ diff --git a/hosting/views.py b/hosting/views.py index 637a112b..c2470707 100644 --- a/hosting/views.py +++ b/hosting/views.py @@ -810,7 +810,7 @@ class PaymentVMView(LoginRequiredMixin, FormView): card_id = form.cleaned_data.get('card') customer = owner.stripecustomer try: - user_card_detail = UserCardDetail.objects.get(id=card_id) + user_card_detail = UserCardDetail.get_ucd_from_card_id(card_id=card_id) if not request.user.has_perm( 'view_usercarddetail', user_card_detail ): @@ -1014,7 +1014,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.objects.get(id=card_id) + card_detail = UserCardDetail.get_ucd_from_card_id(card_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 +1128,7 @@ class OrdersHostingDetailView(LoginRequiredMixin, DetailView, FormView): return JsonResponse(response) else: card_id = request.session.get('card_id') - user_card_detail = UserCardDetail.objects.get(id=card_id) + user_card_detail = UserCardDetail.get_ucd_from_card_id(card_id=card_id) card_details_dict = { 'last4': user_card_detail.last4, 'brand': user_card_detail.brand, From b6239159b2765594534a2568406848ce7ac53c67 Mon Sep 17 00:00:00 2001 From: PCoder Date: Wed, 21 May 2025 11:17:15 +0530 Subject: [PATCH 31/38] Remove f-strings to make things compatible --- hosting/models.py | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/hosting/models.py b/hosting/models.py index 5cc3d0fd..f9bdc751 100644 --- a/hosting/models.py +++ b/hosting/models.py @@ -719,8 +719,10 @@ class UserCardDetail(AssignPermissionsMixin, models.Model): if user_card_details.count() > 1: # Log a warning about the duplicate entries logger.warning( - f"Multiple UserCardDetail objects found for card_id={card_id}. " - f"Found {user_card_details.count()} objects. Using the latest one." + "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() @@ -732,14 +734,16 @@ class UserCardDetail(AssignPermissionsMixin, models.Model): # 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( - f"No UserCardDetail found for card_id={card_id}." + "No UserCardDetail found for card_id={}.".format(card_id) ) - raise UserCardDetail.DoesNotExist(f"No UserCardDetail found for card {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( - f"Multiple UserCardDetail objects found for card_id={card_id}. " - f"Found {user_card_details.count()} objects. Using the first one." + "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() @@ -751,16 +755,15 @@ class UserCardDetail(AssignPermissionsMixin, models.Model): # 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( - f"No UserCardDetail found for card_id={card_id}." + "No UserCardDetail found for card_id={}.".format(card_id) ) - raise UserCardDetail.DoesNotExist(f"No UserCardDetail found for card {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(f"An unexpected error occurred while fetching UserCardDetail: {e}") + 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: From 8ffa2d9c3c597fc7da02e13d3bc05c456bfd4066 Mon Sep 17 00:00:00 2001 From: PCoder Date: Wed, 21 May 2025 11:27:22 +0530 Subject: [PATCH 32/38] Replace more f-strings --- hosting/models.py | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/hosting/models.py b/hosting/models.py index f9bdc751..4c039fef 100644 --- a/hosting/models.py +++ b/hosting/models.py @@ -774,8 +774,10 @@ class UserCardDetail(AssignPermissionsMixin, models.Model): if user_card_details.count() > 1: # Log a warning about the duplicate entries logger.warning( - f"Multiple UserCardDetail objects found for stripe_customer_id={stripe_cust.id} and card_id={card_id}. " - f"Found {user_card_details.count()} objects. Using the first one." + "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() @@ -787,13 +789,19 @@ class UserCardDetail(AssignPermissionsMixin, models.Model): # 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( - f"No UserCardDetail found for stripe_customer_id={stripe_cust.id} and card_id={card_id}." + "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 + ) ) - raise UserCardDetail.DoesNotExist(f"No UserCardDetail found for customer {stripe_cust.id}, card {card_id}") except Exception as e: # Catch other potential exceptions during the filter/get process if necessary - logger.error(f"An unexpected error occurred while fetching UserCardDetail: {e}") + logger.error("An unexpected error occurred while fetching UserCardDetail: {}".format(e)) raise return user_card_detail From 2ec89b615734c2ef8af68c57ab7cf320be5c21f4 Mon Sep 17 00:00:00 2001 From: PCoder Date: Wed, 21 May 2025 15:23:13 +0530 Subject: [PATCH 33/38] Print provisioning parameters --- datacenterlight/views.py | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/datacenterlight/views.py b/datacenterlight/views.py index 709d1c44..9a4bdd51 100644 --- a/datacenterlight/views.py +++ b/datacenterlight/views.py @@ -1428,6 +1428,30 @@ 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 From 4c0a1fd07f768318899265d0627deba321017009 Mon Sep 17 00:00:00 2001 From: PCoder Date: Tue, 27 May 2025 10:08:09 +0530 Subject: [PATCH 34/38] Debug --- datacenterlight/views.py | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/datacenterlight/views.py b/datacenterlight/views.py index 9a4bdd51..9ce2efd9 100644 --- a/datacenterlight/views.py +++ b/datacenterlight/views.py @@ -201,6 +201,12 @@ class IndexView(CreateView): ssd_size=storage, pricing_name=vm_pricing_name ) + if request.user.id == 51: + print("User is test") + price = 0 + vat = 0 + vat_percent = 0 + discount = 0 specs = { 'cpu': cores, 'memory': memory, @@ -588,6 +594,9 @@ 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) @@ -1621,7 +1630,7 @@ def do_provisioning(request, stripe_api_cus_id, card_details_response, def get_error_response_dict(msg, request): - logger.error(msg) + logger.debug("Init get_error_response_dict {}".format(msg)) response = { 'status': False, 'redirect': "{url}#{section}".format( From 4e978f62eaa2f3c90520a4f8b16a4b7ae9d37834 Mon Sep 17 00:00:00 2001 From: PCoder Date: Tue, 27 May 2025 10:47:06 +0530 Subject: [PATCH 35/38] More debug --- datacenterlight/views.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/datacenterlight/views.py b/datacenterlight/views.py index 9ce2efd9..1e486242 100644 --- a/datacenterlight/views.py +++ b/datacenterlight/views.py @@ -656,6 +656,12 @@ 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") + price = 0 + vat = 0 + vat_percent = 0 + discount = {"amount": 0} vm_specs["price"] = price vm_specs["price_after_discount"] = price - discount["amount"] amount_to_charge = price From 018c3b5bba95c2c4ad435c62aa839dc39d985e90 Mon Sep 17 00:00:00 2001 From: PCoder Date: Tue, 27 May 2025 10:58:33 +0530 Subject: [PATCH 36/38] More debugging --- datacenterlight/views.py | 6 ++++-- hosting/models.py | 4 ++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/datacenterlight/views.py b/datacenterlight/views.py index 1e486242..331e0fc9 100644 --- a/datacenterlight/views.py +++ b/datacenterlight/views.py @@ -1219,6 +1219,7 @@ 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) @@ -1233,17 +1234,18 @@ 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) + 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, diff --git a/hosting/models.py b/hosting/models.py index 4c039fef..f17d8a57 100644 --- a/hosting/models.py +++ b/hosting/models.py @@ -699,15 +699,19 @@ 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_customer=stripe_cust, card_id=card_id ) + print(" user_card_detail={}".format(user_card_detail)) 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): From f8ba89c1934285bcb109b63afb2ce1ff23301d0b Mon Sep 17 00:00:00 2001 From: PCoder Date: Tue, 27 May 2025 11:47:48 +0530 Subject: [PATCH 37/38] Fix params passing to method --- hosting/models.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hosting/models.py b/hosting/models.py index f17d8a57..12edba65 100644 --- a/hosting/models.py +++ b/hosting/models.py @@ -703,9 +703,9 @@ class UserCardDetail(AssignPermissionsMixin, models.Model): 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_customer=stripe_cust, card_id=card_id + stripe_cust, card_id ) - print(" user_card_detail={}".format(user_card_detail)) + print(" user_card_detail={}".format(user_card_detail.__dict__)) for card in stripe_cust.usercarddetail_set.all(): card.preferred = False card.save() From 9cdf4593cfef31479dda480d86850e27208ea0f1 Mon Sep 17 00:00:00 2001 From: PCoder Date: Tue, 27 May 2025 12:02:15 +0530 Subject: [PATCH 38/38] Remove hardcode --- datacenterlight/views.py | 8 -------- 1 file changed, 8 deletions(-) diff --git a/datacenterlight/views.py b/datacenterlight/views.py index 331e0fc9..c708ff6a 100644 --- a/datacenterlight/views.py +++ b/datacenterlight/views.py @@ -203,10 +203,6 @@ class IndexView(CreateView): ) if request.user.id == 51: print("User is test") - price = 0 - vat = 0 - vat_percent = 0 - discount = 0 specs = { 'cpu': cores, 'memory': memory, @@ -658,10 +654,6 @@ class OrderConfirmationView(DetailView, FormView): ) if request.user.id == 51: print("User is test") - price = 0 - vat = 0 - vat_percent = 0 - discount = {"amount": 0} vm_specs["price"] = price vm_specs["price_after_discount"] = price - discount["amount"] amount_to_charge = price