origin pull master

config/environments/development.rb

@@ -51,4 +51,7 @@ Rails.application.configure do
   # Use an evented file watcher to asynchronously detect changes in source code,
   # routes, locales, etc. This feature depends on the listen gem.
   config.file_watcher = ActiveSupport::EventedFileUpdateChecker
+
+  # Set Cable URL
+  config.action_cable.url = "ws://192.168.1.140:3002/cable"
 end

config/initializers/assets.rb

@@ -16,3 +16,5 @@ Rails.application.config.assets.precompile += %w( orgiami.js )
 # -- Order Queue Station -----
 Rails.application.config.assets.precompile += %w( OQS.css )
 Rails.application.config.assets.precompile += %w( OQS.js ) 
+
+Rails.application.config.assets.precompile += %w( settings.css )

config/routes.rb

@@ -2,13 +2,12 @@ require 'sidekiq/web'
 
 Rails.application.routes.draw do
 
-  namespace :origami do
-    get 'request_bills/show'
-  end
-
   root 'home#index'
   mount Sidekiq::Web => '/kiq'
 
+  # Action Cable Creation
+  mount ActionCable.server => "/cable"
+
   #--------- SmartSales Installation ------------#
   get 'install' => 'install#index'
   post 'install' =>  'install#create'
@@ -76,8 +75,6 @@ Rails.application.routes.draw do
     resources :request_bills, only: [:show] 
   end
 
-
-
   #--------- Waiter/Ordering Station ------------#
   namespace :oishi do
       #zones
@@ -99,6 +96,10 @@ Rails.application.routes.draw do
   #--------- Order Queue Station ------------#
   namespace :oqs do
     root "home#index"
+
+    post 'update_delivery', to: "home#update_delivery_status"
+
+    get 'print/print/:id', to: "print#print"
     #dashboard
     #
   end
@@ -155,7 +156,12 @@ Rails.application.routes.draw do
     end
 
   end
+  #--------- Transactions Sections ------------#
+  namespace :transactions do
+    resources :sales
+  end
 
+  #--------- Reports Controller Sections ------------#
   namespace :reports do
     resources :sales, :only => [:index, :show]
     resources :orders, :only => [:index, :show]
@@ -179,7 +185,8 @@ Rails.application.routes.draw do
   #   end
   # end
 
-
+  #----------- Print Setup --------#
+  resources :print_settings
 
   # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html
 end