add testing device images and a lot more, before bootstrap:themed

This commit is contained in:
2012-08-24 13:46:59 +02:00
parent 5b27d6dcd9
commit e3c189d187
33 changed files with 2003 additions and 51 deletions
+7 -7
View File
@@ -99,12 +99,12 @@ class SuppliersController < ApplicationController
end
end
# GET /suppliers/1/active_order_list
# GET /suppliers/1/active_order_list.json
def active_order_list
# GET /suppliers/1/active_orders
# GET /suppliers/1/active_orders.json
def active_orders
@supplier = Supplier.find(params[:id])
respond_to do |format|
format.html
format.html { render layout: 'tablet' }
format.json do
h = @supplier.as_json
h[:orders] = []
@@ -124,7 +124,7 @@ class SuppliersController < ApplicationController
h[:orders] << ho
end
h[:total_amount] = list_total.round(2)
render json: h
render json: h, layout: 'tablet'
end
end
end
@@ -134,7 +134,7 @@ class SuppliersController < ApplicationController
def active_lists
@supplier = Supplier.find(params[:id])
respond_to do |format|
format.html
format.html { render layout: 'tablet' }
format.json do
h = @supplier.as_json
h[:lists] = []
@@ -146,7 +146,7 @@ class SuppliersController < ApplicationController
h[:lists] << hl
end
h[:total_amount] = grand_total.round(2)
render json: h
render json: h, layout: 'tablet'
end
end
end