amal
/
dynamicweb
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Edited membership_order_list.html to allow “become a member” option.Edited membership_order_list.html for new deactivate membership flow.Fixed get_current_membership function .Fixed Reactivated membership view.Fixed Mixin to know if an user is an active member or not.

This commit is contained in:
Levi 2016-10-31 23:01:43 -05:00
parent ba2e231078
commit 56776e8894
5 changed files with 105 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
digitalglarus/mixins.py
View File

@ -1,5 +1,11 @@
from django.core.urlresolvers import reverse_lazy
from django.contrib.auth.mixins import LoginRequiredMixin
from django.views.generic import UpdateView
from django.db import models
from django.http import HttpResponseRedirect
from django.contrib import messages
from membership.models import StripeCustomer
from utils.models import BillingAddress
@ -50,3 +56,27 @@ class Ordereable(models.Model):
instance.cc_brand = stripe_charge.source.brand
instance.save()
return instance
class ChangeMembershipStatusMixin(LoginRequiredMixin, UpdateView):
success_message = None
success_url = reverse_lazy('digitalglarus:membership_orders_list')
login_url = reverse_lazy('digitalglarus:login')
fields = '__all__'
def get_object(self):
from .models import MembershipOrder
membership_order = MembershipOrder.objects.\
filter(customer__user=self.request.user).last()
if not membership_order:
raise AttributeError("Membership does not exists")
membership = membership_order.membership
return membership
def post(self, *args, **kwargs):
membership = self.get_object()
membership.activate()
messages.add_message(self.request, messages.SUCCESS, self.success_message)
return HttpResponseRedirect(self.success_url)

32
digitalglarus/models.py
View File

@ -65,6 +65,19 @@ class Membership(models.Model):
start_date = models.DateField()
end_date = models.DateField()
@classmethod
def get_current_membership(cls, user):
has_order_current_month = Q(membershiporder__customer__user=user,
membershiporder__created_at__month=datetime.today().month)
# import pdb;pdb.set_trace()
return cls.objects.\
filter(has_order_current_month).last()
# def get_current_active_membership(cls, user):
# membership = cls.get_current_membership(user)
# return membership if membership and membership.active else None
@classmethod
def get_by_user(cls, user):
return cls.objects.\
@ -75,15 +88,22 @@ class Membership(models.Model):
instance = cls.objects.create(**data)
return instance
@classmethod
def activate_or_crete(cls, data, user):
membership = cls.get_by_user(user)
obj, created = cls.objects.update_or_create(id=membership.id, defaults=data)
return obj
@classmethod
def is_digitalglarus_active_member(cls, user):
past_month = (datetime.today() - relativedelta(months=1)).month
# past_month = (datetime.today() - relativedelta(months=1)).month
has_order_current_month = Q(membershiporder__customer__user=user,
membershiporder__created_at__month=datetime.today().month)
has_order_past_month = Q(membershiporder__customer__user=user,
membershiporder__created_at__month=past_month)
# has_order_past_month = Q(membershiporder__customer__user=user,
# membershiporder__created_at__month=past_month)
active_membership = Q(active=True)
return cls.objects.filter(has_order_past_month | has_order_current_month).\
# return cls.objects.filter(has_order_past_month | has_order_current_month).\
return cls.objects.filter(has_order_current_month).\
filter(active_membership).exists()
def update_dates(self, start_date, end_date):
@ -95,6 +115,10 @@ class Membership(models.Model):
self.active = False
self.save()
def activate(self):
self.active = True
self.save()
class MembershipOrder(Ordereable, models.Model):
membership = models.ForeignKey(Membership)

30
digitalglarus/templates/digitalglarus/membership_orders_list.html
View File

@ -59,22 +59,40 @@
{% endif %}
<hr class="greyline-long">
<h2 class="order-head">Your Next Membership</h2>
{% if next_membership_start_date and next_membership_end_date%}
{% if next_membership_start_date and next_membership_end_date and current_membership.active %}
<h2 class="history-name">
Dates: {{next_membership_start_date|date}} - {{next_membership_end_date|date}}<br>
</h2>
{% elif current_membership.active == False %}
<h2 class="history-name">
Your membership is deactivated
</h2>
{% else %}
<h2 class="history-name">
You are not a member yet
You are not a member.
</h2>
{% endif %}
<div class="edit-button">
<a class="btn btn-primary btn-grey btn-deactivate print" href="{% url 'digitalglarus:membership_deactivate' %}">Deactivate</a>
</div>
{% if not current_membership == None %}
{% if current_membership.active %}
<div class="edit-button">
<a class="btn btn-primary btn-grey btn-deactivate print" href="{% url 'digitalglarus:membership_deactivate' %}">Deactivate</a>
</div>
{% elif not current_membership.active %}
<form method="POST" action="{% url 'digitalglarus:membership_reactivate' %}">
{% csrf_token %}
<div class="edit-button">
<button type="submit" class="btn btn-primary btn-grey btn-deactivate print" href="{% url 'digitalglarus:membership_reactivate' %}">Reactivate</button>
</div>
</form>
{% endif %}
{% else %}
<div class="edit-button">
<a class="btn btn-primary btn-blue" href="{% url 'digitalglarus:membership_pricing' %}">Become a member</a>
</div>
{% endif %}
<hr class="greyline-long">
<div class="row">
<div class="col-md-12 notice-box">

5
digitalglarus/urls.py
View File

@ -6,7 +6,8 @@ from .views import ContactView, IndexView, AboutView, HistoryView, LoginView, Si
PasswordResetView, PasswordResetConfirmView, MembershipPaymentView, MembershipActivatedView,\
MembershipPricingView, BookingSelectDatesView, BookingPaymentView, OrdersBookingDetailView,\
BookingOrdersListView, MembershipOrdersListView, OrdersMembershipDetailView, \
MembershipDeactivateView, MembershipDeactivateSuccessView, UserBillingAddressView
MembershipDeactivateView, MembershipDeactivateSuccessView, UserBillingAddressView, \
MembershipReactivateView
# from membership.views import LoginRegistrationView
urlpatterns = [
@ -33,6 +34,8 @@ urlpatterns = [
name='membership_activated'),
url(_(r'membership/deactivate/?$'), MembershipDeactivateView.as_view(),
name='membership_deactivate'),
url(_(r'membership/reactivate/?$'), MembershipReactivateView.as_view(),
name='membership_reactivate'),
url(_(r'membership/deactivate/success/?$'), MembershipDeactivateSuccessView.as_view(),
name='membership_deactivate_success'),
url(_(r'membership/pricing/?$'), MembershipPricingView.as_view(),

22
digitalglarus/views.py
View File

@ -17,6 +17,7 @@ from django.views.generic import View, DetailView, ListView
from .models import Supporter
from .mixins import ChangeMembershipStatusMixin
from utils.forms import ContactUsForm
from utils.mailer import BaseEmail
@ -357,13 +358,14 @@ class MembershipPaymentView(LoginRequiredMixin, IsNotMemberMixin, FormView):
# Get membership dates
membership_start_date, membership_end_date = membership_type.first_month_range
# Create membership plan
# Create or update membership plan
membership_data = {
'type': membership_type,
'active': True,
'start_date': membership_start_date,
'end_date': membership_end_date
}
membership = Membership.create(membership_data)
membership = Membership.activate_or_crete(membership_data, self.request.user)
# Create membership order
order_data = {
@ -446,6 +448,16 @@ class MembershipDeactivateView(LoginRequiredMixin, UpdateView):
return HttpResponseRedirect(self.success_url)
class MembershipReactivateView(ChangeMembershipStatusMixin):
success_message = "Your membership has been reactivate :)"
template_name = "digitalglarus/membership_orders_list.html"
def post(self, request, *args, **kwargs):
membership = self.get_object()
membership.activate()
return super(MembershipReactivateView, self).post(request, *args, **kwargs)
class UserBillingAddressView(LoginRequiredMixin, UpdateView):
model = UserBillingAddress
form_class = UserBillingAddressForm
@ -504,12 +516,16 @@ 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_dates(self.request.user)
current_membership = Membership.get_current_membership(self.request.user)
start_date, end_date = (current_membership.start_date, current_membership.end_date)\
if current_membership else [None, None]
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,
'current_membership': current_membership,
'next_membership_start_date': next_start_date,
'next_membership_end_date': next_end_date,
'billing_address': current_billing_address