update report and view

2017-07-28 17:07:16 +06:30
parent 24fd399c17
commit 98c04f21d8
14 changed files with 815 additions and 29 deletions
--- a/app/controllers/origami/home_controller.rb
+++ b/app/controllers/origami/home_controller.rb
@@ -15,7 +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