Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add sum column to order overview #964

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions app/views/orders/index.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
%th= heading_helper Order, :pickup
%th= heading_helper Order, :ends
%th= heading_helper Order, :note
%th= heading_helper Order, :sum
%th{colspan: "2"}
%tbody
- unless @open_orders.empty?
Expand All @@ -34,6 +35,7 @@
%td= format_date(order.pickup) unless order.pickup.nil?
%td= format_time(order.ends) unless order.ends.nil?
%td= truncate(order.note)
%td= number_to_currency(order.sum(:net)) + ' / ' + number_to_currency(order.sum(:gross))
%td= link_to t('.action_end'), finish_order_path(order),
data: {confirm: t('.confirm_end', order: order.name)}, method: :post,
class: 'btn btn-small btn-success'
Expand Down
1 change: 1 addition & 0 deletions config/locales/de.yml
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,7 @@ de:
pickup: Abholung
starts: Läuft vom
status: Status
sum: Summe (Netto/Brutto-Preise)
supplier: Lieferant
transport: Transportkosten
transport_distribution: Transportkostenverteilung
Expand Down
1 change: 1 addition & 0 deletions config/locales/en.yml
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,7 @@ en:
pickup: Pickup
starts: Starts at
status: Status
sum: Sum (net/gross price)
supplier: Supplier
transport: Transport costs
transport_distribution: Transport costs distribution
Expand Down
1 change: 1 addition & 0 deletions config/locales/es.yml
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,7 @@ es:
pickup: Recogida
starts: Comienza el
status: Estado
sum: Suma (Precio Neto/Bruto)
supplier: Proveedor
transport: Coste de transporte
transport_distribution: Distribución de costes de transporte
Expand Down
1 change: 1 addition & 0 deletions config/locales/fr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@ fr:
name: Fournisseur-e
starts: Ouverture le
status: Statut
sum: Totaux (des prix TTC/HT)
supplier: Fournisseu-r-se
updated_by: Dernière modification par
order_article:
Expand Down
1 change: 1 addition & 0 deletions config/locales/nl.yml
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,7 @@ nl:
pickup: Ophaaldag
starts: Start op
status: Status
sum: Totaal (netto/bruto prijs)
supplier: Leverancier
transport: Vervoerskosten
transport_distribution: Verdeling van vervoerskosten
Expand Down