End of day commit

This commit is contained in:
2015-02-18 22:36:47 +01:00
parent 82670f271b
commit c1858455e9
68 changed files with 633 additions and 145 deletions
+5 -4
View File
@@ -1,5 +1,5 @@
class SupplierController < ApplicationController
before_filter :authenticate_supplier!
class SupplierController < Suppliers::ApplicationController
before_filter :setup_employee_and_supplier!
layout 'supplier/app'
def home
@@ -14,7 +14,8 @@ class SupplierController < ApplicationController
end
def current
render json: SupplierSupplierSerializer.new(current_supplier).as_json
[current_supplier].include_relations(sections: :tables, product_categories: :products)
render json: Suppliers::SupplierSerializer.new(current_supplier).as_json
end
# POST /supplier/settings
@@ -30,7 +31,7 @@ class SupplierController < ApplicationController
end
format.json do
current_supplier.update_attributes(supplier_params)
render json: SupplierSupplierSerializer.new(current_supplier).as_json
render json: Suppliers::SupplierSerializer.new(current_supplier).as_json
end
end
end