rezometz/re2o
8
0
Fork 0
mirror of https://gitlab2.federez.net/re2o/re2o synced 2024-12-23 07:23:46 +00:00
Code Issues Releases Wiki Activity

Fix the test for ventes in the set_active function. This function could be greatly improved if the duraction could not be null.

Browse source
This commit is contained in:
grisel-davy 2020-10-15 19:21:16 +02:00
parent 8c06bd4fca
commit 23698a1653
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
users/models.py
View file

@ -931,10 +931,14 @@ class User(
"""
if self.state == self.STATE_NOT_YET_ACTIVE:
if self.facture_set.filter(valid=True).filter(
~(Q(vente__duration_membership__isnull=True) | Q(vente__duration_membership=0)))\
.filter(~(Q(vente__duration_days_membership__isnull=True) | Q(vente__duration_days_membership=0))
).exists() or OptionalUser.get_cached_value("all_users_active"):
# Look for ventes with non 0 and non null subscription duration in the invoices set
not_null = self.facture_set.filter(valid=True).exclude(Q(vente__duration_membership__isnull=True)).exists()
not_zero = self.facture_set.filter(valid=True).exclude(Q(vente__duration_membership=0)).exists()
days_not_null = self.facture_set.filter(valid=True).exclude(Q(vente__duration_days_membership__isnull=True)).exists()
days_not_zero = self.facture_set.filter(valid=True).exclude(Q(vente__duration_days_membership=0)).exists()
# if any vente is found, activate the user
if(not_null or not_zero or days_not_null or days_not_zero \
or OptionalUser.get_cached_value("all_users_active")):
self.state = self.STATE_ACTIVE
self.save()
if self.state == self.STATE_ARCHIVE or self.state == self.STATE_FULL_ARCHIVE: