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

2018-05-18 11:15:52 +06:30
parent 1e38ebcd51 679d3f838c
commit 39e7269fc1
42 changed files with 408 additions and 291 deletions
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -110,6 +110,8 @@ 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' }
    
+    get "quick_service/cash_ins" => "pending_order#cash_ins"
+    get "quick_service/cash_outs" => "pending_order#cash_outs"

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