From 0e72f8a4367c8ada9c81513b1b36b24469ed19dd Mon Sep 17 00:00:00 2001 From: Arvind Tiwari Date: Sun, 20 Aug 2017 03:30:10 +0530 Subject: [PATCH 0001/1862] downtime page --- .../datacenterlight/css/downtime-page.css | 52 +++++++++++++++ .../templates/datacenterlight/downtime.html | 63 +++++++++++++++++++ datacenterlight/urls.py | 11 +++- 3 files changed, 123 insertions(+), 3 deletions(-) create mode 100644 datacenterlight/static/datacenterlight/css/downtime-page.css create mode 100644 datacenterlight/templates/datacenterlight/downtime.html diff --git a/datacenterlight/static/datacenterlight/css/downtime-page.css b/datacenterlight/static/datacenterlight/css/downtime-page.css new file mode 100644 index 00000000..9bbfa5bc --- /dev/null +++ b/datacenterlight/static/datacenterlight/css/downtime-page.css @@ -0,0 +1,52 @@ +body { + font-family: Lato, sans-serif; + font-weight: 300; + font-size: 20px; + line-height: 1; +} + +h1 { + font-weight: 300; + font-size: 52px; + text-align: center; +} + +nav { + padding: 15px; +} + +.downtime-container { + max-width: 1200px; + margin: auto; + display: flex; + flex-direction: column; + justify-content: space-between; +} + +.downtime-msg { + text-align: center; + font-size: 30px; +} + +.downtime-contact { + max-width: 300px; + margin: auto; + color: #4a90e2; +} + +h2 { + font-weight: 300; + font-size: 24px; + text-align: center; +} +p { + margin: 15px auto +} +.xl_p { + margin: 15px auto; +} + +a { + color: #4a90e2; + text-decoration: none; +} \ No newline at end of file diff --git a/datacenterlight/templates/datacenterlight/downtime.html b/datacenterlight/templates/datacenterlight/downtime.html new file mode 100644 index 00000000..dd5954ca --- /dev/null +++ b/datacenterlight/templates/datacenterlight/downtime.html @@ -0,0 +1,63 @@ +{% load staticfiles bootstrap3%} +{% load i18n %} + + + + + + + + + + + + ungleich + + + + + + + + + + + + + + {% include "google_analytics.html" %} + + + + + +
+ + +

{% trans "You caught us while working!" %}

+
+

{% trans "We're doing scheduled maintainence from" %}

+

17:00 21.08.2017 {% trans "to" %} 23:00 21.08.2017 CEST.

+
+

{% trans "If you need immediate assistance, please contact us at" %}

+
+

support@datacenterlight.ch

+

+41 044 534 66 22

+

https://twitter.com/datacenterlight

+

https://twitter.com/ungleich

+
+
+ + + diff --git a/datacenterlight/urls.py b/datacenterlight/urls.py index a3aed7a6..a0942695 100644 --- a/datacenterlight/urls.py +++ b/datacenterlight/urls.py @@ -1,17 +1,22 @@ from django.conf.urls import url +from django.views.generic import TemplateView from .views import IndexView, BetaProgramView, LandingProgramView, BetaAccessView, PricingView, SuccessView, \ - PaymentOrderView, OrderConfirmationView, WhyDataCenterLightView + PaymentOrderView, OrderConfirmationView, WhyDataCenterLightView urlpatterns = [ url(r'^$', IndexView.as_view(), name='index'), - url(r'^whydatacenterlight/?$', WhyDataCenterLightView.as_view(), name='whydatacenterlight'), + url(r'^whydatacenterlight/?$', WhyDataCenterLightView.as_view(), + name='whydatacenterlight'), url(r'^beta-program/?$', BetaProgramView.as_view(), name='beta'), url(r'^landing/?$', LandingProgramView.as_view(), name='landing'), url(r'^pricing/?$', PricingView.as_view(), name='pricing'), url(r'^payment/?$', PaymentOrderView.as_view(), name='payment'), - url(r'^order-confirmation/?$', OrderConfirmationView.as_view(), name='order_confirmation'), + url(r'^order-confirmation/?$', OrderConfirmationView.as_view(), + name='order_confirmation'), url(r'^order-success/?$', SuccessView.as_view(), name='order_success'), url(r'^beta_access?$', BetaAccessView.as_view(), name='beta_access'), + + url(r'test/?$', TemplateView.as_view(template_name='datacenterlight/downtime.html')), ] From 06c68873aea768ba04419a36aac3ae123fd08713 Mon Sep 17 00:00:00 2001 From: Arvind Tiwari Date: Sun, 20 Aug 2017 03:59:24 +0530 Subject: [PATCH 0002/1862] downtime.html modified as a static html page --- .../datacenterlight/css/downtime-page.css | 52 ----------- .../templates/datacenterlight/downtime.html | 86 ++++++++++++++----- 2 files changed, 64 insertions(+), 74 deletions(-) delete mode 100644 datacenterlight/static/datacenterlight/css/downtime-page.css diff --git a/datacenterlight/static/datacenterlight/css/downtime-page.css b/datacenterlight/static/datacenterlight/css/downtime-page.css deleted file mode 100644 index 9bbfa5bc..00000000 --- a/datacenterlight/static/datacenterlight/css/downtime-page.css +++ /dev/null @@ -1,52 +0,0 @@ -body { - font-family: Lato, sans-serif; - font-weight: 300; - font-size: 20px; - line-height: 1; -} - -h1 { - font-weight: 300; - font-size: 52px; - text-align: center; -} - -nav { - padding: 15px; -} - -.downtime-container { - max-width: 1200px; - margin: auto; - display: flex; - flex-direction: column; - justify-content: space-between; -} - -.downtime-msg { - text-align: center; - font-size: 30px; -} - -.downtime-contact { - max-width: 300px; - margin: auto; - color: #4a90e2; -} - -h2 { - font-weight: 300; - font-size: 24px; - text-align: center; -} -p { - margin: 15px auto -} -.xl_p { - margin: 15px auto; -} - -a { - color: #4a90e2; - text-decoration: none; -} \ No newline at end of file diff --git a/datacenterlight/templates/datacenterlight/downtime.html b/datacenterlight/templates/datacenterlight/downtime.html index dd5954ca..17c40d79 100644 --- a/datacenterlight/templates/datacenterlight/downtime.html +++ b/datacenterlight/templates/datacenterlight/downtime.html @@ -1,5 +1,3 @@ -{% load staticfiles bootstrap3%} -{% load i18n %} @@ -13,23 +11,69 @@ ungleich - - + @@ -37,25 +81,23 @@
-

{% trans "You caught us while working!" %}

+

You caught us while working!

-

{% trans "We're doing scheduled maintainence from" %}

-

17:00 21.08.2017 {% trans "to" %} 23:00 21.08.2017 CEST.

+

We're doing scheduled maintenance from

+

17:00 21.08.2017 to 23:00 21.08.2017 CEST.

-

{% trans "If you need immediate assistance, please contact us at" %}

+

If you need immediate assistance, please contact us at

support@datacenterlight.ch

+41 044 534 66 22

-

https://twitter.com/datacenterlight

-

https://twitter.com/ungleich

+

twitter datacenterlight

+

twitter ungleich

From 8b5117ba8054ab9dd4b4caab30b7999705ae90a8 Mon Sep 17 00:00:00 2001 From: PCoder Date: Fri, 25 Aug 2017 13:28:16 +0530 Subject: [PATCH 0003/1862] Commented code that was causing the error when executing the tests --- hosting/test_forms.py | 67 ++++++++---------- hosting/test_models.py | 150 ++++++++++++++++++++--------------------- hosting/test_views.py | 70 +++++++++---------- 3 files changed, 139 insertions(+), 148 deletions(-) diff --git a/hosting/test_forms.py b/hosting/test_forms.py index e0f5df30..dd5ee94a 100644 --- a/hosting/test_forms.py +++ b/hosting/test_forms.py @@ -1,14 +1,9 @@ from django.test import TestCase - -from unittest import mock from model_mommy import mommy - -from .forms import HostingOrderAdminForm, HostingUserLoginForm, HostingUserSignupForm -from .models import VirtualMachinePlan +from .forms import HostingUserLoginForm, HostingUserSignupForm class HostingUserLoginFormTest(TestCase): - def setUp(self): password = 'user_password' self.user = mommy.make('CustomUser') @@ -34,9 +29,7 @@ class HostingUserLoginFormTest(TestCase): class HostingUserSignupFormTest(TestCase): - def setUp(self): - self.completed_data = { 'name': 'test name', 'email': 'test@ungleich.com', @@ -58,13 +51,11 @@ class HostingUserSignupFormTest(TestCase): class HostingOrderAdminFormTest(TestCase): - def setUp(self): - self.customer = mommy.make('StripeCustomer') self.vm_plan = mommy.make('VirtualMachinePlan') - self.vm_canceled_plan = mommy.make('VirtualMachinePlan', - status=VirtualMachinePlan.CANCELED_STATUS) + # self.vm_canceled_plan = mommy.make('VirtualMachinePlan', + # status=VirtualMachinePlan.CANCELED_STATUS) self.mocked_charge = { 'amount': 5100, @@ -87,30 +78,30 @@ class HostingOrderAdminFormTest(TestCase): 'customer': None } - @mock.patch('utils.stripe_utils.StripeUtils.make_charge') - def test_valid_form(self, stripe_mocked_call): - stripe_mocked_call.return_value = { - 'paid': True, - 'response_object': self.mocked_charge, - 'error': None - } - form = HostingOrderAdminForm(data=self.completed_data) - self.assertTrue(form.is_valid()) + # @mock.patch('utils.stripe_utils.StripeUtils.make_charge') + # def test_valid_form(self, stripe_mocked_call): + # stripe_mocked_call.return_value = { + # 'paid': True, + # 'response_object': self.mocked_charge, + # 'error': None + # } + # form = HostingOrderAdminForm(data=self.completed_data) + # self.assertTrue(form.is_valid()) - @mock.patch('utils.stripe_utils.StripeUtils.make_charge') - def test_invalid_form_canceled_vm(self, stripe_mocked_call): - - self.completed_data.update({ - 'vm_plan': self.vm_canceled_plan.id - }) - stripe_mocked_call.return_value = { - 'paid': True, - 'response_object': self.mocked_charge, - 'error': None - } - form = HostingOrderAdminForm(data=self.completed_data) - self.assertFalse(form.is_valid()) - - def test_invalid_form(self): - form = HostingOrderAdminForm(data=self.incompleted_data) - self.assertFalse(form.is_valid()) + # @mock.patch('utils.stripe_utils.StripeUtils.make_charge') + # def test_invalid_form_canceled_vm(self, stripe_mocked_call): + # + # self.completed_data.update({ + # 'vm_plan': self.vm_canceled_plan.id + # }) + # stripe_mocked_call.return_value = { + # 'paid': True, + # 'response_object': self.mocked_charge, + # 'error': None + # } + # form = HostingOrderAdminForm(data=self.completed_data) + # self.assertFalse(form.is_valid()) + # + # def test_invalid_form(self): + # form = HostingOrderAdminForm(data=self.incompleted_data) + # self.assertFalse(form.is_valid()) diff --git a/hosting/test_models.py b/hosting/test_models.py index 2b41045b..944044ea 100644 --- a/hosting/test_models.py +++ b/hosting/test_models.py @@ -1,75 +1,75 @@ -from django.test import TestCase - -from django.core.management import call_command - - -from .models import VirtualMachineType - - -class VirtualMachineTypeModelTest(TestCase): - - def setUp(self): - self.HETZNER_NUG_NAME = 'hetzner_nug' - self.HETZNER_NAME = 'hetzner' - self.HETZNER_RAID6_NAME = 'hetzner_raid6' - self.HETZNER_GLUSTERFS_NAME = 'hetzner_glusterfs' - self.BERN_NAME = 'bern' - self.HETZNER_NUG_EXPECTED_PRICE = 79 - self.HETZNER_EXPECTED_PRICE = 180 - self.HETZNER_RAID6_EXPECTED_PRICE = 216 - self.HETZNER_GLUSTERFS_EXPECTED_PRICE = 252 - self.BERN_EXPECTED_PRICE = 202 - - call_command('create_vm_types') - - def test_calculate_price(self): - - # hetzner_nug - # specifications = { - # 'cores': 2, - # 'memory': 10, - # 'disk_size': 100 - # } - # vm_type = VirtualMachineType.objects.get(hosting_company=self.HETZNER_NUG_NAME) - # calculated_price = vm_type.calculate_price(specifications) - # self.assertEqual(calculated_price, self.HETZNER_NUG_EXPECTED_PRICE) - - # hetzner - specifications = { - 'cores': 2, - 'memory': 10, - 'disk_size': 100 - } - vm_type = VirtualMachineType.objects.get(hosting_company=self.HETZNER_NAME) - calculated_price = vm_type.calculate_price(specifications) - self.assertEqual(calculated_price, self.HETZNER_EXPECTED_PRICE) - - # hetzner_raid6 - # specifications = { - # 'cores': 2, - # 'memory': 10, - # 'disk_size': 100 - # } - # vm_type = VirtualMachineType.objects.get(hosting_company=self.HETZNER_RAID6_NAME) - # calculated_price = vm_type.calculate_price(specifications) - # self.assertEqual(calculated_price, self.HETZNER_RAID6_EXPECTED_PRICE) - - # hetzner_glusterfs - # specifications = { - # 'cores': 2, - # 'memory': 10, - # 'disk_size': 100 - # } - # vm_type = VirtualMachineType.objects.get(hosting_company=self.HETZNER_GLUSTERFS_NAME) - # calculated_price = vm_type.calculate_price(specifications) - # self.assertEqual(calculated_price, self.HETZNER_GLUSTERFS_EXPECTED_PRICE) - - # bern - specifications = { - 'cores': 2, - 'memory': 10, - 'disk_size': 100 - } - vm_type = VirtualMachineType.objects.get(hosting_company=self.BERN_NAME) - calculated_price = vm_type.calculate_price(specifications) - self.assertEqual(calculated_price, self.BERN_EXPECTED_PRICE) +# from django.test import TestCase +# +# from django.core.management import call_command +# +# +# #from .models import VirtualMachineType +# +# +# class VirtualMachineTypeModelTest(TestCase): +# +# def setUp(self): +# self.HETZNER_NUG_NAME = 'hetzner_nug' +# self.HETZNER_NAME = 'hetzner' +# self.HETZNER_RAID6_NAME = 'hetzner_raid6' +# self.HETZNER_GLUSTERFS_NAME = 'hetzner_glusterfs' +# self.BERN_NAME = 'bern' +# self.HETZNER_NUG_EXPECTED_PRICE = 79 +# self.HETZNER_EXPECTED_PRICE = 180 +# self.HETZNER_RAID6_EXPECTED_PRICE = 216 +# self.HETZNER_GLUSTERFS_EXPECTED_PRICE = 252 +# self.BERN_EXPECTED_PRICE = 202 +# +# call_command('create_vm_types') +# +# def test_calculate_price(self): +# +# # hetzner_nug +# # specifications = { +# # 'cores': 2, +# # 'memory': 10, +# # 'disk_size': 100 +# # } +# # vm_type = VirtualMachineType.objects.get(hosting_company=self.HETZNER_NUG_NAME) +# # calculated_price = vm_type.calculate_price(specifications) +# # self.assertEqual(calculated_price, self.HETZNER_NUG_EXPECTED_PRICE) +# +# # hetzner +# specifications = { +# 'cores': 2, +# 'memory': 10, +# 'disk_size': 100 +# } +# vm_type = VirtualMachineType.objects.get(hosting_company=self.HETZNER_NAME) +# calculated_price = vm_type.calculate_price(specifications) +# self.assertEqual(calculated_price, self.HETZNER_EXPECTED_PRICE) +# +# # hetzner_raid6 +# # specifications = { +# # 'cores': 2, +# # 'memory': 10, +# # 'disk_size': 100 +# # } +# # vm_type = VirtualMachineType.objects.get(hosting_company=self.HETZNER_RAID6_NAME) +# # calculated_price = vm_type.calculate_price(specifications) +# # self.assertEqual(calculated_price, self.HETZNER_RAID6_EXPECTED_PRICE) +# +# # hetzner_glusterfs +# # specifications = { +# # 'cores': 2, +# # 'memory': 10, +# # 'disk_size': 100 +# # } +# # vm_type = VirtualMachineType.objects.get(hosting_company=self.HETZNER_GLUSTERFS_NAME) +# # calculated_price = vm_type.calculate_price(specifications) +# # self.assertEqual(calculated_price, self.HETZNER_GLUSTERFS_EXPECTED_PRICE) +# +# # bern +# specifications = { +# 'cores': 2, +# 'memory': 10, +# 'disk_size': 100 +# } +# vm_type = VirtualMachineType.objects.get(hosting_company=self.BERN_NAME) +# calculated_price = vm_type.calculate_price(specifications) +# self.assertEqual(calculated_price, self.BERN_EXPECTED_PRICE) diff --git a/hosting/test_views.py b/hosting/test_views.py index aa9a9ace..e8853c9f 100644 --- a/hosting/test_views.py +++ b/hosting/test_views.py @@ -13,11 +13,11 @@ from stored_messages.models import Inbox from membership.models import CustomUser, StripeCustomer -from .models import VirtualMachineType, HostingOrder, VirtualMachinePlan +from .models import HostingOrder from .views import DjangoHostingView, RailsHostingView, NodeJSHostingView, LoginView, SignupView, \ PaymentVMView, OrdersHostingDetailView, OrdersHostingListView, VirtualMachineView, \ VirtualMachinesPlanListView, PasswordResetView, PasswordResetConfirmView, HostingPricingView, \ - NotificationsView, MarkAsReadNotificationView, GenerateVMSSHKeysView + NotificationsView, MarkAsReadNotificationView from utils.tests import BaseTestCase @@ -47,15 +47,15 @@ class DjangoHostingViewTest(TestCase, ProcessVMSelectionTestMixin): self.view = DjangoHostingView() self.expected_template = 'hosting/django.html' HOSTING = 'django' - configuration_detail = dict(VirtualMachinePlan.VM_CONFIGURATION).get(HOSTING) + #configuration_detail = dict(VirtualMachinePlan.VM_CONFIGURATION).get(HOSTING) self.expected_context = { 'hosting': HOSTING, 'hosting_long': "Django", - 'configuration_detail': configuration_detail, + #'configuration_detail': configuration_detail, 'domain': "django-hosting.ch", 'google_analytics': "UA-62285904-6", 'email': "info@django-hosting.ch", - 'vm_types': VirtualMachineType.get_serialized_vm_types(), + #'vm_types': VirtualMachineType.get_serialized_vm_types(), } @@ -66,15 +66,15 @@ class RailsHostingViewTest(TestCase, ProcessVMSelectionTestMixin): self.view = RailsHostingView() self.expected_template = 'hosting/rails.html' HOSTING = 'rails' - configuration_detail = dict(VirtualMachinePlan.VM_CONFIGURATION).get(HOSTING) + #configuration_detail = dict(VirtualMachinePlan.VM_CONFIGURATION).get(HOSTING) self.expected_context = { 'hosting': HOSTING, 'hosting_long': "Ruby On Rails", - 'configuration_detail': configuration_detail, + #'configuration_detail': configuration_detail, 'domain': "rails-hosting.ch", 'google_analytics': "UA-62285904-5", 'email': "info@rails-hosting.ch", - 'vm_types': VirtualMachineType.get_serialized_vm_types(), + #'vm_types': VirtualMachineType.get_serialized_vm_types(), } @@ -85,15 +85,15 @@ class NodeJSHostingViewTest(TestCase, ProcessVMSelectionTestMixin): self.view = NodeJSHostingView() self.expected_template = 'hosting/nodejs.html' HOSTING = 'nodejs' - configuration_detail = dict(VirtualMachinePlan.VM_CONFIGURATION).get(HOSTING) + #configuration_detail = dict(VirtualMachinePlan.VM_CONFIGURATION).get(HOSTING) self.expected_context = { 'hosting': HOSTING, 'hosting_long': "NodeJS", - 'configuration_detail': configuration_detail, + #'configuration_detail': configuration_detail, 'domain': "node-hosting.ch", 'google_analytics': "UA-62285904-7", 'email': "info@node-hosting.ch", - 'vm_types': VirtualMachineType.get_serialized_vm_types(), + #'vm_types': VirtualMachineType.get_serialized_vm_types(), } @@ -104,11 +104,11 @@ class HostingPricingViewTest(TestCase): self.view = HostingPricingView() self.expected_template = 'hosting/hosting_pricing.html' - configuration_options = dict(VirtualMachinePlan.VM_CONFIGURATION) + #configuration_options = dict(VirtualMachinePlan.VM_CONFIGURATION) self.expected_context = { - 'configuration_options': configuration_options, + #'configuration_options': configuration_options, 'email': "info@django-hosting.ch", - 'vm_types': VirtualMachineType.get_serialized_vm_types(), + #'vm_types': VirtualMachineType.get_serialized_vm_types(), } def url_resolve_to_view_correctly(self): @@ -135,10 +135,10 @@ class PaymentVMViewTest(BaseTestCase): self.view = PaymentVMView # VM - self.vm = mommy.make(VirtualMachineType, base_price=10000, - memory_price=100, - core_price=1000, - disk_size_price=1) + # self.vm = mommy.make(VirtualMachineType, base_price=10000, + # memory_price=100, + # core_price=1000, + # disk_size_price=1) # post data self.billing_address = { @@ -153,16 +153,16 @@ class PaymentVMViewTest(BaseTestCase): self.url = reverse('hosting:payment') # Session data - self.session_data = { - 'vm_specs': { - 'hosting_company': self.vm.hosting_company, - 'cores': 1, - 'memory': 10, - 'disk_size': 10000, - 'price': 22000, - 'configuration': dict(VirtualMachinePlan.VM_CONFIGURATION).get('django') - } - } + # self.session_data = { + # 'vm_specs': { + # 'hosting_company': self.vm.hosting_company, + # 'cores': 1, + # 'memory': 10, + # 'disk_size': 10000, + # 'price': 22000, + # 'configuration': dict(VirtualMachinePlan.VM_CONFIGURATION).get('django') + # } + # } session = self.customer_client.session session.update(self.session_data) @@ -290,8 +290,8 @@ class GenerateVMSSHKeysViewTest(BaseTestCase): def setUp(self): super(GenerateVMSSHKeysViewTest, self).setUp() - self.view = GenerateVMSSHKeysView - self.vm = mommy.make(VirtualMachinePlan) + # self.view = GenerateVMSSHKeysView + # self.vm = mommy.make(VirtualMachinePlan) self.expected_template = 'hosting/virtual_machine_key.html' self.url = reverse('hosting:virtual_machine_key', kwargs={'pk': self.vm.id}) @@ -312,8 +312,8 @@ class GenerateVMSSHKeysViewTest(BaseTestCase): # Logged user should get the page response = self.customer_client.get(self.url, follow=True) self.assertEqual(response.status_code, 200) - updated_vm = VirtualMachinePlan.objects.get(id=self.vm.id) - self.assertEqual(response.context['public_key'].decode("utf-8"), updated_vm.public_key) + #updated_vm = VirtualMachinePlan.objects.get(id=self.vm.id) + #self.assertEqual(response.context['public_key'].decode("utf-8"), updated_vm.public_key) self.assertTrue(response.context['private_key'] is not None) self.assertEqual(len(response.context['public_key']), 380) self.assertTrue(len(response.context['private_key']) is 1678 or 1674) @@ -326,7 +326,7 @@ class VirtualMachineViewTest(BaseTestCase): super(VirtualMachineViewTest, self).setUp() self.stripe_customer = mommy.make(StripeCustomer, user=self.customer) - self.vm = mommy.make(VirtualMachinePlan) + #self.vm = mommy.make(VirtualMachinePlan) self.vm.assign_permissions(self.customer) self.order = mommy.make(HostingOrder, customer=self.stripe_customer, vm_plan=self.vm) self.url = reverse('hosting:virtual_machines', kwargs={'pk': self.vm.id}) @@ -361,8 +361,8 @@ class VirtualMachinesPlanListViewTest(BaseTestCase): self.stripe_customer = mommy.make(StripeCustomer, user=self.customer) mommy.make(HostingOrder, customer=self.stripe_customer, approved=True, _quantity=20) - _vms = VirtualMachinePlan.objects.all() - self.vms = sorted(_vms, key=lambda vm: vm.id, reverse=True) + #_vms = VirtualMachinePlan.objects.all() + #self.vms = sorted(_vms, key=lambda vm: vm.id, reverse=True) self.url = reverse('hosting:virtual_machines') self.view = VirtualMachinesPlanListView() self.expected_template = 'hosting/virtual_machines.html' From e2188cc166666d4cab69ec7a1db1dce6008a6a07 Mon Sep 17 00:00:00 2001 From: "M.Ravi" Date: Mon, 2 Oct 2017 17:19:51 +0200 Subject: [PATCH 0004/1862] Added some skipIf conditions --- utils/tests.py | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/utils/tests.py b/utils/tests.py index d5c2d726..1da5ba28 100644 --- a/utils/tests.py +++ b/utils/tests.py @@ -139,6 +139,10 @@ class TestStripeCustomerDescription(TestCase): self.assertEqual(customer_data.description, self.customer_name) +@skipIf(settings.STRIPE_API_PRIVATE_KEY_TEST == "" or + settings.TEST_MANAGE_SSH_KEY_HOST == "", + """Skipping test_save_ssh_key_add because either host + or public key were not specified or were empty""") class StripePlanTestCase(TestStripeCustomerDescription): """ A class to test Stripe plans @@ -161,6 +165,10 @@ class StripePlanTestCase(TestStripeCustomerDescription): self.assertIsNone(stripe_plan.get('error')) self.assertIsInstance(stripe_plan.get('response_object'), StripePlan) + @skipIf(settings.TEST_MANAGE_SSH_KEY_PUBKEY == "" or + settings.TEST_MANAGE_SSH_KEY_HOST == "", + """Skipping test_save_ssh_key_add because either host + or public key were not specified or were empty""") @patch('utils.stripe_utils.logger') def test_create_duplicate_plans_error_handling(self, mock_logger): """ @@ -254,10 +262,8 @@ class SaveSSHKeyTestCase(TestCase): self.public_key = settings.TEST_MANAGE_SSH_KEY_PUBKEY self.hosts = settings.TEST_MANAGE_SSH_KEY_HOST - @skipIf(settings.TEST_MANAGE_SSH_KEY_PUBKEY is None or - settings.TEST_MANAGE_SSH_KEY_PUBKEY == "" or - settings.TEST_MANAGE_SSH_KEY_HOST is None or - settings.TEST_MANAGE_SSH_KEY_HOST is "", + @skipIf(settings.TEST_MANAGE_SSH_KEY_PUBKEY == "" or + settings.TEST_MANAGE_SSH_KEY_HOST == "", """Skipping test_save_ssh_key_add because either host or public key were not specified or were empty""") def test_save_ssh_key_add(self): From f044b83b8f1be5220270dbb12980459c5d2a7b69 Mon Sep 17 00:00:00 2001 From: "M.Ravi" Date: Tue, 3 Oct 2017 13:06:26 +0200 Subject: [PATCH 0005/1862] Add Stripe unsubscribe_customer method --- utils/stripe_utils.py | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/utils/stripe_utils.py b/utils/stripe_utils.py index 8fcf0ab1..58840be0 100644 --- a/utils/stripe_utils.py +++ b/utils/stripe_utils.py @@ -232,6 +232,17 @@ class StripeUtils(object): ) return subscription_result + @handleStripeError + def unsubscribe_customer(self, subscription_id): + """ + Cancels a given subscription + + :param subscription_id: The Stripe subscription id string + :return: + """ + sub = stripe.Subscription.retrieve(subscription_id) + return sub.delete() + @handleStripeError def make_payment(self, customer, amount, token): charge = self.stripe.Charge.create( From 777aab711503d268767ba096043073df79129066 Mon Sep 17 00:00:00 2001 From: "M.Ravi" Date: Tue, 3 Oct 2017 13:07:41 +0200 Subject: [PATCH 0006/1862] Add cancel subscription code on VM cancel --- hosting/views.py | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/hosting/views.py b/hosting/views.py index 6d4f15ca..d534ccbe 100644 --- a/hosting/views.py +++ b/hosting/views.py @@ -11,6 +11,7 @@ from django.contrib.auth.mixins import LoginRequiredMixin from django.contrib.auth.tokens import default_token_generator from django.core.exceptions import ValidationError from django.core.files.base import ContentFile +from django.core.mail import EmailMessage from django.core.urlresolvers import reverse_lazy, reverse from django.http import Http404, HttpResponseRedirect, HttpResponse @@ -1071,6 +1072,52 @@ class VirtualMachineView(LoginRequiredMixin, View): vm_id=opennebula_vm_id).first() vm_detail_obj.terminated_at = datetime.utcnow() vm_detail_obj.save() + # Cancel subscription + stripe_utils = StripeUtils() + error_msg_subject = ( + 'Error canceling subscription for ' + '{user} and vm id {vm_id}'.format( + user=owner.email, + vm_id=opennebula_vm_id + ) + ) + try: + hosting_order = HostingOrder.objects.get( + vm_id=opennebula_vm_id + ) + result = stripe_utils.unsubscribe_customer( + subscription_id=hosting_order.subscription_id + ) + stripe_subscription_obj = result.get( + 'response_object') + # Check if the subscription was canceled + if (stripe_subscription_obj is None or + stripe_subscription_obj.status != 'canceled'): + error_msg = result.get('error') + logger.error(error_msg) + email_data = { + 'subject': error_msg_subject, + 'from_email': settings.DCL_SUPPORT_FROM_ADDRESS, + 'to': settings.DCL_ERROR_EMAILS_TO_LIST, + 'body': error_msg, + } + email = EmailMessage(**email_data) + email.send() + except HostingOrder.DoesNotExist: + error_msg = ( + "HostingOrder corresponding to vm_id={vm_id} does" + "not exist. Hence, can not find subscription to " + "cancel ".format(vm_id=opennebula_vm_id) + ) + logger.error(error_msg) + email_data = { + 'subject': error_msg_subject, + 'from_email': settings.DCL_SUPPORT_FROM_ADDRESS, + 'to': settings.DCL_ERROR_EMAILS_TO_LIST, + 'body': error_msg, + } + email = EmailMessage(**email_data) + email.send() break except BaseException: break From 6536991209fc25af113a91dfa93988ede3a00952 Mon Sep 17 00:00:00 2001 From: Arvind Tiwari Date: Fri, 6 Oct 2017 01:17:35 +0530 Subject: [PATCH 0007/1862] list all cards, card_input template --- .../datacenterlight/landing_payment.html | 58 +-------------- hosting/templates/hosting/payment.html | 57 +------------- hosting/templates/hosting/settings.html | 74 +++---------------- hosting/views.py | 19 +++-- 4 files changed, 20 insertions(+), 188 deletions(-) diff --git a/datacenterlight/templates/datacenterlight/landing_payment.html b/datacenterlight/templates/datacenterlight/landing_payment.html index fa638d77..1a476797 100644 --- a/datacenterlight/templates/datacenterlight/landing_payment.html +++ b/datacenterlight/templates/datacenterlight/landing_payment.html @@ -121,63 +121,7 @@ {% else %} -
- -
-
-
- -
-
-
-
- -
-
-
- -
-
-
-
- - -
-
-
-
- {% if not messages and not form.non_field_errors %} -

- {% trans "You are not making any payment yet. After placing your order, you will be taken to the Submit Payment Page." %} -

- {% endif %} -
- {% for message in messages %} - {% if 'failed_payment' in message.tags or 'make_charge_error' in message.tags %} -
    -

  • {{ message|safe }}

    • -
- {% elif not form.non_field_errors %} -

- {% trans "You are not making any payment yet. After placing your order, you will be taken to the Submit Payment Page." %} -

- {% endif %} - {% endfor %} - - {% for error in form.non_field_errors %} -

- {{ error|escape }} -

- {% endfor %} -
-
- -
- -
-

-
-
+ {% include "hosting/includes/_card_input.html" %} {% endif %} diff --git a/hosting/templates/hosting/payment.html b/hosting/templates/hosting/payment.html index e9d6476f..a10cfbca 100644 --- a/hosting/templates/hosting/payment.html +++ b/hosting/templates/hosting/payment.html @@ -105,62 +105,7 @@ {% else %} -
- -
-
-
- -
-
-
-
- -
-
-
- -
-
-
-
- - -
-
-
-
- {% if not messages and not form.non_field_errors %} -

- {% trans "You are not making any payment yet. After submitting your card information, you will be taken to the Confirm Order Page." %} -

- {% endif %} -
- {% for message in messages %} - {% if 'failed_payment' or 'make_charge_error' in message.tags %} -
    -
  • -

    {{ message|safe }}

    -
    • -
- {% endif %} - {% endfor %} - - {% for error in form.non_field_errors %} -

- {{ error|escape }} -

- {% endfor %} -
-
- -
- - -
-

-
-
+ {% include "hosting/includes/_card_input.html" %} {% endif %} diff --git a/hosting/templates/hosting/settings.html b/hosting/templates/hosting/settings.html index 0bafe8e5..5e898b04 100644 --- a/hosting/templates/hosting/settings.html +++ b/hosting/templates/hosting/settings.html @@ -30,12 +30,13 @@

{%trans "Credit Card"%}

- {% if credit_card_data.last4 %} + {% for card in cards_list %}
{% trans "Credit Card" %}
-
{% trans "Last" %} 4: *****{{credit_card_data.last4}}
-
{% trans "Type" %}: {{credit_card_data.cc_brand}}
+
{% trans "Last" %} 4: *****{{card.last4}}
+
{% trans "Type" %}: {{card.cc_brand}}
{% comment %} + {% endcomment %}
@@ -46,75 +47,18 @@
- {% endcomment %}
+ {% endfor %} + {% if credit_card_data.last4 %} {% else %}

{% trans "No Credit Cards Added" %}

{% blocktrans %}We are using Stripe for payment and do not store your information in our database.{% endblocktrans %}

- {% comment %}

{% trans "Add a new Card." %}

-

- {% blocktrans %}Please fill in your credit card information below. We are using Stripe for payment and do not store your information in our database.{% endblocktrans %} -

-
- -
-
- -
-
-
-
- -
-
-
- -
-
-
-
- - -
-
- -
- {% if not messages and not form.non_field_errors %} -

- {% blocktrans %}You are not making any payment here.{% endblocktrans %} -

- {% endif %} -
- {% for message in messages %} - {% if 'failed_payment' or 'make_charge_error' in message.tags %} -
  • -

    {{ message|safe }}

    -
- {% endif %} - {% endfor %} - - {% for error in form.non_field_errors %} -

- {{ error|escape }} -

- {% endfor %} -
-
-
- -
-
-
- -
-

-
-
+ {% include "hosting/includes/_card_input.html" %} + {% comment %} {% endcomment %} {% endif %}
@@ -123,7 +67,6 @@ - {% comment %} {% if stripe_key %} {% get_current_language as LANGUAGE_CODE %} @@ -138,6 +81,7 @@ {%endif%} + {% comment %} {% if credit_card_data.last4 and credit_card_data.cc_brand %} - + - - + + - + - - + - - + From 707f1a8768722fd47c3f3f56744280557e608074 Mon Sep 17 00:00:00 2001 From: "M.Ravi" Date: Sun, 15 Oct 2017 18:00:43 +0200 Subject: [PATCH 0012/1862] Add UserCardDetail model + Reorganize imports --- hosting/models.py | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/hosting/models.py b/hosting/models.py index 04f3ae30..243e53c0 100644 --- a/hosting/models.py +++ b/hosting/models.py @@ -1,14 +1,15 @@ -import os import logging -from dateutil.relativedelta import relativedelta +import os +from Crypto.PublicKey import RSA +from dateutil.relativedelta import relativedelta from django.db import models from django.utils import timezone from django.utils.functional import cached_property -from Crypto.PublicKey import RSA + from membership.models import StripeCustomer, CustomUser -from utils.models import BillingAddress from utils.mixins import AssignPermissionsMixin +from utils.models import BillingAddress logger = logging.getLogger(__name__) @@ -180,3 +181,16 @@ class VMDetail(models.Model): months = relativedelta(end_date, self.created_at).months or 1 end_date = self.created_at + relativedelta(months=months, days=-1) return end_date + + +class UserCardDetail(AssignPermissionsMixin, models.Model): + permissions = ('view_usercarddetail',) + customer = models.ForeignKey(StripeCustomer) + stripe_id = models.CharField(unique=True, max_length=100) + last4 = models.CharField(max_length=4) + cc_brand = models.CharField(max_length=10) + + class Meta: + permissions = ( + ('view_usercarddetail', 'View User Card'), + ) \ No newline at end of file From a4b63e220adb697b36dc93cff0e5529262638185 Mon Sep 17 00:00:00 2001 From: "M.Ravi" Date: Sun, 15 Oct 2017 19:49:44 +0200 Subject: [PATCH 0013/1862] Relate UserCardDetail to CustomUser and rename some fields --- hosting/models.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hosting/models.py b/hosting/models.py index 243e53c0..dd792ca5 100644 --- a/hosting/models.py +++ b/hosting/models.py @@ -185,10 +185,10 @@ class VMDetail(models.Model): class UserCardDetail(AssignPermissionsMixin, models.Model): permissions = ('view_usercarddetail',) - customer = models.ForeignKey(StripeCustomer) - stripe_id = models.CharField(unique=True, max_length=100) + user = models.ForeignKey(CustomUser) + stripe_customer_id = models.CharField(unique=True, max_length=100) last4 = models.CharField(max_length=4) - cc_brand = models.CharField(max_length=10) + brand = models.CharField(max_length=10) class Meta: permissions = ( From 1a25bbf11e080e99b896cac37a8535ff48feff5a Mon Sep 17 00:00:00 2001 From: "M.Ravi" Date: Sun, 15 Oct 2017 19:51:58 +0200 Subject: [PATCH 0014/1862] Add name to card form button name --- hosting/templates/hosting/includes/_card_input.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosting/templates/hosting/includes/_card_input.html b/hosting/templates/hosting/includes/_card_input.html index 59e8d1a6..29892650 100644 --- a/hosting/templates/hosting/includes/_card_input.html +++ b/hosting/templates/hosting/includes/_card_input.html @@ -50,7 +50,7 @@ {% endfor %}
- +
From f71c8e553d9d479ba7ecb41e86c622b3a3591c40 Mon Sep 17 00:00:00 2001 From: "M.Ravi" Date: Sun, 15 Oct 2017 19:54:01 +0200 Subject: [PATCH 0015/1862] Add name to user details form button name --- hosting/templates/hosting/settings.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosting/templates/hosting/settings.html b/hosting/templates/hosting/settings.html index 968363d2..afac9435 100644 --- a/hosting/templates/hosting/settings.html +++ b/hosting/templates/hosting/settings.html @@ -22,7 +22,7 @@ {% bootstrap_field field show_label=False type='fields' bound_css_class='' %} {% endfor %}
- +
From 6420a9869b4cea89b08b5286145a843ef69dcc24 Mon Sep 17 00:00:00 2001 From: "M.Ravi" Date: Sun, 15 Oct 2017 19:55:37 +0200 Subject: [PATCH 0016/1862] Add functionality to save UserCardDetail --- hosting/views.py | 47 ++++++++++++++++++++++++++++++++++++----------- 1 file changed, 36 insertions(+), 11 deletions(-) diff --git a/hosting/views.py b/hosting/views.py index cdbb2caa..5d028db0 100644 --- a/hosting/views.py +++ b/hosting/views.py @@ -12,7 +12,6 @@ from django.contrib.auth.tokens import default_token_generator from django.core.exceptions import ValidationError from django.core.files.base import ContentFile from django.core.urlresolvers import reverse_lazy, reverse - from django.http import Http404, HttpResponseRedirect, HttpResponse from django.shortcuts import redirect, render from django.utils.http import urlsafe_base64_decode @@ -29,6 +28,7 @@ from stored_messages.api import mark_read from stored_messages.models import Message from stored_messages.settings import stored_messages_settings +from datacenterlight.models import VMTemplate from datacenterlight.tasks import create_vm_task from membership.models import CustomUser, StripeCustomer from opennebula_api.models import OpenNebulaManager @@ -49,9 +49,9 @@ from .forms import HostingUserSignupForm, HostingUserLoginForm, \ UserHostingKeyForm, generate_ssh_key_name from .mixins import ProcessVMSelectionMixin from .models import ( - HostingOrder, HostingBill, HostingPlan, UserHostingKey, VMDetail + HostingOrder, HostingBill, HostingPlan, UserHostingKey, VMDetail, + UserCardDetail ) -from datacenterlight.models import VMTemplate logger = logging.getLogger(__name__) @@ -569,14 +569,39 @@ class SettingsView(LoginRequiredMixin, FormView): def post(self, request, *args, **kwargs): form = self.get_form() if form.is_valid(): - billing_address_data = form.cleaned_data - billing_address_data.update({ - 'user': self.request.user.id - }) - billing_address_user_form = UserBillingAddressForm( - instance=self.request.user.billing_addresses.first(), - data=billing_address_data) - billing_address_user_form.save() + if 'billing-form' in request.POST: + billing_address_data = form.cleaned_data + billing_address_data.update({ + 'user': self.request.user.id + }) + billing_address_user_form = UserBillingAddressForm( + instance=self.request.user.billing_addresses.first(), + data=billing_address_data) + billing_address_user_form.save() + else: + token = form.cleaned_data.get('token') + stripe_customer_id = StripeCustomer.create_stripe_api_customer( + email=self.request.user.email, + token=token, + customer_name=self.request.user.name + ) + if stripe_customer_id is None: + form.add_error("__all__", _("Invalid credit card")) + else: + stripe_utils = StripeUtils() + card_details = stripe_utils.get_card_details( + stripe_customer_id, token + ) + if not card_details.get('response_object'): + msg = card_details.get('error') + form.add_error("__all__", msg) + return self.render_to_response(self.get_context_data()) + UserCardDetail.objects.create( + user=request.user, + stripe_customer_id=stripe_customer_id, + last4=card_details.get('response_object').get('last4'), + brand=card_details.get('response_object').get('brand') + ) return self.render_to_response(self.get_context_data()) else: billing_address_data = form.cleaned_data From f3ca9110e1658fcdc6f73a70237d6bc59f8a43c1 Mon Sep 17 00:00:00 2001 From: "M.Ravi" Date: Sun, 15 Oct 2017 19:56:40 +0200 Subject: [PATCH 0017/1862] Add UserCardDetail migration --- hosting/migrations/0044_usercarddetail.py | 34 +++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 hosting/migrations/0044_usercarddetail.py diff --git a/hosting/migrations/0044_usercarddetail.py b/hosting/migrations/0044_usercarddetail.py new file mode 100644 index 00000000..d5264cb4 --- /dev/null +++ b/hosting/migrations/0044_usercarddetail.py @@ -0,0 +1,34 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.4 on 2017-10-15 17:42 +from __future__ import unicode_literals + +import django.db.models.deletion +from django.conf import settings +from django.db import migrations, models + +import utils.mixins + + +class Migration(migrations.Migration): + + dependencies = [ + migrations.swappable_dependency(settings.AUTH_USER_MODEL), + ('hosting', '0043_vmdetail'), + ] + + operations = [ + migrations.CreateModel( + name='UserCardDetail', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('stripe_customer_id', models.CharField(max_length=100, unique=True)), + ('last4', models.CharField(max_length=4)), + ('brand', models.CharField(max_length=10)), + ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), + ], + options={ + 'permissions': (('view_usercarddetail', 'View User Card'),), + }, + bases=(utils.mixins.AssignPermissionsMixin, models.Model), + ), + ] From 9a9a764023bb07f2d479e8ac77fb992427ad0d34 Mon Sep 17 00:00:00 2001 From: "M.Ravi" Date: Sun, 15 Oct 2017 20:06:56 +0200 Subject: [PATCH 0018/1862] Add preferred card field to UserCardDetail --- hosting/migrations/0044_usercarddetail.py | 6 +++--- hosting/models.py | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/hosting/migrations/0044_usercarddetail.py b/hosting/migrations/0044_usercarddetail.py index d5264cb4..b935ab9a 100644 --- a/hosting/migrations/0044_usercarddetail.py +++ b/hosting/migrations/0044_usercarddetail.py @@ -1,11 +1,10 @@ # -*- coding: utf-8 -*- -# Generated by Django 1.9.4 on 2017-10-15 17:42 +# Generated by Django 1.9.4 on 2017-10-15 18:05 from __future__ import unicode_literals -import django.db.models.deletion from django.conf import settings from django.db import migrations, models - +import django.db.models.deletion import utils.mixins @@ -24,6 +23,7 @@ class Migration(migrations.Migration): ('stripe_customer_id', models.CharField(max_length=100, unique=True)), ('last4', models.CharField(max_length=4)), ('brand', models.CharField(max_length=10)), + ('preferred', models.BooleanField(default=False)), ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), ], options={ diff --git a/hosting/models.py b/hosting/models.py index dd792ca5..a6fc0823 100644 --- a/hosting/models.py +++ b/hosting/models.py @@ -189,6 +189,7 @@ class UserCardDetail(AssignPermissionsMixin, models.Model): stripe_customer_id = models.CharField(unique=True, max_length=100) last4 = models.CharField(max_length=4) brand = models.CharField(max_length=10) + preferred = models.BooleanField(default=False) class Meta: permissions = ( From a1d7b07e0c74fe7833b66d20c18e4897f6c1d2de Mon Sep 17 00:00:00 2001 From: "M.Ravi" Date: Sun, 15 Oct 2017 21:19:13 +0200 Subject: [PATCH 0019/1862] Relate UserCardDetail with StripeCustomer and add more fields to uniquely identify if a user already has a card --- hosting/migrations/0044_usercarddetail.py | 11 ++++++----- hosting/models.py | 6 ++++-- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/hosting/migrations/0044_usercarddetail.py b/hosting/migrations/0044_usercarddetail.py index b935ab9a..458b3111 100644 --- a/hosting/migrations/0044_usercarddetail.py +++ b/hosting/migrations/0044_usercarddetail.py @@ -1,8 +1,7 @@ # -*- coding: utf-8 -*- -# Generated by Django 1.9.4 on 2017-10-15 18:05 +# Generated by Django 1.9.4 on 2017-10-15 19:17 from __future__ import unicode_literals -from django.conf import settings from django.db import migrations, models import django.db.models.deletion import utils.mixins @@ -11,7 +10,7 @@ import utils.mixins class Migration(migrations.Migration): dependencies = [ - migrations.swappable_dependency(settings.AUTH_USER_MODEL), + ('membership', '0006_auto_20160526_0445'), ('hosting', '0043_vmdetail'), ] @@ -20,11 +19,13 @@ class Migration(migrations.Migration): name='UserCardDetail', fields=[ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('stripe_customer_id', models.CharField(max_length=100, unique=True)), ('last4', models.CharField(max_length=4)), ('brand', models.CharField(max_length=10)), + ('fingerprint', models.CharField(max_length=100)), + ('exp_month', models.IntegerField()), + ('exp_year', models.IntegerField()), ('preferred', models.BooleanField(default=False)), - ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), + ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='membership.StripeCustomer')), ], options={ 'permissions': (('view_usercarddetail', 'View User Card'),), diff --git a/hosting/models.py b/hosting/models.py index a6fc0823..3efd6dd1 100644 --- a/hosting/models.py +++ b/hosting/models.py @@ -185,10 +185,12 @@ class VMDetail(models.Model): class UserCardDetail(AssignPermissionsMixin, models.Model): permissions = ('view_usercarddetail',) - user = models.ForeignKey(CustomUser) - stripe_customer_id = models.CharField(unique=True, max_length=100) + user = models.ForeignKey(StripeCustomer) last4 = models.CharField(max_length=4) brand = models.CharField(max_length=10) + fingerprint = models.CharField(max_length=100) + exp_month = models.IntegerField(null=False) + exp_year = models.IntegerField(null=False) preferred = models.BooleanField(default=False) class Meta: From 167e3589d4d5daa25b2890bede3c2e4c7dc932ec Mon Sep 17 00:00:00 2001 From: "M.Ravi" Date: Sun, 15 Oct 2017 21:21:36 +0200 Subject: [PATCH 0020/1862] Rename user to stripe_customer --- hosting/migrations/0044_usercarddetail.py | 4 ++-- hosting/models.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/hosting/migrations/0044_usercarddetail.py b/hosting/migrations/0044_usercarddetail.py index 458b3111..c2ff25b2 100644 --- a/hosting/migrations/0044_usercarddetail.py +++ b/hosting/migrations/0044_usercarddetail.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Generated by Django 1.9.4 on 2017-10-15 19:17 +# Generated by Django 1.9.4 on 2017-10-15 19:20 from __future__ import unicode_literals from django.db import migrations, models @@ -25,7 +25,7 @@ class Migration(migrations.Migration): ('exp_month', models.IntegerField()), ('exp_year', models.IntegerField()), ('preferred', models.BooleanField(default=False)), - ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='membership.StripeCustomer')), + ('stripe_customer', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='membership.StripeCustomer')), ], options={ 'permissions': (('view_usercarddetail', 'View User Card'),), diff --git a/hosting/models.py b/hosting/models.py index 3efd6dd1..a33f51d5 100644 --- a/hosting/models.py +++ b/hosting/models.py @@ -185,7 +185,7 @@ class VMDetail(models.Model): class UserCardDetail(AssignPermissionsMixin, models.Model): permissions = ('view_usercarddetail',) - user = models.ForeignKey(StripeCustomer) + stripe_customer = models.ForeignKey(StripeCustomer) last4 = models.CharField(max_length=4) brand = models.CharField(max_length=10) fingerprint = models.CharField(max_length=100) From 7d69d8d5d41f385c8198ba288986e917ecec32ae Mon Sep 17 00:00:00 2001 From: "M.Ravi" Date: Sun, 15 Oct 2017 21:45:17 +0200 Subject: [PATCH 0021/1862] Add get_cards_details_from_token function --- utils/stripe_utils.py | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/utils/stripe_utils.py b/utils/stripe_utils.py index 8fcf0ab1..9264820d 100644 --- a/utils/stripe_utils.py +++ b/utils/stripe_utils.py @@ -1,6 +1,8 @@ import logging + import stripe from django.conf import settings + from datacenterlight.models import StripePlan stripe.api_key = settings.STRIPE_API_PRIVATE_KEY @@ -102,6 +104,18 @@ class StripeUtils(object): } return card_details + @handleStripeError + def get_cards_details_from_token(self, token): + stripe_token = stripe.Token.retrieve(token) + card_details = { + 'last4': stripe_token.card.last4, + 'brand': stripe_token.card.brand, + 'exp_month': stripe_token.card.exp_month, + 'exp_year': stripe_token.card.exp_year, + 'fingerprint': stripe_token.card.fingerprint + } + return card_details + def check_customer(self, id, user, token): customers = self.stripe.Customer.all() if not customers.get('data'): From 83363f4701aa38b1774532956935837f1a8867d2 Mon Sep 17 00:00:00 2001 From: "M.Ravi" Date: Sun, 15 Oct 2017 21:46:26 +0200 Subject: [PATCH 0022/1862] Remove some lines --- utils/stripe_utils.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/utils/stripe_utils.py b/utils/stripe_utils.py index 9264820d..5e0f0646 100644 --- a/utils/stripe_utils.py +++ b/utils/stripe_utils.py @@ -1,8 +1,6 @@ import logging - import stripe from django.conf import settings - from datacenterlight.models import StripePlan stripe.api_key = settings.STRIPE_API_PRIVATE_KEY From a3ce43fd53dec10497d4960f4ae392df53a29a15 Mon Sep 17 00:00:00 2001 From: "M.Ravi" Date: Sun, 15 Oct 2017 23:32:16 +0200 Subject: [PATCH 0023/1862] Add add_card_to_stripe_customer function --- utils/stripe_utils.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/utils/stripe_utils.py b/utils/stripe_utils.py index 5e0f0646..9dd17b63 100644 --- a/utils/stripe_utils.py +++ b/utils/stripe_utils.py @@ -78,6 +78,10 @@ class StripeUtils(object): customer.source = token customer.save() + def add_card_to_stripe_customer(self, stripe_customer_id, token): + customer = stripe.Customer.retrieve(stripe_customer_id) + self.update_customer_token(customer, token) + @handleStripeError def update_customer_card(self, customer_id, token): customer = stripe.Customer.retrieve(customer_id) From 74a1f82c301ebf606af7a74848db8ac2a53ffa06 Mon Sep 17 00:00:00 2001 From: "M.Ravi" Date: Sun, 15 Oct 2017 23:37:01 +0200 Subject: [PATCH 0024/1862] Refactor handling post for settings card input form --- hosting/views.py | 48 ++++++++++++++++++++++++++++++------------------ 1 file changed, 30 insertions(+), 18 deletions(-) diff --git a/hosting/views.py b/hosting/views.py index 5d028db0..1d8f971a 100644 --- a/hosting/views.py +++ b/hosting/views.py @@ -580,27 +580,39 @@ class SettingsView(LoginRequiredMixin, FormView): billing_address_user_form.save() else: token = form.cleaned_data.get('token') - stripe_customer_id = StripeCustomer.create_stripe_api_customer( - email=self.request.user.email, - token=token, - customer_name=self.request.user.name + stripe_utils = StripeUtils() + card_details = stripe_utils.get_cards_details_from_token( + token ) - if stripe_customer_id is None: - form.add_error("__all__", _("Invalid credit card")) - else: - stripe_utils = StripeUtils() - card_details = stripe_utils.get_card_details( - stripe_customer_id, 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, token=token + ) + card_details_response = card_details['response_object'] + try: + UserCardDetail.objects.get( + stripe_customer=stripe_customer, + fingerprint=card_details_response['fingerprint'], + exp_month=card_details_response['exp_month'], + exp_year=card_details_response['exp_year'] ) - if not card_details.get('response_object'): - msg = card_details.get('error') - form.add_error("__all__", msg) - return self.render_to_response(self.get_context_data()) + form.add_error( + "__all__", + _('You seem to have already added this card') + ) + except UserCardDetail.DoesNotExist: UserCardDetail.objects.create( - user=request.user, - stripe_customer_id=stripe_customer_id, - last4=card_details.get('response_object').get('last4'), - brand=card_details.get('response_object').get('brand') + stripe_customer=stripe_customer, + last4=card_details_response['last4'], + brand=card_details_response['brand'], + fingerprint=card_details_response['fingerprint'], + exp_month=card_details_response['exp_month'], + exp_year=card_details_response['exp_year'] + ) + stripe_utils.add_card_to_stripe_customer( + stripe_customer.stripe_id, token ) return self.render_to_response(self.get_context_data()) else: From 3f9c1a68d1929f4e50d53bdf94319c9977286e1f Mon Sep 17 00:00:00 2001 From: "M.Ravi" Date: Sun, 15 Oct 2017 23:38:18 +0200 Subject: [PATCH 0025/1862] Remove unused code --- hosting/views.py | 1 - 1 file changed, 1 deletion(-) diff --git a/hosting/views.py b/hosting/views.py index 1d8f971a..61d5c080 100644 --- a/hosting/views.py +++ b/hosting/views.py @@ -616,7 +616,6 @@ class SettingsView(LoginRequiredMixin, FormView): ) return self.render_to_response(self.get_context_data()) else: - billing_address_data = form.cleaned_data return self.form_invalid(form) From 52791f5e48a5d6e78c7ad6becd9f72815ec66e40 Mon Sep 17 00:00:00 2001 From: "M.Ravi" Date: Sun, 15 Oct 2017 23:56:38 +0200 Subject: [PATCH 0026/1862] Refactor cc_brand to brand --- hosting/templates/hosting/settings.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosting/templates/hosting/settings.html b/hosting/templates/hosting/settings.html index afac9435..731e321f 100644 --- a/hosting/templates/hosting/settings.html +++ b/hosting/templates/hosting/settings.html @@ -34,7 +34,7 @@
{% trans "Credit Card" %}
{% trans "Last" %} 4: ***** {{card.last4}}
-
{% trans "Type" %}: {{card.cc_brand}}
+
{% trans "Type" %}: {{card.brand}}
From 619f37829ee12f1a5666a04993f8444b9a0cc125 Mon Sep 17 00:00:00 2001 From: "M.Ravi" Date: Sun, 15 Oct 2017 23:57:15 +0200 Subject: [PATCH 0027/1862] Now showing cards from UserCardDetails --- hosting/views.py | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/hosting/views.py b/hosting/views.py index 61d5c080..01bbe369 100644 --- a/hosting/views.py +++ b/hosting/views.py @@ -549,21 +549,17 @@ class SettingsView(LoginRequiredMixin, FormView): def get_context_data(self, **kwargs): context = super(SettingsView, self).get_context_data(**kwargs) - # Get user user = self.request.user - # Get user's all orders - hosting_orders = HostingOrder.objects.filter(customer__user=user) - # If user has hosting orders, get the credit card data from it + user_card_details = UserCardDetail.objects.filter( + stripe_customer_id=user.stripecustomer.id + ) cards_list = [] - for order in hosting_orders: - credit_card_data = order.get_cc_data() - if credit_card_data and (credit_card_data not in cards_list): - cards_list.append(credit_card_data) + for card in user_card_details: + cards_list.append({'last4': card.last4, 'brand': card.brand}) context.update({ 'cards_list': cards_list, 'stripe_key': settings.STRIPE_API_PUBLIC_KEY }) - return context def post(self, request, *args, **kwargs): From de275c23acc99ed3b71ff959218caec2380e7abb Mon Sep 17 00:00:00 2001 From: "M.Ravi" Date: Mon, 16 Oct 2017 16:18:17 +0200 Subject: [PATCH 0028/1862] Add modal for card delete --- hosting/templates/hosting/settings.html | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/hosting/templates/hosting/settings.html b/hosting/templates/hosting/settings.html index 731e321f..971f6d9d 100644 --- a/hosting/templates/hosting/settings.html +++ b/hosting/templates/hosting/settings.html @@ -38,7 +38,29 @@
- {% trans "REMOVE CARD" %} + {% trans "REMOVE CARD" %} +
{% trans "SELECT" %} From 3d50868c6abd6508a95d21c71e404370895f561b Mon Sep 17 00:00:00 2001 From: "M.Ravi" Date: Mon, 16 Oct 2017 16:18:39 +0200 Subject: [PATCH 0029/1862] Add url for card delete --- hosting/urls.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/hosting/urls.py b/hosting/urls.py index b00a199c..a3f9eb0c 100644 --- a/hosting/urls.py +++ b/hosting/urls.py @@ -42,6 +42,8 @@ urlpatterns = [ name='choice_ssh_keys'), url(r'delete_ssh_key/(?P\d+)/?$', SSHKeyDeleteView.as_view(), name='delete_ssh_key'), + url(r'delete_card/(?P\d+)/?$', SettingsView.as_view(), + name='delete_card'), url(r'create_ssh_key/?$', SSHKeyCreateView.as_view(), name='create_ssh_key'), url(r'^notifications/$', NotificationsView.as_view(), From bff37d624630a97d76d8eee5c627d2e05d03117e Mon Sep 17 00:00:00 2001 From: "M.Ravi" Date: Mon, 16 Oct 2017 16:20:03 +0200 Subject: [PATCH 0030/1862] Add card id param to card details --- hosting/views.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/hosting/views.py b/hosting/views.py index 01bbe369..5fcc44ba 100644 --- a/hosting/views.py +++ b/hosting/views.py @@ -555,7 +555,9 @@ class SettingsView(LoginRequiredMixin, FormView): ) cards_list = [] for card in user_card_details: - cards_list.append({'last4': card.last4, 'brand': card.brand}) + cards_list.append({ + 'last4': card.last4, 'brand': card.brand, 'id': card.id + }) context.update({ 'cards_list': cards_list, 'stripe_key': settings.STRIPE_API_PUBLIC_KEY From c939106a35aebcbd62188b4704c82c96f4fc28bc Mon Sep 17 00:00:00 2001 From: "M.Ravi" Date: Mon, 16 Oct 2017 16:29:09 +0200 Subject: [PATCH 0031/1862] Prepare to handle delete card --- hosting/views.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/hosting/views.py b/hosting/views.py index 5fcc44ba..5d3a13b9 100644 --- a/hosting/views.py +++ b/hosting/views.py @@ -565,6 +565,8 @@ class SettingsView(LoginRequiredMixin, FormView): return context def post(self, request, *args, **kwargs): + if 'delete_card' in request.POST: + return HttpResponseRedirect(reverse_lazy('hosting:settings')) form = self.get_form() if form.is_valid(): if 'billing-form' in request.POST: From 1839a1c27cdc897807acf748d8e8bcce2d6845c3 Mon Sep 17 00:00:00 2001 From: Arvind Tiwari Date: Tue, 17 Oct 2017 00:35:51 +0530 Subject: [PATCH 0032/1862] translation re compilation --- datacenterlight/locale/de/LC_MESSAGES/django.po | 10 +--------- hosting/locale/de/LC_MESSAGES/django.po | 2 +- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/datacenterlight/locale/de/LC_MESSAGES/django.po b/datacenterlight/locale/de/LC_MESSAGES/django.po index dbb611bd..3b8c9ca6 100644 --- a/datacenterlight/locale/de/LC_MESSAGES/django.po +++ b/datacenterlight/locale/de/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-10-16 00:57+0530\n" +"POT-Creation-Date: 2017-10-17 00:32+0530\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -503,14 +503,6 @@ msgstr "" #~ msgid "Card Type" #~ msgstr "Kartentyp" -#~ msgid "" -#~ "You are not making any payment yet. After placing your order, you will be " -#~ "taken to the Submit Payment Page." -#~ msgstr "" -#~ "Es wird noch keine Bezahlung vorgenommen. Die Bezahlung wird erst " -#~ "ausgelöst, nachdem Du die Bestellung auf der nächsten Seite bestätigt " -#~ "hast." - #~ msgid "Processing..." #~ msgstr "Abarbeitung..." diff --git a/hosting/locale/de/LC_MESSAGES/django.po b/hosting/locale/de/LC_MESSAGES/django.po index b398b22e..64e4a73e 100644 --- a/hosting/locale/de/LC_MESSAGES/django.po +++ b/hosting/locale/de/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-10-16 01:06+0530\n" +"POT-Creation-Date: 2017-10-17 00:32+0530\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" From 255c8a1d805dc4583dd6f6487e35908bea14c0b6 Mon Sep 17 00:00:00 2001 From: PCoder Date: Sat, 21 Oct 2017 00:00:21 +0200 Subject: [PATCH 0033/1862] Add UserCardDetail create method that assigns appropriate object permission --- hosting/models.py | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/hosting/models.py b/hosting/models.py index a33f51d5..ef8b8a74 100644 --- a/hosting/models.py +++ b/hosting/models.py @@ -196,4 +196,14 @@ class UserCardDetail(AssignPermissionsMixin, models.Model): class Meta: permissions = ( ('view_usercarddetail', 'View User Card'), - ) \ No newline at end of file + ) + + @classmethod + def create(cls, stripe_customer=None, last4=None, brand=None, + fingerprint=None, exp_month=None, exp_year=None): + instance = cls.objects.create( + stripe_customer=stripe_customer, last4=last4, brand=brand, + fingerprint=fingerprint, exp_month=exp_month, exp_year=exp_year + ) + instance.assign_permissions(stripe_customer.user) + return instance From c664b44f2cfa0b79580f09b70819ce600ea8a453 Mon Sep 17 00:00:00 2001 From: PCoder Date: Sat, 21 Oct 2017 00:02:35 +0200 Subject: [PATCH 0034/1862] Add functionality to delete user card --- hosting/views.py | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/hosting/views.py b/hosting/views.py index 5d3a13b9..71f6cf61 100644 --- a/hosting/views.py +++ b/hosting/views.py @@ -537,6 +537,7 @@ class SettingsView(LoginRequiredMixin, FormView): template_name = "hosting/settings.html" login_url = reverse_lazy('hosting:login') form_class = BillingAddressForm + permission_required = ['view_usercarddetail'] def get_form(self, form_class): """ @@ -566,6 +567,16 @@ class SettingsView(LoginRequiredMixin, FormView): def post(self, request, *args, **kwargs): if 'delete_card' in request.POST: + try: + card = UserCardDetail.objects.get(pk=self.kwargs.get('pk')) + if request.user.has_perm(self.permission_required[0], card): + card.delete() + 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(): @@ -603,7 +614,7 @@ class SettingsView(LoginRequiredMixin, FormView): _('You seem to have already added this card') ) except UserCardDetail.DoesNotExist: - UserCardDetail.objects.create( + UserCardDetail.create( stripe_customer=stripe_customer, last4=card_details_response['last4'], brand=card_details_response['brand'], From 70b6bbdf2f06a82c14c5252655c436c1cd5b4c0e Mon Sep 17 00:00:00 2001 From: PCoder Date: Sat, 21 Oct 2017 13:27:35 +0200 Subject: [PATCH 0035/1862] Save card id as a parameter and use it to delete a source --- hosting/migrations/0044_usercarddetail.py | 3 ++- hosting/models.py | 6 ++++-- hosting/views.py | 20 +++++++++++++++----- utils/stripe_utils.py | 11 +++++++++-- 4 files changed, 30 insertions(+), 10 deletions(-) diff --git a/hosting/migrations/0044_usercarddetail.py b/hosting/migrations/0044_usercarddetail.py index c2ff25b2..2900a806 100644 --- a/hosting/migrations/0044_usercarddetail.py +++ b/hosting/migrations/0044_usercarddetail.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Generated by Django 1.9.4 on 2017-10-15 19:20 +# Generated by Django 1.9.4 on 2017-10-21 10:26 from __future__ import unicode_literals from django.db import migrations, models @@ -21,6 +21,7 @@ class Migration(migrations.Migration): ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), ('last4', models.CharField(max_length=4)), ('brand', models.CharField(max_length=10)), + ('card_id', models.CharField(blank=True, default='', max_length=100)), ('fingerprint', models.CharField(max_length=100)), ('exp_month', models.IntegerField()), ('exp_year', models.IntegerField()), diff --git a/hosting/models.py b/hosting/models.py index ef8b8a74..f7f2fd2a 100644 --- a/hosting/models.py +++ b/hosting/models.py @@ -188,6 +188,7 @@ class UserCardDetail(AssignPermissionsMixin, models.Model): stripe_customer = models.ForeignKey(StripeCustomer) last4 = models.CharField(max_length=4) brand = models.CharField(max_length=10) + card_id = models.CharField(max_length=100, blank=True, default='') fingerprint = models.CharField(max_length=100) exp_month = models.IntegerField(null=False) exp_year = models.IntegerField(null=False) @@ -200,10 +201,11 @@ class UserCardDetail(AssignPermissionsMixin, models.Model): @classmethod def create(cls, stripe_customer=None, last4=None, brand=None, - fingerprint=None, exp_month=None, exp_year=None): + fingerprint=None, exp_month=None, exp_year=None, card_id=None): instance = cls.objects.create( stripe_customer=stripe_customer, last4=last4, brand=brand, - fingerprint=fingerprint, exp_month=exp_month, exp_year=exp_year + fingerprint=fingerprint, exp_month=exp_month, exp_year=exp_year, + card_id=card_id ) instance.assign_permissions(stripe_customer.user) return instance diff --git a/hosting/views.py b/hosting/views.py index 71f6cf61..22c5b35e 100644 --- a/hosting/views.py +++ b/hosting/views.py @@ -570,7 +570,13 @@ class SettingsView(LoginRequiredMixin, FormView): try: card = UserCardDetail.objects.get(pk=self.kwargs.get('pk')) if request.user.has_perm(self.permission_required[0], card): - card.delete() + if card.card_id is not None: + stripe_utils = StripeUtils() + stripe_utils.delete_customer_card( + request.user.stripecustomer.stripe_id, + card.card_id + ) + card.delete() else: msg = _("You are not permitted to do this operation") messages.add_message(request, messages.ERROR, msg) @@ -614,16 +620,20 @@ class SettingsView(LoginRequiredMixin, FormView): _('You seem to have already added this card') ) except UserCardDetail.DoesNotExist: + add_result = stripe_utils.add_card_to_stripe_customer( + stripe_customer.stripe_id, token + ) + if add_result.get('error') is not None: + form.add_error("__all__", card_details.get('error')) + return self.render_to_response(self.get_context_data()) UserCardDetail.create( stripe_customer=stripe_customer, last4=card_details_response['last4'], brand=card_details_response['brand'], fingerprint=card_details_response['fingerprint'], exp_month=card_details_response['exp_month'], - exp_year=card_details_response['exp_year'] - ) - stripe_utils.add_card_to_stripe_customer( - stripe_customer.stripe_id, token + exp_year=card_details_response['exp_year'], + card_id=card_details_response['card_id'] ) return self.render_to_response(self.get_context_data()) else: diff --git a/utils/stripe_utils.py b/utils/stripe_utils.py index 9dd17b63..a7e98a31 100644 --- a/utils/stripe_utils.py +++ b/utils/stripe_utils.py @@ -78,9 +78,15 @@ class StripeUtils(object): customer.source = token customer.save() + @handleStripeError def add_card_to_stripe_customer(self, stripe_customer_id, token): customer = stripe.Customer.retrieve(stripe_customer_id) - self.update_customer_token(customer, token) + customer.sources.create(source=token) + + @handleStripeError + def delete_customer_card(self, stripe_customer_id, card_id): + customer = stripe.Customer.retrieve(stripe_customer_id) + customer.sources.retrieve(card_id).delete() @handleStripeError def update_customer_card(self, customer_id, token): @@ -114,7 +120,8 @@ class StripeUtils(object): 'brand': stripe_token.card.brand, 'exp_month': stripe_token.card.exp_month, 'exp_year': stripe_token.card.exp_year, - 'fingerprint': stripe_token.card.fingerprint + 'fingerprint': stripe_token.card.fingerprint, + 'card_id': stripe_token.card.id } return card_details From be8181ec42b6b9fb4aa064169ffc5f43f8e4ad3a Mon Sep 17 00:00:00 2001 From: PCoder Date: Sat, 21 Oct 2017 17:02:24 +0200 Subject: [PATCH 0036/1862] Add _messages template to hosting/settings.html --- hosting/templates/hosting/settings.html | 1 + hosting/views.py | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/hosting/templates/hosting/settings.html b/hosting/templates/hosting/settings.html index 971f6d9d..93e31d5d 100644 --- a/hosting/templates/hosting/settings.html +++ b/hosting/templates/hosting/settings.html @@ -7,6 +7,7 @@ {% block content %}
+ {% include 'hosting/includes/_messages.html' %}

{% trans "My Settings" %}

diff --git a/hosting/views.py b/hosting/views.py index 22c5b35e..f6043b87 100644 --- a/hosting/views.py +++ b/hosting/views.py @@ -635,6 +635,10 @@ class SettingsView(LoginRequiredMixin, FormView): exp_year=card_details_response['exp_year'], card_id=card_details_response['card_id'] ) + 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: return self.form_invalid(form) From 75e90dbacdc2117e52a332f51f10e148fb5e6320 Mon Sep 17 00:00:00 2001 From: PCoder Date: Sat, 21 Oct 2017 20:37:50 +0200 Subject: [PATCH 0037/1862] Refactor and add messages --- hosting/views.py | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/hosting/views.py b/hosting/views.py index f6043b87..25126d00 100644 --- a/hosting/views.py +++ b/hosting/views.py @@ -572,11 +572,13 @@ class SettingsView(LoginRequiredMixin, FormView): if request.user.has_perm(self.permission_required[0], card): if card.card_id is not None: stripe_utils = StripeUtils() - stripe_utils.delete_customer_card( + stripe_utils.dissociate_customer_card( request.user.stripecustomer.stripe_id, card.card_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) @@ -615,17 +617,9 @@ class SettingsView(LoginRequiredMixin, FormView): exp_month=card_details_response['exp_month'], exp_year=card_details_response['exp_year'] ) - form.add_error( - "__all__", - _('You seem to have already added this card') - ) + msg = _('You seem to have already added this card') + messages.add_message(request, messages.ERROR, msg) except UserCardDetail.DoesNotExist: - add_result = stripe_utils.add_card_to_stripe_customer( - stripe_customer.stripe_id, token - ) - if add_result.get('error') is not None: - form.add_error("__all__", card_details.get('error')) - return self.render_to_response(self.get_context_data()) UserCardDetail.create( stripe_customer=stripe_customer, last4=card_details_response['last4'], From 600b5497041453964961d6cab0017524a8fa44bb Mon Sep 17 00:00:00 2001 From: PCoder Date: Sat, 21 Oct 2017 20:39:00 +0200 Subject: [PATCH 0038/1862] Handle case where a Stripe account may have been deleted via dashboard --- membership/models.py | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/membership/models.py b/membership/models.py index 73804008..ca403347 100644 --- a/membership/models.py +++ b/membership/models.py @@ -210,21 +210,30 @@ class StripeCustomer(models.Model): # check if user is not in stripe but in database customer = stripe_utils.check_customer(stripe_customer.stripe_id, stripe_customer.user, token) - + if "deleted" in customer and customer["deleted"]: + raise StripeCustomer.DoesNotExist() if not customer.sources.data: stripe_utils.update_customer_token(customer, token) return stripe_customer - except StripeCustomer.DoesNotExist: user = CustomUser.objects.get(email=email) stripe_utils = StripeUtils() stripe_data = stripe_utils.create_customer(token, email, user.name) if stripe_data.get('response_object'): stripe_cus_id = stripe_data.get('response_object').get('id') - - stripe_customer = StripeCustomer.objects. \ - create(user=user, stripe_id=stripe_cus_id) - + if user.stripecustomer is None: + # The user never had an associated Stripe account + # So, create one + stripe_customer = StripeCustomer.objects.create( + user=user, stripe_id=stripe_cus_id + ) + else: + # User already had a Stripe account and we are here + # because the account was deleted in dashboard + # So, we simply update the stripe_id + user.stripecustomer.stripe_id = stripe_cus_id + user.stripecustomer.save() + stripe_customer = user.stripecustomer return stripe_customer else: return None From fb2056bf95bb04aa573376f48477d40ecce33a2e Mon Sep 17 00:00:00 2001 From: PCoder Date: Sat, 21 Oct 2017 20:45:00 +0200 Subject: [PATCH 0039/1862] Update stripe_id for a missing case --- utils/stripe_utils.py | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/utils/stripe_utils.py b/utils/stripe_utils.py index a7e98a31..304f060e 100644 --- a/utils/stripe_utils.py +++ b/utils/stripe_utils.py @@ -79,14 +79,15 @@ class StripeUtils(object): customer.save() @handleStripeError - def add_card_to_stripe_customer(self, stripe_customer_id, token): + def associate_customer_card(self, stripe_customer_id, token): customer = stripe.Customer.retrieve(stripe_customer_id) customer.sources.create(source=token) @handleStripeError - def delete_customer_card(self, stripe_customer_id, card_id): + def dissociate_customer_card(self, stripe_customer_id, card_id): customer = stripe.Customer.retrieve(stripe_customer_id) - customer.sources.retrieve(card_id).delete() + card = customer.sources.retrieve(card_id) + card.delete() @handleStripeError def update_customer_card(self, customer_id, token): @@ -129,6 +130,9 @@ class StripeUtils(object): customers = self.stripe.Customer.all() if not customers.get('data'): customer = self.create_customer(token, user.email, user.name) + user.stripecustomer.stripe_id = customer.get( + 'response_object').get('id') + user.stripecustomer.save() else: try: customer = stripe.Customer.retrieve(id) @@ -137,6 +141,8 @@ class StripeUtils(object): user.stripecustomer.stripe_id = customer.get( 'response_object').get('id') user.stripecustomer.save() + if type(customer) is dict: + customer = customer['response_object'] return customer @handleStripeError From 1e08ae54268d70efe298dffebc36257458d5fdbf Mon Sep 17 00:00:00 2001 From: PCoder Date: Sat, 21 Oct 2017 20:46:29 +0200 Subject: [PATCH 0040/1862] Stripe API: Use list() instead of all() as the former is deprecated --- utils/stripe_utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/stripe_utils.py b/utils/stripe_utils.py index 304f060e..ac01b9d5 100644 --- a/utils/stripe_utils.py +++ b/utils/stripe_utils.py @@ -127,7 +127,7 @@ class StripeUtils(object): return card_details def check_customer(self, id, user, token): - customers = self.stripe.Customer.all() + customers = self.stripe.Customer.list() if not customers.get('data'): customer = self.create_customer(token, user.email, user.name) user.stripecustomer.stripe_id = customer.get( From 8df72620d617c935c8d8b7c0a1b4889ed1607bb0 Mon Sep 17 00:00:00 2001 From: PCoder Date: Sat, 21 Oct 2017 20:58:54 +0200 Subject: [PATCH 0041/1862] Add 'billing address updated' message in that case --- hosting/views.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/hosting/views.py b/hosting/views.py index 25126d00..e62a0dc2 100644 --- a/hosting/views.py +++ b/hosting/views.py @@ -597,6 +597,8 @@ class SettingsView(LoginRequiredMixin, FormView): instance=self.request.user.billing_addresses.first(), data=billing_address_data) billing_address_user_form.save() + msg = _("Billing address updated successfully") + messages.add_message(request, messages.SUCCESS, msg) else: token = form.cleaned_data.get('token') stripe_utils = StripeUtils() From 14c7d6ac0e0092d9f2219619ccacfd0ef8181d3b Mon Sep 17 00:00:00 2001 From: PCoder Date: Sat, 21 Oct 2017 21:27:21 +0200 Subject: [PATCH 0042/1862] Refactor getting all cards to UserCardDetail.get_all_cards_list() --- hosting/models.py | 12 ++++++++++++ hosting/views.py | 9 ++------- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/hosting/models.py b/hosting/models.py index f7f2fd2a..62957100 100644 --- a/hosting/models.py +++ b/hosting/models.py @@ -209,3 +209,15 @@ class UserCardDetail(AssignPermissionsMixin, models.Model): ) instance.assign_permissions(stripe_customer.user) return instance + + @classmethod + def get_all_cards_list(cls, stripe_customer): + user_card_details = UserCardDetail.objects.filter( + stripe_customer_id=stripe_customer.id + ) + cards_list = [] + for card in user_card_details: + cards_list.append({ + 'last4': card.last4, 'brand': card.brand, 'id': card.id + }) + return cards_list diff --git a/hosting/views.py b/hosting/views.py index e62a0dc2..5b48ff34 100644 --- a/hosting/views.py +++ b/hosting/views.py @@ -551,14 +551,9 @@ class SettingsView(LoginRequiredMixin, FormView): def get_context_data(self, **kwargs): context = super(SettingsView, self).get_context_data(**kwargs) user = self.request.user - user_card_details = UserCardDetail.objects.filter( - stripe_customer_id=user.stripecustomer.id + cards_list = UserCardDetail.get_all_cards_list( + stripe_customer= user.stripecustomer ) - cards_list = [] - for card in user_card_details: - cards_list.append({ - 'last4': card.last4, 'brand': card.brand, 'id': card.id - }) context.update({ 'cards_list': cards_list, 'stripe_key': settings.STRIPE_API_PUBLIC_KEY From 303eb4112d5af67c307951b756282bee696114d6 Mon Sep 17 00:00:00 2001 From: PCoder Date: Sat, 21 Oct 2017 21:34:54 +0200 Subject: [PATCH 0043/1862] Add doc. and return empty list for get_all_cards_list function --- hosting/models.py | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/hosting/models.py b/hosting/models.py index 62957100..18027790 100644 --- a/hosting/models.py +++ b/hosting/models.py @@ -212,10 +212,19 @@ class UserCardDetail(AssignPermissionsMixin, models.Model): @classmethod def get_all_cards_list(cls, stripe_customer): + """ + Get all the cards of the given customer as a list + + :param stripe_customer: The StripeCustomer object + :return: A list of all cards; an empty list if the customer object is + None + """ + cards_list = [] + if stripe_customer is None: + return cards_list user_card_details = UserCardDetail.objects.filter( stripe_customer_id=stripe_customer.id ) - cards_list = [] for card in user_card_details: cards_list.append({ 'last4': card.last4, 'brand': card.brand, 'id': card.id From 7f4993c3f0fc07a136447ca72d428a21afbc3f69 Mon Sep 17 00:00:00 2001 From: PCoder Date: Sat, 21 Oct 2017 23:12:53 +0200 Subject: [PATCH 0044/1862] Update hosting payment template to use added cards --- hosting/static/hosting/css/commons.css | 20 ++++++++++ hosting/templates/hosting/payment.html | 52 ++++++++++---------------- 2 files changed, 40 insertions(+), 32 deletions(-) diff --git a/hosting/static/hosting/css/commons.css b/hosting/static/hosting/css/commons.css index ca320afa..33381370 100644 --- a/hosting/static/hosting/css/commons.css +++ b/hosting/static/hosting/css/commons.css @@ -294,6 +294,26 @@ font-size: 16px; } +.payment-container .credit-card-info { + padding-bottom: 15px; + border-bottom: 1px solid #eee; +} + +.credit-card-info { + display: flex; +} + +.credit-card-info .align-bottom{ + align-self: flex-end; + padding-right: 0 !important; +} + +.another-card-text { + padding: 20px 0; + font-size: 18px; + font-weight: 700; +} + .credit-card-form { max-width: 360px; } diff --git a/hosting/templates/hosting/payment.html b/hosting/templates/hosting/payment.html index a10cfbca..7cadb530 100644 --- a/hosting/templates/hosting/payment.html +++ b/hosting/templates/hosting/payment.html @@ -66,49 +66,37 @@
+ {% with card_list_len=cards_list|length %}

{%trans "Credit Card"%}

+ {% if card_list_len > 0 %} + {% blocktrans %}Please select one of the previous cards that you used or fill in your credit card information below. We are using Stripe for payment and do not store your information in our database.{% endblocktrans %} + {% else %} {% blocktrans %}Please fill in your credit card information below. We are using Stripe for payment and do not store your information in our database.{% endblocktrans %} + {% endif %}

- {% if credit_card_data.last4 %} -
-
Credit Card
-
Last 4: *****{{credit_card_data.last4}}
-
Type: {{credit_card_data.cc_brand}}
- -
- {% if not messages and not form.non_field_errors %} -

- {% trans "You are not making any payment yet. After submitting your card information, you will be taken to the Confirm Order Page." %} -

- {% endif %} -
- {% for message in messages %} - {% if 'failed_payment' or 'make_charge_error' in message.tags %} -
    -
  • -

    {{ message|safe }}

    -
    • -
- {% endif %} - {% endfor %} - {% for error in form.non_field_errors %} -

- {{ error|escape }} -

- {% endfor %} + {% for card in cards_list %} +
+
+
{% trans "Credit Card" %}
+
{% trans "Last" %} 4: ***** {{card.last4}}
+
{% trans "Type" %}: {{card.brand}}
+
+
+ {% trans "SELECT" %} +
-
- -
- {% else %} - {% include "hosting/includes/_card_input.html" %} + {% endfor %} + {% if card_list_len > 0 %} +
Use another card
{% endif %} + {% include "hosting/includes/_card_input.html" %}
+ {% endwith %}
From bf91bf382292db9ba3d7172a949e9ff5da68801f Mon Sep 17 00:00:00 2001 From: PCoder Date: Sat, 21 Oct 2017 23:14:05 +0200 Subject: [PATCH 0045/1862] Change text: delete card to remove card --- hosting/templates/hosting/settings.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hosting/templates/hosting/settings.html b/hosting/templates/hosting/settings.html index 93e31d5d..5e0f7545 100644 --- a/hosting/templates/hosting/settings.html +++ b/hosting/templates/hosting/settings.html @@ -48,9 +48,9 @@
- +
-

{% trans "Do you want to delete this associated card?"%}

+

{% trans "Do you want to remove this associated card?"%}

{% csrf_token %} From 8351b1bf8b71eb26872f4d631a8615499201f152 Mon Sep 17 00:00:00 2001 From: PCoder Date: Sat, 21 Oct 2017 23:14:55 +0200 Subject: [PATCH 0046/1862] Use refactored get_all_cards_list function --- hosting/views.py | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) diff --git a/hosting/views.py b/hosting/views.py index 5b48ff34..207c95c9 100644 --- a/hosting/views.py +++ b/hosting/views.py @@ -659,25 +659,14 @@ class PaymentVMView(LoginRequiredMixin, FormView): def get_context_data(self, **kwargs): context = super(PaymentVMView, self).get_context_data(**kwargs) - # Get user user = self.request.user - - # Get user last order - last_hosting_order = HostingOrder.objects.filter( - customer__user=user).last() - - # If user has already an hosting order, get the credit card data from - # it - if last_hosting_order: - credit_card_data = last_hosting_order.get_cc_data() - context.update({ - 'credit_card_data': credit_card_data if credit_card_data else None, - }) - + cards_list = UserCardDetail.get_all_cards_list( + stripe_customer= user.stripecustomer + ) context.update({ + 'cards_list': cards_list, 'stripe_key': settings.STRIPE_API_PUBLIC_KEY }) - return context def get(self, request, *args, **kwargs): From 21bb33616681234f2c9f4699d7ad20a188cb3bcb Mon Sep 17 00:00:00 2001 From: PCoder Date: Sun, 22 Oct 2017 00:20:40 +0200 Subject: [PATCH 0047/1862] Add js code to submit id_card --- hosting/static/hosting/js/payment.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/hosting/static/hosting/js/payment.js b/hosting/static/hosting/js/payment.js index ef59416b..4934fdd3 100644 --- a/hosting/static/hosting/js/payment.js +++ b/hosting/static/hosting/js/payment.js @@ -195,5 +195,11 @@ $(document).ready(function () { $(element).closest('.form-group').append(error); } }); + + $('.credit-card-info .btn.choice-btn').click(function(){ + var id = this.dataset['id_card']; + $('#id_card').val(id); + $('#billing-form').submit(); + }); }); From de5035d12e65c71c9cb48aa88f7d6eed994710ea Mon Sep 17 00:00:00 2001 From: PCoder Date: Sun, 22 Oct 2017 00:21:08 +0200 Subject: [PATCH 0048/1862] Add id_card input element --- hosting/templates/hosting/includes/_card_input.html | 1 + hosting/templates/hosting/payment.html | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/hosting/templates/hosting/includes/_card_input.html b/hosting/templates/hosting/includes/_card_input.html index f9edf735..8cf2d55b 100644 --- a/hosting/templates/hosting/includes/_card_input.html +++ b/hosting/templates/hosting/includes/_card_input.html @@ -2,6 +2,7 @@ +
diff --git a/hosting/templates/hosting/payment.html b/hosting/templates/hosting/payment.html index 7cadb530..e3331afe 100644 --- a/hosting/templates/hosting/payment.html +++ b/hosting/templates/hosting/payment.html @@ -86,7 +86,7 @@
{% trans "Type" %}: {{card.brand}}
- {% trans "SELECT" %} + {% trans "SELECT" %}
{% endfor %} From cf426b88e23c45674521f98a8c58a509f933037b Mon Sep 17 00:00:00 2001 From: Arvind Tiwari Date: Thu, 26 Oct 2017 02:14:09 +0530 Subject: [PATCH 0049/1862] de text modified --- ungleich_page/templates/ungleich_page/glasfaser.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ungleich_page/templates/ungleich_page/glasfaser.html b/ungleich_page/templates/ungleich_page/glasfaser.html index 486e4334..2e797814 100644 --- a/ungleich_page/templates/ungleich_page/glasfaser.html +++ b/ungleich_page/templates/ungleich_page/glasfaser.html @@ -91,8 +91,8 @@

Surfen Sie mit 100 Mbit/s im Internet!

-

Mit dem neuen Glasfaser-Angebot der ungleich macht das Arbeiten im Internet richtig Spass. Das beste daran: die Geschwindigkeit symmetrisch in beide Richtungen verfügbar. Damit kann ihr Firmennetzwerk auch Dienste bereitstellen.

-

Dieses Angebot ist im Moment ausschliesslich für Firmenkunden verfügbar. Die Aufschaltkosten der Glasfaserleitung sind von der Entfernung zum nächsten Anschlusspunkt abhängig. Fragen Sie noch heute nach einem individuellem Angebot.

+

Mit dem neuen Glasfaser-Angebot der ungleich macht das Arbeiten im Internet richtig Spass. Das beste daran: die Geschwindigkeit ist symmetrisch in beide Richtungen verfügbar. Damit kann Ihr Firmennetzwerk auch Dienste bereitstellen.

+

Dieses Angebot ist im Moment ausschliesslich für Firmenkunden verfügbar. Die Aufschaltkosten der Glasfaserleitung sind von der Entfernung zum nächsten Anschlusspunkt abhängig. Fragen Sie noch heute nach einem individuellem Angebot. Gerne stellen wir Ihnen eine persönliche Offerte zusammen.

@@ -144,7 +144,7 @@

Einfach zu nutzen

-

2 vorkonfigurierte Endgeräte (benötigt zwei Steckdosen auf Ihrer Seite)

+

2 bereits für Sie konfigurierte Endgeräte (benötigt zwei Ihrer Steckdosen)

Einfach einstecken und los!

@@ -199,7 +199,7 @@
-

Sie müssen dann nur noch Ihre Geräte anschliessen und schon surfen Sie bllitzschnell im Internet!

+

Sie müssen dann nur noch Ihre Geräte anschliessen und schon surfen Sie blitzschnell im Internet!

From 64ffca6ded510643c7c3b595efc31f3df84eb954 Mon Sep 17 00:00:00 2001 From: Arvind Tiwari Date: Thu, 26 Oct 2017 03:24:29 +0530 Subject: [PATCH 0050/1862] signup form placeholder translation --- hosting/forms.py | 10 ++++++---- hosting/locale/de/LC_MESSAGES/django.po | 11 ++++++++++- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/hosting/forms.py b/hosting/forms.py index 7be7a588..d1c9d03a 100644 --- a/hosting/forms.py +++ b/hosting/forms.py @@ -50,15 +50,17 @@ class HostingUserLoginForm(forms.Form): class HostingUserSignupForm(forms.ModelForm): - confirm_password = forms.CharField(widget=forms.PasswordInput()) - password = forms.CharField(widget=forms.PasswordInput()) + confirm_password = forms.CharField(label=_("Confirm Password"), + widget=forms.PasswordInput()) + password = forms.CharField(label=_("Password"), + widget=forms.PasswordInput()) class Meta: model = CustomUser fields = ['name', 'email', 'password'] widgets = { 'name': forms.TextInput( - attrs={'placeholder': 'Enter your name or company name'}), + attrs={'placeholder': _('Enter your name or company name')}), } def clean_confirm_password(self): @@ -106,7 +108,7 @@ class UserHostingKeyForm(forms.ModelForm): public_key=openssh_pubkey_str).first().name KEY_EXISTS_MESSAGE = _( "This key exists already with the name \"%(name)s\"") % { - 'name': key_name} + 'name': key_name} raise forms.ValidationError(KEY_EXISTS_MESSAGE) with tempfile.NamedTemporaryFile(delete=True) as tmp_public_key_file: diff --git a/hosting/locale/de/LC_MESSAGES/django.po b/hosting/locale/de/LC_MESSAGES/django.po index fa24637a..9bb4a7be 100644 --- a/hosting/locale/de/LC_MESSAGES/django.po +++ b/hosting/locale/de/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-10-16 01:06+0530\n" +"POT-Creation-Date: 2017-10-26 03:21+0530\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -27,6 +27,15 @@ msgstr "Dein Account wurde noch nicht aktiviert." msgid "User does not exist" msgstr "Der Benutzer existiert nicht" +msgid "Confirm Password" +msgstr "Passwort Bestätigung" + +msgid "Password" +msgstr "Passwort" + +msgid "Enter your name or company name" +msgstr "Geben Sie Ihren Namen oder der Ihrer Firma ein" + msgid "Paste here your public key" msgstr "Füge Deinen Public Key ein" From 705e448e6f4f138ab17b0448486ce39487cac922 Mon Sep 17 00:00:00 2001 From: Arvind Tiwari Date: Thu, 26 Oct 2017 03:34:13 +0530 Subject: [PATCH 0051/1862] about section text added --- ungleich_page/locale/de/LC_MESSAGES/django.po | 14 +++++++++- .../ungleich_page/includes/_about.html | 26 +++++++++++++++++++ 2 files changed, 39 insertions(+), 1 deletion(-) diff --git a/ungleich_page/locale/de/LC_MESSAGES/django.po b/ungleich_page/locale/de/LC_MESSAGES/django.po index 78921c45..2c432b5f 100644 --- a/ungleich_page/locale/de/LC_MESSAGES/django.po +++ b/ungleich_page/locale/de/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-10-13 02:21+0530\n" +"POT-Creation-Date: 2017-10-26 03:32+0530\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -18,6 +18,9 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +msgid "Glasfaser menu" +msgstr "" + msgid "Toggle navigation" msgstr "Umschalten" @@ -96,6 +99,15 @@ msgstr "" "ungleich startet das Projekt AlpLora, mit dem Tiere via LoRaWAN geortet werden können" +msgid "ungleich starts to give basic computer courses for refugees." +msgstr "ungleich bietet einen PC-Grundkurs für Flüchtlinge an." + +msgid "" +"ungleich starts computer learning club for locals, \"Digitale Building " +"ungleich.\"" +msgstr "" +"ungleich gründet den Verein Digitale Bildung ungleich für Ortsansässige." + msgid "" "ungleich sells Alplora to an IoT " "startup in canton Zürich." diff --git a/ungleich_page/templates/ungleich_page/includes/_about.html b/ungleich_page/templates/ungleich_page/includes/_about.html index 0b8218d9..37fc378a 100644 --- a/ungleich_page/templates/ungleich_page/includes/_about.html +++ b/ungleich_page/templates/ungleich_page/includes/_about.html @@ -79,6 +79,32 @@
+
  • +
    + +
    +
    +
    +

    2016

    +
    +
    +

    {% trans "ungleich starts to give basic computer courses for refugees." %}

    +
    +
    +
    • +
  • +
    + +
    +
    +
    +

    2017

    +
    +
    +

    {% trans 'ungleich starts computer learning club for locals, "Digitale Building ungleich."' %}

    +
    +
    +
  • From 8d2c120b4330b4dc6f22801c97317929072589dc Mon Sep 17 00:00:00 2001 From: "M.Ravi" Date: Thu, 26 Oct 2017 12:29:16 +0200 Subject: [PATCH 0052/1862] Associate newly added card with customer from hosting --- hosting/views.py | 4 ++++ membership/models.py | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/hosting/views.py b/hosting/views.py index 207c95c9..f082ae1b 100644 --- a/hosting/views.py +++ b/hosting/views.py @@ -626,6 +626,10 @@ class SettingsView(LoginRequiredMixin, FormView): exp_year=card_details_response['exp_year'], card_id=card_details_response['card_id'] ) + stripe_utils.associate_customer_card( + request.user.stripecustomer.stripe_id, + token + ) msg = _( "Successfully associated the card with your account" ) diff --git a/membership/models.py b/membership/models.py index ca403347..dc76a8dc 100644 --- a/membership/models.py +++ b/membership/models.py @@ -212,8 +212,8 @@ class StripeCustomer(models.Model): stripe_customer.user, token) if "deleted" in customer and customer["deleted"]: raise StripeCustomer.DoesNotExist() - if not customer.sources.data: - stripe_utils.update_customer_token(customer, token) + #if not customer.sources.data: + # stripe_utils.update_customer_token(customer, token) return stripe_customer except StripeCustomer.DoesNotExist: user = CustomUser.objects.get(email=email) From ef9dc446db7fdabb4b99f624f2a16df9002308cf Mon Sep 17 00:00:00 2001 From: "M.Ravi" Date: Thu, 26 Oct 2017 15:00:54 +0200 Subject: [PATCH 0053/1862] Use hasattr to check if a user already has a stripecustomer object --- hosting/views.py | 6 +++++- membership/models.py | 14 +++++++------- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/hosting/views.py b/hosting/views.py index f082ae1b..d4af6d25 100644 --- a/hosting/views.py +++ b/hosting/views.py @@ -664,8 +664,12 @@ class PaymentVMView(LoginRequiredMixin, FormView): def get_context_data(self, **kwargs): context = super(PaymentVMView, self).get_context_data(**kwargs) user = self.request.user + if hasattr(user, 'stripecustomer'): + stripe_customer = user.stripecustomer + else: + stripe_customer = None cards_list = UserCardDetail.get_all_cards_list( - stripe_customer= user.stripecustomer + stripe_customer=stripe_customer ) context.update({ 'cards_list': cards_list, diff --git a/membership/models.py b/membership/models.py index dc76a8dc..7ebf00ca 100644 --- a/membership/models.py +++ b/membership/models.py @@ -221,19 +221,19 @@ class StripeCustomer(models.Model): stripe_data = stripe_utils.create_customer(token, email, user.name) if stripe_data.get('response_object'): stripe_cus_id = stripe_data.get('response_object').get('id') - if user.stripecustomer is None: - # The user never had an associated Stripe account - # So, create one - stripe_customer = StripeCustomer.objects.create( - user=user, stripe_id=stripe_cus_id - ) - else: + if hasattr(user, 'stripecustomer'): # User already had a Stripe account and we are here # because the account was deleted in dashboard # So, we simply update the stripe_id user.stripecustomer.stripe_id = stripe_cus_id user.stripecustomer.save() stripe_customer = user.stripecustomer + else: + # The user never had an associated Stripe account + # So, create one + stripe_customer = StripeCustomer.objects.create( + user=user, stripe_id=stripe_cus_id + ) return stripe_customer else: return None From 692f82cba4c1ad35f245a0157abb320b581c3354 Mon Sep 17 00:00:00 2001 From: "M.Ravi" Date: Thu, 26 Oct 2017 15:15:27 +0200 Subject: [PATCH 0054/1862] Code rearrange --- hosting/views.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/hosting/views.py b/hosting/views.py index d4af6d25..8eef90cb 100644 --- a/hosting/views.py +++ b/hosting/views.py @@ -627,8 +627,7 @@ class SettingsView(LoginRequiredMixin, FormView): card_id=card_details_response['card_id'] ) stripe_utils.associate_customer_card( - request.user.stripecustomer.stripe_id, - token + request.user.stripecustomer.stripe_id, token ) msg = _( "Successfully associated the card with your account" From 85d19c004be83d66f307a5eaa030bc6a9fdcc10a Mon Sep 17 00:00:00 2001 From: "M.Ravi" Date: Thu, 26 Oct 2017 15:21:29 +0200 Subject: [PATCH 0055/1862] Remove redundant code in check_customer --- utils/stripe_utils.py | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/utils/stripe_utils.py b/utils/stripe_utils.py index ac01b9d5..5299e4d5 100644 --- a/utils/stripe_utils.py +++ b/utils/stripe_utils.py @@ -126,21 +126,14 @@ class StripeUtils(object): } return card_details - def check_customer(self, id, user, token): - customers = self.stripe.Customer.list() - if not customers.get('data'): + def check_customer(self, stripe_cus_api_id, user, token): + try: + customer = stripe.Customer.retrieve(stripe_cus_api_id) + except stripe.InvalidRequestError: customer = self.create_customer(token, user.email, user.name) user.stripecustomer.stripe_id = customer.get( 'response_object').get('id') user.stripecustomer.save() - else: - try: - customer = stripe.Customer.retrieve(id) - except stripe.InvalidRequestError: - customer = self.create_customer(token, user.email, user.name) - user.stripecustomer.stripe_id = customer.get( - 'response_object').get('id') - user.stripecustomer.save() if type(customer) is dict: customer = customer['response_object'] return customer From 780fa6cb603692421c2dd4e571818ef79fee077e Mon Sep 17 00:00:00 2001 From: "M.Ravi" Date: Thu, 26 Oct 2017 17:56:12 +0200 Subject: [PATCH 0056/1862] Add get_or_create_user_card_detail method --- hosting/models.py | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/hosting/models.py b/hosting/models.py index 18027790..80ff31f4 100644 --- a/hosting/models.py +++ b/hosting/models.py @@ -230,3 +230,35 @@ class UserCardDetail(AssignPermissionsMixin, models.Model): 'last4': card.last4, 'brand': card.brand, 'id': card.id }) return cards_list + + @classmethod + def get_or_create_user_card_detail(cls, stripe_customer, card_details): + """ + A method that checks if a UserCardDetail object exists already + based upon the given card_details and creates it for the given + customer if it does not exist. It returns the UserCardDetail object + matching the given card_details if it exists. + + :param stripe_customer: The given StripeCustomer object to whom the + card object should belong to + :param card_details: A dictionary identifying a given card + :return: UserCardDetail object + """ + try: + card_detail = UserCardDetail.objects.get( + stripe_customer=stripe_customer, + fingerprint=card_details['fingerprint'], + exp_month=card_details['exp_month'], + exp_year=card_details['exp_year'] + ) + except UserCardDetail.DoesNotExist: + card_detail = UserCardDetail.create( + stripe_customer=stripe_customer, + last4=card_details['last4'], + brand=card_details['brand'], + fingerprint=card_details['fingerprint'], + exp_month=card_details['exp_month'], + exp_year=card_details['exp_year'], + card_id=card_details['card_id'] + ) + return card_detail From 4dd407da679a6d124a780d20b1d135847b999616 Mon Sep 17 00:00:00 2001 From: "M.Ravi" Date: Thu, 26 Oct 2017 17:57:11 +0200 Subject: [PATCH 0057/1862] Use card_id as session variable instead of token and customer --- hosting/views.py | 91 ++++++++++++++++++++++-------------------------- 1 file changed, 42 insertions(+), 49 deletions(-) diff --git a/hosting/views.py b/hosting/views.py index 8eef90cb..199cda8e 100644 --- a/hosting/views.py +++ b/hosting/views.py @@ -689,8 +689,9 @@ class PaymentVMView(LoginRequiredMixin, FormView): token = form.cleaned_data.get('token') owner = self.request.user # Get or create stripe customer - customer = StripeCustomer.get_or_create(email=owner.email, - token=token) + customer = StripeCustomer.get_or_create( + email=owner.email, token=token + ) if not customer: msg = _("Invalid credit card") messages.add_message( @@ -698,13 +699,23 @@ class PaymentVMView(LoginRequiredMixin, FormView): extra_tags='make_charge_error') return HttpResponseRedirect( reverse('hosting:payment') + '#payment_error') - + stripe_utils = StripeUtils() + 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()) + card_details_response = card_details['response_object'] + user_card_detail = UserCardDetail.get_or_create_user_card_detail( + stripe_customer=customer, card_details=card_details_response + ) request.session['billing_address_data'] = billing_address_data - request.session['token'] = token - request.session['customer'] = customer.stripe_id + request.session['card_id'] = user_card_detail.id return HttpResponseRedirect("{url}?{query_params}".format( url=reverse('hosting:order-confirmation'), - query_params='page=payment')) + query_params='page=payment') + ) else: return self.form_invalid(form) @@ -726,13 +737,8 @@ class OrdersHostingDetailView(LoginRequiredMixin, context = super(DetailView, self).get_context_data(**kwargs) obj = self.get_object() owner = self.request.user - stripe_api_cus_id = self.request.session.get('customer') - stripe_utils = StripeUtils() - card_details = stripe_utils.get_card_details( - stripe_api_cus_id, - self.request.session.get('token') - ) - + card_id = self.request.session.get('card_id') + card_detail = UserCardDetail.objects.get(id=card_id) if self.request.GET.get('page') == 'payment': context['page_header_text'] = _('Confirm Order') else: @@ -772,17 +778,11 @@ class OrdersHostingDetailView(LoginRequiredMixin, _('In order to create a VM, you need to create/upload ' 'your SSH KEY first.') ) - elif not card_details.get('response_object'): - # new order, failed to get card details - context['failed_payment'] = True - context['card_details'] = card_details else: # new order, confirm payment context['site_url'] = reverse('hosting:create_virtual_machine') - context['cc_last4'] = card_details.get('response_object').get( - 'last4') - context['cc_brand'] = card_details.get('response_object').get( - 'cc_brand') + context['cc_last4'] = card_detail.last4 + context['cc_brand'] = card_detail.brand context['vm'] = self.request.session.get('specs') return context @@ -792,7 +792,7 @@ class OrdersHostingDetailView(LoginRequiredMixin, return HttpResponseRedirect( reverse('hosting:create_virtual_machine') ) - if 'token' not in self.request.session: + if 'card_id' not in self.request.session: return HttpResponseRedirect(reverse('hosting:payment')) self.object = self.get_object() context = self.get_context_data(object=self.object) @@ -810,44 +810,37 @@ class OrdersHostingDetailView(LoginRequiredMixin, def post(self, request): template = request.session.get('template') specs = request.session.get('specs') + card_id = request.session.get('card_id') # We assume that if the user is here, his/her StripeCustomer # object already exists stripe_customer_id = request.user.stripecustomer.id billing_address_data = request.session.get('billing_address_data') vm_template_id = template.get('id', 1) - stripe_api_cus_id = self.request.session.get('customer') + stripe_api_cus_id = request.user.stripecustomer.stripe_id # Make stripe charge to a customer stripe_utils = StripeUtils() - card_details = stripe_utils.get_card_details(stripe_api_cus_id, - request.session.get( - 'token')) - if not card_details.get('response_object'): - msg = card_details.get('error') - messages.add_message(self.request, messages.ERROR, msg, - extra_tags='failed_payment') - return HttpResponseRedirect( - reverse('datacenterlight:payment') + '#payment_error') - card_details_dict = card_details.get('response_object') + user_card_detail = UserCardDetail.objects.get(id=card_id) + card_details_dict = { + 'last4' : user_card_detail.last4, 'brand': user_card_detail.brand + } cpu = specs.get('cpu') memory = specs.get('memory') disk_size = specs.get('disk_size') amount_to_be_charged = specs.get('price') - plan_name = StripeUtils.get_stripe_plan_name(cpu=cpu, - memory=memory, - disk_size=disk_size) - stripe_plan_id = StripeUtils.get_stripe_plan_id(cpu=cpu, - ram=memory, - ssd=disk_size, - version=1, - app='dcl') + plan_name = StripeUtils.get_stripe_plan_name( + cpu=cpu, memory=memory, disk_size=disk_size + ) + stripe_plan_id = StripeUtils.get_stripe_plan_id( + cpu=cpu, ram=memory, ssd=disk_size, version=1, app='dcl' + ) stripe_plan = stripe_utils.get_or_create_stripe_plan( - amount=amount_to_be_charged, - name=plan_name, - stripe_plan_id=stripe_plan_id) + amount=amount_to_be_charged, name=plan_name, + stripe_plan_id=stripe_plan_id + ) subscription_result = stripe_utils.subscribe_customer_to_plan( stripe_api_cus_id, - [{"plan": stripe_plan.get( - 'response_object').stripe_plan_id}]) + [{"plan": stripe_plan.get('response_object').stripe_plan_id}] + ) stripe_subscription_obj = subscription_result.get('response_object') # Check if the subscription was approved and is active if (stripe_subscription_obj is None or @@ -864,7 +857,8 @@ class OrdersHostingDetailView(LoginRequiredMixin, 'msg_body': str( _('There was a payment related error.' ' On close of this popup, you will be redirected back to' - ' the payment page.')) + ' the payment page.') + ) } return HttpResponse(json.dumps(response), content_type="application/json") @@ -881,8 +875,7 @@ class OrdersHostingDetailView(LoginRequiredMixin, stripe_subscription_obj.id, card_details_dict) for session_var in ['specs', 'template', 'billing_address', - 'billing_address_data', - 'token', 'customer']: + 'billing_address_data', 'card_id']: if session_var in request.session: del request.session[session_var] From a6d28bff8606d4400b7e50f87df4373cc440193c Mon Sep 17 00:00:00 2001 From: PCoder Date: Fri, 27 Oct 2017 00:40:38 +0200 Subject: [PATCH 0058/1862] Add set_default_card and set_default_card_from_stripe methods --- hosting/models.py | 36 ++++++++++++++++++++++++++++++++++-- 1 file changed, 34 insertions(+), 2 deletions(-) diff --git a/hosting/models.py b/hosting/models.py index 80ff31f4..a72c4d7e 100644 --- a/hosting/models.py +++ b/hosting/models.py @@ -10,6 +10,7 @@ from django.utils.functional import cached_property from membership.models import StripeCustomer, CustomUser from utils.mixins import AssignPermissionsMixin from utils.models import BillingAddress +from utils.stripe_utils import StripeUtils logger = logging.getLogger(__name__) @@ -201,11 +202,12 @@ class UserCardDetail(AssignPermissionsMixin, models.Model): @classmethod def create(cls, stripe_customer=None, last4=None, brand=None, - fingerprint=None, exp_month=None, exp_year=None, card_id=None): + fingerprint=None, exp_month=None, exp_year=None, card_id=None, + preferred=False): instance = cls.objects.create( stripe_customer=stripe_customer, last4=last4, brand=brand, fingerprint=fingerprint, exp_month=exp_month, exp_year=exp_year, - card_id=card_id + card_id=card_id, preferred=preferred ) instance.assign_permissions(stripe_customer.user) return instance @@ -262,3 +264,33 @@ class UserCardDetail(AssignPermissionsMixin, models.Model): card_id=card_details['card_id'] ) return card_detail + + def set_default_card(self, stripe_api_cus_id, stripe_source_id): + """ + Sets the given stripe source as the default source for the given + Stripe customer + :param stripe_api_cus_id: Stripe customer id + :param stripe_source_id: The Stripe source id + :return: + """ + stripe_utils = StripeUtils() + cus_response = stripe_utils.get_customer(stripe_api_cus_id) + cu = cus_response['response_object'] + cu.default_source = stripe_source_id + cu.save() + self._save_default_card(stripe_api_cus_id, stripe_source_id) + + def set_default_card_from_stripe(self, stripe_api_cus_id): + stripe_utils = StripeUtils() + cus_response = stripe_utils.get_customer(stripe_api_cus_id) + cu = cus_response['response_object'] + default_source = cu.default_source + self._save_default_card(stripe_api_cus_id, default_source) + + def _save_default_card(self, stripe_api_cus_id, card_id): + stripe_cust = StripeCustomer.objects.get(stripe_id=stripe_api_cus_id) + user_card_detail = UserCardDetail.objects.get( + stripe_customer=stripe_cust, card_id=card_id + ) + user_card_detail.preferred = True + user_card_detail.save() \ No newline at end of file From 1374eaf1a29bb357b37d2fe63c9b14321c07c249 Mon Sep 17 00:00:00 2001 From: PCoder Date: Fri, 27 Oct 2017 00:41:49 +0200 Subject: [PATCH 0059/1862] Rename id to stripe_api_cus_id --- utils/stripe_utils.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/utils/stripe_utils.py b/utils/stripe_utils.py index 5299e4d5..b9884ebf 100644 --- a/utils/stripe_utils.py +++ b/utils/stripe_utils.py @@ -139,8 +139,8 @@ class StripeUtils(object): return customer @handleStripeError - def get_customer(self, id): - customer = stripe.Customer.retrieve(id) + def get_customer(self, stripe_api_cus_id): + customer = stripe.Customer.retrieve(stripe_api_cus_id) # data = customer.get('response_object') return customer From bd7db306336232a4e34b267a934bbae6cdd6bf0f Mon Sep 17 00:00:00 2001 From: PCoder Date: Fri, 27 Oct 2017 00:43:07 +0200 Subject: [PATCH 0060/1862] Add card hidden field to BillingAddressForm --- utils/forms.py | 1 + 1 file changed, 1 insertion(+) diff --git a/utils/forms.py b/utils/forms.py index f8a6d103..bd00b42d 100644 --- a/utils/forms.py +++ b/utils/forms.py @@ -117,6 +117,7 @@ class EditCreditCardForm(forms.Form): class BillingAddressForm(forms.ModelForm): token = forms.CharField(widget=forms.HiddenInput(), required=False) + card = forms.CharField(widget=forms.HiddenInput(), required=False) class Meta: model = BillingAddress From 38168e8f8f3cb9124569d700a84844758fb8b4ca Mon Sep 17 00:00:00 2001 From: PCoder Date: Fri, 27 Oct 2017 00:45:26 +0200 Subject: [PATCH 0061/1862] Allow use of previous cards in hosting flow --- hosting/views.py | 91 +++++++++++++++++++++++++++++++++++------------- 1 file changed, 66 insertions(+), 25 deletions(-) diff --git a/hosting/views.py b/hosting/views.py index 199cda8e..31fcdedd 100644 --- a/hosting/views.py +++ b/hosting/views.py @@ -571,6 +571,10 @@ class SettingsView(LoginRequiredMixin, FormView): request.user.stripecustomer.stripe_id, card.card_id ) + if card.preferred: + card.set_default_card_from_stripe( + request.user.stripecustomer.stripe_id + ) card.delete() msg = _("Card deassociation successful") messages.add_message(request, messages.SUCCESS, msg) @@ -617,6 +621,9 @@ class SettingsView(LoginRequiredMixin, FormView): msg = _('You seem to have already added this card') messages.add_message(request, messages.ERROR, msg) except UserCardDetail.DoesNotExist: + preferred = False + if stripe_customer.usercarddetail_set.count() == 0: + preferred = True UserCardDetail.create( stripe_customer=stripe_customer, last4=card_details_response['last4'], @@ -624,7 +631,8 @@ class SettingsView(LoginRequiredMixin, FormView): fingerprint=card_details_response['fingerprint'], exp_month=card_details_response['exp_month'], exp_year=card_details_response['exp_year'], - card_id=card_details_response['card_id'] + card_id=card_details_response['card_id'], + preferred=preferred ) stripe_utils.associate_customer_card( request.user.stripecustomer.stripe_id, token @@ -688,28 +696,53 @@ class PaymentVMView(LoginRequiredMixin, FormView): billing_address_data = form.cleaned_data token = form.cleaned_data.get('token') owner = self.request.user - # Get or create stripe customer - customer = StripeCustomer.get_or_create( - email=owner.email, token=token - ) - if not customer: - msg = _("Invalid credit card") - messages.add_message( - self.request, messages.ERROR, msg, - extra_tags='make_charge_error') - return HttpResponseRedirect( - reverse('hosting:payment') + '#payment_error') - stripe_utils = StripeUtils() - 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()) - card_details_response = card_details['response_object'] - user_card_detail = UserCardDetail.get_or_create_user_card_detail( - stripe_customer=customer, card_details=card_details_response - ) + if token is '': + card_id = form.cleaned_data.get('card') + customer = owner.stripecustomer + try: + user_card_detail = UserCardDetail.objects.get(id=card_id) + if not request.user.has_perm('view_usercarddetail', user_card_detail): + raise UserCardDetail.DoesNotExist( + _("{user} does not have permission to access the " + "card").format(user=request.user.email) + ) + except UserCardDetail.DoesNotExist as e: + ex = str(e) + logger.error("Card Id: {card_id}, Exception: {ex}".format( + card_id=card_id, ex=ex + ) + ) + msg = _("An error occurred. Details: {}".format(ex)) + messages.add_message( + self.request, messages.ERROR, msg, + extra_tags='make_charge_error' + ) + return HttpResponseRedirect( + reverse('hosting:payment') + '#payment_error' + ) + else: + # Get or create stripe customer + customer = StripeCustomer.get_or_create( + email=owner.email, token=token + ) + if not customer: + msg = _("Invalid credit card") + messages.add_message( + self.request, messages.ERROR, msg, + extra_tags='make_charge_error') + return HttpResponseRedirect( + reverse('hosting:payment') + '#payment_error') + stripe_utils = StripeUtils() + 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()) + card_details_response = card_details['response_object'] + user_card_detail = UserCardDetail.get_or_create_user_card_detail( + stripe_customer=customer, card_details=card_details_response + ) request.session['billing_address_data'] = billing_address_data request.session['card_id'] = user_card_detail.id return HttpResponseRedirect("{url}?{query_params}".format( @@ -737,8 +770,6 @@ class OrdersHostingDetailView(LoginRequiredMixin, context = super(DetailView, self).get_context_data(**kwargs) obj = self.get_object() owner = self.request.user - card_id = self.request.session.get('card_id') - card_detail = UserCardDetail.objects.get(id=card_id) if self.request.GET.get('page') == 'payment': context['page_header_text'] = _('Confirm Order') else: @@ -780,6 +811,8 @@ class OrdersHostingDetailView(LoginRequiredMixin, ) else: # new order, confirm payment + card_id = self.request.session.get('card_id') + card_detail = UserCardDetail.objects.get(id=card_id) context['site_url'] = reverse('hosting:create_virtual_machine') context['cc_last4'] = card_detail.last4 context['cc_brand'] = card_detail.brand @@ -837,6 +870,14 @@ class OrdersHostingDetailView(LoginRequiredMixin, amount=amount_to_be_charged, name=plan_name, stripe_plan_id=stripe_plan_id ) + stripe_utils.associate_customer_card( + stripe_api_cus_id, user_card_detail.card_id + ) + if not user_card_detail.preferred: + user_card_detail.set_default_card( + stripe_api_cus_id=stripe_api_cus_id, + stripe_source_id=user_card_detail.card_id + ) subscription_result = stripe_utils.subscribe_customer_to_plan( stripe_api_cus_id, [{"plan": stripe_plan.get('response_object').stripe_plan_id}] From 73169e825d2d0e4ce46f1667a294f46931b1b69a Mon Sep 17 00:00:00 2001 From: PCoder Date: Sat, 28 Oct 2017 15:13:38 +0200 Subject: [PATCH 0062/1862] Add set_as_default parameter for associate_customer_card method --- utils/stripe_utils.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/utils/stripe_utils.py b/utils/stripe_utils.py index b9884ebf..e43304ca 100644 --- a/utils/stripe_utils.py +++ b/utils/stripe_utils.py @@ -79,9 +79,13 @@ class StripeUtils(object): customer.save() @handleStripeError - def associate_customer_card(self, stripe_customer_id, token): + def associate_customer_card(self, stripe_customer_id, token, + set_as_default=False): customer = stripe.Customer.retrieve(stripe_customer_id) - customer.sources.create(source=token) + card = customer.sources.create(source=token) + if set_as_default: + customer.default_source = card.id + customer.save() @handleStripeError def dissociate_customer_card(self, stripe_customer_id, card_id): From 8759e2a4b5491c904b4dc3a46143878a74363c7b Mon Sep 17 00:00:00 2001 From: PCoder Date: Sat, 28 Oct 2017 15:14:42 +0200 Subject: [PATCH 0063/1862] Save default card only if Stripe's default_source is not None --- hosting/models.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hosting/models.py b/hosting/models.py index a72c4d7e..ae047628 100644 --- a/hosting/models.py +++ b/hosting/models.py @@ -285,7 +285,8 @@ class UserCardDetail(AssignPermissionsMixin, models.Model): cus_response = stripe_utils.get_customer(stripe_api_cus_id) cu = cus_response['response_object'] default_source = cu.default_source - self._save_default_card(stripe_api_cus_id, default_source) + if default_source is not None: + self._save_default_card(stripe_api_cus_id, default_source) def _save_default_card(self, stripe_api_cus_id, card_id): stripe_cust = StripeCustomer.objects.get(stripe_id=stripe_api_cus_id) From d14a6431712c2ffb4f2e99084fc05017a48c586e Mon Sep 17 00:00:00 2001 From: PCoder Date: Sat, 28 Oct 2017 15:26:15 +0200 Subject: [PATCH 0064/1862] Set preferred field as in card_details --- hosting/models.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/hosting/models.py b/hosting/models.py index ae047628..d95adf13 100644 --- a/hosting/models.py +++ b/hosting/models.py @@ -254,6 +254,9 @@ class UserCardDetail(AssignPermissionsMixin, models.Model): exp_year=card_details['exp_year'] ) except UserCardDetail.DoesNotExist: + preferred = False + if 'preferred' in card_details: + preferred = card_details['preferred'] card_detail = UserCardDetail.create( stripe_customer=stripe_customer, last4=card_details['last4'], @@ -261,7 +264,8 @@ class UserCardDetail(AssignPermissionsMixin, models.Model): fingerprint=card_details['fingerprint'], exp_month=card_details['exp_month'], exp_year=card_details['exp_year'], - card_id=card_details['card_id'] + card_id=card_details['card_id'], + preferred=preferred ) return card_detail From 6212c9df5050384b349a9d656164cdecbc8691a3 Mon Sep 17 00:00:00 2001 From: PCoder Date: Sat, 28 Oct 2017 15:30:42 +0200 Subject: [PATCH 0065/1862] Manage token and card_id properly in hosting flow --- hosting/views.py | 104 +++++++++++++++++++++++++++-------------------- 1 file changed, 60 insertions(+), 44 deletions(-) diff --git a/hosting/views.py b/hosting/views.py index 31fcdedd..ff7221ad 100644 --- a/hosting/views.py +++ b/hosting/views.py @@ -552,7 +552,7 @@ class SettingsView(LoginRequiredMixin, FormView): context = super(SettingsView, self).get_context_data(**kwargs) user = self.request.user cards_list = UserCardDetail.get_all_cards_list( - stripe_customer= user.stripecustomer + stripe_customer=user.stripecustomer ) context.update({ 'cards_list': cards_list, @@ -701,7 +701,9 @@ class PaymentVMView(LoginRequiredMixin, FormView): customer = owner.stripecustomer try: user_card_detail = UserCardDetail.objects.get(id=card_id) - if not request.user.has_perm('view_usercarddetail', user_card_detail): + if not request.user.has_perm( + 'view_usercarddetail', user_card_detail + ): raise UserCardDetail.DoesNotExist( _("{user} does not have permission to access the " "card").format(user=request.user.email) @@ -720,6 +722,7 @@ class PaymentVMView(LoginRequiredMixin, FormView): return HttpResponseRedirect( reverse('hosting:payment') + '#payment_error' ) + request.session['card_id'] = user_card_detail.id else: # Get or create stripe customer customer = StripeCustomer.get_or_create( @@ -732,19 +735,8 @@ class PaymentVMView(LoginRequiredMixin, FormView): extra_tags='make_charge_error') return HttpResponseRedirect( reverse('hosting:payment') + '#payment_error') - stripe_utils = StripeUtils() - 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()) - card_details_response = card_details['response_object'] - user_card_detail = UserCardDetail.get_or_create_user_card_detail( - stripe_customer=customer, card_details=card_details_response - ) + request.session['token'] = token request.session['billing_address_data'] = billing_address_data - request.session['card_id'] = user_card_detail.id return HttpResponseRedirect("{url}?{query_params}".format( url=reverse('hosting:order-confirmation'), query_params='page=payment') @@ -811,11 +803,23 @@ class OrdersHostingDetailView(LoginRequiredMixin, ) else: # new order, confirm payment - card_id = self.request.session.get('card_id') - card_detail = UserCardDetail.objects.get(id=card_id) + if 'token' in self.request.session: + token = self.request.session['token'] + stripe_utils = StripeUtils() + card_details = stripe_utils.get_cards_details_from_token( + token + ) + if not card_details.get('response_object'): + return HttpResponseRedirect(reverse('hosting:payment')) + card_details_response = card_details['response_object'] + context['cc_last4'] = card_details_response['last4'] + context['cc_brand'] = card_details_response['brand'] + else: + card_id = self.request.session.get('card_id') + card_detail = UserCardDetail.objects.get(id=card_id) + context['cc_last4'] = card_detail.last4 + context['cc_brand'] = card_detail.brand context['site_url'] = reverse('hosting:create_virtual_machine') - context['cc_last4'] = card_detail.last4 - context['cc_brand'] = card_detail.brand context['vm'] = self.request.session.get('specs') return context @@ -825,37 +829,50 @@ class OrdersHostingDetailView(LoginRequiredMixin, return HttpResponseRedirect( reverse('hosting:create_virtual_machine') ) - if 'card_id' not in self.request.session: + if ('card_id' not in self.request.session and + 'token' not in self.request.session): return HttpResponseRedirect(reverse('hosting:payment')) self.object = self.get_object() context = self.get_context_data(object=self.object) - if 'failed_payment' in context: - msg = context['card_details'].get('error') - messages.add_message( - self.request, messages.ERROR, msg, - extra_tags='failed_payment' - ) - return HttpResponseRedirect( - reverse('hosting:payment') + '#payment_error' - ) return self.render_to_response(context) def post(self, request): template = request.session.get('template') specs = request.session.get('specs') - card_id = request.session.get('card_id') + stripe_utils = StripeUtils() # We assume that if the user is here, his/her StripeCustomer # object already exists stripe_customer_id = request.user.stripecustomer.id 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 - # Make stripe charge to a customer - stripe_utils = StripeUtils() - user_card_detail = UserCardDetail.objects.get(id=card_id) - card_details_dict = { - 'last4' : user_card_detail.last4, 'brand': user_card_detail.brand - } + if 'token' in self.request.session: + card_details = stripe_utils.get_cards_details_from_token( + request.session['token'] + ) + if not card_details.get('response_object'): + return HttpResponseRedirect(reverse('hosting:payment')) + card_details_response = card_details['response_object'] + card_details_dict = { + 'last4': card_details_response['last4'], + 'brand': card_details_response['brand'] + } + stripe_utils.associate_customer_card( + stripe_api_cus_id, request.session['token'], + set_as_default=True + ) + else: + card_id = request.session.get('card_id') + user_card_detail = UserCardDetail.objects.get(id=card_id) + card_details_dict = { + 'last4': user_card_detail.last4, + 'brand': user_card_detail.brand + } + if not user_card_detail.preferred: + user_card_detail.set_default_card( + stripe_api_cus_id=stripe_api_cus_id, + stripe_source_id=user_card_detail.card_id + ) cpu = specs.get('cpu') memory = specs.get('memory') disk_size = specs.get('disk_size') @@ -870,14 +887,7 @@ class OrdersHostingDetailView(LoginRequiredMixin, amount=amount_to_be_charged, name=plan_name, stripe_plan_id=stripe_plan_id ) - stripe_utils.associate_customer_card( - stripe_api_cus_id, user_card_detail.card_id - ) - if not user_card_detail.preferred: - user_card_detail.set_default_card( - stripe_api_cus_id=stripe_api_cus_id, - stripe_source_id=user_card_detail.card_id - ) + subscription_result = stripe_utils.subscribe_customer_to_plan( stripe_api_cus_id, [{"plan": stripe_plan.get('response_object').stripe_plan_id}] @@ -903,6 +913,12 @@ class OrdersHostingDetailView(LoginRequiredMixin, } return HttpResponse(json.dumps(response), content_type="application/json") + if 'token' in request.session: + card_details_response['preferred']=True + UserCardDetail.get_or_create_user_card_detail( + stripe_customer=self.request.user.stripecustomer, + card_details=card_details_response + ) user = { 'name': self.request.user.name, 'email': self.request.user.email, @@ -916,7 +932,7 @@ class OrdersHostingDetailView(LoginRequiredMixin, stripe_subscription_obj.id, card_details_dict) for session_var in ['specs', 'template', 'billing_address', - 'billing_address_data', 'card_id']: + 'billing_address_data', 'card_id', 'token']: if session_var in request.session: del request.session[session_var] From b6d1e8df6b460fa6777a194ffec315dc06285ab6 Mon Sep 17 00:00:00 2001 From: PCoder Date: Sat, 28 Oct 2017 15:45:05 +0200 Subject: [PATCH 0066/1862] Set preferred for the card that's used for a subscription --- hosting/views.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hosting/views.py b/hosting/views.py index ff7221ad..04ae6b3b 100644 --- a/hosting/views.py +++ b/hosting/views.py @@ -911,10 +911,10 @@ class OrdersHostingDetailView(LoginRequiredMixin, ' the payment page.') ) } - return HttpResponse(json.dumps(response), - content_type="application/json") + return HttpResponse( + json.dumps(response), content_type="application/json" + ) if 'token' in request.session: - card_details_response['preferred']=True UserCardDetail.get_or_create_user_card_detail( stripe_customer=self.request.user.stripecustomer, card_details=card_details_response From a17a5f66bc1e89636b779a35a81e230876f2fe75 Mon Sep 17 00:00:00 2001 From: PCoder Date: Sat, 28 Oct 2017 16:47:10 +0200 Subject: [PATCH 0067/1862] Set preferred = False for cards that are not preferred --- hosting/models.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/hosting/models.py b/hosting/models.py index d95adf13..78743edc 100644 --- a/hosting/models.py +++ b/hosting/models.py @@ -282,7 +282,7 @@ class UserCardDetail(AssignPermissionsMixin, models.Model): cu = cus_response['response_object'] cu.default_source = stripe_source_id cu.save() - self._save_default_card(stripe_api_cus_id, stripe_source_id) + self.save_default_card(stripe_api_cus_id, stripe_source_id) def set_default_card_from_stripe(self, stripe_api_cus_id): stripe_utils = StripeUtils() @@ -290,12 +290,15 @@ class UserCardDetail(AssignPermissionsMixin, models.Model): cu = cus_response['response_object'] default_source = cu.default_source if default_source is not None: - self._save_default_card(stripe_api_cus_id, default_source) + self.save_default_card(stripe_api_cus_id, default_source) - def _save_default_card(self, stripe_api_cus_id, card_id): + def save_default_card(self, stripe_api_cus_id, card_id): stripe_cust = StripeCustomer.objects.get(stripe_id=stripe_api_cus_id) user_card_detail = UserCardDetail.objects.get( stripe_customer=stripe_cust, card_id=card_id ) + for card in stripe_cust.usercarddetail_set.all(): + card.preferred = False + card.save() user_card_detail.preferred = True - user_card_detail.save() \ No newline at end of file + user_card_detail.save() From 4be105a0a9856e91a75dab9426327d7ecfdd4b01 Mon Sep 17 00:00:00 2001 From: PCoder Date: Sat, 28 Oct 2017 16:48:03 +0200 Subject: [PATCH 0068/1862] Set default card for newly added card in hosting flow --- hosting/views.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/hosting/views.py b/hosting/views.py index 04ae6b3b..b3267fcf 100644 --- a/hosting/views.py +++ b/hosting/views.py @@ -915,10 +915,14 @@ class OrdersHostingDetailView(LoginRequiredMixin, json.dumps(response), content_type="application/json" ) if 'token' in request.session: - UserCardDetail.get_or_create_user_card_detail( + ucd = UserCardDetail.get_or_create_user_card_detail( stripe_customer=self.request.user.stripecustomer, card_details=card_details_response ) + ucd.save_default_card( + self.request.user.stripecustomer.stripe_id, + card_details_response['card_id'] + ) user = { 'name': self.request.user.name, 'email': self.request.user.email, From 06a5cba50ed134699caf74a378f8de2af78a3c41 Mon Sep 17 00:00:00 2001 From: PCoder Date: Sat, 28 Oct 2017 18:28:14 +0200 Subject: [PATCH 0069/1862] Add contains utility method --- hosting/models.py | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/hosting/models.py b/hosting/models.py index 78743edc..d6367301 100644 --- a/hosting/models.py +++ b/hosting/models.py @@ -302,3 +302,23 @@ class UserCardDetail(AssignPermissionsMixin, models.Model): card.save() user_card_detail.preferred = True user_card_detail.save() + + @staticmethod + def contains(stripe_customer, card_details): + """ + A utility function to check whether a StripeCustomer is already + associated with the card having given details + :param stripe_customer: + :param card_details: + :return: + """ + try: + UserCardDetail.objects.get( + stripe_customer=stripe_customer, + fingerprint=card_details['fingerprint'], + exp_month=card_details['exp_month'], + exp_year=card_details['exp_year'] + ) + return True + except UserCardDetail.DoesNotExist: + return False From d2ae94327ab5c4051c75c1b3fe43ef8a5ec6f3d5 Mon Sep 17 00:00:00 2001 From: PCoder Date: Sat, 28 Oct 2017 18:29:19 +0200 Subject: [PATCH 0070/1862] Associate card only if it has not already been done --- hosting/views.py | 36 +++++++++++++++++------------------- 1 file changed, 17 insertions(+), 19 deletions(-) diff --git a/hosting/views.py b/hosting/views.py index b3267fcf..8853a8b4 100644 --- a/hosting/views.py +++ b/hosting/views.py @@ -610,28 +610,22 @@ class SettingsView(LoginRequiredMixin, FormView): stripe_customer = StripeCustomer.get_or_create( email=request.user.email, token=token ) - card_details_response = card_details['response_object'] - try: - UserCardDetail.objects.get( - stripe_customer=stripe_customer, - fingerprint=card_details_response['fingerprint'], - exp_month=card_details_response['exp_month'], - exp_year=card_details_response['exp_year'] - ) + card = card_details['response_object'] + if UserCardDetail.contains(stripe_customer, card): msg = _('You seem to have already added this card') messages.add_message(request, messages.ERROR, msg) - except UserCardDetail.DoesNotExist: + else: preferred = False if stripe_customer.usercarddetail_set.count() == 0: preferred = True UserCardDetail.create( stripe_customer=stripe_customer, - last4=card_details_response['last4'], - brand=card_details_response['brand'], - fingerprint=card_details_response['fingerprint'], - exp_month=card_details_response['exp_month'], - exp_year=card_details_response['exp_year'], - card_id=card_details_response['card_id'], + 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 ) stripe_utils.associate_customer_card( @@ -857,10 +851,14 @@ class OrdersHostingDetailView(LoginRequiredMixin, 'last4': card_details_response['last4'], 'brand': card_details_response['brand'] } - stripe_utils.associate_customer_card( - stripe_api_cus_id, request.session['token'], - set_as_default=True + ucd = UserCardDetail.contains( + request.user.stripecustomer, card_details_response ) + if not ucd: + stripe_utils.associate_customer_card( + stripe_api_cus_id, request.session['token'], + set_as_default=True + ) else: card_id = request.session.get('card_id') user_card_detail = UserCardDetail.objects.get(id=card_id) @@ -921,7 +919,7 @@ class OrdersHostingDetailView(LoginRequiredMixin, ) ucd.save_default_card( self.request.user.stripecustomer.stripe_id, - card_details_response['card_id'] + ucd.card_id ) user = { 'name': self.request.user.name, From 2a59a3336bd5b2342c38f173a9592256ee18bb3d Mon Sep 17 00:00:00 2001 From: PCoder Date: Sat, 28 Oct 2017 20:25:18 +0200 Subject: [PATCH 0071/1862] Add metadata (vm_id) to Stripe subscription --- datacenterlight/tasks.py | 5 +++++ utils/stripe_utils.py | 12 ++++++++++++ 2 files changed, 17 insertions(+) diff --git a/datacenterlight/tasks.py b/datacenterlight/tasks.py index 3db6eb54..149781ec 100644 --- a/datacenterlight/tasks.py +++ b/datacenterlight/tasks.py @@ -18,6 +18,7 @@ from utils.hosting_utils import get_all_public_keys, get_or_create_vm_detail from utils.forms import UserBillingAddressForm from utils.mailer import BaseEmail from utils.models import BillingAddress +from utils.stripe_utils import StripeUtils logger = get_task_logger(__name__) @@ -118,6 +119,10 @@ def create_vm_task(self, vm_template_id, user, specs, template, # Associate an order with a stripe subscription order.set_subscription_id(stripe_subscription_id, cc_details) + stripe_utils = StripeUtils() + stripe_utils.set_subscription_meta_data( + stripe_subscription_id, {'ID': vm_id} + ) # If the Stripe payment succeeds, set order status approved order.set_approved() diff --git a/utils/stripe_utils.py b/utils/stripe_utils.py index e43304ca..74b6fa4a 100644 --- a/utils/stripe_utils.py +++ b/utils/stripe_utils.py @@ -304,3 +304,15 @@ class StripeUtils(object): cpu=cpu, memory=memory, disk_size=disk_size) + + @handleStripeError + def set_subscription_meta_data(self, subscription_id, meta_data): + """ + Adds VM metadata to a subscription + :param subscription_id: Stripe identifier for the subscription + :param meta_data: A dict of meta data to be added + :return: + """ + subscription = stripe.Subscription.retrieve(subscription_id) + subscription.metadata = meta_data + subscription.save() \ No newline at end of file From 175180e193640d4bf625db4fd76b268323f92e14 Mon Sep 17 00:00:00 2001 From: PCoder Date: Sat, 28 Oct 2017 20:45:00 +0200 Subject: [PATCH 0072/1862] Show DEFAULT text against the default card in the settings page --- hosting/models.py | 3 ++- hosting/templates/hosting/settings.html | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/hosting/models.py b/hosting/models.py index d6367301..ff116947 100644 --- a/hosting/models.py +++ b/hosting/models.py @@ -229,7 +229,8 @@ class UserCardDetail(AssignPermissionsMixin, models.Model): ) for card in user_card_details: cards_list.append({ - 'last4': card.last4, 'brand': card.brand, 'id': card.id + 'last4': card.last4, 'brand': card.brand, 'id': card.id, + 'preferred': card.preferred }) return cards_list diff --git a/hosting/templates/hosting/settings.html b/hosting/templates/hosting/settings.html index 5e0f7545..96e811cf 100644 --- a/hosting/templates/hosting/settings.html +++ b/hosting/templates/hosting/settings.html @@ -64,7 +64,11 @@
    + {% if card.preferred %} + {% trans "DEFAULT" %} + {% else %} {% trans "SELECT" %} + {% endif %}
    From c47b5cdc7243e7a00a8b7669fefaf8404aa9b7b4 Mon Sep 17 00:00:00 2001 From: PCoder Date: Sat, 28 Oct 2017 22:17:46 +0200 Subject: [PATCH 0073/1862] Add form to send selected card in settings page --- hosting/templates/hosting/settings.html | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/hosting/templates/hosting/settings.html b/hosting/templates/hosting/settings.html index 96e811cf..6b5acbee 100644 --- a/hosting/templates/hosting/settings.html +++ b/hosting/templates/hosting/settings.html @@ -67,7 +67,11 @@ {% if card.preferred %} {% trans "DEFAULT" %} {% else %} - {% trans "SELECT" %} + + {% csrf_token %} + + {% trans "SELECT" %} + {% endif %} From dc8ea8d253aeb1418c74e0d0c90a230acc375a03 Mon Sep 17 00:00:00 2001 From: PCoder Date: Sat, 28 Oct 2017 22:18:54 +0200 Subject: [PATCH 0074/1862] Make save_default_card method static --- hosting/models.py | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/hosting/models.py b/hosting/models.py index ff116947..7da50294 100644 --- a/hosting/models.py +++ b/hosting/models.py @@ -270,7 +270,8 @@ class UserCardDetail(AssignPermissionsMixin, models.Model): ) return card_detail - def set_default_card(self, stripe_api_cus_id, stripe_source_id): + @staticmethod + def set_default_card(stripe_api_cus_id, stripe_source_id): """ Sets the given stripe source as the default source for the given Stripe customer @@ -283,17 +284,23 @@ class UserCardDetail(AssignPermissionsMixin, models.Model): cu = cus_response['response_object'] cu.default_source = stripe_source_id cu.save() - self.save_default_card(stripe_api_cus_id, stripe_source_id) + UserCardDetail.save_default_card_local( + stripe_api_cus_id, stripe_source_id + ) - def set_default_card_from_stripe(self, stripe_api_cus_id): + @staticmethod + def set_default_card_from_stripe(stripe_api_cus_id): stripe_utils = StripeUtils() cus_response = stripe_utils.get_customer(stripe_api_cus_id) cu = cus_response['response_object'] default_source = cu.default_source if default_source is not None: - self.save_default_card(stripe_api_cus_id, default_source) + UserCardDetail.save_default_card_local( + stripe_api_cus_id, default_source + ) - def save_default_card(self, stripe_api_cus_id, card_id): + @staticmethod + def save_default_card_local(stripe_api_cus_id, card_id): stripe_cust = StripeCustomer.objects.get(stripe_id=stripe_api_cus_id) user_card_detail = UserCardDetail.objects.get( stripe_customer=stripe_cust, card_id=card_id From cac00d4b9e417c0b7e453c1edbb9c565ff0f3651 Mon Sep 17 00:00:00 2001 From: PCoder Date: Sat, 28 Oct 2017 22:19:53 +0200 Subject: [PATCH 0075/1862] Implement select default card functionality --- hosting/views.py | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/hosting/views.py b/hosting/views.py index 8853a8b4..f61a4b19 100644 --- a/hosting/views.py +++ b/hosting/views.py @@ -14,6 +14,7 @@ from django.core.files.base import ContentFile from django.core.urlresolvers import reverse_lazy, reverse from django.http import Http404, HttpResponseRedirect, HttpResponse from django.shortcuts import redirect, render +from django.utils.html import escape from django.utils.http import urlsafe_base64_decode from django.utils.safestring import mark_safe from django.utils.translation import get_language, ugettext_lazy as _ @@ -561,6 +562,22 @@ class SettingsView(LoginRequiredMixin, FormView): return context 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=user_card_detail.card_id + ) + msg = _( + ("Your {brand} card ending in {last4} set as " + "default card").format( + 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: try: card = UserCardDetail.objects.get(pk=self.kwargs.get('pk')) @@ -572,7 +589,7 @@ class SettingsView(LoginRequiredMixin, FormView): card.card_id ) if card.preferred: - card.set_default_card_from_stripe( + UserCardDetail.set_default_card_from_stripe( request.user.stripecustomer.stripe_id ) card.delete() @@ -867,7 +884,7 @@ class OrdersHostingDetailView(LoginRequiredMixin, 'brand': user_card_detail.brand } if not user_card_detail.preferred: - user_card_detail.set_default_card( + UserCardDetail.set_default_card( stripe_api_cus_id=stripe_api_cus_id, stripe_source_id=user_card_detail.card_id ) @@ -917,7 +934,7 @@ class OrdersHostingDetailView(LoginRequiredMixin, stripe_customer=self.request.user.stripecustomer, card_details=card_details_response ) - ucd.save_default_card( + UserCardDetail.save_default_card_local( self.request.user.stripecustomer.stripe_id, ucd.card_id ) From 2a8f02a19795265877b93b0986daa2c3f0b78e25 Mon Sep 17 00:00:00 2001 From: PCoder Date: Sat, 28 Oct 2017 22:32:35 +0200 Subject: [PATCH 0076/1862] Order by preferred and id fields for cards in settings page --- hosting/models.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosting/models.py b/hosting/models.py index 7da50294..9486eae7 100644 --- a/hosting/models.py +++ b/hosting/models.py @@ -226,7 +226,7 @@ class UserCardDetail(AssignPermissionsMixin, models.Model): return cards_list user_card_details = UserCardDetail.objects.filter( stripe_customer_id=stripe_customer.id - ) + ).order_by('-preferred', 'id') for card in user_card_details: cards_list.append({ 'last4': card.last4, 'brand': card.brand, 'id': card.id, From 7e5cab2cc4db84ad12d61cba133d6646034b78e3 Mon Sep 17 00:00:00 2001 From: PCoder Date: Sat, 28 Oct 2017 22:44:58 +0200 Subject: [PATCH 0077/1862] Fix PEP8 warnings --- membership/models.py | 2 -- utils/stripe_utils.py | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/membership/models.py b/membership/models.py index 7ebf00ca..ac4dc1ad 100644 --- a/membership/models.py +++ b/membership/models.py @@ -212,8 +212,6 @@ class StripeCustomer(models.Model): stripe_customer.user, token) if "deleted" in customer and customer["deleted"]: raise StripeCustomer.DoesNotExist() - #if not customer.sources.data: - # stripe_utils.update_customer_token(customer, token) return stripe_customer except StripeCustomer.DoesNotExist: user = CustomUser.objects.get(email=email) diff --git a/utils/stripe_utils.py b/utils/stripe_utils.py index 74b6fa4a..2742045a 100644 --- a/utils/stripe_utils.py +++ b/utils/stripe_utils.py @@ -315,4 +315,4 @@ class StripeUtils(object): """ subscription = stripe.Subscription.retrieve(subscription_id) subscription.metadata = meta_data - subscription.save() \ No newline at end of file + subscription.save() From db8dd9af54d8963a09ee44553f75aa1b73a04a0b Mon Sep 17 00:00:00 2001 From: PCoder Date: Sat, 28 Oct 2017 23:18:10 +0200 Subject: [PATCH 0078/1862] Hosting payment: select card text update --- hosting/templates/hosting/payment.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosting/templates/hosting/payment.html b/hosting/templates/hosting/payment.html index e3331afe..fdc5ad63 100644 --- a/hosting/templates/hosting/payment.html +++ b/hosting/templates/hosting/payment.html @@ -72,7 +72,7 @@

    {% if card_list_len > 0 %} - {% blocktrans %}Please select one of the previous cards that you used or fill in your credit card information below. We are using Stripe for payment and do not store your information in our database.{% endblocktrans %} + {% blocktrans %}Please select one of the previous cards that you used before or fill in your credit card information below. We are using Stripe for payment and do not store your information in our database.{% endblocktrans %} {% else %} {% blocktrans %}Please fill in your credit card information below. We are using Stripe for payment and do not store your information in our database.{% endblocktrans %} {% endif %} From bafb4e7b68b54c3d3dc8f07c91b4931cefa3ddd2 Mon Sep 17 00:00:00 2001 From: PCoder Date: Sat, 28 Oct 2017 23:42:30 +0200 Subject: [PATCH 0079/1862] Remove hasCreditcard js code - not used anymore --- hosting/templates/hosting/payment.html | 9 --------- 1 file changed, 9 deletions(-) diff --git a/hosting/templates/hosting/payment.html b/hosting/templates/hosting/payment.html index fdc5ad63..10fd4674 100644 --- a/hosting/templates/hosting/payment.html +++ b/hosting/templates/hosting/payment.html @@ -116,13 +116,4 @@ })(); {%endif%} - -{% if credit_card_data.last4 and credit_card_data.cc_brand %} - -{%endif%} - {%endblock%} From 248283b369c55b3989c421a93921453d33248f42 Mon Sep 17 00:00:00 2001 From: PCoder Date: Sat, 28 Oct 2017 23:44:06 +0200 Subject: [PATCH 0080/1862] Show user's credit cards dynamically in landing payment page --- .../datacenterlight/landing_payment.html | 35 ++++++++++++++----- datacenterlight/views.py | 11 +++++- 2 files changed, 36 insertions(+), 10 deletions(-) diff --git a/datacenterlight/templates/datacenterlight/landing_payment.html b/datacenterlight/templates/datacenterlight/landing_payment.html index 58246b6a..69c80d35 100644 --- a/datacenterlight/templates/datacenterlight/landing_payment.html +++ b/datacenterlight/templates/datacenterlight/landing_payment.html @@ -84,11 +84,35 @@

    + {% with card_list_len=cards_list|length %}

    {%trans "Credit Card"%}

    + {% if card_list_len > 0 %} + {% blocktrans %}Please select one of the previous cards that you used before or fill in your credit card information below. We are using Stripe for payment and do not store your information in our database.{% endblocktrans %} + {% else %} {% blocktrans %}Please fill in your credit card information below. We are using Stripe for payment and do not store your information in our database.{% endblocktrans %} + {% endif %}

    +
    + {% for card in cards_list %} +
    +
    +
    {% trans "Credit Card" %}
    +
    {% trans "Last" %} 4: ***** {{card.last4}}
    +
    {% trans "Type" %}: {{card.brand}}
    +
    +
    + {% trans "SELECT" %} +
    +
    + {% endfor %} + {% if card_list_len > 0 %} +
    Use another card
    + {% endif %} + {% include "hosting/includes/_card_input.html" %} +
    + {% comment %}
    {% if credit_card_data.last4 %}
    @@ -125,6 +149,8 @@ {% include "hosting/includes/_card_input.html" %} {% endif %}
    + {% endcomment %} + {% endwith %}
    @@ -144,13 +170,4 @@ })(); {%endif%} - -{% if credit_card_data.last4 and credit_card_data.cc_brand %} - -{%endif%} - {%endblock%} diff --git a/datacenterlight/views.py b/datacenterlight/views.py index bd1a7f51..861817e1 100644 --- a/datacenterlight/views.py +++ b/datacenterlight/views.py @@ -14,7 +14,7 @@ from django.views.decorators.cache import cache_control from django.views.generic import FormView, CreateView, TemplateView, DetailView from datacenterlight.tasks import create_vm_task -from hosting.models import HostingOrder +from hosting.models import HostingOrder, UserCardDetail from hosting.forms import HostingUserLoginForm from membership.models import CustomUser, StripeCustomer from opennebula_api.serializers import VMTemplateSerializer @@ -347,6 +347,14 @@ class PaymentOrderView(FormView): def get_context_data(self, **kwargs): context = super(PaymentOrderView, self).get_context_data(**kwargs) + user = self.request.user + if hasattr(user, 'stripecustomer'): + stripe_customer = user.stripecustomer + else: + stripe_customer = None + cards_list = UserCardDetail.get_all_cards_list( + stripe_customer=stripe_customer + ) if 'billing_address_data' in self.request.session: billing_address_data = self.request.session['billing_address_data'] else: @@ -380,6 +388,7 @@ class PaymentOrderView(FormView): ) context.update({ + 'cards_list': cards_list, 'stripe_key': settings.STRIPE_API_PUBLIC_KEY, 'site_url': reverse('datacenterlight:index'), 'login_form': HostingUserLoginForm(prefix='login_form'), From 2ffaee2d5b9722a50ed33e5d6a338df77af5232c Mon Sep 17 00:00:00 2001 From: PCoder Date: Sun, 29 Oct 2017 13:14:29 +0100 Subject: [PATCH 0081/1862] Add clear_items_from_list utility function --- utils/hosting_utils.py | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/utils/hosting_utils.py b/utils/hosting_utils.py index 3c193ad7..9541588d 100644 --- a/utils/hosting_utils.py +++ b/utils/hosting_utils.py @@ -60,3 +60,23 @@ def get_vm_price(cpu, memory, disk_size): :return: The price of the VM """ return (cpu * 5) + (memory * 2) + (disk_size * 0.6) + + +class HostingUtils: + @staticmethod + def clear_items_from_list(from_list, items_list): + """ + A utility function to clear items from a given list. + Useful when deleting items in bulk from session. + e.g.: + HostingUtils.clear_items_from_list( + request.session, + ['token', 'billing_address_data', 'card_id',] + ) + :param from_list: + :param items_list: + :return: + """ + for var in items_list: + if var in from_list: + del from_list[var] From 82ad9ac337a9f9ab83256debecc05160b7379274 Mon Sep 17 00:00:00 2001 From: PCoder Date: Sun, 29 Oct 2017 13:17:26 +0100 Subject: [PATCH 0082/1862] Add selected card handling in landing flow "Order confirmation" page --- datacenterlight/views.py | 172 +++++++++++++++++++++++++++------------ 1 file changed, 122 insertions(+), 50 deletions(-) diff --git a/datacenterlight/views.py b/datacenterlight/views.py index 861817e1..baec4ee6 100644 --- a/datacenterlight/views.py +++ b/datacenterlight/views.py @@ -21,7 +21,7 @@ from opennebula_api.serializers import VMTemplateSerializer from utils.forms import ( BillingAddressForm, BillingAddressFormSignup ) -from utils.hosting_utils import get_vm_price +from utils.hosting_utils import get_vm_price, HostingUtils from utils.mailer import BaseEmail from utils.stripe_utils import StripeUtils from utils.tasks import send_plain_email_task @@ -401,6 +401,13 @@ class PaymentOrderView(FormView): # user is no longer added to session on the index page if 'specs' not in request.session: return HttpResponseRedirect(reverse('datacenterlight:index')) + HostingUtils.clear_items_from_list( + request.session, + ['token', 'billing_address_data', 'card_id', 'customer', + 'user'] + ) + if 'token' in request.session: + del request.session['token'] return self.render_to_response(self.get_context_data()) def post(self, request, *args, **kwargs): @@ -436,8 +443,40 @@ class PaymentOrderView(FormView): 'name': request.user.name } customer = StripeCustomer.get_or_create( - email=this_user.get('email'), - token=token) + email=this_user.get('email'), token=token + ) + if token is '': + # card selected case + card_id = address_form.cleaned_data.get('card') + try: + user_card_detail = UserCardDetail.objects.get( + id=card_id) + if not request.user.has_perm( + 'view_usercarddetail', user_card_detail + ): + raise UserCardDetail.DoesNotExist( + _( + "{user} does not have permission to access the " + "card").format(user=request.user.email) + ) + except UserCardDetail.DoesNotExist as e: + ex = str(e) + logger.error( + "Card Id: {card_id}, Exception: {ex}".format( + card_id=card_id, ex=ex + ) + ) + msg = _("An error occurred. Details: {}".format(ex)) + messages.add_message( + self.request, messages.ERROR, msg, + extra_tags='make_charge_error' + ) + return HttpResponseRedirect( + reverse('hosting:payment') + '#payment_error' + ) + request.session['card_id'] = user_card_detail.id + else: + request.session['token'] = token else: user_email = address_form.cleaned_data.get('email') user_name = address_form.cleaned_data.get('name') @@ -472,7 +511,7 @@ class PaymentOrderView(FormView): email=user_email, token=token, customer_name=user_name) - + request.session['token'] = token request.session['billing_address_data'] = address_form.cleaned_data request.session['user'] = this_user # Get or create stripe customer @@ -485,7 +524,6 @@ class PaymentOrderView(FormView): billing_address_form=address_form ) ) - request.session['token'] = token if type(customer) is StripeCustomer: request.session['customer'] = customer.stripe_id else: @@ -508,27 +546,33 @@ class OrderConfirmationView(DetailView): def get(self, request, *args, **kwargs): if 'specs' not in request.session or 'user' not in request.session: return HttpResponseRedirect(reverse('datacenterlight:index')) - if 'token' not in request.session: + if 'token' not in request.session and 'card_id' not in request.session: return HttpResponseRedirect(reverse('datacenterlight:payment')) - stripe_api_cus_id = request.session.get('customer') - stripe_utils = StripeUtils() - card_details = stripe_utils.get_card_details(stripe_api_cus_id, - request.session.get( - 'token')) - if not card_details.get('response_object'): - msg = card_details.get('error') - messages.add_message(self.request, messages.ERROR, msg, - extra_tags='failed_payment') - return HttpResponseRedirect( - reverse('datacenterlight:payment') + '#payment_error') context = { 'site_url': reverse('datacenterlight:index'), - 'cc_last4': card_details.get('response_object').get('last4'), - 'cc_brand': card_details.get('response_object').get('brand'), 'vm': request.session.get('specs'), 'page_header_text': _('Confirm Order'), 'billing_address_data': request.session.get('billing_address_data') } + if 'token' in request.session: + stripe_utils = StripeUtils() + card_details = stripe_utils.get_cards_details_from_token( + request.session.get('token') + ) + card_detail_resp = card_details.get('response_object') + if not card_detail_resp: + msg = card_details.get('error') + messages.add_message(self.request, messages.ERROR, msg, + extra_tags='failed_payment') + return HttpResponseRedirect( + reverse('datacenterlight:payment') + '#payment_error') + context['cc_last4'] = card_detail_resp.get('last4') + context['cc_brand'] = card_detail_resp.get('brand') + else: + card_id = self.request.session.get('card_id') + card_detail = UserCardDetail.objects.get(id=card_id) + context['cc_last4'] = card_detail.last4 + context['cc_brand'] = card_detail.brand return render(request, self.template_name, context) def post(self, request, *args, **kwargs): @@ -538,43 +582,62 @@ class OrderConfirmationView(DetailView): stripe_api_cus_id = request.session.get('customer') vm_template_id = template.get('id', 1) stripe_utils = StripeUtils() - card_details = stripe_utils.get_card_details(stripe_api_cus_id, - request.session.get( - 'token')) - if not card_details.get('response_object'): - msg = card_details.get('error') - messages.add_message(self.request, messages.ERROR, msg, - extra_tags='failed_payment') - response = { - 'status': False, - 'redirect': "{url}#{section}".format( - url=reverse('datacenterlight:payment'), - section='payment_error'), - 'msg_title': str(_('Error.')), - 'msg_body': str( - _('There was a payment related error.' - ' On close of this popup, you will be redirected back to' - ' the payment page.')) + if 'token' in self.request.session: + card_details = stripe_utils.get_cards_details_from_token( + request.session['token'] + ) + if not card_details.get('response_object'): + msg = card_details.get('error') + messages.add_message(self.request, messages.ERROR, msg, + extra_tags='failed_payment') + response = { + 'status': False, + 'redirect': "{url}#{section}".format( + url=reverse('datacenterlight:payment'), + section='payment_error'), + 'msg_title': str(_('Error.')), + 'msg_body': str( + _('There was a payment related error.' + ' On close of this popup, you will be redirected back to' + ' the payment page.')) + } + return HttpResponse(json.dumps(response), + content_type="application/json") + card_details_dict = card_details.get('response_object') + ucd = UserCardDetail.contains( + request.user.stripecustomer, card_details_dict + ) + if not ucd: + stripe_utils.associate_customer_card( + stripe_api_cus_id, request.session['token'], + set_as_default=True + ) + else: + card_id = request.session.get('card_id') + user_card_detail = UserCardDetail.objects.get(id=card_id) + card_details_dict = { + 'last4': user_card_detail.last4, + 'brand': user_card_detail.brand } - return HttpResponse(json.dumps(response), - content_type="application/json") - card_details_dict = card_details.get('response_object') + if not user_card_detail.preferred: + UserCardDetail.set_default_card( + stripe_api_cus_id=stripe_api_cus_id, + stripe_source_id=user_card_detail.card_id + ) cpu = specs.get('cpu') memory = specs.get('memory') disk_size = specs.get('disk_size') amount_to_be_charged = specs.get('price') - plan_name = StripeUtils.get_stripe_plan_name(cpu=cpu, - memory=memory, - disk_size=disk_size) - stripe_plan_id = StripeUtils.get_stripe_plan_id(cpu=cpu, - ram=memory, - ssd=disk_size, - version=1, - app='dcl') + plan_name = StripeUtils.get_stripe_plan_name( + cpu=cpu, memory=memory, disk_size=disk_size + ) + stripe_plan_id = StripeUtils.get_stripe_plan_id( + cpu=cpu, ram=memory, ssd=disk_size, version=1, app='dcl' + ) stripe_plan = stripe_utils.get_or_create_stripe_plan( - amount=amount_to_be_charged, - name=plan_name, - stripe_plan_id=stripe_plan_id) + amount=amount_to_be_charged, name=plan_name, + stripe_plan_id=stripe_plan_id + ) subscription_result = stripe_utils.subscribe_customer_to_plan( stripe_api_cus_id, [{"plan": stripe_plan.get( @@ -644,6 +707,15 @@ class OrderConfirmationView(DetailView): billing_address_data.update({ 'user': custom_user.id }) + if 'token' in request.session: + ucd = UserCardDetail.get_or_create_user_card_detail( + stripe_customer=self.request.user.stripecustomer, + card_details=card_details_dict + ) + UserCardDetail.save_default_card_local( + self.request.user.stripecustomer.stripe_id, + ucd.card_id + ) user = { 'name': custom_user.name, 'email': custom_user.email, From 23e7edf7c28af39b0d8d93517a47538b5cd1911c Mon Sep 17 00:00:00 2001 From: PCoder Date: Sun, 29 Oct 2017 14:40:15 +0100 Subject: [PATCH 0083/1862] Return True if associate_customer_card runs ok --- utils/stripe_utils.py | 1 + 1 file changed, 1 insertion(+) diff --git a/utils/stripe_utils.py b/utils/stripe_utils.py index 2742045a..cb9ae6fb 100644 --- a/utils/stripe_utils.py +++ b/utils/stripe_utils.py @@ -86,6 +86,7 @@ class StripeUtils(object): if set_as_default: customer.default_source = card.id customer.save() + return True @handleStripeError def dissociate_customer_card(self, stripe_customer_id, card_id): From bea3477d848a8f87526e44ece06df5c0352ee801 Mon Sep 17 00:00:00 2001 From: PCoder Date: Sun, 29 Oct 2017 14:45:14 +0100 Subject: [PATCH 0084/1862] Handle errors related to payment by redirecting to payment page --- datacenterlight/views.py | 39 ++++++++++++++++++++++++++--- hosting/views.py | 54 +++++++++++++++++++++++++++++++++++----- 2 files changed, 84 insertions(+), 9 deletions(-) diff --git a/datacenterlight/views.py b/datacenterlight/views.py index baec4ee6..d9c0fbc1 100644 --- a/datacenterlight/views.py +++ b/datacenterlight/views.py @@ -603,21 +603,46 @@ class OrderConfirmationView(DetailView): } return HttpResponse(json.dumps(response), content_type="application/json") - card_details_dict = card_details.get('response_object') + card_details_response = card_details['response_object'] + card_details_dict = { + 'last4': card_details_response['last4'], + 'brand': card_details_response['brand'], + 'card_id': card_details_response['card_id'] + } ucd = UserCardDetail.contains( request.user.stripecustomer, card_details_dict ) if not ucd: - stripe_utils.associate_customer_card( + acc_result = stripe_utils.associate_customer_card( stripe_api_cus_id, request.session['token'], set_as_default=True ) + if acc_result['response_object'] is None: + response = { + 'status': False, + 'redirect': "{url}#{section}".format( + url=reverse('datacenterlight:payment'), + section='payment_error'), + 'msg_title': str(_('Error.')), + 'msg_body': str( + _('There was a payment related error.' + ' On close of this popup, you will be redirected back to' + ' the payment page.')) + } + logger.error( + "Card association failed. Error {error}".format( + error=acc_result['error'] + ) + ) + return HttpResponse(json.dumps(response), + content_type="application/json") else: card_id = request.session.get('card_id') user_card_detail = UserCardDetail.objects.get(id=card_id) card_details_dict = { 'last4': user_card_detail.last4, - 'brand': user_card_detail.brand + 'brand': user_card_detail.brand, + 'card_id': user_card_detail.card_id } if not user_card_detail.preferred: UserCardDetail.set_default_card( @@ -646,6 +671,14 @@ class OrderConfirmationView(DetailView): # Check if the subscription was approved and is active if (stripe_subscription_obj is None or stripe_subscription_obj.status != 'active'): + if request.user.is_authenticated(): + sac_id = request.user.stripecustomer.stripe_id + else: + sac_id = stripe_api_cus_id + stripe_utils.dissociate_customer_card( + sac_id, + card_details_dict['card_id'] + ) msg = subscription_result.get('error') messages.add_message(self.request, messages.ERROR, msg, extra_tags='failed_payment') diff --git a/hosting/views.py b/hosting/views.py index f61a4b19..6d5c9a78 100644 --- a/hosting/views.py +++ b/hosting/views.py @@ -632,6 +632,18 @@ class SettingsView(LoginRequiredMixin, FormView): msg = _('You seem to have already added this card') messages.add_message(request, messages.ERROR, 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 @@ -645,9 +657,6 @@ class SettingsView(LoginRequiredMixin, FormView): card_id=card['card_id'], preferred=preferred ) - stripe_utils.associate_customer_card( - request.user.stripecustomer.stripe_id, token - ) msg = _( "Successfully associated the card with your account" ) @@ -866,22 +875,48 @@ class OrdersHostingDetailView(LoginRequiredMixin, card_details_response = card_details['response_object'] card_details_dict = { 'last4': card_details_response['last4'], - 'brand': card_details_response['brand'] + 'brand': card_details_response['brand'], + 'card_id': card_details_response['card_id'] } ucd = UserCardDetail.contains( request.user.stripecustomer, card_details_response ) if not ucd: - stripe_utils.associate_customer_card( + acc_result = stripe_utils.associate_customer_card( stripe_api_cus_id, request.session['token'], 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'] + ) + ) + messages.add_message(self.request, messages.ERROR, msg, + extra_tags='failed_payment') + response = { + 'status': False, + 'redirect': "{url}#{section}".format( + url=reverse('hosting:payment'), + section='payment_error'), + 'msg_title': str(_('Error.')), + 'msg_body': str( + _('There was a payment related error.' + ' On close of this popup, you will be redirected' + ' back to the payment page.') + ) + } + return HttpResponse( + json.dumps(response), content_type="application/json" + ) else: card_id = request.session.get('card_id') user_card_detail = UserCardDetail.objects.get(id=card_id) card_details_dict = { 'last4': user_card_detail.last4, - 'brand': user_card_detail.brand + 'brand': user_card_detail.brand, + 'card_id': user_card_detail.card_id } if not user_card_detail.preferred: UserCardDetail.set_default_card( @@ -911,6 +946,13 @@ class OrdersHostingDetailView(LoginRequiredMixin, # Check if the subscription was approved and is active if (stripe_subscription_obj is None or stripe_subscription_obj.status != 'active'): + # At this point, we have created a Stripe API card, but and + # associated it with the customer; but the transaction failed + # due to some reason. So, we dissociate this card. + stripe_utils.dissociate_customer_card( + request.user.stripecustomer.stripe_id, + card_details_dict['card_id'] + ) msg = subscription_result.get('error') messages.add_message(self.request, messages.ERROR, msg, extra_tags='failed_payment') From abe8c9efa52b13f4d87eb07392b63c0d3494a4ad Mon Sep 17 00:00:00 2001 From: PCoder Date: Sun, 29 Oct 2017 15:05:32 +0100 Subject: [PATCH 0085/1862] Add error details to messages datacenterlight landing flow --- datacenterlight/views.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/datacenterlight/views.py b/datacenterlight/views.py index d9c0fbc1..f58b8276 100644 --- a/datacenterlight/views.py +++ b/datacenterlight/views.py @@ -610,7 +610,7 @@ class OrderConfirmationView(DetailView): 'card_id': card_details_response['card_id'] } ucd = UserCardDetail.contains( - request.user.stripecustomer, card_details_dict + request.user.stripecustomer, card_details_response ) if not ucd: acc_result = stripe_utils.associate_customer_card( @@ -618,6 +618,11 @@ class OrderConfirmationView(DetailView): set_as_default=True ) if acc_result['response_object'] is None: + msg = acc_result.get('error') + messages.add_message( + self.request, messages.ERROR, msg, + extra_tags='failed_payment' + ) response = { 'status': False, 'redirect': "{url}#{section}".format( From 63eb7fc0e2278721932adebe114e3cfe7236313e Mon Sep 17 00:00:00 2001 From: PCoder Date: Sun, 29 Oct 2017 21:31:11 +0100 Subject: [PATCH 0086/1862] Rename contains to get_user_card_details --- hosting/models.py | 9 +++++---- hosting/views.py | 4 ++-- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/hosting/models.py b/hosting/models.py index 9486eae7..7a181fe1 100644 --- a/hosting/models.py +++ b/hosting/models.py @@ -312,21 +312,22 @@ class UserCardDetail(AssignPermissionsMixin, models.Model): user_card_detail.save() @staticmethod - def contains(stripe_customer, card_details): + def get_user_card_details(stripe_customer, card_details): """ A utility function to check whether a StripeCustomer is already associated with the card having given details + :param stripe_customer: :param card_details: - :return: + :return: The UserCardDetails object if it exists, False otherwise """ try: - UserCardDetail.objects.get( + ucd = UserCardDetail.objects.get( stripe_customer=stripe_customer, fingerprint=card_details['fingerprint'], exp_month=card_details['exp_month'], exp_year=card_details['exp_year'] ) - return True + return ucd except UserCardDetail.DoesNotExist: return False diff --git a/hosting/views.py b/hosting/views.py index 6d5c9a78..5a9c2e2e 100644 --- a/hosting/views.py +++ b/hosting/views.py @@ -628,7 +628,7 @@ class SettingsView(LoginRequiredMixin, FormView): email=request.user.email, token=token ) card = card_details['response_object'] - if UserCardDetail.contains(stripe_customer, card): + 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) else: @@ -878,7 +878,7 @@ class OrdersHostingDetailView(LoginRequiredMixin, 'brand': card_details_response['brand'], 'card_id': card_details_response['card_id'] } - ucd = UserCardDetail.contains( + ucd = UserCardDetail.get_user_card_details( request.user.stripecustomer, card_details_response ) if not ucd: From af1690b84621322c86fa27a07031d72388da614f Mon Sep 17 00:00:00 2001 From: PCoder Date: Sun, 29 Oct 2017 21:36:12 +0100 Subject: [PATCH 0087/1862] Fix: obtaining stripe_customer in landing flow --- datacenterlight/views.py | 82 ++++++++++++++++++++++------------------ 1 file changed, 46 insertions(+), 36 deletions(-) diff --git a/datacenterlight/views.py b/datacenterlight/views.py index f58b8276..1a817310 100644 --- a/datacenterlight/views.py +++ b/datacenterlight/views.py @@ -403,8 +403,7 @@ class PaymentOrderView(FormView): return HttpResponseRedirect(reverse('datacenterlight:index')) HostingUtils.clear_items_from_list( request.session, - ['token', 'billing_address_data', 'card_id', 'customer', - 'user'] + ['token', 'card_id', 'customer', 'user'] ) if 'token' in request.session: del request.session['token'] @@ -609,38 +608,49 @@ class OrderConfirmationView(DetailView): 'brand': card_details_response['brand'], 'card_id': card_details_response['card_id'] } - ucd = UserCardDetail.contains( - request.user.stripecustomer, card_details_response - ) - if not ucd: - acc_result = stripe_utils.associate_customer_card( - stripe_api_cus_id, request.session['token'], - set_as_default=True - ) - if acc_result['response_object'] is None: - msg = acc_result.get('error') - messages.add_message( - self.request, messages.ERROR, msg, - extra_tags='failed_payment' + s_cus = None + try: + s_cus = StripeCustomer.objects.get(stripe_id=stripe_api_cus_id) + except StripeCustomer.DoesNotExist: + pass + if s_cus: + ucd = UserCardDetail.get_user_card_details(s_cus, card_details_response) + if not ucd: + acc_result = stripe_utils.associate_customer_card( + stripe_api_cus_id, request.session['token'], + set_as_default=True ) - response = { - 'status': False, - 'redirect': "{url}#{section}".format( - url=reverse('datacenterlight:payment'), - section='payment_error'), - 'msg_title': str(_('Error.')), - 'msg_body': str( - _('There was a payment related error.' - ' On close of this popup, you will be redirected back to' - ' the payment page.')) - } - logger.error( - "Card association failed. Error {error}".format( - error=acc_result['error'] + if acc_result['response_object'] is None: + msg = acc_result.get('error') + messages.add_message( + self.request, messages.ERROR, msg, + extra_tags='failed_payment' + ) + response = { + 'status': False, + 'redirect': "{url}#{section}".format( + url=reverse('datacenterlight:payment'), + section='payment_error'), + 'msg_title': str(_('Error.')), + 'msg_body': str( + _('There was a payment related error.' + ' On close of this popup, you will be ' + 'redirected back to the payment page.') + ) + } + logger.error( + "Card association failed. Error {error}".format( + error=acc_result['error'] + ) + ) + return HttpResponse(json.dumps(response), + content_type="application/json") + else: + if not ucd.preferred: + UserCardDetail.set_default_card( + stripe_api_cus_id=stripe_api_cus_id, + stripe_source_id=ucd.card_id ) - ) - return HttpResponse(json.dumps(response), - content_type="application/json") else: card_id = request.session.get('card_id') user_card_detail = UserCardDetail.objects.get(id=card_id) @@ -745,13 +755,13 @@ class OrderConfirmationView(DetailView): billing_address_data.update({ 'user': custom_user.id }) - if 'token' in request.session: + if 'token' in request.session and s_cus is not None: ucd = UserCardDetail.get_or_create_user_card_detail( - stripe_customer=self.request.user.stripecustomer, - card_details=card_details_dict + stripe_customer=s_cus, + card_details=card_details_response ) UserCardDetail.save_default_card_local( - self.request.user.stripecustomer.stripe_id, + s_cus.stripe_id, ucd.card_id ) user = { From 618d0004f2456b236d4d427e98631234ea355922 Mon Sep 17 00:00:00 2001 From: PCoder Date: Sun, 29 Oct 2017 21:41:54 +0100 Subject: [PATCH 0088/1862] Rearrange code --- datacenterlight/views.py | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/datacenterlight/views.py b/datacenterlight/views.py index 1a817310..36ca81d6 100644 --- a/datacenterlight/views.py +++ b/datacenterlight/views.py @@ -451,12 +451,11 @@ class PaymentOrderView(FormView): user_card_detail = UserCardDetail.objects.get( id=card_id) if not request.user.has_perm( - 'view_usercarddetail', user_card_detail + 'view_usercarddetail', user_card_detail ): raise UserCardDetail.DoesNotExist( - _( - "{user} does not have permission to access the " - "card").format(user=request.user.email) + _("{user} does not have permission to access" + " the card").format(user=request.user.email) ) except UserCardDetail.DoesNotExist as e: ex = str(e) @@ -496,9 +495,9 @@ class PaymentOrderView(FormView): ) ) customer = StripeCustomer.create_stripe_api_customer( - email=user_email, - token=token, - customer_name=user_name) + email=user_email, token=token, + customer_name=user_name + ) except CustomUser.DoesNotExist: logger.debug( ("StripeCustomer does not exist for {email}." @@ -597,8 +596,8 @@ class OrderConfirmationView(DetailView): 'msg_title': str(_('Error.')), 'msg_body': str( _('There was a payment related error.' - ' On close of this popup, you will be redirected back to' - ' the payment page.')) + ' On close of this popup, you will be redirected ' + 'back to the payment page.')) } return HttpResponse(json.dumps(response), content_type="application/json") From 3d8f81339b41218e58a2d8f2659d37781188838d Mon Sep 17 00:00:00 2001 From: PCoder Date: Sun, 29 Oct 2017 21:49:15 +0100 Subject: [PATCH 0089/1862] Refactor, reorganize some code --- datacenterlight/views.py | 42 ++++++++++++++++++++++------------------ 1 file changed, 23 insertions(+), 19 deletions(-) diff --git a/datacenterlight/views.py b/datacenterlight/views.py index 36ca81d6..51cd18fd 100644 --- a/datacenterlight/views.py +++ b/datacenterlight/views.py @@ -560,10 +560,13 @@ class OrderConfirmationView(DetailView): card_detail_resp = card_details.get('response_object') if not card_detail_resp: msg = card_details.get('error') - messages.add_message(self.request, messages.ERROR, msg, - extra_tags='failed_payment') + messages.add_message( + self.request, messages.ERROR, msg, + extra_tags='failed_payment' + ) return HttpResponseRedirect( - reverse('datacenterlight:payment') + '#payment_error') + reverse('datacenterlight:payment') + '#payment_error' + ) context['cc_last4'] = card_detail_resp.get('last4') context['cc_brand'] = card_detail_resp.get('brand') else: @@ -586,8 +589,10 @@ class OrderConfirmationView(DetailView): ) if not card_details.get('response_object'): msg = card_details.get('error') - messages.add_message(self.request, messages.ERROR, msg, - extra_tags='failed_payment') + messages.add_message( + self.request, messages.ERROR, msg, + extra_tags='failed_payment' + ) response = { 'status': False, 'redirect': "{url}#{section}".format( @@ -599,8 +604,9 @@ class OrderConfirmationView(DetailView): ' On close of this popup, you will be redirected ' 'back to the payment page.')) } - return HttpResponse(json.dumps(response), - content_type="application/json") + return HttpResponse( + json.dumps(response), content_type="application/json" + ) card_details_response = card_details['response_object'] card_details_dict = { 'last4': card_details_response['last4'], @@ -709,7 +715,6 @@ class OrderConfirmationView(DetailView): } return HttpResponse(json.dumps(response), content_type="application/json") - # Create user if the user is not logged in and if he is not already # registered if not request.user.is_authenticated(): @@ -747,7 +752,6 @@ class OrderConfirmationView(DetailView): # object already exists stripe_customer_id = request.user.stripecustomer.id custom_user = request.user - # Save billing address billing_address_data = request.session.get('billing_address_data') logger.debug('billing_address_data is {}'.format(billing_address_data)) @@ -771,16 +775,16 @@ class OrderConfirmationView(DetailView): 'request_host': request.get_host(), 'language': get_language(), } - - create_vm_task.delay(vm_template_id, user, specs, template, - stripe_customer_id, billing_address_data, - stripe_subscription_obj.id, card_details_dict) - for session_var in ['specs', 'template', 'billing_address', - 'billing_address_data', - 'token', 'customer']: - if session_var in request.session: - del request.session[session_var] - + create_vm_task.delay( + vm_template_id, user, specs, template, stripe_customer_id, + billing_address_data, stripe_subscription_obj.id, + card_details_dict + ) + HostingUtils.clear_items_from_list( + request.session, + ['specs', 'template', 'billing_address', 'billing_address_data', + 'token', 'customer'] + ) response = { 'status': True, 'redirect': reverse( From edac806c118f642b737c7999c02d99643a67b639 Mon Sep 17 00:00:00 2001 From: PCoder Date: Sun, 29 Oct 2017 21:56:29 +0100 Subject: [PATCH 0090/1862] Some more refactoring --- datacenterlight/views.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/datacenterlight/views.py b/datacenterlight/views.py index 51cd18fd..50148418 100644 --- a/datacenterlight/views.py +++ b/datacenterlight/views.py @@ -785,17 +785,18 @@ class OrderConfirmationView(DetailView): ['specs', 'template', 'billing_address', 'billing_address_data', 'token', 'customer'] ) + if request.user.is_authenticated(): + redirect_url = reverse('hosting:virtual_machines') + else: + redirect_url = reverse('datacenterlight:index') response = { 'status': True, - 'redirect': reverse( - 'hosting:virtual_machines') if request.user.is_authenticated() else reverse( - 'datacenterlight:index'), + 'redirect': redirect_url, 'msg_title': str(_('Thank you for the order.')), 'msg_body': str( _('Your VM will be up and running in a few moments.' ' We will send you a confirmation email as soon as' ' it is ready.')) } - return HttpResponse(json.dumps(response), content_type="application/json") From 62f30bf03c37301061b357ab14daa90ea363b648 Mon Sep 17 00:00:00 2001 From: PCoder Date: Sun, 29 Oct 2017 22:03:19 +0100 Subject: [PATCH 0091/1862] Remove some commented and unnecessary code --- .../datacenterlight/landing_payment.html | 38 ------------------- datacenterlight/views.py | 15 -------- hosting/templates/hosting/settings.html | 10 ----- 3 files changed, 63 deletions(-) diff --git a/datacenterlight/templates/datacenterlight/landing_payment.html b/datacenterlight/templates/datacenterlight/landing_payment.html index 69c80d35..5ac601ce 100644 --- a/datacenterlight/templates/datacenterlight/landing_payment.html +++ b/datacenterlight/templates/datacenterlight/landing_payment.html @@ -112,44 +112,6 @@ {% endif %} {% include "hosting/includes/_card_input.html" %} - {% comment %} -
    - {% if credit_card_data.last4 %} - -
    Credit Card
    -
    Last 4: *****{{credit_card_data.last4}}
    -
    Type: {{credit_card_data.cc_brand}}
    - - - {% if not messages and not form.non_field_errors %} -

    - {% trans "You are not making any payment yet. After submitting your card information, you will be taken to the Confirm Order Page." %} -

    - {% endif %} -
    - {% for message in messages %} - {% if 'failed_payment' or 'make_charge_error' in message.tags %} -
      -
    • -

      {{ message|safe }}

      -
      • -
    - {% endif %} - {% endfor %} - {% for error in form.non_field_errors %} -

    - {{ error|escape }} -

    - {% endfor %} -
    -
    - -
    - {% else %} - {% include "hosting/includes/_card_input.html" %} - {% endif %} -
    - {% endcomment %} {% endwith %} diff --git a/datacenterlight/views.py b/datacenterlight/views.py index 50148418..3a8bdac6 100644 --- a/datacenterlight/views.py +++ b/datacenterlight/views.py @@ -359,7 +359,6 @@ class PaymentOrderView(FormView): billing_address_data = self.request.session['billing_address_data'] else: billing_address_data = {} - if self.request.user.is_authenticated(): if billing_address_data: billing_address_form = BillingAddressForm( @@ -369,24 +368,10 @@ class PaymentOrderView(FormView): billing_address_form = BillingAddressForm( instance=self.request.user.billing_addresses.first() ) - # Get user last order - last_hosting_order = HostingOrder.objects.filter( - customer__user=self.request.user - ).last() - - # If user has already an hosting order, get the credit card - # data from it - if last_hosting_order: - credit_card_data = last_hosting_order.get_cc_data() - if credit_card_data: - context['credit_card_data'] = credit_card_data - else: - context['credit_card_data'] = None else: billing_address_form = BillingAddressFormSignup( initial=billing_address_data ) - context.update({ 'cards_list': cards_list, 'stripe_key': settings.STRIPE_API_PUBLIC_KEY, diff --git a/hosting/templates/hosting/settings.html b/hosting/templates/hosting/settings.html index 6b5acbee..64057747 100644 --- a/hosting/templates/hosting/settings.html +++ b/hosting/templates/hosting/settings.html @@ -123,14 +123,4 @@ })(); {%endif%} - - {% comment %} - {% if credit_card_data.last4 and credit_card_data.cc_brand %} - - {%endif%} - {% endcomment %} {%endblock%} From 4be27962703cdb2774e1b0d13842ba3df3b22846 Mon Sep 17 00:00:00 2001 From: PCoder Date: Sun, 29 Oct 2017 22:40:21 +0100 Subject: [PATCH 0092/1862] Clean up some unnecessary code --- datacenterlight/views.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/datacenterlight/views.py b/datacenterlight/views.py index 3a8bdac6..fb34f5b4 100644 --- a/datacenterlight/views.py +++ b/datacenterlight/views.py @@ -348,10 +348,9 @@ class PaymentOrderView(FormView): def get_context_data(self, **kwargs): context = super(PaymentOrderView, self).get_context_data(**kwargs) user = self.request.user + stripe_customer = None if hasattr(user, 'stripecustomer'): stripe_customer = user.stripecustomer - else: - stripe_customer = None cards_list = UserCardDetail.get_all_cards_list( stripe_customer=stripe_customer ) @@ -390,8 +389,6 @@ class PaymentOrderView(FormView): request.session, ['token', 'card_id', 'customer', 'user'] ) - if 'token' in request.session: - del request.session['token'] return self.render_to_response(self.get_context_data()) def post(self, request, *args, **kwargs): From 83dbae74e6a661b649f79d2b691ea8dc73a2e8d2 Mon Sep 17 00:00:00 2001 From: PCoder Date: Sun, 29 Oct 2017 22:54:33 +0100 Subject: [PATCH 0093/1862] Add missing card_id to session variables to be cleared --- datacenterlight/views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/datacenterlight/views.py b/datacenterlight/views.py index fb34f5b4..f9d1dede 100644 --- a/datacenterlight/views.py +++ b/datacenterlight/views.py @@ -765,7 +765,7 @@ class OrderConfirmationView(DetailView): HostingUtils.clear_items_from_list( request.session, ['specs', 'template', 'billing_address', 'billing_address_data', - 'token', 'customer'] + 'token', 'customer', 'card_id'] ) if request.user.is_authenticated(): redirect_url = reverse('hosting:virtual_machines') From 16b6ecb38cdc87737c54e9f51e3ffa7eff51014a Mon Sep 17 00:00:00 2001 From: PCoder Date: Sun, 29 Oct 2017 23:48:33 +0100 Subject: [PATCH 0094/1862] Clear session variables on payment error --- hosting/views.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/hosting/views.py b/hosting/views.py index 5a9c2e2e..37d6eabb 100644 --- a/hosting/views.py +++ b/hosting/views.py @@ -39,7 +39,7 @@ from utils.forms import ( BillingAddressForm, PasswordResetRequestForm, UserBillingAddressForm, ResendActivationEmailForm ) -from utils.hosting_utils import get_vm_price +from utils.hosting_utils import get_vm_price, HostingUtils from utils.mailer import BaseEmail from utils.stripe_utils import StripeUtils from utils.views import ( @@ -707,6 +707,10 @@ class PaymentVMView(LoginRequiredMixin, FormView): def get(self, request, *args, **kwargs): if 'next' in request.session: del request.session['next'] + HostingUtils.clear_items_from_list( + request.session, + ['token', 'card_id', 'customer', 'user'] + ) return self.render_to_response(self.get_context_data()) def post(self, request, *args, **kwargs): From 24d904288fd0724178af021fcbeec01fadf54947 Mon Sep 17 00:00:00 2001 From: PCoder Date: Mon, 30 Oct 2017 00:26:18 +0100 Subject: [PATCH 0095/1862] Clear token and card form variables explicitly --- datacenterlight/views.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/datacenterlight/views.py b/datacenterlight/views.py index f9d1dede..f2af35cd 100644 --- a/datacenterlight/views.py +++ b/datacenterlight/views.py @@ -356,6 +356,10 @@ class PaymentOrderView(FormView): ) if 'billing_address_data' in self.request.session: billing_address_data = self.request.session['billing_address_data'] + if 'token' in billing_address_data: + billing_address_data.pop('token') + if 'card' in billing_address_data: + billing_address_data.pop('card') else: billing_address_data = {} if self.request.user.is_authenticated(): From a2a35a9475eb6bafd7d6d70d991416a21caab0f4 Mon Sep 17 00:00:00 2001 From: PCoder Date: Mon, 30 Oct 2017 08:26:35 +0100 Subject: [PATCH 0096/1862] Fix error accessing stripecustomer for user when it doesn't exist --- hosting/views.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/hosting/views.py b/hosting/views.py index 37d6eabb..3b259242 100644 --- a/hosting/views.py +++ b/hosting/views.py @@ -552,8 +552,11 @@ class SettingsView(LoginRequiredMixin, FormView): def get_context_data(self, **kwargs): context = super(SettingsView, self).get_context_data(**kwargs) user = self.request.user + stripe_customer = None + if hasattr(user, 'stripecustomer'): + stripe_customer = user.stripecustomer cards_list = UserCardDetail.get_all_cards_list( - stripe_customer=user.stripecustomer + stripe_customer=stripe_customer ) context.update({ 'cards_list': cards_list, From 3e08760e044bfed66cb1363a4bfcb8de95b93d52 Mon Sep 17 00:00:00 2001 From: PCoder Date: Tue, 31 Oct 2017 08:58:43 +0100 Subject: [PATCH 0097/1862] Change letter-spacing to 2px for settings-container buttons --- hosting/static/hosting/css/commons.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosting/static/hosting/css/commons.css b/hosting/static/hosting/css/commons.css index 33381370..32a1338e 100644 --- a/hosting/static/hosting/css/commons.css +++ b/hosting/static/hosting/css/commons.css @@ -363,7 +363,7 @@ } .settings-container .choice-btn { - letter-spacing: 1px; + letter-spacing: 2px; min-width: 127px; } From d8ce0f95c5d92d2c9648051e5cef5f54f03ce04b Mon Sep 17 00:00:00 2001 From: PCoder Date: Tue, 31 Oct 2017 09:02:07 +0100 Subject: [PATCH 0098/1862] Change letter-spacing to 2px for btn-vm-contact --- hosting/static/hosting/css/virtual-machine.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosting/static/hosting/css/virtual-machine.css b/hosting/static/hosting/css/virtual-machine.css index 3329d6fe..5f91fe2f 100644 --- a/hosting/static/hosting/css/virtual-machine.css +++ b/hosting/static/hosting/css/virtual-machine.css @@ -413,7 +413,7 @@ border: 2px solid #A3C0E2; padding: 5px 25px; font-size: 12px; - letter-spacing: 1.3px; + letter-spacing: 2px; } .btn-vm-contact:hover, .btn-vm-contact:focus { background: #fff; From f9bd8493330cd809f4c47ea98e7c21ba8b1fb1cd Mon Sep 17 00:00:00 2001 From: PCoder Date: Tue, 31 Oct 2017 09:05:49 +0100 Subject: [PATCH 0099/1862] Remove redundant "previous" text --- .../templates/datacenterlight/landing_payment.html | 4 ++-- hosting/templates/hosting/payment.html | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/datacenterlight/templates/datacenterlight/landing_payment.html b/datacenterlight/templates/datacenterlight/landing_payment.html index 5ac601ce..e0bd56a9 100644 --- a/datacenterlight/templates/datacenterlight/landing_payment.html +++ b/datacenterlight/templates/datacenterlight/landing_payment.html @@ -89,7 +89,7 @@

    {% if card_list_len > 0 %} - {% blocktrans %}Please select one of the previous cards that you used before or fill in your credit card information below. We are using Stripe for payment and do not store your information in our database.{% endblocktrans %} + {% blocktrans %}Please select one of the cards that you used before or fill in your credit card information below. We are using Stripe for payment and do not store your information in our database.{% endblocktrans %} {% else %} {% blocktrans %}Please fill in your credit card information below. We are using Stripe for payment and do not store your information in our database.{% endblocktrans %} {% endif %} @@ -108,7 +108,7 @@ {% endfor %} {% if card_list_len > 0 %} -

    Use another card
    +
    {% trans "Use another card" %}
    {% endif %} {% include "hosting/includes/_card_input.html" %} diff --git a/hosting/templates/hosting/payment.html b/hosting/templates/hosting/payment.html index 10fd4674..a321b44c 100644 --- a/hosting/templates/hosting/payment.html +++ b/hosting/templates/hosting/payment.html @@ -72,7 +72,7 @@

    {% if card_list_len > 0 %} - {% blocktrans %}Please select one of the previous cards that you used before or fill in your credit card information below. We are using Stripe for payment and do not store your information in our database.{% endblocktrans %} + {% blocktrans %}Please select one of the cards that you used before or fill in your credit card information below. We are using Stripe for payment and do not store your information in our database.{% endblocktrans %} {% else %} {% blocktrans %}Please fill in your credit card information below. We are using Stripe for payment and do not store your information in our database.{% endblocktrans %} {% endif %} @@ -91,7 +91,7 @@

    {% endfor %} {% if card_list_len > 0 %} -
    Use another card
    +
    {% trans "Use another card" %}
    {% endif %} {% include "hosting/includes/_card_input.html" %} From c438c0d8cbab7d8518d929cc675fa5d8fc5d1d13 Mon Sep 17 00:00:00 2001 From: PCoder Date: Tue, 31 Oct 2017 09:38:36 +0100 Subject: [PATCH 0100/1862] Add some de translations --- .../locale/de/LC_MESSAGES/django.po | 48 +++++++--- hosting/locale/de/LC_MESSAGES/django.po | 87 +++++++++++++++---- 2 files changed, 108 insertions(+), 27 deletions(-) diff --git a/datacenterlight/locale/de/LC_MESSAGES/django.po b/datacenterlight/locale/de/LC_MESSAGES/django.po index 3b8c9ca6..2fe8dba8 100644 --- a/datacenterlight/locale/de/LC_MESSAGES/django.po +++ b/datacenterlight/locale/de/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-10-17 00:32+0530\n" +"POT-Creation-Date: 2017-10-31 08:23+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -345,6 +345,17 @@ msgstr "Monat" msgid "Credit Card" msgstr "Kreditkarte" +msgid "" +"Please select one of the cards that you used before or fill in your credit " +"card information below. We are using Stripe for payment and do not store your information in our " +"database." +msgstr "" +"Bitte wähle Seine der Karten aus, die du zuvor verwendet hast, oder gib " +"deine Kreditkartendaten unten ein. Wir verwenden Stripe als " +"Zahlungdiensleister und speichern deine Daten nicht in unserer Datenbank." + msgid "" "Please fill in your credit card information below. We are using Stripe for payment and do not " @@ -354,12 +365,17 @@ msgstr "" "\"https://stripe.com\" target=\"_blank\">Stripe für die Bezahlung und " "speichern keine Informationen in unserer Datenbank." -msgid "" -"You are not making any payment yet. After submitting your card information, " -"you will be taken to the Confirm Order Page." -msgstr "" -"Es wird noch keine Bezahlung vorgenommen. Die Bezahlung wird erst ausgelöst, " -"nachdem Du die Bestellung auf der nächsten Seite bestätigt hast." +msgid "Last" +msgstr "Vor" + +msgid "Type" +msgstr "Kartentyp" + +msgid "SELECT" +msgstr "Auswählen" + +msgid "Use another card" +msgstr "Benutze eine andere Kreditkarte" msgid "Processing" msgstr "Weiter" @@ -471,6 +487,13 @@ msgstr "Ungültige RAM-Grösse" msgid "Invalid storage size" msgstr "Ungültige Speicher-Grösse" +#, python-brace-format +msgid "{user} does not have permission to access the card" +msgstr "" + +msgid "An error occurred. Details: {}" +msgstr "" + msgid "Confirm Order" msgstr "Bestellung Bestätigen" @@ -494,15 +517,20 @@ msgstr "" "Deine VM ist gleich bereit. Wir senden Dir eine Bestätigungsemail, sobald Du " "auf sie zugreifen kannst." +#~ msgid "" +#~ "You are not making any payment yet. After submitting your card " +#~ "information, you will be taken to the Confirm Order Page." +#~ msgstr "" +#~ "Es wird noch keine Bezahlung vorgenommen. Die Bezahlung wird erst " +#~ "ausgelöst, nachdem Du die Bestellung auf der nächsten Seite bestätigt " +#~ "hast." + #~ msgid "Card Number" #~ msgstr "Kreditkartennummer" #~ msgid "Expiry Date" #~ msgstr "Ablaufdatum" -#~ msgid "Card Type" -#~ msgstr "Kartentyp" - #~ msgid "Processing..." #~ msgstr "Abarbeitung..." diff --git a/hosting/locale/de/LC_MESSAGES/django.po b/hosting/locale/de/LC_MESSAGES/django.po index 64e4a73e..3614dc49 100644 --- a/hosting/locale/de/LC_MESSAGES/django.po +++ b/hosting/locale/de/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-10-17 00:32+0530\n" +"POT-Creation-Date: 2017-10-31 08:23+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -437,6 +437,17 @@ msgstr "inkl. Mehrwertsteuer" msgid "Billing Address" msgstr "Rechnungsadresse" +msgid "" +"Please select one of the cards that you used before or fill in your credit " +"card information below. We are using Stripe for payment and do not store your information in our " +"database." +msgstr "" +"Bitte wähle Seine der Karten aus, die du zuvor verwendet hast, oder gib " +"deine Kreditkartendaten unten ein. Wir verwenden Stripe als " +"Zahlungdiensleister und speichern deine Daten nicht in unserer Datenbank." + msgid "" "Please fill in your credit card information below. We are using Stripe for payment and do not " @@ -446,12 +457,17 @@ msgstr "" "\"https://stripe.com\" target=\"_blank\">Stripe für die Bezahlung und " "speichern keine Informationen in unserer Datenbank." -msgid "" -"You are not making any payment yet. After submitting your card information, " -"you will be taken to the Confirm Order Page." -msgstr "" -"Es wird noch keine Bezahlung vorgenommen. Die Bezahlung wird erst ausgelöst, " -"nachdem Du die Bestellung auf der nächsten Seite bestätigt hast." +msgid "Last" +msgstr "Vor" + +msgid "Type" +msgstr "Kartentyp" + +msgid "SELECT" +msgstr "Auswählen" + +msgid "Use another card" +msgstr "Benutze eine andere Kreditkarte" msgid "Processing" msgstr "Weiter" @@ -468,16 +484,19 @@ msgstr "Passwort zurücksetzen" msgid "UPDATE" msgstr "" -msgid "Last" -msgstr "" - -msgid "Type" -msgstr "Kartentyp" - msgid "REMOVE CARD" msgstr "KARTE ENTFERNEN" -msgid "SELECT" +msgid "Remove Card" +msgstr "Karte Entfernen" + +msgid "Do you want to remove this associated card?" +msgstr "" + +msgid "Delete" +msgstr "Löschen" + +msgid "DEFAULT" msgstr "" msgid "No Credit Cards Added" @@ -534,9 +553,6 @@ msgstr "" msgid "Private Key" msgstr "" -msgid "Delete" -msgstr "Löschen" - msgid "Delete SSH Key" msgstr "SSH Key löschen" @@ -668,6 +684,35 @@ 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 "Card deassociation successful" +msgstr "" + +msgid "You are not permitted to do this operation" +msgstr "" + +msgid "The selected card does not exist" +msgstr "" + +msgid "Billing address updated successfully" +msgstr "" + +msgid "You seem to have already added this card" +msgstr "" + +#, python-brace-format +msgid "An error occurred while associating the card. Details: {details}" +msgstr "Beim Zuordnen der Karte ist ein Fehler aufgetreten. Details: {details}" + +msgid "Successfully associated the card with your account" +msgstr "" + +#, python-brace-format +msgid "{user} does not have permission to access the card" +msgstr "" + +msgid "An error occurred. Details: {}" +msgstr "" + msgid "Invalid credit card" msgstr "Ungültige Kreditkarte" @@ -735,6 +780,14 @@ msgstr "" "Es gab einen Fehler bei der Bearbeitung Deine Anfrage. Bitte versuche es " "noch einmal." +#~ msgid "" +#~ "You are not making any payment yet. After submitting your card " +#~ "information, you will be taken to the Confirm Order Page." +#~ msgstr "" +#~ "Es wird noch keine Bezahlung vorgenommen. Die Bezahlung wird erst " +#~ "ausgelöst, nachdem Du die Bestellung auf der nächsten Seite bestätigt " +#~ "hast." + #~ msgid "Reset your password" #~ msgstr "Passwort zurücksetzen" From 07dfd3d67533c6ca72d5d1c45f26d1a60b5cfa5e Mon Sep 17 00:00:00 2001 From: Arvind Tiwari Date: Tue, 31 Oct 2017 15:10:10 +0530 Subject: [PATCH 0101/1862] images changed to something more relatable --- ungleich_page/templates/ungleich_page/includes/_about.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ungleich_page/templates/ungleich_page/includes/_about.html b/ungleich_page/templates/ungleich_page/includes/_about.html index 37fc378a..e01b22e3 100644 --- a/ungleich_page/templates/ungleich_page/includes/_about.html +++ b/ungleich_page/templates/ungleich_page/includes/_about.html @@ -81,7 +81,7 @@
  • - +
    @@ -94,7 +94,7 @@
  • - +
    From 372f015760891a6442c67bdcb10ad8cb1b24205d Mon Sep 17 00:00:00 2001 From: Arvind Tiwari Date: Tue, 31 Oct 2017 20:50:15 +0530 Subject: [PATCH 0102/1862] translation fix --- hosting/locale/de/LC_MESSAGES/django.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosting/locale/de/LC_MESSAGES/django.po b/hosting/locale/de/LC_MESSAGES/django.po index 9bb4a7be..2be2ae6d 100644 --- a/hosting/locale/de/LC_MESSAGES/django.po +++ b/hosting/locale/de/LC_MESSAGES/django.po @@ -34,7 +34,7 @@ msgid "Password" msgstr "Passwort" msgid "Enter your name or company name" -msgstr "Geben Sie Ihren Namen oder der Ihrer Firma ein" +msgstr "Gib Deinen Namen oder den Name Deines Unternehmens ein" msgid "Paste here your public key" msgstr "Füge Deinen Public Key ein" From b8d0ca17d77770a6a6b5bd1c21cac78d561d37f2 Mon Sep 17 00:00:00 2001 From: Arvind Tiwari Date: Tue, 31 Oct 2017 21:01:54 +0530 Subject: [PATCH 0103/1862] translation fix in utils.forms --- utils/locale/de/LC_MESSAGES/django.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/locale/de/LC_MESSAGES/django.po b/utils/locale/de/LC_MESSAGES/django.po index 8a961e7a..f18fc9c2 100644 --- a/utils/locale/de/LC_MESSAGES/django.po +++ b/utils/locale/de/LC_MESSAGES/django.po @@ -736,7 +736,7 @@ msgid "Unknown or unspecified country" msgstr "" msgid "Enter your name or company name" -msgstr "Geben Sie Ihren Namen oder der Ihrer Firma ein" +msgstr "Gib Deinen Namen oder den Name Deines Unternehmens ein" msgid "Your username and/or password were incorrect." msgstr "Dein Benutzername und/oder Dein Passwort ist falsch." From 16f8ab6eccc76bfb647a38d61aebf9d8c785b6b3 Mon Sep 17 00:00:00 2001 From: Arvind Tiwari Date: Wed, 1 Nov 2017 02:50:47 +0530 Subject: [PATCH 0104/1862] ungleich landing page animation delay reduced, direction changed --- .../static/ungleich_page/js/ungleich.js | 6 +-- .../ungleich_page/includes/_about.html | 5 +-- .../ungleich_page/includes/_contact_us.html | 10 +---- .../ungleich_page/includes/_portfolio.html | 6 +-- .../ungleich_page/includes/_services.html | 45 +++++++++---------- 5 files changed, 31 insertions(+), 41 deletions(-) diff --git a/ungleich_page/static/ungleich_page/js/ungleich.js b/ungleich_page/static/ungleich_page/js/ungleich.js index e5e4ed34..ca6a71e3 100644 --- a/ungleich_page/static/ungleich_page/js/ungleich.js +++ b/ungleich_page/static/ungleich_page/js/ungleich.js @@ -2,16 +2,16 @@ $(function(){ new WOW().init(); - $('.img-toggle').one('mouseover', toggleImage); + $('.img-toggle').one('mouseenter', toggleImage); }); function toggleImage(e) { var $this = $(this), toggle_img = $this.attr('data-replaced'), current_img = $this.attr('src'); - $this.fadeOut(600, function() { + $this.fadeOut(200, function() { $this.attr('src', toggle_img); $this.attr('data-replaced', current_img); - $this.fadeIn(900); + $this.fadeIn(300); }); }; diff --git a/ungleich_page/templates/ungleich_page/includes/_about.html b/ungleich_page/templates/ungleich_page/includes/_about.html index 0b8218d9..b2bd393f 100644 --- a/ungleich_page/templates/ungleich_page/includes/_about.html +++ b/ungleich_page/templates/ungleich_page/includes/_about.html @@ -1,5 +1,4 @@ -{% load static %} -{% load i18n %} +{% load static i18n %}
    @@ -32,7 +31,7 @@

    {% trans "ungleich founded" %}

    -

    {% trans "in Switzerland" %}

    +

    {% trans "in Switzerland" %}

    • diff --git a/ungleich_page/templates/ungleich_page/includes/_contact_us.html b/ungleich_page/templates/ungleich_page/includes/_contact_us.html index 5c4d2da0..a104fbb3 100644 --- a/ungleich_page/templates/ungleich_page/includes/_contact_us.html +++ b/ungleich_page/templates/ungleich_page/includes/_contact_us.html @@ -8,7 +8,7 @@ {% for message in messages %} {% endfor %} @@ -16,7 +16,7 @@

    {% trans "Join us at" %} {% trans "Digital Glarus" %}, + href="{% url 'digitalglarus:landing' %}">{% trans "Digital Glarus" %}, {% trans "a great co-working space in the middle of Alps!" %}

    {% trans "You can contact us at" %}

    info@ungleich.ch @@ -62,12 +62,6 @@ --> -

     

    - -
    -
    - -
    \ No newline at end of file diff --git a/ungleich_page/templates/ungleich_page/includes/_portfolio.html b/ungleich_page/templates/ungleich_page/includes/_portfolio.html index 0df3b4c2..2c439a5d 100644 --- a/ungleich_page/templates/ungleich_page/includes/_portfolio.html +++ b/ungleich_page/templates/ungleich_page/includes/_portfolio.html @@ -10,7 +10,7 @@
    -
    +

    {% trans "Data Center Light" %}

    @@ -18,7 +18,7 @@

    {% trans "We offer the most affordable hosting in Switzerland. Data Center Light has full FOSS stack, 100% IPv6 and 100% SSD. Choose any configuration among CentOS, Debian, Ubuntu, Devuan, and FreeBSD." %}

    -
    +

    {% trans "Rails Hosting" %}

    @@ -26,7 +26,7 @@

    {% trans "Ready to go live with your Ruby on Rails application? We offer you ready-to-deploy virtual machines or configure your existing infrastructure for Ruby on Rails." %}

    -
    +

    {% trans "High Speed Internet" %}

    diff --git a/ungleich_page/templates/ungleich_page/includes/_services.html b/ungleich_page/templates/ungleich_page/includes/_services.html index 5a0ef848..2c3a8f62 100644 --- a/ungleich_page/templates/ungleich_page/includes/_services.html +++ b/ungleich_page/templates/ungleich_page/includes/_services.html @@ -2,48 +2,45 @@ {% load i18n %}
    -
    -
    -
    -

    {% trans "our services" %}

    -

    - {% trans "We support our clients in all areas of Unix infrastructure." %}
    - {% trans "Our top notch configuration management is refreshingly simple and reliable." %} -

    -
    -
    +
    +
    +

    {% trans "our services" %}

    +

    + {% trans "We support our clients in all areas of Unix infrastructure." %}
    + {% trans "Our top notch configuration management is refreshingly simple and reliable." %} +

    +
    -
    +
    -

    {% trans "Hosting" %}

    -

     

    -

    {% trans "Ruby on Rails. Java hosting, Django hosting, we make it everything run smooth and safe." %}

    +

    {% trans "Hosting" %}

    +

     

    +

    {% trans "Ruby on Rails. Java hosting, Django hosting, we make it everything run smooth and safe." %}

    -
    +
    -

    {% trans "Configuration as a Service" %}

    -

     

    -

    {% trans "Ruby on Rails, Django, Java, Webserver, Mailserver, any infrastructure that needs to configured, we provide comprehensive solutions. Amazon, rackspace or bare metal servers, we configure for you." %}

    -

     

    +

    {% trans "Configuration as a Service" %}

    +

     

    +

    {% trans "Ruby on Rails, Django, Java, Webserver, Mailserver, any infrastructure that needs to configured, we provide comprehensive solutions. Amazon, rackspace or bare metal servers, we configure for you." %}

    -
    +
    -

    {% trans "Linux System Engineering" %}

    -

     

    -

    {% trans "Let your developers develop! We take care of your system administration. Gentoo, Archlinux, Debian, Ubuntu, and many more." %}

    +

    {% trans "Linux System Engineering" %}

    +

     

    +

    {% trans "Let your developers develop! We take care of your system administration. Gentoo, Archlinux, Debian, Ubuntu, and many more." %}

    -
    +
    From 0d3258dbbac602364805da05445e9f47faad0c4f Mon Sep 17 00:00:00 2001 From: Arvind Tiwari Date: Wed, 1 Nov 2017 03:05:47 +0530 Subject: [PATCH 0105/1862] navbar brand icon padding fixed --- ungleich_page/static/ungleich_page/css/agency.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ungleich_page/static/ungleich_page/css/agency.css b/ungleich_page/static/ungleich_page/css/agency.css index c898aa9f..8e6f4155 100755 --- a/ungleich_page/static/ungleich_page/css/agency.css +++ b/ungleich_page/static/ungleich_page/css/agency.css @@ -264,7 +264,8 @@ fieldset[disabled] .btn-xl.active { } .navbar-default.navbar-shrink .navbar-brand { - font-size: 1.5em; + font-size: 1.5em; + padding: 8px; } } From fcc22945a47857ecb48a880b45aaf4ed4ab67d0c Mon Sep 17 00:00:00 2001 From: Arvind Tiwari Date: Thu, 2 Nov 2017 23:49:38 +0530 Subject: [PATCH 0106/1862] digitalglarus landing page animation direction changed, bootstrap grid fix --- .../static/digitalglarus/css/ungleich.css | 2 +- .../templates/digitalglarus/index.html | 786 +++++++++--------- 2 files changed, 386 insertions(+), 402 deletions(-) diff --git a/digitalglarus/static/digitalglarus/css/ungleich.css b/digitalglarus/static/digitalglarus/css/ungleich.css index 03a2b47c..0b47b04f 100644 --- a/digitalglarus/static/digitalglarus/css/ungleich.css +++ b/digitalglarus/static/digitalglarus/css/ungleich.css @@ -1,4 +1,4 @@ -#page-top #services .container .row .col-lg-12.text-center .section-heading { +#page-top #services .section-heading { font-style: normal; color: #494949; padding-top: 50px; diff --git a/digitalglarus/templates/digitalglarus/index.html b/digitalglarus/templates/digitalglarus/index.html index b57e54b5..504af551 100644 --- a/digitalglarus/templates/digitalglarus/index.html +++ b/digitalglarus/templates/digitalglarus/index.html @@ -3,251 +3,255 @@ {% block content %} - -
    -
    -
    -

    -

    -
    - - Where great minds work - -
    -
    -
    - -
    -

    - Book a date today and dive in

    - Join now - - -
    + - - -
    - - -
    -
    -
    -
    -
    -
    -
    Partner of
    -
    -
    -
    + +
    +
    +
    +
    + + Where great minds work + +
    -
    +
    + +
    +

    Book a date today and dive in

    + Join now + + {% comment %} +
    +
    + + +
    + + +
    +
    + +
    + {% endcomment %} +
    + +
    + + + +
    +
    +
    +
    Partner of
    +
    + + + +
    +
    +

    In Digital Glarus you can..

    -
    - -
    -
    -
    - + + +
    +
    +
    + +
    -
    -
    -
    - +
    +
    + +
    -
    -
    -
    - +
    +
    + +
    -
    -
    -
    - -
    -
    -
    -
    -
    - +
    +
    + +
    -
    -
    -
    - -
    -
    -
    -
    - -
    -
    -
    -
    - +
    +
    +
    + +
    +
    +
    +
    + +
    +
    +
    +
    + +
    +
    +
    +
    + +
    +
    - -
    -
    - -
      + +
      +
      + +
      3. -
      +
    - -
    + +

    - When we first moved our company HQ to Glarus, - we couldn't believe how beautiful and peaceful - a workplace could be. Then we thought, we can't be - the only ones appreciating it, more people should + When we first moved our company HQ to Glarus, + we couldn't believe how beautiful and peaceful + a workplace could be. Then we thought, we can't be + the only ones appreciating it, more people should know about this.

    @@ -256,13 +260,13 @@

    - After my first visit to Digital Glarus, I felt - right at home and at peace. Now that 200ok has a - mountain-side office, our meetings, workshops and - code-retreats are so much more intense and productive - for everyone. And in the end, when people came - over from the city for work, they want to come back - real soon, because it just feels like going on vacation. + After my first visit to Digital Glarus, I felt + right at home and at peace. Now that 200ok has a + mountain-side office, our meetings, workshops and + code-retreats are so much more intense and productive + for everyone. And in the end, when people came + over from the city for work, they want to come back + real soon, because it just feels like going on vacation.

    - Alain Lafon , CEO of 200ok GmbH @@ -270,219 +274,199 @@

    - You get on the train from the city and in an hour - you arrive at a completely different environment. - Just looking around, is amazing.We have this beautiful - nature like on a holiday, but it is still a working - environment and you can really focus and be productive. + You get on the train from the city and in an hour + you arrive at a completely different environment. + Just looking around, is amazing.We have this beautiful + nature like on a holiday, but it is still a working + environment and you can really focus and be productive. I really like this building. it's full of old charm.

    - Gregor Martius, Swiss Federal Institute for Forest, Snow and Landscape Research WSL

    -
    -
    - -
    +
    +
    + +
    - - -
    + +
    -
    -
    - - -
    -
      -
    • - + +
      +
      +
        +
      • +
        - - -
        -
        • -
      -
      excursions
      - -
      - -
      +
      +
      • +
    +
    excursions
    +
    + +
    • -
      -
      - -
      +
      +
      +
    -
    enjoy the great outdoors
    -
    +
    enjoy the great outdoors
    +
    - -
    -
      -
    • - -
      -
      - -
      -
      • -
    -
    cultural events
    -
    - -
    -
      -
    • - -
      -
      - -
      -
      • -
    -
    be inspired
    -
    - - - -
    -
      -
    • - +
      +
        +
      • +
        -
        • -
      -
      workshops
      -
      +
      • +
    +
    cultural events
    +
    -
    -
      -
    • - +
      +
        +
      • +
        -
        -
        • -
      -
      recharge
      +
      +
      • +
    +
    be inspired
    +
    + +
    +
      +
    • + +
      +
      +
      +
      • +
    +
    workshops
    +
    + +
    +
      +
    • + +
      +
      +
      +
      • +
    +
    recharge
    +
    - - - -
    +
    - - - - - - - - -
    -
    -
    -
    -

    Contact Us

    -
    -
    -
    - Digital Glarus
    - In der Au 7 Schwanden 8762 Switzerland -
    info@digitalglarus.ch + +
    + + + + +
    + +
    +
    + Lorawan meetup :
    + connect with like-minded people and discuss your latest tech obsession. +
    +
    +
    + +
    +
    + Cooking and Hacking at Digital Chalet Schwanden +
    +
    +
    + +
    +
    + Dive into the beautiful nature around you anytime you want +
    +
    +
    + + + + + + + + +
    + +
    +
    +
    +
    +
    +

    Contact Us

    +
    + +
    +
    + Digital Glarus
    + In der Au 7 Schwanden 8762 Switzerland +
    info@digitalglarus.ch +
    + (044) 534-66-22 +

     

    +     +
    +

     

    +
    +
    +
    +
    +
    - - - - - @@ -41,37 +41,37 @@

    the story of Digital Glarus

    - +

    In search for a better environment for creativity, ungleich arrived at a small village in Glarus. First we were driven by the cheap real estate price, then we were genuinely surprised by the beauty of its nature. People were incredibly friendly as well. Working just became so relaxed and enjoyable in such a beautiful - surrounding..How come we are the only ones here?! We can't be + surrounding..How come we are the only ones here?! We can't be enjoying this alone, we need to let others know about this great - place. That's how it all started... -

    + place. That's how it all started... +

    we fell in love

    - +

    - We didn't see this coming, but we really fell in love with Glarus. The lakes, the mountains, the mist, the (amazing) snow, - the fresh air, the stream, the people, the stars...how could we not? And before long, we found an 100 something years old house, - formerly a family home, but long time unused, next to a river in - Schwanden. Full of old furniture, the house and the neighborhood - was stepping in a time machine. There, we found our first + We didn't see this coming, but we really fell in love with Glarus. The lakes, the mountains, the mist, the (amazing) snow, + the fresh air, the stream, the people, the stars...how could we not? And before long, we found an 100 something years old house, + formerly a family home, but long time unused, next to a river in + Schwanden. Full of old furniture, the house and the neighborhood + was stepping in a time machine. There, we found our first coworking space in Glarus.

    Our crowdfunding success

    - +

    - What comes with a very old house? Lots of charm, yes. Great + What comes with a very old house? Lots of charm, yes. Great history, yes. A contract stating that we can park our goats in the - storage room, yes. And, yes, tons of things to be fixed. We - couldn't afford much of renovation-we are a young start up rich - with creativity but not much money (yet)-that is why we decided to ask for help. To our surprise, generous people found hope and - inspiration from our project. We got much supports from people we - know and we don't know. People wrote to us, called us, met us. We - were on the cover of newspaper. We were on TV. We became the talk + storage room, yes. And, yes, tons of things to be fixed. We + couldn't afford much of renovation-we are a young start up rich + with creativity but not much money (yet)-that is why we decided to ask for help. To our surprise, generous people found hope and + inspiration from our project. We got much supports from people we + know and we don't know. People wrote to us, called us, met us. We + were on the cover of newspaper. We were on TV. We became the talk of the town.

    @@ -80,11 +80,11 @@

    And the story continues..!

    - With the money we raised from our crowdfunding campaign, we - started renovating the hourse, ripping floors off and fixing + With the money we raised from our crowdfunding campaign, we + started renovating the hourse, ripping floors off and fixing walls, giving a fresh coat of paint on old walls. We hired Samuel, - who came to Glarus as a refugee from Eritrea, as our intern to - renovate the house and learn computer science. We opened our door for students to live. Our coworking space is growing slowly but + who came to Glarus as a refugee from Eritrea, as our intern to + renovate the house and learn computer science. We opened our door for students to live. Our coworking space is growing slowly but meaningfully. Our journey only started!

    @@ -107,7 +107,7 @@

    Our Supporters

    -

    Here are our proud supporters of project Digital Glarus. Thanks to our supporters, the first cowerking space in Glarus +

    Here are our proud supporters of project Digital Glarus. Thanks to our supporters, the first cowerking space in Glarus is going to have a new look!

    @@ -132,7 +132,7 @@

    - +
    Digital Glarus
    diff --git a/digitalglarus/templates/digitalglarus/index.html b/digitalglarus/templates/digitalglarus/index.html index da8d762e..03cb2bc0 100644 --- a/digitalglarus/templates/digitalglarus/index.html +++ b/digitalglarus/templates/digitalglarus/index.html @@ -443,10 +443,10 @@
    -
    +

    Contact Us

    -
    - +
    +
    Digital Glarus
    From 49ea549c73ca6cf0f04c7f4240b53d2e9e85c838 Mon Sep 17 00:00:00 2001 From: Arvind Tiwari Date: Sun, 5 Nov 2017 23:48:20 +0530 Subject: [PATCH 0109/1862] ungleich header slider --- .../static/ungleich_page/css/ungleich.css | 15 +++++++ .../ungleich_page/includes/_header.html | 41 ++++++++++++++----- 2 files changed, 45 insertions(+), 11 deletions(-) diff --git a/ungleich_page/static/ungleich_page/css/ungleich.css b/ungleich_page/static/ungleich_page/css/ungleich.css index 40ddf2fd..fc8a460e 100644 --- a/ungleich_page/static/ungleich_page/css/ungleich.css +++ b/ungleich_page/static/ungleich_page/css/ungleich.css @@ -111,3 +111,18 @@ paddding: 10px; } } + +.header_slider { + height: 100vh; +} + +.header_slider > .carousel { + display: flex; + flex-direction: column; + height: 100%; + align-items: stretch; +} + +.header_slider > .carousel .item { + padding-top: 150px; +} \ No newline at end of file diff --git a/ungleich_page/templates/ungleich_page/includes/_header.html b/ungleich_page/templates/ungleich_page/includes/_header.html index a86f2f24..996b297c 100644 --- a/ungleich_page/templates/ungleich_page/includes/_header.html +++ b/ungleich_page/templates/ungleich_page/includes/_header.html @@ -1,17 +1,36 @@ {% load static %} {% load i18n %} -
    -
    -
    - -


    -
    - - {% trans "We Design, Configure & Maintain
    Your Linux Infrastructure " %} -     -
    +
    + + +
    +
    +
    +
    + +


    +
    + + {% trans "We Design, Configure & Maintain
    Your Linux Infrastructure " %} +     +
    +
    +
    +
    +
    +

    slide 2

    +
    +
    +

    slide 3

    +
    +
    \ No newline at end of file From 994f193276790736137d86e5a0ca72480b4d0a14 Mon Sep 17 00:00:00 2001 From: Arvind Tiwari Date: Mon, 6 Nov 2017 00:26:39 +0530 Subject: [PATCH 0110/1862] html fix --- digitalglarus/locale/de/LC_MESSAGES/django.po | 5 +- ungleich_page/locale/de/LC_MESSAGES/django.po | 8 ++- .../templates/ungleich_page/404.html | 16 ++--- .../ungleich_page/includes/_contact_us.html | 17 ++--- .../ungleich_page/includes/_footer.html | 12 ++-- .../ungleich_page/includes/_team.html | 68 +++++++++---------- .../templates/ungleich_page/landing.html | 8 +-- 7 files changed, 68 insertions(+), 66 deletions(-) diff --git a/digitalglarus/locale/de/LC_MESSAGES/django.po b/digitalglarus/locale/de/LC_MESSAGES/django.po index 6ae6a6bb..23c0ecab 100644 --- a/digitalglarus/locale/de/LC_MESSAGES/django.po +++ b/digitalglarus/locale/de/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-10-10 21:35+0530\n" +"POT-Creation-Date: 2017-11-06 00:24+0530\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -95,6 +95,9 @@ msgstr "Seite" msgid "Data Center Light" msgstr "" +msgid "Glasfaser" +msgstr "" + msgid "English" msgstr "" diff --git a/ungleich_page/locale/de/LC_MESSAGES/django.po b/ungleich_page/locale/de/LC_MESSAGES/django.po index 78921c45..c4d9510a 100644 --- a/ungleich_page/locale/de/LC_MESSAGES/django.po +++ b/ungleich_page/locale/de/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-10-13 02:21+0530\n" +"POT-Creation-Date: 2017-11-06 00:24+0530\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -18,6 +18,12 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +msgid "Glasfaser menu" +msgstr "" + +msgid "\"Sorry, we could not find the page you are looking for!\"" +msgstr "" + msgid "Toggle navigation" msgstr "Umschalten" diff --git a/ungleich_page/templates/ungleich_page/404.html b/ungleich_page/templates/ungleich_page/404.html index bcd2260b..6bba094c 100644 --- a/ungleich_page/templates/ungleich_page/404.html +++ b/ungleich_page/templates/ungleich_page/404.html @@ -11,7 +11,7 @@ Page not found | ungleich - + @@ -33,27 +33,21 @@ - - +
    -
    -
    +

     

    404

    - "Sorry, we could not find the page you are looking for!" -

    -
    + {% trans '"Sorry, we could not find the page you are looking for!"' %} +

    -
    - - diff --git a/ungleich_page/templates/ungleich_page/includes/_contact_us.html b/ungleich_page/templates/ungleich_page/includes/_contact_us.html index a104fbb3..e87fe8ac 100644 --- a/ungleich_page/templates/ungleich_page/includes/_contact_us.html +++ b/ungleich_page/templates/ungleich_page/includes/_contact_us.html @@ -3,8 +3,8 @@
    -
    -
    +
    +
    {% for message in messages %}


    -

    {% trans "Join us at" %} {% trans "Digital Glarus" %}, - {% trans "a great co-working space in the middle of Alps!" %} -

    {% trans "You can contact us at" %}

    -

    info@ungleich.ch +

    + {% trans "Join us at" %} {% trans "Digital Glarus" %}, {% trans "a great co-working space in the middle of Alps!" %}
    + {% trans "You can contact us at" %} +

    +

    + info@ungleich.ch

    -

    (044) 534-66-22

    +

    (044) 534-66-22

    diff --git a/ungleich_page/templates/ungleich_page/includes/_footer.html b/ungleich_page/templates/ungleich_page/includes/_footer.html index 1b0eb595..014a99e5 100644 --- a/ungleich_page/templates/ungleich_page/includes/_footer.html +++ b/ungleich_page/templates/ungleich_page/includes/_footer.html @@ -9,17 +9,21 @@
    diff --git a/ungleich_page/templates/ungleich_page/includes/_team.html b/ungleich_page/templates/ungleich_page/includes/_team.html index a9a32c74..e207e336 100644 --- a/ungleich_page/templates/ungleich_page/includes/_team.html +++ b/ungleich_page/templates/ungleich_page/includes/_team.html @@ -3,29 +3,27 @@
    -
    -
    -

    {% trans "Why ungleich?*" %}

    -

    {% trans "What our customers say" %}

    -
    -
    +
    +

    {% trans "Why ungleich?*" %}

    +

    {% trans "What our customers say" %}

    +
    -
    +
      -
    1. -
    2. -
    3. +
    4. +
    5. +
    -
    - -

    +

    + +

    {% blocktrans %} "ungleich helped us getting started with our internal infrastructure, hosted on physical servers in a @@ -40,14 +38,14 @@ engineers to work more efficiently and comfortable than before." {% endblocktrans %} -

    -

    - - Luciano Franceschina, CTO at Teralytics -

    -
    -
    - -

    +

    +

    + - Luciano Franceschina, CTO at Teralytics +

    +
    +
    + +

    {% blocktrans %} "Thanks to ungleich team, who has designed and configured our company's Linux infrastructure, our @@ -56,14 +54,14 @@ significantly not only in cost but also in time saving, which is crucial for IT companies like ours." {% endblocktrans %} -

    -

    - - Beat Seeliger , CTO at Panter AG -

    -
    -
    - -

    +

    +

    + - Beat Seeliger , CTO at Panter AG +

    +
    +
    + +

    {% blocktrans %} "ungleich provided an excellent service in designing our system architecture and created secure and stable @@ -77,21 +75,21 @@ recommend them to any companies with high demand in solid infrastructures." {% endblocktrans %} -

    -

    +

    +

    {% blocktrans %} - Sebastian Plattner, Teamleader Development Cyber Security Products at RUAG {% endblocktrans %} -

    -
    +

    +
    -
    -

    {% blocktrans %}*ungleich means not equal to (≠) U+2260.{% endblocktrans %}

    +
    +

    {% blocktrans %}*ungleich means not equal to (≠) U+2260.{% endblocktrans %}

    \ No newline at end of file diff --git a/ungleich_page/templates/ungleich_page/landing.html b/ungleich_page/templates/ungleich_page/landing.html index 96f3851f..a1434929 100644 --- a/ungleich_page/templates/ungleich_page/landing.html +++ b/ungleich_page/templates/ungleich_page/landing.html @@ -15,6 +15,7 @@ + @@ -43,7 +44,7 @@
    - +
    From a56f626aefe664f45552ceaff14eb0714431cfee Mon Sep 17 00:00:00 2001 From: PCoder Date: Fri, 10 Nov 2017 21:57:43 +0100 Subject: [PATCH 0116/1862] Update Changelog --- Changelog | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Changelog b/Changelog index af9ee184..cd040f1e 100644 --- a/Changelog +++ b/Changelog @@ -1,8 +1,9 @@ 1.2.9: (Next release) - * #3848: [ungleich] optimize ungleich.ch landing page - * #3360: [ungleich] ungleich.ch landing page animation fix - * #3421: [hosting] signup form placeholder translations - * #3856: [ungleich] glasfaser text modified + * #3848: [ungleich] Optimize ungleich.ch landing page + * #3360: [ungleich] Ungleich.ch landing page animation fix + * #3421: [hosting] Signup form placeholder translations + * #3856: [ungleich] Glasfaser text modified + * bugfix: [blog] Redirect user to ungleich home on ungliech logo click 1.2.8: 2017-10-21 * Remove ALLOWED_HOST alplora.ch * Add ALLOWED_HOST hack4glarus.ch From de76311ea35cd9f91da144cd35be32fcb72f13bd Mon Sep 17 00:00:00 2001 From: PCoder Date: Sat, 11 Nov 2017 11:39:25 +0100 Subject: [PATCH 0117/1862] Change "affordable vm hosting.." text --- datacenterlight/static/datacenterlight/css/landing-page.css | 4 ++++ datacenterlight/templates/datacenterlight/index.html | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/datacenterlight/static/datacenterlight/css/landing-page.css b/datacenterlight/static/datacenterlight/css/landing-page.css index 9b02420c..54ff8b8c 100755 --- a/datacenterlight/static/datacenterlight/css/landing-page.css +++ b/datacenterlight/static/datacenterlight/css/landing-page.css @@ -434,6 +434,10 @@ button, input, optgroup, select, textarea { font-size: 21px !important; } +.new-lead .small-text { + font-size: 16px; +} + .split-section .split-text .split-title{ position: relative; margin-bottom: 25px; diff --git a/datacenterlight/templates/datacenterlight/index.html b/datacenterlight/templates/datacenterlight/index.html index 85e66571..6eed1392 100755 --- a/datacenterlight/templates/datacenterlight/index.html +++ b/datacenterlight/templates/datacenterlight/index.html @@ -130,7 +130,7 @@

    {% trans "Simple and affordable: Try our virtual machine with featherlight price." %}

    -

    {% trans "Affordable VM hosting based in Switzerland" %}

    +

    {% blocktrans %}Ready in 30 seconds.
    Experience the unbeatable speed from Data Center Light.
    From confirmation to access, our VM takes only 30 seconds.
    *measurement for a single VM, multiple VMs may take few seconds longer.{% endblocktrans %}

    From 0b340f29e17636deb68a1472c70645285de8b3b3 Mon Sep 17 00:00:00 2001 From: PCoder Date: Sat, 11 Nov 2017 11:40:26 +0100 Subject: [PATCH 0118/1862] Add DE translation --- datacenterlight/locale/de/LC_MESSAGES/django.po | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/datacenterlight/locale/de/LC_MESSAGES/django.po b/datacenterlight/locale/de/LC_MESSAGES/django.po index ac796b95..80f22aff 100644 --- a/datacenterlight/locale/de/LC_MESSAGES/django.po +++ b/datacenterlight/locale/de/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-10-16 00:57+0530\n" +"POT-Creation-Date: 2017-11-11 10:31+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -270,8 +270,16 @@ msgstr "" "Einfach und bezahlbar: Teste nun unsere virtuellen Maschinen mit " "federleichten Preisen." -msgid "Affordable VM hosting based in Switzerland" -msgstr "Bezahlbares VM Hosting in der Schweiz" +msgid "" +"Ready in 30 seconds.
    Experience the unbeatable speed from Data Center " +"Light.
    From confirmation to access, our VM takes only 30 seconds.
    *measurement for a single VM, multiple VMs may " +"take few seconds longer." +msgstr "" +"Fertig in 30 Sekunden.
    Erlebe die unschlagbare Geschwindigkeit von Data " +"Center Light.
    Von der Bestätigung bis zum Zugriff auf die VM dauert es " +"nur 30 Sekunden.
    *Dies bezieht sich auf eine " +"einzelne VM. Mehrere VMs können einige Sekunden länger dauern." msgid "Contact us" msgstr "Kontaktiere uns" @@ -513,6 +521,9 @@ msgstr "" "Deine VM ist gleich bereit. Wir senden Dir eine Bestätigungsemail, sobald Du " "auf sie zugreifen kannst." +#~ msgid "Affordable VM hosting based in Switzerland" +#~ msgstr "Bezahlbares VM Hosting in der Schweiz" + #~ msgid "Processing..." #~ msgstr "Abarbeitung..." From 629eb41ff5bf4a51d9132c4549add1feacb89f4e Mon Sep 17 00:00:00 2001 From: PCoder Date: Mon, 13 Nov 2017 19:00:56 +0100 Subject: [PATCH 0119/1862] Remove "From confirmation to access" text --- .../locale/de/LC_MESSAGES/django.po | 22 +++++++++++++------ .../datacenterlight/css/landing-page.css | 4 ---- .../templates/datacenterlight/index.html | 2 +- 3 files changed, 16 insertions(+), 12 deletions(-) diff --git a/datacenterlight/locale/de/LC_MESSAGES/django.po b/datacenterlight/locale/de/LC_MESSAGES/django.po index 80f22aff..e87a7616 100644 --- a/datacenterlight/locale/de/LC_MESSAGES/django.po +++ b/datacenterlight/locale/de/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-11-11 10:31+0000\n" +"POT-Creation-Date: 2017-11-13 17:59+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -272,14 +272,10 @@ msgstr "" msgid "" "Ready in 30 seconds.
    Experience the unbeatable speed from Data Center " -"Light.
    From confirmation to access, our VM takes only 30 seconds.
    *measurement for a single VM, multiple VMs may " -"take few seconds longer." +"Light." msgstr "" "Fertig in 30 Sekunden.
    Erlebe die unschlagbare Geschwindigkeit von Data " -"Center Light.
    Von der Bestätigung bis zum Zugriff auf die VM dauert es " -"nur 30 Sekunden.
    *Dies bezieht sich auf eine " -"einzelne VM. Mehrere VMs können einige Sekunden länger dauern." +"Center Light.
    " msgid "Contact us" msgstr "Kontaktiere uns" @@ -521,6 +517,18 @@ msgstr "" "Deine VM ist gleich bereit. Wir senden Dir eine Bestätigungsemail, sobald Du " "auf sie zugreifen kannst." +#~ msgid "" +#~ "Ready in 30 seconds.
    Experience the unbeatable speed from Data Center " +#~ "Light.
    From confirmation to access, our VM takes only 30 seconds.
    *measurement for a single VM, multiple VMs " +#~ "may take few seconds longer." +#~ msgstr "" +#~ "Fertig in 30 Sekunden.
    Erlebe die unschlagbare Geschwindigkeit von " +#~ "Data Center Light.
    Von der Bestätigung bis zum Zugriff auf die VM " +#~ "dauert es nur 30 Sekunden.
    *Dies bezieht " +#~ "sich auf eine einzelne VM. Mehrere VMs können einige Sekunden länger " +#~ "dauern." + #~ msgid "Affordable VM hosting based in Switzerland" #~ msgstr "Bezahlbares VM Hosting in der Schweiz" diff --git a/datacenterlight/static/datacenterlight/css/landing-page.css b/datacenterlight/static/datacenterlight/css/landing-page.css index 54ff8b8c..9b02420c 100755 --- a/datacenterlight/static/datacenterlight/css/landing-page.css +++ b/datacenterlight/static/datacenterlight/css/landing-page.css @@ -434,10 +434,6 @@ button, input, optgroup, select, textarea { font-size: 21px !important; } -.new-lead .small-text { - font-size: 16px; -} - .split-section .split-text .split-title{ position: relative; margin-bottom: 25px; diff --git a/datacenterlight/templates/datacenterlight/index.html b/datacenterlight/templates/datacenterlight/index.html index 6eed1392..cc3597ec 100755 --- a/datacenterlight/templates/datacenterlight/index.html +++ b/datacenterlight/templates/datacenterlight/index.html @@ -130,7 +130,7 @@

    {% trans "Simple and affordable: Try our virtual machine with featherlight price." %}

    -

    {% blocktrans %}Ready in 30 seconds.
    Experience the unbeatable speed from Data Center Light.
    From confirmation to access, our VM takes only 30 seconds.
    *measurement for a single VM, multiple VMs may take few seconds longer.{% endblocktrans %}

    +

    {% blocktrans %}Ready in 30 seconds.
    Experience the unbeatable speed from Data Center Light.{% endblocktrans %}

    From 0038bb8ee45b5ae3aec9e9c03316ac1c4e2f9a51 Mon Sep 17 00:00:00 2001 From: PCoder Date: Mon, 13 Nov 2017 19:37:46 +0100 Subject: [PATCH 0120/1862] Remove commented translation --- datacenterlight/locale/de/LC_MESSAGES/django.po | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/datacenterlight/locale/de/LC_MESSAGES/django.po b/datacenterlight/locale/de/LC_MESSAGES/django.po index e87a7616..ca5bd19d 100644 --- a/datacenterlight/locale/de/LC_MESSAGES/django.po +++ b/datacenterlight/locale/de/LC_MESSAGES/django.po @@ -517,18 +517,6 @@ msgstr "" "Deine VM ist gleich bereit. Wir senden Dir eine Bestätigungsemail, sobald Du " "auf sie zugreifen kannst." -#~ msgid "" -#~ "Ready in 30 seconds.
    Experience the unbeatable speed from Data Center " -#~ "Light.
    From confirmation to access, our VM takes only 30 seconds.
    *measurement for a single VM, multiple VMs " -#~ "may take few seconds longer." -#~ msgstr "" -#~ "Fertig in 30 Sekunden.
    Erlebe die unschlagbare Geschwindigkeit von " -#~ "Data Center Light.
    Von der Bestätigung bis zum Zugriff auf die VM " -#~ "dauert es nur 30 Sekunden.
    *Dies bezieht " -#~ "sich auf eine einzelne VM. Mehrere VMs können einige Sekunden länger " -#~ "dauern." - #~ msgid "Affordable VM hosting based in Switzerland" #~ msgstr "Bezahlbares VM Hosting in der Schweiz" From 6d7d24eafe76777b58297a4c366d7504221178a7 Mon Sep 17 00:00:00 2001 From: PCoder Date: Mon, 13 Nov 2017 19:40:00 +0100 Subject: [PATCH 0121/1862] Remove unwanted br tag in de translation --- datacenterlight/locale/de/LC_MESSAGES/django.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/datacenterlight/locale/de/LC_MESSAGES/django.po b/datacenterlight/locale/de/LC_MESSAGES/django.po index ca5bd19d..c69f83d1 100644 --- a/datacenterlight/locale/de/LC_MESSAGES/django.po +++ b/datacenterlight/locale/de/LC_MESSAGES/django.po @@ -275,7 +275,7 @@ msgid "" "Light." msgstr "" "Fertig in 30 Sekunden.
    Erlebe die unschlagbare Geschwindigkeit von Data " -"Center Light.
    " +"Center Light." msgid "Contact us" msgstr "Kontaktiere uns" From b9a5c9fea1136bb62fb4c884da33581a80bd3a4b Mon Sep 17 00:00:00 2001 From: PCoder Date: Mon, 13 Nov 2017 19:43:53 +0100 Subject: [PATCH 0122/1862] Update Changelog --- Changelog | 1 + 1 file changed, 1 insertion(+) diff --git a/Changelog b/Changelog index cd040f1e..52607287 100644 --- a/Changelog +++ b/Changelog @@ -4,6 +4,7 @@ * #3421: [hosting] Signup form placeholder translations * #3856: [ungleich] Glasfaser text modified * bugfix: [blog] Redirect user to ungleich home on ungliech logo click + * #3858: [dcl] Change "affordable vm ..." text to "Ready in 30 seconds ..." 1.2.8: 2017-10-21 * Remove ALLOWED_HOST alplora.ch * Add ALLOWED_HOST hack4glarus.ch From dbd3fea5caedc561feb59f5767b3f3bb7baac1b2 Mon Sep 17 00:00:00 2001 From: PCoder Date: Mon, 13 Nov 2017 19:46:20 +0100 Subject: [PATCH 0123/1862] Update Changelog: Add date for 1.2.9 --- Changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Changelog b/Changelog index 52607287..e288f85d 100644 --- a/Changelog +++ b/Changelog @@ -1,4 +1,4 @@ -1.2.9: (Next release) +1.2.9: 2017-11-13 * #3848: [ungleich] Optimize ungleich.ch landing page * #3360: [ungleich] Ungleich.ch landing page animation fix * #3421: [hosting] Signup form placeholder translations From 1651dc00b59e80c1393e49fd9923f20ddb0c1f68 Mon Sep 17 00:00:00 2001 From: PCoder Date: Mon, 13 Nov 2017 19:54:37 +0100 Subject: [PATCH 0124/1862] Changelog: Correct ungleich spelling --- Changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Changelog b/Changelog index e288f85d..77c53a4b 100644 --- a/Changelog +++ b/Changelog @@ -3,7 +3,7 @@ * #3360: [ungleich] Ungleich.ch landing page animation fix * #3421: [hosting] Signup form placeholder translations * #3856: [ungleich] Glasfaser text modified - * bugfix: [blog] Redirect user to ungleich home on ungliech logo click + * bugfix: [blog] Redirect user to ungleich home on ungleich logo click * #3858: [dcl] Change "affordable vm ..." text to "Ready in 30 seconds ..." 1.2.8: 2017-10-21 * Remove ALLOWED_HOST alplora.ch From e35d9a27895d9ca978165d96375cedf4e7de8b36 Mon Sep 17 00:00:00 2001 From: "M.Ravi" Date: Thu, 16 Nov 2017 17:44:15 +0100 Subject: [PATCH 0125/1862] Add ungleich_cms_page.html --- .../ungleich_page/ungleich_cms_page.html | 145 ++++++++++++++++++ 1 file changed, 145 insertions(+) create mode 100644 ungleich_page/templates/ungleich_page/ungleich_cms_page.html diff --git a/ungleich_page/templates/ungleich_page/ungleich_cms_page.html b/ungleich_page/templates/ungleich_page/ungleich_cms_page.html new file mode 100644 index 00000000..9f863f1f --- /dev/null +++ b/ungleich_page/templates/ungleich_page/ungleich_cms_page.html @@ -0,0 +1,145 @@ +{% load static i18n cms_tags sekizai_tags %} + + + + + + + + + + + + {% page_attribute "page_title" %} + + + + + + + + + + + + + + {% render_block "css" postprocessor "compressor.contrib.sekizai.compress" %} + {% render_block "js" postprocessor "compressor.contrib.sekizai.compress" %} + + {% include "google_analytics.html" %} + + + + + + +{% cms_toolbar %} + + + + + {% placeholder 'Ungleich Page Contents' %} + + + {% include "ungleich_page/includes/_header.html" %} + + + {% include "ungleich_page/includes/_services.html" %} + + + {% include "ungleich_page/includes/_portfolio.html" %} + + + {% include "ungleich_page/includes/_about.html" %} + + + {% include "ungleich_page/includes/_team.html" %} + + + {% include "ungleich_page/includes/_softwares.html" %} + + + {% include "ungleich_page/includes/_contact_us.html" %} + + + {% include "ungleich_page/includes/_footer.html" %} + + + + + + + + + + + + + + + + + + + + + + + + + From e9b3e77752d8eb71e3f7e441551f0deca3b515a1 Mon Sep 17 00:00:00 2001 From: "M.Ravi" Date: Fri, 17 Nov 2017 15:48:44 +0100 Subject: [PATCH 0126/1862] Change title char field in UngleichPicture to HTML field --- ungleich_page/models.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ungleich_page/models.py b/ungleich_page/models.py index 3759ee25..5ea6a9dc 100644 --- a/ungleich_page/models.py +++ b/ungleich_page/models.py @@ -11,7 +11,7 @@ class UngelichPicture(CMSPlugin): related_name="image", on_delete=models.SET_NULL ) - title = models.CharField(max_length=400) + title = HTMLField() class SectionWithImage(UngelichPicture): From 501dc08b0ef86dffcd4b181df768532a8a544395 Mon Sep 17 00:00:00 2001 From: "M.Ravi" Date: Fri, 17 Nov 2017 16:30:44 +0100 Subject: [PATCH 0127/1862] Align text to flex-start or flex-end for timeline --- .../static/ungleich_page/css/ungleich.css | 36 ++++++++++++++++++- .../ungleich_page/glasfaser/_about_item.html | 2 +- 2 files changed, 36 insertions(+), 2 deletions(-) diff --git a/ungleich_page/static/ungleich_page/css/ungleich.css b/ungleich_page/static/ungleich_page/css/ungleich.css index fc8a460e..fe34ee6b 100644 --- a/ungleich_page/static/ungleich_page/css/ungleich.css +++ b/ungleich_page/static/ungleich_page/css/ungleich.css @@ -125,4 +125,38 @@ .header_slider > .carousel .item { padding-top: 150px; -} \ No newline at end of file +} + + +.timeline>li .timeline-panel { + display: flex; + min-height: 80px; + align-items: center; + padding-bottom: 15px; +} + +.flex-justify-content-end{ + justify-content: flex-end; +} + +.flex-justify-content-start{ + justify-content: flex-start; +} + +.timeline>li.timeline-inverted>.timeline-panel { + padding-bottom: 0; +} + + +@media (min-width: 768px) and (max-width: 991px) { + .timeline>li .timeline-panel { + min-height: 100px; + } +} + +@media (min-width: 992px) { + .timeline>li .timeline-panel { + min-height: 170px; + } +} + diff --git a/ungleich_page/templates/ungleich_page/glasfaser/_about_item.html b/ungleich_page/templates/ungleich_page/glasfaser/_about_item.html index 0ccdff9a..6b619579 100644 --- a/ungleich_page/templates/ungleich_page/glasfaser/_about_item.html +++ b/ungleich_page/templates/ungleich_page/glasfaser/_about_item.html @@ -4,7 +4,7 @@
    {% if instance.link_url %}{% endif %} -
    +

    {{ instance.title }}

    From 4367b9e58a6d8386285ba357a6ef7aafd13be445 Mon Sep 17 00:00:00 2001 From: "M.Ravi" Date: Fri, 17 Nov 2017 16:32:40 +0100 Subject: [PATCH 0128/1862] Add ungleich cms page template --- dynamicweb/settings/base.py | 1 + 1 file changed, 1 insertion(+) diff --git a/dynamicweb/settings/base.py b/dynamicweb/settings/base.py index 48a2399f..19c263d5 100644 --- a/dynamicweb/settings/base.py +++ b/dynamicweb/settings/base.py @@ -219,6 +219,7 @@ CMS_TEMPLATES = ( # dcl ('datacenterlight/cms_page.html', gettext('Data Center Light')), ('ungleich_page/glasfaser_cms_page.html', gettext('Glasfaser')), + ('ungleich_page/ungleich_cms_page.html', gettext('ungleich')), ) DATABASES = { From 432d109c48c8f3ed67b018f8e81b904fd584b2c0 Mon Sep 17 00:00:00 2001 From: "M.Ravi" Date: Fri, 17 Nov 2017 16:36:25 +0100 Subject: [PATCH 0129/1862] Add migration --- .../migrations/0007_auto_20171117_1011.py | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 ungleich_page/migrations/0007_auto_20171117_1011.py diff --git a/ungleich_page/migrations/0007_auto_20171117_1011.py b/ungleich_page/migrations/0007_auto_20171117_1011.py new file mode 100644 index 00000000..71b4017a --- /dev/null +++ b/ungleich_page/migrations/0007_auto_20171117_1011.py @@ -0,0 +1,21 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.4 on 2017-11-17 10:11 +from __future__ import unicode_literals + +from django.db import migrations +import djangocms_text_ckeditor.fields + + +class Migration(migrations.Migration): + + dependencies = [ + ('ungleich_page', '0006_aboutitem_link_url'), + ] + + operations = [ + migrations.AlterField( + model_name='ungelichpicture', + name='title', + field=djangocms_text_ckeditor.fields.HTMLField(), + ), + ] From 8a2eb8307a6991fedbf414af90f2ffab4d70e3fe Mon Sep 17 00:00:00 2001 From: "M.Ravi" Date: Fri, 17 Nov 2017 17:36:01 +0100 Subject: [PATCH 0130/1862] Add UngleichServiceItem model --- ungleich_page/models.py | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/ungleich_page/models.py b/ungleich_page/models.py index 5ea6a9dc..894e4101 100644 --- a/ungleich_page/models.py +++ b/ungleich_page/models.py @@ -87,3 +87,12 @@ class AboutItem(UngelichPicture): return "{alignment} - {title}".format( alignment=alignment, title=self.title ) + + +class UngleichServiceItem(ServiceItem): + data_replaced_image = FilerImageField( + null=True, + blank=True, + related_name="service_item_data_replaced_image", + on_delete=models.SET_NULL + ) \ No newline at end of file From cf1f7d6141344847fd79a00f6705046aa39a3ad0 Mon Sep 17 00:00:00 2001 From: "M.Ravi" Date: Fri, 17 Nov 2017 17:37:05 +0100 Subject: [PATCH 0131/1862] Add UngleichServicesPlugin and UngleichServicesItemPlugin --- ungleich_page/cms_plugins.py | 34 +++++++++++++++++++++++++++++++++- 1 file changed, 33 insertions(+), 1 deletion(-) diff --git a/ungleich_page/cms_plugins.py b/ungleich_page/cms_plugins.py index a5b10d5f..4c842093 100644 --- a/ungleich_page/cms_plugins.py +++ b/ungleich_page/cms_plugins.py @@ -3,7 +3,7 @@ from cms.plugin_pool import plugin_pool from .models import ( UngelichContactUsSection, UngelichTextSection, Service, ServiceItem, - About, AboutItem, SectionWithImage + About, AboutItem, SectionWithImage, UngleichServiceItem ) @@ -145,3 +145,35 @@ class GlasfaserAboutItemPlugin(CMSPluginBase): ) context['instance'] = instance return context + + +@plugin_pool.register_plugin +class UngleichServicesPlugin(CMSPluginBase): + name = "ungleich Services Plugin" + model = Service + render_template = "ungleich_page/ungleich/section_services.html" + cache = False + allow_children = True + child_classes = ['UngleichServicesItemPlugin'] + + def render(self, context, instance, placeholder): + context['service_instance'] = instance + context['section_id'] = get_section_id(instance, 'services') + return context + + +@plugin_pool.register_plugin +class UngleichServicesItemPlugin(CMSPluginBase): + name = "ungleich Service Item Plugin" + model = UngleichServiceItem + render_template = "ungleich_page/ungleich/_services_item.html" + cache = False + require_parent = True + parent_classes = ['UngleichServicesPlugin'] + + def render(self, context, instance, placeholder): + context = super(UngleichServicesItemPlugin, self).render( + context, instance, placeholder + ) + context['instance'] = instance + return context \ No newline at end of file From 2af78be195170d853ddd48740f9875c17212f96f Mon Sep 17 00:00:00 2001 From: "M.Ravi" Date: Fri, 17 Nov 2017 17:39:46 +0100 Subject: [PATCH 0132/1862] First version of ungleich/section_services.html (wip) --- .../ungleich/section_services.html | 44 +++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 ungleich_page/templates/ungleich_page/ungleich/section_services.html diff --git a/ungleich_page/templates/ungleich_page/ungleich/section_services.html b/ungleich_page/templates/ungleich_page/ungleich/section_services.html new file mode 100644 index 00000000..10a682b7 --- /dev/null +++ b/ungleich_page/templates/ungleich_page/ungleich/section_services.html @@ -0,0 +1,44 @@ +{% load static i18n cms_tags %} +
    +
    +
    +

    {{ service_instance.title }}

    +

    + {% trans "We support our clients in all areas of Unix infrastructure." %}
    + {% trans "Our top notch configuration management is refreshingly simple and reliable." %} +

    +
    +
    +
    +
    + +
    +

    {% trans "Hosting" %}

    +

     

    +

    {% trans "Ruby on Rails. Java hosting, Django hosting, we make it everything run smooth and safe." %}

    +
    +
    +
    +
    +
    + +
    +

    {% trans "Configuration as a Service" %}

    +

     

    +

    {% trans "Ruby on Rails, Django, Java, Webserver, Mailserver, any infrastructure that needs to configured, we provide comprehensive solutions. Amazon, rackspace or bare metal servers, we configure for you." %}

    +
    +
    +
    +
    +
    + +
    +

    {% trans "Linux System Engineering" %}

    +

     

    +

    {% trans "Let your developers develop! We take care of your system administration. Gentoo, Archlinux, Debian, Ubuntu, and many more." %}

    +
    +
    +
    +
    +
    +
    From 06e8b3acc99aa7e855ff8fa74552cbd1065e10ee Mon Sep 17 00:00:00 2001 From: PCoder Date: Sun, 19 Nov 2017 08:16:50 +0100 Subject: [PATCH 0133/1862] Remove new line --- .../templates/ungleich_page/glasfaser/section_services.html | 1 - 1 file changed, 1 deletion(-) diff --git a/ungleich_page/templates/ungleich_page/glasfaser/section_services.html b/ungleich_page/templates/ungleich_page/glasfaser/section_services.html index a4b50e5c..4f373653 100644 --- a/ungleich_page/templates/ungleich_page/glasfaser/section_services.html +++ b/ungleich_page/templates/ungleich_page/glasfaser/section_services.html @@ -11,7 +11,6 @@ {% render_plugin plugin %}
    {% endfor %} -
    \ No newline at end of file From 41b68365ed275dc64f04ddff71c4509afd4bfc34 Mon Sep 17 00:00:00 2001 From: PCoder Date: Sun, 19 Nov 2017 10:22:32 +0100 Subject: [PATCH 0134/1862] Add ungleichserviceitem migration --- .../migrations/0008_ungleichserviceitem.py | 29 +++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 ungleich_page/migrations/0008_ungleichserviceitem.py diff --git a/ungleich_page/migrations/0008_ungleichserviceitem.py b/ungleich_page/migrations/0008_ungleichserviceitem.py new file mode 100644 index 00000000..3a029110 --- /dev/null +++ b/ungleich_page/migrations/0008_ungleichserviceitem.py @@ -0,0 +1,29 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.4 on 2017-11-17 18:49 +from __future__ import unicode_literals + +from django.db import migrations, models +import django.db.models.deletion +import filer.fields.image + + +class Migration(migrations.Migration): + + dependencies = [ + ('filer', '0005_auto_20171015_0703'), + ('ungleich_page', '0007_auto_20171117_1011'), + ] + + operations = [ + migrations.CreateModel( + name='UngleichServiceItem', + fields=[ + ('serviceitem_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='ungleich_page.ServiceItem')), + ('data_replaced_image', filer.fields.image.FilerImageField(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='service_item_data_replaced_image', to='filer.Image')), + ], + options={ + 'abstract': False, + }, + bases=('ungleich_page.serviceitem',), + ), + ] From 7aca2512600cf1a5d57d180fb85c5a0f64d5f575 Mon Sep 17 00:00:00 2001 From: PCoder Date: Sun, 19 Nov 2017 10:25:30 +0100 Subject: [PATCH 0135/1862] Add ungleich services and serivce item htmls --- .../ungleich/_services_item.html | 8 ++++ .../ungleich/section_services.html | 42 ++++--------------- 2 files changed, 15 insertions(+), 35 deletions(-) create mode 100644 ungleich_page/templates/ungleich_page/ungleich/_services_item.html diff --git a/ungleich_page/templates/ungleich_page/ungleich/_services_item.html b/ungleich_page/templates/ungleich_page/ungleich/_services_item.html new file mode 100644 index 00000000..87fda196 --- /dev/null +++ b/ungleich_page/templates/ungleich_page/ungleich/_services_item.html @@ -0,0 +1,8 @@ +
    + +
    +

    {{ instance.title }}

    +

     

    +

    {{ instance.description }}

    +
    +
    \ No newline at end of file diff --git a/ungleich_page/templates/ungleich_page/ungleich/section_services.html b/ungleich_page/templates/ungleich_page/ungleich/section_services.html index 10a682b7..2c9e5246 100644 --- a/ungleich_page/templates/ungleich_page/ungleich/section_services.html +++ b/ungleich_page/templates/ungleich_page/ungleich/section_services.html @@ -1,44 +1,16 @@ -{% load static i18n cms_tags %} +{% load cms_tags %}

    {{ service_instance.title }}

    -

    - {% trans "We support our clients in all areas of Unix infrastructure." %}
    - {% trans "Our top notch configuration management is refreshingly simple and reliable." %} -

    +

    {{ service_instance.sub_title }}

    -
    -
    - -
    -

    {% trans "Hosting" %}

    -

     

    -

    {% trans "Ruby on Rails. Java hosting, Django hosting, we make it everything run smooth and safe." %}

    -
    -
    -
    -
    -
    - -
    -

    {% trans "Configuration as a Service" %}

    -

     

    -

    {% trans "Ruby on Rails, Django, Java, Webserver, Mailserver, any infrastructure that needs to configured, we provide comprehensive solutions. Amazon, rackspace or bare metal servers, we configure for you." %}

    -
    -
    -
    -
    -
    - -
    -

    {% trans "Linux System Engineering" %}

    -

     

    -

    {% trans "Let your developers develop! We take care of your system administration. Gentoo, Archlinux, Debian, Ubuntu, and many more." %}

    -
    -
    -
    + {% for plugin in service_instance.child_plugin_instances %} +
    + {% render_plugin plugin %} +
    + {% endfor %}
    From d006ddcf0db26b638e8b906d7ab842a22ca7edac Mon Sep 17 00:00:00 2001 From: PCoder Date: Sun, 19 Nov 2017 13:19:01 +0100 Subject: [PATCH 0136/1862] Add UngleichHeaderWithTextAndImageSliderPlugin and UngleichHeaderItemPlugin --- ungleich_page/cms_plugins.py | 34 +++++++++++++++++++++++++++++++++- 1 file changed, 33 insertions(+), 1 deletion(-) diff --git a/ungleich_page/cms_plugins.py b/ungleich_page/cms_plugins.py index 4c842093..9d5cfda0 100644 --- a/ungleich_page/cms_plugins.py +++ b/ungleich_page/cms_plugins.py @@ -3,7 +3,8 @@ from cms.plugin_pool import plugin_pool from .models import ( UngelichContactUsSection, UngelichTextSection, Service, ServiceItem, - About, AboutItem, SectionWithImage, UngleichServiceItem + About, AboutItem, SectionWithImage, UngleichServiceItem, UngleichHeader, + UngleichHeaderItem ) @@ -176,4 +177,35 @@ class UngleichServicesItemPlugin(CMSPluginBase): context, instance, placeholder ) context['instance'] = instance + return context + + +@plugin_pool.register_plugin +class UngleichHeaderWithTextAndImageSliderPlugin(CMSPluginBase): + name = "ungleich Header with Text and Image Slider Plugin" + model = UngleichHeader + render_template = "ungleich_page/ungleich/header.html" + cache = False + allow_children = True + child_classes = ['UngleichHeaderItemPlugin'] + + def render(self, context, instance, placeholder): + context['instance'] = instance + return context + + +@plugin_pool.register_plugin +class UngleichHeaderItemPlugin(CMSPluginBase): + name = "ungleich Header Item Plugin" + model = UngleichHeaderItem + render_template = "ungleich_page/ungleich/_header_item.html" + cache = False + require_parent = True + parent_classes = ['UngleichHeaderWithTextAndImageSliderPlugin'] + + def render(self, context, instance, placeholder): + context = super(UngleichHeaderItemPlugin, self).render( + context, instance, placeholder + ) + context['instance'] = instance return context \ No newline at end of file From e05a2eab7e4a2b985dd5fac426e9a87a210dd8ec Mon Sep 17 00:00:00 2001 From: PCoder Date: Sun, 19 Nov 2017 13:19:40 +0100 Subject: [PATCH 0137/1862] Add UngleichHeader and UngleichHeaderItem models --- ungleich_page/models.py | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/ungleich_page/models.py b/ungleich_page/models.py index 894e4101..640e599b 100644 --- a/ungleich_page/models.py +++ b/ungleich_page/models.py @@ -95,4 +95,24 @@ class UngleichServiceItem(ServiceItem): blank=True, related_name="service_item_data_replaced_image", on_delete=models.SET_NULL - ) \ No newline at end of file + ) + + +class UngleichHeader(CMSPlugin): + background_image = FilerImageField( + null=True, + blank=True, + related_name="ungleich_header_background_image", + on_delete=models.SET_NULL + ) + carousel_data_interval = models.IntegerField(default=5000) + + +class UngleichHeaderItem(CMSPlugin): + image = FilerImageField( + null=True, + blank=True, + related_name="ungleich_header_item_image", + on_delete=models.SET_NULL + ) + description = HTMLField() \ No newline at end of file From 09b118b3119764107511df031558b6bd062a77fe Mon Sep 17 00:00:00 2001 From: PCoder Date: Sun, 19 Nov 2017 13:20:26 +0100 Subject: [PATCH 0138/1862] Add intro-cap-sans-transform p class --- ungleich_page/static/ungleich_page/css/ungleich.css | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/ungleich_page/static/ungleich_page/css/ungleich.css b/ungleich_page/static/ungleich_page/css/ungleich.css index fe34ee6b..b3296ca1 100644 --- a/ungleich_page/static/ungleich_page/css/ungleich.css +++ b/ungleich_page/static/ungleich_page/css/ungleich.css @@ -7,6 +7,17 @@ color: #494949; } +.header-vh { + height: 30px; +} +.intro-cap-sans-transform p { + font-family: 'Raleway', 'Helvetica Neue', 'Open Sans Bold', Helvetica, Arial, 'Arial Bold', sans-serif; + font-size: 26px; + font-style: normal; + font-weight: 200; + color: #FFF; +} + .intro-cap { font-family: 'Raleway', 'Helvetica Neue', 'Open Sans Bold', Helvetica, Arial, 'Arial Bold', sans-serif; font-size: 26px; From 7a9c624012ffe5e7fae09bc0df0a194c25e9cda1 Mon Sep 17 00:00:00 2001 From: PCoder Date: Sun, 19 Nov 2017 13:21:00 +0100 Subject: [PATCH 0139/1862] Add ungleich header migration --- .../0009_ungleichheader_ungleichheaderitem.py | 44 +++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 ungleich_page/migrations/0009_ungleichheader_ungleichheaderitem.py diff --git a/ungleich_page/migrations/0009_ungleichheader_ungleichheaderitem.py b/ungleich_page/migrations/0009_ungleichheader_ungleichheaderitem.py new file mode 100644 index 00000000..499917a2 --- /dev/null +++ b/ungleich_page/migrations/0009_ungleichheader_ungleichheaderitem.py @@ -0,0 +1,44 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.4 on 2017-11-19 11:28 +from __future__ import unicode_literals + +from django.db import migrations, models +import django.db.models.deletion +import djangocms_text_ckeditor.fields +import filer.fields.image + + +class Migration(migrations.Migration): + + dependencies = [ + ('filer', '0005_auto_20171015_0703'), + ('cms', '0014_auto_20160404_1908'), + ('ungleich_page', '0008_ungleichserviceitem'), + ] + + operations = [ + migrations.CreateModel( + name='UngleichHeader', + fields=[ + ('cmsplugin_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='cms.CMSPlugin')), + ('carousel_data_interval', models.IntegerField(default=5000)), + ('background_image', filer.fields.image.FilerImageField(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='ungleich_header_background_image', to='filer.Image')), + ], + options={ + 'abstract': False, + }, + bases=('cms.cmsplugin',), + ), + migrations.CreateModel( + name='UngleichHeaderItem', + fields=[ + ('cmsplugin_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='cms.CMSPlugin')), + ('description', djangocms_text_ckeditor.fields.HTMLField()), + ('image', filer.fields.image.FilerImageField(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='ungleich_header_item_image', to='filer.Image')), + ], + options={ + 'abstract': False, + }, + bases=('cms.cmsplugin',), + ), + ] From 4e8b3cdbe8441ce22e75df294f4ed299abce264c Mon Sep 17 00:00:00 2001 From: PCoder Date: Sun, 19 Nov 2017 13:22:37 +0100 Subject: [PATCH 0140/1862] Add ungleich header.html _header_item.html --- .../ungleich_page/ungleich/_header_item.html | 14 +++++++++++++ .../ungleich_page/ungleich/header.html | 20 +++++++++++++++++++ 2 files changed, 34 insertions(+) create mode 100644 ungleich_page/templates/ungleich_page/ungleich/_header_item.html create mode 100644 ungleich_page/templates/ungleich_page/ungleich/header.html diff --git a/ungleich_page/templates/ungleich_page/ungleich/_header_item.html b/ungleich_page/templates/ungleich_page/ungleich/_header_item.html new file mode 100644 index 00000000..ca4303db --- /dev/null +++ b/ungleich_page/templates/ungleich_page/ungleich/_header_item.html @@ -0,0 +1,14 @@ +
    +
    + {% if instance.image %} + +
    + {% endif %} +
    + + {{ instance.description }} + +
    +
    +
    diff --git a/ungleich_page/templates/ungleich_page/ungleich/header.html b/ungleich_page/templates/ungleich_page/ungleich/header.html new file mode 100644 index 00000000..89def4ee --- /dev/null +++ b/ungleich_page/templates/ungleich_page/ungleich/header.html @@ -0,0 +1,20 @@ +{% load cms_tags %} +
    + +
    \ No newline at end of file From f927220a889e05ea17c1d2b2c36c831b6a91cb5a Mon Sep 17 00:00:00 2001 From: PCoder Date: Sun, 19 Nov 2017 14:54:16 +0100 Subject: [PATCH 0141/1862] Use image width 300px --- .../templates/ungleich_page/ungleich/_header_item.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ungleich_page/templates/ungleich_page/ungleich/_header_item.html b/ungleich_page/templates/ungleich_page/ungleich/_header_item.html index ca4303db..a770d1ed 100644 --- a/ungleich_page/templates/ungleich_page/ungleich/_header_item.html +++ b/ungleich_page/templates/ungleich_page/ungleich/_header_item.html @@ -1,7 +1,7 @@
    {% if instance.image %} -
    {% endif %} From 567ff8d314044a9f88f1289315e5388ff91b8306 Mon Sep 17 00:00:00 2001 From: PCoder Date: Sun, 19 Nov 2017 15:51:52 +0100 Subject: [PATCH 0142/1862] Change subtitle to HTMLfield --- .../migrations/0010_auto_20171119_1404.py | 21 +++++++++++++++++++ ungleich_page/models.py | 2 +- 2 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 ungleich_page/migrations/0010_auto_20171119_1404.py diff --git a/ungleich_page/migrations/0010_auto_20171119_1404.py b/ungleich_page/migrations/0010_auto_20171119_1404.py new file mode 100644 index 00000000..4057a90b --- /dev/null +++ b/ungleich_page/migrations/0010_auto_20171119_1404.py @@ -0,0 +1,21 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.4 on 2017-11-19 14:04 +from __future__ import unicode_literals + +from django.db import migrations +import djangocms_text_ckeditor.fields + + +class Migration(migrations.Migration): + + dependencies = [ + ('ungleich_page', '0009_ungleichheader_ungleichheaderitem'), + ] + + operations = [ + migrations.AlterField( + model_name='service', + name='sub_title', + field=djangocms_text_ckeditor.fields.HTMLField(), + ), + ] diff --git a/ungleich_page/models.py b/ungleich_page/models.py index 640e599b..d1e0199b 100644 --- a/ungleich_page/models.py +++ b/ungleich_page/models.py @@ -54,7 +54,7 @@ class UngelichTextSection(CMSPlugin): class Service(CMSPlugin): menu_text = models.CharField(max_length=100, default="", blank=True) title = models.CharField(max_length=200) - sub_title = models.CharField(max_length=200) + sub_title = HTMLField() def __str__(self): return self.title From 16e5fb8f5c9a03cc814c7ddde3537dd32059ed3d Mon Sep 17 00:00:00 2001 From: PCoder Date: Wed, 22 Nov 2017 00:16:39 +0100 Subject: [PATCH 0143/1862] Add multiply filter --- datacenterlight/templatetags/custom_tags.py | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/datacenterlight/templatetags/custom_tags.py b/datacenterlight/templatetags/custom_tags.py index ce6e6724..908b1f89 100644 --- a/datacenterlight/templatetags/custom_tags.py +++ b/datacenterlight/templatetags/custom_tags.py @@ -31,3 +31,14 @@ def get_value_from_dict(dict_data, key): return dict_data.get(key) else: return "" + + +@register.filter('multiply') +def multiply(value, arg): + """ + usage: {{ quantity|multiply:price }} + :param value: + :param arg: + :return: + """ + return value*arg From 1e567ef6ad0e86ec1f438d2e6240944f74bfd9d9 Mon Sep 17 00:00:00 2001 From: PCoder Date: Wed, 22 Nov 2017 00:19:07 +0100 Subject: [PATCH 0144/1862] Add ungleichproduct and ungleichproductitem plugins --- ungleich_page/cms_plugins.py | 36 +++++++++++++++++- ...011_ungleichproduct_ungleichproductitem.py | 38 +++++++++++++++++++ ungleich_page/models.py | 10 ++++- 3 files changed, 81 insertions(+), 3 deletions(-) create mode 100644 ungleich_page/migrations/0011_ungleichproduct_ungleichproductitem.py diff --git a/ungleich_page/cms_plugins.py b/ungleich_page/cms_plugins.py index 9d5cfda0..1b10375a 100644 --- a/ungleich_page/cms_plugins.py +++ b/ungleich_page/cms_plugins.py @@ -4,7 +4,7 @@ from cms.plugin_pool import plugin_pool from .models import ( UngelichContactUsSection, UngelichTextSection, Service, ServiceItem, About, AboutItem, SectionWithImage, UngleichServiceItem, UngleichHeader, - UngleichHeaderItem + UngleichHeaderItem, UngleichProductItem, UngleichProduct ) @@ -208,4 +208,36 @@ class UngleichHeaderItemPlugin(CMSPluginBase): context, instance, placeholder ) context['instance'] = instance - return context \ No newline at end of file + return context + + +@plugin_pool.register_plugin +class UngleichProductsPlugin(CMSPluginBase): + name = "ungleich Products Plugin" + model = UngleichProduct + render_template = "ungleich_page/ungleich/section_products.html" + cache = False + allow_children = True + child_classes = ['UngleichProductsItemPlugin'] + + def render(self, context, instance, placeholder): + context['product_instance'] = instance + context['section_id'] = get_section_id(instance, 'products') + return context + + +@plugin_pool.register_plugin +class UngleichProductsItemPlugin(CMSPluginBase): + name = "ungleich Product Item Plugin" + model = UngleichProductItem + render_template = "ungleich_page/ungleich/_products_item.html" + cache = False + require_parent = True + parent_classes = ['UngleichProductsPlugin'] + + def render(self, context, instance, placeholder): + context = super(UngleichProductsItemPlugin, self).render( + context, instance, placeholder + ) + context['instance'] = instance + return context diff --git a/ungleich_page/migrations/0011_ungleichproduct_ungleichproductitem.py b/ungleich_page/migrations/0011_ungleichproduct_ungleichproductitem.py new file mode 100644 index 00000000..c4984f5a --- /dev/null +++ b/ungleich_page/migrations/0011_ungleichproduct_ungleichproductitem.py @@ -0,0 +1,38 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.4 on 2017-11-21 19:04 +from __future__ import unicode_literals + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('ungleich_page', '0010_auto_20171119_1404'), + ] + + operations = [ + migrations.CreateModel( + name='UngleichProduct', + fields=[ + ('service_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='ungleich_page.Service')), + ('section_class', models.CharField(blank=True, default='', max_length=100)), + ], + options={ + 'abstract': False, + }, + bases=('ungleich_page.service',), + ), + migrations.CreateModel( + name='UngleichProductItem', + fields=[ + ('serviceitem_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='ungleich_page.ServiceItem')), + ('url', models.URLField(blank=True, default='', max_length=300)), + ], + options={ + 'abstract': False, + }, + bases=('ungleich_page.serviceitem',), + ), + ] diff --git a/ungleich_page/models.py b/ungleich_page/models.py index d1e0199b..f936f23b 100644 --- a/ungleich_page/models.py +++ b/ungleich_page/models.py @@ -115,4 +115,12 @@ class UngleichHeaderItem(CMSPlugin): related_name="ungleich_header_item_image", on_delete=models.SET_NULL ) - description = HTMLField() \ No newline at end of file + description = HTMLField() + + +class UngleichProductItem(ServiceItem): + url = models.URLField(max_length=300, default="", blank=True) + + +class UngleichProduct(Service): + section_class = models.CharField(max_length=100, default="", blank=True) \ No newline at end of file From 609a49cdbb825c6aa7dbaa54884758d7c62c36ad Mon Sep 17 00:00:00 2001 From: PCoder Date: Wed, 22 Nov 2017 00:20:06 +0100 Subject: [PATCH 0145/1862] Add section_products and _products_item templates --- .../ungleich/_products_item.html | 6 ++++++ .../ungleich/section_products.html | 20 +++++++++++++++++++ 2 files changed, 26 insertions(+) create mode 100644 ungleich_page/templates/ungleich_page/ungleich/_products_item.html create mode 100644 ungleich_page/templates/ungleich_page/ungleich/section_products.html diff --git a/ungleich_page/templates/ungleich_page/ungleich/_products_item.html b/ungleich_page/templates/ungleich_page/ungleich/_products_item.html new file mode 100644 index 00000000..0a09640d --- /dev/null +++ b/ungleich_page/templates/ungleich_page/ungleich/_products_item.html @@ -0,0 +1,6 @@ + +
    +

    {{ instance.title }}

    +

     

    +

    {{ instance.description }}

    +
    \ No newline at end of file diff --git a/ungleich_page/templates/ungleich_page/ungleich/section_products.html b/ungleich_page/templates/ungleich_page/ungleich/section_products.html new file mode 100644 index 00000000..8eb2f312 --- /dev/null +++ b/ungleich_page/templates/ungleich_page/ungleich/section_products.html @@ -0,0 +1,20 @@ +{% load cms_tags custom_tags %} +
    +
    +
    +
    +
    +

    {{ product_instance.title }}

    +

    {{ product_instance.sub_title }}

    +
    +
    +
    + {% for plugin in product_instance.child_plugin_instances %} +
    + {% render_plugin plugin %} +
    + {% endfor %} +
    +
    +
    +
    \ No newline at end of file From 85289c2eeddc7682e6c66a94469464b2fb95f6dd Mon Sep 17 00:00:00 2001 From: PCoder Date: Thu, 23 Nov 2017 09:45:38 +0100 Subject: [PATCH 0146/1862] Add ungleich customer section, templates and migration --- ungleich_page/cms_plugins.py | 35 +++++++++++++- ...2_ungleichcustomer_ungleichcustomeritem.py | 46 +++++++++++++++++++ ungleich_page/models.py | 22 ++++++++- .../ungleich/_customer_item.html | 2 + .../ungleich/section_customers.html | 35 ++++++++++++++ 5 files changed, 138 insertions(+), 2 deletions(-) create mode 100644 ungleich_page/migrations/0012_ungleichcustomer_ungleichcustomeritem.py create mode 100644 ungleich_page/templates/ungleich_page/ungleich/_customer_item.html create mode 100644 ungleich_page/templates/ungleich_page/ungleich/section_customers.html diff --git a/ungleich_page/cms_plugins.py b/ungleich_page/cms_plugins.py index 1b10375a..d7c3c1a6 100644 --- a/ungleich_page/cms_plugins.py +++ b/ungleich_page/cms_plugins.py @@ -4,7 +4,8 @@ from cms.plugin_pool import plugin_pool from .models import ( UngelichContactUsSection, UngelichTextSection, Service, ServiceItem, About, AboutItem, SectionWithImage, UngleichServiceItem, UngleichHeader, - UngleichHeaderItem, UngleichProductItem, UngleichProduct + UngleichHeaderItem, UngleichProductItem, UngleichProduct, UngleichCustomer, + UngleichCustomerItem ) @@ -241,3 +242,35 @@ class UngleichProductsItemPlugin(CMSPluginBase): ) context['instance'] = instance return context + + +@plugin_pool.register_plugin +class UngleichCustomerSectionPlugin(CMSPluginBase): + name = "ungleich Customer Section Plugin" + model = UngleichCustomer + render_template = "ungleich_page/ungleich/section_customers.html" + cache = False + allow_children = True + child_classes = ['UngleichCustomerItemPlugin'] + + def render(self, context, instance, placeholder): + context['customer_instance'] = instance + context['section_id'] = get_section_id(instance, 'customer') + return context + + +@plugin_pool.register_plugin +class UngleichCustomerItemPlugin(CMSPluginBase): + name = "ungleich Customer Item Plugin" + model = UngleichCustomerItem + render_template = "ungleich_page/ungleich/_customer_item.html" + cache = False + require_parent = True + parent_classes = ['UngleichCustomerSectionPlugin'] + + def render(self, context, instance, placeholder): + context = super(UngleichCustomerItemPlugin, self).render( + context, instance, placeholder + ) + context['instance'] = instance + return context diff --git a/ungleich_page/migrations/0012_ungleichcustomer_ungleichcustomeritem.py b/ungleich_page/migrations/0012_ungleichcustomer_ungleichcustomeritem.py new file mode 100644 index 00000000..148ce241 --- /dev/null +++ b/ungleich_page/migrations/0012_ungleichcustomer_ungleichcustomeritem.py @@ -0,0 +1,46 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.4 on 2017-11-23 08:11 +from __future__ import unicode_literals + +from django.db import migrations, models +import django.db.models.deletion +import djangocms_text_ckeditor.fields +import filer.fields.image + + +class Migration(migrations.Migration): + + dependencies = [ + ('filer', '0005_auto_20171015_0703'), + ('cms', '0014_auto_20160404_1908'), + ('ungleich_page', '0011_ungleichproduct_ungleichproductitem'), + ] + + operations = [ + migrations.CreateModel( + name='UngleichCustomer', + fields=[ + ('service_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='ungleich_page.Service')), + ('section_class', models.CharField(blank=True, default='', max_length=100)), + ('carousel_data_interval', models.IntegerField(default=3000)), + ('bottom_text', djangocms_text_ckeditor.fields.HTMLField(default='

    *ungleich means not equal to (≠) U+2260.

    ')), + ], + options={ + 'abstract': False, + }, + bases=('ungleich_page.service',), + ), + migrations.CreateModel( + name='UngleichCustomerItem', + fields=[ + ('cmsplugin_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='cms.CMSPlugin')), + ('url', models.URLField(blank=True, default='', max_length=300)), + ('description', djangocms_text_ckeditor.fields.HTMLField()), + ('image', filer.fields.image.FilerImageField(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='customer_item_image', to='filer.Image')), + ], + options={ + 'abstract': False, + }, + bases=('cms.cmsplugin',), + ), + ] diff --git a/ungleich_page/models.py b/ungleich_page/models.py index f936f23b..9024ac28 100644 --- a/ungleich_page/models.py +++ b/ungleich_page/models.py @@ -123,4 +123,24 @@ class UngleichProductItem(ServiceItem): class UngleichProduct(Service): - section_class = models.CharField(max_length=100, default="", blank=True) \ No newline at end of file + section_class = models.CharField(max_length=100, default="", blank=True) + + +class UngleichCustomer(Service): + section_class = models.CharField(max_length=100, default="", blank=True) + carousel_data_interval = models.IntegerField(default=3000) + bottom_text = HTMLField( + default='

    *ungleich means ' + 'not equal to (≠) U+2260.

    ' + ) + + +class UngleichCustomerItem(CMSPlugin): + image = FilerImageField( + null=True, + blank=True, + related_name="customer_item_image", + on_delete=models.SET_NULL + ) + url = models.URLField(max_length=300, default="", blank=True) + description = HTMLField() diff --git a/ungleich_page/templates/ungleich_page/ungleich/_customer_item.html b/ungleich_page/templates/ungleich_page/ungleich/_customer_item.html new file mode 100644 index 00000000..794bcb06 --- /dev/null +++ b/ungleich_page/templates/ungleich_page/ungleich/_customer_item.html @@ -0,0 +1,2 @@ + +

    {{ instance.description }}

    \ No newline at end of file diff --git a/ungleich_page/templates/ungleich_page/ungleich/section_customers.html b/ungleich_page/templates/ungleich_page/ungleich/section_customers.html new file mode 100644 index 00000000..afe67b2a --- /dev/null +++ b/ungleich_page/templates/ungleich_page/ungleich/section_customers.html @@ -0,0 +1,35 @@ +{% load cms_tags custom_tags %} +
    +
    +
    +

    {{ customer_instance.title }}

    +

    {{ customer_instance.sub_title }}

    +
    +
    +
    + +
    + +
      + {% for plugin in customer_instance.child_plugin_instances %} +
    1. + {% endfor %} +
    + + +
    + {% for plugin in customer_instance.child_plugin_instances %} +
    + {% render_plugin plugin %} +
    + {% endfor %} +
    +
    + +
    +
    +
    +
    + {{customer_instance.bottom_text}} +
    +
    \ No newline at end of file From 0fff040a9be8ab92758dbf097e1bd3ebc2590d66 Mon Sep 17 00:00:00 2001 From: PCoder Date: Thu, 23 Nov 2017 09:46:42 +0100 Subject: [PATCH 0147/1862] Use forloop.counter --- .../templates/ungleich_page/ungleich/section_products.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ungleich_page/templates/ungleich_page/ungleich/section_products.html b/ungleich_page/templates/ungleich_page/ungleich/section_products.html index 8eb2f312..06e6632d 100644 --- a/ungleich_page/templates/ungleich_page/ungleich/section_products.html +++ b/ungleich_page/templates/ungleich_page/ungleich/section_products.html @@ -10,7 +10,7 @@
    {% for plugin in product_instance.child_plugin_instances %} -
    +
    {% render_plugin plugin %}
    {% endfor %} From 7fa23577f62fa788e11772444bebf3f5f56a63b8 Mon Sep 17 00:00:00 2001 From: "M.Ravi" Date: Thu, 23 Nov 2017 11:35:39 +0100 Subject: [PATCH 0148/1862] Change 0005_auto_20171015_0703 dependency to 0004_auto_20160328_1434 --- ungleich_page/migrations/0008_ungleichserviceitem.py | 2 +- .../migrations/0009_ungleichheader_ungleichheaderitem.py | 2 +- .../migrations/0012_ungleichcustomer_ungleichcustomeritem.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ungleich_page/migrations/0008_ungleichserviceitem.py b/ungleich_page/migrations/0008_ungleichserviceitem.py index 3a029110..2037dcf6 100644 --- a/ungleich_page/migrations/0008_ungleichserviceitem.py +++ b/ungleich_page/migrations/0008_ungleichserviceitem.py @@ -10,7 +10,7 @@ import filer.fields.image class Migration(migrations.Migration): dependencies = [ - ('filer', '0005_auto_20171015_0703'), + ('filer', '0004_auto_20160328_1434'), ('ungleich_page', '0007_auto_20171117_1011'), ] diff --git a/ungleich_page/migrations/0009_ungleichheader_ungleichheaderitem.py b/ungleich_page/migrations/0009_ungleichheader_ungleichheaderitem.py index 499917a2..2faabe45 100644 --- a/ungleich_page/migrations/0009_ungleichheader_ungleichheaderitem.py +++ b/ungleich_page/migrations/0009_ungleichheader_ungleichheaderitem.py @@ -11,7 +11,7 @@ import filer.fields.image class Migration(migrations.Migration): dependencies = [ - ('filer', '0005_auto_20171015_0703'), + ('filer', '0004_auto_20160328_1434'), ('cms', '0014_auto_20160404_1908'), ('ungleich_page', '0008_ungleichserviceitem'), ] diff --git a/ungleich_page/migrations/0012_ungleichcustomer_ungleichcustomeritem.py b/ungleich_page/migrations/0012_ungleichcustomer_ungleichcustomeritem.py index 148ce241..85b1c203 100644 --- a/ungleich_page/migrations/0012_ungleichcustomer_ungleichcustomeritem.py +++ b/ungleich_page/migrations/0012_ungleichcustomer_ungleichcustomeritem.py @@ -11,7 +11,7 @@ import filer.fields.image class Migration(migrations.Migration): dependencies = [ - ('filer', '0005_auto_20171015_0703'), + ('filer', '0004_auto_20160328_1434'), ('cms', '0014_auto_20160404_1908'), ('ungleich_page', '0011_ungleichproduct_ungleichproductitem'), ] From 6ec7fc182b4a60fb8d2ff49205347fb3fc260d81 Mon Sep 17 00:00:00 2001 From: "M.Ravi" Date: Thu, 23 Nov 2017 13:02:08 +0100 Subject: [PATCH 0149/1862] Add ungleich HTML only template --- ungleich_page/cms_plugins.py | 17 ++++++++++- .../migrations/0013_ungleichhtmlonly.py | 29 +++++++++++++++++++ ungleich_page/models.py | 4 +++ .../ungleich_page/ungleich/html_block.html | 5 ++++ 4 files changed, 54 insertions(+), 1 deletion(-) create mode 100644 ungleich_page/migrations/0013_ungleichhtmlonly.py create mode 100644 ungleich_page/templates/ungleich_page/ungleich/html_block.html diff --git a/ungleich_page/cms_plugins.py b/ungleich_page/cms_plugins.py index d7c3c1a6..52762a1b 100644 --- a/ungleich_page/cms_plugins.py +++ b/ungleich_page/cms_plugins.py @@ -5,7 +5,7 @@ from .models import ( UngelichContactUsSection, UngelichTextSection, Service, ServiceItem, About, AboutItem, SectionWithImage, UngleichServiceItem, UngleichHeader, UngleichHeaderItem, UngleichProductItem, UngleichProduct, UngleichCustomer, - UngleichCustomerItem + UngleichCustomerItem, UngleichHTMLOnly ) @@ -274,3 +274,18 @@ class UngleichCustomerItemPlugin(CMSPluginBase): ) context['instance'] = instance return context + + +@plugin_pool.register_plugin +class UngleichHTMLPlugin(CMSPluginBase): + name = "ungleich HTML Plugin" + model = UngleichHTMLOnly + render_template = "ungleich_page/ungleich/html_block.html" + cache = False + + def render(self, context, instance, placeholder): + context = super(UngleichHTMLPlugin, self).render( + context, instance, placeholder + ) + context['instance'] = instance + return context diff --git a/ungleich_page/migrations/0013_ungleichhtmlonly.py b/ungleich_page/migrations/0013_ungleichhtmlonly.py new file mode 100644 index 00000000..c726a5a0 --- /dev/null +++ b/ungleich_page/migrations/0013_ungleichhtmlonly.py @@ -0,0 +1,29 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.4 on 2017-11-23 11:49 +from __future__ import unicode_literals + +from django.db import migrations, models +import django.db.models.deletion +import djangocms_text_ckeditor.fields + + +class Migration(migrations.Migration): + + dependencies = [ + ('cms', '0014_auto_20160404_1908'), + ('ungleich_page', '0012_ungleichcustomer_ungleichcustomeritem'), + ] + + operations = [ + migrations.CreateModel( + name='UngleichHTMLOnly', + fields=[ + ('cmsplugin_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='cms.CMSPlugin')), + ('HTML', djangocms_text_ckeditor.fields.HTMLField()), + ], + options={ + 'abstract': False, + }, + bases=('cms.cmsplugin',), + ), + ] diff --git a/ungleich_page/models.py b/ungleich_page/models.py index 9024ac28..2113b4c0 100644 --- a/ungleich_page/models.py +++ b/ungleich_page/models.py @@ -144,3 +144,7 @@ class UngleichCustomerItem(CMSPlugin): ) url = models.URLField(max_length=300, default="", blank=True) description = HTMLField() + + +class UngleichHTMLOnly(CMSPlugin): + HTML = HTMLField() diff --git a/ungleich_page/templates/ungleich_page/ungleich/html_block.html b/ungleich_page/templates/ungleich_page/ungleich/html_block.html new file mode 100644 index 00000000..65c7b792 --- /dev/null +++ b/ungleich_page/templates/ungleich_page/ungleich/html_block.html @@ -0,0 +1,5 @@ +{% load cms_tags static %} +{{instance.HTML}} +{% for plugin in instance.child_plugin_instances %} + {% render_plugin plugin %} +{% endfor %} From db4362af01a7e6650773fd99619b4d8c2f77a957 Mon Sep 17 00:00:00 2001 From: "M.Ravi" Date: Thu, 23 Nov 2017 14:52:21 +0100 Subject: [PATCH 0150/1862] Remove unused includes in ungleich_cms_page --- .../ungleich_page/ungleich_cms_page.html | 21 ------------------- 1 file changed, 21 deletions(-) diff --git a/ungleich_page/templates/ungleich_page/ungleich_cms_page.html b/ungleich_page/templates/ungleich_page/ungleich_cms_page.html index 9f863f1f..763e25c1 100644 --- a/ungleich_page/templates/ungleich_page/ungleich_cms_page.html +++ b/ungleich_page/templates/ungleich_page/ungleich_cms_page.html @@ -89,27 +89,6 @@ {% placeholder 'Ungleich Page Contents' %} - - {% include "ungleich_page/includes/_header.html" %} - - - {% include "ungleich_page/includes/_services.html" %} - - - {% include "ungleich_page/includes/_portfolio.html" %} - - - {% include "ungleich_page/includes/_about.html" %} - - - {% include "ungleich_page/includes/_team.html" %} - - - {% include "ungleich_page/includes/_softwares.html" %} - - - {% include "ungleich_page/includes/_contact_us.html" %} - {% include "ungleich_page/includes/_footer.html" %} From f4b252ff090d3116205392989d1a144192a19268 Mon Sep 17 00:00:00 2001 From: "M.Ravi" Date: Thu, 23 Nov 2017 17:15:19 +0100 Subject: [PATCH 0151/1862] Show carousel indicators only if we have more than 1 item --- .../templates/ungleich_page/ungleich/header.html | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/ungleich_page/templates/ungleich_page/ungleich/header.html b/ungleich_page/templates/ungleich_page/ungleich/header.html index 89def4ee..9cf759e6 100644 --- a/ungleich_page/templates/ungleich_page/ungleich/header.html +++ b/ungleich_page/templates/ungleich_page/ungleich/header.html @@ -2,12 +2,13 @@
    @@ -26,8 +25,7 @@

    {% trans "Configuration as a Service" %}

    -

     

    -

    {% trans "Ruby on Rails, Django, Java, Webserver, Mailserver, any infrastructure that needs to configured, we provide comprehensive solutions. Amazon, rackspace or bare metal servers, we configure for you." %}

    +

    {% trans "Ruby on Rails, Django, Java, Webserver, Mailserver, any infrastructure that needs to configured, we provide comprehensive solutions. Amazon, rackspace or bare metal servers, we configure for you." %}

    @@ -36,7 +34,6 @@

    {% trans "Linux System Engineering" %}

    -

     

    {% trans "Let your developers develop! We take care of your system administration. Gentoo, Archlinux, Debian, Ubuntu, and many more." %}

    From 3eebed6245fb48b27180ae0a9f208bfd9ada65c6 Mon Sep 17 00:00:00 2001 From: Arvind Tiwari Date: Wed, 29 Nov 2017 00:55:13 +0530 Subject: [PATCH 0210/1862] about section heading margin fix --- ungleich_page/static/ungleich_page/css/agency.css | 8 -------- 1 file changed, 8 deletions(-) diff --git a/ungleich_page/static/ungleich_page/css/agency.css b/ungleich_page/static/ungleich_page/css/agency.css index c8687625..eb485f78 100755 --- a/ungleich_page/static/ungleich_page/css/agency.css +++ b/ungleich_page/static/ungleich_page/css/agency.css @@ -560,10 +560,6 @@ section h3.section-subheading { color: inherit; } -.timeline .timeline-heading-last h4 { - margin-top: 15px; -} - .timeline .timeline-heading h4.subheading { text-transform: none; } @@ -631,10 +627,6 @@ section h3.section-subheading { line-height: 26px; } - .timeline .timeline-heading-last h4 { - margin-top: 45px; - } - .timeline>li.timeline-inverted>.timeline-panel { padding: 10px 20px 20px; } From 1d3307043e06235709c009a103ce43f0687e1bad Mon Sep 17 00:00:00 2001 From: Arvind Tiwari Date: Wed, 29 Nov 2017 01:30:50 +0530 Subject: [PATCH 0211/1862] mobile text size and alignment fix --- .../static/digitalglarus/css/agency.css | 23 ------ .../static/digitalglarus/css/agency1.css | 23 ------ .../static/ungleich_page/css/agency.css | 82 +++++++++++-------- .../static/ungleich_page/css/ungleich.css | 18 ++-- .../ungleich_page/includes/_contact_us.html | 8 +- .../ungleich_page/includes/_portfolio.html | 12 +-- .../ungleich_page/includes/_services.html | 4 +- 7 files changed, 69 insertions(+), 101 deletions(-) diff --git a/digitalglarus/static/digitalglarus/css/agency.css b/digitalglarus/static/digitalglarus/css/agency.css index 1ce961ba..4ac531c2 100755 --- a/digitalglarus/static/digitalglarus/css/agency.css +++ b/digitalglarus/static/digitalglarus/css/agency.css @@ -964,29 +964,6 @@ section h3.section-comment { color: #494949; } -small-comment { - font-family: "Open Sans", "Droid Serif", "Helvetica Neue", Helvetica, Arial, sans-serif; - margin-bottom: none; - font-transform: none; - font-size:10px; - font-weight:400; - color: #777 -} - -logo-image { - z-index: 100; - position: absolute; - left: 0; - width: 80px; - height: 80px; - margin-left: 0; - border: 7px solid #f1f1f1; - border-radius: 100%; - text-align: center; - color: #fff; - background-color: #a1cfd7; -} - .intro-small { font-family: 'Montserrat' ,'Raleway', "Open Sans Bold", Helvetica, Arial, "Arial Bold", sans-serif; font-size: 20px; diff --git a/digitalglarus/static/digitalglarus/css/agency1.css b/digitalglarus/static/digitalglarus/css/agency1.css index 40507f78..6178630c 100755 --- a/digitalglarus/static/digitalglarus/css/agency1.css +++ b/digitalglarus/static/digitalglarus/css/agency1.css @@ -960,29 +960,6 @@ section h3.section-comment { color: #494949; } -small-comment { - font-family: "Open Sans", "Droid Serif", "Helvetica Neue", Helvetica, Arial, sans-serif; - margin-bottom: none; - font-transform: none; - font-size:10px; - font-weight:400; - color: #777 -} - -logo-image { - z-index: 100; - position: absolute; - left: 0; - width: 80px; - height: 80px; - margin-left: 0; - border: 7px solid #f1f1f1; - border-radius: 100%; - text-align: center; - color: #fff; - background-color: #a1cfd7; -} - .intro-small { font-family: 'Montserrat' ,'Raleway', "Open Sans Bold", Helvetica, Arial, "Arial Bold", sans-serif; font-size: 20px; diff --git a/ungleich_page/static/ungleich_page/css/agency.css b/ungleich_page/static/ungleich_page/css/agency.css index eb485f78..e5d30bc0 100755 --- a/ungleich_page/static/ungleich_page/css/agency.css +++ b/ungleich_page/static/ungleich_page/css/agency.css @@ -345,15 +345,15 @@ section { section h2.section-heading { margin-top: 0; margin-bottom: 15px; - font-size: 24px; + font-size: 18px; color: #494949; } section h3.section-subheading { - margin-bottom: 75px; + margin-bottom: 50px; text-transform: none; font-family: 'Raleway', "Helvetica Neue", "Open Sans", "Droid Serif", Helvetica, Arial, sans-serif; - font-size: 18px; + font-size: 16px; font-weight: 400; color: #494949; line-height: 1.4; @@ -366,6 +366,10 @@ section h3.section-subheading { section h2.section-heading { font-size: 40px; } + section h3.section-subheading { + font-size: 18px; + margin-bottom: 75px; + } } .service-heading { @@ -431,7 +435,7 @@ section h3.section-subheading { } #portfolio .portfolio-item .portfolio-caption h4 { - margin: 0 0 20px; + margin: 0 0 17px; text-transform: none; color: #494949; } @@ -450,7 +454,7 @@ section h3.section-subheading { display: inline-block } -@media(min-width:767px) { +@media(min-width:768px) { #portfolio .portfolio-item { margin: 0 0 30px; } @@ -560,6 +564,10 @@ section h3.section-subheading { color: inherit; } +.timeline .timeline-heading h4 { + margin-bottom: 0; +} + .timeline .timeline-heading h4.subheading { text-transform: none; } @@ -657,7 +665,7 @@ section h3.section-subheading { } .team-member { - margin-bottom: 50px; + margin-bottom: 25px; text-align: center; } @@ -667,11 +675,27 @@ section h3.section-subheading { } .team-member h4 { - margin-top: 20px; - margin-bottom: 20px; + margin-top: 10px; + margin-bottom: 10px; text-transform: none; } +@media(max-width:767px) { + .team-member .team-member-caption p { + line-height: 1.5; + } +} + +@media(min-width:768px) { + .team-member { + margin-bottom: 50px; + } + .team-member h4 { + margin-top: 20px; + margin-bottom: 20px; + } +} + .team-member p { margin-top: 0; } @@ -692,6 +716,15 @@ section#contact .section-heading { font-size: 32px; } +@media(max-width:767px) { + section#contact .section-heading { + font-size: 20px; + } + section#contact .intro-smallcap { + font-size: 18px; + } +} + section#contact .form-group { color:white; margin-bottom: 25px; @@ -903,36 +936,15 @@ section h3.section-comment { color: #494949; } -small-comment { - font-family: "Open Sans", "Droid Serif", "Helvetica Neue", Helvetica, Arial, sans-serif; - margin-bottom: none; - font-transform: none; - font-size:10px; - font-weight:400; - color: #777 -} - -logo-image { - z-index: 100; - position: absolute; - left: 0; - width: 80px; - height: 80px; - margin-left: 0; - border: 7px solid #f1f1f1; - border-radius: 100%; - text-align: center; - color: #fff; - background-color: #fed136; -} - .carousel-indicators li.active, .text-carousel .carousel-indicators li.active { border: 0; background-color: #fed136; } -@media (min-width: 740px) -.carousel-inner, .text-carousel .carousel-inner { - min-height: 225px; + +@media (min-width: 740px) { + .carousel-inner, .text-carousel .carousel-inner { + min-height: 225px; + } } .carousel-text { @@ -943,4 +955,4 @@ logo-image { lign-heignt: 2px; color : #666; text-align : center; -} +} \ No newline at end of file diff --git a/ungleich_page/static/ungleich_page/css/ungleich.css b/ungleich_page/static/ungleich_page/css/ungleich.css index d8c6e8b5..623060b3 100644 --- a/ungleich_page/static/ungleich_page/css/ungleich.css +++ b/ungleich_page/static/ungleich_page/css/ungleich.css @@ -120,15 +120,11 @@ } @media (max-width: 767px) { - .portfolio-item .portfolio-caption p, - section h2.section-heading, - section h3.section-subheading, - #portfolio .portfolio-item .portfolio-caption h4 { - text-align: left; - } - section h2.section-heading, - section h3.section-subheading { + .intro-smallcap.sm_left, + .section-heading.sm_left, + .section-subheading.sm_left { padding-left: 15px; + padding-right: 15px; } } @@ -251,6 +247,12 @@ padding-bottom: 0; } +@media (max-width: 767px) { + .sm_left { + text-align: left !important; + } +} + @media (min-width: 768px) and (max-width: 991px) { .timeline>li .timeline-panel { diff --git a/ungleich_page/templates/ungleich_page/includes/_contact_us.html b/ungleich_page/templates/ungleich_page/includes/_contact_us.html index 6078ae4b..2a2ef246 100644 --- a/ungleich_page/templates/ungleich_page/includes/_contact_us.html +++ b/ungleich_page/templates/ungleich_page/includes/_contact_us.html @@ -12,16 +12,16 @@ {{ message }}
    {% endfor %} -

    {% trans "Contact Us" %}

    -

    +

    {% trans "Contact Us" %}

    +

    {% trans "Join us at" %} {% trans "Digital Glarus" %}, {% trans "a great co-working space in the middle of Alps!" %}
    {% trans "You can contact us at" %}

    -

    +

    info@ungleich.ch

    -

    (044) 534-66-22

    +

    (044) 534-66-22

    diff --git a/ungleich_page/templates/ungleich_page/includes/_portfolio.html b/ungleich_page/templates/ungleich_page/includes/_portfolio.html index b195ead8..db5ce56e 100644 --- a/ungleich_page/templates/ungleich_page/includes/_portfolio.html +++ b/ungleich_page/templates/ungleich_page/includes/_portfolio.html @@ -4,27 +4,27 @@
    -

    {% trans "Our Products" %}

    -

    {% blocktrans %}Our products include an innovative datacenter,
    affordable VM hosting, and high speed fiber internet for canton Glarus.{% endblocktrans %}

    +

    {% trans "Our Products" %}

    +

    {% blocktrans %}Our products include an innovative datacenter,
    affordable VM hosting, and high speed fiber internet for canton Glarus.{% endblocktrans %}

    -
    +

    {% trans "Data Center Light" %}

    -

    {% trans "We offer the most affordable hosting in Switzerland. Data Center Light has full FOSS stack, 100% IPv6 and 100% SSD. Choose any configuration among CentOS, Debian, Ubuntu, Devuan, and FreeBSD." %}

    +

    {% trans "We offer the most affordable hosting in Switzerland. Data Center Light has full FOSS stack, 100% IPv6 and 100% SSD. Choose any configuration among CentOS, Debian, Ubuntu, Devuan, and FreeBSD." %}

    -
    +

    {% trans "Rails Hosting" %}

    {% trans "Ready to go live with your Ruby on Rails application? We offer you ready-to-deploy virtual machines or configure your existing infrastructure for Ruby on Rails." %}

    -
    +

    {% trans "High Speed Internet" %}

    {% trans "We offer high speed fiber internet in Glarus Süd, Glarus and Glarus Nord. Experience 100 Mbit/s and see how speed can change everything." %}

    diff --git a/ungleich_page/templates/ungleich_page/includes/_services.html b/ungleich_page/templates/ungleich_page/includes/_services.html index 37140629..55db52f1 100644 --- a/ungleich_page/templates/ungleich_page/includes/_services.html +++ b/ungleich_page/templates/ungleich_page/includes/_services.html @@ -4,8 +4,8 @@
    -

    {% trans "our services" %}

    -

    +

    {% trans "our services" %}

    +

    {% trans "We support our clients in all areas of Unix infrastructure." %}
    {% trans "Our top notch configuration management is refreshingly simple and reliable." %}

    From bb8195bc0a16e82f4194d36b3be7d6afef81369a Mon Sep 17 00:00:00 2001 From: Arvind Tiwari Date: Wed, 29 Nov 2017 02:56:31 +0530 Subject: [PATCH 0212/1862] contact section background, logos width --- .../static/ungleich_page/css/agency.css | 42 +++++++++++++--- .../static/ungleich_page/css/ungleich.css | 22 ++++---- .../ungleich_page/includes/_contact_us.html | 5 +- .../ungleich_page/includes/_portfolio.html | 2 +- .../ungleich_page/includes/_services.html | 2 +- .../ungleich_page/includes/_softwares.html | 50 +++++++++---------- .../ungleich_page/includes/_team.html | 8 +-- 7 files changed, 79 insertions(+), 52 deletions(-) diff --git a/ungleich_page/static/ungleich_page/css/agency.css b/ungleich_page/static/ungleich_page/css/agency.css index e5d30bc0..cccc1de6 100755 --- a/ungleich_page/static/ungleich_page/css/agency.css +++ b/ungleich_page/static/ungleich_page/css/agency.css @@ -13,6 +13,14 @@ body { font-family: "Helvetica Neue",Helvetica,Arial,sans-serif; } +.row-eq-height { + display: -webkit-box; + display: -webkit-flex; + display: -ms-flexbox; + display: flex; + flex-wrap: wrap; +} + .text-muted { color: #494949; font-family: 'Raleway' , "Open Sans", "Helvetica Neue", Helvetica, Arial, sans-serif; @@ -345,7 +353,7 @@ section { section h2.section-heading { margin-top: 0; margin-bottom: 15px; - font-size: 18px; + font-size: 22px; color: #494949; } @@ -705,10 +713,16 @@ aside.clients img { } section#contact { - background-color: #222; - background-image: url(../img/map-image.png); - background-position: center; - background-repeat: no-repeat; + position: relative; + background: rgba(0,0,0,0.75); +} + +section#contact .bg_img { + filter: blur(1px); +} + +section#contact a { + color: #79bcf7; } section#contact .section-heading { @@ -717,8 +731,11 @@ section#contact .section-heading { } @media(max-width:767px) { + aside.clients img { + margin: 20px auto; + } section#contact .section-heading { - font-size: 20px; + font-size: 24px; } section#contact .intro-smallcap { font-size: 18px; @@ -943,7 +960,7 @@ section h3.section-comment { @media (min-width: 740px) { .carousel-inner, .text-carousel .carousel-inner { - min-height: 225px; + min-height: 225px; } } @@ -952,7 +969,16 @@ section h3.section-comment { font-family:'Raleway' , Montserrat,"Helvetica Neue",Helvetica,Arial,sans-serif; font-size : 20px; font-weight : 100; - lign-heignt: 2px; color : #666; text-align : center; +} + +@media (max-width: 767px) { + .carousel-text { + height: 220px; + overflow: scroll; + } + .carousel-author { + height: 72px; + } } \ No newline at end of file diff --git a/ungleich_page/static/ungleich_page/css/ungleich.css b/ungleich_page/static/ungleich_page/css/ungleich.css index 623060b3..6a00c584 100644 --- a/ungleich_page/static/ungleich_page/css/ungleich.css +++ b/ungleich_page/static/ungleich_page/css/ungleich.css @@ -165,17 +165,6 @@ justify-content: flex-end; } -.header_slider > .carousel .bg_img { - position: absolute; - top: 0; - left: 0; - z-index: -1; - width: 100%; - height: 100%; - background-size: cover; - background-position: center; -} - .header_slider .intro-cap { text-align: right; line-height: 1.1; @@ -226,6 +215,17 @@ } } +.bg_img { + position: absolute; + top: 0; + left: 0; + z-index: -1; + width: 100%; + height: 100%; + background-size: cover; + background-position: center; +} + .timeline>li .timeline-panel { display: flex; flex-direction: column; diff --git a/ungleich_page/templates/ungleich_page/includes/_contact_us.html b/ungleich_page/templates/ungleich_page/includes/_contact_us.html index 2a2ef246..1038f358 100644 --- a/ungleich_page/templates/ungleich_page/includes/_contact_us.html +++ b/ungleich_page/templates/ungleich_page/includes/_contact_us.html @@ -2,6 +2,7 @@ {% load i18n %}
    +
    @@ -12,13 +13,13 @@ {{ message }}
    {% endfor %} -

    {% trans "Contact Us" %}

    +

    {% trans "Contact Us" %}

    {% trans "Join us at" %} {% trans "Digital Glarus" %}, {% trans "a great co-working space in the middle of Alps!" %}
    {% trans "You can contact us at" %}

    - info@ungleich.ch + info@ungleich.ch

    (044) 534-66-22

    diff --git a/ungleich_page/templates/ungleich_page/includes/_portfolio.html b/ungleich_page/templates/ungleich_page/includes/_portfolio.html index db5ce56e..7ea376b1 100644 --- a/ungleich_page/templates/ungleich_page/includes/_portfolio.html +++ b/ungleich_page/templates/ungleich_page/includes/_portfolio.html @@ -4,7 +4,7 @@
    -

    {% trans "Our Products" %}

    +

    {% trans "Our Products" %}

    {% blocktrans %}Our products include an innovative datacenter,
    affordable VM hosting, and high speed fiber internet for canton Glarus.{% endblocktrans %}

    diff --git a/ungleich_page/templates/ungleich_page/includes/_services.html b/ungleich_page/templates/ungleich_page/includes/_services.html index 55db52f1..3f2311f0 100644 --- a/ungleich_page/templates/ungleich_page/includes/_services.html +++ b/ungleich_page/templates/ungleich_page/includes/_services.html @@ -4,7 +4,7 @@
    -

    {% trans "our services" %}

    +

    {% trans "our services" %}

    {% trans "We support our clients in all areas of Unix infrastructure." %}
    {% trans "Our top notch configuration management is refreshingly simple and reliable." %} diff --git a/ungleich_page/templates/ungleich_page/includes/_softwares.html b/ungleich_page/templates/ungleich_page/includes/_softwares.html index b5ece4d8..2af2a3e1 100644 --- a/ungleich_page/templates/ungleich_page/includes/_softwares.html +++ b/ungleich_page/templates/ungleich_page/includes/_softwares.html @@ -2,112 +2,112 @@

    -{% endblock %} \ No newline at end of file +{% endblock %} From e6931534abc3ce8303e9446b7198f6ea44b7e0b9 Mon Sep 17 00:00:00 2001 From: "M.Ravi" Date: Wed, 27 Dec 2017 18:09:45 +0100 Subject: [PATCH 0334/1862] Load i18n in ungleich_page's _header_with_background_video_slider_item.html --- .../ungleich/_header_with_background_video_slider_item.html | 1 + 1 file changed, 1 insertion(+) diff --git a/ungleich_page/templates/ungleich_page/ungleich/_header_with_background_video_slider_item.html b/ungleich_page/templates/ungleich_page/ungleich/_header_with_background_video_slider_item.html index a576684f..78bb7ad8 100644 --- a/ungleich_page/templates/ungleich_page/ungleich/_header_with_background_video_slider_item.html +++ b/ungleich_page/templates/ungleich_page/ungleich/_header_with_background_video_slider_item.html @@ -1,3 +1,4 @@ +{% load i18n %} {% if instance.image %}
    {% endif %} From 31895688849eabf3124c075293045f692e518400 Mon Sep 17 00:00:00 2001 From: PCoder Date: Wed, 27 Dec 2017 20:04:20 +0100 Subject: [PATCH 0335/1862] Send emails to admin when Stripe transaction error --- digitalglarus/views.py | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/digitalglarus/views.py b/digitalglarus/views.py index 3b12934f..32d8e1f5 100644 --- a/digitalglarus/views.py +++ b/digitalglarus/views.py @@ -24,6 +24,7 @@ from utils.forms import ( ) from utils.stripe_utils import StripeUtils from utils.models import UserBillingAddress +from utils.tasks import send_plain_email_task from .forms import ( LoginForm, SignupForm, MembershipBillingForm, BookingDateForm, @@ -387,6 +388,18 @@ class MembershipPaymentView(LoginRequiredMixin, IsNotMemberMixin, FormView): 'paymentError': charge_response.get('error'), 'form': form }) + email_to_admin_data = { + 'subject': "Could not create charge for Digital Glarus " + "user: {user}".format( + user=self.request.user.email + ), + 'from_email': 'info@digitalglarus.ch', + 'to': ['info@ungleich.ch'], + 'body': "\n".join( + ["%s=%s" % (k, v) for (k, v) in + charge_response.items()]), + } + send_plain_email_task.delay(email_to_admin_data) return render(request, self.template_name, context) # Subscribe the customer to dg plan from the next month onwards @@ -415,6 +428,18 @@ class MembershipPaymentView(LoginRequiredMixin, IsNotMemberMixin, FormView): 'paymentError': subscription_result.get('error'), 'form': form }) + email_to_admin_data = { + 'subject': "Could not create Stripe subscription for " + "Digital Glarus user: {user}".format( + user=self.request.user.email + ), + 'from_email': 'info@digitalglarus.ch', + 'to': ['info@ungleich.ch'], + 'body': "\n".join( + ["%s=%s" % (k, v) for (k, v) in + subscription_result.items()]), + } + send_plain_email_task.delay(email_to_admin_data) return render(request, self.template_name, context) charge = charge_response.get('response_object') From 0abd165c8e32c0ed0db3a388f32b3de89a938ba4 Mon Sep 17 00:00:00 2001 From: PCoder Date: Wed, 27 Dec 2017 20:21:37 +0100 Subject: [PATCH 0336/1862] Skip test_post if Stripe API key is not provided --- digitalglarus/test_views.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/digitalglarus/test_views.py b/digitalglarus/test_views.py index cdd23bad..b7fc6c3a 100644 --- a/digitalglarus/test_views.py +++ b/digitalglarus/test_views.py @@ -1,5 +1,5 @@ from model_mommy import mommy -from unittest import mock +from unittest import mock, skipIf from django.test import TestCase from django.conf import settings @@ -126,6 +126,11 @@ class MembershipPaymentViewTest(BaseTestCase): self.assertEqual(response.context['membership_type'], self.membership_type) + @skipIf( + settings.STRIPE_API_PRIVATE_KEY_TEST is None or + settings.STRIPE_API_PRIVATE_KEY_TEST is "", + """Stripe details unavailable, so skipping CeleryTaskTestCase""" + ) @mock.patch('utils.stripe_utils.StripeUtils.create_customer') def test_post(self, stripe_mocked_call): From 01b8266b613bc50e1611d546c1fcf5d1baf9bdbf Mon Sep 17 00:00:00 2001 From: PCoder Date: Wed, 27 Dec 2017 20:37:34 +0100 Subject: [PATCH 0337/1862] Update Changelog --- Changelog | 1 + 1 file changed, 1 insertion(+) diff --git a/Changelog b/Changelog index 1ad8f324..63c4fd07 100644 --- a/Changelog +++ b/Changelog @@ -8,6 +8,7 @@ Next: * #3601: [dcl, hosting] Change minimum required RAM from 2GB to 1GB * #3973: [dcl] Update datacenterlight and glasfaser contact address to Linthal and company name to "ungleich glarus ag" * #3993: [dg] Fix new user membership payment by setting cardholder_name field for UserBillingAddressForm + * #3799: [dg] Make digital glarus billing work as monthly subscription 1.2.13: 2017-12-09 * [cms] Introduce UngleichHeaderBackgroundImageAndTextSliderPlugin that allows to have scrolling images and texts * [cms] Remove

    tag for ungleich cms customer item template From 23c4069ebd8d36a606087de2b8c7c8b180f3a296 Mon Sep 17 00:00:00 2001 From: PCoder Date: Wed, 27 Dec 2017 21:31:53 +0100 Subject: [PATCH 0338/1862] Update Changelog for release 1.3 --- Changelog | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Changelog b/Changelog index 63c4fd07..cb078924 100644 --- a/Changelog +++ b/Changelog @@ -1,4 +1,4 @@ -Next: +1.3: 2017-12-27 * #3911: [dcl] Integrate resend activation link into dcl landing payment page * #3972: [hosting] Add ungleich company info to invoice footer * #3974: [hosting] Improve invoice number: Show 404 for invoice resources that do not belong to the user @@ -9,6 +9,7 @@ Next: * #3973: [dcl] Update datacenterlight and glasfaser contact address to Linthal and company name to "ungleich glarus ag" * #3993: [dg] Fix new user membership payment by setting cardholder_name field for UserBillingAddressForm * #3799: [dg] Make digital glarus billing work as monthly subscription + * #3994: [dg] Add a line on signup for clarifying dcl users can login without new signup 1.2.13: 2017-12-09 * [cms] Introduce UngleichHeaderBackgroundImageAndTextSliderPlugin that allows to have scrolling images and texts * [cms] Remove

    tag for ungleich cms customer item template From 34f841afd4206d93e650cd83b1a60ded136af1df Mon Sep 17 00:00:00 2001 From: PCoder Date: Wed, 27 Dec 2017 21:47:29 +0100 Subject: [PATCH 0339/1862] Update Changelog --- Changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Changelog b/Changelog index cb078924..d4c517b8 100644 --- a/Changelog +++ b/Changelog @@ -2,7 +2,7 @@ * #3911: [dcl] Integrate resend activation link into dcl landing payment page * #3972: [hosting] Add ungleich company info to invoice footer * #3974: [hosting] Improve invoice number: Show 404 for invoice resources that do not belong to the user - * [ungleich] Add video cover to the header on ungleich.ch landing page and add corresponding cms plugin + * #3961: [ungleich] Add video cover to the header on ungleich.ch landing page and add corresponding cms plugin * #3774: [hosting] Update Stripe subscription on vm delete * [ungleich] Update text on landing page * #3601: [dcl, hosting] Change minimum required RAM from 2GB to 1GB From b0993d8728f18e9544681400f64c28642a763207 Mon Sep 17 00:00:00 2001 From: PCoder Date: Wed, 27 Dec 2017 23:44:27 +0100 Subject: [PATCH 0340/1862] Fix address: Bahnhotstrasse to Bahnhofstrasse --- hosting/templates/hosting/order_detail.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosting/templates/hosting/order_detail.html b/hosting/templates/hosting/order_detail.html index 6ea4f36f..2b062b55 100644 --- a/hosting/templates/hosting/order_detail.html +++ b/hosting/templates/hosting/order_detail.html @@ -155,7 +155,7 @@ {% endblock submit_btn %} {% else %}

    - ungleich glarus ag  Bahnhotstrasse 1, 8783 Linthal, Switzerland
    + ungleich glarus ag  Bahnhofstrasse 1, 8783 Linthal, Switzerland
    www.datacenterlight.ch  |  info@datacenterlight.ch
    {% endif %} From f2f1c61739eb6c402083ce02f5a22c2f564086ca Mon Sep 17 00:00:00 2001 From: PCoder Date: Wed, 27 Dec 2017 23:59:40 +0100 Subject: [PATCH 0341/1862] Remove margin from a tags for explanation text --- digitalglarus/templates/digitalglarus/signup.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/digitalglarus/templates/digitalglarus/signup.html b/digitalglarus/templates/digitalglarus/signup.html index 063dcee4..6a46294a 100644 --- a/digitalglarus/templates/digitalglarus/signup.html +++ b/digitalglarus/templates/digitalglarus/signup.html @@ -29,8 +29,8 @@
    -
    From f5db08e3dff1ac14d54ff54027e3f2b9803d4290 Mon Sep 17 00:00:00 2001 From: PCoder Date: Thu, 28 Dec 2017 13:14:59 +0100 Subject: [PATCH 0342/1862] Update psycopg2 from 2.7.1 to 2.7.3.2 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 2ff887a7..7a325357 100644 --- a/requirements.txt +++ b/requirements.txt @@ -67,7 +67,7 @@ lxml==3.6.0 model-mommy==1.2.6 phonenumbers==7.4.0 phonenumberslite==7.4.0 -psycopg2==2.7.1 +psycopg2==2.7.3.2 pycryptodome==3.4 pylibmc==1.5.1 python-dateutil==2.5.3 From a4ff33f0fd1c39b24530714652d44eeb2bfe1cef Mon Sep 17 00:00:00 2001 From: Arvind Tiwari Date: Fri, 29 Dec 2017 18:50:58 +0530 Subject: [PATCH 0343/1862] Update Changelog --- Changelog | 1 + 1 file changed, 1 insertion(+) diff --git a/Changelog b/Changelog index d4c517b8..015600bb 100644 --- a/Changelog +++ b/Changelog @@ -16,6 +16,7 @@ 1.2.12: 2017-12-09 * #3594: [digitalglarus] Remove white scroll bar on the right in mobile * #3905: [ungleich] Update ungleich.ch header into a slider + * #3968: [ungleich] Fix navbar logo alignment * [all] Enable logging custom modules 1.2.11: 2017-11-30 * [all] TravisCI: Test against python 3.4.2 only From ace2abc47e11044dc806dc81b324fc6c61caf4de Mon Sep 17 00:00:00 2001 From: PCoder Date: Sun, 31 Dec 2017 00:58:37 +0100 Subject: [PATCH 0344/1862] Obtain email host, port and tls settings from env --- dynamicweb/settings/base.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dynamicweb/settings/base.py b/dynamicweb/settings/base.py index 67734052..d66093ed 100644 --- a/dynamicweb/settings/base.py +++ b/dynamicweb/settings/base.py @@ -63,8 +63,12 @@ LOGIN_URL = None LOGOUT_URL = None LOGIN_REDIRECT_URL = None -EMAIL_HOST = "localhost" -EMAIL_PORT = 25 +EMAIL_HOST = env("EMAIL_HOST") +if not EMAIL_HOST: + EMAIL_HOST = "localhost" +EMAIL_PORT = int_env("EMAIL_PORT", 25) +EMAIL_USE_TLS = bool_env("EMAIL_USE_TLS") + SECRET_KEY = env('DJANGO_SECRET_KEY') # Application definition From 554335ae19134a04b5c602005647666b98d40a39 Mon Sep 17 00:00:00 2001 From: PCoder Date: Sun, 31 Dec 2017 18:28:41 +0100 Subject: [PATCH 0345/1862] Update Changelog for 1.3.1 --- Changelog | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Changelog b/Changelog index 015600bb..4a9945f9 100644 --- a/Changelog +++ b/Changelog @@ -1,3 +1,6 @@ +1.3.1: 2017-12-31 + * feature: [all] Load email configurations host, port and use_tls from env + * bugfix: [all] Use ungleich's smtp as relayhost for sending emails 1.3: 2017-12-27 * #3911: [dcl] Integrate resend activation link into dcl landing payment page * #3972: [hosting] Add ungleich company info to invoice footer From 43999d803a8a3deb67bc7b94f359ce2a9f808097 Mon Sep 17 00:00:00 2001 From: PCoder Date: Wed, 3 Jan 2018 08:43:57 +0100 Subject: [PATCH 0346/1862] Add sdd_size, hdd_size to VirtualMachineSerializer --- opennebula_api/serializers.py | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/opennebula_api/serializers.py b/opennebula_api/serializers.py index 662b2fb6..07506a8b 100644 --- a/opennebula_api/serializers.py +++ b/opennebula_api/serializers.py @@ -49,6 +49,8 @@ class VirtualMachineSerializer(serializers.Serializer): memory = serializers.SerializerMethodField() disk_size = serializers.SerializerMethodField() + hdd_size = serializers.SerializerMethodField() + sdd_size = serializers.SerializerMethodField() ipv4 = serializers.SerializerMethodField() ipv6 = serializers.SerializerMethodField() vm_id = serializers.IntegerField(read_only=True, source='id') @@ -102,6 +104,22 @@ class VirtualMachineSerializer(serializers.Serializer): disk_size += int(disk.size) return disk_size / 1024 + def get_sdd_size(self, obj): + template = obj.template + disk_size = 0 + for disk in template.disks: + if disk.datastore == 'cephds': + disk_size += int(disk.size) + return disk_size / 1024 + + def get_hdd_size(self, obj): + template = obj.template + disk_size = 0 + for disk in template.disks: + if disk.datastore == 'ceph_hdd_ds': + disk_size += int(disk.size) + return disk_size / 1024 + def get_price(self, obj): template = obj.template price = float(template.vcpu) * 5.0 From 3d1738871b76fb0dcffd343a7a49603d97c0c5da Mon Sep 17 00:00:00 2001 From: PCoder Date: Wed, 3 Jan 2018 08:54:19 +0100 Subject: [PATCH 0347/1862] Replace all ungleich.com with ungleich.ch --- digitalglarus/test_views.py | 2 +- hosting/test_forms.py | 2 +- hosting/test_views.py | 2 +- utils/mailer.py | 2 +- utils/tests.py | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/digitalglarus/test_views.py b/digitalglarus/test_views.py index b7fc6c3a..aff11081 100644 --- a/digitalglarus/test_views.py +++ b/digitalglarus/test_views.py @@ -224,7 +224,7 @@ class SignupViewTest(TestCase): self.view = SignupView self.signup_data = { 'name': 'ungleich', - 'email': 'test@ungleich.com', + 'email': 'test@ungleich.ch', 'password': 'fake_password', 'confirm_password': 'fake_password', } diff --git a/hosting/test_forms.py b/hosting/test_forms.py index 89ddb268..3dd4f8ff 100644 --- a/hosting/test_forms.py +++ b/hosting/test_forms.py @@ -30,7 +30,7 @@ class HostingUserSignupFormTest(TestCase): def setUp(self): self.completed_data = { 'name': 'test name', - 'email': 'test@ungleich.com', + 'email': 'test@ungleich.ch', 'password': 'test_password', 'confirm_password': 'test_password' } diff --git a/hosting/test_views.py b/hosting/test_views.py index 2c71959a..324aa4fa 100644 --- a/hosting/test_views.py +++ b/hosting/test_views.py @@ -505,7 +505,7 @@ class SignupViewTest(TestCase): self.view = SignupView self.signup_data = { 'name': 'ungleich', - 'email': 'test@ungleich.com', + 'email': 'test@ungleich.ch', 'password': 'fake_password', 'confirm_password': 'fake_password', } diff --git a/utils/mailer.py b/utils/mailer.py index d626e733..ae1d96da 100644 --- a/utils/mailer.py +++ b/utils/mailer.py @@ -25,7 +25,7 @@ class BaseEmail(object): self.email.from_email = kwargs.get('from_address') else: self.email.from_email = '(ungleich) ungleich Support ' - self.email.to = [kwargs.get('to', 'info@ungleich.com')] + self.email.to = [kwargs.get('to', 'info@ungleich.ch')] def send(self): self.email.send() diff --git a/utils/tests.py b/utils/tests.py index ce54800a..8abbbb1d 100644 --- a/utils/tests.py +++ b/utils/tests.py @@ -44,7 +44,7 @@ class BaseTestCase(TestCase): # Request Object self.request = HttpRequest() - self.request.META['SERVER_NAME'] = 'ungleich.com' + self.request.META['SERVER_NAME'] = 'ungleich.ch' self.request.META['SERVER_PORT'] = '80' def get_client(self, user): From 74626a59dcd604eb31c56297e0559cd0ab217743 Mon Sep 17 00:00:00 2001 From: Arvind Tiwari Date: Fri, 5 Jan 2018 05:18:35 +0530 Subject: [PATCH 0348/1862] galsfaser section cms plugin extra padding fix --- ungleich_page/static/ungleich_page/css/agency.css | 13 ++++++++++++- .../templates/ungleich_page/glasfaser.html | 11 +++++------ .../glasfaser/section_text_glasfaser.html | 3 +-- 3 files changed, 18 insertions(+), 9 deletions(-) diff --git a/ungleich_page/static/ungleich_page/css/agency.css b/ungleich_page/static/ungleich_page/css/agency.css index 43a05898..011781e3 100755 --- a/ungleich_page/static/ungleich_page/css/agency.css +++ b/ungleich_page/static/ungleich_page/css/agency.css @@ -280,7 +280,7 @@ fieldset[disabled] .btn-xl.active { } .navbar-default .navbar-brand { - padding: 4px 8px 12px; + padding: 8px 8px; } .navbar-default.navbar-shrink .navbar-brand { padding: 6px 8px 10px; @@ -345,6 +345,7 @@ header .intro-text .intro-heading { section { padding: 75px 0; + border-bottom: 1px solid #f3f4f5; } @media(max-width:767px) { @@ -353,6 +354,16 @@ section { } } +section .section-heading-contain { + margin-bottom: 50px; +} + +@media(min-width:767px) { + section .section-heading-contain { + margin-bottom: 75px; + } +} + section h2.section-heading { margin-top: 0; margin-bottom: 15px; diff --git a/ungleich_page/templates/ungleich_page/glasfaser.html b/ungleich_page/templates/ungleich_page/glasfaser.html index 3d8fbb76..77338ac9 100644 --- a/ungleich_page/templates/ungleich_page/glasfaser.html +++ b/ungleich_page/templates/ungleich_page/glasfaser.html @@ -83,7 +83,7 @@
    -
    +
    @@ -96,13 +96,12 @@
    -
    +
    -
    +

    Was ist es?

    -

    Bei diesem Angebot handelt es sich um einen Internetzugang für Firmenkunden.

    @@ -114,7 +113,7 @@
    -
    +

    Technische Details

    Im Angebot enthalten sind

    @@ -156,7 +155,7 @@
    -
    +

    Wie funktioniert es?

    So kommen Sie in wenigen einfachen Schritten zu Ihrem High-Speed-Internet

    diff --git a/ungleich_page/templates/ungleich_page/glasfaser/section_text_glasfaser.html b/ungleich_page/templates/ungleich_page/glasfaser/section_text_glasfaser.html index d3d83dfc..06b0e26d 100644 --- a/ungleich_page/templates/ungleich_page/glasfaser/section_text_glasfaser.html +++ b/ungleich_page/templates/ungleich_page/glasfaser/section_text_glasfaser.html @@ -1,9 +1,8 @@
    -
    +

    {{instance.title}}

    -

    {{instance.description}}

    From 3ef2aa4bfbd007721845c679cd572d717d0da28d Mon Sep 17 00:00:00 2001 From: Arvind Tiwari Date: Fri, 5 Jan 2018 18:31:24 +0530 Subject: [PATCH 0349/1862] removed unused header plugins --- ungleich_page/cms_plugins.py | 70 +------------------ .../migrations/0018_auto_20180105_1826.py | 64 +++++++++++++++++ ungleich_page/models.py | 53 -------------- 3 files changed, 67 insertions(+), 120 deletions(-) create mode 100644 ungleich_page/migrations/0018_auto_20180105_1826.py diff --git a/ungleich_page/cms_plugins.py b/ungleich_page/cms_plugins.py index fb40ea2b..47f296aa 100644 --- a/ungleich_page/cms_plugins.py +++ b/ungleich_page/cms_plugins.py @@ -3,11 +3,10 @@ from cms.plugin_pool import plugin_pool from .models import ( UngelichContactUsSection, UngelichTextSection, Service, ServiceItem, - About, AboutItem, SectionWithImage, UngleichServiceItem, UngleichHeader, - UngleichHeaderItem, UngleichProductItem, UngleichProduct, UngleichCustomer, - UngleichCustomerItem, UngleichHTMLOnly, UngleichSimpleHeader, + About, AboutItem, SectionWithImage, UngleichServiceItem, + UngleichProductItem, UngleichProduct, UngleichCustomer, + UngleichCustomerItem, UngleichHTMLOnly, UngleichHeaderWithBackgroundImageSlider, - UngleichHeaderWithBackgroundImageSliderItem, UngleichHeaderWithBackgroundVideoSliderItem, ) @@ -184,49 +183,6 @@ class UngleichServicesItemPlugin(CMSPluginBase): return context -@plugin_pool.register_plugin -class UngleichHeaderWithTextAndImagePlugin(CMSPluginBase): - name = "ungleich Header with Text and Image Plugin" - model = UngleichSimpleHeader - render_template = "ungleich_page/ungleich/header.html" - cache = False - - def render(self, context, instance, placeholder): - context['instance'] = instance - return context - - -@plugin_pool.register_plugin -class UngleichHeaderWithTextAndImageSliderPlugin(CMSPluginBase): - name = "ungleich Header with Text and Image Slider Plugin" - model = UngleichHeader - render_template = "ungleich_page/ungleich/header_with_slider.html" - cache = False - allow_children = True - child_classes = ['UngleichHeaderItemPlugin'] - - def render(self, context, instance, placeholder): - context['instance'] = instance - return context - - -@plugin_pool.register_plugin -class UngleichHeaderItemPlugin(CMSPluginBase): - name = "ungleich Header Item Plugin" - model = UngleichHeaderItem - render_template = "ungleich_page/ungleich/_header_item.html" - cache = False - require_parent = True - parent_classes = ['UngleichHeaderWithTextAndImageSliderPlugin'] - - def render(self, context, instance, placeholder): - context = super(UngleichHeaderItemPlugin, self).render( - context, instance, placeholder - ) - context['instance'] = instance - return context - - @plugin_pool.register_plugin class UngleichHeaderBackgroundImageAndTextSliderPlugin(CMSPluginBase): name = "ungleich Header with Background and Image Slider Plugin" @@ -237,7 +193,6 @@ class UngleichHeaderBackgroundImageAndTextSliderPlugin(CMSPluginBase): cache = False allow_children = True child_classes = [ - 'UngleichHeaderBackgroundImageAndTextItemPlugin', 'UngleichHeaderBackgroundVideoItemPlugin', ] @@ -263,25 +218,6 @@ class UngleichHeaderBackgroundVideoItemPlugin(CMSPluginBase): return context -@plugin_pool.register_plugin -class UngleichHeaderBackgroundImageAndTextItemPlugin(CMSPluginBase): - name = "ungleich Header with Background and Image and Text Item Plugin" - model = UngleichHeaderWithBackgroundImageSliderItem - render_template = ( - 'ungleich_page/ungleich/_header_with_background_image_slider_item.html' - ) - cache = False - require_parent = True - parent_classes = ['UngleichHeaderBackgroundImageAndTextSliderPlugin'] - - def render(self, context, instance, placeholder): - context = super( - UngleichHeaderBackgroundImageAndTextItemPlugin, self - ).render(context, instance, placeholder) - context['instance'] = instance - return context - - @plugin_pool.register_plugin class UngleichProductsPlugin(CMSPluginBase): name = "ungleich Products Plugin" diff --git a/ungleich_page/migrations/0018_auto_20180105_1826.py b/ungleich_page/migrations/0018_auto_20180105_1826.py new file mode 100644 index 00000000..b269fb04 --- /dev/null +++ b/ungleich_page/migrations/0018_auto_20180105_1826.py @@ -0,0 +1,64 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.4 on 2018-01-05 12:56 +from __future__ import unicode_literals + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('cms', '0014_auto_20160404_1908'), + ('ungleich_page', '0017_auto_20171219_1856'), + ] + + operations = [ + migrations.RemoveField( + model_name='ungleichheader', + name='background_image', + ), + migrations.RemoveField( + model_name='ungleichheader', + name='cmsplugin_ptr', + ), + migrations.RemoveField( + model_name='ungleichheaderitem', + name='cmsplugin_ptr', + ), + migrations.RemoveField( + model_name='ungleichheaderitem', + name='image', + ), + migrations.RemoveField( + model_name='ungleichheaderwithbackgroundimageslideritem', + name='background_image', + ), + migrations.RemoveField( + model_name='ungleichheaderwithbackgroundimageslideritem', + name='cmsplugin_ptr', + ), + migrations.RemoveField( + model_name='ungleichsimpleheader', + name='background_image', + ), + migrations.RemoveField( + model_name='ungleichsimpleheader', + name='cmsplugin_ptr', + ), + migrations.RemoveField( + model_name='ungleichsimpleheader', + name='image', + ), + migrations.DeleteModel( + name='UngleichHeader', + ), + migrations.DeleteModel( + name='UngleichHeaderItem', + ), + migrations.DeleteModel( + name='UngleichHeaderWithBackgroundImageSliderItem', + ), + migrations.DeleteModel( + name='UngleichSimpleHeader', + ), + ] diff --git a/ungleich_page/models.py b/ungleich_page/models.py index ad44c161..b96afcb1 100644 --- a/ungleich_page/models.py +++ b/ungleich_page/models.py @@ -98,63 +98,10 @@ class UngleichServiceItem(ServiceItem): ) -class UngleichSimpleHeader(CMSPlugin): - background_image = FilerImageField( - null=True, - blank=True, - related_name="ungleich_simple_header_background_image", - on_delete=models.SET_NULL - ) - image = FilerImageField( - null=True, - blank=True, - related_name="ungleich_simple_header_image", - on_delete=models.SET_NULL - ) - text = HTMLField() - - -class UngleichHeader(CMSPlugin): - background_image = FilerImageField( - null=True, - blank=True, - related_name="ungleich_header_background_image", - on_delete=models.SET_NULL - ) - carousel_data_interval = models.IntegerField(default=5000) - - -class UngleichHeaderWithBackgroundImageSliderItem(CMSPlugin): - background_image = FilerImageField( - null=True, blank=True, - related_name="ungleich_header_slider_item_image", - on_delete=models.SET_NULL - ) - description = HTMLField( - default='
    We Design, Configure & Maintain ' - '
    Your Linux Infrastructure

    ' - 'Ruby on Rails, Django, Java, Webserver, Mailserver, any ' - 'infrastructure that needs to configured, we provide ' - 'comprehensive solutions. Amazon, rackspace or bare metal ' - 'servers, we configure for you.

    Learn More

    ' - ) - - class UngleichHeaderWithBackgroundImageSlider(CMSPlugin): carousel_data_interval = models.IntegerField(default=2000) -class UngleichHeaderItem(CMSPlugin): - image = FilerImageField( - null=True, - blank=True, - related_name="ungleich_header_item_image", - on_delete=models.SET_NULL - ) - description = HTMLField() - - class UngleichHeaderWithBackgroundVideoSliderItem(CMSPlugin): image = FilerImageField( null=True, From 6dd69b24fa41cb276fca6be99f28e2ac1816be35 Mon Sep 17 00:00:00 2001 From: PCoder Date: Sun, 7 Jan 2018 08:42:52 +0100 Subject: [PATCH 0350/1862] Replace another occurrence in a commented block --- nosystemd/templates/nosystemd/landing.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nosystemd/templates/nosystemd/landing.html b/nosystemd/templates/nosystemd/landing.html index 9836e86c..2e19af2f 100755 --- a/nosystemd/templates/nosystemd/landing.html +++ b/nosystemd/templates/nosystemd/landing.html @@ -96,7 +96,7 @@
    -

    info@ungleich.com

    +

    info@ungleich.ch

    From aff4288cd99c6f5215559c606a4632d81e6dc71a Mon Sep 17 00:00:00 2001 From: PCoder Date: Sun, 7 Jan 2018 09:29:54 +0100 Subject: [PATCH 0351/1862] Update Changelog --- Changelog | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Changelog b/Changelog index 4a9945f9..010e094f 100644 --- a/Changelog +++ b/Changelog @@ -1,3 +1,5 @@ +Next: + * #4000: [all] Replace all ungleich.com with ungleich.ch 1.3.1: 2017-12-31 * feature: [all] Load email configurations host, port and use_tls from env * bugfix: [all] Use ungleich's smtp as relayhost for sending emails From 205274be42c72b60e2ea8f5f50f29a05383c7418 Mon Sep 17 00:00:00 2001 From: Arvind Tiwari Date: Sun, 7 Jan 2018 20:40:38 +0530 Subject: [PATCH 0352/1862] removed ununsed templates --- .../ungleich_page/ungleich/_header_item.html | 14 ------------- ...der_with_background_image_slider_item.html | 4 ---- .../ungleich_page/ungleich/header.html | 15 ------------- .../ungleich/header_with_slider.html | 21 ------------------- 4 files changed, 54 deletions(-) delete mode 100644 ungleich_page/templates/ungleich_page/ungleich/_header_item.html delete mode 100644 ungleich_page/templates/ungleich_page/ungleich/_header_with_background_image_slider_item.html delete mode 100644 ungleich_page/templates/ungleich_page/ungleich/header.html delete mode 100644 ungleich_page/templates/ungleich_page/ungleich/header_with_slider.html diff --git a/ungleich_page/templates/ungleich_page/ungleich/_header_item.html b/ungleich_page/templates/ungleich_page/ungleich/_header_item.html deleted file mode 100644 index a770d1ed..00000000 --- a/ungleich_page/templates/ungleich_page/ungleich/_header_item.html +++ /dev/null @@ -1,14 +0,0 @@ -
    -
    - {% if instance.image %} - -
    - {% endif %} -
    - - {{ instance.description }} - -
    -
    -
    diff --git a/ungleich_page/templates/ungleich_page/ungleich/_header_with_background_image_slider_item.html b/ungleich_page/templates/ungleich_page/ungleich/_header_with_background_image_slider_item.html deleted file mode 100644 index 063a0a7b..00000000 --- a/ungleich_page/templates/ungleich_page/ungleich/_header_with_background_image_slider_item.html +++ /dev/null @@ -1,4 +0,0 @@ -
    -
    - {{ instance.description }} -
    \ No newline at end of file diff --git a/ungleich_page/templates/ungleich_page/ungleich/header.html b/ungleich_page/templates/ungleich_page/ungleich/header.html deleted file mode 100644 index 77c7ffdf..00000000 --- a/ungleich_page/templates/ungleich_page/ungleich/header.html +++ /dev/null @@ -1,15 +0,0 @@ -{% load cms_tags %} - -
    -
    -
    - -


    -
    - - {{ instance.text }} - -
    -
    -
    -
    diff --git a/ungleich_page/templates/ungleich_page/ungleich/header_with_slider.html b/ungleich_page/templates/ungleich_page/ungleich/header_with_slider.html deleted file mode 100644 index 9cf759e6..00000000 --- a/ungleich_page/templates/ungleich_page/ungleich/header_with_slider.html +++ /dev/null @@ -1,21 +0,0 @@ -{% load cms_tags %} -
    - -
    \ No newline at end of file From 157cc5ac5d7161f5ff4442aa6936dae237988678 Mon Sep 17 00:00:00 2001 From: Arvind Tiwari Date: Mon, 8 Jan 2018 00:56:54 +0530 Subject: [PATCH 0353/1862] fix datacenterlight templates --- .../datacenterlight/base_hosting.html | 117 ++++++++++++++++++ .../emails/base_email_datacenterlight.html | 2 + .../_calculator_form.html} | 0 .../templates/datacenterlight/index.html | 2 +- .../datacenterlight/landing_payment.html | 2 +- .../datacenterlight/order_detail.html | 2 +- .../datacenterlight/whydatacenterlight.html | 2 +- datacenterlight/urls.py | 4 +- datacenterlight/views.py | 2 + 9 files changed, 127 insertions(+), 6 deletions(-) create mode 100644 datacenterlight/templates/datacenterlight/base_hosting.html rename datacenterlight/templates/datacenterlight/{calculator_form.html => includes/_calculator_form.html} (100%) diff --git a/datacenterlight/templates/datacenterlight/base_hosting.html b/datacenterlight/templates/datacenterlight/base_hosting.html new file mode 100644 index 00000000..613d67a9 --- /dev/null +++ b/datacenterlight/templates/datacenterlight/base_hosting.html @@ -0,0 +1,117 @@ +{% load staticfiles bootstrap3%} +{% load i18n %} + + + + + + + + + + + + ungleich + + + + + + + + + + + + + + + {% block css_extra %} + {% endblock css_extra %} + + + + + + + + + + + + + {% include "google_analytics.html" %} + + + + + + + {% block navbar %} + {% include "hosting/includes/_navbar_user.html" %} + {% endblock navbar %} + +
    + {% block content %} + {% endblock %} +
    + + + {% if request.user.is_authenticated %} +
    +
    +

    Copyright © ungleich GmbH {% now "Y" %}. {% trans "All Rights Reserved" %}

    +
    +
    + {% else %} +
    + {% include "datacenterlight/includes/_footer.html" %} +
    + {% endif %} + + + + + + + + + + + + + + + + + + + + + {% block js_extra %} + {% comment %} + this block is above some files, because on stripe error scripts below the stripe + script are not properly executed. + {% endcomment %} + {% endblock js_extra %} + + + + + + + + + + + + + + + + + + diff --git a/datacenterlight/templates/datacenterlight/emails/base_email_datacenterlight.html b/datacenterlight/templates/datacenterlight/emails/base_email_datacenterlight.html index be8479d9..3f06b069 100644 --- a/datacenterlight/templates/datacenterlight/emails/base_email_datacenterlight.html +++ b/datacenterlight/templates/datacenterlight/emails/base_email_datacenterlight.html @@ -1,5 +1,7 @@ {% load static from staticfiles %} {% load i18n %} +{% comment %} unused {% endcomment %} +
    - {% include "datacenterlight/calculator_form.html" %} + {% include "datacenterlight/includes/_calculator_form.html" %}
    diff --git a/datacenterlight/templates/datacenterlight/landing_payment.html b/datacenterlight/templates/datacenterlight/landing_payment.html index f2f75e9c..8e779576 100644 --- a/datacenterlight/templates/datacenterlight/landing_payment.html +++ b/datacenterlight/templates/datacenterlight/landing_payment.html @@ -1,4 +1,4 @@ -{% extends "hosting/base_short.html" %} +{% extends "datacenterlight/base_hosting.html" %} {% load staticfiles bootstrap3 i18n %} {% block css_extra %} diff --git a/datacenterlight/templates/datacenterlight/order_detail.html b/datacenterlight/templates/datacenterlight/order_detail.html index ec4befc9..79119777 100644 --- a/datacenterlight/templates/datacenterlight/order_detail.html +++ b/datacenterlight/templates/datacenterlight/order_detail.html @@ -1,4 +1,4 @@ -{% extends "hosting/order_detail.html" %} +{% extends "datacenterlight/base_hosting.html" %} {% load i18n %} {% block navbar %} diff --git a/datacenterlight/templates/datacenterlight/whydatacenterlight.html b/datacenterlight/templates/datacenterlight/whydatacenterlight.html index c54156b6..ee6cfefa 100644 --- a/datacenterlight/templates/datacenterlight/whydatacenterlight.html +++ b/datacenterlight/templates/datacenterlight/whydatacenterlight.html @@ -137,7 +137,7 @@
    - {% include "datacenterlight/calculator_form.html" %} + {% include "datacenterlight/includes/_calculator_form.html" %}
    diff --git a/datacenterlight/urls.py b/datacenterlight/urls.py index 2cd0723f..8d6273ef 100644 --- a/datacenterlight/urls.py +++ b/datacenterlight/urls.py @@ -17,8 +17,8 @@ urlpatterns = [ url(r'^l/$', IndexView.as_view(), name='index_l'), url(r'^whydatacenterlight/?$', WhyDataCenterLightView.as_view(), name='whydatacenterlight'), - url(r'^beta-program/?$', BetaProgramView.as_view(), name='beta'), - url(r'^landing/?$', LandingProgramView.as_view(), name='landing'), + # url(r'^beta-program/?$', BetaProgramView.as_view(), name='beta'), + # url(r'^landing/?$', LandingProgramView.as_view(), name='landing'), url(r'^payment/?$', PaymentOrderView.as_view(), name='payment'), url(r'^order-confirmation/?$', OrderConfirmationView.as_view(), name='order_confirmation'), diff --git a/datacenterlight/views.py b/datacenterlight/views.py index fda8c9c9..8a41005f 100644 --- a/datacenterlight/views.py +++ b/datacenterlight/views.py @@ -76,6 +76,7 @@ class ContactUsView(FormView): class LandingProgramView(TemplateView): + # FIXME: template doesn't exist template_name = "datacenterlight/landing.html" @@ -143,6 +144,7 @@ class BetaAccessView(FormView): class BetaProgramView(CreateView): + # FIXME: template doesn't exist template_name = "datacenterlight/beta.html" model = BetaAccessVM fields = '__all__' From 24bd5a18809fe1348f4243035cc4b5602c7e6dae Mon Sep 17 00:00:00 2001 From: Arvind Tiwari Date: Mon, 8 Jan 2018 02:33:04 +0530 Subject: [PATCH 0354/1862] navbar closes on click, smooth scroll enabled --- .../static/ungleich_page/js/ungleich.js | 27 +++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/ungleich_page/static/ungleich_page/js/ungleich.js b/ungleich_page/static/ungleich_page/js/ungleich.js index ca6a71e3..d2121bcb 100644 --- a/ungleich_page/static/ungleich_page/js/ungleich.js +++ b/ungleich_page/static/ungleich_page/js/ungleich.js @@ -15,3 +15,30 @@ function toggleImage(e) { $this.fadeIn(300); }); }; + +/*! + * Start Bootstrap - Agnecy Bootstrap Theme (http://startbootstrap.com) + * Code licensed under the Apache License v2.0. + * For details, see http://www.apache.org/licenses/LICENSE-2.0. + */ + +// jQuery for page scrolling feature - requires jQuery Easing plugin +$(function() { + $('a.page-scroll').bind('click', function(event) { + var $anchor = $(this); + $('html, body').stop().animate({ + scrollTop: $($anchor.attr('href')).offset().top + }, 1500, 'easeInOutExpo'); + event.preventDefault(); + }); +}); + +// Highlight the top nav as scrolling occurs +$('body').scrollspy({ + target: '.navbar-fixed-top' +}) + +// Closes the Responsive Menu on Menu Item Click +$('.navbar-collapse ul li a').click(function() { + $('.navbar-toggle:visible').click(); +}); From 12fe1fa7226cc5a6967bd6e77057b3da6da1606a Mon Sep 17 00:00:00 2001 From: Arvind Tiwari Date: Mon, 8 Jan 2018 02:45:16 +0530 Subject: [PATCH 0355/1862] Update Changelog --- Changelog | 1 + 1 file changed, 1 insertion(+) diff --git a/Changelog b/Changelog index 010e094f..7e681a75 100644 --- a/Changelog +++ b/Changelog @@ -1,5 +1,6 @@ Next: * #4000: [all] Replace all ungleich.com with ungleich.ch + * #4067: [ungleich] mobile navbar toggle fix 1.3.1: 2017-12-31 * feature: [all] Load email configurations host, port and use_tls from env * bugfix: [all] Use ungleich's smtp as relayhost for sending emails From 0697492ab8cc2912adbf2fbf7c82855cda988ade Mon Sep 17 00:00:00 2001 From: Arvind Tiwari Date: Mon, 8 Jan 2018 07:36:30 +0530 Subject: [PATCH 0356/1862] removed unused css files --- datacenterlight/templates/datacenterlight/base_hosting.html | 3 --- datacenterlight/templates/datacenterlight/beta_success.html | 1 - dynamicweb/settings/base.py | 2 +- 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/datacenterlight/templates/datacenterlight/base_hosting.html b/datacenterlight/templates/datacenterlight/base_hosting.html index 613d67a9..848b8a46 100644 --- a/datacenterlight/templates/datacenterlight/base_hosting.html +++ b/datacenterlight/templates/datacenterlight/base_hosting.html @@ -21,10 +21,8 @@ - - {% block css_extra %} {% endblock css_extra %} @@ -49,7 +47,6 @@ - {% block navbar %} {% include "hosting/includes/_navbar_user.html" %} {% endblock navbar %} diff --git a/datacenterlight/templates/datacenterlight/beta_success.html b/datacenterlight/templates/datacenterlight/beta_success.html index 60df607c..7ac49457 100644 --- a/datacenterlight/templates/datacenterlight/beta_success.html +++ b/datacenterlight/templates/datacenterlight/beta_success.html @@ -1,4 +1,3 @@ - {% load i18n %} -
    + {% csrf_token %}
    +
    {{contact_form.name.errors}}
    @@ -30,6 +31,7 @@
    +
    {{contact_form.email.errors}}
    @@ -37,6 +39,7 @@
    +
    {{contact_form.message.errors}}
    diff --git a/datacenterlight/templates/datacenterlight/includes/_navbar.html b/datacenterlight/templates/datacenterlight/includes/_navbar.html index e2f1edc0..2f435704 100644 --- a/datacenterlight/templates/datacenterlight/includes/_navbar.html +++ b/datacenterlight/templates/datacenterlight/includes/_navbar.html @@ -1,6 +1,6 @@ -{% load staticfiles i18n%} -{% load custom_tags %} +{% load staticfiles i18n custom_tags %} {% get_current_language as LANGUAGE_CODE %} +
    diff --git a/datacenterlight/views.py b/datacenterlight/views.py index 8a41005f..0e860b7e 100644 --- a/datacenterlight/views.py +++ b/datacenterlight/views.py @@ -391,7 +391,6 @@ class PaymentOrderView(FormView): @cache_control(no_cache=True, must_revalidate=True, no_store=True) def get(self, request, *args, **kwargs): - # user is no longer added to session on the index page if 'specs' not in request.session: return HttpResponseRedirect(reverse('datacenterlight:index')) return self.render_to_response(self.get_context_data()) diff --git a/digitalglarus/templates/new_base_glarus.html b/digitalglarus/templates/new_base_glarus.html index 3b18756d..9a24f269 100644 --- a/digitalglarus/templates/new_base_glarus.html +++ b/digitalglarus/templates/new_base_glarus.html @@ -72,8 +72,8 @@ margin: 0px; color:white; } - - @media only screen and (min-width: 769px){ + + @media only screen and (min-width: 769px){ .dropdown.home-dropdown-mobile { display: none; } @@ -81,14 +81,14 @@ display: block; } } - - + + @media only screen and (max-width: 768px){ .dropdown.home-dropdown-mobile { display: block; - background-color: + background-color: } - + .dropdown.home-dropdown-mobile .dropdown-menu{ display: block; background-color: #0f1221; @@ -104,19 +104,19 @@ .dropdown.home-dropdown { display: none; } - + } - + - +
    From 82d4bf8c47d0c908d47878faaf776b6f2dfd46db Mon Sep 17 00:00:00 2001 From: PCoder Date: Sun, 11 Mar 2018 16:38:51 +0100 Subject: [PATCH 0504/1862] Update Changelog --- Changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Changelog b/Changelog index 86c56802..aa8df651 100644 --- a/Changelog +++ b/Changelog @@ -1,4 +1,4 @@ -1.5.1 2018-03-09: +1.5: 2018-03-09 * #3554: [dcl] Remove some more beta access resources (some were left in the earlier release) * #3452: [hosting] Back button management and cache control for hosting views * #3718: [dcl] downtime page From 44e913a7444543e07b86214115d6665012e0e161 Mon Sep 17 00:00:00 2001 From: PCoder Date: Sun, 11 Mar 2018 21:24:24 +0100 Subject: [PATCH 0505/1862] Remove datacentelright_content placeholder conf --- .../templates/datacenterlight/cms/base.html | 2 +- dynamicweb/settings/base.py | 12 ------------ 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/datacenterlight/templates/datacenterlight/cms/base.html b/datacenterlight/templates/datacenterlight/cms/base.html index a6123cc3..79bb2bef 100644 --- a/datacenterlight/templates/datacenterlight/cms/base.html +++ b/datacenterlight/templates/datacenterlight/cms/base.html @@ -57,7 +57,7 @@
    {% endplaceholder %} - {% placeholder 'datacenterlight_content' %} + {% placeholder 'Datacenterlight Content' %} {% placeholder 'datacenterlight_footer'%} diff --git a/dynamicweb/settings/base.py b/dynamicweb/settings/base.py index 05811384..b0dc42f4 100644 --- a/dynamicweb/settings/base.py +++ b/dynamicweb/settings/base.py @@ -352,18 +352,6 @@ CMS_PLACEHOLDER_CONF = { }, ] }, - 'datacenterlight_content': { - 'name': _('Datacenterlight Content'), - 'default_plugins': [ - { - 'plugin_type': 'DCLCalculatorPlugin', - 'values': { - 'heading': 'Heading', - 'content': 'Text' - }, - }, - ] - }, } CMS_PERMISSION = True From 533ff9fed77b9ff887ecf8a2a25f6e09632fbdb4 Mon Sep 17 00:00:00 2001 From: PCoder Date: Sun, 11 Mar 2018 22:03:22 +0100 Subject: [PATCH 0506/1862] Update Changelog --- Changelog | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Changelog b/Changelog index aa8df651..9fc03b04 100644 --- a/Changelog +++ b/Changelog @@ -1,3 +1,5 @@ +1.5.1: 2018-03-11 + * bgfix: [dcl cms] Remove datacenterlight_content placeholder conf 1.5: 2018-03-09 * #3554: [dcl] Remove some more beta access resources (some were left in the earlier release) * #3452: [hosting] Back button management and cache control for hosting views From 9dfb53f2f4ade1b980ee12100862a25ee43f5d7e Mon Sep 17 00:00:00 2001 From: PCoder Date: Sun, 11 Mar 2018 22:05:06 +0100 Subject: [PATCH 0507/1862] Improve Changelog --- Changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Changelog b/Changelog index 9fc03b04..c2d905d0 100644 --- a/Changelog +++ b/Changelog @@ -1,5 +1,5 @@ 1.5.1: 2018-03-11 - * bgfix: [dcl cms] Remove datacenterlight_content placeholder conf + * bgfix: [dcl cms] Remove datacenterlight_content placeholder conf so that we can create a cms page without calculator 1.5: 2018-03-09 * #3554: [dcl] Remove some more beta access resources (some were left in the earlier release) * #3452: [hosting] Back button management and cache control for hosting views From b9a1882080c61190e91ffee93275d5c95e71e31c Mon Sep 17 00:00:00 2001 From: Arvind Tiwari Date: Tue, 13 Mar 2018 01:52:54 +0530 Subject: [PATCH 0508/1862] fix style issues for dcl plugins --- .../datacenterlight/css/landing-page.css | 73 ++----- .../datacenterlight/cms/banner_list.html | 8 +- .../datacenterlight/cms/calculator.html | 18 +- .../datacenterlight/cms/contact.html | 28 ++- .../datacenterlight/cms/navbar_dropdown.html | 2 +- .../datacenterlight/cms/section.html | 51 +++-- .../datacenterlight/whydatacenterlight.html | 190 +++++++++--------- 7 files changed, 176 insertions(+), 194 deletions(-) diff --git a/datacenterlight/static/datacenterlight/css/landing-page.css b/datacenterlight/static/datacenterlight/css/landing-page.css index 61128e69..05b2f075 100755 --- a/datacenterlight/static/datacenterlight/css/landing-page.css +++ b/datacenterlight/static/datacenterlight/css/landing-page.css @@ -501,10 +501,15 @@ textarea { .split-section-plain .split-figure { width: 41.66666667%; } - + .split-section-plain .split-figure.col-sm-push-6 { + left: 58.33333333%; + } .split-section-plain .split-text { width: 58.33333333%; } + .split-section-plain .split-text.col-sm-pull-6 { + right: 41.66666667%; + } } .section-image img { @@ -726,34 +731,10 @@ textarea { width: 70%; } -hr.thick-divider { - border-top: 3px solid #eee !important; -} - .space { padding: 50px 0; -} - -tech-sub-sec h2 { - font-size: 45px; - line-height: 60px; - padding-bottom: 25px; - color: #3a3a3a; - letter-spacing: 1px; -} - -.logo-wrap { - text-align: center; - min-height: 140px; - padding: 20px 40px 30px 40px; -} - -.btm-space { - padding-bottom: 8px; -} - -.btm-space-tayga { - padding-bottom: 12px; + max-width: 660px; + margin: auto; } .percent-text { @@ -761,11 +742,6 @@ tech-sub-sec h2 { color: #999; } -.tech-sub-sec h2 { - font-size: 40px; - line-height: 55px; -} - .space-middle { /* padding: 45px 0; */ display: inline-block; @@ -791,16 +767,6 @@ tech-sub-sec h2 { padding: 30px 2px 20px; } -.logo-wrap .logo-caption { - padding-top: 20px; - display: inline-block; - color: #999 !important; -} - -.logo-wrap-1 { - padding-top: 50px; -} - /*Pricing page*/ @@ -966,13 +932,6 @@ tech-sub-sec h2 { } } -@media (min-width: 576px) and (max-width: 767px) { - .logo-wrap, .logo-wrap-1 { - width: 50%; - padding: 15px 30px !important; - min-height: 179px; - } -} @media(max-width:991px) { .section-sm-center .split-text { @@ -989,9 +948,6 @@ tech-sub-sec h2 { } @media(max-width:767px) { - .logo-wrap { - padding: 10px; - } .navbar-transparent li a { color: #777 !important; } @@ -1138,9 +1094,6 @@ tech-sub-sec h2 { } @media(max-width:575px) { - .logo-wrap { - padding: 30px; - } .percent-text { font-weight: normal; font-size: 37px; @@ -1210,12 +1163,16 @@ footer { flex-shrink: 0; padding: 0 15px; } + .flex-row .desc-text { + text-align: right; + } .flex-row .desc-text, .flex-row .percent-text { - max-width: 380px; + max-width: 430px; } .flex-row-rev .desc-text { max-width: 710px; + text-align: left; } .flex-row-rev .percent-text { order: 2; @@ -1225,10 +1182,6 @@ footer { } } -.w380 { - max-width: 380px !important; -} - .checkmark { display: inline-block; } diff --git a/datacenterlight/templates/datacenterlight/cms/banner_list.html b/datacenterlight/templates/datacenterlight/cms/banner_list.html index 7ef1c1c5..92c5c059 100644 --- a/datacenterlight/templates/datacenterlight/cms/banner_list.html +++ b/datacenterlight/templates/datacenterlight/cms/banner_list.html @@ -2,9 +2,11 @@