From 5e744453f8ba56bd17b61e57f4773b2a3e558434 Mon Sep 17 00:00:00 2001
From: Patrick Gansterer <paroga@paroga.com>
Date: Fri, 4 Mar 2016 22:26:55 +0100
Subject: [PATCH] Add more infos to the invoice page

When a foodcoop does not use the balancing feature the invoice page is
the main page for informations. Add all related information to it, so
people do not need to open the balancing page.
---
 app/models/delivery.rb                    | 19 ++++++++++++++++++-
 app/views/finance/invoices/show.html.haml | 15 +++++++++++++++
 config/locales/de.yml                     |  1 +
 config/locales/en.yml                     |  1 +
 config/locales/fr.yml                     |  1 +
 config/locales/nl.yml                     |  1 +
 6 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/app/models/delivery.rb b/app/models/delivery.rb
index 367cdc1f..3c46763c 100644
--- a/app/models/delivery.rb
+++ b/app/models/delivery.rb
@@ -20,7 +20,24 @@ class Delivery < ActiveRecord::Base
   def includes_article?(article)
     self.stock_changes.map{|stock_change| stock_change.stock_article.id}.include? article.id
   end
-  
+
+  def sum(type = :gross)
+    total = 0
+    for sc in stock_changes
+      article = sc.stock_article
+      quantity = sc.quantity
+      case type
+        when :net
+          total += quantity * article.price
+        when :gross
+          total += quantity * article.gross_price
+        when :fc
+          total += quantity * article.fc_price
+      end
+    end
+    total
+  end
+
   protected
   
   def stock_articles_must_be_unique
diff --git a/app/views/finance/invoices/show.html.haml b/app/views/finance/invoices/show.html.haml
index b57a0296..ccb87778 100644
--- a/app/views/finance/invoices/show.html.haml
+++ b/app/views/finance/invoices/show.html.haml
@@ -1,5 +1,7 @@
 - title t('.title', number: @invoice.number)
 
+- total = 0
+
 %p
   %b= heading_helper(Invoice, :created_at) + ':'
   = format_time(@invoice.created_at)
@@ -15,15 +17,21 @@
     %b= heading_helper(Invoice, :deliveries) + ':'
     %span><
       - @invoice.deliveries.order(:delivered_on).each_with_index do |delivery, index|
+        - sum = delivery.sum
+        - total += sum
         = ', ' if index > 0
         = link_to format_date(delivery.delivered_on), [delivery.supplier,delivery]
+        = ' (' + number_to_currency(sum) + ')'
 - if @invoice.orders.any?
   %p
     %b= heading_helper(Invoice, :orders) + ':'
     %span><
       - @invoice.orders.order(:ends).each_with_index do |order, index|
+        - sum = order.sum
+        - total += sum
         = ', ' if index > 0
         = link_to format_date(order.ends), new_finance_order_path(order_id: order)
+        = ' (' + number_to_currency(sum) + ')'
 
 %p
   %b= heading_helper(Invoice, :number) + ':'
@@ -43,6 +51,13 @@
 %p
   %b= heading_helper(Invoice, :deposit_credit) + ':'
   = number_to_currency @invoice.deposit_credit
+%p
+  %b= heading_helper(Invoice, :net_amount) + ':'
+  = number_to_currency @invoice.net_amount
+- if @invoice.deliveries.any? || @invoice.orders.any?
+  %p
+    %b= heading_helper(Invoice, :total) + ':'
+    = number_to_currency total
 %p
   %b= heading_helper(Invoice, :note) + ':'
   =h @invoice.note
diff --git a/config/locales/de.yml b/config/locales/de.yml
index 62e9a8cd..df339054 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -60,6 +60,7 @@ de:
         deliveries: Lieferung
         deposit: Pfand berechnet
         deposit_credit: Pfand gutgeschrieben
+        net_amount: Pfandbereinigter Betrag
         note: Notiz
         number: Nummer
         orders: Bestellung
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 6497da03..b5269903 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -60,6 +60,7 @@ en:
         deliveries: Delivery
         deposit: Deposit charged
         deposit_credit: Deposit returned
+        net_amount: Amount adjusted for refund
         note: Note
         number: Number
         orders: Order
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 5c7f2ac3..f771b959 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -60,6 +60,7 @@ fr:
         deliveries: Réapprovisionnement
         deposit: Consigne facturée
         deposit_credit: Consigne remboursée
+        net_amount: Montant recalculé en excluant les consignes
         note: Note
         number: Numéro
         orders: Commande
diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index 3d2cc0e0..83faa3d2 100644
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -60,6 +60,7 @@ nl:
         deliveries: Levering
         deposit: Statiegeld in rekening gebracht
         deposit_credit: Statiegeld teruggekregen
+        net_amount: Bedrag gecorrigeerd voor statiegeld
         note: Notitie
         number: Nummer
         orders: Bestelling