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

config/routes.rb

@@ -244,6 +244,8 @@ Rails.application.routes.draw do
     resources :menu_item_options
     #tax_profiles
     resources :tax_profiles
+    #products
+    resources :products
     #lookups
     resources :lookups
     #cashier_terminals
@@ -272,6 +274,9 @@ Rails.application.routes.draw do
       end
     end
 
+    #promotion
+    resources :promotions
+
   end
 
   #--------- Transactions Sections ------------#