merge all 03062017

config/routes.rb

@@ -1,7 +1,7 @@
 require 'sidekiq/web'
 
 Rails.application.routes.draw do
-  
+
   root 'home#index'
   mount Sidekiq::Web => '/kiq'
 
@@ -72,10 +72,9 @@ Rails.application.routes.draw do
       resources :discounts, only: [:index,:new, :create ] #add discount type
       resources :customers, only: [:index,:new, :create ] #add customer type
     end
+    resources :request_bills, only: [:show] 
   end
 
-
-
   #--------- Waiter/Ordering Station ------------#
   namespace :oishi do
       #zones
@@ -115,6 +114,9 @@ Rails.application.routes.draw do
       resources :menu_categories, only: [:new, :create, :edit]
     end
 
+    #accounts
+    resources :accounts
+
     resources :menu_categories do
       #menu_items
       #resources :menu_items