Merge pull request #769 from jitendra-webkul/master

Issue #435 fixed

Author: jitendra-webkul

packages/Webkul/Admin/src/DataGrids/Mail/EmailDataGrid.php

@@ -108,6 +108,11 @@ public function prepareActions()
             'title'        => trans('ui::app.datagrid.delete'),
             'method'       => 'DELETE',
             'route'        => 'admin.mail.delete',
+            'params'       => [
+                                'type' => request('route') == 'trash'
+                                    ? 'delete'
+                                    : 'trash'
+                            ],
             'confirm_text' => trans('ui::app.datagrid.massaction.delete', ['resource' => 'email']),
             'icon'         => 'trash-icon',
         ]);
@@ -120,10 +125,25 @@ public function prepareActions()
      */
     public function prepareMassActions()
     {
+        if (request('route') == 'trash') {
+            $this->addMassAction([
+                'type'   => 'delete',
+                'label'  => trans('admin::app.datagrid.move-to-inbox'),
+                'action' => route('admin.mail.mass_update', [
+                                'folders' => ['inbox'],
+                            ]),
+                'method' => 'PUT',
+            ]);
+        }
+
         $this->addMassAction([
             'type'   => 'delete',
             'label'  => trans('ui::app.datagrid.delete'),
-            'action' => route('admin.mail.mass_delete'),
+            'action' => route('admin.mail.mass_delete', [
+                            'type' => request('route') == 'trash'
+                                ? 'delete'
+                                : 'trash',
+                        ]),
             'method' => 'PUT',
         ]);
     }

packages/Webkul/Admin/src/Http/Controllers/Mail/EmailController.php

@@ -253,6 +253,28 @@ public function download($id)
         return Storage::download($attachment->path);
     }
 
+    /**
+     * Mass Update the specified resources.
+     *
+     * @return \Illuminate\Http\Response
+     */
+    public function massUpdate()
+    {
+        foreach (request('rows') as $emailId) {
+            Event::dispatch('email.update.before', $emailId);
+
+            $this->emailRepository->update([
+                'folders' => request('folders'),
+            ], $emailId);
+
+            Event::dispatch('email.update.after', $emailId);
+        }
+
+        return response()->json([
+            'message' => trans('admin::app.mail.mass-update-success'),
+        ]);
+    }
+
     /*
      * Remove the specified resource from storage.
      *
@@ -264,13 +286,19 @@ public function destroy($id)
         $email = $this->emailRepository->findOrFail($id);
 
         try {
-            Event::dispatch('email.delete.before', $id);
+            Event::dispatch('email.' . request('type') . '.before', $id);
 
             $parentId = $email->parent_id;
 
-            $this->emailRepository->delete($id);
+            if (request('type') == 'trash') {
+                $this->emailRepository->update([
+                    'folders' => ['trash'],
+                ], $id);
+            } else {
+                $this->emailRepository->delete($id);
+            }
 
-            Event::dispatch('email.delete.after', $id);
+            Event::dispatch('email.' . request('type') . '.after', $id);
 
             if (request()->ajax()) {
                 return response()->json([
@@ -306,11 +334,17 @@ public function destroy($id)
     public function massDestroy()
     {
         foreach (request('rows') as $emailId) {
-            Event::dispatch('email.delete.before', $emailId);
+            Event::dispatch('email.' . request('type') . '.before', $emailId);
 
-            $this->emailRepository->delete($emailId);
+            if (request('type') == 'trash') {
+                $this->emailRepository->update([
+                    'folders' => ['trash'],
+                ], $emailId);
+            } else {
+                $this->emailRepository->delete($emailId);
+            }
 
-            Event::dispatch('email.delete.after', $emailId);
+            Event::dispatch('email.' . request('type') . '.after', $emailId);
         }
 
         return response()->json([

packages/Webkul/Admin/src/Http/Controllers/Setting/UserController.php

@@ -226,8 +226,6 @@ public function massUpdate()
     {
         $count = 0;
 
-        $data = request()->all();
-
         foreach (request('rows') as $userId) {
             if (auth()->guard('user')->user()->id == $userId) {
                 continue;

packages/Webkul/Admin/src/Http/routes.php

@@ -162,6 +162,8 @@
 
                 Route::delete('{id?}', 'EmailController@destroy')->name('admin.mail.delete');
 
+                Route::put('mass-update', 'EmailController@massUpdate')->name('admin.mail.mass_update');
+
                 Route::put('mass-destroy', 'EmailController@massDestroy')->name('admin.mail.mass_delete');
             });
 

packages/Webkul/Admin/src/Resources/lang/ar/ar.php

@@ -307,6 +307,7 @@
             'saved-to-draft'          => 'تم حفظ البريد الإلكتروني في المسودة.',
             'delete-success'          => 'تم حذف البريد الإلكتروني بنجاح.',
             'delete-failed'           => 'لا يمكن حذف البريد الإلكتروني.',
+            'mass-update-success'     => 'Emails updated successfully.',
 
             'forget-password' => [
                 'subject'           => 'إعادة تعيين كلمة مرور العميل',
@@ -724,6 +725,7 @@
             'rotten-days'         => 'أيام فاسدة',
             'yes'                 => 'نعم',
             'no'                  => 'لا',
+            'move-to-inbox'       => 'Move to Inbox',
             'update-success'      => ':تم تحديث المورد بنجاح.',
             'destroy-success'     => ':تم حذف المورد بنجاح.',
             'destroy-failed'      => ':لا يمكن حذف المورد.',

packages/Webkul/Admin/src/Resources/lang/en/app.php

@@ -310,6 +310,7 @@
             'saved-to-draft'          => 'Email saved to draft.',
             'delete-success'          => 'Email deleted successfully.',
             'delete-failed'           => 'Email can not be deleted.',
+            'mass-update-success'     => 'Emails updated successfully.',
 
             'forget-password' => [
                 'subject'           => 'Customer Reset Password',
@@ -727,6 +728,7 @@
             'rotten-days'         => 'Rotten Days',
             'yes'                 => 'Yes',
             'no'                  => 'No',
+            'move-to-inbox'       => 'Move to Inbox',
             'update-success'      => ':resource updated successfully.',
             'destroy-success'     => ':resource deleted successfully.',
             'destroy-failed'      => ':resource can not be deleted.',