Merge pull request #1256 from suraj-webkul/Issue#1198

Issue #1198 fixed.
krayin · Jun 19, 2024 · 15e395c · 15e395c
2 parents 9ea6015 + eddb410
commit 15e395c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/packages/Webkul/Admin/src/Http/Controllers/Mail/EmailController.php b/packages/Webkul/Admin/src/Http/Controllers/Mail/EmailController.php
@@ -136,7 +136,7 @@ public function store()
                 Mail::send(new Email($email));
 
                 $this->emailRepository->update([
-                    'folders' => ['inbox', 'sent']
+                    'folders' => ['sent']
                 ], $email->id);
             } catch (\Exception $e) {}
         }
@@ -151,7 +151,7 @@ public function store()
 
         session()->flash('success', trans('admin::app.mail.create-success'));
 
-        return redirect()->route('admin.mail.index', ['route'   => 'inbox']);
+        return redirect()->route('admin.mail.index', ['route'   => 'sent']);
     }
 
     /**

diff --git a/packages/Webkul/Email/src/Repositories/EmailRepository.php b/packages/Webkul/Email/src/Repositories/EmailRepository.php
@@ -138,6 +138,7 @@ public function processInboundParseMail($content)
             ]));
         } else {
             $this->update([
+                'folders'       => array_unique(array_merge($email->folders, ['inbox'])),
                 'reference_ids' => array_merge($email->reference_ids ?? [], [$headers['message_id']]),
             ], $email->id);