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

Merge branch '2.1-dev' of github.com:akaunting/akaunting into 2.1-dev

Browse Source
This commit is contained in:
Cüneyt Şentürk
2020-11-11 18:49:19 +03:00
parent 72231b10ce 6dbf2a8d5c
commit 8784dc14db
91 changed files with 1938 additions and 1814 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6,9 +6,7 @@ use App\Abstracts\Http\Controller;
use App\Http\Requests\Common\BulkAction as Request;
use Illuminate\Support\Str;
class
BulkActions extends Controller
class BulkActions extends Controller
{
/**

2
app/Http/Controllers/Common/Companies.php
View File

@ -26,7 +26,7 @@ class Companies extends Controller
{
$companies = Company::collect();
return view('common.companies.index', compact('companies'));
return $this->response('common.companies.index', compact('companies'));
}
/**

2
app/Http/Controllers/Common/Dashboards.php
View File

@ -40,7 +40,7 @@ class Dashboards extends Controller
{
$dashboards = user()->dashboards()->collect();
return view('common.dashboards.index', compact('dashboards'));
return $this->response('common.dashboards.index', compact('dashboards'));
}
/**

6
app/Http/Controllers/Common/Items.php
View File

@ -30,7 +30,7 @@ class Items extends Controller
{
$items = Item::with('category', 'media')->collect();
return view('common.items.index', compact('items'));
return $this->response('common.items.index', compact('items'));
}
/**
@ -50,7 +50,7 @@ class Items extends Controller
*/
public function create()
{
$categories = Category::item()->enabled()->orderBy('name')->pluck('name', 'id');
$categories = Category::item()->enabled()->orderBy('name')->take(setting('default.select_limit'))->pluck('name', 'id');
$taxes = Tax::enabled()->orderBy('name')->get()->pluck('title', 'id');
@ -129,7 +129,7 @@ class Items extends Controller
*/
public function edit(Item $item)
{
$categories = Category::item()->enabled()->orderBy('name')->pluck('name', 'id');
$categories = Category::item()->enabled()->orderBy('name')->take(setting('default.select_limit'))->pluck('name', 'id');
$taxes = Tax::enabled()->orderBy('name')->get()->pluck('title', 'id');

2
app/Http/Controllers/Common/Reports.php
View File

@ -45,7 +45,7 @@ class Reports extends Controller
$categories[$class->getCategory()][] = $report;
}
return view('common.reports.index', compact('categories', 'totals', 'icons'));
return $this->response('common.reports.index', compact('categories', 'totals', 'icons'));
}
/**