From a84a88479f33fe6493ff5b22109d697108f2220c Mon Sep 17 00:00:00 2001 From: Levi Date: Tue, 13 Dec 2016 10:54:05 -0500 Subject: [PATCH] Fixed #2789 #2788 #2790 #2812 #2811 --- digitalglarus/models.py | 3 + .../digitalglarus/booking_payment.html | 2 +- .../emails/password_reset_email.html | 147 ++++++++++++++++-- .../emails/password_reset_email.txt | 147 ++++++++++++++++-- .../digitalglarus/membership_orders_list.html | 2 +- membership/admin.py | 3 +- .../djangocms_blog/includes/blog_item.html | 8 +- utils/admin.py | 4 + utils/mailer.py | 4 +- 9 files changed, 287 insertions(+), 33 deletions(-) diff --git a/digitalglarus/models.py b/digitalglarus/models.py index 26ecb4ff..1cfd1c0b 100644 --- a/digitalglarus/models.py +++ b/digitalglarus/models.py @@ -65,6 +65,9 @@ class Membership(models.Model): start_date = models.DateField() end_date = models.DateField() + def __str__(self): + return str(self.id) + @classmethod def get_current_membership(cls, user): diff --git a/digitalglarus/templates/digitalglarus/booking_payment.html b/digitalglarus/templates/digitalglarus/booking_payment.html index df9bfa69..adfb142e 100644 --- a/digitalglarus/templates/digitalglarus/booking_payment.html +++ b/digitalglarus/templates/digitalglarus/booking_payment.html @@ -70,7 +70,7 @@
- {% if credit_card_data %} + {% if credit_card_data.last4 and credit_card_data.cc_brand %}

Credit Card

Last 4: *****{{credit_card_data.last4}}

diff --git a/digitalglarus/templates/digitalglarus/emails/password_reset_email.html b/digitalglarus/templates/digitalglarus/emails/password_reset_email.html index 20244b11..ce9189b0 100644 --- a/digitalglarus/templates/digitalglarus/emails/password_reset_email.html +++ b/digitalglarus/templates/digitalglarus/emails/password_reset_email.html @@ -1,13 +1,136 @@ -{% load i18n %}{% autoescape off %} -{% blocktrans %}You're receiving this email because you requested a password reset for your user account at {{ site_name }}.{% endblocktrans %} +{% load static from staticfiles %} + + + + + + +Oxygen Invoice + + + + + + + + + + + + + +
+
+ + +
+ +
+ + + +
+ logo + +
+
+ +
+
+
+
+ + + + + + + + + + +
+ Reset password +
+ You're receiving this email because you requested a password reset for your user account at {{ site_name }}.
Please go to the following page and choose a new password. +
+ +
+
+
+
+ + +
+ Digitalglarus
+
+
+
+ + -{% trans "Please go to the following page and choose a new password:" %} - {% block reset_link %} - {{ base_url }}{% url 'digitalglarus:reset_password_confirm' uidb64=uid token=token %} - {% endblock %} - -{% trans "Thanks for using our site!" %} - -{% blocktrans %}The {{ site_name }} team{% endblocktrans %} - -{% endautoescape %} \ No newline at end of file diff --git a/digitalglarus/templates/digitalglarus/emails/password_reset_email.txt b/digitalglarus/templates/digitalglarus/emails/password_reset_email.txt index 20244b11..ce9189b0 100644 --- a/digitalglarus/templates/digitalglarus/emails/password_reset_email.txt +++ b/digitalglarus/templates/digitalglarus/emails/password_reset_email.txt @@ -1,13 +1,136 @@ -{% load i18n %}{% autoescape off %} -{% blocktrans %}You're receiving this email because you requested a password reset for your user account at {{ site_name }}.{% endblocktrans %} +{% load static from staticfiles %} + + + + + + +Oxygen Invoice + + + + + + + + + + + + + +
+
+ + +
+ +
+ + + +
+ logo + +
+
+ +
+
+
+
+ + + + + + + + + + +
+ Reset password +
+ You're receiving this email because you requested a password reset for your user account at {{ site_name }}.
Please go to the following page and choose a new password. +
+ +
+
+
+
+ + +
+ Digitalglarus
+
+
+
+ + -{% trans "Please go to the following page and choose a new password:" %} - {% block reset_link %} - {{ base_url }}{% url 'digitalglarus:reset_password_confirm' uidb64=uid token=token %} - {% endblock %} - -{% trans "Thanks for using our site!" %} - -{% blocktrans %}The {{ site_name }} team{% endblocktrans %} - -{% endautoescape %} \ No newline at end of file diff --git a/digitalglarus/templates/digitalglarus/membership_orders_list.html b/digitalglarus/templates/digitalglarus/membership_orders_list.html index b0d11ed8..dd7ab8dc 100644 --- a/digitalglarus/templates/digitalglarus/membership_orders_list.html +++ b/digitalglarus/templates/digitalglarus/membership_orders_list.html @@ -29,7 +29,7 @@ h2 {text-transform: lowercase;} {% if membership_start_date and membership_end_date%}

{{membership_start_date|date}}-{{membership_end_date|date}}

{% else %} -

You don't have an active membership

+

You don't have an active membership

{% endif %}

Orders history

diff --git a/membership/admin.py b/membership/admin.py index 148f9ab6..f69ccbef 100644 --- a/membership/admin.py +++ b/membership/admin.py @@ -1,5 +1,5 @@ from django.contrib import admin -from .models import CustomUser +from .models import CustomUser, StripeCustomer from django.contrib.auth.hashers import make_password @@ -18,3 +18,4 @@ class CustomUserAdmin(admin.ModelAdmin): admin.site.register(CustomUser, CustomUserAdmin) +admin.site.register(StripeCustomer) diff --git a/ungleich/templates/ungleich/djangocms_blog/includes/blog_item.html b/ungleich/templates/ungleich/djangocms_blog/includes/blog_item.html index 16a7040a..37b3ced8 100644 --- a/ungleich/templates/ungleich/djangocms_blog/includes/blog_item.html +++ b/ungleich/templates/ungleich/djangocms_blog/includes/blog_item.html @@ -5,12 +5,12 @@
- - - + + +
- +

{{ post.title }}

diff --git a/utils/admin.py b/utils/admin.py index 8c38f3f3..82e57d2f 100644 --- a/utils/admin.py +++ b/utils/admin.py @@ -1,3 +1,7 @@ from django.contrib import admin +from .models import BillingAddress, UserBillingAddress # Register your models here. + + +admin.site.register(UserBillingAddress) diff --git a/utils/mailer.py b/utils/mailer.py index d60a2270..948cdd68 100644 --- a/utils/mailer.py +++ b/utils/mailer.py @@ -21,7 +21,7 @@ class BaseEmail(object): self.email = EmailMultiAlternatives(self.subject, text_content) self.email.attach_alternative(html_content, "text/html") - self.email.from_email = '(Ungleich) Ungleich Support ' + self.email.from_email = '(ungleich) ungleich Support ' self.email.to = [kwargs.get('to', 'info@ungleich.com')] def send(self): @@ -31,7 +31,7 @@ class BaseEmail(object): class BaseMailer(object): def __init__(self): self._slug = None - self.no_replay_mail = 'no-replay@ungleich.ch' + self.no_replay_mail = 'info@ungleich.ch' if not hasattr(self, '_to'): self._to = None