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

2017-06-26 15:38:31 +06:30
parent 7263a65da9 69f24101f9
commit 1d96eb1d48
5 changed files with 34 additions and 4 deletions
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -77,6 +77,7 @@ Rails.application.routes.draw do
    end
    post 'moving' => "movetable#moving"
    get "/table/:table_id/sale/:sale_id/edit" => "sale_edit#edit"
+    post 'item_void' => "sale_edit#item_void"
    get 'table/:dining_id/movetable' => "movetable#move_dining"
    get 'table/:dining_id/moveroom' => "moveroom#move_dining"
    get 'sale/:sale_id' => 'sales#show'