remove conflict data in ability.rb

2018-02-09 14:06:16 +06:30
parent c124a5fb77 a59d692569
commit 9f6505fd95
65 changed files with 415 additions and 57 deletions
--- a/app/controllers/origami/rooms_controller.rb
+++ b/app/controllers/origami/rooms_controller.rb
@@ -125,5 +125,9 @@ class Origami::RoomsController < BaseOrigamiController
    end
  end

-
+  #Shop Name in Navbor
+  helper_method :shop_detail
+  def shop_detail
+    @shop = Shop.first
+  end
 end