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/models/shop.rb
+++ b/app/models/shop.rb
@@ -1,12 +1,18 @@
 class Shop < ApplicationRecord
-	#ShopDetail = Shop.find_by_id(1)
+	#ShopDetail = Shop.current_shop

 	# Shop Image Uploader
+
  	mount_uploader :logo, ShopImageUploader
  	has_many :display_images
+
 	accepts_nested_attributes_for :display_images

 	def file_data=(input_data)
 	    self.data = input_data.read
 	end
+
+  def self.current_shop
+    ActsAsTenant.current_tenant
+  end
 end