don't apply tags if the order is created by admin

openfoodfoundation · Jan 9, 2021 · a36c2bf · a36c2bf
1 parent d5687a3
commit a36c2bf
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/app/controllers/spree/admin/orders_controller.rb b/app/controllers/spree/admin/orders_controller.rb
@@ -150,6 +150,7 @@ def load_distribution_choices
       def ensure_distribution
         unless @order
           @order = Spree::Order.new
+          @order.created_by = spree_current_user
           @order.generate_order_number
           @order.save!
         end

diff --git a/app/models/spree/order.rb b/app/models/spree/order.rb
@@ -594,7 +594,7 @@ def create_proposed_shipments
       shipments.destroy_all
 
       packages = OrderManagement::Stock::Coordinator.new(self).packages(
-        checkout: true, apply_tags: true
+        checkout: true, apply_tags: !created_by&.admin?
       )
       packages.each do |package|
         shipments << package.to_shipment