Merge branch 'r-1902001-01-dev' of gitlab.com:code2lab/SXRestaurant into r-1902001-01-dev

2019-12-09 10:30:13 +06:30
parent dc1f464b7f 3b5b6c78f3
commit 67e7658e56
10 changed files with 11 additions and 8 deletions
--- a/app/controllers/origami/home_controller.rb
+++ b/app/controllers/origami/home_controller.rb
@@ -4,6 +4,7 @@ class Origami::HomeController < BaseOrigamiController

  def index
    @webview = check_mobile
+
    @tables   = Table.unscope(:order).includes(:zone).all.active.order('status desc')
    @rooms    = Room.unscope(:order).includes(:zone).all.active.order('status desc')
    @complete = Sale.completed_sale("cashier")