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

config/routes.rb

@@ -130,6 +130,7 @@ Rails.application.routes.draw do
     get 'sale/:sale_id/first_bill' => 'payments#first_bill', :defaults => { :format => 'json' }
     get 'sale/:sale_id/payment' => 'payments#show'
 
+    post 'payment/foc' => 'payments#foc', :defaults => { :format => 'json' }
     post 'payment/cash' => 'payments#create'
     post 'payment/mpu' => "mpu#create"
     post 'payment/jcb' => "jcb#create"
@@ -216,6 +217,10 @@ Rails.application.routes.draw do
       resources :menu_categories, only: [:new, :create, :edit,:delete]
     end
 
+    resources :item_sets
+
+    resources :menu_item_sets
+
     #accounts
     resources :accounts