|
@@ -163,10 +163,11 @@ class VisitTable(tables.Table):
|
|
|
class DayOrdersTable(OrdersTable):
|
|
class DayOrdersTable(OrdersTable):
|
|
|
designer = tables.Column(verbose_name = 'Дизайнер')
|
|
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[1] = price
|
|
|
|
|
+ self.summary[2] = paid
|
|
|
|
|
|
|
|
def render_designer(self, value):
|
|
def render_designer(self, value):
|
|
|
return ' '.join((value.first_name, value.last_name))
|
|
return ' '.join((value.first_name, value.last_name))
|
|
@@ -175,9 +176,6 @@ class DayOrdersTable(OrdersTable):
|
|
|
empty_text = 'Заказов для этого дня нет'
|
|
empty_text = 'Заказов для этого дня нет'
|
|
|
attrs = {'class': 'paleblue'}
|
|
attrs = {'class': 'paleblue'}
|
|
|
exclude = ('date',
|
|
exclude = ('date',
|
|
|
- 'delivery',
|
|
|
|
|
- 'lifting',
|
|
|
|
|
- 'paid',
|
|
|
|
|
'ostatok',
|
|
'ostatok',
|
|
|
'approved',
|
|
'approved',
|
|
|
'sketch',
|
|
'sketch',
|
|
@@ -185,7 +183,8 @@ class DayOrdersTable(OrdersTable):
|
|
|
'is_done',
|
|
'is_done',
|
|
|
)
|
|
)
|
|
|
sequence = ('product',
|
|
sequence = ('product',
|
|
|
- 'price',
|
|
|
|
|
|
|
+ 'price',
|
|
|
|
|
+ 'paid',
|
|
|
'address',
|
|
'address',
|
|
|
'designer',
|
|
'designer',
|
|
|
'deadline',
|
|
'deadline',
|