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

config/initializers/mime_types.rb

@@ -2,3 +2,4 @@
 
 # Add new mime types for use in respond_to blocks:
 # Mime::Type.register "text/richtext", :rtf
+Mime::Type.register 'application/vnd.ms-excel', :xls

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"
 
@@ -112,7 +113,7 @@ Rails.application.routes.draw do
     #resources :customers
     get '/:sale_id/customers', to: "customers#add_customer"
     get '/:customer_id/get_customer' => 'home#get_customer'
-    post '/:sale_id/update_sale' , to: "home#update_sale_by_customer"#update customer id in sale table
+    post '/:sale_id/update_sale' , to: "customers#update_sale_by_customer"#update customer id in sale table
   end
 
   #--------- Waiter/Ordering Station ------------#