Pull from master

2018-04-12 10:04:28 +06:30
parent 36eab44f8b
commit 4a0995c7ba
11 changed files with 486 additions and 310 deletions
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -266,6 +266,9 @@ scope "(:locale)", locale: /en|mm/ do

    #order and reservation
    resources :order_reservation
+    get 'order_reservation/get_order/:id' => "order_reservation#get_order",:as => "get_order", :defaults => { :format => 'json' }
+    post 'order_reservation/update', to: "order_reservation#update" , :defaults => { :format => 'json' }
+
  end

  #--------- Waiter/Ordering Station ------------#