Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Sith
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
59
Issues
59
List
Boards
Labels
Service Desk
Milestones
Merge Requests
9
Merge Requests
9
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
AE
Sith
Commits
bef10c0f
Commit
bef10c0f
authored
Jul 07, 2018
by
Sli
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'sli' into 'master'
Add subscription for 2018 Euroks See merge request
!155
parents
290f6ca8
e3cb6d41
Pipeline
#1514
passed with stage
in 5 minutes and 38 seconds
Changes
3
Pipelines
1
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
166 additions
and
138 deletions
+166
-138
locale/fr/LC_MESSAGES/django.po
locale/fr/LC_MESSAGES/django.po
+141
-138
sith/settings.py
sith/settings.py
+5
-0
subscription/migrations/0007_auto_20180706_1135.py
subscription/migrations/0007_auto_20180706_1135.py
+20
-0
No files found.
locale/fr/LC_MESSAGES/django.po
View file @
bef10c0f
This diff is collapsed.
Click to expand it.
sith/settings.py
View file @
bef10c0f
...
...
@@ -502,6 +502,11 @@ SITH_SUBSCRIPTIONS = {
'name'
:
_
(
'Two month for free'
),
'price'
:
0
,
'duration'
:
0.33
,
},
'benevoles-euroks'
:
{
'name'
:
_
(
'Eurok
\'
s volunteer'
),
'price'
:
5
,
'duration'
:
0.1
}
# To be completed....
}
...
...
subscription/migrations/0007_auto_20180706_1135.py
0 → 100644
View file @
bef10c0f
# -*- coding: utf-8 -*-
# Generated by Django 1.11.13 on 2018-07-06 09:35
from
__future__
import
unicode_literals
from
django.db
import
migrations
,
models
class
Migration
(
migrations
.
Migration
):
dependencies
=
[
(
'subscription'
,
'0006_auto_20170902_1222'
),
]
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-mois-essai'
,
'Two month for free'
),
(
'deux-semestres'
,
'Two semesters'
),
(
'membre-honoraire'
,
'Honorary member'
),
(
'reseau-ut'
,
'UT network member'
),
(
'sbarro/esta'
,
'Sbarro/ESTA member'
),
(
'un-semestre'
,
'One semester'
),
(
'un-semestre-welcome'
,
'One semester Welcome Week'
)],
max_length
=
255
,
verbose_name
=
'subscription type'
),
),
]
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment