mirror of
https://github.com/openfoodfoundation/openfoodnetwork
synced 2026-03-23 05:28:53 +00:00
Merge pull request #8148 from jibees/5236-remove-incomplete-orders-from-admin-interface-2
Only shows order that actually have at least one line_item V2
This commit is contained in:
@@ -105,6 +105,10 @@ module Spree
|
||||
before_save :update_payment_fees!, if: :complete?
|
||||
|
||||
# -- Scopes
|
||||
scope :not_empty, -> {
|
||||
left_outer_joins(:line_items).where.not(spree_line_items: { id: nil })
|
||||
}
|
||||
|
||||
scope :managed_by, lambda { |user|
|
||||
if user.has_spree_role?('admin')
|
||||
where(nil)
|
||||
|
||||
@@ -23,7 +23,8 @@ class SearchOrders
|
||||
end
|
||||
|
||||
def search_query
|
||||
base_query = ::Permissions::Order.new(current_user).editable_orders
|
||||
base_query = ::Permissions::Order.new(current_user).editable_orders.not_empty
|
||||
|
||||
return base_query unless params[:shipping_method_id]
|
||||
|
||||
base_query
|
||||
|
||||
Reference in New Issue
Block a user