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

app/models/license.rb

@@ -60,8 +60,8 @@ class License
         return true
       end
     else         
-      # @license = Marshal.load(cache_license)
-      # assign(aes_key, aes_iv)
+      @license = Marshal.load(cache_license)
+      assign(aes_key, aes_iv)
       # Rails.logger.info 'API License'           
       return true
     end

app/models/my_aes_crypt.rb

@@ -64,7 +64,7 @@ class MyAesCrypt
 		shop_json["data"].each do |j|
 			if j["lookup"] == from			
 				# add [0...44] for production cloud for remove \n
-				if(j["value"]["key"][0...44] == token)
+				if(j["value"]["key"] == token)
 					return true
 				end
 			end