diff --git a/app/Http/Controllers/ClientPortal/InvoiceController.php b/app/Http/Controllers/ClientPortal/InvoiceController.php index b9f66049e3a1..ef31300f40b2 100644 --- a/app/Http/Controllers/ClientPortal/InvoiceController.php +++ b/app/Http/Controllers/ClientPortal/InvoiceController.php @@ -46,7 +46,7 @@ class InvoiceController extends Controller if (request()->ajax()) { - return DataTables::of(Invoice::filter($filters))->addColumn('action', function ($invoice) { + return DataTables::of($invoices)->addColumn('action', function ($invoice) { return ''.ctrans('texts.view').''; }) ->addColumn('checkbox', function ($invoice){ diff --git a/app/Http/Controllers/ClientPortal/RecurringInvoiceController.php b/app/Http/Controllers/ClientPortal/RecurringInvoiceController.php index 55d9ad085b93..639c1a9d88f2 100644 --- a/app/Http/Controllers/ClientPortal/RecurringInvoiceController.php +++ b/app/Http/Controllers/ClientPortal/RecurringInvoiceController.php @@ -11,6 +11,7 @@ namespace App\Http\Controllers\ClientPortal; +use App\Filters\InvoiceFilters; use App\Http\Controllers\Controller; use App\Models\RecurringInvoice; use App\Utils\Traits\MakesHash; @@ -37,12 +38,12 @@ class RecurringInvoiceController extends Controller * @return \Illuminate\Http\Response */ public function index(InvoiceFilters $filters, Builder $builder) - {// + { $invoices = Invoice::filter($filters); if (request()->ajax()) { - return DataTables::of(Invoice::filter($filters))->addColumn('action', function ($invoice) { + return DataTables::of($invoices)->addColumn('action', function ($invoice) { return ''.ctrans('texts.view').''; }) ->editColumn('status_id', function ($invoice){