Merge branch 'crm' of bitbucket.org:code2lab/sxrestaurant into staging

2017-06-18 12:10:30 +06:30
parent f33f11df64 b62d5349c6
commit 74c6f3cebc
13 changed files with 191 additions and 65 deletions
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -124,6 +124,9 @@ Rails.application.routes.draw do
      post "update_booking" , to: "bookings#update_booking", as: "update_booking"#assign and cancel
      get '/print/:id', to: "home#print_order"#print order for crm

+      get "/dining_queues/:id/assign"    =>"dining_queues#assign", :as => "assign"
+      post "/dining_queues/assign_table" =>"dining_queues#assign_table", :as => "assign_table"
+
  end

  #--------- Order Queue Station ------------#