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

2017-06-22 18:05:38 +06:30
parent 618aed50dc 0c0e44c808
commit 139c3c997a
18 changed files with 177 additions and 91 deletions
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -80,6 +80,7 @@ Rails.application.routes.draw do
    get 'table/:dining_id/movetable' => "movetable#move_dining"
    get 'table/:dining_id/moveroom' => "moveroom#move_dining"
    get 'sale/:sale_id' => 'sales#show'
+    post 'sale/append_order' => 'sales#add_to_existing_invoice'
    get 'room/:room_id' => 'rooms#show'
    get 'order/:order_id' => "orders#show"