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

Rename Delivery.delivered_on to date

Browse source 
This aligns it with column names of StockTaking and us to use inheritance
in a next step to share common code between the entities.
This commit is contained in:
Patrick Gansterer 2020-08-01 18:39:34 +02:00
parent 7b2072251e
commit a5582e9542
18 changed files with 35 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/views/finance/invoices/_invoices.html.haml
View file

@ -28,7 +28,7 @@
%td><
- invoice.deliveries.each_with_index do |delivery, index|
= ', ' if index > 0
= link_to format_date(delivery.delivered_on), [delivery.supplier,delivery]
= link_to format_date(delivery.date), [delivery.supplier,delivery]
%td><
- invoice.orders.each_with_index do |order, index|
= ', ' if index > 0

4
app/views/finance/invoices/show.html.haml
View file

@ -16,11 +16,11 @@
%p
%b= heading_helper(Invoice, :deliveries) + ':'
%span><
- @invoice.deliveries.order(:delivered_on).each_with_index do |delivery, index|
- @invoice.deliveries.order(:date).each_with_index do |delivery, index|
- sum = delivery.sum
- total += sum
= ', ' if index > 0
= link_to format_date(delivery.delivered_on), [delivery.supplier,delivery]
= link_to format_date(delivery.date), [delivery.supplier, delivery]
= ' (' + number_to_currency(sum) + ')'
- if @invoice.orders.any?
%p