raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-24 20:36:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix incorrectly ordered entries with duplicate product names in OC and custom taxon ordering applied

Browse Source
This commit is contained in:
Matt-Yorkley
2019-10-31 12:10:22 +00:00
parent 9723e2cd49
commit 67a5a1cdc2
2 changed files with 2 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/services/products_renderer.rb
View File

@@ -64,7 +64,7 @@ class ProductsRenderer
distributor
.preferred_shopfront_taxon_order
.split(",").map { |id| "spree_products.primary_taxon_id=#{id} DESC" }
.join(", ") + ", spree_products.name ASC"
.join(", ") + ", spree_products.name ASC, spree_products.id ASC"
else
"spree_products.name ASC"
end

10
spec/controllers/api/order_cycles_controller_spec.rb
View File

@@ -204,25 +204,17 @@ module Api
it "displays products in new order" do
api_get :products, id: order_cycle.id, distributor: distributor.id
expect(product_ids.length).to eq 7
expect(product_ids).to eq [product7.id, product8.id, product2.id, product3.id, product5.id, product6.id, product1.id]
end
xit "displays products in correct order across multiple pages" do
it "displays products in correct order across multiple pages" do
api_get :products, id: order_cycle.id, distributor: distributor.id, per_page: 3
expect(product_ids.length).to eq 3
expect(product_ids).to eq [product7.id, product8.id, product2.id]
api_get :products, id: order_cycle.id, distributor: distributor.id, per_page: 3, page: 2
expect(product_ids.length).to eq 3
expect(product_ids).to eq [product3.id, product5.id, product6.id]
api_get :products, id: order_cycle.id, distributor: distributor.id, per_page: 3, page: 3
expect(product_ids.length).to eq 1
expect(product_ids).to eq [product1.id]
end
end