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

2018-03-13 14:53:07 +06:30
parent 0a9294ed60 a9afa4e317
commit a0c6c363fd
33 changed files with 1188 additions and 82 deletions
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -95,6 +95,9 @@ scope "(:locale)", locale: /en|mm/ do
    get "quick_service/modify_order/:sale_id" => "quick_service#modify_order"
    post 'quick_service/update_modify_order' => "quick_service#update_modify_order", :defaults => { :format => 'json' }
    
+    resources :second_display
+
+    post '/customer_view' => "second_display#customer_view",:as => "customer_view", :defaults => { :format => 'json' }

    resources :cash_ins, only: [:new, :create]
    resources :cash_outs, only: [:new, :create]