Merge branch 'crm' of 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]
@@ -86,6 +90,7 @@ Rails.application.routes.draw do
       resources :customers
       #membership
       #bookings
+      post "update_booking" , to: "bookings#update_booking", as: "update_booking"
       #queue
   end