Foodsoft
/
foodsoft
1
1
Fork 0
Code Issues 36 Pull Requests 5 Projects 1 Releases Wiki Activity

Merge pull request #417 from foodcoop1040/deliveries_col 

Hide deliveries column if there are no deliveries
This commit is contained in:
wvengen 2016-03-11 11:53:40 +01:00
parent 14e2fd179e 7d7dfd7155
commit b56df39623
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/views/finance/invoices/_invoices.html.haml
View File

@ -10,7 +10,8 @@
%th= heading_helper Invoice, :date %th= heading_helper Invoice, :date
%th= heading_helper Invoice, :paid_on %th= heading_helper Invoice, :paid_on
%th= heading_helper Invoice, :amount %th= heading_helper Invoice, :amount
%th= heading_helper Invoice, :deliveries - if Delivery.any?
%th= heading_helper Invoice, :deliveries
%th= heading_helper Invoice, :orders %th= heading_helper Invoice, :orders
%th= heading_helper Invoice, :note %th= heading_helper Invoice, :note
%th %th
@ -23,10 +24,11 @@
%td= link_to h(format_date invoice.date), finance_invoice_path(invoice) %td= link_to h(format_date invoice.date), finance_invoice_path(invoice)
%td= format_date invoice.paid_on %td= format_date invoice.paid_on
%td= number_to_currency invoice.amount %td= number_to_currency invoice.amount
%td>< - if Delivery.any?
- invoice.deliveries.each_with_index do |delivery, index| %td><
= ', ' if index > 0 - invoice.deliveries.each_with_index do |delivery, index|
= link_to format_date(delivery.delivered_on), [delivery.supplier,delivery] = ', ' if index > 0
= link_to format_date(delivery.delivered_on), [delivery.supplier,delivery]
%td>< %td><
- invoice.orders.each_with_index do |order, index| - invoice.orders.each_with_index do |order, index|
= ', ' if index > 0 = ', ' if index > 0