From 8ceaf8be050f6d45672f4b2de6285b2c388ffc02 Mon Sep 17 00:00:00 2001 From: Yan Date: Fri, 20 Oct 2017 17:06:34 +0630 Subject: [PATCH] edited order --- app/controllers/api/orders_controller.rb | 19 +++++++------------ config/application.rb | 2 +- 2 files changed, 8 insertions(+), 13 deletions(-) diff --git a/app/controllers/api/orders_controller.rb b/app/controllers/api/orders_controller.rb index 40c20afc..15f5f423 100644 --- a/app/controllers/api/orders_controller.rb +++ b/app/controllers/api/orders_controller.rb @@ -93,18 +93,13 @@ class Api::OrdersController < Api::ApiController end end - # for parallel order - - # i = 0 - remoteIP = "" - begin - @status, @booking = @order.generate - # i += 1 - puts "RRR" - puts @booking.booking_id - puts request.remote_ip - remoteIP = request.remote_ip - end while request.remote_ip != remoteIP + @status, @booking = @order.generate + # # for parallel order + # remoteIP = "" + # begin + # @status, @booking = @order.generate + # remoteIP = request.remote_ip + # end while request.remote_ip != remoteIP end # render json for http status code diff --git a/config/application.rb b/config/application.rb index 42f0cf82..8f0ca671 100644 --- a/config/application.rb +++ b/config/application.rb @@ -13,7 +13,7 @@ module SXRestaurants # Settings in config/environments/* take precedence over those specified here. # Application configuration should go into files in config/initializers # -- all .rb files in that directory are automatically loaded. - config.i18n.default_locale = :'mm' # English 'en' + config.i18n.default_locale = :'en' # English 'en' config.active_record.time_zone_aware_types = [:datetime, :time] config.active_job.queue_adapter = :sidekiq