diff --git a/asuzr/tables.py b/asuzr/tables.py index 1b36260..46c0a2f 100644 --- a/asuzr/tables.py +++ b/asuzr/tables.py @@ -163,10 +163,11 @@ class VisitTable(tables.Table): class DayOrdersTable(OrdersTable): designer = tables.Column(verbose_name = 'Дизайнер') - summary = ['Итого:', 0, '', '', '',] + summary = ['Итого:', 0, 0, '', '', '', '', ''] - def set_summary(self, price): + def set_summary(self, price, paid): self.summary[1] = price + self.summary[2] = paid def render_designer(self, value): return ' '.join((value.first_name, value.last_name)) @@ -175,9 +176,6 @@ class DayOrdersTable(OrdersTable): empty_text = 'Заказов для этого дня нет' attrs = {'class': 'paleblue'} exclude = ('date', - 'delivery', - 'lifting', - 'paid', 'ostatok', 'approved', 'sketch', @@ -185,7 +183,8 @@ class DayOrdersTable(OrdersTable): 'is_done', ) sequence = ('product', - 'price', + 'price', + 'paid', 'address', 'designer', 'deadline', diff --git a/asuzr/views.py b/asuzr/views.py index e69e517..db92e25 100644 --- a/asuzr/views.py +++ b/asuzr/views.py @@ -94,10 +94,10 @@ def get_attendance_table(year, month, prefix): def get_day_orders_table(date, prefix): orders = Order.objects.filter(date = date) - orders_price = orders.aggregate(Sum('price')) + summaries = orders.aggregate(Sum('price'), Sum('paid')) table = DayOrdersTable(orders, prefix = prefix) table.verbose_name = 'Заказы на %s' % date.strftime('%d %B %Y г') - table.set_summary(orders_price['price__sum'] or 0) + table.set_summary(summaries['price__sum'] or 0, summaries['paid__sum'] or 0) return table