Merge branch 'adminbsb_material_ui'

2018-03-30 17:47:46 +06:30
parent fc8d8eea4a 2dec217bcc
commit d1a62948e9
4 changed files with 50 additions and 11 deletions
--- a/app/controllers/origami/quick_service_controller.rb
+++ b/app/controllers/origami/quick_service_controller.rb
@@ -12,7 +12,7 @@ class Origami::QuickServiceController < ApplicationController
    day = Date.today.wday
    @menus    = Menu.all
    @menu     = MenuCategory.active.where("menu_id =#{@menus[0].id}").order('order_by asc')
-    @zone   = Zone.all
+    @zone     = Zone.all
    @customer = Customer.all
    @tables   = Table.all.active.order('status desc')
    @rooms    = Room.all.active.order('status desc')