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

moved folders to common directory

Browse Source
This commit is contained in:
denisdulici
2018-06-10 02:48:51 +03:00
parent 7fa629e8b5
commit b1fd49c507
71 changed files with 719 additions and 647 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/Http/Controllers/Api/Companies/Companies.php → app/Http/Controllers/Api/Common/Companies.php
View File

@ -1,11 +1,11 @@
<?php
namespace App\Http\Controllers\Api\Companies;
namespace App\Http\Controllers\Api\Common;
use App\Http\Controllers\ApiController;
use App\Http\Requests\Company\Company as Request;
use App\Models\Company\Company;
use App\Transformers\Company\Company as Transformer;
use App\Http\Requests\Common\Company as Request;
use App\Models\Common\Company;
use App\Transformers\Common\Company as Transformer;
use Dingo\Api\Routing\Helpers;
class Companies extends ApiController

8
app/Http/Controllers/Api/Items/Items.php → app/Http/Controllers/Api/Common/Items.php
View File

@ -1,11 +1,11 @@
<?php
namespace App\Http\Controllers\Api\Items;
namespace App\Http\Controllers\Api\Common;
use App\Http\Controllers\ApiController;
use App\Http\Requests\Item\Item as Request;
use App\Models\Item\Item;
use App\Transformers\Item\Item as Transformer;
use App\Http\Requests\Common\Item as Request;
use App\Models\Common\Item;
use App\Transformers\Common\Item as Transformer;
use Dingo\Api\Routing\Helpers;
class Items extends ApiController

2
app/Http/Controllers/Api/Expenses/Bills.php
View File

@ -11,7 +11,7 @@ use App\Models\Expense\BillHistory;
use App\Models\Expense\BillItem;
use App\Models\Expense\BillPayment;
use App\Models\Expense\BillStatus;
use App\Models\Item\Item;
use App\Models\Common\Item;
use App\Models\Setting\Tax;
use App\Transformers\Expense\Bill as Transformer;
use Dingo\Api\Routing\Helpers;

4
app/Http/Controllers/Api/Incomes/Invoices.php
View File

@ -11,9 +11,9 @@ use App\Models\Income\InvoiceHistory;
use App\Models\Income\InvoiceItem;
use App\Models\Income\InvoicePayment;
use App\Models\Income\InvoiceTotal;
use App\Models\Item\Item;
use App\Models\Common\Item;
use App\Models\Setting\Tax;
use App\Notifications\Item\Item as ItemNotification;
use App\Notifications\Common\Item as ItemNotification;
use App\Transformers\Income\Invoice as Transformer;
use Dingo\Api\Routing\Helpers;

2
app/Http/Controllers/Auth/Users.php
View File

@ -236,7 +236,7 @@ class Users extends Controller
// Mark item notifications as read
foreach ($user->unreadNotifications as $notification) {
// Not an item notification
if ($notification->getAttribute('type') != 'App\Notifications\Item\Item') {
if ($notification->getAttribute('type') != 'App\Notifications\Common\Item') {
continue;
}

26
app/Http/Controllers/Companies/Companies.php → app/Http/Controllers/Common/Companies.php
View File

@ -1,11 +1,11 @@
<?php
namespace App\Http\Controllers\Companies;
namespace App\Http\Controllers\Common;
use App\Events\CompanySwitched;
use App\Http\Controllers\Controller;
use App\Http\Requests\Company\Company as Request;
use App\Models\Company\Company;
use App\Http\Requests\Common\Company as Request;
use App\Models\Common\Company;
use App\Models\Setting\Currency;
use App\Traits\Uploads;
@ -26,7 +26,7 @@ class Companies extends Controller
$company->setSettings();
}
return view('companies.companies.index', compact('companies'));
return view('common.companies.index', compact('companies'));
}
/**
@ -36,7 +36,7 @@ class Companies extends Controller
*/
public function show()
{
return redirect('companies/companies');
return redirect('common/companies');
}
/**
@ -48,7 +48,7 @@ class Companies extends Controller
{
$currencies = Currency::enabled()->pluck('name', 'code');
return view('companies.companies.create', compact('currencies'));
return view('common.companies.create', compact('currencies'));
}
/**
@ -91,7 +91,7 @@ class Companies extends Controller
flash($message)->success();
return redirect('companies/companies');
return redirect('common/companies');
}
/**
@ -109,14 +109,14 @@ class Companies extends Controller
flash($message)->error();
return redirect('companies/companies');
return redirect('common/companies');
}
$company->setSettings();
$currencies = Currency::enabled()->pluck('name', 'code');
return view('companies.companies.edit', compact('company', 'currencies'));
return view('common.companies.edit', compact('company', 'currencies'));
}
/**
@ -135,7 +135,7 @@ class Companies extends Controller
flash($message)->error();
return redirect('companies/companies');
return redirect('common/companies');
}
// Update company
@ -171,7 +171,7 @@ class Companies extends Controller
flash($message)->success();
return redirect('companies/companies');
return redirect('common/companies');
}
/**
@ -189,7 +189,7 @@ class Companies extends Controller
flash($message)->error();
return redirect('companies/companies');
return redirect('common/companies');
}
$company->delete();
@ -198,7 +198,7 @@ class Companies extends Controller
flash($message)->success();
return redirect('companies/companies');
return redirect('common/companies');
}
/**

4
app/Http/Controllers/Dashboard/Dashboard.php → app/Http/Controllers/Common/Dashboard.php
View File

@ -1,6 +1,6 @@
<?php
namespace App\Http\Controllers\Dashboard;
namespace App\Http\Controllers\Common;
use App\Http\Controllers\Controller;
use App\Models\Banking\Account;
@ -46,7 +46,7 @@ class Dashboard extends Controller
$latest_expenses = $this->getLatestExpenses();
return view('dashboard.dashboard.index', compact(
return view('common.dashboard.index', compact(
'total_incomes',
'total_expenses',
'total_profit',

24
app/Http/Controllers/Items/Items.php → app/Http/Controllers/Common/Items.php
View File

@ -1,10 +1,10 @@
<?php
namespace App\Http\Controllers\Items;
namespace App\Http\Controllers\Common;
use App\Http\Controllers\Controller;
use App\Http\Requests\Item\Item as Request;
use App\Models\Item\Item;
use App\Http\Requests\Common\Item as Request;
use App\Models\Common\Item;
use App\Models\Setting\Category;
use App\Models\Setting\Currency;
use App\Models\Setting\Tax;
@ -27,7 +27,7 @@ class Items extends Controller
$categories = Category::enabled()->type('item')->pluck('name', 'id')
->prepend(trans('general.all_type', ['type' => trans_choice('general.categories', 2)]), '');
return view('items.items.index', compact('items', 'categories'));
return view('common.items.index', compact('items', 'categories'));
}
/**
@ -37,7 +37,7 @@ class Items extends Controller
*/
public function show()
{
return redirect('items/items');
return redirect('common/items');
}
/**
@ -51,7 +51,7 @@ class Items extends Controller
$taxes = Tax::enabled()->get()->pluck('title', 'id');
return view('items.items.create', compact('categories', 'taxes'));
return view('common.items.create', compact('categories', 'taxes'));
}
/**
@ -76,7 +76,7 @@ class Items extends Controller
flash($message)->success();
return redirect('items/items');
return redirect('common/items');
}
/**
@ -94,7 +94,7 @@ class Items extends Controller
flash($message)->success();
return redirect('items/items/' . $clone->id . '/edit');
return redirect('common/items/' . $clone->id . '/edit');
}
/**
@ -119,7 +119,7 @@ class Items extends Controller
flash($message)->success();
return redirect('items/items');
return redirect('common/items');
}
/**
@ -135,7 +135,7 @@ class Items extends Controller
$taxes = Tax::enabled()->get()->pluck('title', 'id');
return view('items.items.edit', compact('item', 'categories', 'taxes'));
return view('common.items.edit', compact('item', 'categories', 'taxes'));
}
/**
@ -161,7 +161,7 @@ class Items extends Controller
flash($message)->success();
return redirect('items/items');
return redirect('common/items');
}
/**
@ -190,7 +190,7 @@ class Items extends Controller
flash($message)->warning();
}
return redirect('items/items');
return redirect('common/items');
}
public function autocomplete()

4
app/Http/Controllers/Search/Search.php → app/Http/Controllers/Common/Search.php
View File

@ -1,6 +1,6 @@
<?php
namespace App\Http\Controllers\Search;
namespace App\Http\Controllers\Common;
use App\Http\Controllers\Controller;
use App\Models\Banking\Account;
@ -10,7 +10,7 @@ use App\Models\Expense\Vendor;
use App\Models\Income\Invoice;
use App\Models\Income\Revenue;
use App\Models\Income\Customer;
use App\Models\Item\Item;
use App\Models\Common\Item;
class Search extends Controller
{

2
app/Http/Controllers/Controller.php
View File

@ -43,7 +43,7 @@ class Controller extends BaseController
$controller .= kebab_case($arr[0]);
// Skip ACL
$skip = ['dashboard-dashboard', 'customers-dashboard'];
$skip = ['common-dashboard', 'customers-dashboard'];
if (in_array($controller, $skip)) {
return;
}

2
app/Http/Controllers/Expenses/Bills.php
View File

@ -16,7 +16,7 @@ use App\Models\Expense\BillItem;
use App\Models\Expense\BillTotal;
use App\Models\Expense\BillHistory;
use App\Models\Expense\BillPayment;
use App\Models\Item\Item;
use App\Models\Common\Item;
use App\Models\Setting\Category;
use App\Models\Setting\Currency;
use App\Models\Setting\Tax;

4
app/Http/Controllers/Incomes/Invoices.php
View File

@ -16,13 +16,13 @@ use App\Models\Income\InvoiceItem;
use App\Models\Income\InvoiceTotal;
use App\Models\Income\InvoicePayment;
use App\Models\Income\InvoiceStatus;
use App\Models\Item\Item;
use App\Models\Common\Item;
use App\Models\Setting\Category;
use App\Models\Setting\Currency;
use App\Models\Setting\Tax;
use App\Models\Common\Media;
use App\Notifications\Income\Invoice as Notification;
use App\Notifications\Item\Item as ItemNotification;
use App\Notifications\Common\Item as ItemNotification;
use App\Traits\Currencies;
use App\Traits\DateTime;
use App\Traits\Incomes;

2
app/Http/Controllers/Settings/Settings.php
View File

@ -5,7 +5,7 @@ namespace App\Http\Controllers\Settings;
use App\Http\Controllers\Controller;
use App\Http\Requests\Setting\Setting as Request;
use App\Models\Banking\Account;
use App\Models\Company\Company;
use App\Models\Common\Company;
use App\Models\Setting\Currency;
use App\Models\Setting\Setting;
use App\Models\Common\Media;