Merge pull request #866 from FJNR-inc/develop

New release

blitz_api/settings.py

@@ -59,7 +59,8 @@
     'safedelete',
     'import_export',
     'django_filters',
-    'admin_auto_filters'
+    'admin_auto_filters',
+    'django_admin_inline_paginator',
 ]
 
 MIDDLEWARE = [

cron_manager/admin.py

@@ -3,21 +3,23 @@
 
 from . import models
 from django.utils.translation import ugettext_lazy as _
+from django_admin_inline_paginator.admin import TabularInlinePaginated
 
 
 class TaskFilter(AutocompleteFilter):
     title = 'Task'
     field_name = 'task'
 
 
-class ExecutionInline(admin.StackedInline):
+class ExecutionInline(TabularInlinePaginated):
     model = models.Execution
     can_delete = True
     show_change_link = True
     verbose_name_plural = _('Executions')
     fk_name = 'task'
     readonly_fields = ('created_at',)
     max_num = 10
+    per_page = 5
 
 
 class TaskAdmin(admin.ModelAdmin):

requirements.txt

@@ -28,4 +28,6 @@ tqdm==4.54.1
 colorama==0.4.4
 django-admin-autocomplete-filter==0.6.1
 mailchimp3==3.0.14
-babel==2.9.0
+babel==2.9.0
+
+django-admin-inline-paginator==0.1.1

store/resources.py

@@ -116,6 +116,9 @@ class Meta:
             'item_id',
             'quantity',
             'order',
+            'coupon',
+            'coupon_real_value',
+            'cost',
         )
         export_order = (
             'id',
@@ -125,6 +128,9 @@ class Meta:
             'item_id',
             'quantity',
             'order',
+            'coupon',
+            'coupon_real_value',
+            'cost',
         )
 
 

store/tests/tests_viewset_Order.py

@@ -3374,13 +3374,6 @@ def test_validate_coupon(self):
         )
 
         content = {
-            'orderline': {
-                'content_type': 'package',
-                'object_id': self.package.id,
-                'quantity': 2,
-                'metadata': None,
-                'options': []
-            },
             'value': 10.0
         }