From a84a88479f33fe6493ff5b22109d697108f2220c Mon Sep 17 00:00:00 2001 From: Levi Date: Tue, 13 Dec 2016 10:54:05 -0500 Subject: [PATCH 1/6] 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 From 06d03bbe90b4a923e927b542a8e66fccfb500e6f Mon Sep 17 00:00:00 2001 From: Levi Date: Tue, 13 Dec 2016 12:09:32 -0500 Subject: [PATCH 2/6] changed email logo and style --- .../img/digitalgalrus_logo_white.png | Bin 0 -> 5140 bytes .../emails/booking_cancellation.html | 4 ++-- .../emails/booking_cancellation.txt | 4 ++-- .../booking_cancellation_notification.html | 2 +- .../emails/booking_cancellation_notification.txt | 2 +- .../emails/booking_order_email.html | 2 +- .../digitalglarus/emails/booking_order_email.txt | 2 +- .../digitalglarus/emails/membership_charge.html | 2 +- .../digitalglarus/emails/membership_charge.txt | 2 +- .../emails/password_reset_email.html | 2 +- .../emails/password_reset_email.txt | 2 +- 11 files changed, 12 insertions(+), 12 deletions(-) create mode 100644 digitalglarus/static/digitalglarus/img/digitalgalrus_logo_white.png diff --git a/digitalglarus/static/digitalglarus/img/digitalgalrus_logo_white.png b/digitalglarus/static/digitalglarus/img/digitalgalrus_logo_white.png new file mode 100644 index 0000000000000000000000000000000000000000..dc81dd505e95eb38c4d285deedc4117f598c2608 GIT binary patch literal 5140 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 V;9KuKwpVq4nTe%wwV`v={{TPhPXYh{ literal 0 HcmV?d00001 diff --git a/digitalglarus/templates/digitalglarus/emails/booking_cancellation.html b/digitalglarus/templates/digitalglarus/emails/booking_cancellation.html index f2294335..cd63b871 100644 --- a/digitalglarus/templates/digitalglarus/emails/booking_cancellation.html +++ b/digitalglarus/templates/digitalglarus/emails/booking_cancellation.html @@ -74,7 +74,7 @@
@@ -112,7 +112,7 @@
My Account
- BOOK A DATE + BOOK A DATE diff --git a/digitalglarus/templates/digitalglarus/emails/booking_cancellation.txt b/digitalglarus/templates/digitalglarus/emails/booking_cancellation.txt index f2294335..cd63b871 100644 --- a/digitalglarus/templates/digitalglarus/emails/booking_cancellation.txt +++ b/digitalglarus/templates/digitalglarus/emails/booking_cancellation.txt @@ -74,7 +74,7 @@
- logo + logo
@@ -112,7 +112,7 @@
My Account
- BOOK A DATE + BOOK A DATE diff --git a/digitalglarus/templates/digitalglarus/emails/booking_cancellation_notification.html b/digitalglarus/templates/digitalglarus/emails/booking_cancellation_notification.html index e0dff454..1c9f6310 100644 --- a/digitalglarus/templates/digitalglarus/emails/booking_cancellation_notification.html +++ b/digitalglarus/templates/digitalglarus/emails/booking_cancellation_notification.html @@ -74,7 +74,7 @@
- logo + logo
diff --git a/digitalglarus/templates/digitalglarus/emails/booking_cancellation_notification.txt b/digitalglarus/templates/digitalglarus/emails/booking_cancellation_notification.txt index e0dff454..1c9f6310 100644 --- a/digitalglarus/templates/digitalglarus/emails/booking_cancellation_notification.txt +++ b/digitalglarus/templates/digitalglarus/emails/booking_cancellation_notification.txt @@ -74,7 +74,7 @@
- logo + logo
diff --git a/digitalglarus/templates/digitalglarus/emails/booking_order_email.html b/digitalglarus/templates/digitalglarus/emails/booking_order_email.html index d45bcc72..68d5e56d 100644 --- a/digitalglarus/templates/digitalglarus/emails/booking_order_email.html +++ b/digitalglarus/templates/digitalglarus/emails/booking_order_email.html @@ -74,7 +74,7 @@
- logo + logo
diff --git a/digitalglarus/templates/digitalglarus/emails/booking_order_email.txt b/digitalglarus/templates/digitalglarus/emails/booking_order_email.txt index 5a414ae4..5d3b1244 100644 --- a/digitalglarus/templates/digitalglarus/emails/booking_order_email.txt +++ b/digitalglarus/templates/digitalglarus/emails/booking_order_email.txt @@ -74,7 +74,7 @@
- logo + logo
diff --git a/digitalglarus/templates/digitalglarus/emails/membership_charge.html b/digitalglarus/templates/digitalglarus/emails/membership_charge.html index a6af3443..b6101458 100644 --- a/digitalglarus/templates/digitalglarus/emails/membership_charge.html +++ b/digitalglarus/templates/digitalglarus/emails/membership_charge.html @@ -74,7 +74,7 @@
- logo + logo
diff --git a/digitalglarus/templates/digitalglarus/emails/membership_charge.txt b/digitalglarus/templates/digitalglarus/emails/membership_charge.txt index a6af3443..b6101458 100644 --- a/digitalglarus/templates/digitalglarus/emails/membership_charge.txt +++ b/digitalglarus/templates/digitalglarus/emails/membership_charge.txt @@ -74,7 +74,7 @@
- logo + logo
diff --git a/digitalglarus/templates/digitalglarus/emails/password_reset_email.html b/digitalglarus/templates/digitalglarus/emails/password_reset_email.html index ce9189b0..42562b05 100644 --- a/digitalglarus/templates/digitalglarus/emails/password_reset_email.html +++ b/digitalglarus/templates/digitalglarus/emails/password_reset_email.html @@ -74,7 +74,7 @@
- logo + logo
diff --git a/digitalglarus/templates/digitalglarus/emails/password_reset_email.txt b/digitalglarus/templates/digitalglarus/emails/password_reset_email.txt index ce9189b0..42562b05 100644 --- a/digitalglarus/templates/digitalglarus/emails/password_reset_email.txt +++ b/digitalglarus/templates/digitalglarus/emails/password_reset_email.txt @@ -74,7 +74,7 @@
- logo + logo
From 3da05e80255cbff53cc1c9ae55926b7c22763f73 Mon Sep 17 00:00:00 2001 From: Levi Date: Mon, 19 Dec 2016 09:33:15 -0500 Subject: [PATCH 3/6] Finished responsive issues --- .../static/digitalglarus/js/payment.js | 26 ++++++++-- .../digitalglarus/booking_orders_list.html | 2 +- .../digitalglarus/booking_payment.html | 8 +++ .../templates/digitalglarus/history.html | 16 +++++- .../digitalglarus/membership_orders_list.html | 49 ++++++++++-------- .../digitalglarus/membership_payment.html | 2 +- .../digitalglarus/membership_pricing.html | 2 +- digitalglarus/templates/new_base_glarus.html | 2 +- digitalglarus/views.py | 2 + dump.rdb | Bin 0 -> 8373 bytes membership/models.py | 6 ++- utils/stripe_utils.py | 6 +++ 12 files changed, 89 insertions(+), 32 deletions(-) create mode 100644 dump.rdb diff --git a/digitalglarus/static/digitalglarus/js/payment.js b/digitalglarus/static/digitalglarus/js/payment.js index 3179f721..0d95a109 100644 --- a/digitalglarus/static/digitalglarus/js/payment.js +++ b/digitalglarus/static/digitalglarus/js/payment.js @@ -27,22 +27,42 @@ $( document ).ready(function() { //Acept term and conditions button + var hasCreditcard = window.hasCreditcard; + console.log("has creditcard"); + console.log("has creditcard"); + console.log("has creditcard"); + + var submit_form_btn = $('#payment_button'); + submit_form_btn.on('click', submit_payment); - var submit_form_btn = $('#payment_button'); - submit_form_btn.on('click', submit_payment); function submit_payment(e){ - $('#billing-form').submit(); + e.preventDefault(); + if (hasCreditcard) { + $('#billing-form').submit(); + } + else  { + $('#payment-form').submit(); + + } + + + // $form.submit(); } + var $form = $('#payment-form'); $form.submit(payWithStripe); /* If you're using Stripe for payments */ function payWithStripe(e) { console.log("submiting"); + console.log("token"); + console.log("token"); + // console.log("token", token); + e.preventDefault(); if (!$('.agree-terms').is(':checked')){ diff --git a/digitalglarus/templates/digitalglarus/booking_orders_list.html b/digitalglarus/templates/digitalglarus/booking_orders_list.html index 9fa3d793..a1cb8e39 100644 --- a/digitalglarus/templates/digitalglarus/booking_orders_list.html +++ b/digitalglarus/templates/digitalglarus/booking_orders_list.html @@ -18,7 +18,7 @@

2016.11.13-2016.12.13

Booking history

-
- logo + logo
+
diff --git a/digitalglarus/templates/digitalglarus/booking_payment.html b/digitalglarus/templates/digitalglarus/booking_payment.html index adfb142e..442a2812 100644 --- a/digitalglarus/templates/digitalglarus/booking_payment.html +++ b/digitalglarus/templates/digitalglarus/booking_payment.html @@ -212,4 +212,12 @@ {%endif%} +{% if credit_card_data.last4 and credit_card_data.cc_brand %} + + +{%endif%} + + {% endblock %} \ No newline at end of file diff --git a/digitalglarus/templates/digitalglarus/history.html b/digitalglarus/templates/digitalglarus/history.html index ae407d34..c54a4a72 100755 --- a/digitalglarus/templates/digitalglarus/history.html +++ b/digitalglarus/templates/digitalglarus/history.html @@ -4,6 +4,20 @@ {% block content %} + + +
@@ -81,7 +95,7 @@
-
+
diff --git a/digitalglarus/templates/digitalglarus/membership_orders_list.html b/digitalglarus/templates/digitalglarus/membership_orders_list.html index dd7ab8dc..ceeea6f1 100644 --- a/digitalglarus/templates/digitalglarus/membership_orders_list.html +++ b/digitalglarus/templates/digitalglarus/membership_orders_list.html @@ -6,12 +6,12 @@ @media only screen and (max-width: 320px) { - body { font-size: 2em; } - + /*body { font-size: 2em; }*/ + h2.section-heading {font-size: 2em !important;} } -h2 {text-transform: lowercase;} + @@ -33,26 +33,29 @@ h2 {text-transform: lowercase;} {% endif %}

Orders history

-
#
- - - - - - - - - - {% for order in orders%} - - - - - - - {% endfor %} - -
#Valid MonthDateInvoice
{{order.id}}{{order.created_at|date:"F"}}{{order.created_at|date}}View
+
+ + + + + + + + + + + + {% for order in orders%} + + + + + + + {% endfor %} + +
#Valid MonthDateInvoice
{{order.id}}{{order.created_at|date:"F"}}{{order.created_at|date}}View
+

Billing AdressEdit

diff --git a/digitalglarus/templates/digitalglarus/membership_payment.html b/digitalglarus/templates/digitalglarus/membership_payment.html index 61c60af9..7e90a7d7 100644 --- a/digitalglarus/templates/digitalglarus/membership_payment.html +++ b/digitalglarus/templates/digitalglarus/membership_payment.html @@ -113,7 +113,7 @@ I accept the Digital Glarus Terms and Conditions, Community Guidelines and Privacy Policy
-
+
diff --git a/digitalglarus/templates/digitalglarus/membership_pricing.html b/digitalglarus/templates/digitalglarus/membership_pricing.html index 6d8033f1..35867858 100644 --- a/digitalglarus/templates/digitalglarus/membership_pricing.html +++ b/digitalglarus/templates/digitalglarus/membership_pricing.html @@ -5,7 +5,7 @@ {% block content %} diff --git a/digitalglarus/templates/new_base_glarus.html b/digitalglarus/templates/new_base_glarus.html index 50d1f24b..116ca4bf 100644 --- a/digitalglarus/templates/new_base_glarus.html +++ b/digitalglarus/templates/new_base_glarus.html @@ -133,7 +133,7 @@