From 735089785bda812f58a8332397872937cceaeea0 Mon Sep 17 00:00:00 2001 From: Levi Date: Sun, 23 Oct 2016 18:09:01 -0500 Subject: [PATCH] Fixed: #2669 Membership date range is incorrect.Fixed: #2671 Error when user try to access membership view without having one.Fixed: #2672: As I user want to know my next membership date range.Fixed #2673: Enable new Main DG index.Fixed #2657 :cancel membership button style fix --- digitalglarus/models.py | 22 ++++++++++++----- .../templates/digitalglarus/index.html | 7 +++--- .../digitalglarus/membership_deactivated.html | 11 ++++++++- .../digitalglarus/membership_orders_list.html | 24 ++++++++++++++++--- digitalglarus/views.py | 8 ++++--- 5 files changed, 56 insertions(+), 16 deletions(-) diff --git a/digitalglarus/models.py b/digitalglarus/models.py index c1e50308..876df6d7 100644 --- a/digitalglarus/models.py +++ b/digitalglarus/models.py @@ -102,16 +102,26 @@ class MembershipOrder(Ordereable, models.Model): end_date = models.DateField() @classmethod - def current_membership(cls, user): + def current_membership_dates(cls, user): last_membership_payment = cls.objects.\ filter(customer__user=user).last() - # start_date = last_payment.created_at - # _, days_in_month = calendar.monthrange(start_date.year, - # start_date.month) - # start_date.replace(day=1) - # end_date = start_date + timedelta(days=days_in_month) + if not last_membership_payment: + return [None, None] + return last_membership_payment.start_date, last_membership_payment.end_date + @classmethod + def next_membership_dates(cls, user): + current_start_date, current_end_date = cls.current_membership_dates(user) + if not current_start_date or not current_end_date: + return [None, None] + next_start_date = current_end_date + relativedelta(months=1) + _, days_in_month = calendar.monthrange(next_start_date.year, + next_start_date.month) + next_start_date = next_start_date.replace(day=1) + next_end_date = next_start_date + timedelta(days=days_in_month) + return next_start_date, next_end_date + def first_membership_range_date(self): start_date = self.created_at _, days_in_month = calendar.monthrange(start_date.year, diff --git a/digitalglarus/templates/digitalglarus/index.html b/digitalglarus/templates/digitalglarus/index.html index a2ad5827..152dd48e 100644 --- a/digitalglarus/templates/digitalglarus/index.html +++ b/digitalglarus/templates/digitalglarus/index.html @@ -20,7 +20,8 @@

Book a date today and dive in

-
+ Join now +
@@ -187,7 +188,7 @@ Join our community. Be our member now!

- Sign Up + Sign Up diff --git a/digitalglarus/templates/digitalglarus/membership_deactivated.html b/digitalglarus/templates/digitalglarus/membership_deactivated.html index 0ec0295b..977c467c 100644 --- a/digitalglarus/templates/digitalglarus/membership_deactivated.html +++ b/digitalglarus/templates/digitalglarus/membership_deactivated.html @@ -10,6 +10,15 @@ margin-top:10%; } + #cancel-subscription-modal .modal-header{ + border-bottom: none; + } + + #cancel-subscription-modal .modal-footer{ + border-top: none; + text-align: center; + } +
@@ -46,7 +55,7 @@

Do you want to cancel your subscription?

-
+
diff --git a/digitalglarus/templates/digitalglarus/membership_orders_list.html b/digitalglarus/templates/digitalglarus/membership_orders_list.html index 5fc92329..57284121 100644 --- a/digitalglarus/templates/digitalglarus/membership_orders_list.html +++ b/digitalglarus/templates/digitalglarus/membership_orders_list.html @@ -15,7 +15,11 @@

{{request.user.name}}

Current Membership

-

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

+ {% if membership_start_date and membership_end_date%} +

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

+ {% else %} +

You don't have an active membership

+ {% endif %}

Orders history

@@ -43,16 +47,30 @@

{{request.user.name}}

+ {% if billing_address %}

{{billing_address.street_address}},{{billing_address.postal_code}}
{{billing_address.city}}, {{billing_address.country}}.

- + {% else %} +

+ Edit your billing address +

+ {% endif %}

Your Next Membership

+ {% if next_membership_start_date and next_membership_end_date%} + + +

- Dates: {{membership_start_date|date}} - {{membership_end_date|date}}
+ Dates: {{next_membership_start_date|date}} - {{next_membership_end_date|date}}

+ {% else %} +

+ You are not a member yet +

+ {% endif %}
Deactivate diff --git a/digitalglarus/views.py b/digitalglarus/views.py index 1a901c80..73af4ca2 100644 --- a/digitalglarus/views.py +++ b/digitalglarus/views.py @@ -42,7 +42,7 @@ from .mixins import MembershipRequiredMixin, IsNotMemberMixin class IndexView(TemplateView): - template_name = "digitalglarus/old_index.html" + template_name = "digitalglarus/index.html" class LoginView(LoginViewMixin): @@ -488,11 +488,14 @@ class MembershipOrdersListView(LoginRequiredMixin, ListView): def get_context_data(self, **kwargs): context = super(MembershipOrdersListView, self).get_context_data(**kwargs) - start_date, end_date = MembershipOrder.current_membership(self.request.user) + start_date, end_date = MembershipOrder.current_membership_dates(self.request.user) + next_start_date, next_end_date = MembershipOrder.next_membership_dates(self.request.user) current_billing_address = self.request.user.billing_addresses.filter(current=True).last() context.update({ 'membership_start_date': start_date, 'membership_end_date': end_date, + 'next_membership_start_date': next_start_date, + 'next_membership_end_date': next_end_date, 'billing_address': current_billing_address }) return context @@ -602,7 +605,6 @@ class ContactView(FormView): return super(ContactView, self).form_valid(form) - class AboutView(TemplateView): template_name = "digitalglarus/about.html"