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

2018-03-14 09:16:14 +06:30
parent 69fcdb7e03 84fe089568
commit 0edc92d066
110 changed files with 1354 additions and 786 deletions
--- a/app/controllers/origami/discounts_controller.rb
+++ b/app/controllers/origami/discounts_controller.rb
@@ -355,9 +355,5 @@ class Origami::DiscountsController < BaseOrigamiController

  #   redirect_to origami_path(sale_id)
  # end
-  #Shop Name in Navbor
-  helper_method :shop_detail
-  def shop_detail
-    @shop = Shop.first
-  end    
+   
 end