Commit 8516b094 authored by Och's avatar Och
Browse files

sith: edited subscriptions prices

parents 1eb8eaf6 d815b6ff
Pipeline #2210 failed with stage
in 6 minutes and 39 seconds
......@@ -4758,6 +4758,7 @@ msgstr "Lavage et séchage"
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
#: sith/settings.py:594
=======
#: sith/settings.py:593
......@@ -4768,6 +4769,9 @@ msgstr "Lavage et séchage"
=======
#: sith/settings.py:594
>>>>>>> d815b6f... subscription: Corrected bad changes
=======
#: sith/settings.py:594
>>>>>>> d815b6ff0d35cfc8cf56c9b18a38458b797d7e85
msgid "Washing"
msgstr "Lavage"
......@@ -4775,6 +4779,7 @@ msgstr "Lavage"
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
#: sith/settings.py:594
=======
#: sith/settings.py:593
......@@ -4785,6 +4790,9 @@ msgstr "Lavage"
=======
#: sith/settings.py:594
>>>>>>> d815b6f... subscription: Corrected bad changes
=======
#: sith/settings.py:594
>>>>>>> d815b6ff0d35cfc8cf56c9b18a38458b797d7e85
msgid "Drying"
msgstr "Séchage"
......@@ -5509,8 +5517,11 @@ msgstr "Un mois gratuit"
#: sith/settings.py:501
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d815b6f... subscription: Corrected bad changes
=======
>>>>>>> d815b6ff0d35cfc8cf56c9b18a38458b797d7e85
msgid "Two months for free"
msgstr "Deux mois gratuits"
......@@ -5520,6 +5531,7 @@ msgstr "Six semaines gratuites"
#: sith/settings.py:507
<<<<<<< HEAD
<<<<<<< HEAD
msgid "Eurock's volunteer"
msgstr "Bénévole Eurockéennes"
......@@ -5531,6 +5543,8 @@ msgstr "Un jour"
=======
=======
>>>>>>> d815b6f... subscription: Corrected bad changes
=======
>>>>>>> d815b6ff0d35cfc8cf56c9b18a38458b797d7e85
msgid "Eurock's volunteer"
msgstr "Bénévole Eurockéennes"
......@@ -5538,6 +5552,7 @@ msgstr "Bénévole Eurockéennes"
msgid "One day"
msgstr "Un jour"
<<<<<<< HEAD
<<<<<<< HEAD
#: sith/settings.py:503
>>>>>>> c3de7f1... sith: Edited cotisations prices
......@@ -5560,6 +5575,12 @@ msgstr "Membre staff GA (2 semaines), 1 €"
>>>>>>> a68c74f... locale: Added traduction for the new subscription
<<<<<<< HEAD
=======
#: sith/settings.py:509
msgid "GA staff member"
msgstr "Membre staff GA (2 semaines), 1 €"
>>>>>>> d815b6ff0d35cfc8cf56c9b18a38458b797d7e85
#: sith/settings.py:512
msgid "One semester (-20%)"
msgstr "Un semestre, 20 €"
......@@ -5613,6 +5634,7 @@ msgid "Active member"
msgstr "Membre actif"
#: sith/settings.py:562
<<<<<<< HEAD
msgid "Curious"
msgstr "Curieux"
......@@ -5683,6 +5705,8 @@ msgid "Active member"
msgstr "Membre actif"
#: sith/settings.py:562
=======
>>>>>>> d815b6ff0d35cfc8cf56c9b18a38458b797d7e85
msgid "Curious"
msgstr "Curieux"
......@@ -5694,12 +5718,16 @@ msgstr "Une nouvelle affiche a besoin d'être modérée"
msgid "A new mailing list needs to be moderated"
msgstr "Une nouvelle mailing list a besoin d'être modérée"
<<<<<<< HEAD
<<<<<<< HEAD
#: sith/settings.py:569
>>>>>>> c3de7f1... sith: Edited cotisations prices
=======
#: sith/settings.py:602
>>>>>>> d815b6f... subscription: Corrected bad changes
=======
#: sith/settings.py:602
>>>>>>> d815b6ff0d35cfc8cf56c9b18a38458b797d7e85
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"
......@@ -5707,6 +5735,7 @@ msgstr ""
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
#: sith/settings.py:604
=======
#: sith/settings.py:603
......@@ -5717,6 +5746,9 @@ msgstr ""
=======
#: sith/settings.py:604
>>>>>>> d815b6f... subscription: Corrected bad changes
=======
#: sith/settings.py:604
>>>>>>> d815b6ff0d35cfc8cf56c9b18a38458b797d7e85
#, python-format
msgid "There are %s fresh news to be moderated"
msgstr "Il y a %s nouvelles toutes fraîches à modérer"
......@@ -5724,11 +5756,15 @@ msgstr "Il y a %s nouvelles toutes fraîches à modérer"
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d815b6ff0d35cfc8cf56c9b18a38458b797d7e85
#: sith/settings.py:605
msgid "New files to be moderated"
msgstr "Nouveaux fichiers à modérer"
#: sith/settings.py:606
<<<<<<< HEAD
=======
#: sith/settings.py:604
msgid "New files to be moderated"
......@@ -5750,6 +5786,8 @@ msgstr "Nouveaux fichiers à modérer"
#: sith/settings.py:606
>>>>>>> d815b6f... subscription: Corrected bad changes
=======
>>>>>>> d815b6ff0d35cfc8cf56c9b18a38458b797d7e85
#, python-format
msgid "There are %s pictures to be moderated in the SAS"
msgstr "Il y a %s photos à modérer dans le SAS"
......@@ -5757,11 +5795,15 @@ msgstr "Il y a %s photos à modérer dans le SAS"
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d815b6ff0d35cfc8cf56c9b18a38458b797d7e85
#: sith/settings.py:607
msgid "You've been identified on some pictures"
msgstr "Vous avez été identifié sur des photos"
#: sith/settings.py:608
<<<<<<< HEAD
=======
#: sith/settings.py:606
msgid "You've been identified on some pictures"
......@@ -5783,6 +5825,8 @@ msgstr "Vous avez été identifié sur des photos"
#: sith/settings.py:608
>>>>>>> d815b6f... subscription: Corrected bad changes
=======
>>>>>>> d815b6ff0d35cfc8cf56c9b18a38458b797d7e85
#, python-format
msgid "You just refilled of %s €"
msgstr "Vous avez rechargé votre compte de %s€"
......@@ -5790,6 +5834,7 @@ msgstr "Vous avez rechargé votre compte de %s€"
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
#: sith/settings.py:609
=======
#: sith/settings.py:608
......@@ -5800,6 +5845,9 @@ msgstr "Vous avez rechargé votre compte de %s€"
=======
#: sith/settings.py:609
>>>>>>> d815b6f... subscription: Corrected bad changes
=======
#: sith/settings.py:609
>>>>>>> d815b6ff0d35cfc8cf56c9b18a38458b797d7e85
#, python-format
msgid "You just bought %s"
msgstr "Vous avez acheté %s"
......@@ -5807,6 +5855,9 @@ msgstr "Vous avez acheté %s"
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d815b6ff0d35cfc8cf56c9b18a38458b797d7e85
#: sith/settings.py:610
msgid "You have a notification"
msgstr "Vous avez une notification"
......@@ -5828,6 +5879,7 @@ msgid "You successfully edited an article in the Weekmail"
msgstr "Article édité avec succès dans le Weekmail"
#: sith/settings.py:626
<<<<<<< HEAD
msgid "You successfully sent the Weekmail"
msgstr "Weekmail envoyé avec succès"
......@@ -5873,6 +5925,12 @@ msgstr "Weekmail envoyé avec succès"
=======
#: sith/settings.py:634
>>>>>>> d815b6f... subscription: Corrected bad changes
=======
msgid "You successfully sent the Weekmail"
msgstr "Weekmail envoyé avec succès"
#: sith/settings.py:634
>>>>>>> d815b6ff0d35cfc8cf56c9b18a38458b797d7e85
msgid "AE tee-shirt"
msgstr "Tee-shirt AE"
......
# Generated by Django 2.2.13 on 2020-08-26 11:32
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
("subscription", "0012_auto_20200615_1438"),
]
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-branche", "Branch cursus"),
("cursus-tronc-commun", "Common core cursus"),
("deux-semestres", "Two semesters"),
("membre-honoraire", "Honorary member"),
("membre-staff-ga", "GA staff member"),
("reseau-ut", "UT network member"),
("sbarro/esta", "Sbarro/ESTA member"),
("un-jour", "One day"),
("un-mois-essai", "One month for free"),
("un-semestre", "One semester"),
("un-semestre-welcome", "One semester Welcome Week"),
],
max_length=255,
verbose_name="subscription type",
),
),
]
# Generated by Django 2.2.13 on 2020-08-27 12:44
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
("subscription", "0013_auto_20200826_1332"),
]
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"),
("membre-staff-ga", "GA staff member"),
("reseau-ut", "UT network member"),
("sbarro/esta", "Sbarro/ESTA member"),
("six-semaines-essai", "Six weeks for free"),
("un-jour", "One day"),
("un-mois-essai", "One month for free"),
("un-semestre", "One semester"),
("un-semestre-reduction", "One semester (-20%)"),
("un-semestre-welcome", "One semester Welcome Week"),
],
max_length=255,
verbose_name="subscription type",
),
),
]
......@@ -145,6 +145,7 @@ class SubscriptionIntegrationTest(TestCase):
subscription_type="deux-mois-essai",
payment_method=settings.SITH_SUBSCRIPTION_PAYMENT_METHOD[0],
)
<<<<<<< HEAD
s.subscription_start = date(2017, 8, 29)
s.subscription_end = s.compute_end(duration=0.16666, start=s.subscription_start)
s.save()
......@@ -157,6 +158,8 @@ class SubscriptionIntegrationTest(TestCase):
subscription_type="deux-mois-essai",
payment_method=settings.SITH_SUBSCRIPTION_PAYMENT_METHOD[0],
)
=======
>>>>>>> d815b6ff0d35cfc8cf56c9b18a38458b797d7e85
s.subscription_start = date(2017, 8, 29)
s.subscription_end = s.compute_end(duration=0.33, start=s.subscription_start)
s.save()
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment