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

2017-07-26 18:40:11 +06:30
parent ad2dfa2ee0 1de6cc906c
commit 124528c138
5 changed files with 24 additions and 10 deletions
--- a/app/controllers/origami/home_controller.rb
+++ b/app/controllers/origami/home_controller.rb
@@ -15,6 +15,7 @@ class Origami::HomeController < BaseOrigamiController
    @rooms = Room.all.active.order('status desc')
    @complete = Sale.where("sale_status != 'new'")
    @orders = Order.all.order('date desc')
+    @shop   = Shop.find_by_id(1)
    @status_order = ""
    @status_sale = ""
    @sale_array = Array.new