fixed conflict after merch dev for current shop

2019-12-02 19:30:24 +06:30
parent 6ad2f320df 937f40e7c1
commit 417d64ecae
92 changed files with 1611 additions and 350 deletions
--- a/app/controllers/origami/split_bill_controller.rb
+++ b/app/controllers/origami/split_bill_controller.rb
@@ -397,4 +397,9 @@ class Origami::SplitBillController < BaseOrigamiController
 		render :json => { status: true }
 	end

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