mirror of
				https://github.com/ae-utbm/sith.git
				synced 2025-11-03 18:43:04 +00:00 
			
		
		
		
	Compare commits
	
		
			1 Commits
		
	
	
		
			fix-poster
			...
			update_sub
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 
						 | 
					2550fd0af7 | 
@@ -4974,47 +4974,47 @@ msgstr "Suppression de rechargement"
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
#: sith/settings.py
 | 
					#: sith/settings.py
 | 
				
			||||||
msgid "One semester"
 | 
					msgid "One semester"
 | 
				
			||||||
msgstr "Un semestre, 20 €"
 | 
					msgstr "Un semestre"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#: sith/settings.py
 | 
					#: sith/settings.py
 | 
				
			||||||
msgid "Two semesters"
 | 
					msgid "Two semesters"
 | 
				
			||||||
msgstr "Deux semestres, 35 €"
 | 
					msgstr "Deux semestres"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#: sith/settings.py
 | 
					#: sith/settings.py
 | 
				
			||||||
msgid "Common core cursus"
 | 
					msgid "Common core cursus"
 | 
				
			||||||
msgstr "Cursus tronc commun, 60 €"
 | 
					msgstr "Cursus tronc commun"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#: sith/settings.py
 | 
					#: sith/settings.py
 | 
				
			||||||
msgid "Branch cursus"
 | 
					msgid "Branch cursus"
 | 
				
			||||||
msgstr "Cursus branche, 60 €"
 | 
					msgstr "Cursus branche"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#: sith/settings.py
 | 
					#: sith/settings.py
 | 
				
			||||||
msgid "Alternating cursus"
 | 
					msgid "Alternating cursus"
 | 
				
			||||||
msgstr "Cursus alternant, 30 €"
 | 
					msgstr "Cursus alternant"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#: sith/settings.py
 | 
					#: sith/settings.py
 | 
				
			||||||
msgid "Honorary member"
 | 
					msgid "Honorary member"
 | 
				
			||||||
msgstr "Membre honoraire, 0 €"
 | 
					msgstr "Membre honoraire"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#: sith/settings.py
 | 
					#: sith/settings.py
 | 
				
			||||||
msgid "Assidu member"
 | 
					msgid "Assidu member"
 | 
				
			||||||
msgstr "Membre d'Assidu, 0 €"
 | 
					msgstr "Membre d'Assidu"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#: sith/settings.py
 | 
					#: sith/settings.py
 | 
				
			||||||
msgid "Amicale/DOCEO member"
 | 
					msgid "Amicale/DOCEO member"
 | 
				
			||||||
msgstr "Membre de l'Amicale/DOCEO, 0 €"
 | 
					msgstr "Membre de l'Amicale/DOCEO"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#: sith/settings.py
 | 
					#: sith/settings.py
 | 
				
			||||||
msgid "UT network member"
 | 
					msgid "UT network member"
 | 
				
			||||||
msgstr "Cotisant du réseau UT, 0 €"
 | 
					msgstr "Cotisant du réseau UT"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#: sith/settings.py
 | 
					#: sith/settings.py
 | 
				
			||||||
msgid "CROUS member"
 | 
					msgid "CROUS member"
 | 
				
			||||||
msgstr "Membres du CROUS, 0 €"
 | 
					msgstr "Membres du CROUS"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#: sith/settings.py
 | 
					#: sith/settings.py
 | 
				
			||||||
msgid "Sbarro/ESTA member"
 | 
					msgid "Sbarro/ESTA member"
 | 
				
			||||||
msgstr "Membre de Sbarro ou de l'ESTA, 20 €"
 | 
					msgstr "Membre de Sbarro ou de l'ESTA"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#: sith/settings.py
 | 
					#: sith/settings.py
 | 
				
			||||||
msgid "One semester Welcome Week"
 | 
					msgid "One semester Welcome Week"
 | 
				
			||||||
@@ -5041,28 +5041,28 @@ msgid "One day"
 | 
				
			|||||||
msgstr "Un jour"
 | 
					msgstr "Un jour"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#: sith/settings.py
 | 
					#: sith/settings.py
 | 
				
			||||||
msgid "GA staff member"
 | 
					msgid "GA staff member (2 weeks)"
 | 
				
			||||||
msgstr "Membre staff GA (2 semaines), 1 €"
 | 
					msgstr "Membre staff GA (2 semaines)"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#: sith/settings.py
 | 
					#: sith/settings.py
 | 
				
			||||||
msgid "One semester (-20%)"
 | 
					msgid "One semester (-20%)"
 | 
				
			||||||
msgstr "Un semestre (-20%), 12 €"
 | 
					msgstr "Un semestre (-20%)"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#: sith/settings.py
 | 
					#: sith/settings.py
 | 
				
			||||||
msgid "Two semesters (-20%)"
 | 
					msgid "Two semesters (-20%)"
 | 
				
			||||||
msgstr "Deux semestres (-20%), 22 €"
 | 
					msgstr "Deux semestres (-20%)"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#: sith/settings.py
 | 
					#: sith/settings.py
 | 
				
			||||||
msgid "Common core cursus (-20%)"
 | 
					msgid "Common core cursus (-20%)"
 | 
				
			||||||
msgstr "Cursus tronc commun (-20%), 36 €"
 | 
					msgstr "Cursus tronc commun (-20%)"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#: sith/settings.py
 | 
					#: sith/settings.py
 | 
				
			||||||
msgid "Branch cursus (-20%)"
 | 
					msgid "Branch cursus (-20%)"
 | 
				
			||||||
msgstr "Cursus branche (-20%), 36 €"
 | 
					msgstr "Cursus branche (-20%)"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#: sith/settings.py
 | 
					#: sith/settings.py
 | 
				
			||||||
msgid "Alternating cursus (-20%)"
 | 
					msgid "Alternating cursus (-20%)"
 | 
				
			||||||
msgstr "Cursus alternant (-20%), 24 €"
 | 
					msgstr "Cursus alternant (-20%)"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#: sith/settings.py
 | 
					#: sith/settings.py
 | 
				
			||||||
msgid "One year for free(CA offer)"
 | 
					msgid "One year for free(CA offer)"
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -541,7 +541,7 @@ SITH_SUBSCRIPTIONS = {
 | 
				
			|||||||
        "duration": 4,
 | 
					        "duration": 4,
 | 
				
			||||||
    },
 | 
					    },
 | 
				
			||||||
    "cursus-branche": {"name": _("Branch cursus"), "price": 60, "duration": 6},
 | 
					    "cursus-branche": {"name": _("Branch cursus"), "price": 60, "duration": 6},
 | 
				
			||||||
    "cursus-alternant": {"name": _("Alternating cursus"), "price": 30, "duration": 6},
 | 
					    "cursus-alternant": {"name": _("Alternating cursus"), "price": 35, "duration": 6},
 | 
				
			||||||
    "membre-honoraire": {"name": _("Honorary member"), "price": 0, "duration": 666},
 | 
					    "membre-honoraire": {"name": _("Honorary member"), "price": 0, "duration": 666},
 | 
				
			||||||
    "assidu": {"name": _("Assidu member"), "price": 0, "duration": 2},
 | 
					    "assidu": {"name": _("Assidu member"), "price": 0, "duration": 2},
 | 
				
			||||||
    "amicale/doceo": {"name": _("Amicale/DOCEO member"), "price": 0, "duration": 2},
 | 
					    "amicale/doceo": {"name": _("Amicale/DOCEO member"), "price": 0, "duration": 2},
 | 
				
			||||||
@@ -553,8 +553,6 @@ SITH_SUBSCRIPTIONS = {
 | 
				
			|||||||
        "price": 0,
 | 
					        "price": 0,
 | 
				
			||||||
        "duration": 1,
 | 
					        "duration": 1,
 | 
				
			||||||
    },
 | 
					    },
 | 
				
			||||||
    "un-mois-essai": {"name": _("One month for free"), "price": 0, "duration": 0.166},
 | 
					 | 
				
			||||||
    "deux-mois-essai": {"name": _("Two months for free"), "price": 0, "duration": 0.33},
 | 
					 | 
				
			||||||
    "benevoles-euroks": {"name": _("Eurok's volunteer"), "price": 5, "duration": 0.1},
 | 
					    "benevoles-euroks": {"name": _("Eurok's volunteer"), "price": 5, "duration": 0.1},
 | 
				
			||||||
    "six-semaines-essai": {
 | 
					    "six-semaines-essai": {
 | 
				
			||||||
        "name": _("Six weeks for free"),
 | 
					        "name": _("Six weeks for free"),
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -0,0 +1,21 @@
 | 
				
			|||||||
 | 
					# Generated by Django 5.2.3 on 2025-10-06 11:24
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					from django.db import migrations, models
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					import subscription.models
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					class Migration(migrations.Migration):
 | 
				
			||||||
 | 
					    dependencies = [("subscription", "0015_alter_subscription_location_and_more")]
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    operations = [
 | 
				
			||||||
 | 
					        migrations.AlterField(
 | 
				
			||||||
 | 
					            model_name="subscription",
 | 
				
			||||||
 | 
					            name="subscription_type",
 | 
				
			||||||
 | 
					            field=models.CharField(
 | 
				
			||||||
 | 
					                choices=subscription.models.get_subscription_types,
 | 
				
			||||||
 | 
					                max_length=255,
 | 
				
			||||||
 | 
					                verbose_name="subscription type",
 | 
				
			||||||
 | 
					            ),
 | 
				
			||||||
 | 
					        )
 | 
				
			||||||
 | 
					    ]
 | 
				
			||||||
@@ -38,16 +38,19 @@ def validate_payment(value):
 | 
				
			|||||||
        raise ValidationError(_("Bad payment method"))
 | 
					        raise ValidationError(_("Bad payment method"))
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					def get_subscription_types():
 | 
				
			||||||
 | 
					    return (
 | 
				
			||||||
 | 
					        (k, f"{v['name']}, {v['price']}€")
 | 
				
			||||||
 | 
					        for k, v in sorted(settings.SITH_SUBSCRIPTIONS.items())
 | 
				
			||||||
 | 
					    )
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
class Subscription(models.Model):
 | 
					class Subscription(models.Model):
 | 
				
			||||||
    member = models.ForeignKey(
 | 
					    member = models.ForeignKey(
 | 
				
			||||||
        User, related_name="subscriptions", on_delete=models.CASCADE
 | 
					        User, related_name="subscriptions", on_delete=models.CASCADE
 | 
				
			||||||
    )
 | 
					    )
 | 
				
			||||||
    subscription_type = models.CharField(
 | 
					    subscription_type = models.CharField(
 | 
				
			||||||
        _("subscription type"),
 | 
					        _("subscription type"), max_length=255, choices=get_subscription_types
 | 
				
			||||||
        max_length=255,
 | 
					 | 
				
			||||||
        choices=(
 | 
					 | 
				
			||||||
            (k, v["name"]) for k, v in sorted(settings.SITH_SUBSCRIPTIONS.items())
 | 
					 | 
				
			||||||
        ),
 | 
					 | 
				
			||||||
    )
 | 
					    )
 | 
				
			||||||
    subscription_start = models.DateField(_("subscription start"))
 | 
					    subscription_start = models.DateField(_("subscription start"))
 | 
				
			||||||
    subscription_end = models.DateField(_("subscription end"))
 | 
					    subscription_end = models.DateField(_("subscription end"))
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user