raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-04 22:16:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'caching' into new_cart

Browse Source 
Conflicts:
	app/serializers/api/variant_serializer.rb
This commit is contained in:
Will Marshall
2014-07-18 11:23:25 +10:00
parent 562f8dbd4e f4c1cd5253
commit a2da7f7ede
7 changed files with 70 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/controllers/shop_controller.rb
View File

@@ -8,10 +8,16 @@ class ShopController < BaseController
end
def products
unless @products = current_order_cycle.andand
# Can we make this query less slow?
#
if @products = current_order_cycle.andand
.valid_products_distributed_by(current_distributor).andand
.select { |p| !p.deleted? && p.has_stock_for_distribution?(current_order_cycle, current_distributor) }.andand
.sort_by {|p| p.name }
render status: 200,
json: ActiveModel::ArraySerializer.new(@products, each_serializer: Api::ProductSerializer,
current_order_cycle: current_order_cycle, current_distributor: current_distributor).to_json
else
render json: "", status: 404
end
end