Fix/run send to supplier as job

app/controllers/orders_controller.rb

@@ -136,7 +136,7 @@ def receive
 
         flash[:notice] = (s ? I18n.t('orders.receive.notice', msg: s) : I18n.t('orders.receive.notice_none'))
       end
-      NotifyReceivedOrderJob.perform_later(@order)
+      NotifyReceivedOrderJob.perform_later(FoodsoftConfig.scope,@order)
       if current_user.role_orders? || current_user.role_finance?
         redirect_to @order
       elsif current_user.role_pickups?

app/jobs/notify_finished_order_job.rb

@@ -1,5 +1,6 @@
 class NotifyFinishedOrderJob < ApplicationJob
-  def perform(order)
+  def perform(foodcoop,order)
+    FoodsoftConfig.select_multifoodcoop foodcoop
     order.group_orders.each do |group_order|
       next unless group_order.ordergroup
 

app/jobs/notify_negative_balance_job.rb

@@ -1,5 +1,6 @@
 class NotifyNegativeBalanceJob < ApplicationJob
-  def perform(ordergroup, transaction)
+  def perform(foodcoop,ordergroup, transaction)
+    FoodsoftConfig.select_multifoodcoop foodcoop
     ordergroup.users.each do |user|
       next unless user.settings.notify['negative_balance']
 

app/jobs/notify_received_order_job.rb

@@ -1,5 +1,6 @@
 class NotifyReceivedOrderJob < ApplicationJob
-  def perform(order)
+  def perform(foodcoop,order)
+    FoodsoftConfig.select_multifoodcoop foodcoop
     order.group_orders.each do |group_order|
       next unless group_order.ordergroup
 

app/jobs/send_order_to_supplier_job.rb

@@ -0,0 +1,8 @@
+class SendOrderToSupplierJob < ApplicationJob
+  def perform(order)
+    Mailer.deliver_now_with_default_locale do
+      Mailer.order_result_supplier(order.created_by, order)
+    end
+    order.update!(last_sent_mail: Time.now)
+  end
+end

app/mailers/mailer.rb

@@ -149,9 +149,10 @@ def self.deliver_now_with_default_locale(&block)
 
   def self.deliver_now
     message = yield
-    message.deliver_now
+    message.deliver_now!
   rescue StandardError => e
     MailDeliveryStatus.create email: message.to[0], message: e.message
+    raise StandardError, e.message
   end
 
   # separate method to allow plugins to mess with the attachments

app/models/order.rb

@@ -266,7 +266,7 @@ def finish!(user)
       ordergroups.each(&:update_stats!)
 
       # Notifications
-      NotifyFinishedOrderJob.perform_later(self)
+      NotifyFinishedOrderJob.perform_later(FoodsoftConfig.scope,self)
     end
   end
 
@@ -311,10 +311,7 @@ def close_direct!(user)
   end
 
   def send_to_supplier!(user)
-    Mailer.deliver_now_with_default_locale do
-      Mailer.order_result_supplier(user, self)
-    end
-    update!(last_sent_mail: Time.now)
+    SendOrderToSupplierJob.perform_later(FoodsoftConfig.scope,self)
   end
 
   def do_end_action!

app/models/ordergroup.rb

@@ -91,7 +91,7 @@ def add_financial_transaction!(amount, note, user, transaction_type, link = nil,
       t.save!
       update_balance!
       # Notify only when order group had a positive balance before the last transaction:
-      NotifyNegativeBalanceJob.perform_later(self, t) if t.amount < 0 && account_balance < 0 && account_balance - t.amount >= 0
+      NotifyNegativeBalanceJob.perform_later(FoodsoftConfig.scope,self, t) if t.amount < 0 && account_balance < 0 && account_balance - t.amount >= 0
       t
     end
   end

config/initializers/active_job_select_foodcoop.rb

@@ -4,13 +4,8 @@ def self.included(base) # :nodoc:
       alias_method :orig_deserialize, :deserialize
       alias_method :orig_serialize, :serialize
 
-      def serialize(arguments)
-        ret = orig_serialize(arguments)
-        ret.unshift FoodsoftConfig.scope
-      end
-
       def deserialize(arguments)
-        FoodsoftConfig.select_multifoodcoop arguments.shift
+        FoodsoftConfig.select_multifoodcoop arguments[0]
         orig_deserialize(arguments)
       end
     end

plugins/messages/app/controllers/messages_controller.rb

@@ -33,7 +33,7 @@ def new
   def create
     @message = @current_user.send_messages.new(params[:message])
     if @message.save
-      DeliverMessageJob.perform_later(@message)
+      DeliverMessageJob.perform_later(FoodsoftConfig.scope,@message)
       redirect_to messages_url, notice: I18n.t('messages.create.notice')
     else
       render action: 'new'

plugins/messages/app/jobs/deliver_message_job.rb

@@ -1,5 +1,6 @@
 class DeliverMessageJob < ApplicationJob
-  def perform(message)
+  def perform(foodcoop,message)
+    FoodsoftConfig.select_multifoodcoop foodcoop
     message.message_recipients.each do |message_recipient|
       recipient = message_recipient.user
       if recipient.receive_email?

plugins/messages/app/mail_receivers/messages_mail_receiver.rb

@@ -48,7 +48,7 @@ def received(data)
     message.add_recipients [@message.sender_id]
 
     message.save!
-    DeliverMessageJob.perform_later(message)
+    DeliverMessageJob.perform_later(FoodsoftConfig.scope,message)
   end
 
   private