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/voucher_controller.rb
+++ b/app/controllers/origami/voucher_controller.rb
@@ -78,9 +78,4 @@ class Origami::VoucherController < BaseOrigamiController
    end
  end

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