enable actions for multi (group) orders and ordergroup invoices
This commit is contained in:
parent
f676497e43
commit
e902aa0d5a
44 changed files with 550 additions and 324 deletions
|
|
@ -1,7 +1,14 @@
|
|||
class Finance::BalancingController < Finance::BaseController
|
||||
def index
|
||||
@multi_orders = MultiOrder.includes(:orders, :group_orders).page(params[:page]).per(@per_page).order('ends DESC')
|
||||
@orders = Order.finished.non_multi_order.page(params[:page]).per(@per_page).order('ends DESC')
|
||||
page = params[:page].to_i
|
||||
page = 1 if page < 1
|
||||
per_page = @per_page.to_i
|
||||
offset = (page - 1) * per_page
|
||||
|
||||
multi_orders = MultiOrder.includes(:orders, :group_orders).page(params[:page]).per(@per_page).order('ends DESC')
|
||||
orders = Order.finished.non_multi_order.page(params[:page]).per(@per_page).order('ends DESC')
|
||||
combined = (multi_orders + orders).sort_by { |r| r.ends }.reverse
|
||||
@results = Kaminari.paginate_array(combined).page(params[:page]).per(@per_page)
|
||||
end
|
||||
|
||||
def new
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue