refactored bulk actions

akaunting · Dec 23, 2019 · a3dc7b8 · a3dc7b8
1 parent d4efb90
commit a3dc7b8
Show file tree

Hide file tree

Showing 20 changed files with 324 additions and 663 deletions.
diff --git a/app/Abstracts/BulkAction.php b/app/Abstracts/BulkAction.php
@@ -2,6 +2,9 @@
 
 namespace App\Abstracts;
 
+use App\Jobs\Common\DeleteContact;
+use App\Jobs\Common\UpdateContact;
+use App\Jobs\Banking\DeleteTransaction;
 use App\Traits\Jobs;
 use App\Traits\Relationships;
 use Artisan;
@@ -16,24 +19,34 @@ abstract class BulkAction
         'enable' => [
             'name' => 'general.enable',
             'message' => 'bulk_actions.message.enable',
-            'permission' => 'update-common-items'
+            'permission' => 'update-common-items',
         ],
         'disable' => [
             'name' => 'general.disable',
             'message' => 'bulk_actions.message.disable',
-            'permission' => 'update-common-items'
+            'permission' => 'update-common-items',
+        ],
+        'delete' => [
+            'name' => 'general.delete',
+            'message' => 'bulk_actions.message.delete',
+            'permission' => 'delete-common-items',
         ],
         'export' => [
             'name' => 'general.export',
-            'message' => 'bulk_actions.message.exports',
+            'message' => 'bulk_actions.message.export',
         ],
-        'delete' => [
-            'name' => 'general.delete',
-            'message' => 'bulk_actions.message.deletes',
-            'permission' => 'delete-common-items'
-        ]
     ];
 
+    public function getSelectedRecords($request)
+    {
+        return $this->model::find($this->getSelectedInput($request));
+    }
+
+    public function getSelectedInput($request)
+    {
+        return $request->get('selected', []);
+    }
+
     /**
      * Duplicate the specified resource.
      *
@@ -43,9 +56,7 @@ abstract class BulkAction
      */
     public function duplicate($request)
     {
-        $selected = $request->get('selected', []);
-
-        $items = $this->model::find($selected);
+        $items = $this->getSelectedRecords($request);
 
         foreach ($items as $item) {
             $item->duplicate();
@@ -61,9 +72,7 @@ public function duplicate($request)
      */
     public function enable($request)
     {
-        $selected = $request->get('selected', []);
-
-        $items = $this->model::find($selected);
+        $items = $this->getSelectedRecords($request);
 
         foreach ($items as $item) {
             $item->enabled = 1;
@@ -80,9 +89,7 @@ public function enable($request)
      */
     public function disable($request)
     {
-        $selected = $request->get('selected', []);
-
-        $items = $this->model::find($selected);
+        $items = $this->getSelectedRecords($request);
 
         foreach ($items as $item) {
             $item->enabled = 0;
@@ -111,14 +118,51 @@ public function delete($request)
      */
     public function destroy($request)
     {
-        $selected = $request->get('selected', []);
-
-        $items = $this->model::find($selected);
+        $items = $this->getSelectedRecords($request);
 
         foreach ($items as $item) {
             $item->delete();
         }
 
         Artisan::call('cache:clear');
     }
+
+    public function disableContacts($request)
+    {
+        $contacts = $this->getSelectedRecords($request);
+
+        foreach ($contacts as $contact) {
+            try {
+                $this->dispatch(new UpdateContact($contact, request()->merge(['enabled' => 0])));
+            } catch (\Exception $e) {
+                flash($e->getMessage())->error();
+            }
+        }
+    }
+
+    public function deleteContacts($request)
+    {
+        $contacts = $this->getSelectedRecords($request);
+
+        foreach ($contacts as $contact) {
+            try {
+                $this->dispatch(new DeleteContact($contact));
+            } catch (\Exception $e) {
+                flash($e->getMessage())->error();
+            }
+        }
+    }
+
+    public function deleteTransactions($request)
+    {
+        $transactions = $this->getSelectedRecords($request);
+
+        foreach ($transactions as $transaction) {
+            try {
+                $this->dispatch(new DeleteTransaction($transaction));
+            } catch (\Exception $e) {
+                flash($e->getMessage())->error();
+            }
+        }
+    }
 }
diff --git a/app/BulkActions/Auth/Permissions.php b/app/BulkActions/Auth/Permissions.php
@@ -12,8 +12,8 @@ class Permissions extends BulkAction
     public $actions = [
         'delete' => [
             'name' => 'general.delete',
-            'message' => 'bulk_actions.message.deletes',
-            'permission' => 'delete-auth-permissions'
-        ]
+            'message' => 'bulk_actions.message.delete',
+            'permission' => 'delete-auth-permissions',
+        ],
     ];
 }
diff --git a/app/BulkActions/Auth/Roles.php b/app/BulkActions/Auth/Roles.php
@@ -12,8 +12,8 @@ class Roles extends BulkAction
     public $actions = [
         'delete' => [
             'name' => 'general.delete',
-            'message' => 'bulk_actions.message.deletes',
-            'permission' => 'delete-auth-roles'
-        ]
+            'message' => 'bulk_actions.message.delete',
+            'permission' => 'delete-auth-roles',
+        ],
     ];
 }
diff --git a/app/BulkActions/Auth/Users.php b/app/BulkActions/Auth/Users.php
@@ -4,6 +4,7 @@
 
 use App\Abstracts\BulkAction;
 use App\Jobs\Auth\DeleteUser;
+use App\Jobs\Auth\UpdateUser;
 use App\Models\Auth\User;
 
 class Users extends BulkAction
@@ -14,54 +15,42 @@ class Users extends BulkAction
         'enable' => [
             'name' => 'general.enable',
             'message' => 'bulk_actions.message.enable',
-            'permission' => 'update-auth-users'
+            'permission' => 'update-auth-users',
         ],
         'disable' => [
             'name' => 'general.disable',
             'message' => 'bulk_actions.message.disable',
-            'permission' => 'update-auth-users'
+            'permission' => 'update-auth-users',
         ],
         'delete' => [
             'name' => 'general.delete',
-            'message' => 'bulk_actions.message.deletes',
-            'permission' => 'delete-auth-users'
-        ]
+            'message' => 'bulk_actions.message.delete',
+            'permission' => 'delete-auth-users',
+        ],
     ];
 
     public function disable($request)
     {
-        $selected = $request->get('selected', []);
-
-        $users = $this->model::find($selected);
+        $users = $this->getSelectedRecords($request);
 
         foreach ($users as $user) {
-            // Can't disable yourself
-            if ($user->id == user()->id) {
-                continue;
-                //$this->response->errorMethodNotAllowed(trans('auth.error.self_delete'));
+            try {
+                $this->dispatch(new UpdateUser($user, $request->merge(['enabled' => 0])));
+            } catch (\Exception $e) {
+                flash($e->getMessage())->error();
             }
-
-            $user->enabled = 0;
-            $user->save();
         }
     }
 
-    public function delete($request)
-    {
-        $this->destroy($request);
-    }
-
     public function destroy($request)
     {
-        $selected = $request->get('selected', []);
-
-        $users = $this->model::find($selected);
+        $users = $this->getSelectedRecords($request);
 
         foreach ($users as $user) {
             try {
                 $this->dispatch(new DeleteUser($user));
             } catch (\Exception $e) {
-                return $e->getMessage();
+                flash($e->getMessage())->error();
             }
         }
     }

diff --git a/app/BulkActions/Banking/Accounts.php b/app/BulkActions/Banking/Accounts.php
@@ -15,51 +15,42 @@ class Accounts extends BulkAction
         'enable' => [
             'name' => 'general.enable',
             'message' => 'bulk_actions.message.enable',
-            'permission' => 'update-banking-accounts'
+            'permission' => 'update-banking-accounts',
         ],
         'disable' => [
             'name' => 'general.disable',
             'message' => 'bulk_actions.message.disable',
-            'permission' => 'update-banking-accounts'
+            'permission' => 'update-banking-accounts',
         ],
         'delete' => [
             'name' => 'general.delete',
-            'message' => 'bulk_actions.message.deletes',
-            'permission' => 'delete-banking-accounts'
-        ]
+            'message' => 'bulk_actions.message.delete',
+            'permission' => 'delete-banking-accounts',
+        ],
     ];
 
     public function disable($request)
     {
-        $selected = $request->get('selected', []);
-
-        $accounts = $this->model::find($selected);
+        $accounts = $this->getSelectedRecords($request);
 
         foreach ($accounts as $account) {
             try {
-                $this->dispatch(new UpdateAccount($account, request()->merge(['enabled' => 1])));
+                $this->dispatch(new UpdateAccount($account, $request->merge(['enabled' => 0])));
             } catch (\Exception $e) {
-                return $e->getMessage();
+                flash($e->getMessage())->error();
             }
         }
     }
 
-    public function delete($request)
-    {
-        $this->destroy($request);
-    }
-
     public function destroy($request)
     {
-        $selected = $request->get('selected', []);
-
-        $accounts = $this->model::find($selected);
+        $accounts = $this->getSelectedRecords($request);
 
         foreach ($accounts as $account) {
             try {
                 $this->dispatch(new DeleteAccount($account));
             } catch (\Exception $e) {
-                return $e->getMessage();
+                flash($e->getMessage())->error();
             }
         }
     }

diff --git a/app/BulkActions/Banking/Reconciliations.php b/app/BulkActions/Banking/Reconciliations.php
@@ -14,25 +14,23 @@ class Reconciliations extends BulkAction
         'enable' => [
             'name' => 'general.enable',
             'message' => 'bulk_actions.message.enable',
-            'permission' => 'update-banking-reconciliations'
+            'permission' => 'update-banking-reconciliations',
         ],
         'disable' => [
             'name' => 'general.disable',
             'message' => 'bulk_actions.message.disable',
-            'permission' => 'update-banking-reconciliations'
+            'permission' => 'update-banking-reconciliations',
         ],
         'delete' => [
             'name' => 'general.delete',
-            'message' => 'bulk_actions.message.deletes',
-            'permission' => 'delete-banking-reconciliations'
-        ]
+            'message' => 'bulk_actions.message.delete',
+            'permission' => 'delete-banking-reconciliations',
+        ],
     ];
 
     public function enable($request)
     {
-        $selected = $request->get('selected', []);
-
-        $reconciliations = $this->model::find($selected);
+        $reconciliations = $this->getSelectedRecords($request);
 
         foreach ($reconciliations as $reconciliation) {
             $reconciliation->enabled = 1;
@@ -49,9 +47,7 @@ public function enable($request)
 
     public function disable($request)
     {
-        $selected = $request->get('selected', []);
-
-        $reconciliations = $this->model::find($selected);
+        $reconciliations = $this->getSelectedRecords($request);
 
         foreach ($reconciliations as $reconciliation) {
             $reconciliation->enabled = 0;
@@ -66,16 +62,9 @@ public function disable($request)
         }
     }
 
-    public function delete($request)
-    {
-        $this->destroy($request);
-    }
-
     public function destroy($request)
     {
-        $selected = $request->get('selected', []);
-
-        $reconciliations = $this->model::find($selected);
+        $reconciliations = $this->getSelectedRecords($request);
 
         foreach ($reconciliations as $reconciliation) {
             $reconciliation->delete();

diff --git a/app/BulkActions/Banking/Transfers.php b/app/BulkActions/Banking/Transfers.php
@@ -14,23 +14,20 @@ class Transfers extends BulkAction
         'delete' => [
             'name' => 'general.delete',
             'message' => 'bulk_action.message.deletes',
-            'permission' => 'delete-banking-transfers'
-        ]
+            'permission' => 'delete-banking-transfers',
+        ],
     ];
 
-    public function delete($request)
-    {
-        $this->destroy($request);
-    }
-
     public function destroy($request)
     {
-        $selected = $request->get('selected', []);
-
-        $transfers = $this->model::find($selected);
+        $transfers = $this->getSelectedRecords($request);
 
         foreach ($transfers as $transfer) {
-            $this->dispatch(new DeleteTransfer($transfer));
+            try {
+                $this->dispatch(new DeleteTransfer($transfer));
+            } catch (\Exception $e) {
+                flash($e->getMessage())->error();
+            }
         }
     }
 }