From 2083bc87bf4c2be65e57e771fd9bd35b6e163560 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=BCneyt=20=C5=9Eent=C3=BCrk?= Date: Fri, 27 Dec 2019 15:42:22 +0300 Subject: [PATCH] BulkAction error massage issue fixed. --- app/BulkActions/Auth/Permissions.php | 2 +- app/BulkActions/Auth/Roles.php | 2 +- app/BulkActions/Auth/Users.php | 2 +- app/BulkActions/Banking/Accounts.php | 2 +- app/BulkActions/Banking/Reconciliations.php | 2 +- app/BulkActions/Banking/Transfers.php | 2 +- app/BulkActions/Common/Companies.php | 2 +- app/BulkActions/Common/Items.php | 3 +-- app/BulkActions/Expenses/Bills.php | 2 +- app/BulkActions/Expenses/Payments.php | 2 +- app/BulkActions/Expenses/Vendors.php | 3 +-- app/BulkActions/Incomes/Customers.php | 2 +- app/BulkActions/Incomes/Invoices.php | 2 +- app/BulkActions/Incomes/Revenues.php | 2 +- app/BulkActions/Settings/Categories.php | 2 +- app/BulkActions/Settings/Currencies.php | 2 +- app/BulkActions/Settings/Taxes.php | 2 +- resources/assets/js/mixins/global.js | 2 -- resources/assets/js/plugins/bulk-action.js | 3 +++ 19 files changed, 20 insertions(+), 21 deletions(-) diff --git a/app/BulkActions/Auth/Permissions.php b/app/BulkActions/Auth/Permissions.php index ccb54968c..26c2b7bc6 100644 --- a/app/BulkActions/Auth/Permissions.php +++ b/app/BulkActions/Auth/Permissions.php @@ -14,6 +14,6 @@ class Permissions extends BulkAction 'name' => 'general.delete', 'message' => 'bulk_actions.message.delete', 'permission' => 'delete-auth-permissions', - ] + ], ]; } diff --git a/app/BulkActions/Auth/Roles.php b/app/BulkActions/Auth/Roles.php index 9ea209823..6ece570de 100644 --- a/app/BulkActions/Auth/Roles.php +++ b/app/BulkActions/Auth/Roles.php @@ -14,6 +14,6 @@ class Roles extends BulkAction 'name' => 'general.delete', 'message' => 'bulk_actions.message.delete', 'permission' => 'delete-auth-roles', - ] + ], ]; } diff --git a/app/BulkActions/Auth/Users.php b/app/BulkActions/Auth/Users.php index e952a88df..9476e2c98 100644 --- a/app/BulkActions/Auth/Users.php +++ b/app/BulkActions/Auth/Users.php @@ -26,7 +26,7 @@ class Users extends BulkAction 'name' => 'general.delete', 'message' => 'bulk_actions.message.delete', 'permission' => 'delete-auth-users', - ] + ], ]; public function disable($request) diff --git a/app/BulkActions/Banking/Accounts.php b/app/BulkActions/Banking/Accounts.php index ea2777187..96bc53dbf 100644 --- a/app/BulkActions/Banking/Accounts.php +++ b/app/BulkActions/Banking/Accounts.php @@ -26,7 +26,7 @@ class Accounts extends BulkAction 'name' => 'general.delete', 'message' => 'bulk_actions.message.delete', 'permission' => 'delete-banking-accounts', - ] + ], ]; public function disable($request) diff --git a/app/BulkActions/Banking/Reconciliations.php b/app/BulkActions/Banking/Reconciliations.php index 392f3b2f7..024614715 100644 --- a/app/BulkActions/Banking/Reconciliations.php +++ b/app/BulkActions/Banking/Reconciliations.php @@ -25,7 +25,7 @@ class Reconciliations extends BulkAction 'name' => 'general.delete', 'message' => 'bulk_actions.message.delete', 'permission' => 'delete-banking-reconciliations', - ] + ], ]; public function enable($request) diff --git a/app/BulkActions/Banking/Transfers.php b/app/BulkActions/Banking/Transfers.php index 9bba10e5f..bc59b4714 100644 --- a/app/BulkActions/Banking/Transfers.php +++ b/app/BulkActions/Banking/Transfers.php @@ -15,7 +15,7 @@ class Transfers extends BulkAction 'name' => 'general.delete', 'message' => 'bulk_action.message.deletes', 'permission' => 'delete-banking-transfers', - ] + ], ]; public function destroy($request) diff --git a/app/BulkActions/Common/Companies.php b/app/BulkActions/Common/Companies.php index c00c66d2a..1a385ec37 100644 --- a/app/BulkActions/Common/Companies.php +++ b/app/BulkActions/Common/Companies.php @@ -26,7 +26,7 @@ class Companies extends BulkAction 'name' => 'general.delete', 'message' => 'bulk_actions.message.delete', 'permission' => 'delete-common-companies', - ] + ], ]; public function enable($request) diff --git a/app/BulkActions/Common/Items.php b/app/BulkActions/Common/Items.php index 089272201..3454ea560 100644 --- a/app/BulkActions/Common/Items.php +++ b/app/BulkActions/Common/Items.php @@ -5,7 +5,6 @@ namespace App\BulkActions\Common; use App\Abstracts\BulkAction; use App\Exports\Common\Items as Export; use App\Jobs\Common\DeleteItem; -use App\Jobs\Common\UpdateItem; use App\Models\Common\Item; class Items extends BulkAction @@ -31,7 +30,7 @@ class Items extends BulkAction 'export' => [ 'name' => 'general.export', 'message' => 'bulk_actions.message.export', - ] + ], ]; public function destroy($request) diff --git a/app/BulkActions/Expenses/Bills.php b/app/BulkActions/Expenses/Bills.php index 51fcc6853..c9153fd2f 100644 --- a/app/BulkActions/Expenses/Bills.php +++ b/app/BulkActions/Expenses/Bills.php @@ -26,7 +26,7 @@ class Bills extends BulkAction 'export' => [ 'name' => 'general.export', 'message' => 'bulk_actions.message.export', - ] + ], ]; public function received($request) diff --git a/app/BulkActions/Expenses/Payments.php b/app/BulkActions/Expenses/Payments.php index 49e676f4e..094c4c1de 100644 --- a/app/BulkActions/Expenses/Payments.php +++ b/app/BulkActions/Expenses/Payments.php @@ -19,7 +19,7 @@ class Payments extends BulkAction 'name' => 'general.delete', 'message' => 'bulk_actions.message.delete', 'permission' => 'delete-expenses-payments', - ] + ], ]; public function destroy($request) diff --git a/app/BulkActions/Expenses/Vendors.php b/app/BulkActions/Expenses/Vendors.php index 77939e539..39ce02340 100644 --- a/app/BulkActions/Expenses/Vendors.php +++ b/app/BulkActions/Expenses/Vendors.php @@ -4,7 +4,6 @@ namespace App\BulkActions\Expenses; use App\Abstracts\BulkAction; use App\Exports\Expenses\Vendors as Export; -use App\Jobs\Common\UpdateContact; use App\Models\Common\Contact; class Vendors extends BulkAction @@ -30,7 +29,7 @@ class Vendors extends BulkAction 'export' => [ 'name' => 'general.export', 'message' => 'bulk_actions.message.export', - ] + ], ]; public function disable($request) diff --git a/app/BulkActions/Incomes/Customers.php b/app/BulkActions/Incomes/Customers.php index 19b7f97a0..3a06bef96 100644 --- a/app/BulkActions/Incomes/Customers.php +++ b/app/BulkActions/Incomes/Customers.php @@ -29,7 +29,7 @@ class Customers extends BulkAction 'export' => [ 'name' => 'general.export', 'message' => 'bulk_actions.message.export', - ] + ], ]; public function disable($request) diff --git a/app/BulkActions/Incomes/Invoices.php b/app/BulkActions/Incomes/Invoices.php index 385428ece..ef2f7242e 100644 --- a/app/BulkActions/Incomes/Invoices.php +++ b/app/BulkActions/Incomes/Invoices.php @@ -33,7 +33,7 @@ class Invoices extends BulkAction 'export' => [ 'name' => 'general.export', 'message' => 'bulk_actions.message.export', - ] + ], ]; public function paid($request) diff --git a/app/BulkActions/Incomes/Revenues.php b/app/BulkActions/Incomes/Revenues.php index 2c3f1f590..de1bd627e 100644 --- a/app/BulkActions/Incomes/Revenues.php +++ b/app/BulkActions/Incomes/Revenues.php @@ -19,7 +19,7 @@ class Revenues extends BulkAction 'export' => [ 'name' => 'general.export', 'message' => 'bulk_actions.message.export', - ] + ], ]; public function destroy($request) diff --git a/app/BulkActions/Settings/Categories.php b/app/BulkActions/Settings/Categories.php index 9d61db862..d9b665f98 100644 --- a/app/BulkActions/Settings/Categories.php +++ b/app/BulkActions/Settings/Categories.php @@ -26,7 +26,7 @@ class Categories extends BulkAction 'name' => 'general.delete', 'message' => 'bulk_actions.message.delete', 'permission' => 'delete-settings-categories', - ] + ], ]; public function disable($request) diff --git a/app/BulkActions/Settings/Currencies.php b/app/BulkActions/Settings/Currencies.php index d02b30205..581878290 100644 --- a/app/BulkActions/Settings/Currencies.php +++ b/app/BulkActions/Settings/Currencies.php @@ -26,7 +26,7 @@ class Currencies extends BulkAction 'name' => 'general.delete', 'message' => 'bulk_actions.message.delete', 'permission' => 'delete-settings-currencies', - ] + ], ]; public function disable($request) diff --git a/app/BulkActions/Settings/Taxes.php b/app/BulkActions/Settings/Taxes.php index 529140df4..3d1d7182e 100644 --- a/app/BulkActions/Settings/Taxes.php +++ b/app/BulkActions/Settings/Taxes.php @@ -26,7 +26,7 @@ class Taxes extends BulkAction 'name' => 'general.delete', 'message' => 'bulk_actions.message.delete', 'permission' => 'delete-settings-taxes', - ] + ], ]; public function disable($request) diff --git a/resources/assets/js/mixins/global.js b/resources/assets/js/mixins/global.js index 4d8a31979..9e31d5322 100644 --- a/resources/assets/js/mixins/global.js +++ b/resources/assets/js/mixins/global.js @@ -122,8 +122,6 @@ export default { // Bulk Action use selected Action onAction() { this.bulk_action.action(); - - window.location.reload(false); }, // Bulk Action modal cancel diff --git a/resources/assets/js/plugins/bulk-action.js b/resources/assets/js/plugins/bulk-action.js index 079906415..365fdfac7 100644 --- a/resources/assets/js/plugins/bulk-action.js +++ b/resources/assets/js/plugins/bulk-action.js @@ -114,6 +114,9 @@ export default class BulkAction { //this.loading = false; //this.modal = false; + //window.location.reload(false); + }) + .finally(function () { //window.location.reload(false); }); }