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

config/initializers/assets.rb

@@ -32,3 +32,7 @@ Rails.application.config.assets.precompile += %w( jquery-confirm.js )
 
 # --- Image Uploader ----
 Rails.application.config.assets.precompile += %w( fileinput.min.js )
+
+# --- Customer/ Customer - Crm ----
+Rails.application.config.assets.precompile += %w( addorder.css )
+Rails.application.config.assets.precompile += %w( addorder.js )

config/routes.rb

@@ -181,7 +181,9 @@ Rails.application.routes.draw do
 
     post '/:sale_id/get_customer' => "customers#get_customer"
 
-    resources :addorders
+     get '/:addorders/:id' => "addorders#detail"
+     post '/:addorders/create' => "addorders#create", :defaults => { :format => 'json' }
+
     resources :commissions
     resources :commissioners
     resources :in_juties