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

config/routes.rb

@@ -44,10 +44,9 @@ Rails.application.routes.draw do
 
     #Order Controller
     resources :orders, only: [:create, :show, :update] do
-
       post "bill" => "bill#create"
-
     end
+    get 'view_orders' => "orders#view_orders"
 
     #Current active bookings
     resources :bookings, only: [:index, :show, :create, :update]