Merge branch 'master' into license

config/application.rb

@@ -7,6 +7,7 @@ require 'rails/all'
 Bundler.require(*Rails.groups)
 
 require 'carrierwave/orm/activerecord'
+require 'carrierwave/processing/mini_magick'
 
 module SXRestaurants
   class Application < Rails::Application

config/puma.rb.production

@@ -1,9 +1,11 @@
 application_path = '/home/superuser/Application/production/sxrestaurant'
 directory application_path
-environment 'production'
+environment ENV.fetch("RAILS_ENV") { "development" }
 daemonize true
-pidfile "#{application_path}/tmp/pids/puma.pid"
-state_path "#{application_path}/tmp/pids/puma.state"
+pidfile "#{application_path}/tmp/puma/pid"
+state_path "#{application_path}/tmp/puma/state"
 stdout_redirect "#{application_path}/log/puma.stdout.log", "#{application_path}/log/puma.stderr.log"
-bind 'tcp://0.0.0.0:9292'
+port        ENV.fetch("PORT") { 62158 }
 workers 2
+preload_app!
+

config/routes.rb

@@ -230,7 +230,7 @@ scope "(:locale)", locale: /en|mm/ do
   #--------- Order Queue Station ------------#
   namespace :oqs do
     root "home#index"
-    get "/:table_id", to: "home#get_order_items"
+    get "/:order_no", to: "home#get_order_items"
 
     post 'update_delivery', to: "home#update_delivery_status"