Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-11-03 21:47:32 -05:00
Code Issues Packages Projects Releases Wiki Activity

Updated vendors to new datatable class

Browse Source
This commit is contained in:
Hillel Coren 2016-05-23 21:07:06 +03:00
parent 541b19cd5f
commit b2beb8fb73
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Ninja/Datatables/VendorDatatable.php
View File

@ -74,6 +74,6 @@ class VendorDatatable extends EntityDatatable
] ]
]; ];
} }
} }

1
app/Services/DatatableService.php
View File

@ -8,7 +8,6 @@ use App\Ninja\Datatables\EntityDatatable;
class DatatableService class DatatableService
{ {
//public function createDatatable($entityType, $query, $columns, $actions = null, $showCheckbox = true, $orderColumns = [])
public function createDatatable(EntityDatatable $datatable, $query) public function createDatatable(EntityDatatable $datatable, $query)
{ {
$table = Datatable::query($query); $table = Datatable::query($query);

4
app/Services/VendorService.php
View File

@ -8,6 +8,7 @@ use App\Models\Expense;
use App\Services\BaseService; use App\Services\BaseService;
use App\Ninja\Repositories\VendorRepository; use App\Ninja\Repositories\VendorRepository;
use App\Ninja\Repositories\NinjaRepository; use App\Ninja\Repositories\NinjaRepository;
use App\Ninja\Datatables\VendorDatatable;
class VendorService extends BaseService class VendorService extends BaseService
{ {
@ -37,13 +38,14 @@ class VendorService extends BaseService
public function getDatatable($search) public function getDatatable($search)
{ {
$datatable = new VendorDatatable();
$query = $this->vendorRepo->find($search); $query = $this->vendorRepo->find($search);
if(!Utils::hasPermission('view_all')){ if(!Utils::hasPermission('view_all')){
$query->where('vendors.user_id', '=', Auth::user()->id); $query->where('vendors.user_id', '=', Auth::user()->id);
} }
return $this->datatableService->createDatatable(ENTITY_VENDOR, $query); return $this->datatableService->createDatatable($datatable, $query);
} }
} }