Add cmtool to Qwaiter

config/application.rb

@@ -16,6 +16,17 @@ if defined?(Bundler)
   # Bundler.require(:default, :assets, Rails.env)
 end
 
+# Ugly fix for the updated json gem changes
+module JSON
+  class << self
+    alias :old_parse :parse
+    def parse(json, args = {})
+      args[:create_additions] = true
+      old_parse(json, args)
+    end
+  end
+end
+
 module Qwaiter
   class Application < Rails::Application
     # Settings in config/environments/* take precedence over those specified here.

config/routes.rb

@@ -61,13 +61,13 @@ Qwaiter::Application.routes.draw do
 
   #match '/show_products' => 'dashboard#show_products', as: :user_products
   # GENERAL
-  get '/about' => 'dashboard#about'
-  get '/enquete' => 'dashboard#enquete'
-  get '/cartoon' => 'dashboard#cartoon'
-  get '/bars-restaurants' => 'dashboard#bars_restaurants', as: :bars_restaurants
-  get '/clients' => 'dashboard#clients'
-  get '/contact' => 'dashboard#contact'
-  get '/s' => 'dashboard#scan', as: :scan
+  #get '/about' => 'dashboard#about'
+  #get '/enquete' => 'dashboard#enquete'
+  #get '/cartoon' => 'dashboard#cartoon'
+  #get '/bars-restaurants' => 'dashboard#bars_restaurants', as: :bars_restaurants
+  #get '/clients' => 'dashboard#clients'
+  #get '/contact' => 'dashboard#contact'
+  get '/s' => redirect('/scan'), as: :scan
 
   # DEVELOPMENT ONLY 
   get '/qr' => 'dashboard#qr'
@@ -100,6 +100,8 @@ Qwaiter::Application.routes.draw do
   #DEMO & DEVELOPMENT
   get '/select_qrcode' => 'dashboard#select_qrcode'
   get '/table_qr_image' => 'dashboard#table_qr_image', as: :table_qr_image
+
+  mount Cmtool::Engine => '/cmtool'
   #match "/:action", controller: 'dashboard'
 
   # The priority is based upon order of creation:
@@ -151,7 +153,10 @@ Qwaiter::Application.routes.draw do
 
   # You can have the root of your site routed with "root"
   # just remember to delete public/index.html.
-  root :to => 'dashboard#home'
+  #
+  #root :to => 'dashboard#home'
+  root :to => 'pages#home'
+  get "/:name" => "pages#show", constraints: {name: /.*/}, as: :page
 
   # See how all your routes lay out with "rake routes"