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

Merge pull request #4325 from kristinalim/feature/4312-remove_find_variant_in_orders_and_fulfillment_report

Browse Source 
4312 Use association instead of OrderAndFulfillmentsReport#find_variant
This commit is contained in:
Luis Ramos
2019-10-07 11:38:37 +01:00
committed by GitHub
parent f4523f0305 8fc4ca6f65
commit 8a732568e7
2 changed files with 28 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
lib/open_food_network/orders_and_fulfillments_report.rb
View File

@@ -60,30 +60,30 @@ module OpenFoodNetwork
when "order_cycle_supplier_totals"
[
{
group_by: proc { |line_item| find_variant(line_item.variant_id).product.supplier },
group_by: proc { |line_item| line_item.variant.product.supplier },
sort_by: proc { |supplier| supplier.name }
},
{
group_by: proc { |line_item| find_variant(line_item.variant_id).product },
group_by: proc { |line_item| line_item.variant.product },
sort_by: proc { |product| product.name }
},
{
group_by: proc { |line_item| find_variant(line_item.variant_id).full_name },
group_by: proc { |line_item| line_item.variant.full_name },
sort_by: proc { |full_name| full_name }
}
]
when "order_cycle_supplier_totals_by_distributor"
[
{
group_by: proc { |line_item| find_variant(line_item.variant_id).product.supplier },
group_by: proc { |line_item| line_item.variant.product.supplier },
sort_by: proc { |supplier| supplier.name }
},
{
group_by: proc { |line_item| find_variant(line_item.variant_id).product },
group_by: proc { |line_item| line_item.variant.product },
sort_by: proc { |product| product.name }
},
{
group_by: proc { |line_item| find_variant(line_item.variant_id).full_name },
group_by: proc { |line_item| line_item.variant.full_name },
sort_by: proc { |full_name| full_name },
summary_columns: [
proc { |_line_items| "" },
@@ -119,15 +119,15 @@ module OpenFoodNetwork
]
},
{
group_by: proc { |line_item| find_variant(line_item.variant_id).product.supplier },
group_by: proc { |line_item| line_item.variant.product.supplier },
sort_by: proc { |supplier| supplier.name }
},
{
group_by: proc { |line_item| find_variant(line_item.variant_id).product },
group_by: proc { |line_item| line_item.variant.product },
sort_by: proc { |product| product.name }
},
{
group_by: proc { |line_item| find_variant(line_item.variant_id).full_name },
group_by: proc { |line_item| line_item.variant.full_name },
sort_by: proc { |full_name| full_name }
}
]
@@ -184,11 +184,11 @@ module OpenFoodNetwork
]
},
{
group_by: proc { |line_item| find_variant(line_item.variant_id).product },
group_by: proc { |line_item| line_item.variant.product },
sort_by: proc { |product| product.name }
},
{
group_by: proc { |line_item| find_variant(line_item.variant_id) },
group_by: proc { |line_item| line_item.variant },
sort_by: proc { |variant| variant.full_name }
},
{
@@ -220,8 +220,8 @@ module OpenFoodNetwork
when "order_cycle_supplier_totals_by_distributor"
[
supplier_name,
proc { |line_items| find_variant(line_items.first.variant_id).product.name },
proc { |line_items| find_variant(line_items.first.variant_id).full_name },
proc { |line_items| line_items.first.variant.product.name },
proc { |line_items| line_items.first.variant.full_name },
proc { |line_items| line_items.first.order.distributor.name },
proc { |line_items| line_items.sum(&:quantity) },
proc { |line_items| line_items.first.price },
@@ -230,9 +230,9 @@ module OpenFoodNetwork
]
when "order_cycle_distributor_totals_by_supplier"
[proc { |line_items| line_items.first.order.distributor.name },
proc { |line_items| find_variant(line_items.first.variant_id).product.supplier.name },
proc { |line_items| find_variant(line_items.first.variant_id).product.name },
proc { |line_items| find_variant(line_items.first.variant_id).full_name },
proc { |line_items| line_items.first.variant.product.supplier.name },
proc { |line_items| line_items.first.variant.product.name },
proc { |line_items| line_items.first.variant.full_name },
proc { |line_items| line_items.sum(&:quantity) },
proc { |line_items| line_items.first.price },
proc { |line_items| line_items.sum(&:amount) },
@@ -245,9 +245,9 @@ module OpenFoodNetwork
proc { |line_items| line_items.first.order.bill_address.firstname + " " + line_items.first.order.bill_address.lastname },
proc { |line_items| line_items.first.order.email },
proc { |line_items| line_items.first.order.bill_address.phone },
proc { |line_items| find_variant(line_items.first.variant_id).product.supplier.name },
proc { |line_items| find_variant(line_items.first.variant_id).product.name },
proc { |line_items| find_variant(line_items.first.variant_id).full_name },
proc { |line_items| line_items.first.variant.product.supplier.name },
proc { |line_items| line_items.first.variant.product.name },
proc { |line_items| line_items.first.variant.full_name },
proc { |line_items| line_items.sum(&:quantity) },
proc { |line_items| line_items.sum(&:amount) },
@@ -268,7 +268,7 @@ module OpenFoodNetwork
proc { |line_items| line_items.first.order.ship_address.andand.state if rsa.call(line_items) },
proc { |_line_items| "" },
proc { |line_items| find_variant(line_items.first.variant_id).sku },
proc { |line_items| line_items.first.variant.sku },
proc { |line_items| line_items.first.order.order_cycle.andand.name },
proc { |line_items| line_items.first.order.payments.first.andand.payment_method.andand.name },
@@ -289,19 +289,19 @@ module OpenFoodNetwork
private
def supplier_name
proc { |line_items| find_variant(line_items.first.variant_id).product.supplier.name }
proc { |line_items| line_items.first.variant.product.supplier.name }
end
def product_name
proc { |line_items| find_variant(line_items.first.variant_id).product.name }
proc { |line_items| line_items.first.variant.product.name }
end
def line_item_name
proc { |line_item| find_variant(line_item.variant_id).full_name }
proc { |line_item| line_item.variant.full_name }
end
def line_items_name
proc { |line_items| find_variant(line_items.first.variant_id).full_name }
proc { |line_items| line_items.first.variant.full_name }
end
def permissions
@@ -313,7 +313,7 @@ module OpenFoodNetwork
return " " if not_all_have_unit?(line_items)
total_units = line_items.sum do |li|
product = find_variant(li.variant_id).product
product = li.variant.product
li.quantity * li.unit_value / scale_factor(product)
end
@@ -327,10 +327,5 @@ module OpenFoodNetwork
def scale_factor(product)
product.variant_unit == 'weight' ? 1000 : 1
end
# Returns the variant with the given id, including soft-deleted ones
def find_variant(id)
Spree::Variant.unscoped.find(id)
end
end
end

7
lib/open_food_network/orders_and_fulfillments_report/default_report.rb
View File

@@ -1,8 +1,7 @@
module OpenFoodNetwork
class OrdersAndFulfillmentsReport
class DefaultReport
delegate :line_item_name, :find_variant, :supplier_name, :product_name,
:line_items_name, to: :context
delegate :line_item_name, :supplier_name, :product_name, :line_items_name, to: :context
def initialize(context)
@context = context
@@ -25,11 +24,11 @@ module OpenFoodNetwork
def rules
[
{
group_by: proc { |line_item| find_variant(line_item.variant_id).product.supplier },
group_by: proc { |line_item| line_item.variant.product.supplier },
sort_by: proc { |supplier| supplier.name }
},
{
group_by: proc { |line_item| find_variant(line_item.variant_id).product },
group_by: proc { |line_item| line_item.variant.product },
sort_by: proc { |product| product.name }
},
{