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

refactoring

Browse Source
This commit is contained in:
denisdulici
2019-12-22 15:58:48 +03:00
parent f9687d9138
commit e82f948353
29 changed files with 154 additions and 288 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/BulkActions/Auth/Permissions.php
View File

@ -7,7 +7,6 @@ use App\Models\Auth\Permission;
class Permissions extends BulkAction
{
public $model = Permission::class;
public $actions = [

1
app/BulkActions/Auth/Roles.php
View File

@ -7,7 +7,6 @@ use App\Models\Auth\Role;
class Roles extends BulkAction
{
public $model = Role::class;
public $actions = [

20
app/BulkActions/Auth/Users.php
View File

@ -3,12 +3,11 @@
namespace App\BulkActions\Auth;
use App\Abstracts\BulkAction;
use App\Jobs\Auth\DeleteUser;
use App\Models\Auth\User;
use Artisan;
class Users extends BulkAction
{
public $model = User::class;
public $actions = [
@ -59,20 +58,11 @@ class Users extends BulkAction
$users = $this->model::find($selected);
foreach ($users as $user) {
// Can't delete yourself
if ($user->id == user()->id) {
continue;
//$this->response->errorMethodNotAllowed(trans('auth.error.self_delete'));
try {
$this->dispatch(new DeleteUser($user));
} catch (\Exception $e) {
return $e->getMessage();
}
$user->delete();
}
// Can't delete yourself
if ($user->id == app(Auth::class)->user()->id) {
$this->response->errorMethodNotAllowed(trans('auth.error.self_delete'));
}
Artisan::call('cache:clear');
}
}

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

@ -3,11 +3,12 @@
namespace App\BulkActions\Banking;
use App\Abstracts\BulkAction;
use App\Jobs\Banking\DeleteAccount;
use App\Jobs\Banking\UpdateAccount;
use App\Models\Banking\Account;
class Accounts extends BulkAction
{
public $model = Account::class;
public $actions = [
@ -35,21 +36,10 @@ class Accounts extends BulkAction
$accounts = $this->model::find($selected);
foreach ($accounts as $account) {
if ($account->id == setting('default.account')) {
$relationships[] = strtolower(trans_choice('general.companies', 1));
}
if (empty($relationships)) {
$account->enabled = 0;
$account->save();
$message = trans('messages.success.disabled', ['type' => $account->name]);
return $this->itemResponse($account->fresh(), new Transformer(), $message);
} else {
$message = trans('messages.warning.disabled', ['name' => $account->name, 'text' => implode(', ', $relationships)]);
$this->response->errorUnauthorized($message);
try {
$this->dispatch(new UpdateAccount($account, request()->merge(['enabled' => 1])));
} catch (\Exception $e) {
return $e->getMessage();
}
}
}
@ -66,33 +56,11 @@ class Accounts extends BulkAction
$accounts = $this->model::find($selected);
foreach ($accounts as $account) {
if ($relationships = $this->getRelationships($account)) {
if ($account->id == setting('default.account')) {
$relationships[] = strtolower(trans_choice('general.companies', 1));
}
}
if (empty($relationships)) {
$account->delete();
$message = trans('messages.success.deleted', ['type' => $account->name]);
flash($message)->success();
} else {
$message = trans('messages.warning.deleted', ['name' => $account->name, 'text' => implode(', ', $relationships)]);
$this->response->errorUnauthorized($message);
try {
$this->dispatch(new DeleteAccount($account));
} catch (\Exception $e) {
return $e->getMessage();
}
}
}
protected function getRelationships($account)
{
$relationships = $this->countRelationships($account, [
'expense_transactions' => 'transactions',
'income_transacions' => 'transactions',
]);
return $relationships;
}
}

1
app/BulkActions/Banking/Reconciliations.php
View File

@ -8,7 +8,6 @@ use App\Models\Banking\Transaction;
class Reconciliations extends BulkAction
{
public $model = Reconciliation::class;
public $actions = [

6
app/BulkActions/Banking/Transfers.php
View File

@ -3,11 +3,11 @@
namespace App\BulkActions\Banking;
use App\Abstracts\BulkAction;
use App\Jobs\Banking\DeleteTransfer;
use App\Models\Banking\Transfer;
class Transfers extends BulkAction
{
public $model = Transfer::class;
public $actions = [
@ -30,9 +30,7 @@ class Transfers extends BulkAction
$transfers = $this->model::find($selected);
foreach ($transfers as $transfer) {
$this->deleteRelationships($transfer, ['expense_transaction', 'income_transaction']);
$transfer->delete();
$this->dispatch(new DeleteTransfer($transfer));
}
}
}

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

@ -7,7 +7,6 @@ use App\Models\Common\Company;
class Companies extends BulkAction
{
public $model = Company::class;
public $actions = [

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

@ -8,7 +8,6 @@ use App\Models\Common\Item;
class Items extends BulkAction
{
public $model = Item::class;
public $actions = [

5
app/BulkActions/Expenses/Bills.php
View File

@ -4,12 +4,12 @@ namespace App\BulkActions\Expenses;
use App\Abstracts\BulkAction;
use App\Exports\Expenses\Bills as Export;
use App\Jobs\Expense\DeleteBill;
use App\Models\Expense\Bill;
use App\Models\Expense\BillHistory;
class Bills extends BulkAction
{
public $model = Bill::class;
public $actions = [
@ -67,8 +67,7 @@ class Bills extends BulkAction
$bills = $this->model::find($selected);
foreach ($bills as $bill) {
$this->deleteRelationships($bill, ['items', 'item_taxes', 'histories', 'payments', 'recurring', 'totals']);
$bill->delete();
$this->dispatch(new DeleteBill($bill));
}
}

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

@ -9,7 +9,6 @@ use App\Models\Setting\Category;
class Payments extends BulkAction
{
public $model = Transaction::class;
public $actions = [

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

@ -8,7 +8,6 @@ use App\Models\Common\Contact;
class Vendors extends BulkAction
{
public $model = Contact::class;
public $actions = [

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

@ -8,7 +8,6 @@ use App\Models\Common\Contact;
class Customers extends BulkAction
{
public $model = Contact::class;
public $actions = [

4
app/BulkActions/Incomes/Invoices.php
View File

@ -7,6 +7,7 @@ use App\Events\Income\InvoiceCreated;
use App\Events\Income\InvoiceSent;
use App\Events\Income\PaymentReceived;
use App\Exports\Incomes\Invoices as Export;
use App\Jobs\Income\DeleteInvoice;
use App\Models\Income\Invoice;
use Date;
@ -67,8 +68,7 @@ class Invoices extends BulkAction
$invoices = $this->model::find($selected);
foreach ($invoices as $invoice) {
$this->deleteRelationships($invoice, ['items', 'item_taxes', 'histories', 'transactions', 'recurring', 'totals']);
$invoice->delete();
$this->dispatch(new DeleteInvoice($invoice));
}
}

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

@ -9,7 +9,6 @@ use App\Models\Setting\Category;
class Revenues extends BulkAction
{
public $model = Transaction::class;
public $actions = [

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

@ -7,7 +7,6 @@ use App\Models\Setting\Category;
class Categories extends BulkAction
{
public $model = Category::class;
public $actions = [

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

@ -7,7 +7,6 @@ use App\Models\Setting\Currency;
class Currencies extends BulkAction
{
public $model = Currency::class;
public $actions = [

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

@ -7,7 +7,6 @@ use App\Models\Setting\Tax;
class Taxes extends BulkAction
{
public $model = Tax::class;
public $actions = [