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

2017-08-16 11:00:51 +06:30
parent db43ae186c 3e9b9c6b8b
commit 73cceaf482
11 changed files with 593 additions and 877 deletions
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -80,6 +80,7 @@ Rails.application.routes.draw do
    post 'moving' => "movetable#moving"
    get "/table/:table_id/sale/:sale_id/edit" => "sale_edit#edit"
    post 'item_void' => "sale_edit#item_void"
+    post 'item_foc' => "sale_edit#item_foc"
    post 'item_edit' => "sale_edit#item_edit"
    post 'item_void_cancel' => "sale_edit#item_void_cancel"
    post 'cancel_all_void' => 'sale_edit#cancel_all_void'