merge origin master

2017-06-23 17:53:53 +06:30
parent a996ccc7ee 81c50f220a
commit e01ecc6e0f
8 changed files with 177 additions and 37 deletions
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -76,7 +76,7 @@ Rails.application.routes.draw do
      resources :customers #add customer type
    end
    post 'moving' => "movetable#moving"
-
+    get "/table/:table_id/sale/:sale_id/edit" => "sale_edit#edit"
    get 'table/:dining_id/movetable' => "movetable#move_dining"
    get 'table/:dining_id/moveroom' => "moveroom#move_dining"
    get 'sale/:sale_id' => 'sales#show'