Add a 'reply to' email address where it makes sense and has been missing until now

app/mailers/enterprise_mailer.rb

@@ -24,7 +24,8 @@ class EnterpriseMailer < ApplicationMailer
       subject = t('.subject',
                   enterprise: @enterprise.name)
       mail(to: user.email,
-           subject:)
+           subject:,
+           reply_to: @enterprise.contact.email)
     end
   end
 

app/mailers/payment_mailer.rb

@@ -12,7 +12,9 @@ class PaymentMailer < ApplicationMailer
       subject = t('.subject',
                   number: @order.number,
                   distributor: @order.distributor.name)
-      mail(to: payment.order.email, subject:)
+      mail(to: @order.email,
+           subject:,
+           reply_to: @order.distributor.contact.email)
     end
   end
 

app/mailers/spree/order_mailer.rb

@@ -17,7 +17,8 @@ module Spree
                     number: @order.number,
                     distributor: @order.distributor.name)
         mail(to: @order.email,
-             subject:)
+             subject:,
+             reply_to: @order.distributor.contact.email)
       end
     end
 

app/mailers/spree/shipment_mailer.rb

@@ -12,7 +12,9 @@ module Spree
       subject = t(base_subject,
                   number: @order.number,
                   distributor: @order.distributor.name)
-      mail(to: @shipment.order.email, subject:)
+      mail(to: @shipment.order.email,
+           subject:,
+           reply_to: @order.distributor.contact.email)
     end
 
     private