Browse Source

Added a blank "FDN" configuration type for Offers

Damien Nicolas 10 years ago
parent
commit
9e13381e5d

+ 3 - 2
coin/offers/admin.py

@@ -33,7 +33,7 @@ class OfferSubscriptionAdmin(admin.ModelAdmin):
     list_display_links = ('member','offer')
     list_display_links = ('member','offer')
     list_filter = ( OfferSubscriptionTerminationFilter,
     list_filter = ( OfferSubscriptionTerminationFilter,
                     OfferSubscriptionCommitmentFilter,
                     OfferSubscriptionCommitmentFilter,
-                    'member', 'offer')
+                    'member', 'offer', 'status')
     search_fields = ['member__first_name', 'member__last_name', 'member__email']
     search_fields = ['member__first_name', 'member__last_name', 'member__email']
     
     
     fields = (
     fields = (
@@ -41,7 +41,8 @@ class OfferSubscriptionAdmin(admin.ModelAdmin):
                 'offer',
                 'offer',
                 'subscription_date',
                 'subscription_date',
                 'commitment',
                 'commitment',
-                'resign_date'
+                'resign_date',
+                'status',
              )
              )
     form = autocomplete_light.modelform_factory(OfferSubscription, fields='__all__')
     form = autocomplete_light.modelform_factory(OfferSubscription, fields='__all__')
 
 

+ 2 - 1
coin/settings.py

@@ -162,7 +162,8 @@ INSTALLED_APPS = (
     'coin.configuration',
     'coin.configuration',
     'coin.vpn',
     'coin.vpn',
     'coin.isp_database',
     'coin.isp_database',
-    'simple_dsl'
+    'simple_dsl',
+    'fdnwhitelabel',
 )
 )
 
 
 # A sample logging configuration. The only tangible logging
 # A sample logging configuration. The only tangible logging

+ 0 - 0
fdnwhitelabel/__init__.py


+ 3 - 0
fdnwhitelabel/admin.py

@@ -0,0 +1,3 @@
+from django.contrib import admin
+
+# Register your models here.

+ 0 - 0
fdnwhitelabel/migrations/__init__.py


+ 37 - 0
fdnwhitelabel/models.py

@@ -0,0 +1,37 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models
+from django.core.validators import RegexValidator
+
+from coin.configuration.models import Configuration
+
+
+class FDNWhiteLabel(Configuration):
+    class Meta:
+        verbose_name = 'marque blanche FDN'
+        # If Django's default pluralisation is not satisfactory
+        # verbose_name_plural = 'very many DSL lines'
+
+    # URL namespace associated to this configuration type, to build URLs
+    # in various view.  Should also be defined in urls.py.  Here, we don't
+    # define any view, so there's no need for an URL namespace.
+    url_namespace = "fdn"
+    phone_number = models.CharField(max_length=20,
+                                    verbose_name='phone number',
+                                    help_text="Phone number associated to the DSL line")
+    address = models.TextField(
+        verbose_name='adresse postale', blank=True, null=True)
+    postal_code = models.CharField(max_length=5, blank=True, null=True,
+                                   validators=[RegexValidator(regex=r'^\d{5}$',
+                                                              message='Code postal non valide.')],
+                                   verbose_name='code postal')
+    city = models.CharField(max_length=200, blank=True, null=True,
+                            verbose_name='commune')
+    
+    def __unicode__(self):
+        return self.phone_number
+
+    def subnet_event(self):
+        # Do something with self.ip_subnet.all() here.
+        pass

+ 3 - 0
fdnwhitelabel/tests.py

@@ -0,0 +1,3 @@
+from django.test import TestCase
+
+# Create your tests here.

+ 3 - 0
fdnwhitelabel/views.py

@@ -0,0 +1,3 @@
+from django.shortcuts import render
+
+# Create your views here.