mirror of
https://gitlab2.federez.net/re2o/re2o
synced 2024-12-23 07:23:46 +00:00
Code formatting.
This commit is contained in:
parent
7f36b642ac
commit
4d82eda5b1
2 changed files with 70 additions and 41 deletions
|
@ -8,38 +8,52 @@ from django.db import migrations, models
|
|||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('cotisations', '0050_auto_20201102_2342'),
|
||||
("cotisations", "0050_auto_20201102_2342"),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.AlterField(
|
||||
model_name='article',
|
||||
name='duration_connection',
|
||||
field=models.PositiveIntegerField(verbose_name='duration of the connection (in months)'),
|
||||
model_name="article",
|
||||
name="duration_connection",
|
||||
field=models.PositiveIntegerField(
|
||||
verbose_name="duration of the connection (in months)"
|
||||
),
|
||||
),
|
||||
migrations.AlterField(
|
||||
model_name='article',
|
||||
name='duration_days_connection',
|
||||
field=models.PositiveIntegerField(verbose_name='duration of the connection (in days, will be added to duration in months)'),
|
||||
model_name="article",
|
||||
name="duration_days_connection",
|
||||
field=models.PositiveIntegerField(
|
||||
verbose_name="duration of the connection (in days, will be added to duration in months)"
|
||||
),
|
||||
),
|
||||
migrations.AlterField(
|
||||
model_name='article',
|
||||
name='duration_days_membership',
|
||||
field=models.PositiveIntegerField(verbose_name='duration of the membership (in days, will be added to duration in months)'),
|
||||
model_name="article",
|
||||
name="duration_days_membership",
|
||||
field=models.PositiveIntegerField(
|
||||
verbose_name="duration of the membership (in days, will be added to duration in months)"
|
||||
),
|
||||
),
|
||||
migrations.AlterField(
|
||||
model_name='article',
|
||||
name='duration_membership',
|
||||
field=models.PositiveIntegerField(verbose_name='duration of the membership (in months)'),
|
||||
model_name="article",
|
||||
name="duration_membership",
|
||||
field=models.PositiveIntegerField(
|
||||
verbose_name="duration of the membership (in months)"
|
||||
),
|
||||
),
|
||||
migrations.AlterField(
|
||||
model_name='vente',
|
||||
name='duration_days_connection',
|
||||
field=models.PositiveIntegerField(default=0, verbose_name='duration of the connection (in days, will be added to duration in months)'),
|
||||
model_name="vente",
|
||||
name="duration_days_connection",
|
||||
field=models.PositiveIntegerField(
|
||||
default=0,
|
||||
verbose_name="duration of the connection (in days, will be added to duration in months)",
|
||||
),
|
||||
),
|
||||
migrations.AlterField(
|
||||
model_name='vente',
|
||||
name='duration_days_membership',
|
||||
field=models.PositiveIntegerField(default=0, verbose_name='duration of the membership (in days, will be added to duration in months)'),
|
||||
model_name="vente",
|
||||
name="duration_days_membership",
|
||||
field=models.PositiveIntegerField(
|
||||
default=0,
|
||||
verbose_name="duration of the membership (in days, will be added to duration in months)",
|
||||
),
|
||||
),
|
||||
]
|
||||
|
|
|
@ -293,8 +293,7 @@ class Facture(BaseInvoice):
|
|||
"""Returns every subscription associated with this invoice."""
|
||||
return Cotisation.objects.filter(
|
||||
vente__in=self.vente_set.filter(
|
||||
~(Q(duration_membership=0)) |\
|
||||
~(Q(duration_days_membership=0))
|
||||
~(Q(duration_membership=0)) | ~(Q(duration_days_membership=0))
|
||||
)
|
||||
)
|
||||
|
||||
|
@ -467,14 +466,18 @@ class Vente(RevMixin, AclMixin, models.Model):
|
|||
)
|
||||
duration_days_connection = models.PositiveIntegerField(
|
||||
default=0,
|
||||
verbose_name=_("duration of the connection (in days, will be added to duration in months)"),
|
||||
verbose_name=_(
|
||||
"duration of the connection (in days, will be added to duration in months)"
|
||||
),
|
||||
)
|
||||
duration_membership = models.PositiveIntegerField(
|
||||
default=0, verbose_name=_("duration of the membership (in months)")
|
||||
)
|
||||
duration_days_membership = models.PositiveIntegerField(
|
||||
default=0,
|
||||
verbose_name=_("duration of the membership (in days, will be added to duration in months)"),
|
||||
verbose_name=_(
|
||||
"duration of the membership (in days, will be added to duration in months)"
|
||||
),
|
||||
)
|
||||
|
||||
class Meta:
|
||||
|
@ -629,12 +632,14 @@ class Vente(RevMixin, AclMixin, models.Model):
|
|||
return str(self.name) + " " + str(self.facture)
|
||||
|
||||
def test_membership_or_connection(self):
|
||||
""" Test if the purchase include membership or connecton
|
||||
"""
|
||||
return self.duration_membership or \
|
||||
self.duration_days_membership or \
|
||||
self.duration_connection or \
|
||||
self.duration_days_connection
|
||||
"""Test if the purchase include membership or connecton"""
|
||||
return (
|
||||
self.duration_membership
|
||||
or self.duration_days_membership
|
||||
or self.duration_connection
|
||||
or self.duration_days_connection
|
||||
)
|
||||
|
||||
|
||||
# TODO : change vente to purchase
|
||||
@receiver(post_save, sender=Vente)
|
||||
|
@ -705,13 +710,17 @@ class Article(RevMixin, AclMixin, models.Model):
|
|||
verbose_name=_("duration of the membership (in months)")
|
||||
)
|
||||
duration_days_membership = models.PositiveIntegerField(
|
||||
verbose_name=_("duration of the membership (in days, will be added to duration in months)"),
|
||||
verbose_name=_(
|
||||
"duration of the membership (in days, will be added to duration in months)"
|
||||
),
|
||||
)
|
||||
duration_connection = models.PositiveIntegerField(
|
||||
verbose_name=_("duration of the connection (in months)")
|
||||
)
|
||||
duration_days_connection = models.PositiveIntegerField(
|
||||
verbose_name=_("duration of the connection (in days, will be added to duration in months)"),
|
||||
verbose_name=_(
|
||||
"duration of the connection (in days, will be added to duration in months)"
|
||||
),
|
||||
)
|
||||
|
||||
need_membership = models.BooleanField(
|
||||
|
@ -878,7 +887,9 @@ class Paiement(RevMixin, AclMixin, models.Model):
|
|||
|
||||
# In case a cotisation was bought, inform the user, the
|
||||
# cotisation time has been extended too
|
||||
if any(sell.test_membership_or_connection() for sell in invoice.vente_set.all()):
|
||||
if any(
|
||||
sell.test_membership_or_connection() for sell in invoice.vente_set.all()
|
||||
):
|
||||
messages.success(
|
||||
request,
|
||||
_(
|
||||
|
@ -950,9 +961,13 @@ class Cotisation(RevMixin, AclMixin, models.Model):
|
|||
vente = models.OneToOneField(
|
||||
"Vente", on_delete=models.CASCADE, null=True, verbose_name=_("purchase")
|
||||
)
|
||||
date_start_con = models.DateTimeField(verbose_name=_("start date for the connection"))
|
||||
date_start_con = models.DateTimeField(
|
||||
verbose_name=_("start date for the connection")
|
||||
)
|
||||
date_end_con = models.DateTimeField(verbose_name=_("end date for the connection"))
|
||||
date_start_memb = models.DateTimeField(verbose_name=_("start date for the membership"))
|
||||
date_start_memb = models.DateTimeField(
|
||||
verbose_name=_("start date for the membership")
|
||||
)
|
||||
date_end_memb = models.DateTimeField(verbose_name=_("end date for the membership"))
|
||||
|
||||
class Meta:
|
||||
|
|
Loading…
Reference in a new issue