Merge pull request #658 from savoirfairelinux/feature/delivered-orders

Allow batch order status change

src/order/admin.py

@@ -1,6 +1,44 @@
 from django.contrib import admin
 from order.models import Order, Order_item, OrderStatusChange
 
-admin.site.register(Order)
-admin.site.register(Order_item)
+
+def make_delivered(modeladmin, request, queryset):
+    queryset.update(status='D')
+make_delivered.short_description = "Mark selected orders as delivered"
+
+
+class OrderItemInline(admin.TabularInline):
+    model = Order_item
+
+
+class OrderItemAdmin(admin.ModelAdmin):
+    search_fields = ['order__id']
+    list_display = (
+        'order',
+        'order_item_type',
+        'component_group',
+        'total_quantity',
+        'billable_flag',
+        'price',
+    )
+
+
+class OrderAdmin(admin.ModelAdmin):
+    search_fields = ['client__member__lastname', 'client__member__firstname']
+    list_filter = ('status', 'delivery_date')
+    list_display = (
+        'id',
+        'client',
+        'status',
+        'price',
+        'delivery_date',
+        'creation_date',
+    )
+    actions = [make_delivered]
+    inlines = [
+        OrderItemInline
+    ]
+
+admin.site.register(Order, OrderAdmin)
+admin.site.register(Order_item, OrderItemAdmin)
 admin.site.register(OrderStatusChange)

src/order/models.py

@@ -304,6 +304,13 @@ def create_order(self, delivery_date, client, items, prices):
 
         return order
 
+    """
+    Allow changing status of multiple orders at once.
+    """
+    def update_orders_status(self, orders, new):
+        count = orders.update(status=new)
+        return count
+
 
 class Order(models.Model):
 

src/order/tests.py

@@ -131,6 +131,19 @@ def test_get_shippable_orders_active_client_only(self):
         new_orders = Order.objects.get_shippable_orders()
         self.assertNotEqual(len(self.orders), len(new_orders))
 
+    def test_update_orders_status(self):
+        """
+        Should update orders status.
+        """
+        ordered = Order.objects.get_shippable_orders()
+        ordered_count = len(ordered)
+        Order.objects.update_orders_status(ordered, 'D')
+        delivered = Order.objects.filter(
+            delivery_date=date.today(),
+            status='D',
+        )
+        self.assertEqual(ordered_count, len(delivered))
+
 
 class OrderItemTestCase(TestCase):