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

app/controllers/origami/addorders_controller.rb

@@ -184,11 +184,11 @@ puts items_arr.to_json
         
           @status, @sale = Sale.request_bill(@order,current_user,current_login_employee)
           # for second display 
-           if ENV["SERVER_MODE"] != 'cloud'
+           # if ENV["SERVER_MODE"] != 'cloud'
 
             ActionCable.server.broadcast "second_display_channel",data: @sale,status:"sale"
             
-          end
+          # end
           result = {:status=> @status, :data => @sale }
           render :json => result.to_json
         end

app/controllers/origami/second_display_controller.rb

@@ -13,9 +13,9 @@ class Origami::SecondDisplayController < BaseOrigamiController
    else
      tax_profiles = nil
    end
-    if ENV["SERVER_MODE"] != 'cloud'
+   if ENV["SERVER_MODE"] != 'cloud'
       ActionCable.server.broadcast "second_display_view_channel",data: params[:data],tax_profiles: tax_profiles,status:params[:status]
-    end
+   end
   end
   #Shop Name in Navbor
   helper_method :shop_detail

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

config/initializers/mysql2_adapter.rb

@@ -24,7 +24,7 @@ module ActiveRecord
       end
 
       client = Mysql2::Client.new(config.symbolize_keys)
-      options = [config[:host], config[:username], config[:password], config[:database], config[:port], config[:socket], 0]
+      options = [config[:host], config[:username], config[:password], config[:database], config[:port], config[:socket], config[:wait_timeout], 0]
       ConnectionAdapters::Mysql2Adapter.new(client, logger, options, config)
     end
   end