fixed #278
This commit is contained in:
parent
6dec413786
commit
88d78d54af
@ -84,19 +84,34 @@ class Accounts extends Controller
|
|||||||
*/
|
*/
|
||||||
public function update(Account $account, Request $request)
|
public function update(Account $account, Request $request)
|
||||||
{
|
{
|
||||||
$account->update($request->all());
|
// Check if we can disable it
|
||||||
|
if (!$request['enabled']) {
|
||||||
// Set default account
|
if ($account->id == setting('general.default_account')) {
|
||||||
if ($request['default_account']) {
|
$relationships[] = strtolower(trans_choice('general.companies', 1));
|
||||||
setting()->set('general.default_account', $account->id);
|
}
|
||||||
setting()->save();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
$message = trans('messages.success.updated', ['type' => trans_choice('general.accounts', 1)]);
|
if (empty($relationships)) {
|
||||||
|
$account->update($request->all());
|
||||||
|
|
||||||
flash($message)->success();
|
// Set default account
|
||||||
|
if ($request['default_account']) {
|
||||||
|
setting()->set('general.default_account', $account->id);
|
||||||
|
setting()->save();
|
||||||
|
}
|
||||||
|
|
||||||
return redirect('banking/accounts');
|
$message = trans('messages.success.updated', ['type' => trans_choice('general.accounts', 1)]);
|
||||||
|
|
||||||
|
flash($message)->success();
|
||||||
|
|
||||||
|
return redirect('banking/accounts');
|
||||||
|
} else {
|
||||||
|
$message = trans('messages.warning.disabled', ['name' => $account->name, 'text' => implode(', ', $relationships)]);
|
||||||
|
|
||||||
|
flash($message)->warning();
|
||||||
|
|
||||||
|
return redirect('banking/accounts/' . $account->id . '/edit');
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -115,6 +130,10 @@ class Accounts extends Controller
|
|||||||
'revenues' => 'revenues',
|
'revenues' => 'revenues',
|
||||||
]);
|
]);
|
||||||
|
|
||||||
|
if ($account->id == setting('general.default_account')) {
|
||||||
|
$relationships[] = strtolower(trans_choice('general.companies', 1));
|
||||||
|
}
|
||||||
|
|
||||||
if (empty($relationships)) {
|
if (empty($relationships)) {
|
||||||
$account->delete();
|
$account->delete();
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user