Merge branch 'a19_subscriptions' into 'master'

SUBSCRIPTIONS: 5 new discounted subscriptions for integration

See merge request ae/Sith!226
This commit is contained in:
Antoine Bartuccio 2019-08-29 19:33:07 +02:00
commit ca042fe75e
3 changed files with 118 additions and 28 deletions

View File

@ -4714,12 +4714,12 @@ msgid "Washing and drying"
msgstr "Lavage et séchage"
#: launderette/templates/launderette/launderette_book.jinja:27
#: sith/settings.py:557
#: sith/settings.py:583
msgid "Washing"
msgstr "Lavage"
#: launderette/templates/launderette/launderette_book.jinja:31
#: sith/settings.py:557
#: sith/settings.py:583
msgid "Drying"
msgstr "Séchage"
@ -5408,108 +5408,128 @@ msgstr "6 semaines gratuites"
msgid "One day"
msgstr "Un jour"
#: sith/settings.py:517
#: sith/settings.py:501
msgid "One semester (-20%)"
msgstr "Un semestre (-20%), 12 €"
#: sith/settings.py:506
msgid "Two semesters (-20%)"
msgstr "Deux semestres (-20%), 22 €"
#: sith/settings.py:511
msgid "Common core cursus (-20%)"
msgstr "Cursus tronc commun (-20%), 36 €"
#: sith/settings.py:516
msgid "Branch cursus (-20%)"
msgstr "Cursus branche (-20%), 36 €"
#: sith/settings.py:521
msgid "Alternating cursus (-20%)"
msgstr "Cursus alternant (-20%), 24 €"
#: sith/settings.py:543
msgid "President"
msgstr "Président"
#: sith/settings.py:518
#: sith/settings.py:544
msgid "Vice-President"
msgstr "Vice-Président"
#: sith/settings.py:519
#: sith/settings.py:545
msgid "Treasurer"
msgstr "Trésorier"
#: sith/settings.py:520
#: sith/settings.py:546
msgid "Communication supervisor"
msgstr "Responsable communication"
#: sith/settings.py:521
#: sith/settings.py:547
msgid "Secretary"
msgstr "Secrétaire"
#: sith/settings.py:522
#: sith/settings.py:548
msgid "IT supervisor"
msgstr "Responsable info"
#: sith/settings.py:523
#: sith/settings.py:549
msgid "Board member"
msgstr "Membre du bureau"
#: sith/settings.py:524
#: sith/settings.py:550
msgid "Active member"
msgstr "Membre actif"
#: sith/settings.py:525
#: sith/settings.py:551
msgid "Curious"
msgstr "Curieux"
#: sith/settings.py:561
#: sith/settings.py:587
msgid "A new poster needs to be moderated"
msgstr "Une nouvelle affiche a besoin d'être modérée"
#: sith/settings.py:562
#: sith/settings.py:588
msgid "A new mailing list needs to be moderated"
msgstr "Une nouvelle mailing list a besoin d'être modérée"
#: sith/settings.py:565
#: sith/settings.py:591
msgid "A new pedagogy comment has been signaled for moderation"
msgstr ""
"Un nouveau commentaire de la pédagogie a été signalé pour la modération"
#: sith/settings.py:567
#: sith/settings.py:593
#, python-format
msgid "There are %s fresh news to be moderated"
msgstr "Il y a %s nouvelles toutes fraîches à modérer"
#: sith/settings.py:568
#: sith/settings.py:594
msgid "New files to be moderated"
msgstr "Nouveaux fichiers à modérer"
#: sith/settings.py:569
#: sith/settings.py:595
#, python-format
msgid "There are %s pictures to be moderated in the SAS"
msgstr "Il y a %s photos à modérer dans le SAS"
#: sith/settings.py:570
#: sith/settings.py:596
msgid "You've been identified on some pictures"
msgstr "Vous avez été identifié sur des photos"
#: sith/settings.py:571
#: sith/settings.py:597
#, python-format
msgid "You just refilled of %s"
msgstr "Vous avez rechargé votre compte de %s"
#: sith/settings.py:572
#: sith/settings.py:598
#, python-format
msgid "You just bought %s"
msgstr "Vous avez acheté %s"
#: sith/settings.py:573
#: sith/settings.py:599
msgid "You have a notification"
msgstr "Vous avez une notification"
#: sith/settings.py:585
#: sith/settings.py:611
msgid "Success!"
msgstr "Succès !"
#: sith/settings.py:586
#: sith/settings.py:612
msgid "Fail!"
msgstr "Échec !"
#: sith/settings.py:587
#: sith/settings.py:613
msgid "You successfully posted an article in the Weekmail"
msgstr "Article posté avec succès dans le Weekmail"
#: sith/settings.py:588
#: sith/settings.py:614
msgid "You successfully edited an article in the Weekmail"
msgstr "Article édité avec succès dans le Weekmail"
#: sith/settings.py:589
#: sith/settings.py:615
msgid "You successfully sent the Weekmail"
msgstr "Weekmail envoyé avec succès"
#: sith/settings.py:597
#: sith/settings.py:623
msgid "AE tee-shirt"
msgstr "Tee-shirt AE"

View File

@ -495,7 +495,33 @@ SITH_SUBSCRIPTIONS = {
"price": 0,
"duration": 0.23,
},
"un-jour": {"name": _("One day"), "price": 0, "duration": 0.00555333}
"un-jour": {"name": _("One day"), "price": 0, "duration": 0.00555333},
# Discount subscriptions
"un-semestre-reduction": {
"name": _("One semester (-20%)"),
"price": 12,
"duration": 1,
},
"deux-semestres-reduction": {
"name": _("Two semesters (-20%)"),
"price": 22,
"duration": 2,
},
"cursus-tronc-commun-reduction": {
"name": _("Common core cursus (-20%)"),
"price": 36,
"duration": 4,
},
"cursus-branche-reduction": {
"name": _("Branch cursus (-20%)"),
"price": 36,
"duration": 6,
},
"cursus-alternant-reduction": {
"name": _("Alternating cursus (-20%)"),
"price": 24,
"duration": 6,
}
# To be completed....
}

View File

@ -0,0 +1,44 @@
# -*- coding: utf-8 -*-
# Generated by Django 1.11.20 on 2019-08-25 20:15
from __future__ import unicode_literals
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [("subscription", "0010_auto_20180920_1441")]
operations = [
migrations.AlterField(
model_name="subscription",
name="subscription_type",
field=models.CharField(
choices=[
("amicale/doceo", "Amicale/DOCEO member"),
("assidu", "Assidu member"),
("benevoles-euroks", "Eurok's volunteer"),
("crous", "CROUS member"),
("cursus-alternant", "Alternating cursus"),
("cursus-alternant-reduction", "Alternating cursus (-20%)"),
("cursus-branche", "Branch cursus"),
("cursus-branche-reduction", "Branch cursus (-20%)"),
("cursus-tronc-commun", "Common core cursus"),
("cursus-tronc-commun-reduction", "Common core cursus (-20%)"),
("deux-mois-essai", "Two months for free"),
("deux-semestres", "Two semesters"),
("deux-semestres-reduction", "Two semesters (-20%)"),
("membre-honoraire", "Honorary member"),
("reseau-ut", "UT network member"),
("sbarro/esta", "Sbarro/ESTA member"),
("six-semaines-essai", "Six weeks for free"),
("un-jour", "One day"),
("un-semestre", "One semester"),
("un-semestre-reduction", "One semester (-20%)"),
("un-semestre-welcome", "One semester Welcome Week"),
],
max_length=255,
verbose_name="subscription type",
),
)
]