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

2017-06-18 20:18:12 +06:30
parent 7881ae4dfa 5906dde741
commit 6ffa73fa6f
53 changed files with 906 additions and 207 deletions
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -132,6 +132,7 @@ Rails.application.routes.draw do
  #--------- Order Queue Station ------------#
  namespace :oqs do
    root "home#index"
+    get "/:table_id", to: "home#get_order_items"

    post 'update_delivery', to: "home#update_delivery_status"