raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-13 23:37:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix orders and fulfillment report

Browse Source
This commit is contained in:
Gaetan Craig-Riou
2024-08-12 15:34:37 +10:00
parent 977b6e6c2a
commit fa986f3fc2
2 changed files with 10 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/reporting/reports/orders_and_fulfillment/base.rb
View File

@@ -72,8 +72,7 @@ module Reporting
return " " if not_all_have_unit?(line_items)
total_units = line_items.sum do |li|
product = li.variant.product
li.quantity * li.unit_value / scale_factor(product)
li.quantity * li.unit_value / scale_factor(li.variant)
end
total_units.round(3)
@@ -92,8 +91,8 @@ module Reporting
line_items.map { |li| li.unit_value.nil? }.any?
end
def scale_factor(product)
product.variant_unit == 'weight' ? 1000 : 1
def scale_factor(variant)
variant.variant_unit == 'weight' ? 1000 : 1
end
def report_variant_overrides

17
spec/lib/reports/orders_and_fulfillment/orders_cycle_supplier_totals_report_spec.rb
View File

@@ -34,8 +34,7 @@ RSpec.describe Reporting::Reports::OrdersAndFulfillment::OrderCycleSupplierTotal
let(:variant) { item.variant }
it "contains a sum of total items" do
variant.product.update!(variant_unit: "items", variant_unit_name: "bottle")
variant.update!(unit_value: 6) # six-pack
variant.update!(variant_unit: "items", variant_unit_name: "bottle", unit_value: 6) # six-pack
item.update!(final_weight_volume: nil) # reset unit information
item.update!(quantity: 3)
@@ -44,8 +43,7 @@ RSpec.describe Reporting::Reports::OrdersAndFulfillment::OrderCycleSupplierTotal
end
it "contains a sum of total weight" do
variant.product.update!(variant_unit: "weight")
variant.update!(unit_value: 200) # grams
variant.update!(variant_unit: "weight", unit_value: 200) # grams
item.update!(final_weight_volume: nil) # reset unit information
item.update!(quantity: 3)
@@ -57,8 +55,8 @@ RSpec.describe Reporting::Reports::OrdersAndFulfillment::OrderCycleSupplierTotal
# This is not possible with the current code but was possible years ago.
# So I'm using `update_columns` to save invalid data.
# We still have lots of that data in our databases though.
variant.product.update(variant_unit: "items", variant_unit_name: "container")
variant.update_columns(unit_value: nil, unit_description: "vacuum")
variant.update_columns(variant_unit: "items", variant_unit_name: "container",
unit_value: nil, unit_description: "vacuum")
item.update!(final_weight_volume: nil) # reset unit information
expect(table_headers[4]).to eq "Total Units"
@@ -69,8 +67,7 @@ RSpec.describe Reporting::Reports::OrdersAndFulfillment::OrderCycleSupplierTotal
expect(report).to receive(:display_summary_row?).and_return(true)
# assures product appears first on report table
variant.product.update!(name: "Alpha-Product #000")
variant.product.update!(variant_unit: "weight")
variant.update!(unit_value: 200) # grams
variant.update!(variant_unit: "weight", unit_value: 200) # grams
item.update!(final_weight_volume: nil) # reset unit information
item.update!(quantity: 3)
@@ -89,8 +86,8 @@ RSpec.describe Reporting::Reports::OrdersAndFulfillment::OrderCycleSupplierTotal
# This is not possible with the current code but was possible years ago.
# So I'm using `update_columns` to save invalid data.
# We still have lots of that data in our databases though.
variant.product.update(variant_unit: "items", variant_unit_name: "container")
variant.update_columns(unit_value: nil, unit_description: "vacuum")
variant.update_columns(variant_unit: "items", variant_unit_name: "container",
unit_value: nil, unit_description: "vacuum")
item.update!(final_weight_volume: nil) # reset unit information
# This second line item will have a default a bigint value.