diff --git a/app/Http/Controllers/ClientPortal/InvoiceController.php b/app/Http/Controllers/ClientPortal/InvoiceController.php index 46a1328f3e0a..e591d7c506a9 100644 --- a/app/Http/Controllers/ClientPortal/InvoiceController.php +++ b/app/Http/Controllers/ClientPortal/InvoiceController.php @@ -12,6 +12,7 @@ namespace App\Http\Controllers\ClientPortal; use App\Filters\InvoiceFilters; +use App\Http\Controllers\Controller; use App\Jobs\Entity\ActionEntity; use App\Models\Invoice; use App\Repositories\BaseRepository; @@ -23,7 +24,7 @@ use Illuminate\Http\Request; * @package App\Http\Controllers\ClientPortal\InvoiceController */ -class InvoiceController extends BaseController +class InvoiceController extends Controller { use MakesHash; @@ -36,8 +37,6 @@ class InvoiceController extends BaseController public function __construct() { - parent::__construct(); - } /** @@ -50,9 +49,9 @@ class InvoiceController extends BaseController public function index(InvoiceFilters $filters) { - $invoices = Invoice::filter($filters); + // $invoices = Invoice::filter($filters); - return $this->listResponse($invoices); + return view('portal.default.invoices.index'); } diff --git a/composer.json b/composer.json index 6b19f983ece2..8aeee5dd5e75 100644 --- a/composer.json +++ b/composer.json @@ -39,7 +39,8 @@ "spatie/browsershot": "^3.29", "superbalist/laravel-google-cloud-storage": "^2.2", "webpatser/laravel-countries": "dev-master#75992ad", - "wildbit/postmark-php": "^2.6" + "wildbit/postmark-php": "^2.6", + "yajra/laravel-datatables-oracle": "~9.0" }, "require-dev": { "barryvdh/laravel-debugbar": "^3.2", diff --git a/resources/views/portal/default/header.blade.php b/resources/views/portal/default/header.blade.php index 36b83cac3871..e5d858ad9ab9 100644 --- a/resources/views/portal/default/header.blade.php +++ b/resources/views/portal/default/header.blade.php @@ -37,11 +37,11 @@ -