ungleich-public/dynamicweb
6
0
Fork 0
Code Issues 1 Pull requests 2 Projects Releases Wiki Activity

Compare commits

base: ungleich-public:master
Branches Tags
ungleich-public:master
ungleich-public:make-docker-build-succesful
ungleich-public:requirements
ungleich-public:12186-3ds
ungleich-public:recaptcha
ungleich-public:docker
ungleich-public:improve-logging
ungleich-public:7819/use-ascii-chars-only-for-username
ungleich-public:master-2.10.1
ungleich-public:bugfix/ldap_migration
ungleich-public:feature/old_master
ungleich-public:feature/nosystemd
ungleich-public:feature/vm_pricing
ungleich-public:3.4
ungleich-public:3.3
ungleich-public:3.2
ungleich-public:3.1
ungleich-public:3.0
ungleich-public:2.14
ungleich-public:2.13
ungleich-public:2.12.1
ungleich-public:2.12
ungleich-public:2.11
ungleich-public:2.10.8
ungleich-public:2.10.7
ungleich-public:2.10.6
ungleich-public:2.10.5
ungleich-public:2.10.4b
ungleich-public:2.10.3b
ungleich-public:2.10.2b
ungleich-public:2.10.3
ungleich-public:2.10.2
ungleich-public:2.10.1
ungleich-public:2.10
ungleich-public:2.9.5
ungleich-public:2.9.4
ungleich-public:2.9.3
ungleich-public:2.9.2
ungleich-public:2.9.1
ungleich-public:2.9
ungleich-public:2.8.2
ungleich-public:2.8.1
ungleich-public:2.8
ungleich-public:2.7.3
ungleich-public:2.7.2
ungleich-public:2.7.1
ungleich-public:2.7
ungleich-public:2.6.10
ungleich-public:2.6.9
ungleich-public:2.6.8
ungleich-public:2.6.7
ungleich-public:2.6.6
ungleich-public:2.6.5
ungleich-public:2.6.4
ungleich-public:2.6.3
ungleich-public:2.6.2
ungleich-public:2.6.1
ungleich-public:2.6
ungleich-public:2.5.11
ungleich-public:2.5.10
ungleich-public:2.5.9
ungleich-public:2.5.8
ungleich-public:2.5.7
ungleich-public:2.5.6
ungleich-public:2.5.5
ungleich-public:2.5.4
ungleich-public:2.5.3
ungleich-public:2.5.2
ungleich-public:2.5.1
ungleich-public:2.5
ungleich-public:2.4.10
ungleich-public:2.4.9
ungleich-public:2.4.8
ungleich-public:2.4.7
ungleich-public:2.4.6
ungleich-public:2.4.5
ungleich-public:2.4.4
ungleich-public:2.4.3
ungleich-public:2.4.2
ungleich-public:2.4.1
ungleich-public:2.4
ungleich-public:2.3.1
ungleich-public:2.3
ungleich-public:2.2.2
ungleich-public:2.2.1
ungleich-public:2.2
ungleich-public:2.1.2
ungleich-public:2.1.1
ungleich-public:2.1
ungleich-public:2.0.5
ungleich-public:2.0.4
ungleich-public:2.0.3
ungleich-public:2.0.2
ungleich-public:2.0.1
ungleich-public:2.0
ungleich-public:1.9.1
ungleich-public:1.9
ungleich-public:1.8
ungleich-public:1.7.2
ungleich-public:1.7.1
ungleich-public:1.7
ungleich-public:1.6.5
ungleich-public:1.6.4
ungleich-public:1.6.3
ungleich-public:1.6.2
ungleich-public:1.6.1
ungleich-public:1.6
ungleich-public:1.5.5
ungleich-public:1.5.4
ungleich-public:1.5.3
ungleich-public:1.5.2
ungleich-public:1.5.1
ungleich-public:1.5
ungleich-public:1.4.1
ungleich-public:1.4
ungleich-public:1.3.3
ungleich-public:1.3.2
ungleich-public:1.3.1
ungleich-public:1.3
ungleich-public:1.2.13
ungleich-public:1.2.12
ungleich-public:1.2.11
ungleich-public:1.2.10
ungleich-public:1.2.9
ungleich-public:1.2.8
ungleich-public:1.2.7
ungleich-public:1.2.6
ungleich-public:1.2.5
ungleich-public:1.2.4
ungleich-public:1.2.3
ungleich-public:1.2.2
ungleich-public:1.2.1
ungleich-public:1.2
ungleich-public:1.1.1
ungleich-public:1.1
ungleich-public:1.0.24
ungleich-public:1.0.23
ungleich-public:1.0.22
ungleich-public:1.0.21
ungleich-public:1.0.20
ungleich-public:1.0.19
ungleich-public:1.0.18
ungleich-public:1.0.17
ungleich-public:1.0.16
ungleich-public:1.0.15
ungleich-public:1.0.14
ungleich-public:1.0.13
ungleich-public:1.0.12
ungleich-public:1.0.11
ungleich-public:1.0.10
ungleich-public:1.0.9
ungleich-public:1.0.8
ungleich-public:1.0.7
ungleich-public:1.0.6
ungleich-public:1.0.5
ungleich-public:1.0.4
ungleich-public:1.0.3
ungleich-public:1.0.2
ungleich-public:1.0.1
ungleich-public:1.0.0
ungleich-public:old-2.0
..
compare: ungleich-public:12186-3ds
Branches Tags
ungleich-public:master
ungleich-public:make-docker-build-succesful
ungleich-public:requirements
ungleich-public:12186-3ds
ungleich-public:recaptcha
ungleich-public:docker
ungleich-public:improve-logging
ungleich-public:7819/use-ascii-chars-only-for-username
ungleich-public:master-2.10.1
ungleich-public:bugfix/ldap_migration
ungleich-public:feature/old_master
ungleich-public:feature/nosystemd
ungleich-public:feature/vm_pricing
ungleich-public:3.4
ungleich-public:3.3
ungleich-public:3.2
ungleich-public:3.1
ungleich-public:3.0
ungleich-public:2.14
ungleich-public:2.13
ungleich-public:2.12.1
ungleich-public:2.12
ungleich-public:2.11
ungleich-public:2.10.8
ungleich-public:2.10.7
ungleich-public:2.10.6
ungleich-public:2.10.5
ungleich-public:2.10.4b
ungleich-public:2.10.3b
ungleich-public:2.10.2b
ungleich-public:2.10.3
ungleich-public:2.10.2
ungleich-public:2.10.1
ungleich-public:2.10
ungleich-public:2.9.5
ungleich-public:2.9.4
ungleich-public:2.9.3
ungleich-public:2.9.2
ungleich-public:2.9.1
ungleich-public:2.9
ungleich-public:2.8.2
ungleich-public:2.8.1
ungleich-public:2.8
ungleich-public:2.7.3
ungleich-public:2.7.2
ungleich-public:2.7.1
ungleich-public:2.7
ungleich-public:2.6.10
ungleich-public:2.6.9
ungleich-public:2.6.8
ungleich-public:2.6.7
ungleich-public:2.6.6
ungleich-public:2.6.5
ungleich-public:2.6.4
ungleich-public:2.6.3
ungleich-public:2.6.2
ungleich-public:2.6.1
ungleich-public:2.6
ungleich-public:2.5.11
ungleich-public:2.5.10
ungleich-public:2.5.9
ungleich-public:2.5.8
ungleich-public:2.5.7
ungleich-public:2.5.6
ungleich-public:2.5.5
ungleich-public:2.5.4
ungleich-public:2.5.3
ungleich-public:2.5.2
ungleich-public:2.5.1
ungleich-public:2.5
ungleich-public:2.4.10
ungleich-public:2.4.9
ungleich-public:2.4.8
ungleich-public:2.4.7
ungleich-public:2.4.6
ungleich-public:2.4.5
ungleich-public:2.4.4
ungleich-public:2.4.3
ungleich-public:2.4.2
ungleich-public:2.4.1
ungleich-public:2.4
ungleich-public:2.3.1
ungleich-public:2.3
ungleich-public:2.2.2
ungleich-public:2.2.1
ungleich-public:2.2
ungleich-public:2.1.2
ungleich-public:2.1.1
ungleich-public:2.1
ungleich-public:2.0.5
ungleich-public:2.0.4
ungleich-public:2.0.3
ungleich-public:2.0.2
ungleich-public:2.0.1
ungleich-public:2.0
ungleich-public:1.9.1
ungleich-public:1.9
ungleich-public:1.8
ungleich-public:1.7.2
ungleich-public:1.7.1
ungleich-public:1.7
ungleich-public:1.6.5
ungleich-public:1.6.4
ungleich-public:1.6.3
ungleich-public:1.6.2
ungleich-public:1.6.1
ungleich-public:1.6
ungleich-public:1.5.5
ungleich-public:1.5.4
ungleich-public:1.5.3
ungleich-public:1.5.2
ungleich-public:1.5.1
ungleich-public:1.5
ungleich-public:1.4.1
ungleich-public:1.4
ungleich-public:1.3.3
ungleich-public:1.3.2
ungleich-public:1.3.1
ungleich-public:1.3
ungleich-public:1.2.13
ungleich-public:1.2.12
ungleich-public:1.2.11
ungleich-public:1.2.10
ungleich-public:1.2.9
ungleich-public:1.2.8
ungleich-public:1.2.7
ungleich-public:1.2.6
ungleich-public:1.2.5
ungleich-public:1.2.4
ungleich-public:1.2.3
ungleich-public:1.2.2
ungleich-public:1.2.1
ungleich-public:1.2
ungleich-public:1.1.1
ungleich-public:1.1
ungleich-public:1.0.24
ungleich-public:1.0.23
ungleich-public:1.0.22
ungleich-public:1.0.21
ungleich-public:1.0.20
ungleich-public:1.0.19
ungleich-public:1.0.18
ungleich-public:1.0.17
ungleich-public:1.0.16
ungleich-public:1.0.15
ungleich-public:1.0.14
ungleich-public:1.0.13
ungleich-public:1.0.12
ungleich-public:1.0.11
ungleich-public:1.0.10
ungleich-public:1.0.9
ungleich-public:1.0.8
ungleich-public:1.0.7
ungleich-public:1.0.6
ungleich-public:1.0.5
ungleich-public:1.0.4
ungleich-public:1.0.3
ungleich-public:1.0.2
ungleich-public:1.0.1
ungleich-public:1.0.0
ungleich-public:old-2.0

3 commits
master ... 12186-3ds

Author SHA1 Message Date
PCoder
b47a8828bf Merge remote-tracking branch 'mainRepo/master' into 12186-3ds 2024-02-02 19:54:58 +05:30
PCoder
a47087c551 Attempt 3ds on payment intents 2023-11-15 18:18:21 +05:30
PCoder
c3e574ab7d Enable 3ds for subscription create 2023-11-15 16:40:46 +05:30
15 changed files with 123 additions and 328 deletions
Show stats Expand all files Collapse all files

1
.dockerignore
View file

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

20
Dockerfile
View file

@ -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" ]

23
build-image.sh
View file

@ -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

54
datacenterlight/management/commands/fix_generic_stripe_plan_product_names.py
View file

@ -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")

6
datacenterlight/templatetags/custom_tags.py
View file

@ -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

26
datacenterlight/views.py
View file

@ -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__)
@ -902,21 +900,15 @@ class OrderConfirmationView(DetailView, FormView):
2
)
)
stripe_plan_id = "generic-{0}-{1:.2f}".format(
plan_name = "generic-{0}-{1:.2f}".format(
request.session['generic_payment_details']['product_id'],
amount_to_be_charged
)
try:
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')
@ -1009,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':
@ -1224,7 +1214,6 @@ 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
@ -1234,7 +1223,6 @@ 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
@ -1439,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({
@ -1462,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'],
@ -1470,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,
@ -1527,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.")
@ -1553,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")

6
dynamicweb/settings/base.py
View file

@ -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

19
entrypoint.sh
View file

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

38
hosting/management/commands/change_ch_vatrate_2023.py
View file

@ -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 = []

143
hosting/management/commands/change_fi_vatrate_2024.py
View file

@ -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)))

76
hosting/static/hosting/js/payment.js
View file

@ -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();

5
hosting/templates/hosting/includes/_card_input.html
View file

@ -40,6 +40,9 @@
{% endif %}
{% endfor %}
</div>
<div id="error-section">
<p id="3ds-error-message" style="color: red;"></p>
</div>
<div class="text-right">
<button class="btn btn-vm-contact btn-wide" type="submit" name="payment-form">{%trans "SUBMIT" %}</button>
</div>
@ -47,4 +50,4 @@
<div style="display:none;">
<p class="payment-errors"></p>
</div>
</form>
</form>

22
hosting/views.py
View file

@ -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
@ -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:

2
requirements.txt
View file

@ -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

10
utils/stripe_utils.py
View file

@ -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