Merge branch 'r-1902001-01' into foodcourt

2020-08-26 11:03:03 +06:30
parent 38a01a8bde a226a39d08
commit e0cbe57245
41 changed files with 1592 additions and 1153 deletions
--- a/app/models/shop.rb
+++ b/app/models/shop.rb
@@ -8,7 +8,7 @@ class Shop < ApplicationRecord
 	accepts_nested_attributes_for :display_images

 	def file_data=(input_data)
-	    self.data = input_data.read
+    self.data = input_data.read
 	end

  def self.current_shop