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

2017-06-16 09:43:05 +06:30
parent 9a93f2e622 d92a0b0378
commit 2fe8f77bac
23 changed files with 383 additions and 232 deletions
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -198,8 +198,10 @@ Rails.application.routes.draw do
  namespace :transactions do
    resources :sales
    resources :orders
+
+    get "/sales/:sale_id/manual_complete_sale" =>"sales#manual_complete_sale", :as => "manual_complete_sale"
    get "/sales/:sale_id/void" =>"sales#void", :as => "void"
-    post "sales/manual_void_sale", to: "sales#manual_void_sale", :as => "manual_void_sale"
+    post "sales/:sale_id/manual_void_sale", to: "sales#manual_void_sale", :as => "manual_void_sale"
  end

  #--------- Reports Controller Sections ------------#