From d824d0d9285ee8116851aeab08723ccaa3a1f555 Mon Sep 17 00:00:00 2001 From: Skia Date: Sun, 7 Aug 2016 20:06:47 +0200 Subject: [PATCH] Uppercase some choices in settings --- .../migrations/0014_auto_20160807_1954.py | 19 +++++++++++++ counter/migrations/0015_auto_20160807_1954.py | 24 ++++++++++++++++ sith/settings_sample.py | 28 ++++++++++--------- .../migrations/0004_auto_20160807_1954.py | 19 +++++++++++++ 4 files changed, 77 insertions(+), 13 deletions(-) create mode 100644 accounting/migrations/0014_auto_20160807_1954.py create mode 100644 counter/migrations/0015_auto_20160807_1954.py create mode 100644 subscription/migrations/0004_auto_20160807_1954.py diff --git a/accounting/migrations/0014_auto_20160807_1954.py b/accounting/migrations/0014_auto_20160807_1954.py new file mode 100644 index 00000000..808c840c --- /dev/null +++ b/accounting/migrations/0014_auto_20160807_1954.py @@ -0,0 +1,19 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('accounting', '0013_auto_20160807_1923'), + ] + + operations = [ + migrations.AlterField( + model_name='operation', + name='mode', + field=models.CharField(max_length=255, verbose_name='payment method', choices=[('CHEQUE', 'Check'), ('CASH', 'Cash'), ('TRANSFert', 'Transfert'), ('CARD', 'Credit card')]), + ), + ] diff --git a/counter/migrations/0015_auto_20160807_1954.py b/counter/migrations/0015_auto_20160807_1954.py new file mode 100644 index 00000000..914d3189 --- /dev/null +++ b/counter/migrations/0015_auto_20160807_1954.py @@ -0,0 +1,24 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('counter', '0014_auto_20160804_1603'), + ] + + operations = [ + migrations.AlterField( + model_name='refilling', + name='bank', + field=models.CharField(max_length=255, verbose_name='bank', choices=[('OTHER', 'Autre'), ('LA-POSTE', 'La Poste'), ('CREDIT-AGRICOLE', 'Credit Agricole'), ('CREDIT-MUTUEL', 'Credit Mutuel')], default='other'), + ), + migrations.AlterField( + model_name='refilling', + name='payment_method', + field=models.CharField(max_length=255, verbose_name='payment method', choices=[('CHEQUE', 'Check'), ('CASH', 'Cash')], default='cash'), + ), + ] diff --git a/sith/settings_sample.py b/sith/settings_sample.py index 5e1d4c95..7bf0c5b0 100644 --- a/sith/settings_sample.py +++ b/sith/settings_sample.py @@ -43,6 +43,7 @@ INSTALLED_APPS = ( 'django.contrib.staticfiles', 'django.contrib.sites', 'django_jinja', + 'rest_framework', 'core', 'club', 'subscription', @@ -50,6 +51,7 @@ INSTALLED_APPS = ( 'counter', 'eboutic', 'launderette', + 'api', ) MIDDLEWARE_CLASSES = ( @@ -245,16 +247,16 @@ SITH_MAIN_BOARD_GROUP=SITH_MAIN_CLUB['unix_name']+SITH_BOARD_SUFFIX SITH_MAIN_MEMBERS_GROUP=SITH_MAIN_CLUB['unix_name']+SITH_MEMBER_SUFFIX SITH_ACCOUNTING_PAYMENT_METHOD = [ - ('cheque', _('Check')), - ('cash', _('Cash')), - ('transfert', _('Transfert')), - ('card', _('Credit card')), + ('CHEQUE', _('Check')), + ('CASH', _('Cash')), + ('TRANSFert', _('Transfert')), + ('CARD', _('Credit card')), ] SITH_SUBSCRIPTION_PAYMENT_METHOD = [ - ('cheque', _('Check')), - ('cash', _('Cash')), - ('other', _('Other')), + ('CHEQUE', _('Check')), + ('CASH', _('Cash')), + ('OTHER', _('Other')), ] SITH_SUBSCRIPTION_LOCATIONS = [ @@ -270,15 +272,15 @@ SITH_COUNTER_BARS = [ ] SITH_COUNTER_PAYMENT_METHOD = [ - ('cheque', _('Check')), - ('cash', _('Cash')), + ('CHEQUE', _('Check')), + ('CASH', _('Cash')), ] SITH_COUNTER_BANK = [ - ('other', 'Autre'), - ('la-poste', 'La Poste'), - ('credit-agricole', 'Credit Agricole'), - ('credit-mutuel', 'Credit Mutuel'), + ('OTHER', 'Autre'), + ('LA-POSTE', 'La Poste'), + ('CREDIT-AGRICOLE', 'Credit Agricole'), + ('CREDIT-MUTUEL', 'Credit Mutuel'), ] # Subscription durations are in semestres (should be settingized) diff --git a/subscription/migrations/0004_auto_20160807_1954.py b/subscription/migrations/0004_auto_20160807_1954.py new file mode 100644 index 00000000..d218230b --- /dev/null +++ b/subscription/migrations/0004_auto_20160807_1954.py @@ -0,0 +1,19 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('subscription', '0003_subscription_location'), + ] + + operations = [ + migrations.AlterField( + model_name='subscription', + name='payment_method', + field=models.CharField(max_length=255, verbose_name='payment method', choices=[('CHEQUE', 'Check'), ('CASH', 'Cash'), ('OTHER', 'Other')]), + ), + ]