Properly close conversations on agent reply by email - closes #5078

Author: freescout-help-desk

app/Console/Commands/FetchEmails.php

@@ -1232,8 +1232,9 @@ public function saveUserThread($mailbox, $message_id, $prev_thread, $user, $from
 
         // Respect mailbox settings for "Status After Replying
         $prev_status = $conversation->status;
-        $conversation->status = ($mailbox->ticket_status == Mailbox::TICKET_STATUS_KEEP_CURRENT ? $conversation->status : $mailbox->ticket_status);
-        if ($conversation->status != $mailbox->ticket_status) {
+        $new_status = ($mailbox->ticket_status == Mailbox::TICKET_STATUS_KEEP_CURRENT ? $conversation->status : $mailbox->ticket_status);
+        if ($new_status != $prev_status) {
+            $conversation->setStatus($new_status, $user, $update_folder = false);
             \Eventy::action('conversation.status_changed', $conversation, $user, true, $prev_status);
         }
         $conversation->last_reply_at = $now;

app/Conversation.php

@@ -622,12 +622,14 @@ public function getStatus()
      *
      * @param int $status
      */
-    public function setStatus($status, $user = null)
+    public function setStatus($status, $user = null, $update_folder = true)
     {
         $now = date('Y-m-d H:i:s');
 
         $this->status = $status;
-        $this->updateFolder();
+        if ($update_folder) {
+            $this->updateFolder();
+        }
         $this->user_updated_at = $now;
 
         if ($user && $status == self::STATUS_CLOSED) {