aatish/dynamicweb
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Reformat code

Browse source
This commit is contained in:
PCoder 2017-12-24 13:06:23 +01:00
commit b4421bc9b2
1 changed files with 13 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

20
digitalglarus/models.py
View file

@ -83,9 +83,10 @@ class Membership(models.Model):
@classmethod @classmethod
def get_current_membership(cls, user): def get_current_membership(cls, user):
has_order_current_month = Q(
has_order_current_month = Q(membershiporder__customer__user=user, membershiporder__customer__user=user,
membershiporder__created_at__month=datetime.today().month) membershiporder__created_at__month=datetime.today().month
)
# import pdb;pdb.set_trace() # import pdb;pdb.set_trace()
return cls.objects.\ return cls.objects.\
filter(has_order_current_month).last() filter(has_order_current_month).last()
@ -108,18 +109,23 @@ class Membership(models.Model):
def activate_or_crete(cls, data, user): def activate_or_crete(cls, data, user):
membership = cls.get_by_user(user) membership = cls.get_by_user(user)
membership_id = membership.id if membership else None membership_id = membership.id if membership else None
obj, created = cls.objects.update_or_create(id=membership_id, defaults=data) obj, created = cls.objects.update_or_create(
id=membership_id, defaults=data
)
return obj return obj
@classmethod @classmethod
def is_digitalglarus_active_member(cls, user): 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, has_order_current_month = Q(
membershiporder__created_at__month=datetime.today().month) membershiporder__customer__user=user,
membershiporder__created_at__month=datetime.today().month
)
# has_order_past_month = Q(membershiporder__customer__user=user, # has_order_past_month = Q(membershiporder__customer__user=user,
# membershiporder__created_at__month=past_month) # membershiporder__created_at__month=past_month)
active_membership = Q(active=True) 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).\ return cls.objects.filter(has_order_current_month).\
filter(active_membership).exists() filter(active_membership).exists()