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

Merge pull request #355 from foodcoop1040/expeted_delivery_date

Browse source 
Add expected delivery date
This commit is contained in:
wvengen 2016-05-04 17:42:29 +02:00
commit 8d5467ab7c
15 changed files with 59 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

19
app/views/orders/show.html.haml
View file

@ -11,12 +11,23 @@
.well
= close_button :alert
%p
= raw t '.description1',
- description1 = raw t '.description1_order',
state: t("orders.state.#{@order.state}").capitalize,
supplier: supplier_link(@order),
who: show_user_link(@order.created_by),
starts: format_time(@order.starts),
ends: format_time(@order.ends)
who: show_user_link(@order.created_by)
- description1 += ' '
- if @order.ends
- description1 += raw t '.description1_period.starts_ends',
starts: format_time(@order.starts),
ends: format_time(@order.ends)
- else
- description1 += raw t '.description1_period.starts',
starts: format_time(@order.starts)
- if @order.pickup
- description1 += ' '
- description1 += raw t '.description1_period.pickup',
pickup: format_date(@order.pickup)
= description1 + '.'
%br
= raw t '.description2',
ordergroups: ordergroup_count(@order),