add new domain

diff --git a/app/settings.py b/app/settings.py
index 84f3e14f00bf78b3ab3628e712de09236cd880c1..adb49921adc73b5c3e4042cc3ea6723683a4b6b3 100644 (file)
--- a/app/settings.py
+++ b/app/settings.py
@@ -33,6 +33,7 @@ MANAGERS = ADMINS
 ALLOWED_HOSTS = ['localhost', 'crfpa.dockdev.pilotsystems.net',
     'staging.docker.e-learning.crfpa.pre-barreau.parisson.com',
     'e-learning.crfpa.pre-barreau.com',
+    'prod.docker.e-learning.crfpa.pre-barreau.parisson.com',
 ]
 
 ASGI_APPLICATION = "teleforma.ws.routing.application"
@@ -463,11 +464,9 @@ JAZZMIN_UI_TWEAKS = {
 # Sherlock's online payment
 PAYMENT_SHERLOCKS_PATH='/srv/sherlocks'
 
-PAYMENT_PARAMETERS = { 'merchant_id' : { 'Semestrielle': "014295303911111",
-                                         'Annuelle': "014295303911111",
-                                         'Pré-annuelle': "014295303911111",
-                                         'Estivale': "014295303911111",
-                                         'Pré-estivale': "014295303911111", },
+PAYMENT_PARAMETERS = { 'merchant_id' : { 'Semestrielle': "040109417200053",
+                                  'Annuelle': "040109417200053",
+                                  'Estivale': "040109417200054", },                                         
                        'merchant_country': 'fr',
                        'currency_code': '978',
                        'language': 'fr'

diff --git a/teleforma/webclass/migrations/0005_webclassrecord_category.py b/teleforma/webclass/migrations/0005_webclassrecord_category.py
new file mode 100644 (file)
index 0000000..4b91243
--- /dev/null
+++ b/teleforma/webclass/migrations/0005_webclassrecord_category.py
@@ -0,0 +1,18 @@
+# Generated by Django 3.2.3 on 2021-07-13 16:08
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('webclass', '0004_auto_20210616_1654'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='webclassrecord',
+            name='category',
+            field=models.CharField(choices=[('WC', 'Webclass'), ('CC', 'Correction de copie')], default='WC', max_length=2, verbose_name='Catégorie'),
+        ),
+    ]