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

Exclude non-eligible entries from report

Browse Source
This commit is contained in:
Kristina Lim
2019-02-18 09:30:03 +08:00
parent 8ce7337c9d
commit 19f99255fa
2 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
engines/order_management/app/services/order_management/reports/enterprise_fee_summary/scope.rb
View File

@@ -46,7 +46,7 @@ module OrderManagement
def find_adjustments
chain_to_scope do
Spree::Adjustment
Spree::Adjustment.eligible
end
end

8
engines/order_management/spec/services/order_management/reports/enterprise_fee_summary/report_service_spec.rb
View File

@@ -165,11 +165,9 @@ describe OrderManagement::Reports::EnterpriseFeeSummary::ReportService do
it "is included" do
totals = service.list
expect(totals.length).to eq(2)
expect(totals.length).to eq(1)
expected_result = [
["Payment Transaction", "Sample Distributor", "Sample Payment Method", "Sample Customer",
nil, nil, nil, "2.00"],
["Shipment", "Sample Distributor", "Sample Shipping Method", "Sample Customer",
nil, nil, "Platform Rate", "1.00"]
]
@@ -202,11 +200,9 @@ describe OrderManagement::Reports::EnterpriseFeeSummary::ReportService do
it "is included" do
totals = service.list
expect(totals.length).to eq(3)
expect(totals.length).to eq(2)
expected_result = [
["Admin", "Sample Distributor", "Sample Enterprise Fee", "Sample Customer",
"Outgoing", "Sample Distributor", nil, "0.00"],
["Payment Transaction", "Sample Distributor", "Sample Payment Method", "Sample Customer",
nil, nil, nil, "2.00"],
["Shipment", "Sample Distributor", "Sample Shipping Method", "Sample Customer",