Add pickup date

This additional date helps users to find the correct order if the time
between end and pickup varies a lot.
This commit is contained in:
Patrick Gansterer 2016-04-29 15:28:05 +02:00
parent 97f81d9826
commit f286dd6053
15 changed files with 59 additions and 9 deletions

View file

@ -33,6 +33,8 @@
%dd= show_user_link(@order.created_by)
%dt= heading_helper Order, :ends
%dd= format_time(@order.ends)
%dt= heading_helper Order, :pickup
%dd= format_date(@order.pickup)
- unless @order.stockit? or @order.supplier.min_order_quantity.blank?
%dt= heading_helper Supplier, :min_order_quantity, short: true
%dd= @order.supplier.min_order_quantity

View file

@ -2,6 +2,7 @@
%thead
%tr
%th= heading_helper Order, :name
%th= heading_helper Order, :pickup
%th= heading_helper Order, :ends
%th= heading_helper GroupOrder, :price
%tbody
@ -10,6 +11,7 @@
- order_class = group_order ? "" : "color:grey"
%tr{:class=> cycle('even', 'odd', :name => 'orders'), :style => order_class}
%td= group_order.present? ? link_to(order.name, group_order_path(group_order)) : order.name
%td= format_date(order.pickup)
%td= format_time(order.ends)
%td.numeric= group_order ? number_to_currency(group_order.price) : "--"
- if pagination

View file

@ -15,6 +15,8 @@
%dd= @order.note
%dt= heading_helper Order, :ends
%dd= format_time(@order.ends)
%dt= heading_helper Order, :pickup
%dd= format_date(@order.pickup)
%dt= heading_helper GroupOrder, :price
%dd
- if @group_order