Merge branch 'master' into license

2017-11-24 10:15:37 +06:30
parent 22b5421603 ca93f50fdf
commit a5a33b269a
143 changed files with 23874 additions and 3746 deletions
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -230,7 +230,7 @@ scope "(:locale)", locale: /en|mm/ do
  #--------- Order Queue Station ------------#
  namespace :oqs do
    root "home#index"
-    get "/:table_id", to: "home#get_order_items"
+    get "/:order_no", to: "home#get_order_items"

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