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

config/routes.rb

@@ -185,6 +185,12 @@ Rails.application.routes.draw do
     resources :commissioners
 
     resources :in_juties
+
+    # product_commission
+    get 'table/:table_id/sale/:sale_id/load_commissioners' => 'product_commissions#load_commissioners', as: 'load_commissioners'
+    post 'select_sale_item' => 'product_commissions#select_sale_item', as: 'select_sale_item'
+    post 'select_commissioner' => 'product_commissions#set_commissioner_to_sale_item', as: 'select_commissioner'
+
   end
 
   #--------- Waiter/Ordering Station ------------#
@@ -309,12 +315,6 @@ Rails.application.routes.draw do
     # get 'menu_item_instances/get_instance/:id' => 'menu_item_instances#get_instance',:as => "show_instance"
   end
 
-  # commissions
-  get 'origami/table/:table_id/sale/:sale_id/load_commissioners' => 'settings/commissions#load_commissioners', as: 'load_commissioners'
-  post 'origami/select_sale_item' => 'settings/commissions#select_sale_item', as: 'select_sale_item'
-  # product_commission
-  post 'origami/select_commissioner' => 'origami/product_commissions#set_commissioner_to_sale_item', as: 'select_commissioner'
-
   #--------- Transactions Sections ------------#
   namespace :transactions do
     resources :sales
@@ -347,6 +347,7 @@ Rails.application.routes.draw do
     post 'save_stock' => 'stock_checks#create', as:'stock_check_save'
     get '/stock_checks/:id' => 'stock_checks#show'
     post 'save_to_journal' => 'stock_checks#save_to_journal', as: 'save_to_journal'
+    post 'print_stock_check' => 'stock_checks#print_stock_check', as: 'print_stock_check'
     # resources :stock_checks
     resources :stock_journals
     resources :inventory_definitions