Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant

2018-04-23 14:18:14 +06:30
parent cbb7a14621 6ce1fbf8a9
commit 924f8b03cd
2 changed files with 4 additions and 3 deletions
--- a/app/models/my_aes_crypt.rb
+++ b/app/models/my_aes_crypt.rb
@@ -62,8 +62,9 @@ class MyAesCrypt

 		shop_json = JSON.parse(shop_data)	
 		shop_json["data"].each do |j|
-			if j["lookup"] == from				
-				if(j["value"]["key"] == token)
+			if j["lookup"] == from			
+				# add [0...44] for production cloud for remove \n
+				if(j["value"]["key"][0...44] == token)
 					return true
 				end
 			end