Compare commits
7 Commits
master
...
7819/use-a
| Author | SHA1 | Date |
|---|---|---|
PCoder
|
e18188603a | |
|
PCoder
|
4441ba37ca | |
|
PCoder
|
2f16f2440e | |
|
PCoder
|
af70824d6a | |
|
PCoder
|
4890c4956f | |
|
PCoder
|
a995f418b2 | |
|
PCoder
|
ea79fafb08 |
41
Changelog
41
Changelog
|
|
@ -1,44 +1,3 @@
|
|||
3.2: 2021-02-07
|
||||
* 8816: Update order confirmation text to better prepared for payment dispute
|
||||
* supportticket#22990: Fix: can't add a deleted card
|
||||
3.1: 2021-01-11
|
||||
* 8781: Fix error is setting a default card (MR!746)
|
||||
3.0: 2021-01-07
|
||||
* 8393: Implement SCA for stripe payments (MR!745)
|
||||
* 8691: Implment check_vm_templates management command (MR!744)
|
||||
2.14: 2020-12-07
|
||||
* 8692: Create a script that fixes django db for the order after celery error (MR!743)
|
||||
2.13: 2020-12-02
|
||||
* 8654: Fix 500 error on invoices list for the user contact+devuanhosting.com@virus.media (MR!742)
|
||||
* 8593: Escape user's ssh key in xml-rpc call to create VM (MR!741)
|
||||
2.12.1: 2020-07-21
|
||||
* 8307: Introduce "Exclude vat calculations" for Generic Products (MR!740)
|
||||
* Change DE VAT rate to 16% from 19% (MR!739)
|
||||
2.12: 2020-06-23
|
||||
* 7894: Show one time payment invoices (MR!738)
|
||||
2.11: 2020-06-11
|
||||
* Bugfix: Correct the wrong constant name (caused payment to go thru and showing error and VMs not instantiated)
|
||||
2.10.8: 2020-06-10
|
||||
* #8102: Refactor MAX_TIME_TO_WAIT_FOR_VM_TERMINATE to increase time to poll whether VM has been terminated or not (MR!737)
|
||||
2.10.7: 2020-05-25
|
||||
* Bugfix: Handle VM templates deleted in OpenNebula but VM instances still existing (MR!736)
|
||||
Notes for deployment:
|
||||
When deploying define a UPDATED_TEMPLATES string represented dictionary value in .env
|
||||
```
|
||||
# Represents Template Ids that were
|
||||
# deleted and the new template Id to look for the template
|
||||
# definition
|
||||
UPDATED_TEMPLATES="{1: 100}"
|
||||
```
|
||||
2.10.6: 2020-03-25
|
||||
* Bugfix: Handle Nonetype for discount's name (MR!735)
|
||||
2.10.5: 2020-03-17
|
||||
* Introduce base price for VMs and let admins add stripe_coupon_id (MR!730)
|
||||
Notes for deployment:
|
||||
1. Add env variable `VM_BASE_PRICE`
|
||||
2. Migrate datacenterlight app. This introduces the stripe_coupon_code field in the VMPricing.
|
||||
3. Create a coupon in stripe with the desired value and note down the stripe's coupon id
|
||||
4. Update the discount amount and set the corresponding coupon id in the admin
|
||||
2.10.3b: 2020-03-05
|
||||
* #7773: Use username for communicating with opennebula all the time
|
||||
2.10.2b: 2020-02-25
|
||||
|
|
|
|||
|
|
@ -1,6 +1,5 @@
|
|||
from cms.plugin_base import CMSPluginBase
|
||||
from cms.plugin_pool import plugin_pool
|
||||
from django.conf import settings
|
||||
|
||||
from .cms_models import (
|
||||
DCLBannerItemPluginModel, DCLBannerListPluginModel, DCLContactPluginModel,
|
||||
|
|
@ -101,7 +100,6 @@ class DCLCalculatorPlugin(CMSPluginBase):
|
|||
vm_type=instance.vm_type
|
||||
).order_by('name')
|
||||
context['instance'] = instance
|
||||
context['vm_base_price'] = settings.VM_BASE_PRICE
|
||||
context['min_ram'] = 0.5 if instance.enable_512mb_ram else 1
|
||||
return context
|
||||
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ msgid ""
|
|||
msgstr ""
|
||||
"Project-Id-Version: PACKAGE VERSION\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2021-02-07 11:10+0000\n"
|
||||
"POT-Creation-Date: 2020-02-01 09:42+0000\n"
|
||||
"PO-Revision-Date: 2018-03-30 23:22+0000\n"
|
||||
"Last-Translator: b'Anonymous User <coder.purple+25@gmail.com>'\n"
|
||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||
|
|
@ -144,8 +144,8 @@ msgid ""
|
|||
"the heart of Switzerland."
|
||||
msgstr "Bei uns findest Du die günstiges VMs aus der Schweiz."
|
||||
|
||||
msgid "Try now, order a VM. VM price starts from only 11.5 CHF per month."
|
||||
msgstr "Unser Angebot beginnt bei 11.5 CHF pro Monat. Probier's jetzt aus!"
|
||||
msgid "Try now, order a VM. VM price starts from only 10.5 CHF per month."
|
||||
msgstr "Unser Angebot beginnt bei 10.5 CHF pro Monat. Probier's jetzt aus!"
|
||||
|
||||
msgid "ORDER VM"
|
||||
msgstr "VM BESTELLEN"
|
||||
|
|
@ -415,9 +415,8 @@ msgstr "Deine MwSt-Nummer wurde überprüft"
|
|||
msgid ""
|
||||
"Your VAT number is under validation. VAT will be adjusted, once the "
|
||||
"validation is complete."
|
||||
msgstr ""
|
||||
"Deine MwSt-Nummer wird derzeit validiert. Die MwSt. wird angepasst, sobald "
|
||||
"die Validierung abgeschlossen ist."
|
||||
msgstr "Deine MwSt-Nummer wird derzeit validiert. Die MwSt. wird angepasst, "
|
||||
"sobald die Validierung abgeschlossen ist."
|
||||
|
||||
msgid "Payment method"
|
||||
msgstr "Bezahlmethode"
|
||||
|
|
@ -431,6 +430,18 @@ msgstr "Bestellungsübersicht"
|
|||
msgid "Product"
|
||||
msgstr "Produkt"
|
||||
|
||||
msgid "Price"
|
||||
msgstr "Preise"
|
||||
|
||||
msgid "VAT for"
|
||||
msgstr "MwSt für"
|
||||
|
||||
msgid "Total Amount"
|
||||
msgstr "Gesamtsumme"
|
||||
|
||||
msgid "Amount"
|
||||
msgstr "Betrag"
|
||||
|
||||
msgid "Description"
|
||||
msgstr "Beschreibung"
|
||||
|
||||
|
|
@ -443,51 +454,42 @@ msgstr "Preis ohne MwSt."
|
|||
msgid "Pre VAT"
|
||||
msgstr "Exkl. MwSt."
|
||||
|
||||
msgid "VAT for"
|
||||
msgstr "MwSt für"
|
||||
|
||||
msgid "Your Price in Total"
|
||||
msgstr "Dein Gesamtpreis"
|
||||
|
||||
#, python-format
|
||||
msgid ""
|
||||
" By clicking \"Place order\" you agree to our <a href=\"https://"
|
||||
"datacenterlight.ch/en-us/cms/terms-of-service/\">Terms of Service</a> and "
|
||||
"this plan will charge your credit card account with %(total_price)s CHF/year"
|
||||
"By clicking \"Place order\" this plan will charge your credit card account "
|
||||
"with %(total_price)s CHF/year"
|
||||
msgstr ""
|
||||
"Indem Du auf \"Bestellung aufgeben\" klickst, erklärst Du dich mit unseren <a href=\"https://"
|
||||
"datacenterlight.ch/en-us/cms/terms-of-service/\">Nutzungsbedingungen</a> einverstanden und Dein Kreditkartenkonto wird mit %(total_price)s CHF/Jahr belastet."
|
||||
"Wenn Du \"bestellen\" auswählst, wird Deine Kreditkarte mit %(total_price)s "
|
||||
"CHF pro Jahr belastet"
|
||||
|
||||
#, python-format
|
||||
msgid ""
|
||||
"\n"
|
||||
" By clicking \"Place order\" you agree to "
|
||||
"our <a href=\"https://datacenterlight.ch/en-us/cms/terms-of-service/\">Terms "
|
||||
"of Service</a> and this plan will charge your credit card account with "
|
||||
"%(total_price)s CHF/month"
|
||||
"By clicking \"Place order\" this plan will charge your credit card account "
|
||||
"with %(total_price)s CHF/month"
|
||||
msgstr ""
|
||||
"\n"
|
||||
"Indem Du auf \"Bestellung aufgeben\" klickst, erklärst Du dich mit unseren <a href=\"https://"
|
||||
"datacenterlight.ch/en-us/cms/terms-of-service/\">Nutzungsbedingungen</a> einverstanden und Dein Kreditkartenkonto wird mit %(total_price)s CHF/Monat belastet."
|
||||
"Wenn Du \"bestellen\" auswählst, wird Deine Kreditkarte mit %(total_price)s "
|
||||
"CHF pro Monat belastet"
|
||||
|
||||
#, fuzzy, python-format
|
||||
#| msgid ""
|
||||
#| "By clicking \"Place order\" this payment will charge your credit card "
|
||||
#| "account with a one time amount of %(total_price)s CHF"
|
||||
msgid ""
|
||||
"By clicking \"Place order\" this payment will charge your credit card "
|
||||
"account with a one time amount of %(total_price)s CHF"
|
||||
msgstr ""
|
||||
"Wenn Du \"bestellen\" auswählst, wird Deine Kreditkarte mit "
|
||||
"%(vm_total_price)s CHF pro Monat belastet"
|
||||
|
||||
#, python-format
|
||||
msgid ""
|
||||
"By clicking \"Place order\" you agree to our <a href=\"https://"
|
||||
"datacenterlight.ch/en-us/cms/terms-of-service/\">Terms of Service</a> and "
|
||||
"this plan will charge your credit card account with %(total_price)s CHF"
|
||||
"By clicking \"Place order\" this plan will charge your credit card account "
|
||||
"with %(vm_total_price)s CHF/month"
|
||||
msgstr ""
|
||||
"Indem Du auf \"Bestellung aufgeben\" klickst, erklärst Du dich mit unseren <a href=\"https://"
|
||||
"datacenterlight.ch/de/cms/terms-of-service/\">Nutzungsbedingungen</a> einverstanden und Dein Kreditkartenkonto wird mit %(total_price)s CHF belastet."
|
||||
|
||||
#, python-format
|
||||
msgid ""
|
||||
"By clicking \"Place order\" you agree to our <a href=\"https://"
|
||||
"datacenterlight.ch/en-us/cms/terms-of-service/\">Terms of Service</a> and "
|
||||
"this plan will charge your credit card account with %(vm_total_price)s CHF/"
|
||||
"month"
|
||||
msgstr ""
|
||||
"Indem Du auf \"Bestellung aufgeben\" klickst, erklärst Du dich mit unseren <a href=\"https://"
|
||||
"datacenterlight.ch/de/cms/terms-of-service/\">Nutzungsbedingungen</a> einverstanden und Dein Kreditkartenkonto wird mit %(vm_total_price)s CHF/Monat belastet"
|
||||
"Wenn Du \"bestellen\" auswählst, wird Deine Kreditkarte mit "
|
||||
"%(vm_total_price)s CHF pro Monat belastet"
|
||||
|
||||
msgid "Place order"
|
||||
msgstr "Bestellen"
|
||||
|
|
@ -606,22 +608,16 @@ msgid "Incorrect pricing name. Please contact support{support_email}"
|
|||
msgstr ""
|
||||
"Ungültige Preisbezeichnung. Bitte kontaktiere den Support{support_email}"
|
||||
|
||||
#, python-brace-format
|
||||
msgid "{user} does not have permission to access the card"
|
||||
msgstr "{user} hat keine Erlaubnis auf diese Karte zuzugreifen"
|
||||
|
||||
msgid "An error occurred. Details: {}"
|
||||
msgstr "Ein Fehler ist aufgetreten. Details: {}"
|
||||
|
||||
msgid "Confirm Order"
|
||||
msgstr "Bestellung Bestätigen"
|
||||
|
||||
#, fuzzy
|
||||
#| msgid "Thank you!"
|
||||
msgid "Thank you !"
|
||||
msgstr "Vielen Dank!"
|
||||
|
||||
msgid "Your product will be provisioned as soon as we receive the payment."
|
||||
msgstr ""
|
||||
|
||||
#, python-brace-format
|
||||
msgid "An error occurred while associating the card. Details: {details}"
|
||||
msgstr ""
|
||||
"Beim Verbinden der Karte ist ein Fehler aufgetreten. Details: {details}"
|
||||
|
||||
msgid "Error."
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -632,21 +628,10 @@ msgstr ""
|
|||
"Es ist ein Fehler bei der Zahlung betreten. Du wirst nach dem Schliessen vom "
|
||||
"Popup zur Bezahlseite weitergeleitet."
|
||||
|
||||
msgid "Thank you for the order."
|
||||
msgstr "Danke für Deine Bestellung."
|
||||
|
||||
msgid ""
|
||||
"Your product will be provisioned as soon as we receive a payment "
|
||||
"confirmation from Stripe. We will send you a confirmation email. You can "
|
||||
"always contact us at support@datacenterlight.ch"
|
||||
#, python-brace-format
|
||||
msgid "An error occurred while associating the card. Details: {details}"
|
||||
msgstr ""
|
||||
|
||||
msgid ""
|
||||
"Your VM will be up and running in a few moments. We will send you a "
|
||||
"confirmation email as soon as it is ready."
|
||||
msgstr ""
|
||||
"Deine VM ist gleich bereit. Wir senden Dir eine Bestätigungsemail, sobald Du "
|
||||
"auf sie zugreifen kannst."
|
||||
"Beim Verbinden der Karte ist ein Fehler aufgetreten. Details: {details}"
|
||||
|
||||
msgid " This is a monthly recurring plan."
|
||||
msgstr "Dies ist ein monatlich wiederkehrender Plan."
|
||||
|
|
@ -686,40 +671,15 @@ msgstr ""
|
|||
"Du wirst bald eine Bestätigungs-E-Mail über die Zahlung erhalten. Du kannst "
|
||||
"jederzeit unter info@ungleich.ch kontaktieren."
|
||||
|
||||
#, python-format
|
||||
#~ msgid ""
|
||||
#~ "By clicking \"Place order\" this plan will charge your credit card "
|
||||
#~ "account with %(total_price)s CHF/month"
|
||||
#~ msgstr ""
|
||||
#~ "Wenn Du \"bestellen\" auswählst, wird Deine Kreditkarte mit "
|
||||
#~ "%(total_price)s CHF pro Monat belastet"
|
||||
msgid "Thank you for the order."
|
||||
msgstr "Danke für Deine Bestellung."
|
||||
|
||||
#, fuzzy, python-format
|
||||
#~| msgid ""
|
||||
#~| "By clicking \"Place order\" this payment will charge your credit card "
|
||||
#~| "account with a one time amount of %(total_price)s CHF"
|
||||
#~ msgid ""
|
||||
#~ "By clicking \"Place order\" this payment will charge your credit card "
|
||||
#~ "account with a one time amount of %(total_price)s CHF"
|
||||
#~ msgstr ""
|
||||
#~ "Wenn Du \"bestellen\" auswählst, wird Deine Kreditkarte mit "
|
||||
#~ "%(vm_total_price)s CHF pro Monat belastet"
|
||||
|
||||
#, python-brace-format
|
||||
#~ msgid "{user} does not have permission to access the card"
|
||||
#~ msgstr "{user} hat keine Erlaubnis auf diese Karte zuzugreifen"
|
||||
|
||||
#~ msgid "An error occurred. Details: {}"
|
||||
#~ msgstr "Ein Fehler ist aufgetreten. Details: {}"
|
||||
|
||||
#~ msgid "Price"
|
||||
#~ msgstr "Preise"
|
||||
|
||||
#~ msgid "Total Amount"
|
||||
#~ msgstr "Gesamtsumme"
|
||||
|
||||
#~ msgid "Amount"
|
||||
#~ msgstr "Betrag"
|
||||
msgid ""
|
||||
"Your VM will be up and running in a few moments. We will send you a "
|
||||
"confirmation email as soon as it is ready."
|
||||
msgstr ""
|
||||
"Deine VM ist gleich bereit. Wir senden Dir eine Bestätigungsemail, sobald Du "
|
||||
"auf sie zugreifen kannst."
|
||||
|
||||
#~ msgid "Subtotal"
|
||||
#~ msgstr "Zwischensumme"
|
||||
|
|
@ -786,6 +746,9 @@ msgstr ""
|
|||
#~ "Wir werden dann sobald als möglich Ihren Beta-Zugang erstellen und Sie "
|
||||
#~ "daraufhin kontaktieren.Bis dahin bitten wir Sie um etwas Geduld."
|
||||
|
||||
#~ msgid "Thank you!"
|
||||
#~ msgstr "Vielen Dank!"
|
||||
|
||||
#~ msgid "Thank you for order! Our team will contact you via email"
|
||||
#~ msgstr ""
|
||||
#~ "Vielen Dank für die Bestellung. Unser Team setzt sich sobald wie möglich "
|
||||
|
|
|
|||
|
|
@ -1,65 +0,0 @@
|
|||
from django.core.management.base import BaseCommand
|
||||
from opennebula_api.models import OpenNebulaManager
|
||||
from datacenterlight.models import VMTemplate
|
||||
from membership.models import CustomUser
|
||||
|
||||
from django.conf import settings
|
||||
from time import sleep
|
||||
import datetime
|
||||
import json
|
||||
import logging
|
||||
import os
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
|
||||
class Command(BaseCommand):
|
||||
help = '''Checks all VM templates to find if they can be instantiated'''
|
||||
|
||||
def add_arguments(self, parser):
|
||||
parser.add_argument('user_email', type=str)
|
||||
|
||||
def handle(self, *args, **options):
|
||||
result_dict = {}
|
||||
user_email = options['user_email'] if 'user_email' in options else ""
|
||||
|
||||
if user_email:
|
||||
cu = CustomUser.objects.get(email=user_email)
|
||||
specs = {'cpu': 1, 'memory': 1, 'disk_size': 10}
|
||||
manager = OpenNebulaManager(email=user_email, password=cu.password)
|
||||
pub_keys = [settings.TEST_MANAGE_SSH_KEY_PUBKEY]
|
||||
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():
|
||||
vm_name = 'test-%s' % vm_template.name
|
||||
vm_id = manager.create_vm(
|
||||
template_id=vm_template.opennebula_vm_template_id,
|
||||
specs=specs,
|
||||
ssh_key='\n'.join(pub_keys),
|
||||
vm_name=vm_name
|
||||
)
|
||||
if vm_id and vm_id > 0:
|
||||
result_dict[vm_name] = "%s OK, created VM %s" % (
|
||||
'%s %s %s' % (vm_template.opennebula_vm_template_id,
|
||||
vm_template.name, vm_template.vm_type),
|
||||
vm_id
|
||||
)
|
||||
self.stdout.write(self.style.SUCCESS(result_dict[vm_name]))
|
||||
manager.delete_vm(vm_id)
|
||||
else:
|
||||
result_dict[vm_name] = '''Error creating VM %s, template_id
|
||||
%s %s''' % (vm_name,
|
||||
vm_template.opennebula_vm_template_id,
|
||||
vm_template.vm_type)
|
||||
self.stdout.write(self.style.ERROR(result_dict[vm_name]))
|
||||
sleep(1)
|
||||
date_str = datetime.datetime.strftime(
|
||||
datetime.datetime.now(), '%Y%m%d%H%M%S'
|
||||
)
|
||||
with open("%s/outputs/check_vm_templates_%s.txt" %
|
||||
(PROJECT_PATH, date_str),
|
||||
'w',
|
||||
encoding='utf-8') as f:
|
||||
f.write(json.dumps(result_dict))
|
||||
self.stdout.write(self.style.SUCCESS("Done"))
|
||||
|
|
@ -1,76 +0,0 @@
|
|||
from django.core.management.base import BaseCommand
|
||||
from datacenterlight.tasks import handle_metadata_and_emails
|
||||
from opennebula_api.models import OpenNebulaManager
|
||||
from membership.models import CustomUser
|
||||
import logging
|
||||
import json
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
|
||||
class Command(BaseCommand):
|
||||
help = '''Updates the DB after manual creation of VM'''
|
||||
|
||||
def add_arguments(self, parser):
|
||||
parser.add_argument('vm_id', type=int)
|
||||
parser.add_argument('order_id', type=int)
|
||||
parser.add_argument('user', type=str)
|
||||
parser.add_argument('specs', type=str)
|
||||
parser.add_argument('template', type=str)
|
||||
|
||||
def handle(self, *args, **options):
|
||||
vm_id = options['vm_id']
|
||||
order_id = options['order_id']
|
||||
user_str = options['user']
|
||||
specs_str = options['specs']
|
||||
template_str = options['template']
|
||||
|
||||
json_acceptable_string = user_str.replace("'", "\"")
|
||||
user_dict = json.loads(json_acceptable_string)
|
||||
|
||||
json_acceptable_string = specs_str.replace("'", "\"")
|
||||
specs = json.loads(json_acceptable_string)
|
||||
|
||||
json_acceptable_string = template_str.replace("'", "\"")
|
||||
template = json.loads(json_acceptable_string)
|
||||
if vm_id <= 0:
|
||||
self.stdout.write(self.style.ERROR(
|
||||
'vm_id can\'t be less than or 0. Given: %s' % vm_id))
|
||||
return
|
||||
if vm_id <= 0:
|
||||
self.stdout.write(self.style.ERROR(
|
||||
'order_id can\'t be less than or 0. Given: %s' % vm_id))
|
||||
return
|
||||
if specs_str is None or specs_str == "":
|
||||
self.stdout.write(
|
||||
self.style.ERROR('specs can\'t be empty or None'))
|
||||
return
|
||||
|
||||
user = {
|
||||
'name': user_dict['name'],
|
||||
'email': user_dict['email'],
|
||||
'username': user_dict['username'],
|
||||
'pass': user_dict['pass'],
|
||||
'request_scheme': user_dict['request_scheme'],
|
||||
'request_host': user_dict['request_host'],
|
||||
'language': user_dict['language'],
|
||||
}
|
||||
cu = CustomUser.objects.get(username=user.get('username'))
|
||||
# Create OpenNebulaManager
|
||||
self.stdout.write(
|
||||
self.style.SUCCESS(
|
||||
'Connecting using %s' % (cu.username)
|
||||
)
|
||||
)
|
||||
manager = OpenNebulaManager(email=cu.username, password=cu.password)
|
||||
handle_metadata_and_emails(order_id, vm_id, manager, user, specs,
|
||||
template)
|
||||
self.stdout.write(
|
||||
self.style.SUCCESS(
|
||||
'Done handling metadata and emails for %s %s %s' % (
|
||||
order_id,
|
||||
vm_id,
|
||||
str(user)
|
||||
)
|
||||
)
|
||||
)
|
||||
|
|
@ -1,20 +0,0 @@
|
|||
# -*- coding: utf-8 -*-
|
||||
# Generated by Django 1.9.4 on 2020-02-04 03:16
|
||||
from __future__ import unicode_literals
|
||||
|
||||
from django.db import migrations, models
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('datacenterlight', '0030_dclnavbarpluginmodel_show_non_transparent_navbar_always'),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.AddField(
|
||||
model_name='vmpricing',
|
||||
name='stripe_coupon_id',
|
||||
field=models.CharField(blank=True, max_length=255, null=True),
|
||||
),
|
||||
]
|
||||
|
|
@ -54,7 +54,6 @@ class VMPricing(models.Model):
|
|||
discount_amount = models.DecimalField(
|
||||
max_digits=6, decimal_places=2, default=0
|
||||
)
|
||||
stripe_coupon_id = models.CharField(max_length=255, null=True, blank=True)
|
||||
|
||||
def __str__(self):
|
||||
display_str = self.name + ' => ' + ' - '.join([
|
||||
|
|
|
|||
|
|
@ -225,8 +225,8 @@
|
|||
}
|
||||
var total = (cardPricing['cpu'].value * window.coresUnitPrice) +
|
||||
(cardPricing['ram'].value * window.ramUnitPrice) +
|
||||
(cardPricing['storage'].value * window.ssdUnitPrice) +
|
||||
window.vmBasePrice - window.discountAmount;
|
||||
(cardPricing['storage'].value * window.ssdUnitPrice) -
|
||||
window.discountAmount;
|
||||
total = parseFloat(total.toFixed(2));
|
||||
$("#total").text(total);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -56,6 +56,11 @@ def create_vm_task(self, vm_template_id, user, specs, template, order_id):
|
|||
"Running create_vm_task on {}".format(current_task.request.hostname))
|
||||
vm_id = None
|
||||
try:
|
||||
final_price = (
|
||||
specs.get('total_price') if 'total_price' in specs
|
||||
else specs.get('price')
|
||||
)
|
||||
|
||||
if 'pass' in user:
|
||||
on_user = user.get('username')
|
||||
on_pass = user.get('pass')
|
||||
|
|
@ -87,8 +92,107 @@ def create_vm_task(self, vm_template_id, user, specs, template, order_id):
|
|||
if vm_id is None:
|
||||
raise Exception("Could not create VM")
|
||||
|
||||
handle_metadata_and_emails(order_id, vm_id, manager, user, specs,
|
||||
template)
|
||||
# Update HostingOrder with the created vm_id
|
||||
hosting_order = HostingOrder.objects.filter(id=order_id).first()
|
||||
error_msg = None
|
||||
|
||||
try:
|
||||
hosting_order.vm_id = vm_id
|
||||
hosting_order.save()
|
||||
logger.debug(
|
||||
"Updated hosting_order {} with vm_id={}".format(
|
||||
hosting_order.id, vm_id
|
||||
)
|
||||
)
|
||||
except Exception as ex:
|
||||
error_msg = (
|
||||
"HostingOrder with id {order_id} not found. This means that "
|
||||
"the hosting order was not created and/or it is/was not "
|
||||
"associated with VM with id {vm_id}. Details {details}".format(
|
||||
order_id=order_id, vm_id=vm_id, details=str(ex)
|
||||
)
|
||||
)
|
||||
logger.error(error_msg)
|
||||
|
||||
stripe_utils = StripeUtils()
|
||||
result = stripe_utils.set_subscription_metadata(
|
||||
subscription_id=hosting_order.subscription_id,
|
||||
metadata={"VM_ID": str(vm_id)}
|
||||
)
|
||||
|
||||
if result.get('error') is not None:
|
||||
emsg = "Could not update subscription metadata for {sub}".format(
|
||||
sub=hosting_order.subscription_id
|
||||
)
|
||||
logger.error(emsg)
|
||||
if error_msg:
|
||||
error_msg += ". " + emsg
|
||||
else:
|
||||
error_msg = emsg
|
||||
|
||||
vm = VirtualMachineSerializer(manager.get_vm(vm_id)).data
|
||||
|
||||
context = {
|
||||
'name': user.get('name'),
|
||||
'email': user.get('email'),
|
||||
'cores': specs.get('cpu'),
|
||||
'memory': specs.get('memory'),
|
||||
'storage': specs.get('disk_size'),
|
||||
'price': final_price,
|
||||
'template': template.get('name'),
|
||||
'vm_name': vm.get('name'),
|
||||
'vm_id': vm['vm_id'],
|
||||
'order_id': order_id
|
||||
}
|
||||
|
||||
if error_msg:
|
||||
context['errors'] = error_msg
|
||||
if 'pricing_name' in specs:
|
||||
context['pricing'] = str(VMPricing.get_vm_pricing_by_name(
|
||||
name=specs['pricing_name']
|
||||
))
|
||||
email_data = {
|
||||
'subject': settings.DCL_TEXT + " Order from %s" % context['email'],
|
||||
'from_email': settings.DCL_SUPPORT_FROM_ADDRESS,
|
||||
'to': ['info@ungleich.ch'],
|
||||
'body': "\n".join(
|
||||
["%s=%s" % (k, v) for (k, v) in context.items()]),
|
||||
'reply_to': [context['email']],
|
||||
}
|
||||
email = EmailMessage(**email_data)
|
||||
email.send()
|
||||
|
||||
if 'pass' in user:
|
||||
lang = 'en-us'
|
||||
if user.get('language') is not None:
|
||||
logger.debug(
|
||||
"Language is set to {}".format(user.get('language')))
|
||||
lang = user.get('language')
|
||||
translation.activate(lang)
|
||||
# Send notification to the user as soon as VM has been booked
|
||||
context = {
|
||||
'base_url': "{0}://{1}".format(user.get('request_scheme'),
|
||||
user.get('request_host')),
|
||||
'order_url': reverse('hosting:invoices'),
|
||||
'page_header': _(
|
||||
'Your New VM %(vm_name)s at Data Center Light') % {
|
||||
'vm_name': vm.get('name')},
|
||||
'vm_name': vm.get('name')
|
||||
}
|
||||
email_data = {
|
||||
'subject': context.get('page_header'),
|
||||
'to': user.get('email'),
|
||||
'context': context,
|
||||
'template_name': 'new_booked_vm',
|
||||
'template_path': 'hosting/emails/',
|
||||
'from_address': settings.DCL_SUPPORT_FROM_ADDRESS,
|
||||
}
|
||||
email = BaseEmail(**email_data)
|
||||
email.send()
|
||||
|
||||
logger.debug("New VM ID is {vm_id}".format(vm_id=vm_id))
|
||||
if vm_id > 0:
|
||||
get_or_create_vm_detail(custom_user, manager, vm_id)
|
||||
except Exception as e:
|
||||
logger.error(str(e))
|
||||
try:
|
||||
|
|
@ -110,127 +214,3 @@ def create_vm_task(self, vm_template_id, user, specs, template, order_id):
|
|||
return
|
||||
|
||||
return vm_id
|
||||
|
||||
|
||||
def handle_metadata_and_emails(order_id, vm_id, manager, user, specs,
|
||||
template):
|
||||
"""
|
||||
Handle's setting up of the metadata in Stripe and database and sending of
|
||||
emails to the user after VM creation
|
||||
|
||||
:param order_id: the hosting order id
|
||||
:param vm_id: the id of the vm created
|
||||
:param manager: the OpenNebula Manager instance
|
||||
:param user: the user's dict passed to the celery task
|
||||
:param specs: the specification's dict passed to the celery task
|
||||
:param template: the template dict passed to the celery task
|
||||
|
||||
:return:
|
||||
"""
|
||||
|
||||
custom_user = CustomUser.objects.get(email=user.get('email'))
|
||||
final_price = (
|
||||
specs.get('total_price') if 'total_price' in specs
|
||||
else specs.get('price')
|
||||
)
|
||||
# Update HostingOrder with the created vm_id
|
||||
hosting_order = HostingOrder.objects.filter(id=order_id).first()
|
||||
error_msg = None
|
||||
|
||||
try:
|
||||
hosting_order.vm_id = vm_id
|
||||
hosting_order.save()
|
||||
logger.debug(
|
||||
"Updated hosting_order {} with vm_id={}".format(
|
||||
hosting_order.id, vm_id
|
||||
)
|
||||
)
|
||||
except Exception as ex:
|
||||
error_msg = (
|
||||
"HostingOrder with id {order_id} not found. This means that "
|
||||
"the hosting order was not created and/or it is/was not "
|
||||
"associated with VM with id {vm_id}. Details {details}".format(
|
||||
order_id=order_id, vm_id=vm_id, details=str(ex)
|
||||
)
|
||||
)
|
||||
logger.error(error_msg)
|
||||
|
||||
stripe_utils = StripeUtils()
|
||||
result = stripe_utils.set_subscription_metadata(
|
||||
subscription_id=hosting_order.subscription_id,
|
||||
metadata={"VM_ID": str(vm_id)}
|
||||
)
|
||||
|
||||
if result.get('error') is not None:
|
||||
emsg = "Could not update subscription metadata for {sub}".format(
|
||||
sub=hosting_order.subscription_id
|
||||
)
|
||||
logger.error(emsg)
|
||||
if error_msg:
|
||||
error_msg += ". " + emsg
|
||||
else:
|
||||
error_msg = emsg
|
||||
|
||||
vm = VirtualMachineSerializer(manager.get_vm(vm_id)).data
|
||||
|
||||
context = {
|
||||
'name': user.get('name'),
|
||||
'email': user.get('email'),
|
||||
'cores': specs.get('cpu'),
|
||||
'memory': specs.get('memory'),
|
||||
'storage': specs.get('disk_size'),
|
||||
'price': final_price,
|
||||
'template': template.get('name'),
|
||||
'vm_name': vm.get('name'),
|
||||
'vm_id': vm['vm_id'],
|
||||
'order_id': order_id
|
||||
}
|
||||
|
||||
if error_msg:
|
||||
context['errors'] = error_msg
|
||||
if 'pricing_name' in specs:
|
||||
context['pricing'] = str(VMPricing.get_vm_pricing_by_name(
|
||||
name=specs['pricing_name']
|
||||
))
|
||||
email_data = {
|
||||
'subject': settings.DCL_TEXT + " Order from %s" % context['email'],
|
||||
'from_email': settings.DCL_SUPPORT_FROM_ADDRESS,
|
||||
'to': ['info@ungleich.ch'],
|
||||
'body': "\n".join(
|
||||
["%s=%s" % (k, v) for (k, v) in context.items()]),
|
||||
'reply_to': [context['email']],
|
||||
}
|
||||
email = EmailMessage(**email_data)
|
||||
email.send()
|
||||
|
||||
if 'pass' in user:
|
||||
lang = 'en-us'
|
||||
if user.get('language') is not None:
|
||||
logger.debug(
|
||||
"Language is set to {}".format(user.get('language')))
|
||||
lang = user.get('language')
|
||||
translation.activate(lang)
|
||||
# Send notification to the user as soon as VM has been booked
|
||||
context = {
|
||||
'base_url': "{0}://{1}".format(user.get('request_scheme'),
|
||||
user.get('request_host')),
|
||||
'order_url': reverse('hosting:invoices'),
|
||||
'page_header': _(
|
||||
'Your New VM %(vm_name)s at Data Center Light') % {
|
||||
'vm_name': vm.get('name')},
|
||||
'vm_name': vm.get('name')
|
||||
}
|
||||
email_data = {
|
||||
'subject': context.get('page_header'),
|
||||
'to': user.get('email'),
|
||||
'context': context,
|
||||
'template_name': 'new_booked_vm',
|
||||
'template_path': 'hosting/emails/',
|
||||
'from_address': settings.DCL_SUPPORT_FROM_ADDRESS,
|
||||
}
|
||||
email = BaseEmail(**email_data)
|
||||
email.send()
|
||||
|
||||
logger.debug("New VM ID is {vm_id}".format(vm_id=vm_id))
|
||||
if vm_id > 0:
|
||||
get_or_create_vm_detail(custom_user, manager, vm_id)
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
<div class="price-calc-section">
|
||||
<div class="card">
|
||||
{% include "datacenterlight/includes/_calculator_form.html" with vm_pricing=instance.pricing vm_base_price=vm_base_price %}
|
||||
{% include "datacenterlight/includes/_calculator_form.html" with vm_pricing=instance.pricing %}
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -28,7 +28,7 @@
|
|||
{% blocktrans %}Thanks for joining us! We provide the most affordable virtual machines from the heart of Switzerland.{% endblocktrans %}
|
||||
</p>
|
||||
<p style="line-height: 1.75; font-family: Lato, Arial, sans-serif; font-weight: 300; margin: 0;">
|
||||
{% blocktrans %}Try now, order a VM. VM price starts from only 11.5 CHF per month.{% endblocktrans %}
|
||||
{% blocktrans %}Try now, order a VM. VM price starts from only 10.5 CHF per month.{% endblocktrans %}
|
||||
</p>
|
||||
</td>
|
||||
</tr>
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
{% trans "Welcome to Data Center Light!" %}
|
||||
|
||||
{% blocktrans %}Thanks for joining us! We provide the most affordable virtual machines from the heart of Switzerland.{% endblocktrans %}
|
||||
{% blocktrans %}Try now, order a VM. VM price starts from only 11.5 CHF per month.{% endblocktrans %}
|
||||
{% blocktrans %}Try now, order a VM. VM price starts from only 10.5 CHF per month.{% endblocktrans %}
|
||||
|
||||
{{ base_url }}{% url 'hosting:create_virtual_machine' %}
|
||||
|
||||
|
|
|
|||
|
|
@ -9,7 +9,6 @@
|
|||
window.ssdUnitPrice = {{vm_pricing.ssd_unit_price|default:0}};
|
||||
window.hddUnitPrice = {{vm_pricing.hdd_unit_price|default:0}};
|
||||
window.discountAmount = {{vm_pricing.discount_amount|default:0}};
|
||||
window.vmBasePrice = {{vm_base_price|default:0}};
|
||||
window.minRam = {{min_ram}};
|
||||
window.minRamErr = '{% blocktrans with min_ram=min_ram %}Please enter a value in range {{min_ram}} - 200.{% endblocktrans %}';
|
||||
</script>
|
||||
|
|
|
|||
|
|
@ -2,14 +2,6 @@
|
|||
{% load staticfiles bootstrap3 i18n custom_tags humanize %}
|
||||
|
||||
{% block content %}
|
||||
<script>
|
||||
{% if payment_intent_secret %}
|
||||
console.log("payment_intent_secret");
|
||||
window.paymentIntentSecret = "{{payment_intent_secret}}";
|
||||
{% else %}
|
||||
console.log("No payment_intent_secret");
|
||||
{% endif %}
|
||||
</script>
|
||||
<div id="order-detail{{order.pk}}" class="order-detail-container">
|
||||
{% if messages %}
|
||||
<div class="alert alert-warning">
|
||||
|
|
@ -111,61 +103,58 @@
|
|||
</p>
|
||||
{% endif %}
|
||||
</div>
|
||||
{% if generic_payment_details.exclude_vat_calculations %}
|
||||
{% else %}
|
||||
<div class="col-sm-12">
|
||||
<hr class="thin-hr">
|
||||
<div class="col-sm-12">
|
||||
<hr class="thin-hr">
|
||||
</div>
|
||||
<div class="col-sm-9">
|
||||
<p>
|
||||
<strong class="text-uppercase">{% trans "Price Before VAT" %}</strong>
|
||||
<strong class="pull-right">{{generic_payment_details.amount_before_vat|floatformat:2|intcomma}} CHF</strong>
|
||||
</p>
|
||||
</div>
|
||||
<div class="col-sm-12">
|
||||
<hr class="thin-hr">
|
||||
</div>
|
||||
<div class="col-sm-9">
|
||||
<div class="row">
|
||||
<div class="col-md-4 col-sm-4 col-xs-4">
|
||||
<p><span></span></p>
|
||||
</div>
|
||||
<div class="col-md-3 col-sm-3 col-xs-4">
|
||||
<p class="text-right"><strong class="cmf-ord-heading">{% trans "Pre VAT" %}</strong></p>
|
||||
</div>
|
||||
<div class="col-md-5 col-sm-5 col-xs-4 header-no-left-padding">
|
||||
<p class="text-right"><strong class="cmf-ord-heading">{% trans "VAT for" %} {{generic_payment_details.vat_country}} ({{generic_payment_details.vat_rate}}%)</strong></p>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-sm-9">
|
||||
<p>
|
||||
<strong class="text-uppercase">{% trans "Price Before VAT" %}</strong>
|
||||
<strong class="pull-right">{{generic_payment_details.amount_before_vat|floatformat:2|intcomma}} CHF</strong>
|
||||
</p>
|
||||
<div class="row">
|
||||
<div class="col-md-4 col-sm-4 col-xs-4">
|
||||
<p><span>Price</span></p>
|
||||
</div>
|
||||
<div class="col-md-3 col-sm-3 col-xs-4">
|
||||
<p><span class="pull-right" >{{generic_payment_details.amount_before_vat|floatformat:2|intcomma}} CHF</span></p>
|
||||
</div>
|
||||
<div class="col-md-5 col-sm-5 col-xs-4">
|
||||
<p><span class="pull-right">{{generic_payment_details.amount|floatformat:2|intcomma}} CHF</span></p>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-sm-12">
|
||||
<hr class="thin-hr">
|
||||
</div>
|
||||
<div class="col-sm-12">
|
||||
<hr class="thin-hr">
|
||||
</div>
|
||||
<div class="col-sm-9">
|
||||
<div class="row">
|
||||
<div class="col-md-4 col-sm-4 col-xs-4">
|
||||
<p><strong>Total</strong></p>
|
||||
</div>
|
||||
<div class="col-md-3 col-sm-3 col-xs-4">
|
||||
<p><strong class="pull-right">{{generic_payment_details.amount_before_vat|floatformat:2|intcomma}} CHF</strong></p>
|
||||
</div>
|
||||
<div class="col-md-5 col-sm-5 col-xs-4">
|
||||
<p><strong class="pull-right">{{generic_payment_details.amount|floatformat:2|intcomma}} CHF</strong></p>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-sm-9">
|
||||
<div class="row">
|
||||
<div class="col-md-4 col-sm-4 col-xs-4">
|
||||
<p><span></span></p>
|
||||
</div>
|
||||
<div class="col-md-3 col-sm-3 col-xs-4">
|
||||
<p class="text-right"><strong class="cmf-ord-heading">{% trans "Pre VAT" %}</strong></p>
|
||||
</div>
|
||||
<div class="col-md-5 col-sm-5 col-xs-4 header-no-left-padding">
|
||||
<p class="text-right"><strong class="cmf-ord-heading">{% trans "VAT for" %} {{generic_payment_details.vat_country}} ({{generic_payment_details.vat_rate}}%)</strong></p>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-md-4 col-sm-4 col-xs-4">
|
||||
<p><span>Price</span></p>
|
||||
</div>
|
||||
<div class="col-md-3 col-sm-3 col-xs-4">
|
||||
<p><span class="pull-right" >{{generic_payment_details.amount_before_vat|floatformat:2|intcomma}} CHF</span></p>
|
||||
</div>
|
||||
<div class="col-md-5 col-sm-5 col-xs-4">
|
||||
<p><span class="pull-right">{{generic_payment_details.amount|floatformat:2|intcomma}} CHF</span></p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-sm-12">
|
||||
<hr class="thin-hr">
|
||||
</div>
|
||||
<div class="col-sm-9">
|
||||
<div class="row">
|
||||
<div class="col-md-4 col-sm-4 col-xs-4">
|
||||
<p><strong>Total</strong></p>
|
||||
</div>
|
||||
<div class="col-md-3 col-sm-3 col-xs-4">
|
||||
<p><strong class="pull-right">{{generic_payment_details.amount_before_vat|floatformat:2|intcomma}} CHF</strong></p>
|
||||
</div>
|
||||
<div class="col-md-5 col-sm-5 col-xs-4">
|
||||
<p><strong class="pull-right">{{generic_payment_details.amount|floatformat:2|intcomma}} CHF</strong></p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
{% endif %}
|
||||
</div>
|
||||
<div class="col-sm-12">
|
||||
<hr class="thin-hr">
|
||||
</div>
|
||||
|
|
@ -278,16 +267,15 @@
|
|||
{% if generic_payment_details %}
|
||||
{% if generic_payment_details.recurring %}
|
||||
{% if generic_payment_details.recurring_interval == 'year' %}
|
||||
<div class="dcl-place-order-text">{% blocktrans with total_price=generic_payment_details.amount|floatformat:2|intcomma %} By clicking "Place order" you agree to our <a href="https://datacenterlight.ch/en-us/cms/terms-of-service/">Terms of Service</a> and this plan will charge your credit card account with {{ total_price }} CHF/year{% endblocktrans %}.</div>
|
||||
<div class="dcl-place-order-text">{% blocktrans with total_price=generic_payment_details.amount|floatformat:2|intcomma %}By clicking "Place order" this plan will charge your credit card account with {{total_price}} CHF/year{% endblocktrans %}.</div>
|
||||
{% else %}
|
||||
<div class="dcl-place-order-text">{% blocktrans with total_price=generic_payment_details.amount|floatformat:2|intcomma %}
|
||||
By clicking "Place order" you agree to our <a href="https://datacenterlight.ch/en-us/cms/terms-of-service/">Terms of Service</a> and this plan will charge your credit card account with {{ total_price }} CHF/month{% endblocktrans %}.</div>
|
||||
<div class="dcl-place-order-text">{% blocktrans with total_price=generic_payment_details.amount|floatformat:2|intcomma %}By clicking "Place order" this plan will charge your credit card account with {{total_price}} CHF/month{% endblocktrans %}.</div>
|
||||
{% endif %}
|
||||
{% else %}
|
||||
<div class="dcl-place-order-text">{% blocktrans with total_price=generic_payment_details.amount|floatformat:2|intcomma %}By clicking "Place order" you agree to our <a href="https://datacenterlight.ch/en-us/cms/terms-of-service/">Terms of Service</a> and this plan will charge your credit card account with {{ total_price }} CHF{% endblocktrans %}.</div>
|
||||
<div class="dcl-place-order-text">{% blocktrans with total_price=generic_payment_details.amount|floatformat:2|intcomma %}By clicking "Place order" this payment will charge your credit card account with a one time amount of {{total_price}} CHF{% endblocktrans %}.</div>
|
||||
{% endif %}
|
||||
{% else %}
|
||||
<div class="dcl-place-order-text">{% blocktrans with vm_total_price=vm.total_price|floatformat:2|intcomma %}By clicking "Place order" you agree to our <a href="https://datacenterlight.ch/en-us/cms/terms-of-service/">Terms of Service</a> and this plan will charge your credit card account with {{ vm_total_price }} CHF/month{% endblocktrans %}.</div>
|
||||
<div class="dcl-place-order-text">{% blocktrans with vm_total_price=vm.total_price|floatformat:2|intcomma %}By clicking "Place order" this plan will charge your credit card account with {{vm_total_price}} CHF/month{% endblocktrans %}.</div>
|
||||
{% endif %}
|
||||
</div>
|
||||
<div class="col-sm-4 order-confirm-btn text-right">
|
||||
|
|
@ -330,14 +318,5 @@
|
|||
<script type="text/javascript">
|
||||
{% trans "Some problem encountered. Please try again later." as err_msg %}
|
||||
var create_vm_error_message = '{{err_msg|safe}}';
|
||||
var pm_id = '{{id_payment_method}}';
|
||||
var error_url = '{{ error_msg.redirect }}';
|
||||
var error_msg = '{{ error_msg.msg_body }}';
|
||||
var error_title = '{{ error_msg.msg_title }}';
|
||||
var success_msg = '{{ success_msg.msg_body }}';
|
||||
var success_title = '{{ success_msg.msg_title }}';
|
||||
var success_url = '{{ success_msg.redirect }}';
|
||||
window.stripeKey = "{{stripe_key}}";
|
||||
window.isSubscription = ("{{is_subscription}}" === 'true');
|
||||
</script>
|
||||
{%endblock%}
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ from django.core.urlresolvers import resolve, reverse
|
|||
from django.utils.safestring import mark_safe
|
||||
from django.utils.translation import activate, get_language, ugettext_lazy as _
|
||||
|
||||
from hosting.models import GenericProduct, HostingOrder
|
||||
from hosting.models import GenericProduct
|
||||
from utils.hosting_utils import get_ip_addresses
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
|
@ -63,41 +63,6 @@ def escaped_line_break(value):
|
|||
return value.replace("\\n", "\n")
|
||||
|
||||
|
||||
@register.filter('get_line_item_from_hosting_order_charge')
|
||||
def get_line_item_from_hosting_order_charge(hosting_order_id):
|
||||
"""
|
||||
Returns ready-to-use "html" line item to be shown for a charge in the
|
||||
invoice list page
|
||||
|
||||
:param hosting_order_id: the HostingOrder id
|
||||
:return:
|
||||
"""
|
||||
try:
|
||||
hosting_order = HostingOrder.objects.get(id = hosting_order_id)
|
||||
if hosting_order.stripe_charge_id:
|
||||
return mark_safe("""
|
||||
<td class="xs-td-inline">{product_name}</td>
|
||||
<td class="xs-td-inline">{created_at}</td>
|
||||
<td class="xs-td-inline">{total}</td>
|
||||
<td class="text-right last-td">
|
||||
<a class="btn btn-order-detail" href="{receipt_url}" target="_blank">{see_invoice_text}</a>
|
||||
</td>
|
||||
""".format(
|
||||
product_name=hosting_order.generic_product.product_name.capitalize(),
|
||||
created_at=hosting_order.created_at.strftime('%Y-%m-%d'),
|
||||
total='%.2f' % (hosting_order.price),
|
||||
receipt_url=reverse('hosting:orders',
|
||||
kwargs={'pk': hosting_order.id}),
|
||||
|
||||
see_invoice_text=_("See Invoice")
|
||||
))
|
||||
else:
|
||||
return ""
|
||||
except Exception as ex:
|
||||
logger.error("Error %s" % str(ex))
|
||||
return ""
|
||||
|
||||
|
||||
@register.filter('get_line_item_from_stripe_invoice')
|
||||
def get_line_item_from_stripe_invoice(invoice):
|
||||
"""
|
||||
|
|
@ -114,7 +79,7 @@ def get_line_item_from_stripe_invoice(invoice):
|
|||
plan_name = ""
|
||||
for line_data in invoice["lines"]["data"]:
|
||||
if is_first:
|
||||
plan_name = line_data.plan.name if line_data.plan is not None else ""
|
||||
plan_name = line_data.plan.name
|
||||
start_date = line_data.period.start
|
||||
end_date = line_data.period.end
|
||||
is_first = False
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@ logger = logging.getLogger(__name__)
|
|||
|
||||
eu_countries = ['at', 'be', 'bg', 'ch', 'cy', 'cz', 'hr', 'dk',
|
||||
'ee', 'fi', 'fr', 'mc', 'de', 'gr', 'hu', 'ie', 'it',
|
||||
'lv', 'lu', 'mt', 'nl', 'pl', 'pt', 'ro','sk', 'si', 'es',
|
||||
'lv', 'lu', 'mt', 'nl', 'po', 'pt', 'ro','sk', 'si', 'es',
|
||||
'se', 'gb']
|
||||
|
||||
|
||||
|
|
@ -38,7 +38,6 @@ def get_cms_integration(name):
|
|||
def create_vm(billing_address_data, stripe_customer_id, specs,
|
||||
stripe_subscription_obj, card_details_dict, request,
|
||||
vm_template_id, template, user):
|
||||
logger.debug("In create_vm")
|
||||
billing_address = BillingAddress(
|
||||
cardholder_name=billing_address_data['cardholder_name'],
|
||||
street_address=billing_address_data['street_address'],
|
||||
|
|
@ -103,6 +102,8 @@ def create_vm(billing_address_data, stripe_customer_id, specs,
|
|||
|
||||
create_vm_task.delay(vm_template_id, user, specs, template, order.id)
|
||||
|
||||
clear_all_session_vars(request)
|
||||
|
||||
|
||||
def clear_all_session_vars(request):
|
||||
if request.session is not None:
|
||||
|
|
@ -111,8 +112,7 @@ def clear_all_session_vars(request):
|
|||
'token', 'customer', 'generic_payment_type',
|
||||
'generic_payment_details', 'product_id',
|
||||
'order_confirm_url', 'new_user_hosting_key_id',
|
||||
'vat_validation_status', 'billing_address_id',
|
||||
'id_payment_method']:
|
||||
'vat_validation_status', 'billing_address_id']:
|
||||
if session_var in request.session:
|
||||
del request.session[session_var]
|
||||
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -42,7 +42,7 @@ def int_env(val, default_value=0):
|
|||
"details: {}").format(
|
||||
val, str(e)))
|
||||
|
||||
return return_value
|
||||
return return_value if return_value is not None else default_value
|
||||
|
||||
|
||||
BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
|
||||
|
|
@ -761,15 +761,7 @@ OTP_VERIFY_ENDPOINT = env('OTP_VERIFY_ENDPOINT')
|
|||
FIRST_VM_ID_AFTER_EU_VAT = int_env('FIRST_VM_ID_AFTER_EU_VAT')
|
||||
PRE_EU_VAT_RATE = float(env('PRE_EU_VAT_RATE'))
|
||||
|
||||
VM_BASE_PRICE = float(env('VM_BASE_PRICE'))
|
||||
|
||||
UPDATED_TEMPLATES_STR = env('UPDATED_TEMPLATES')
|
||||
UPDATED_TEMPLATES_DICT = {}
|
||||
if UPDATED_TEMPLATES_STR:
|
||||
UPDATED_TEMPLATES_DICT = eval(UPDATED_TEMPLATES_STR)
|
||||
|
||||
MAX_TIME_TO_WAIT_FOR_VM_TERMINATE = int_env(
|
||||
'MAX_TIME_TO_WAIT_FOR_VM_TERMINATE', 15)
|
||||
MAX_USERNAME_LENGTH = int_env('MAX_USERNAME_LENGTH', 64)
|
||||
|
||||
if DEBUG:
|
||||
from .local import * # flake8: noqa
|
||||
|
|
|
|||
|
|
@ -2,7 +2,6 @@ import datetime
|
|||
import logging
|
||||
import subprocess
|
||||
import tempfile
|
||||
import xml
|
||||
|
||||
from django import forms
|
||||
from django.conf import settings
|
||||
|
|
@ -208,7 +207,7 @@ class UserHostingKeyForm(forms.ModelForm):
|
|||
logger.debug(
|
||||
"Not a correct ssh format {error}".format(error=str(cpe)))
|
||||
raise forms.ValidationError(KEY_ERROR_MESSAGE)
|
||||
return xml.sax.saxutils.escape(openssh_pubkey_str)
|
||||
return openssh_pubkey_str
|
||||
|
||||
def clean_name(self):
|
||||
INVALID_NAME_MESSAGE = _("Comma not accepted in the name of the key")
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ msgid ""
|
|||
msgstr ""
|
||||
"Project-Id-Version: PACKAGE VERSION\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2021-02-07 10:19+0000\n"
|
||||
"POT-Creation-Date: 2019-11-15 16:40+0000\n"
|
||||
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
|
||||
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||
|
|
@ -211,9 +211,6 @@ msgstr "Bezahlbares VM Hosting in der Schweiz"
|
|||
msgid "My Dashboard"
|
||||
msgstr "Mein Dashboard"
|
||||
|
||||
msgid "Welcome"
|
||||
msgstr ""
|
||||
|
||||
msgid "My VMs"
|
||||
msgstr "Meine VMs"
|
||||
|
||||
|
|
@ -367,11 +364,6 @@ msgstr "Abgelehnt"
|
|||
msgid "Billed to"
|
||||
msgstr "Rechnungsadresse"
|
||||
|
||||
#, fuzzy
|
||||
#| msgid "Card Number"
|
||||
msgid "VAT Number"
|
||||
msgstr "Kreditkartennummer"
|
||||
|
||||
msgid "Payment method"
|
||||
msgstr "Bezahlmethode"
|
||||
|
||||
|
|
@ -399,9 +391,6 @@ msgstr "Festplattenkapazität"
|
|||
msgid "Subtotal"
|
||||
msgstr "Zwischensumme"
|
||||
|
||||
msgid "VAT for"
|
||||
msgstr ""
|
||||
|
||||
msgid "VAT"
|
||||
msgstr "Mehrwertsteuer"
|
||||
|
||||
|
|
@ -435,22 +424,18 @@ msgstr "ZURÜCK ZUR LISTE"
|
|||
msgid "Some problem encountered. Please try again later."
|
||||
msgstr "Ein Problem ist aufgetreten. Bitte versuche es später noch einmal."
|
||||
|
||||
#, fuzzy
|
||||
#| msgid "Description"
|
||||
msgid "Subscriptions"
|
||||
msgstr "Beschreibung"
|
||||
|
||||
#, fuzzy
|
||||
#| msgid "One time payment"
|
||||
msgid "One-time payments"
|
||||
msgstr "Einmalzahlung"
|
||||
|
||||
msgid "VM ID"
|
||||
msgstr ""
|
||||
|
||||
msgid "IP Address"
|
||||
msgstr "IP-Adresse"
|
||||
|
||||
msgid "See Invoice"
|
||||
msgstr "Siehe Rechnung"
|
||||
|
||||
msgid "Page"
|
||||
msgstr "Seite"
|
||||
|
||||
msgid "Log in"
|
||||
msgstr "Anmelden"
|
||||
|
||||
|
|
@ -495,13 +480,11 @@ msgstr "Bestellungsübersicht"
|
|||
|
||||
#, python-format
|
||||
msgid ""
|
||||
"By clicking \"Place order\" you agree to our <a href=\"https://"
|
||||
"datacenterlight.ch/en-us/cms/terms-of-service/\">Terms of Service</a> and "
|
||||
"this plan will charge your credit card account with %(vm_price)s CHF/month."
|
||||
"By clicking \"Place order\" this plan will charge your credit card account "
|
||||
"with %(vm_price)s CHF/month"
|
||||
msgstr ""
|
||||
"Indem Du auf \"Bestellung aufgeben\" klickst, erklärst Du dich mit unseren"
|
||||
" <a href=\"https://"
|
||||
"datacenterlight.ch/de/cms/terms-of-service/\">Nutzungsbedingungen</a> einverstanden und Dein Kreditkartenkonto wird mit %(vm_price)s CHF/Monat belastet."
|
||||
"Wenn Du \"bestellen\" auswählst, wird Deine Kreditkarte mit %(vm_price)s CHF "
|
||||
"pro Monat belastet"
|
||||
|
||||
msgid "Place order"
|
||||
msgstr "Bestellen"
|
||||
|
|
@ -521,12 +504,6 @@ msgstr "Schliessen"
|
|||
msgid "Order Nr."
|
||||
msgstr "Bestellung Nr."
|
||||
|
||||
msgid "See Invoice"
|
||||
msgstr "Siehe Rechnung"
|
||||
|
||||
msgid "Page"
|
||||
msgstr "Seite"
|
||||
|
||||
msgid "Your Order"
|
||||
msgstr "Deine Bestellung"
|
||||
|
||||
|
|
@ -595,19 +572,6 @@ msgstr "Absenden"
|
|||
msgid "Password reset"
|
||||
msgstr "Passwort zurücksetzen"
|
||||
|
||||
#, fuzzy
|
||||
#| msgid "Key name"
|
||||
msgid "My Username"
|
||||
msgstr "Key-Name"
|
||||
|
||||
msgid "Your VAT number has been verified"
|
||||
msgstr ""
|
||||
|
||||
msgid ""
|
||||
"Your VAT number is under validation. VAT will be adjusted, once the "
|
||||
"validation is complete."
|
||||
msgstr ""
|
||||
|
||||
msgid "UPDATE"
|
||||
msgstr "AKTUALISIEREN"
|
||||
|
||||
|
|
@ -809,15 +773,21 @@ msgstr "Dein Passwort konnte nicht zurückgesetzt werden."
|
|||
msgid "The reset password link is no longer valid."
|
||||
msgstr "Der Link zum Zurücksetzen Deines Passwortes ist nicht mehr gültig."
|
||||
|
||||
msgid "Could not set a default card."
|
||||
msgstr ""
|
||||
|
||||
msgid "Card deassociation successful"
|
||||
msgstr "Die Verbindung mit der Karte wurde erfolgreich aufgehoben"
|
||||
|
||||
msgid "You are not permitted to do this operation"
|
||||
msgstr "Du hast keine Erlaubnis um diese Operation durchzuführen"
|
||||
|
||||
msgid "The selected card does not exist"
|
||||
msgstr "Die ausgewählte Karte existiert nicht"
|
||||
|
||||
msgid "Billing address updated successfully"
|
||||
msgstr "Die Rechnungsadresse wurde erfolgreich aktualisiert"
|
||||
|
||||
msgid "You seem to have already added this card"
|
||||
msgstr "Es scheint, als hättest du diese Karte bereits hinzugefügt"
|
||||
|
||||
#, python-brace-format
|
||||
msgid "An error occurred while associating the card. Details: {details}"
|
||||
msgstr ""
|
||||
|
|
@ -882,8 +852,7 @@ msgstr "Ungültige Speicher-Grösse"
|
|||
|
||||
#, python-brace-format
|
||||
msgid "Incorrect pricing name. Please contact support{support_email}"
|
||||
msgstr ""
|
||||
"Ungültige Preisbezeichnung. Bitte kontaktiere den Support{support_email}"
|
||||
msgstr "Ungültige Preisbezeichnung. Bitte kontaktiere den Support{support_email}"
|
||||
|
||||
msgid ""
|
||||
"We could not find the requested VM. Please "
|
||||
|
|
@ -902,9 +871,7 @@ msgstr "Fehler beenden VM"
|
|||
msgid ""
|
||||
"VM terminate action timed out. Please contact support@datacenterlight.ch for "
|
||||
"further information."
|
||||
msgstr ""
|
||||
"VM beendet wegen Zeitüberschreitung. Bitte kontaktiere "
|
||||
"support@datacenterlight.ch für weitere Informationen."
|
||||
msgstr "VM beendet wegen Zeitüberschreitung. Bitte kontaktiere support@datacenterlight.ch für weitere Informationen."
|
||||
|
||||
#, python-format
|
||||
msgid "Virtual Machine %(vm_name)s Cancelled"
|
||||
|
|
@ -915,15 +882,6 @@ msgstr ""
|
|||
"Es gab einen Fehler bei der Bearbeitung Deine Anfrage. Bitte versuche es "
|
||||
"noch einmal."
|
||||
|
||||
#~ msgid "You are not permitted to do this operation"
|
||||
#~ msgstr "Du hast keine Erlaubnis um diese Operation durchzuführen"
|
||||
|
||||
#~ msgid "The selected card does not exist"
|
||||
#~ msgstr "Die ausgewählte Karte existiert nicht"
|
||||
|
||||
#~ msgid "You seem to have already added this card"
|
||||
#~ msgstr "Es scheint, als hättest du diese Karte bereits hinzugefügt"
|
||||
|
||||
#, python-format
|
||||
#~ msgid "This key exists already with the name \"%(name)s\""
|
||||
#~ msgstr "Der SSH-Key mit dem Name \"%(name)s\" existiert bereits"
|
||||
|
|
|
|||
|
|
@ -1,33 +0,0 @@
|
|||
# -*- coding: utf-8 -*-
|
||||
# Generated by Django 1.9.4 on 2020-06-30 19:12
|
||||
from __future__ import unicode_literals
|
||||
|
||||
from django.db import migrations
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('hosting', '0059_stripetaxrate'),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.RunSQL(
|
||||
sql=["update hosting_vatrates set stop_date = '2020-06-30' where territory_codes = 'DE' and rate = '0.19'"],
|
||||
reverse_sql=[
|
||||
"update hosting_vatrates set stop_date = null where stop_date = '2020-06-30' and territory_codes = 'DE' and rate = '0.19'"],
|
||||
),
|
||||
migrations.RunSQL(
|
||||
sql=[
|
||||
"insert into hosting_vatrates (start_date, stop_date, territory_codes, currency_code, rate, rate_type, description) values ('2020-07-01',null,'DE', 'EUR', '0.16', 'standard', 'Germany (member state) standard VAT rate - COVID 19 reduced rate')"],
|
||||
reverse_sql=[
|
||||
"delete from hosting_vatrates where description = 'Germany (member state) standard VAT rate - COVID 19 reduced rate' and start_date = '2020-07-01' and territory_codes = 'DE'" ],
|
||||
),
|
||||
|
||||
migrations.RunSQL(
|
||||
sql=[
|
||||
"update hosting_stripetaxrate set description = 'VAT for DE pre-COVID-19' where description = 'VAT for DE'"],
|
||||
reverse_sql=[
|
||||
"update hosting_stripetaxrate set description = 'VAT for DE' where description = 'VAT for DE pre-COVID-19'"],
|
||||
),
|
||||
]
|
||||
|
|
@ -1,20 +0,0 @@
|
|||
# -*- coding: utf-8 -*-
|
||||
# Generated by Django 1.9.4 on 2020-07-21 16:32
|
||||
from __future__ import unicode_literals
|
||||
|
||||
from django.db import migrations, models
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('hosting', '0060_update_DE_vat_covid-19'),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.AddField(
|
||||
model_name='genericproduct',
|
||||
name='exclude_vat_calculations',
|
||||
field=models.BooleanField(default=False, help_text='When checked VAT calculations are excluded for this product'),
|
||||
),
|
||||
]
|
||||
|
|
@ -1,39 +0,0 @@
|
|||
# -*- coding: utf-8 -*-
|
||||
# Generated by Django 1.9.4 on 2020-12-23 05:36
|
||||
from __future__ import unicode_literals
|
||||
|
||||
from django.db import migrations, models
|
||||
import utils.mixins
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('hosting', '0061_genericproduct_exclude_vat_calculations'),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.CreateModel(
|
||||
name='IncompleteSubscriptions',
|
||||
fields=[
|
||||
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
|
||||
('created_at', models.DateTimeField(auto_now_add=True)),
|
||||
('completed_at', models.DateTimeField()),
|
||||
('subscription_id', models.CharField(max_length=100)),
|
||||
('subscription_status', models.CharField(max_length=30)),
|
||||
('name', models.CharField(max_length=50)),
|
||||
('email', models.EmailField(max_length=254)),
|
||||
('request', models.TextField()),
|
||||
('stripe_api_cus_id', models.CharField(max_length=30)),
|
||||
('card_details_response', models.TextField()),
|
||||
('stripe_subscription_obj', models.TextField()),
|
||||
('stripe_onetime_charge', models.TextField()),
|
||||
('gp_details', models.TextField()),
|
||||
('specs', models.TextField()),
|
||||
('vm_template_id', models.PositiveIntegerField(default=0)),
|
||||
('template', models.TextField()),
|
||||
('billing_address_data', models.TextField()),
|
||||
],
|
||||
bases=(utils.mixins.AssignPermissionsMixin, models.Model),
|
||||
),
|
||||
]
|
||||
|
|
@ -1,33 +0,0 @@
|
|||
# -*- coding: utf-8 -*-
|
||||
# Generated by Django 1.9.4 on 2020-12-31 10:13
|
||||
from __future__ import unicode_literals
|
||||
|
||||
from django.db import migrations, models
|
||||
import utils.mixins
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('hosting', '0063_auto_20201223_0612'),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.CreateModel(
|
||||
name='IncompletePaymentIntents',
|
||||
fields=[
|
||||
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
|
||||
('completed_at', models.DateTimeField(null=True)),
|
||||
('created_at', models.DateTimeField(auto_now_add=True)),
|
||||
('payment_intent_id', models.CharField(max_length=100)),
|
||||
('request', models.TextField()),
|
||||
('stripe_api_cus_id', models.CharField(max_length=30)),
|
||||
('card_details_response', models.TextField()),
|
||||
('stripe_subscription_id', models.TextField()),
|
||||
('stripe_charge_id', models.TextField()),
|
||||
('gp_details', models.TextField()),
|
||||
('billing_address_data', models.TextField()),
|
||||
],
|
||||
bases=(utils.mixins.AssignPermissionsMixin, models.Model),
|
||||
),
|
||||
]
|
||||
|
|
@ -1,25 +0,0 @@
|
|||
# -*- coding: utf-8 -*-
|
||||
# Generated by Django 1.9.4 on 2020-12-31 10:41
|
||||
from __future__ import unicode_literals
|
||||
|
||||
from django.db import migrations, models
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('hosting', '0064_incompletepaymentintents'),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.AlterField(
|
||||
model_name='incompletepaymentintents',
|
||||
name='stripe_charge_id',
|
||||
field=models.CharField(max_length=100, null=True),
|
||||
),
|
||||
migrations.AlterField(
|
||||
model_name='incompletepaymentintents',
|
||||
name='stripe_subscription_id',
|
||||
field=models.CharField(max_length=100, null=True),
|
||||
),
|
||||
]
|
||||
|
|
@ -1,3 +1,4 @@
|
|||
import decimal
|
||||
import json
|
||||
import logging
|
||||
import os
|
||||
|
|
@ -81,22 +82,15 @@ class GenericProduct(AssignPermissionsMixin, models.Model):
|
|||
product_subscription_interval = models.CharField(
|
||||
max_length=10, default="month",
|
||||
help_text="Choose between `year` and `month`")
|
||||
exclude_vat_calculations = models.BooleanField(
|
||||
default=False,
|
||||
help_text="When checked VAT calculations are excluded for this product"
|
||||
)
|
||||
|
||||
def __str__(self):
|
||||
return self.product_name
|
||||
|
||||
def get_actual_price(self, vat_rate=None):
|
||||
if self.exclude_vat_calculations:
|
||||
return round(float(self.product_price), 2)
|
||||
else:
|
||||
VAT = vat_rate if vat_rate is not None else self.product_vat
|
||||
return round(
|
||||
float(self.product_price) + float(self.product_price) * float(VAT), 2
|
||||
)
|
||||
VAT = vat_rate if vat_rate is not None else self.product_vat
|
||||
return round(
|
||||
float(self.product_price) + float(self.product_price) * float(VAT), 2
|
||||
)
|
||||
|
||||
|
||||
class HostingOrder(AssignPermissionsMixin, models.Model):
|
||||
|
|
@ -169,12 +163,8 @@ class HostingOrder(AssignPermissionsMixin, models.Model):
|
|||
|
||||
def set_stripe_charge(self, stripe_charge):
|
||||
self.stripe_charge_id = stripe_charge.id
|
||||
if stripe_charge.source is None:
|
||||
self.last4 = stripe_charge.payment_method_details.card.last4
|
||||
self.cc_brand = stripe_charge.payment_method_details.card.brand
|
||||
else:
|
||||
self.last4 = stripe_charge.source.last4
|
||||
self.cc_brand = stripe_charge.source.brand
|
||||
self.last4 = stripe_charge.source.last4
|
||||
self.cc_brand = stripe_charge.source.brand
|
||||
self.save()
|
||||
|
||||
def set_subscription_id(self, subscription_id, cc_details):
|
||||
|
|
@ -676,11 +666,7 @@ class UserCardDetail(AssignPermissionsMixin, models.Model):
|
|||
stripe_utils = StripeUtils()
|
||||
cus_response = stripe_utils.get_customer(stripe_api_cus_id)
|
||||
cu = cus_response['response_object']
|
||||
if stripe_source_id.startswith("pm"):
|
||||
# card is a payment method
|
||||
cu.invoice_settings.default_payment_method = stripe_source_id
|
||||
else:
|
||||
cu.default_source = stripe_source_id
|
||||
cu.default_source = stripe_source_id
|
||||
cu.save()
|
||||
UserCardDetail.save_default_card_local(
|
||||
stripe_api_cus_id, stripe_source_id
|
||||
|
|
@ -748,35 +734,3 @@ class StripeTaxRate(AssignPermissionsMixin, models.Model):
|
|||
display_name = models.CharField(max_length=100)
|
||||
percentage = models.FloatField(default=0)
|
||||
description = models.CharField(max_length=100)
|
||||
|
||||
|
||||
class IncompletePaymentIntents(AssignPermissionsMixin, models.Model):
|
||||
completed_at = models.DateTimeField(null=True)
|
||||
created_at = models.DateTimeField(auto_now_add=True)
|
||||
payment_intent_id = models.CharField(max_length=100)
|
||||
request = models.TextField()
|
||||
stripe_api_cus_id = models.CharField(max_length=30)
|
||||
card_details_response = models.TextField()
|
||||
stripe_subscription_id = models.CharField(max_length=100, null=True)
|
||||
stripe_charge_id = models.CharField(max_length=100, null=True)
|
||||
gp_details = models.TextField()
|
||||
billing_address_data = models.TextField()
|
||||
|
||||
|
||||
class IncompleteSubscriptions(AssignPermissionsMixin, models.Model):
|
||||
created_at = models.DateTimeField(auto_now_add=True)
|
||||
completed_at = models.DateTimeField(null=True)
|
||||
subscription_id = models.CharField(max_length=100)
|
||||
subscription_status = models.CharField(max_length=30)
|
||||
name = models.CharField(max_length=50)
|
||||
email = models.EmailField()
|
||||
request = models.TextField()
|
||||
stripe_api_cus_id = models.CharField(max_length=30)
|
||||
card_details_response = models.TextField()
|
||||
stripe_subscription_obj = models.TextField()
|
||||
stripe_onetime_charge = models.TextField()
|
||||
gp_details = models.TextField()
|
||||
specs = models.TextField()
|
||||
vm_template_id = models.PositiveIntegerField(default=0)
|
||||
template = models.TextField()
|
||||
billing_address_data = models.TextField()
|
||||
|
|
@ -266,8 +266,8 @@ $( document ).ready(function() {
|
|||
}
|
||||
var total = (cardPricing['cpu'].value * window.coresUnitPrice) +
|
||||
(cardPricing['ram'].value * window.ramUnitPrice) +
|
||||
(cardPricing['storage'].value * window.ssdUnitPrice) +
|
||||
window.vmBasePrice - window.discountAmount;
|
||||
(cardPricing['storage'].value * window.ssdUnitPrice) -
|
||||
window.discountAmount;
|
||||
total = parseFloat(total.toFixed(2));
|
||||
$("#total").text(total);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -84,72 +84,68 @@ $(document).ready(function () {
|
|||
var hasCreditcard = window.hasCreditcard || false;
|
||||
if (!hasCreditcard && window.stripeKey) {
|
||||
var stripe = Stripe(window.stripeKey);
|
||||
if (window.pm_id) {
|
||||
|
||||
} else {
|
||||
var element_style = {
|
||||
fonts: [{
|
||||
family: 'lato-light',
|
||||
src: 'url(https://cdn.jsdelivr.net/font-lato/2.0/Lato/Lato-Light.woff) format("woff2")'
|
||||
}, {
|
||||
family: 'lato-regular',
|
||||
src: 'url(https://cdn.jsdelivr.net/font-lato/2.0/Lato/Lato-Regular.woff) format("woff2")'
|
||||
}
|
||||
],
|
||||
locale: window.current_lan
|
||||
};
|
||||
var elements = stripe.elements(element_style);
|
||||
var credit_card_text_style = {
|
||||
base: {
|
||||
iconColor: '#666EE8',
|
||||
color: '#31325F',
|
||||
lineHeight: '25px',
|
||||
fontWeight: 300,
|
||||
fontFamily: "'lato-light', sans-serif",
|
||||
fontSize: '14px',
|
||||
'::placeholder': {
|
||||
color: '#777'
|
||||
}
|
||||
},
|
||||
invalid: {
|
||||
iconColor: '#eb4d5c',
|
||||
color: '#eb4d5c',
|
||||
lineHeight: '25px',
|
||||
fontWeight: 300,
|
||||
fontFamily: "'lato-regular', sans-serif",
|
||||
fontSize: '14px',
|
||||
'::placeholder': {
|
||||
color: '#eb4d5c',
|
||||
fontWeight: 400
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
var enter_ccard_text = "Enter your credit card number";
|
||||
if (typeof window.enter_your_card_text !== 'undefined') {
|
||||
enter_ccard_text = window.enter_your_card_text;
|
||||
var element_style = {
|
||||
fonts: [{
|
||||
family: 'lato-light',
|
||||
src: 'url(https://cdn.jsdelivr.net/font-lato/2.0/Lato/Lato-Light.woff) format("woff2")'
|
||||
}, {
|
||||
family: 'lato-regular',
|
||||
src: 'url(https://cdn.jsdelivr.net/font-lato/2.0/Lato/Lato-Regular.woff) format("woff2")'
|
||||
}
|
||||
var cardNumberElement = elements.create('cardNumber', {
|
||||
style: credit_card_text_style,
|
||||
placeholder: enter_ccard_text
|
||||
});
|
||||
cardNumberElement.mount('#card-number-element');
|
||||
|
||||
var cardExpiryElement = elements.create('cardExpiry', {
|
||||
style: credit_card_text_style
|
||||
});
|
||||
cardExpiryElement.mount('#card-expiry-element');
|
||||
|
||||
var cardCvcElement = elements.create('cardCvc', {
|
||||
style: credit_card_text_style
|
||||
});
|
||||
cardCvcElement.mount('#card-cvc-element');
|
||||
cardNumberElement.on('change', function (event) {
|
||||
if (event.brand) {
|
||||
setBrandIcon(event.brand);
|
||||
],
|
||||
locale: window.current_lan
|
||||
};
|
||||
var elements = stripe.elements(element_style);
|
||||
var credit_card_text_style = {
|
||||
base: {
|
||||
iconColor: '#666EE8',
|
||||
color: '#31325F',
|
||||
lineHeight: '25px',
|
||||
fontWeight: 300,
|
||||
fontFamily: "'lato-light', sans-serif",
|
||||
fontSize: '14px',
|
||||
'::placeholder': {
|
||||
color: '#777'
|
||||
}
|
||||
});
|
||||
},
|
||||
invalid: {
|
||||
iconColor: '#eb4d5c',
|
||||
color: '#eb4d5c',
|
||||
lineHeight: '25px',
|
||||
fontWeight: 300,
|
||||
fontFamily: "'lato-regular', sans-serif",
|
||||
fontSize: '14px',
|
||||
'::placeholder': {
|
||||
color: '#eb4d5c',
|
||||
fontWeight: 400
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
var enter_ccard_text = "Enter your credit card number";
|
||||
if (typeof window.enter_your_card_text !== 'undefined') {
|
||||
enter_ccard_text = window.enter_your_card_text;
|
||||
}
|
||||
var cardNumberElement = elements.create('cardNumber', {
|
||||
style: credit_card_text_style,
|
||||
placeholder: enter_ccard_text
|
||||
});
|
||||
cardNumberElement.mount('#card-number-element');
|
||||
|
||||
var cardExpiryElement = elements.create('cardExpiry', {
|
||||
style: credit_card_text_style
|
||||
});
|
||||
cardExpiryElement.mount('#card-expiry-element');
|
||||
|
||||
var cardCvcElement = elements.create('cardCvc', {
|
||||
style: credit_card_text_style
|
||||
});
|
||||
cardCvcElement.mount('#card-cvc-element');
|
||||
cardNumberElement.on('change', function (event) {
|
||||
if (event.brand) {
|
||||
setBrandIcon(event.brand);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
var submit_form_btn = $('#payment_button_with_creditcard');
|
||||
|
|
@ -167,7 +163,7 @@ $(document).ready(function () {
|
|||
if (parts.length === 2) return parts.pop().split(";").shift();
|
||||
}
|
||||
|
||||
function submitBillingForm(pmId) {
|
||||
function submitBillingForm() {
|
||||
var billing_form = $('#billing-form');
|
||||
var recurring_input = $('#id_generic_payment_form-recurring');
|
||||
billing_form.append('<input type="hidden" name="generic_payment_form-product_name" value="' + $('#id_generic_payment_form-product_name').val() + '" />');
|
||||
|
|
@ -178,40 +174,11 @@ $(document).ready(function () {
|
|||
billing_form.append('<input type="hidden" name="generic_payment_form-recurring" value="' + (recurring_input.prop('checked') ? 'on' : '') + '" />');
|
||||
}
|
||||
billing_form.append('<input type="hidden" name="generic_payment_form-description" value="' + $('#id_generic_payment_form-description').val() + '" />');
|
||||
billing_form.append('<input type="hidden" name="id_payment_method" value="' + pmId + '" />');
|
||||
billing_form.submit();
|
||||
}
|
||||
|
||||
var $form_new = $('#payment-form-new');
|
||||
$form_new.submit(payWithPaymentIntent);
|
||||
window.result = "";
|
||||
window.card = "";
|
||||
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) {
|
||||
// Handle result.error or result.paymentMethod
|
||||
window.result = result;
|
||||
if(result.error) {
|
||||
var errorElement = document.getElementById('card-errors');
|
||||
errorElement.textContent = result.error.message;
|
||||
} else {
|
||||
console.log("created paymentMethod " + result.paymentMethod.id);
|
||||
stripePMHandler(result.paymentMethod);
|
||||
}
|
||||
});
|
||||
window.card = cardNumberElement;
|
||||
}
|
||||
$form_new.submit(payWithStripe_new);
|
||||
function payWithStripe_new(e) {
|
||||
e.preventDefault();
|
||||
|
||||
|
|
@ -230,7 +197,7 @@ $(document).ready(function () {
|
|||
} else {
|
||||
var process_text = "Processing";
|
||||
if (typeof window.processing_text !== 'undefined') {
|
||||
process_text = window.processing_text;
|
||||
process_text = window.processing_text
|
||||
}
|
||||
|
||||
$form_new.find('[type=submit]').html(process_text + ' <i class="fa fa-spinner fa-pulse"></i>');
|
||||
|
|
|
|||
|
|
@ -92,117 +92,50 @@ $(document).ready(function() {
|
|||
});
|
||||
|
||||
var create_vm_form = $('#virtual_machine_create_form');
|
||||
if (window.isSubscription) {
|
||||
create_vm_form.submit(function () {
|
||||
$('#btn-create-vm').prop('disabled', true);
|
||||
$.ajax({
|
||||
url: create_vm_form.attr('action'),
|
||||
type: 'POST',
|
||||
data: create_vm_form.serialize(),
|
||||
init: function () {
|
||||
ok_btn = $('#createvm-modal-done-btn');
|
||||
close_btn = $('#createvm-modal-close-btn');
|
||||
ok_btn.addClass('btn btn-success btn-ok btn-wide hide');
|
||||
close_btn.addClass('btn btn-danger btn-ok btn-wide hide');
|
||||
},
|
||||
success: function (data) {
|
||||
fa_icon = $('.modal-icon > .fa');
|
||||
modal_btn = $('#createvm-modal-done-btn');
|
||||
if (data.showSCA) {
|
||||
console.log("Show SCA");
|
||||
var stripe = Stripe(data.STRIPE_PUBLISHABLE_KEY);
|
||||
stripe.confirmCardPayment(data.payment_intent_secret).then(function (result) {
|
||||
if (result.error) {
|
||||
// Display error.message in your UI.
|
||||
modal_btn.attr('href', data.error.redirect).removeClass('hide');
|
||||
fa_icon.attr('class', 'fa fa-close');
|
||||
modal_btn.attr('class', '').addClass('btn btn-danger btn-ok btn-wide');
|
||||
$('#createvm-modal-title').text(data.error.msg_title);
|
||||
$('#createvm-modal-body').html(data.error.msg_body);
|
||||
} else {
|
||||
// The payment has succeeded. Display a success message.
|
||||
modal_btn.attr('href', data.success.redirect).removeClass('hide');
|
||||
fa_icon.attr('class', 'checkmark');
|
||||
$('#createvm-modal-title').text(data.success.msg_title);
|
||||
$('#createvm-modal-body').html(data.success.msg_body);
|
||||
}
|
||||
});
|
||||
$('#3Dsecure-modal').show();
|
||||
} else {
|
||||
$('#createvm-modal-title').text(data.msg_title);
|
||||
$('#createvm-modal-body').html(data.msg_body);
|
||||
if (data.redirect) {
|
||||
modal_btn.attr('href', data.redirect).removeClass('hide');
|
||||
} else {
|
||||
modal_btn.attr('href', "");
|
||||
}
|
||||
if (data.status === true) {
|
||||
fa_icon.attr('class', 'checkmark');
|
||||
} else {
|
||||
fa_icon.attr('class', 'fa fa-close');
|
||||
modal_btn.attr('class', '').addClass('btn btn-danger btn-ok btn-wide');
|
||||
}
|
||||
}
|
||||
},
|
||||
error: function (xmlhttprequest, textstatus, message) {
|
||||
create_vm_form.submit(function () {
|
||||
$('#btn-create-vm').prop('disabled', true);
|
||||
$.ajax({
|
||||
url: create_vm_form.attr('action'),
|
||||
type: 'POST',
|
||||
data: create_vm_form.serialize(),
|
||||
init: function(){
|
||||
ok_btn = $('#createvm-modal-done-btn');
|
||||
close_btn = $('#createvm-modal-close-btn');
|
||||
ok_btn.addClass('btn btn-success btn-ok btn-wide hide');
|
||||
close_btn.addClass('btn btn-danger btn-ok btn-wide hide');
|
||||
},
|
||||
success: function (data) {
|
||||
fa_icon = $('.modal-icon > .fa');
|
||||
modal_btn = $('#createvm-modal-done-btn');
|
||||
$('#createvm-modal-title').text(data.msg_title);
|
||||
$('#createvm-modal-body').html(data.msg_body);
|
||||
if (data.redirect) {
|
||||
modal_btn.attr('href', data.redirect).removeClass('hide');
|
||||
} else {
|
||||
modal_btn.attr('href', "");
|
||||
}
|
||||
if (data.status === true) {
|
||||
fa_icon.attr('class', 'checkmark');
|
||||
} else {
|
||||
fa_icon.attr('class', 'fa fa-close');
|
||||
modal_btn.attr('class', '').addClass('btn btn-danger btn-ok btn-wide');
|
||||
}
|
||||
},
|
||||
error: function (xmlhttprequest, textstatus, message) {
|
||||
fa_icon = $('.modal-icon > .fa');
|
||||
fa_icon.attr('class', 'fa fa-close');
|
||||
if (typeof (create_vm_error_message) !== 'undefined') {
|
||||
if (typeof(create_vm_error_message) !== 'undefined') {
|
||||
$('#createvm-modal-body').text(create_vm_error_message);
|
||||
}
|
||||
$('#btn-create-vm').prop('disabled', false);
|
||||
$('#createvm-modal-close-btn').removeClass('hide');
|
||||
}
|
||||
});
|
||||
return false;
|
||||
}
|
||||
});
|
||||
} else {
|
||||
create_vm_form.submit(placeOrderPaymentIntent);
|
||||
function placeOrderPaymentIntent(e) {
|
||||
e.preventDefault();
|
||||
var stripe = Stripe(window.stripeKey);
|
||||
stripe.confirmCardPayment(
|
||||
window.paymentIntentSecret,
|
||||
{
|
||||
payment_method: window.pm_id
|
||||
}
|
||||
).then(function(result) {
|
||||
window.result = result;
|
||||
fa_icon = $('.modal-icon > .fa');
|
||||
modal_btn = $('#createvm-modal-done-btn');
|
||||
if (result.error) {
|
||||
// Display error.message in your UI.
|
||||
modal_btn.attr('href', error_url).removeClass('hide');
|
||||
fa_icon.attr('class', 'fa fa-close');
|
||||
modal_btn.attr('class', '').addClass('btn btn-danger btn-ok btn-wide');
|
||||
$('#createvm-modal-title').text(error_title);
|
||||
$('#createvm-modal-body').html(result.error.message + " " + error_msg);
|
||||
} else {
|
||||
// The payment has succeeded
|
||||
// Display a success message
|
||||
modal_btn.attr('href', success_url).removeClass('hide');
|
||||
fa_icon.attr('class', 'checkmark');
|
||||
$('#createvm-modal-title').text(success_title);
|
||||
$('#createvm-modal-body').html(success_msg);
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
return false;
|
||||
});
|
||||
$('#createvm-modal').on('hidden.bs.modal', function () {
|
||||
$(this).find('.modal-footer .btn').addClass('hide');
|
||||
});
|
||||
|
||||
// Toggle subscription and one-time payments div
|
||||
$('#li-one-time-charges').click(function() {
|
||||
console.log("li-one-time-charges clicked");
|
||||
$('#subscriptions').hide();
|
||||
$('#one-time-charges').show();
|
||||
});
|
||||
$('#li-subscriptions').click(function() {
|
||||
console.log("li-subscriptions clicked");
|
||||
$('#one-time-charges').hide();
|
||||
$('#subscriptions').show();
|
||||
});
|
||||
})
|
||||
});
|
||||
|
||||
window.onload = function () {
|
||||
|
|
|
|||
|
|
@ -15,11 +15,6 @@
|
|||
<div class="dashboard-subtitle"></div>
|
||||
</div>
|
||||
|
||||
<ul class="nav nav-tabs">
|
||||
<li class="active" id="li-subscriptions"><a href="#">{% trans "Subscriptions" %}</a></li>
|
||||
<li id="li-one-time-charges"><a href="#">{% trans "One-time payments" %}</a></li>
|
||||
</ul>
|
||||
<div class="subscriptions" id="subscriptions">
|
||||
<table class="table table-switch">
|
||||
<thead>
|
||||
<tr>
|
||||
|
|
@ -71,60 +66,6 @@
|
|||
{% endif %}
|
||||
</ul>
|
||||
{% endif %}
|
||||
</div>
|
||||
|
||||
|
||||
<div id="one-time-charges" class="one-time-charges" style="display: none;">
|
||||
<table class="table table-switch">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>{% trans "Product" %}</th>
|
||||
<th>{% trans "Date" %}</th>
|
||||
<th>{% trans "Amount" %}</th>
|
||||
<th></th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
{% for ho, stripe_charge_data in invs_charge %}
|
||||
<tr>
|
||||
{{ ho.id | get_line_item_from_hosting_order_charge }}
|
||||
</tr>
|
||||
{% endfor %}
|
||||
</tbody>
|
||||
</table>
|
||||
{% if invs_charge.has_other_pages %}
|
||||
<ul class="pagination">
|
||||
{% if invs_charge.has_previous %}
|
||||
{% if user_email %}
|
||||
<li><a href="?page={{ invs_charge.previous_page_number }}&user_email={{user_email}}">«</a></li>
|
||||
{% else %}
|
||||
<li><a href="?page={{ invs_charge.previous_page_number }}">«</a></li>
|
||||
{% endif %}
|
||||
{% else %}
|
||||
<li class="disabled"><span>«</span></li>
|
||||
{% endif %}
|
||||
{% for i in invs_charge.paginator.page_range %}
|
||||
{% if invs_charge.number == i %}
|
||||
<li class="active"><span>{{ i }} <span class="sr-only">(current)</span></span></li>
|
||||
{% else %}
|
||||
{% if user_email %}
|
||||
<li><a href="?page={{ i }}&user_email={{user_email}}">{{ i }}</a></li>
|
||||
{% else %}
|
||||
<li><a href="?page={{ i }}">{{ i }}</a></li>
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
{% endfor %}
|
||||
{% if invs_charge.has_next %}
|
||||
{% if user_email %}
|
||||
<li><a href="?page={{ invs_charge.next_page_number }}&user_email={{user_email}}">»</a></li>
|
||||
{% else %}
|
||||
<li><a href="?page={{ invs_charge.next_page_number }}">»</a></li>
|
||||
{% endif %}
|
||||
{% else %}
|
||||
<li class="disabled"><span>»</span></li>
|
||||
{% endif %}
|
||||
</ul>
|
||||
{% endif %}
|
||||
</div>
|
||||
</div>
|
||||
{% endblock %}
|
||||
|
|
|
|||
|
|
@ -218,7 +218,7 @@
|
|||
{% csrf_token %}
|
||||
<div class="row">
|
||||
<div class="col-sm-8">
|
||||
<div class="dcl-place-order-text">{% blocktrans with vm_price=vm.total_price|floatformat:2|intcomma %}By clicking "Place order" you agree to our <a href="https://datacenterlight.ch/en-us/cms/terms-of-service/">Terms of Service</a> and this plan will charge your credit card account with {{ vm_price }} CHF/month.{% endblocktrans %}.</div>
|
||||
<div class="dcl-place-order-text">{% blocktrans with vm_price=vm.total_price|floatformat:2|intcomma %}By clicking "Place order" this plan will charge your credit card account with {{ vm_price }} CHF/month{% endblocktrans %}.</div>
|
||||
</div>
|
||||
<div class="col-sm-4 order-confirm-btn text-right">
|
||||
<button class="btn choice-btn" id="btn-create-vm" data-href="{% url 'hosting:order-confirmation' %}" data-toggle="modal" data-target="#createvm-modal">
|
||||
|
|
|
|||
|
|
@ -51,7 +51,7 @@ urlpatterns = [
|
|||
name='choice_ssh_keys'),
|
||||
url(r'delete_ssh_key/(?P<pk>\d+)/?$', SSHKeyDeleteView.as_view(),
|
||||
name='delete_ssh_key'),
|
||||
url(r'delete_card/(?P<pk>[\w\-]+)/$', SettingsView.as_view(),
|
||||
url(r'delete_card/(?P<pk>\d+)/?$', SettingsView.as_view(),
|
||||
name='delete_card'),
|
||||
url(r'create_ssh_key/?$', SSHKeyCreateView.as_view(),
|
||||
name='create_ssh_key'),
|
||||
|
|
|
|||
207
hosting/views.py
207
hosting/views.py
|
|
@ -1,7 +1,6 @@
|
|||
import logging
|
||||
import uuid
|
||||
from datetime import datetime
|
||||
from urllib.parse import quote
|
||||
from time import sleep
|
||||
|
||||
import stripe
|
||||
|
|
@ -14,7 +13,6 @@ from django.core.exceptions import ValidationError
|
|||
from django.core.files.base import ContentFile
|
||||
from django.core.paginator import Paginator, EmptyPage, PageNotAnInteger
|
||||
from django.core.urlresolvers import reverse_lazy, reverse
|
||||
from django.db.models import Q
|
||||
from django.http import (
|
||||
Http404, HttpResponseRedirect, HttpResponse, JsonResponse
|
||||
)
|
||||
|
|
@ -565,11 +563,9 @@ class SettingsView(LoginRequiredMixin, FormView):
|
|||
stripe_customer = None
|
||||
if hasattr(user, 'stripecustomer'):
|
||||
stripe_customer = user.stripecustomer
|
||||
stripe_utils = StripeUtils()
|
||||
cards_list_request = stripe_utils.get_available_payment_methods(
|
||||
stripe_customer
|
||||
cards_list = UserCardDetail.get_all_cards_list(
|
||||
stripe_customer=stripe_customer
|
||||
)
|
||||
cards_list = cards_list_request.get('response_object')
|
||||
context.update({
|
||||
'cards_list': cards_list,
|
||||
'stripe_key': settings.STRIPE_API_PUBLIC_KEY
|
||||
|
|
@ -580,38 +576,48 @@ class SettingsView(LoginRequiredMixin, FormView):
|
|||
def post(self, request, *args, **kwargs):
|
||||
if 'card' in request.POST and request.POST['card'] is not '':
|
||||
card_id = escape(request.POST['card'])
|
||||
user_card_detail = UserCardDetail.objects.get(id=card_id)
|
||||
UserCardDetail.set_default_card(
|
||||
stripe_api_cus_id=request.user.stripecustomer.stripe_id,
|
||||
stripe_source_id=card_id
|
||||
stripe_source_id=user_card_detail.card_id
|
||||
)
|
||||
stripe_utils = StripeUtils()
|
||||
card_details = stripe_utils.get_cards_details_from_payment_method(
|
||||
card_id
|
||||
)
|
||||
if not card_details.get('response_object'):
|
||||
logger.debug("Could not find card %s in stripe" % card_id)
|
||||
messages.add_message(request, messages.ERROR,
|
||||
_("Could not set a default card."))
|
||||
return HttpResponseRedirect(reverse_lazy('hosting:settings'))
|
||||
card_details_response = card_details['response_object']
|
||||
msg = _(
|
||||
("Your {brand} card ending in {last4} set as "
|
||||
"default card").format(
|
||||
brand=card_details_response['brand'],
|
||||
last4=card_details_response['last4']
|
||||
brand=user_card_detail.brand,
|
||||
last4=user_card_detail.last4
|
||||
)
|
||||
)
|
||||
messages.add_message(request, messages.SUCCESS, msg)
|
||||
return HttpResponseRedirect(reverse_lazy('hosting:settings'))
|
||||
if 'delete_card' in request.POST:
|
||||
card = self.kwargs.get('pk')
|
||||
stripe_utils = StripeUtils()
|
||||
stripe_utils.dissociate_customer_card(
|
||||
request.user.stripecustomer.stripe_id,
|
||||
card
|
||||
)
|
||||
msg = _("Card deassociation successful")
|
||||
messages.add_message(request, messages.SUCCESS, msg)
|
||||
try:
|
||||
card = UserCardDetail.objects.get(pk=self.kwargs.get('pk'))
|
||||
if (request.user.has_perm(self.permission_required[0], card)
|
||||
and
|
||||
request.user
|
||||
.stripecustomer
|
||||
.usercarddetail_set
|
||||
.count() > 1):
|
||||
if card.card_id is not None:
|
||||
stripe_utils = StripeUtils()
|
||||
stripe_utils.dissociate_customer_card(
|
||||
request.user.stripecustomer.stripe_id,
|
||||
card.card_id
|
||||
)
|
||||
if card.preferred:
|
||||
UserCardDetail.set_default_card_from_stripe(
|
||||
request.user.stripecustomer.stripe_id
|
||||
)
|
||||
card.delete()
|
||||
msg = _("Card deassociation successful")
|
||||
messages.add_message(request, messages.SUCCESS, msg)
|
||||
else:
|
||||
msg = _("You are not permitted to do this operation")
|
||||
messages.add_message(request, messages.ERROR, msg)
|
||||
except UserCardDetail.DoesNotExist:
|
||||
msg = _("The selected card does not exist")
|
||||
messages.add_message(request, messages.ERROR, msg)
|
||||
return HttpResponseRedirect(reverse_lazy('hosting:settings'))
|
||||
form = self.get_form()
|
||||
if form.is_valid():
|
||||
|
|
@ -686,49 +692,51 @@ class SettingsView(LoginRequiredMixin, FormView):
|
|||
msg = _("Billing address updated successfully")
|
||||
messages.add_message(request, messages.SUCCESS, msg)
|
||||
else:
|
||||
id_payment_method = request.POST.get('id_payment_method', None)
|
||||
token = form.cleaned_data.get('token')
|
||||
stripe_utils = StripeUtils()
|
||||
card_details = stripe_utils.get_cards_details_from_payment_method(
|
||||
id_payment_method
|
||||
card_details = stripe_utils.get_cards_details_from_token(
|
||||
token
|
||||
)
|
||||
if not card_details.get('response_object'):
|
||||
form.add_error("__all__", card_details.get('error'))
|
||||
return self.render_to_response(self.get_context_data())
|
||||
stripe_customer = StripeCustomer.get_or_create(
|
||||
email=request.user.email, id_payment_method=id_payment_method
|
||||
email=request.user.email, token=token
|
||||
)
|
||||
card = card_details['response_object']
|
||||
acc_result = stripe_utils.associate_customer_card(
|
||||
request.user.stripecustomer.stripe_id,
|
||||
id_payment_method,
|
||||
set_as_default=True
|
||||
)
|
||||
if acc_result['response_object'] is None:
|
||||
msg = _(
|
||||
'An error occurred while associating the card.'
|
||||
' Details: {details}'.format(
|
||||
details=acc_result['error']
|
||||
)
|
||||
)
|
||||
if UserCardDetail.get_user_card_details(stripe_customer, card):
|
||||
msg = _('You seem to have already added this card')
|
||||
messages.add_message(request, messages.ERROR, msg)
|
||||
return self.render_to_response(self.get_context_data())
|
||||
preferred = False
|
||||
if stripe_customer.usercarddetail_set.count() == 0:
|
||||
preferred = True
|
||||
UserCardDetail.create(
|
||||
stripe_customer=stripe_customer,
|
||||
last4=card['last4'],
|
||||
brand=card['brand'],
|
||||
fingerprint=card['fingerprint'],
|
||||
exp_month=card['exp_month'],
|
||||
exp_year=card['exp_year'],
|
||||
card_id=card['card_id'],
|
||||
preferred=preferred
|
||||
)
|
||||
msg = _(
|
||||
"Successfully associated the card with your account"
|
||||
)
|
||||
messages.add_message(request, messages.SUCCESS, msg)
|
||||
else:
|
||||
acc_result = stripe_utils.associate_customer_card(
|
||||
request.user.stripecustomer.stripe_id, token
|
||||
)
|
||||
if acc_result['response_object'] is None:
|
||||
msg = _(
|
||||
'An error occurred while associating the card.'
|
||||
' Details: {details}'.format(
|
||||
details=acc_result['error']
|
||||
)
|
||||
)
|
||||
messages.add_message(request, messages.ERROR, msg)
|
||||
return self.render_to_response(self.get_context_data())
|
||||
preferred = False
|
||||
if stripe_customer.usercarddetail_set.count() == 0:
|
||||
preferred = True
|
||||
UserCardDetail.create(
|
||||
stripe_customer=stripe_customer,
|
||||
last4=card['last4'],
|
||||
brand=card['brand'],
|
||||
fingerprint=card['fingerprint'],
|
||||
exp_month=card['exp_month'],
|
||||
exp_year=card['exp_year'],
|
||||
card_id=card['card_id'],
|
||||
preferred=preferred
|
||||
)
|
||||
msg = _(
|
||||
"Successfully associated the card with your account"
|
||||
)
|
||||
messages.add_message(request, messages.SUCCESS, msg)
|
||||
return self.render_to_response(self.get_context_data())
|
||||
else:
|
||||
billing_address_data = form.cleaned_data
|
||||
|
|
@ -1069,13 +1077,7 @@ class OrdersHostingDetailView(LoginRequiredMixin, DetailView, FormView):
|
|||
billing_address_data = request.session.get('billing_address_data')
|
||||
vm_template_id = template.get('id', 1)
|
||||
stripe_api_cus_id = request.user.stripecustomer.stripe_id
|
||||
logger.debug("template=%s specs=%s stripe_customer_id=%s "
|
||||
"billing_address_data=%s vm_template_id=%s "
|
||||
"stripe_api_cus_id=%s" % (
|
||||
template, specs, stripe_customer_id, billing_address_data,
|
||||
vm_template_id, stripe_api_cus_id)
|
||||
)
|
||||
if 'id_payment_method' in self.request.session:
|
||||
if 'token' in self.request.session:
|
||||
card_details = stripe_utils.get_cards_details_from_token(
|
||||
request.session['token']
|
||||
)
|
||||
|
|
@ -1092,7 +1094,7 @@ class OrdersHostingDetailView(LoginRequiredMixin, DetailView, FormView):
|
|||
)
|
||||
if not ucd:
|
||||
acc_result = stripe_utils.associate_customer_card(
|
||||
stripe_api_cus_id, request.session['id_payment_method'],
|
||||
stripe_api_cus_id, request.session['token'],
|
||||
set_as_default=True
|
||||
)
|
||||
if acc_result['response_object'] is None:
|
||||
|
|
@ -1183,31 +1185,10 @@ class OrdersHostingDetailView(LoginRequiredMixin, DetailView, FormView):
|
|||
subscription_result = stripe_utils.subscribe_customer_to_plan(
|
||||
stripe_api_cus_id,
|
||||
[{"plan": stripe_plan.get('response_object').stripe_plan_id}],
|
||||
coupon=(discount['stripe_coupon_id']
|
||||
if 'name' in discount and
|
||||
discount['name'] is not None and
|
||||
'ipv6' in discount['name'].lower() and
|
||||
discount['stripe_coupon_id']
|
||||
else ""),
|
||||
coupon='ipv6-discount-8chf' if 'name' in discount and 'ipv6' in discount['name'].lower() else "",
|
||||
tax_rates=[stripe_tax_rate.tax_rate_id] if stripe_tax_rate else [],
|
||||
default_payment_method=request.session['id_payment_method']
|
||||
)
|
||||
stripe_subscription_obj = subscription_result.get('response_object')
|
||||
latest_invoice = stripe.Invoice.retrieve(stripe_subscription_obj.latest_invoice)
|
||||
ret = stripe.PaymentIntent.confirm(
|
||||
latest_invoice.payment_intent
|
||||
)
|
||||
if ret.status == 'requires_source_action' or ret.status == 'requires_action':
|
||||
pi = stripe.PaymentIntent.retrieve(
|
||||
latest_invoice.payment_intent
|
||||
)
|
||||
context = {
|
||||
'sid': stripe_subscription_obj.id,
|
||||
'payment_intent_secret': pi.client_secret,
|
||||
'STRIPE_PUBLISHABLE_KEY': settings.STRIPE_API_PUBLIC_KEY,
|
||||
'showSCA': True
|
||||
}
|
||||
return JsonResponse(context)
|
||||
# Check if the subscription was approved and is active
|
||||
if (stripe_subscription_obj is None or
|
||||
stripe_subscription_obj.status != 'active'):
|
||||
|
|
@ -1301,11 +1282,10 @@ class InvoiceListView(LoginRequiredMixin, TemplateView):
|
|||
page = self.request.GET.get('page', 1)
|
||||
context = super(InvoiceListView, self).get_context_data(**kwargs)
|
||||
invs_page = None
|
||||
invs_page_charges = None
|
||||
if ('user_email' in self.request.GET
|
||||
and self.request.user.email == settings.ADMIN_EMAIL):
|
||||
user_email = self.request.GET['user_email']
|
||||
context['user_email'] = '%s' % quote(user_email)
|
||||
context['user_email'] = user_email
|
||||
logger.debug(
|
||||
"user_email = {}".format(user_email)
|
||||
)
|
||||
|
|
@ -1315,8 +1295,7 @@ class InvoiceListView(LoginRequiredMixin, TemplateView):
|
|||
logger.debug("User does not exist")
|
||||
cu = self.request.user
|
||||
invs = stripe.Invoice.list(customer=cu.stripecustomer.stripe_id,
|
||||
count=100,
|
||||
status='paid')
|
||||
count=100)
|
||||
paginator = Paginator(invs.data, 10)
|
||||
try:
|
||||
invs_page = paginator.page(page)
|
||||
|
|
@ -1324,21 +1303,6 @@ class InvoiceListView(LoginRequiredMixin, TemplateView):
|
|||
invs_page = paginator.page(1)
|
||||
except EmptyPage:
|
||||
invs_page = paginator.page(paginator.num_pages)
|
||||
hosting_orders = HostingOrder.objects.filter(
|
||||
customer=cu.stripecustomer).filter(
|
||||
Q(subscription_id=None) | Q(subscription_id='')
|
||||
).order_by('-created_at')
|
||||
stripe_chgs = []
|
||||
for ho in hosting_orders:
|
||||
stripe_chgs.append({ho.id: stripe.Charge.retrieve(ho.stripe_charge_id)})
|
||||
|
||||
paginator_charges = Paginator(stripe_chgs, 10)
|
||||
try:
|
||||
invs_page_charges = paginator_charges.page(page)
|
||||
except PageNotAnInteger:
|
||||
invs_page_charges = paginator_charges.page(1)
|
||||
except EmptyPage:
|
||||
invs_page_charges = paginator_charges.page(paginator_charges.num_pages)
|
||||
else:
|
||||
try:
|
||||
invs = stripe.Invoice.list(
|
||||
|
|
@ -1352,27 +1316,10 @@ class InvoiceListView(LoginRequiredMixin, TemplateView):
|
|||
invs_page = paginator.page(1)
|
||||
except EmptyPage:
|
||||
invs_page = paginator.page(paginator.num_pages)
|
||||
hosting_orders = HostingOrder.objects.filter(
|
||||
customer=self.request.user.stripecustomer).filter(
|
||||
Q(subscription_id=None) | Q(subscription_id='')
|
||||
).order_by('-created_at')
|
||||
stripe_chgs = []
|
||||
for ho in hosting_orders:
|
||||
stripe_chgs.append(
|
||||
{ho: stripe.Charge.retrieve(ho.stripe_charge_id)})
|
||||
paginator_charges = Paginator(stripe_chgs, 10)
|
||||
try:
|
||||
invs_page_charges = paginator_charges.page(page)
|
||||
except PageNotAnInteger:
|
||||
invs_page_charges = paginator_charges.page(1)
|
||||
except EmptyPage:
|
||||
invs_page_charges = paginator_charges.page(
|
||||
paginator_charges.num_pages)
|
||||
except Exception as ex:
|
||||
logger.error(str(ex))
|
||||
invs_page = None
|
||||
context["invs"] = invs_page
|
||||
context["invs_charge"] = invs_page_charges
|
||||
return context
|
||||
|
||||
@method_decorator(decorators)
|
||||
|
|
@ -1831,7 +1778,7 @@ class VirtualMachineView(LoginRequiredMixin, View):
|
|||
)
|
||||
response['text'] = str(_('Error terminating VM')) + str(vm.id)
|
||||
else:
|
||||
for t in range(settings.MAX_TIME_TO_WAIT_FOR_VM_TERMINATE):
|
||||
for t in range(15):
|
||||
try:
|
||||
manager.get_vm(vm.id)
|
||||
except WrongIdError:
|
||||
|
|
@ -1854,10 +1801,6 @@ class VirtualMachineView(LoginRequiredMixin, View):
|
|||
)
|
||||
break
|
||||
else:
|
||||
logger.debug(
|
||||
'Sleeping 2 seconds for terminate action on VM %s' %
|
||||
vm.id
|
||||
)
|
||||
sleep(2)
|
||||
if not response['status']:
|
||||
response['text'] = str(_("VM terminate action timed out. "
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
# -*- coding: utf-8 -*-
|
||||
# Generated by Django 1.9.4 on 2020-12-23 06:12
|
||||
# Generated by Django 1.9.4 on 2020-03-06 10:16
|
||||
from __future__ import unicode_literals
|
||||
|
||||
from django.db import migrations, models
|
||||
|
|
@ -8,13 +8,13 @@ from django.db import migrations, models
|
|||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('hosting', '0062_incompletesubscriptions'),
|
||||
('membership', '0011_auto_20191218_1050'),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.AlterField(
|
||||
model_name='incompletesubscriptions',
|
||||
name='completed_at',
|
||||
field=models.DateTimeField(null=True),
|
||||
model_name='customuser',
|
||||
name='username',
|
||||
field=models.CharField(max_length=120, null=True, unique=True),
|
||||
),
|
||||
]
|
||||
|
|
@ -77,28 +77,59 @@ def get_first_and_last_name(full_name):
|
|||
return first_name, last_name
|
||||
|
||||
|
||||
def limit_username_length(username):
|
||||
"""
|
||||
Limit the length of username before the addition of random numbers to
|
||||
18 characters
|
||||
|
||||
:param username: the username to limit
|
||||
:return:
|
||||
"""
|
||||
if len(username) > settings.MAX_USERNAME_LENGTH:
|
||||
username = username[(len(username) - settings.MAX_USERNAME_LENGTH):]
|
||||
return username.strip()
|
||||
|
||||
|
||||
def assign_username(user):
|
||||
if not user.username:
|
||||
ldap_manager = LdapManager()
|
||||
|
||||
# Try to come up with a username
|
||||
first_name, last_name = get_first_and_last_name(user.name)
|
||||
user.username = unicodedata.normalize('NFKD', first_name + last_name)
|
||||
user.username = unicodedata.normalize(
|
||||
'NFKD', first_name + last_name
|
||||
).encode('ascii', 'ignore').decode('ascii', 'ignore')
|
||||
user.username = "".join([char for char in user.username if char.isalnum()]).lower()
|
||||
if user.username.strip() == "":
|
||||
try:
|
||||
# the inferred username from name is empty, hence attempt
|
||||
# inferring a username from email
|
||||
logger.debug("Inferred username from name is empty. So, "
|
||||
"inferring from email now.")
|
||||
user.username = user.email[0:user.email.index("@")]
|
||||
user.username = "".join(
|
||||
[char for char in user.username if char.isalnum()]
|
||||
).lower()
|
||||
except Exception as ex:
|
||||
logger.debug("Exception %s" % str(ex))
|
||||
user.username = get_random_string(
|
||||
allowed_chars='abcdefghijklmnopqrstuvwxyz'
|
||||
)
|
||||
exist = True
|
||||
user_username = limit_username_length(user.username)
|
||||
while exist:
|
||||
# Check if it exists
|
||||
exist, entries = ldap_manager.check_user_exists(user.username)
|
||||
exist, entries = ldap_manager.check_user_exists(user_username)
|
||||
if exist:
|
||||
# If username exists in ldap, come up with a new user name and check it again
|
||||
user.username = user.username + str(random.randint(0, 2 ** 10))
|
||||
user.username = user_username + str(random.randint(0, 2 ** 10))
|
||||
else:
|
||||
# If username does not exists in ldap, try to save it in database
|
||||
try:
|
||||
user.save()
|
||||
except IntegrityError:
|
||||
# If username exists in database then come up with a new username
|
||||
user.username = user.username + str(random.randint(0, 2 ** 10))
|
||||
user.username = user_username + str(random.randint(0, 2 ** 10))
|
||||
exist = True
|
||||
|
||||
|
||||
|
|
@ -116,7 +147,7 @@ class CustomUser(AbstractBaseUser, PermissionsMixin):
|
|||
site = models.ForeignKey(Site, default=1)
|
||||
name = models.CharField(max_length=50, validators=[validate_name])
|
||||
email = models.EmailField(unique=True)
|
||||
username = models.CharField(max_length=60, unique=True, null=True)
|
||||
username = models.CharField(max_length=120, unique=True, null=True)
|
||||
validated = models.IntegerField(choices=VALIDATED_CHOICES, default=0)
|
||||
in_ldap = models.BooleanField(default=False)
|
||||
# By default, we initialize the validation_slug with appropriate value
|
||||
|
|
@ -277,7 +308,7 @@ class StripeCustomer(models.Model):
|
|||
return "%s - %s" % (self.stripe_id, self.user.email)
|
||||
|
||||
@classmethod
|
||||
def create_stripe_api_customer(cls, email=None, id_payment_method=None,
|
||||
def create_stripe_api_customer(cls, email=None, token=None,
|
||||
customer_name=None):
|
||||
"""
|
||||
This method creates a Stripe API customer with the given
|
||||
|
|
@ -288,8 +319,7 @@ class StripeCustomer(models.Model):
|
|||
stripe user.
|
||||
"""
|
||||
stripe_utils = StripeUtils()
|
||||
stripe_data = stripe_utils.create_customer(
|
||||
id_payment_method, email, customer_name)
|
||||
stripe_data = stripe_utils.create_customer(token, email, customer_name)
|
||||
if stripe_data.get('response_object'):
|
||||
stripe_cus_id = stripe_data.get('response_object').get('id')
|
||||
return stripe_cus_id
|
||||
|
|
@ -297,7 +327,7 @@ class StripeCustomer(models.Model):
|
|||
return None
|
||||
|
||||
@classmethod
|
||||
def get_or_create(cls, email=None, token=None, id_payment_method=None):
|
||||
def get_or_create(cls, email=None, token=None):
|
||||
"""
|
||||
Check if there is a registered stripe customer with that email
|
||||
or create a new one
|
||||
|
|
|
|||
|
|
@ -154,8 +154,6 @@ class OpenNebulaManager():
|
|||
protocol=settings.OPENNEBULA_PROTOCOL)
|
||||
)
|
||||
raise ConnectionRefusedError
|
||||
except Exception as ex:
|
||||
logger.error(str(ex))
|
||||
|
||||
def _get_user_pool(self):
|
||||
try:
|
||||
|
|
@ -429,12 +427,8 @@ class OpenNebulaManager():
|
|||
template_id = int(template_id)
|
||||
try:
|
||||
template_pool = self._get_template_pool()
|
||||
if template_id in settings.UPDATED_TEMPLATES_DICT.keys():
|
||||
template_id = settings.UPDATED_TEMPLATES_DICT[template_id]
|
||||
return template_pool.get_by_id(template_id)
|
||||
except Exception as ex:
|
||||
logger.debug("Template Id we are looking for : %s" % template_id)
|
||||
logger.error(str(ex))
|
||||
except:
|
||||
raise ConnectionRefusedError
|
||||
|
||||
def create_template(self, name, cores, memory, disk_size, core_price,
|
||||
|
|
|
|||
|
|
@ -3,8 +3,6 @@ import logging
|
|||
import math
|
||||
import subprocess
|
||||
|
||||
from django.conf import settings
|
||||
|
||||
from oca.pool import WrongIdError
|
||||
|
||||
from datacenterlight.models import VMPricing
|
||||
|
|
@ -81,8 +79,7 @@ def get_vm_price(cpu, memory, disk_size, hdd_size=0, pricing_name='default'):
|
|||
price = ((decimal.Decimal(cpu) * pricing.cores_unit_price) +
|
||||
(decimal.Decimal(memory) * pricing.ram_unit_price) +
|
||||
(decimal.Decimal(disk_size) * pricing.ssd_unit_price) +
|
||||
(decimal.Decimal(hdd_size) * pricing.hdd_unit_price) +
|
||||
decimal.Decimal(settings.VM_BASE_PRICE))
|
||||
(decimal.Decimal(hdd_size) * pricing.hdd_unit_price))
|
||||
cents = decimal.Decimal('.01')
|
||||
price = price.quantize(cents, decimal.ROUND_HALF_UP)
|
||||
return round(float(price), 2)
|
||||
|
|
@ -105,8 +102,7 @@ def get_vm_price_for_given_vat(cpu, memory, ssd_size, hdd_size=0,
|
|||
(decimal.Decimal(cpu) * pricing.cores_unit_price) +
|
||||
(decimal.Decimal(memory) * pricing.ram_unit_price) +
|
||||
(decimal.Decimal(ssd_size) * pricing.ssd_unit_price) +
|
||||
(decimal.Decimal(hdd_size) * pricing.hdd_unit_price) +
|
||||
decimal.Decimal(settings.VM_BASE_PRICE)
|
||||
(decimal.Decimal(hdd_size) * pricing.hdd_unit_price)
|
||||
)
|
||||
|
||||
discount_name = pricing.discount_name
|
||||
|
|
@ -122,8 +118,7 @@ def get_vm_price_for_given_vat(cpu, memory, ssd_size, hdd_size=0,
|
|||
discount = {
|
||||
'name': discount_name,
|
||||
'amount': discount_amount,
|
||||
'amount_with_vat': round(float(discount_amount_with_vat), 2),
|
||||
'stripe_coupon_id': pricing.stripe_coupon_id
|
||||
'amount_with_vat': round(float(discount_amount_with_vat), 2)
|
||||
}
|
||||
return (round(float(price), 2), round(float(vat), 2),
|
||||
round(float(vat_percent), 2), discount)
|
||||
|
|
@ -159,8 +154,7 @@ def get_vm_price_with_vat(cpu, memory, ssd_size, hdd_size=0,
|
|||
(decimal.Decimal(cpu) * pricing.cores_unit_price) +
|
||||
(decimal.Decimal(memory) * pricing.ram_unit_price) +
|
||||
(decimal.Decimal(ssd_size) * pricing.ssd_unit_price) +
|
||||
(decimal.Decimal(hdd_size) * pricing.hdd_unit_price) +
|
||||
decimal.Decimal(settings.VM_BASE_PRICE)
|
||||
(decimal.Decimal(hdd_size) * pricing.hdd_unit_price)
|
||||
)
|
||||
if pricing.vat_inclusive:
|
||||
vat = decimal.Decimal(0)
|
||||
|
|
@ -174,8 +168,7 @@ def get_vm_price_with_vat(cpu, memory, ssd_size, hdd_size=0,
|
|||
vat = vat.quantize(cents, decimal.ROUND_HALF_UP)
|
||||
discount = {
|
||||
'name': pricing.discount_name,
|
||||
'amount': round(float(pricing.discount_amount), 2),
|
||||
'stripe_coupon_id': pricing.stripe_coupon_id
|
||||
'amount': round(float(pricing.discount_amount), 2)
|
||||
}
|
||||
return (round(float(price), 2), round(float(vat), 2),
|
||||
round(float(vat_percent), 2), discount)
|
||||
|
|
@ -222,6 +215,11 @@ def get_ip_addresses(vm_id):
|
|||
return "--"
|
||||
|
||||
|
||||
def round_up(n, decimals=0):
|
||||
multiplier = 10 ** decimals
|
||||
return math.ceil(n * multiplier) / multiplier
|
||||
|
||||
|
||||
class HostingUtils:
|
||||
@staticmethod
|
||||
def clear_items_from_list(from_list, items_list):
|
||||
|
|
|
|||
|
|
@ -3,7 +3,6 @@ import hashlib
|
|||
import random
|
||||
import ldap3
|
||||
import logging
|
||||
import unicodedata
|
||||
|
||||
from django.conf import settings
|
||||
|
||||
|
|
@ -102,7 +101,7 @@ class LdapManager:
|
|||
"uidNumber": [str(uidNumber)],
|
||||
"gidNumber": [str(settings.LDAP_CUSTOMER_GROUP_ID)],
|
||||
"loginShell": ["/bin/bash"],
|
||||
"homeDirectory": ["/home/{}".format(unicodedata.normalize('NFKD', user).encode('ascii','ignore'))],
|
||||
"homeDirectory": ["/home/{}".format(user).encode("utf-8")],
|
||||
"mail": email.encode("utf-8"),
|
||||
"userPassword": [self._ssha_password(
|
||||
password.encode("utf-8")
|
||||
|
|
@ -267,7 +266,7 @@ class LdapManager:
|
|||
logger.error(
|
||||
"Error reading int value from {}. {}"
|
||||
"Returning default value {} instead".format(
|
||||
settings.LDAP_MAX_UID_FILE_PATH,
|
||||
settings.LDAP_MAX_UID_PATH,
|
||||
str(ve),
|
||||
settings.LDAP_DEFAULT_START_UID
|
||||
)
|
||||
|
|
|
|||
|
|
@ -34,7 +34,6 @@ def handleStripeError(f):
|
|||
logger.error(str(e))
|
||||
return response
|
||||
except stripe.error.RateLimitError as e:
|
||||
logger.error(str(e))
|
||||
response.update(
|
||||
{'error': "Too many requests made to the API too quickly"})
|
||||
return response
|
||||
|
|
@ -70,7 +69,7 @@ class StripeUtils(object):
|
|||
CURRENCY = 'chf'
|
||||
INTERVAL = 'month'
|
||||
SUCCEEDED_STATUS = 'succeeded'
|
||||
RESOURCE_ALREADY_EXISTS_ERROR_CODE = 'resource_already_exists'
|
||||
STRIPE_PLAN_ALREADY_EXISTS = 'Plan already exists'
|
||||
STRIPE_NO_SUCH_PLAN = 'No such plan'
|
||||
PLAN_EXISTS_ERROR_MSG = 'Plan {} exists already.\nCreating a local StripePlan now.'
|
||||
PLAN_DOES_NOT_EXIST_ERROR_MSG = 'Plan {} does not exist.'
|
||||
|
|
@ -83,31 +82,20 @@ class StripeUtils(object):
|
|||
customer.save()
|
||||
|
||||
@handleStripeError
|
||||
def associate_customer_card(self, stripe_customer_id, id_payment_method,
|
||||
def associate_customer_card(self, stripe_customer_id, token,
|
||||
set_as_default=False):
|
||||
customer = stripe.Customer.retrieve(stripe_customer_id)
|
||||
stripe.PaymentMethod.attach(
|
||||
id_payment_method,
|
||||
customer=stripe_customer_id,
|
||||
)
|
||||
card = customer.sources.create(source=token)
|
||||
if set_as_default:
|
||||
customer.invoice_settings.default_payment_method = id_payment_method
|
||||
customer.default_source = card.id
|
||||
customer.save()
|
||||
return True
|
||||
|
||||
@handleStripeError
|
||||
def dissociate_customer_card(self, stripe_customer_id, card_id):
|
||||
customer = stripe.Customer.retrieve(stripe_customer_id)
|
||||
if card_id.startswith("pm"):
|
||||
logger.debug("PaymentMethod %s detached %s" % (card_id,
|
||||
stripe_customer_id))
|
||||
pm = stripe.PaymentMethod.retrieve(card_id)
|
||||
stripe.PaymentMethod.detach(card_id)
|
||||
pm.delete()
|
||||
else:
|
||||
logger.debug("card %s detached %s" % (card_id, stripe_customer_id))
|
||||
card = customer.sources.retrieve(card_id)
|
||||
card.delete()
|
||||
card = customer.sources.retrieve(card_id)
|
||||
card.delete()
|
||||
|
||||
@handleStripeError
|
||||
def update_customer_card(self, customer_id, token):
|
||||
|
|
@ -199,24 +187,6 @@ class StripeUtils(object):
|
|||
}
|
||||
return card_details
|
||||
|
||||
@handleStripeError
|
||||
def get_cards_details_from_payment_method(self, payment_method_id):
|
||||
payment_method = stripe.PaymentMethod.retrieve(payment_method_id)
|
||||
# payment_method does not always seem to have a card with id
|
||||
# if that is the case, fallback to payment_method_id for card_id
|
||||
card_id = payment_method_id
|
||||
if hasattr(payment_method.card, 'id'):
|
||||
card_id = payment_method.card.id
|
||||
card_details = {
|
||||
'last4': payment_method.card.last4,
|
||||
'brand': payment_method.card.brand,
|
||||
'exp_month': payment_method.card.exp_month,
|
||||
'exp_year': payment_method.card.exp_year,
|
||||
'fingerprint': payment_method.card.fingerprint,
|
||||
'card_id': card_id
|
||||
}
|
||||
return card_details
|
||||
|
||||
def check_customer(self, stripe_cus_api_id, user, token):
|
||||
try:
|
||||
customer = stripe.Customer.retrieve(stripe_cus_api_id)
|
||||
|
|
@ -236,11 +206,11 @@ class StripeUtils(object):
|
|||
return customer
|
||||
|
||||
@handleStripeError
|
||||
def create_customer(self, id_payment_method, email, name=None):
|
||||
def create_customer(self, token, email, name=None):
|
||||
if name is None or name.strip() == "":
|
||||
name = email
|
||||
customer = self.stripe.Customer.create(
|
||||
payment_method=id_payment_method,
|
||||
source=token,
|
||||
description=name,
|
||||
email=email
|
||||
)
|
||||
|
|
@ -297,17 +267,11 @@ class StripeUtils(object):
|
|||
stripe_plan_db_obj = StripePlan.objects.create(
|
||||
stripe_plan_id=stripe_plan_id)
|
||||
except stripe.error.InvalidRequestError as e:
|
||||
logger.error(str(e))
|
||||
logger.error("error_code = %s" % str(e.__dict__))
|
||||
if self.RESOURCE_ALREADY_EXISTS_ERROR_CODE in e.error.code:
|
||||
if self.STRIPE_PLAN_ALREADY_EXISTS in str(e):
|
||||
logger.debug(
|
||||
self.PLAN_EXISTS_ERROR_MSG.format(stripe_plan_id))
|
||||
stripe_plan_db_obj, c = StripePlan.objects.get_or_create(
|
||||
stripe_plan_db_obj = StripePlan.objects.create(
|
||||
stripe_plan_id=stripe_plan_id)
|
||||
if c:
|
||||
logger.debug("Created stripe plan %s" % stripe_plan_id)
|
||||
else:
|
||||
logger.debug("Plan %s exists already" % stripe_plan_id)
|
||||
return stripe_plan_db_obj
|
||||
|
||||
@handleStripeError
|
||||
|
|
@ -336,14 +300,10 @@ class StripeUtils(object):
|
|||
|
||||
@handleStripeError
|
||||
def subscribe_customer_to_plan(self, customer, plans, trial_end=None,
|
||||
coupon="", tax_rates=list(),
|
||||
default_payment_method=""):
|
||||
coupon="", tax_rates=list()):
|
||||
"""
|
||||
Subscribes the given customer to the list of given plans
|
||||
|
||||
:param default_payment_method:
|
||||
:param tax_rates:
|
||||
:param coupon:
|
||||
:param customer: The stripe customer identifier
|
||||
:param plans: A list of stripe plans.
|
||||
:param trial_end: An integer representing when the Stripe subscription
|
||||
|
|
@ -357,17 +317,12 @@ class StripeUtils(object):
|
|||
]
|
||||
:return: The subscription StripeObject
|
||||
"""
|
||||
logger.debug("Subscribing %s to plan %s : coupon = %s" % (
|
||||
customer, str(plans), str(coupon)
|
||||
))
|
||||
|
||||
subscription_result = self.stripe.Subscription.create(
|
||||
customer=customer, items=plans, trial_end=trial_end,
|
||||
coupon=coupon,
|
||||
default_tax_rates=tax_rates,
|
||||
payment_behavior='allow_incomplete',
|
||||
default_payment_method=default_payment_method
|
||||
)
|
||||
logger.debug("Done subscribing")
|
||||
return subscription_result
|
||||
|
||||
@handleStripeError
|
||||
|
|
@ -525,49 +480,7 @@ class StripeUtils(object):
|
|||
)
|
||||
return tax_id_obj
|
||||
|
||||
@handleStripeError
|
||||
def get_payment_intent(self, amount, customer):
|
||||
""" Create a stripe PaymentIntent of the given amount and return it
|
||||
:param amount: the amount of payment_intent
|
||||
:return:
|
||||
"""
|
||||
payment_intent_obj = stripe.PaymentIntent.create(
|
||||
amount=amount,
|
||||
currency='chf',
|
||||
customer=customer,
|
||||
setup_future_usage='off_session'
|
||||
)
|
||||
return payment_intent_obj
|
||||
|
||||
@handleStripeError
|
||||
def get_available_payment_methods(self, customer):
|
||||
""" Retrieves all payment methods of the given customer
|
||||
:param customer: StripeCustomer object
|
||||
:return: a list of available payment methods
|
||||
"""
|
||||
return_list = []
|
||||
if customer is None:
|
||||
return return_list
|
||||
cu = stripe.Customer.retrieve(customer.stripe_id)
|
||||
pms = stripe.PaymentMethod.list(
|
||||
customer=customer.stripe_id,
|
||||
type="card",
|
||||
)
|
||||
default_source = None
|
||||
if cu.default_source:
|
||||
default_source = cu.default_source
|
||||
else:
|
||||
default_source = cu.invoice_settings.default_payment_method
|
||||
for pm in pms.data:
|
||||
return_list.append({
|
||||
'last4': pm.card.last4, 'brand': pm.card.brand, 'id': pm.id,
|
||||
'exp_year': pm.card.exp_year,
|
||||
'exp_month': '{:02d}'.format(pm.card.exp_month),
|
||||
'preferred': pm.id == default_source
|
||||
})
|
||||
return return_list
|
||||
|
||||
def compare_vat_numbers(self, vat1, vat2):
|
||||
_vat1 = vat1.replace(" ", "").replace(".", "").replace("-","")
|
||||
_vat2 = vat2.replace(" ", "").replace(".", "").replace("-","")
|
||||
return True if _vat1 == _vat2 else False
|
||||
return True if _vat1 == _vat2 else False
|
||||
|
|
@ -321,4 +321,5 @@ IM",GBP,0.1,standard,
|
|||
2019-12-17,,IS,EUR,0.24,standard,Iceland standard VAT (added manually)
|
||||
2019-12-17,,FX,EUR,0.20,standard,France metropolitan standard VAT (added manually)
|
||||
2020-01-04,,CY,EUR,0.19,standard,Cyprus standard VAT (added manually)
|
||||
2019-01-04,,IL,EUR,0.23,standard,Ireland standard VAT (added manually)
|
||||
2019-01-04,,LI,EUR,0.077,standard,Liechtenstein standard VAT (added manually)
|
||||
|
|
|
|||
|
192
webhook/views.py
192
webhook/views.py
|
|
@ -1,17 +1,14 @@
|
|||
import datetime
|
||||
import logging
|
||||
import json
|
||||
import stripe
|
||||
|
||||
import stripe
|
||||
# Create your views here.
|
||||
from django.conf import settings
|
||||
from django.http import HttpResponse
|
||||
from django.views.decorators.csrf import csrf_exempt
|
||||
from django.views.decorators.http import require_POST
|
||||
|
||||
from datacenterlight.views import do_provisioning, do_provisioning_generic
|
||||
from membership.models import StripeCustomer
|
||||
from hosting.models import IncompleteSubscriptions, IncompletePaymentIntents
|
||||
|
||||
from utils.models import BillingAddress, UserBillingAddress
|
||||
from utils.tasks import send_plain_email_task
|
||||
|
|
@ -114,193 +111,8 @@ def handle_webhook(request):
|
|||
'to': settings.DCL_ERROR_EMAILS_TO_LIST,
|
||||
'body': "Response = %s" % str(tax_id_obj),
|
||||
}
|
||||
|
||||
send_plain_email_task.delay(email_data)
|
||||
elif event.type == 'invoice.paid':
|
||||
#More info: https://stripe.com/docs/billing/migration/strong-customer-authentication#scenario-1-handling-fulfillment
|
||||
invoice_obj = event.data.object
|
||||
logger.debug("Webhook Event: invoice.paid")
|
||||
logger.debug("invoice_obj %s " % str(invoice_obj))
|
||||
logger.debug("invoice_obj.paid = %s %s" % (invoice_obj.paid, type(invoice_obj.paid)))
|
||||
logger.debug("invoice_obj.billing_reason = %s %s" % (invoice_obj.billing_reason, type(invoice_obj.billing_reason)))
|
||||
# We should check for billing_reason == "subscription_create" but we
|
||||
# check for "subscription_update"
|
||||
# because we are using older api.
|
||||
# See https://stripe.com/docs/upgrades?since=2015-07-13
|
||||
|
||||
# The billing_reason attribute of the invoice object now can take the
|
||||
# value of subscription_create, indicating that it is the first
|
||||
# invoice of a subscription. For older API versions,
|
||||
# billing_reason=subscription_create is represented as
|
||||
# subscription_update.
|
||||
|
||||
if (invoice_obj.paid and
|
||||
invoice_obj.billing_reason == "subscription_update"):
|
||||
logger.debug("""invoice_obj.paid and
|
||||
invoice_obj.billing_reason == subscription_update""")
|
||||
logger.debug("Start provisioning")
|
||||
try:
|
||||
logger.debug("Looking for subscription %s" %
|
||||
invoice_obj.subscription)
|
||||
stripe_subscription_obj = stripe.Subscription.retrieve(
|
||||
invoice_obj.subscription)
|
||||
try:
|
||||
incomplete_sub = IncompleteSubscriptions.objects.get(
|
||||
subscription_id=invoice_obj.subscription)
|
||||
request = ""
|
||||
soc = ""
|
||||
card_details_response = ""
|
||||
gp_details = ""
|
||||
template = ""
|
||||
specs = ""
|
||||
billing_address_data = ""
|
||||
if incomplete_sub.request:
|
||||
request = json.loads(incomplete_sub.request)
|
||||
if incomplete_sub.specs:
|
||||
specs = json.loads(incomplete_sub.specs)
|
||||
if incomplete_sub.stripe_onetime_charge:
|
||||
soc = json.loads(incomplete_sub.stripe_onetime_charge)
|
||||
if incomplete_sub.gp_details:
|
||||
gp_details = json.loads(incomplete_sub.gp_details)
|
||||
if incomplete_sub.card_details_response:
|
||||
card_details_response = json.loads(
|
||||
incomplete_sub.card_details_response)
|
||||
if incomplete_sub.template:
|
||||
template = json.loads(
|
||||
incomplete_sub.template)
|
||||
if incomplete_sub.billing_address_data:
|
||||
billing_address_data = json.loads(
|
||||
incomplete_sub.billing_address_data)
|
||||
logger.debug("*******")
|
||||
logger.debug(str(incomplete_sub))
|
||||
logger.debug("*******")
|
||||
logger.debug("1*******")
|
||||
logger.debug(request)
|
||||
logger.debug("2*******")
|
||||
logger.debug(card_details_response)
|
||||
logger.debug("3*******")
|
||||
logger.debug(soc)
|
||||
logger.debug("4*******")
|
||||
logger.debug(gp_details)
|
||||
logger.debug("5*******")
|
||||
logger.debug(template)
|
||||
logger.debug("6*******")
|
||||
do_provisioning(
|
||||
request=request,
|
||||
stripe_api_cus_id=incomplete_sub.stripe_api_cus_id,
|
||||
card_details_response=card_details_response,
|
||||
stripe_subscription_obj=stripe_subscription_obj,
|
||||
stripe_onetime_charge=soc,
|
||||
gp_details=gp_details,
|
||||
specs=specs,
|
||||
vm_template_id=incomplete_sub.vm_template_id,
|
||||
template=template,
|
||||
billing_address_data=billing_address_data,
|
||||
real_request=None
|
||||
)
|
||||
except IncompleteSubscriptions.DoesNotExist as ex:
|
||||
logger.error(str(ex))
|
||||
except IncompleteSubscriptions.MultipleObjectsReturned as ex:
|
||||
logger.error(str(ex))
|
||||
email_data = {
|
||||
'subject': "IncompleteSubscriptions error",
|
||||
'from_email': settings.DCL_SUPPORT_FROM_ADDRESS,
|
||||
'to': settings.DCL_ERROR_EMAILS_TO_LIST,
|
||||
'body': "Response = %s" % str(ex),
|
||||
}
|
||||
send_plain_email_task.delay(email_data)
|
||||
except Exception as ex:
|
||||
logger.error(str(ex))
|
||||
email_data = {
|
||||
'subject': "invoice.paid Webhook error",
|
||||
'from_email': settings.DCL_SUPPORT_FROM_ADDRESS,
|
||||
'to': settings.DCL_ERROR_EMAILS_TO_LIST,
|
||||
'body': "Response = %s" % str(ex),
|
||||
}
|
||||
send_plain_email_task.delay(email_data)
|
||||
elif event.type == 'invoice.payment_failed':
|
||||
invoice_obj = event.data.object
|
||||
logger.debug("Webhook Event: invoice.payment_failed")
|
||||
logger.debug("invoice_obj %s " % str(invoice_obj))
|
||||
if (invoice_obj.payment_failed and
|
||||
invoice_obj.billing_reason == "subscription_update"):
|
||||
logger.debug("Payment failed, inform the users")
|
||||
elif event.type == 'payment_intent.succeeded':
|
||||
payment_intent_obj = event.data.object
|
||||
logger.debug("Webhook Event: payment_intent.succeeded")
|
||||
logger.debug("payment_intent_obj %s " % str(payment_intent_obj))
|
||||
try:
|
||||
logger.debug("Looking for IncompletePaymentIntents %s " %
|
||||
payment_intent_obj.id)
|
||||
incomplete_pm = IncompletePaymentIntents.objects.get(
|
||||
payment_intent_id=payment_intent_obj.id)
|
||||
logger.debug("incomplete_pm = %s" % str(incomplete_pm.__dict__))
|
||||
request = ""
|
||||
soc = ""
|
||||
card_details_response = ""
|
||||
gp_details = ""
|
||||
template = ""
|
||||
billing_address_data = ""
|
||||
if incomplete_pm.request:
|
||||
request = json.loads(incomplete_pm.request)
|
||||
logger.debug("request = %s" % str(request))
|
||||
if incomplete_pm.stripe_charge_id:
|
||||
soc = incomplete_pm.stripe_charge_id
|
||||
logger.debug("stripe_onetime_charge = %s" % str(soc))
|
||||
if incomplete_pm.gp_details:
|
||||
gp_details = json.loads(incomplete_pm.gp_details)
|
||||
logger.debug("gp_details = %s" % str(gp_details))
|
||||
if incomplete_pm.card_details_response:
|
||||
card_details_response = json.loads(
|
||||
incomplete_pm.card_details_response)
|
||||
logger.debug("card_details_response = %s" % str(card_details_response))
|
||||
if incomplete_pm.billing_address_data:
|
||||
billing_address_data = json.loads(
|
||||
incomplete_pm.billing_address_data)
|
||||
logger.debug("billing_address_data = %s" % str(billing_address_data))
|
||||
logger.debug("1*******")
|
||||
logger.debug(request)
|
||||
logger.debug("2*******")
|
||||
logger.debug(card_details_response)
|
||||
logger.debug("3*******")
|
||||
logger.debug(soc)
|
||||
logger.debug("4*******")
|
||||
logger.debug(gp_details)
|
||||
logger.debug("5*******")
|
||||
logger.debug(template)
|
||||
logger.debug("6*******")
|
||||
logger.debug(billing_address_data)
|
||||
incomplete_pm.completed_at = datetime.datetime.now()
|
||||
charges = ""
|
||||
if len(payment_intent_obj.charges.data) > 0:
|
||||
for d in payment_intent_obj.charges.data:
|
||||
if charges == "":
|
||||
charges = "%s" % d.id
|
||||
else:
|
||||
charges = "%s,%s" % (charges, d.id)
|
||||
logger.debug("Charge ids = %s" % charges)
|
||||
incomplete_pm.stripe_charge_id=charges
|
||||
do_provisioning_generic(
|
||||
request=request,
|
||||
stripe_api_cus_id=incomplete_pm.stripe_api_cus_id,
|
||||
card_details_response=card_details_response,
|
||||
stripe_subscription_id=None,
|
||||
stripe_charge_id=charges,
|
||||
gp_details=gp_details,
|
||||
billing_address_data=billing_address_data
|
||||
)
|
||||
incomplete_pm.save()
|
||||
except IncompletePaymentIntents.DoesNotExist as ex:
|
||||
logger.error(str(ex))
|
||||
except (IncompletePaymentIntents.MultipleObjectsReturned,
|
||||
Exception) as ex:
|
||||
logger.error(str(ex))
|
||||
email_data = {
|
||||
'subject': "IncompletePaymentIntents error",
|
||||
'from_email': settings.DCL_SUPPORT_FROM_ADDRESS,
|
||||
'to': settings.DCL_ERROR_EMAILS_TO_LIST,
|
||||
'body': "Response = %s" % str(ex),
|
||||
}
|
||||
send_plain_email_task.delay(email_data)
|
||||
else:
|
||||
logger.error("Unhandled event : " + event.type)
|
||||
return HttpResponse(status=200)
|
||||
|
|
|
|||
Loading…
Reference in New Issue