diff --git a/app/helpers/group_orders_helper.rb b/app/helpers/group_orders_helper.rb index b7707744..1c734498 100644 --- a/app/helpers/group_orders_helper.rb +++ b/app/helpers/group_orders_helper.rb @@ -16,6 +16,17 @@ module GroupOrdersHelper link_to order.name, path, options end + def link_to_ordering_price(order, options = {}) + if group_order = order.group_order(current_user.ordergroup) + price = group_order.price + path = group_order_path(group_order) + else + price = 0 + path = new_group_order_path(:order_id => order.id) + end + link_to number_to_currency(price), path, options + end + # Return css class names for order result table def order_article_class_name(quantity, tolerance, result) @@ -36,4 +47,4 @@ module GroupOrdersHelper {group_order_article: goa, quantity: quantity, tolerance: tolerance, result: result, sub_total: sub_total} end -end \ No newline at end of file +end diff --git a/app/views/shared/_open_orders.html.haml b/app/views/shared/_open_orders.html.haml index 63259520..b4ec76f0 100644 --- a/app/views/shared/_open_orders.html.haml +++ b/app/views/shared/_open_orders.html.haml @@ -10,7 +10,7 @@ %th= t '.supplier' %th= t '.ending' %th= t '.who_ordered' - %th= t '.total' + %th.numeric= t '.total' %tbody - total = 0 - Order.open.each do |order| @@ -20,7 +20,7 @@ - if group_order = order.group_order(ordergroup) - total += group_order.price %td= "#{group_order.updated_by.nick} (#{format_time(group_order.updated_on)})" - %td.numeric= number_to_currency(group_order.price) + %td.numeric= link_to_ordering_price(order) - else %td{:colspan => 2} - if total > 0