diff --git a/app/models/spree/order.rb b/app/models/spree/order.rb index 71d76036df..c89c5572e0 100644 --- a/app/models/spree/order.rb +++ b/app/models/spree/order.rb @@ -131,7 +131,7 @@ module Spree } scope :not_state, lambda { |state| - where("state != ?", state) + where.not(state: state) } # All the states an order can be in after completing the checkout diff --git a/lib/open_food_network/order_cycle_management_report.rb b/lib/open_food_network/order_cycle_management_report.rb index 1858469c6e..2e562c876a 100644 --- a/lib/open_food_network/order_cycle_management_report.rb +++ b/lib/open_food_network/order_cycle_management_report.rb @@ -49,7 +49,7 @@ module OpenFoodNetwork if FeatureToggle.enabled?(:customer_balance, @user) Spree::Order. finalized. - where.not(spree_orders: { state: :canceled }). + not_state(:canceled). distributed_by_user(@user). managed_by(@user). search(params[:q])