add docker data

Dockerfile

@@ -8,5 +8,7 @@ COPY Gemfile /sxrestaurant/Gemfile
 COPY Gemfile.lock /sxrestaurant/Gemfile.lock
 RUN bundle install --without development test
 RUN bundle exec rails assets:precompile
+RUN echo "Asia/Rangoon" > /etc/timezone
+RUN dpkg-reconfigure -f noninteractive tzdata
 COPY . /sxrestaurant
 

app/controllers/api/order_reserve/order_reservation_controller.rb

@@ -32,31 +32,31 @@ class Api::OrderReserve::OrderReservationController < Api::ApiController
 	def create
 		status = false
 		if !params[:cus_info]
-			render :json => { :status => false, :message => "cus_info is required!" }
+			result = { :status => false, :message => "cus_info is required!" }
 		elsif !params[:requested_time]
-			render :json => { :status => false, :message => "requested_time is required!" }
+			result = { :status => false, :message => "requested_time is required!" }
 		elsif !params[:callback_url]
-			render :json => { :status => false, :message => "callback_url is required!" }
+			result = { :status => false, :message => "callback_url is required!" }
 		elsif !params[:reference]
-			render :json => { :status => false, :message => "reference is required!" }
+			result = { :status => false, :message => "reference is required!" }
 		elsif !params[:order_type]
-			render :json => { :status => false, :message => "order_type is required!" }
+			result = { :status => false, :message => "order_type is required!" }
 		elsif params[:order_type] == ORDER || params[:order_type] == ORDER_RESERVATION
 			if !params[:order_info]
-				render :json => { :status => false, :message => "order_info is required!" }
+				result = { :status => false, :message => "order_info is required!" }
 			else
 				status = true
 			end
 		elsif params[:order_type] == RESERVATION || params[:order_type] == ORDER_RESERVATION
 			if !params[:reservation_info]
-				render :json => { :status => false, :message => "reservation_info is required!" }
+				result = { :status => false, :message => "reservation_info is required!" }
 			else
 				status = true
 			end
 		elsif !params[:payment_info]
-			render :json => { :status => false, :message => "payment_info is required!" }
+			result = { :status => false, :message => "payment_info is required!" }
 		elsif !params[:delivery_info]
-			render :json => { :status => false, :message => "delivery_info is required!" }
+			result = { :status => false, :message => "delivery_info is required!" }
 		end
 
 		if status == true
@@ -70,16 +70,21 @@ class Api::OrderReserve::OrderReservationController < Api::ApiController
 				else
 					shop_code = ''
 				end
+
+				result = { :status => true, :order_reservation_id => order_reservation_id, :message => "Order reservation is successfully created!" }
 				order_reservation = OrderReservation.get_pending_orders #find(order_reservation_id)
 				ActionCable.server.broadcast "order_reservation_channel",data: order_reservation,shop_code: shop_code
+			else
+				result = { :status => true, :order_reservation_id => order_reservation_id, :message => "Order reservation is already existed!" }
+			end
 		end
 		
-			if flag
-				render :json => { :status => true, :order_reservation_id => order_reservation_id, :message => "Order reservation is successfully created!" }
-			else
-				render :json => { :status => true, :order_reservation_id => order_reservation_id, :message => "Order reservation is already existed!" }
-			end
-		end
+		puts "!!! send doemal ::"
+		puts result
+
+		Rails.logger.debug "send status to doemal"
+		Rails.logger.debug result
+		render :json => result
 	end
 
 	def update_status

app/controllers/concerns/token_verification.rb

@@ -18,7 +18,7 @@ module TokenVerification
       # Rails.logger.debug "token - " + token.to_s
       if(options.length !=0 && options["from"] == "DOEMAL")
         if(ENV["SERVER_MODE"] === "cloud")
-          from = request.subdomain.downcase  + "." + request.domain.downcase  #"local"
+          from = "local" #request.subdomain.downcase  + "." + request.domain.downcase 
           aes = MyAesCrypt.new
           return aes.checkKeyForAuth(from, token)  
         end

config/initializers/action_controller.rb

@@ -20,11 +20,11 @@ class ActionController::Base
       end      
     else         
       #check for license file
-      if check_license
-        current_license(ENV["SX_PROVISION_URL"])
-      else
-        redirect_to activate_path
-      end      
+      # if check_license
+      #   current_license(ENV["SX_PROVISION_URL"])
+      # else
+      #   redirect_to activate_path
+      # end      
     end    
   end
 

config/secrets.yml

@@ -13,7 +13,7 @@
 development:
   secret_key_base: b61d85f8ed2a1a9e0eeece3443b3e8f838d002cc1d9f32115d8e93db920e2957adfedc57501d44741211538f3108b742cdeada87d5bfae796c53da1f90a3cd61  
   sx_provision_url: connect.pos-myanmar.com/api #connect.smartsales.dev/api #connect.smartsales.asia/api  #provision.zsai.ws/api   
-  server_mode: application
+  server_mode: cloud
   cipher_type: AES-256-CBC
   sx_key: Wh@t1$C2L