shihaam/akaunting
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

close #931 Fixed: Bulk action delete not working

Browse Source
This commit is contained in:
Cüneyt Şentürk 2019-11-22 16:48:44 +03:00
parent 346c208e63
commit 03e2079b2c
12 changed files with 57 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/BulkActions/Banking/Accounts.php
View File

@ -77,7 +77,7 @@ class Accounts extends BulkAction
$message = trans('messages.success.deleted', ['type' => $account->name]);
return new Response($message);
flash($message)->success();
} else {
$message = trans('messages.warning.deleted', ['name' => $account->name, 'text' => implode(', ', $relationships)]);

2
app/BulkActions/Common/Companies.php
View File

@ -97,7 +97,7 @@ class Companies extends BulkAction
$message = trans('messages.success.deleted', ['type' => $company->name]);
return new Response($message);
flash($message)->success();
} catch (\HttpException $e) {
$this->response->errorUnauthorized(trans('companies.error.not_user_company'));
}

2
app/BulkActions/Common/Items.php
View File

@ -68,7 +68,7 @@ class Items extends BulkAction
$message = trans('messages.success.deleted', ['type' => $item->name]);
return new Response($message);
flash($message)->success();
} else {
$message = trans('messages.warning.deleted', ['name' => $item->name, 'text' => implode(', ', $relationships)]);

2
app/BulkActions/Expenses/Payments.php
View File

@ -61,7 +61,7 @@ class Payments extends BulkAction
$message = trans('messages.success.deleted', ['type' => trans_choice('general.' . \Str::plural($type), 1)]);
return new Response($message);
flash($message)->success();
} else {
$this->response->errorUnauthorized();
}

2
app/BulkActions/Expenses/Vendors.php
View File

@ -67,7 +67,7 @@ class Vendors extends BulkAction
$message = trans('messages.success.deleted', ['type' => $contact->name]);
return new Response($message);
flash($message)->success();
} else {
$message = trans('messages.warning.deleted', ['name' => $contact->name, 'text' => implode(', ', $relationships)]);

2
app/BulkActions/Incomes/Customers.php
View File

@ -67,7 +67,7 @@ class Customers extends BulkAction
$message = trans('messages.success.deleted', ['type' => $contact->name]);
return new Response($message);
flash($message)->success();
} else {
$message = trans('messages.warning.deleted', ['name' => $contact->name, 'text' => implode(', ', $relationships)]);

2
app/BulkActions/Incomes/Revenues.php
View File

@ -61,7 +61,7 @@ class Revenues extends BulkAction
$message = trans('messages.success.deleted', ['type' => trans_choice('general.' . \Str::plural($type), 1)]);
return new Response($message);
flash($message)->success();
} else {
$this->response->errorUnauthorized();
}

2
app/BulkActions/Settings/Categories.php
View File

@ -41,7 +41,7 @@ class Categories extends BulkAction
$message = trans('messages.success.disabled', ['type' => $category->name]);
return $this->itemResponse($category->fresh(), new Transformer(), $message);
flash($message)->success();
} else {
$message = trans('messages.warning.disabled', ['name' => $category->name, 'text' => implode(', ', $relationships)]);

2
app/BulkActions/Settings/Currencies.php
View File

@ -67,7 +67,7 @@ class Currencies extends BulkAction
$message = trans('messages.success.deleted', ['type' => $currency->name]);
return new Response($message);
flash($message)->success();
} else {
$message = trans('messages.warning.deleted', ['name' => $currency->name, 'text' => implode(', ', $relationships)]);

2
app/BulkActions/Settings/Taxes.php
View File

@ -67,7 +67,7 @@ class Taxes extends BulkAction
$message = trans('messages.success.deleted', ['type' => $tax->name]);
return new Response($message);
flash($message)->success();
} else {
$message = trans('messages.warning.deleted', ['name' => $tax->name, 'text' => implode(', ', $relationships)]);

20
app/Http/Controllers/Common/BulkActions.php
View File

@ -29,8 +29,24 @@ BulkActions extends Controller
$bulk_actions = app('App\BulkActions\\' . ucfirst($group) . '\\' . ucfirst($type));
}
$bulk_actions->{$request->get('handle')}($request);
$result = $bulk_actions->{$request->get('handle')}($request);
return view('common.import.create', compact('group', 'type', 'path', 'namespace'));
if (!empty($result) && isset($result->file)) {
/*return response()->json([
'success' => true,
'redirect' => false,
'error' => false,
'data' => [],
'message' => ''
]);*/
} else {
return response()->json([
'success' => true,
'redirect' => true,
'error' => false,
'data' => [],
'message' => ''
]);
}
}
}

31
resources/assets/js/plugins/bulk-action.js vendored
View File

@ -80,14 +80,41 @@ export default class BulkAction {
.then(response => {
//this.loading = false;
//this.modal = false;
if (response.data.redirect) {
window.location.reload(false);
} else {
this.loading = false;
this.modal = false;
window.location.reload(false);
// It is necessary to create a new blob object with mime-type explicitly set
// otherwise only Chrome works like it should
var newBlob = new Blob([response.body], {type: 'application/pdf'})
// IE doesn't allow using a blob object directly as link href
// instead it is necessary to use msSaveOrOpenBlob
if (window.navigator && window.navigator.msSaveOrOpenBlob) {
window.navigator.msSaveOrOpenBlob(newBlob)
return
}
// For other browsers:
// Create a link pointing to the ObjectURL containing the blob.
const data = window.URL.createObjectURL(newBlob)
var link = document.createElement('a')
link.href = data
link.download = filename + '.pdf'
link.click()
setTimeout(function () {
// For Firefox it is necessary to delay revoking the ObjectURL
window.URL.revokeObjectURL(data)
}, 100)
}
})
.catch(error => {
//this.loading = false;
//this.modal = false;
window.location.reload(false);
//window.location.reload(false);
});
}