start of making nickname optional
This commit is contained in:
parent
a77c3b59b1
commit
e4f0a1e3ed
33 changed files with 92 additions and 48 deletions
|
|
@ -16,7 +16,7 @@
|
|||
%td= link_to truncate(order.name), new_finance_order_path(order_id: order.id)
|
||||
%td=h format_time(order.ends) unless order.ends.nil?
|
||||
%td= order.closed? ? t('.cleared', amount: number_to_currency(order.foodcoop_result)) : t('.ended')
|
||||
%td= order.updated_by.nil? ? '??' : order.updated_by.nick
|
||||
%td= show_user(order.updated_by)
|
||||
%td
|
||||
- unless order.closed?
|
||||
= link_to t('.clear'), new_finance_order_path(order_id: order.id), class: 'btn btn-mini btn-primary'
|
||||
|
|
|
|||
|
|
@ -12,6 +12,6 @@
|
|||
- @financial_transactions.each do |t|
|
||||
%tr
|
||||
%td= format_time(t.created_on)
|
||||
%td= h t.user.nil? ? '??' : t.user.nick
|
||||
%td= h show_user(t.user)
|
||||
%td= h t.note
|
||||
%td.currency{:style => "color:#{t.amount < 0 ? 'red' : 'black'}; width:5em"}= number_to_currency(t.amount)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue