From 4a73b1d26c856ca1894d4769f31d72e585472162 Mon Sep 17 00:00:00 2001 From: Kristina Lim Date: Fri, 14 Dec 2018 20:06:08 +0800 Subject: [PATCH] Do not include incomplete orders in report --- .../order_management/reports/enterprise_fee_summary/scope.rb | 1 + .../reports/enterprise_fee_summary/report_service_spec.rb | 1 + 2 files changed, 2 insertions(+) diff --git a/engines/order_management/app/services/order_management/reports/enterprise_fee_summary/scope.rb b/engines/order_management/app/services/order_management/reports/enterprise_fee_summary/scope.rb index b218c1f677..cf343063a9 100644 --- a/engines/order_management/app/services/order_management/reports/enterprise_fee_summary/scope.rb +++ b/engines/order_management/app/services/order_management/reports/enterprise_fee_summary/scope.rb @@ -82,6 +82,7 @@ module OrderManagement ON ( spree_adjustments.adjustable_type = 'Spree::Order' AND spree_orders.id = spree_adjustments.adjustable_id + AND spree_orders.completed_at IS NOT NULL ) JOIN_STRING ) diff --git a/engines/order_management/spec/services/order_management/reports/enterprise_fee_summary/report_service_spec.rb b/engines/order_management/spec/services/order_management/reports/enterprise_fee_summary/report_service_spec.rb index b74d28c40d..23c2c093a2 100644 --- a/engines/order_management/spec/services/order_management/reports/enterprise_fee_summary/report_service_spec.rb +++ b/engines/order_management/spec/services/order_management/reports/enterprise_fee_summary/report_service_spec.rb @@ -77,6 +77,7 @@ describe OrderManagement::Reports::EnterpriseFeeSummary::ReportService do describe "grouping and sorting of entries" do let!(:customer_order) { prepare_order(customer: customer) } + let!(:customer_incomplete_order) { setup_order(customer: customer) } let!(:second_customer_order) { prepare_order(customer: customer) } let!(:other_customer_order) { prepare_order(customer: another_customer) }