Merge branch 'master' of ssh://bitbucket.org/code2lab/sxrestaurant

config/routes.rb

@@ -38,10 +38,14 @@ Rails.application.routes.draw do
     post "bill/:booking_id" => "bill#create"
     post "move" => "move#create"
 
+
     #Order Controller
     resources :orders, only: [:create, :show, :update] do
+
       post "bill" => "bill#create"
+
     end
+
     #Current active bookings
     resources :bookings, only: [:index, :show, :create, :update]
     resources :customers, only: [:index, :show, :create, :update]
@@ -68,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
@@ -86,12 +89,17 @@ Rails.application.routes.draw do
       resources :customers
       #membership
       #bookings
+      post "update_booking" , to: "bookings#update_booking", as: "update_booking"
       #queue
   end
 
   #--------- 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
@@ -106,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
@@ -174,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