Merge branch 'sales_features' into 'dev'

Sales features

See merge request !266

.gitignore

@@ -36,5 +36,5 @@ coverage.xml
 
 # Celery
 celerybeat-schedule
-/config_app/settings/dev.env
-/config_app/settings/test.env
+/config_app/settings/local.env
+

Envoy.blade.php

@@ -29,9 +29,12 @@ echo '{{ $new_release_dir }}'
 
 @task('create_symlinks', ['on' => 'localhost'])
 echo '>> Создание симлинков'
-@if ($branch)
-    ln -nfs {{ $app_dir }}/configs/master/prod.env {{ $new_release_dir }}/config_app/settings/prod.env
-    ln -nfs {{ $app_dir }}/configs/dev/dev.env {{ $new_release_dir }}/config_app/settings/dev.env
+@if ($branch == 'master')
+    ln -nfs {{ $app_dir }}/configs/master/prod.env {{ $new_release_dir }}/config_app/settings/local.env
+    ln -nfs {{ $app_dir }}/media/master {{ $new_release_dir }}/media
+@endif
+@if ($branch == 'dev')
+    ln -nfs {{ $app_dir }}/configs/dev/dev.env {{ $new_release_dir }}/config_app/settings/local.env
     ln -nfs {{ $app_dir }}/media/master {{ $new_release_dir }}/media
 @endif
 @endtask

config_app/settings/prod.env

@@ -1,5 +0,0 @@
-DEBUG=False
-SECRET_KEY='!eiquy7_+2#vn3z%zfp51$m-=tmvtcv*cj*@x$!v(_9btq0w=$'
-DATABASE_URL='psql://team:nu5Xefise@127.0.0.1:5432/new_lms'
-EMAIL_URL='smtp+tls://robo@skillbox.ru:nu5Xefise@smtp.gmail.com:587'
-CACHE_URL=rediscache://127.0.0.1:6379/1?client_class=django_redis.client.DefaultClient

config_app/settings/prod.env.skeleton

@@ -0,0 +1,5 @@
+DEBUG=False
+SECRET_KEY='....'
+DATABASE_URL='psql://<name>:<password>@127.0.0.1:5432/<db_name>'
+EMAIL_URL='smtp+tls://<name>:<password>@smtp.gmail.com:587'
+CACHE_URL=rediscache://127.0.0.1:6379/<db>?client_class=django_redis.client.DefaultClient

lms/settings.py

@@ -8,22 +8,10 @@ import socket
 root = environ.Path(__file__) - 2
 env = environ.Env()
 
-MOD = os.environ.get('MOD', 'Prod')
-DEBUG = os.environ.get('DEBUG', 'False')
 
-MASTER_PASSWORD = os.environ.get('MASTER_PASSWORD', '@J*1')
-
-if MOD == 'Test':
-    environ.Env.read_env(str(root) + '/config_app/settings/test.env')
-
-elif MOD == 'Dev':
-    environ.Env.read_env(str(root) + '/config_app/settings/dev.env')
+environ.Env.read_env(str(root) + '/config_app/settings/local.env')
 
-elif MOD == 'Prod':
-    environ.Env.read_env(str(root) + '/config_app/settings/prod.env')
-
-else:
-    raise ImportError('no such environ ' + MOD)
+MASTER_PASSWORD = os.environ.get('MASTER_PASSWORD', '@J*1')
 
 EMAIL_CONFIG = env.email_url('EMAIL_URL',)
 vars().update(EMAIL_CONFIG)