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/reports/product_sale_controller.rb
+++ b/app/controllers/reports/product_sale_controller.rb
@@ -22,6 +22,6 @@ class Reports::ProductSaleController < BaseReportController
  	#Shop Name in Navbor
 	helper_method :shop_detail
 	def shop_detail
-		@shop = Shop.first
+		@shop = Shop.current_shop
 	end
 end
--- a/app/controllers/reports/receipt_no_controller.rb
+++ b/app/controllers/reports/receipt_no_controller.rb
@@ -179,7 +179,7 @@ authorize_resource :class => false
      customer= Customer.find(saleObj.customer_id)

      #shop detail
-      #shop_detail =  Shop.first
+      #shop_detail =  Shop.current_shop
      # get member information
      rebate = MembershipSetting.find_by_rebate(1)
      if customer.membership_id != nil && rebate