git_admin/sx-fc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant

Browse Source
This commit is contained in:
Yan
2017-11-15 17:56:16 +06:30
parent 50bf67f5e5 bf0a8135f6
commit 50aca66abe
9 changed files with 41 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/controllers/transactions/bookings_controller.rb
View File

@@ -10,12 +10,12 @@ class Transactions::BookingsController < ApplicationController
if filter.nil? && from.nil? && to.nil?
@bookings = Booking.all.order("sale_id desc")
@bookings = Kaminari.paginate_array(@bookings).page(params[:page]).per(2)
@bookings = Kaminari.paginate_array(@bookings).page(params[:page]).per(20)
else
sale = Sale.search(filter,from,to)
if sale.count > 0
@bookings = sale
@bookings = Kaminari.paginate_array(@bookings).page(params[:page]).per(2)
booking = Booking.search(filter,from,to)
if booking.count > 0
@bookings = booking
@bookings = Kaminari.paginate_array(@bookings).page(params[:page]).per(20)
else
@bookings = 0
end