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

This commit is contained in:
Yan
2017-12-07 17:37:24 +06:30
7 changed files with 65 additions and 43 deletions

View File

@@ -41,8 +41,7 @@ authorize_resource :class => false
def show
from, to = get_date_range_from_params
puts from
puts to
@sale_data = Sale.get_by_shift_sale(from,to,Sale::SALE_STATUS_COMPLETED)
date_arr = Array.new