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

add receive to order screen, and distinguish between finished and closed orders to put it in nicely

Browse source
This commit is contained in:
wvengen 2013-12-18 19:21:39 +01:00
parent 1ab09b41bd
commit 94b4454a1b
2 changed files with 48 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

5
app/controllers/orders_controller.rb
View file

@ -8,7 +8,8 @@ class OrdersController < ApplicationController
# List orders
def index
@open_orders = Order.open
@open_orders = Order.open.includes(:supplier)
@orders_in_progress = Order.finished_not_closed.includes(:supplier)
@per_page = 15
if params['sort']
sort = case params['sort']
@ -20,7 +21,7 @@ class OrdersController < ApplicationController
else
sort = "ends DESC"
end
@orders = Order.page(params[:page]).per(@per_page).order(sort).where("state != 'open'").includes(:supplier)
@orders = Order.closed.page(params[:page]).per(@per_page).includes(:supplier).order(sort)
end
# Gives a view for the results to a specific order