add producer edit ability in bulk_order

openfoodfoundation · Feb 1, 2025 · 764ea78 · 764ea78
1 parent 44ede16
commit 764ea78
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/app/models/spree/ability.rb b/app/models/spree/ability.rb
@@ -348,14 +348,16 @@ def add_manage_line_items_abilities(user)
 
         order.variants.any? { |variant| user_enterprises_ids.include?(variant.supplier_id) }
       end
-      can [:index, :create, :destroy, :update], Spree::LineItem do |item|
+      can [:admin, :index, :create, :destroy, :update], Spree::LineItem do |item|
         user.enterprises.ids.include?(item.variant.supplier_id)
       end
 
       can [:index, :create, :add, :read, :edit, :update], Spree::Shipment do |shipment|
         order = shipment.order
         order.variants.any? { |variant| user.enterprises.ids.include?(variant.supplier_id) }
       end
+
+      can [:admin, :visible], Enterprise
     end
 
     def add_relationship_management_abilities(user)

diff --git a/app/services/permissions/order.rb b/app/services/permissions/order.rb
@@ -40,7 +40,13 @@ def visible_line_items
 
     # Any line items that I can edit
     def editable_line_items
-      Spree::LineItem.where(order_id: editable_orders.select(:id))
+      if @user.can_manage_line_items_in_orders_only?
+        Spree::LineItem.joins(:variant).where(
+          spree_variants: { supplier_id: @permissions.managed_enterprises.select("enterprises.id") }
+        )
+      else
+        Spree::LineItem.where(order_id: editable_orders.select(:id))
+      end
     end
 
     private