Add autocomplete_fields in Admin and other updates

plans/admin.py

@@ -25,19 +25,26 @@ def user_link(self, obj):
 
 class PlanQuotaInline(admin.TabularInline):
     model = PlanQuota
+    autocomplete_fields = ['quota']
 
 
 class PlanPricingInline(admin.TabularInline):
     model = PlanPricing
+    autocomplete_fields = ['pricing']
 
 
 class QuotaAdmin(OrderedModelAdmin):
     list_display = [
         'codename', 'name', 'description', 'unit',
         'is_boolean', 'move_up_down_links',
     ]
+    list_filter = [
+        'unit',
+        'is_boolean'
+    ]
 
     list_display_links = list_display
+    search_fields = ['codename', 'name']
 
 
 def copy_plan(modeladmin, request, queryset):
@@ -68,7 +75,7 @@ def copy_plan(modeladmin, request, queryset):
 
 class PlanAdmin(OrderedModelAdmin):
     search_fields = ('name', 'customized__username', 'customized__email', )
-    list_filter = ('available', 'visible')
+    list_filter = ('available', 'visible', 'default', 'created')
     list_display = [
         'name', 'description', 'customized', 'default', 'available',
         'created', 'move_up_down_links'
@@ -78,6 +85,8 @@ class PlanAdmin(OrderedModelAdmin):
     list_select_related = True
     raw_id_fields = ('customized',)
     actions = [copy_plan, ]
+
+    autocomplete_fields = ['customized']
 
     def queryset(self, request):
         return super(PlanAdmin, self).queryset(request).select_related(
@@ -92,6 +101,7 @@ class BillingInfoAdmin(UserLinkMixin, admin.ModelAdmin):
     list_select_related = True
     readonly_fields = ('user_link',)
     exclude = ('user',)
+    autocomplete_fields = ['user']
 
 
 def make_order_completed(modeladmin, request, queryset):
@@ -117,10 +127,14 @@ class InvoiceInline(admin.TabularInline):
     raw_id_fields = (
         'user',
     )
+    autocomplete_fields = ['user']
 
 
 class OrderAdmin(admin.ModelAdmin):
-    list_filter = ('status', 'created', 'completed', 'plan__name', 'pricing')
+    list_filter = (
+        'status', 'created', 'completed', 'plan__name', 'pricing', 'plan_extended_from',
+        'plan_extended_until', 'currency'
+    )
     raw_id_fields = ('user',)
     search_fields = (
         'id', 'user__username', 'user__email', 'invoice__full_number'
@@ -133,7 +147,11 @@ class OrderAdmin(admin.ModelAdmin):
     list_display_links = list_display
     actions = [make_order_completed, make_order_invoice]
     inlines = (InvoiceInline, )
-
+    autocomplete_fields = [
+        'user',
+        'plan',
+        'pricing'
+    ]
     def queryset(self, request):
         return super(OrderAdmin, self).queryset(request).select_related('plan', 'pricing', 'user')
 
@@ -151,6 +169,7 @@ class InvoiceAdmin(admin.ModelAdmin):
     list_display_links = list_display
     list_select_related = True
     raw_id_fields = ('user', 'order')
+    autocomplete_fields = ['user', 'order']
 
 
 class UserPlanAdmin(UserLinkMixin, admin.ModelAdmin):
@@ -162,12 +181,29 @@ class UserPlanAdmin(UserLinkMixin, admin.ModelAdmin):
     readonly_fields = ['user_link', ]
     fields = ('user', 'user_link', 'plan', 'expire', 'active' )
     raw_id_fields = ['user', 'plan', ]
+    autocomplete_fields = [
+        'user',
+        'plan'
+    ]
+
+
+class PricingAdmin(admin.ModelAdmin):
+    list_display = [
+        'name', 'period', 'visible'
+    ]
+    list_filter = [
+        'visible',
+        'period',
+    ]
+    search_fields = [
+        'name'
+    ]
 
 
 admin.site.register(Quota, QuotaAdmin)
 admin.site.register(Plan, PlanAdmin)
 admin.site.register(UserPlan, UserPlanAdmin)
-admin.site.register(Pricing)
+admin.site.register(Pricing, PricingAdmin)
 admin.site.register(Order, OrderAdmin)
 admin.site.register(BillingInfo, BillingInfoAdmin)
 admin.site.register(Invoice, InvoiceAdmin)

plans/enum.py

@@ -56,4 +56,7 @@ def get_display_name(self, v):
         return self.enum_display[v]
 
     def get_display_code(self, v):
-        return self.enum_code[v]
+        return self.enum_code[v]
+
+    def get_display_id(self, v):
+        return self.enum_dict[v]

plans/migrations/0005_auto_20190529_1055.py

@@ -0,0 +1,48 @@
+# Generated by Django 2.2 on 2019-05-29 10:55
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('plans', '0004_create_user_plans'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='order',
+            name='is_recurring',
+            field=models.BooleanField(blank=True, default=False),
+        ),
+        migrations.AddField(
+            model_name='pricing',
+            name='visible',
+            field=models.BooleanField(db_index=True, default=True, help_text='Is visible in current offer', verbose_name='visible'),
+        ),
+        migrations.AlterField(
+            model_name='plan',
+            name='available',
+            field=models.BooleanField(db_index=True, default=False, help_text='Is still available for purchase', verbose_name='Plan Available'),
+        ),
+        migrations.AlterField(
+            model_name='plan',
+            name='name',
+            field=models.CharField(max_length=100, verbose_name='Plan Name'),
+        ),
+        migrations.AlterField(
+            model_name='plan',
+            name='order',
+            field=models.PositiveIntegerField(db_index=True, editable=False, verbose_name='order'),
+        ),
+        migrations.AlterField(
+            model_name='plan',
+            name='visible',
+            field=models.BooleanField(db_index=True, default=True, help_text='Is visible in current offer', verbose_name='Plan Visible'),
+        ),
+        migrations.AlterField(
+            model_name='quota',
+            name='order',
+            field=models.PositiveIntegerField(db_index=True, editable=False, verbose_name='order'),
+        ),
+    ]

plans/models.py

@@ -55,7 +55,7 @@ class Plan(OrderedModel):
     is using this plan already will be able to extend this plan again. If plan is not visible and not
     available, he will be forced then to change plan next time he extends an account.
     """
-    name = models.CharField(_('name'), max_length=100)
+    name = models.CharField(_('Plan Name'), max_length=100)
     description = models.TextField(_('description'), blank=True)
     default = models.NullBooleanField(
         help_text=_('Both "Unknown" and "No" means that the plan is not default'),
@@ -64,11 +64,11 @@ class Plan(OrderedModel):
         unique=True,
     )
     available = models.BooleanField(
-        _('available'), default=False, db_index=True,
+        _('Plan Available'), default=False, db_index=True,
         help_text=_('Is still available for purchase')
     )
     visible = models.BooleanField(
-        _('visible'), default=True, db_index=True,
+        _('Plan Visible'), default=True, db_index=True,
         help_text=_('Is visible in current offer')
     )
     created = models.DateTimeField(_('created'), db_index=True)
@@ -351,7 +351,11 @@ class Pricing(models.Model):
         _('period'), default=30, null=True, blank=True, db_index=True)
     url = models.URLField(max_length=200, blank=True, help_text=_(
         'Optional link to page with more information (for clickable pricing table headers)'))
-
+    visible = models.BooleanField(
+        _('visible'), default=True, db_index=True,
+        help_text=_('Is visible in current offer')
+    )
+
     class Meta:
         ordering = ('period',)
         verbose_name = _("Pricing")
@@ -470,6 +474,7 @@ class Order(models.Model):
     currency = models.CharField(_('currency'), max_length=3, default='EUR')
     status = models.IntegerField(
         _('status'), choices=STATUS, default=STATUS.NEW)
+    is_recurring = models.BooleanField(default=False, blank=True)
 
     def save(self, force_insert=False, force_update=False, using=None, update_fields=None):
         if self.created is None: