Fixes for self-installer (#3604)

* Fixes for self updater

* Fixes for self updater

* Fixes for self updater

* Fixes for self-updater

app/Console/Commands/ArtisanUpgrade.php

@@ -54,24 +54,6 @@ class ArtisanUpgrade extends Command
             \Log::error("I wasn't able to optimize.");
         }
 
-        // try {
-        //     Artisan::call('queue:restart');
-        // } catch (Exception $e) {
-        //     \Log::error("I wasn't able to restart the queue");
-        // }
-    
-        try {
-            /* Restart Horizon */
-            //Artisan::call('horizon:terminate');
-            
-            exec('cd '.base_path().' && /usr/bin/php artisan horizon:terminate');
-            exec('cd '.base_path().' && /usr/bin/php artisan horizon &');
-
-            //Artisan::call('horizon');
-        } catch (Exception $e) {
-            \Log::error("I wasn't able to start horizon");
-        }
-
         putenv('COMPOSER_HOME=' . __DIR__ . '/vendor/bin/composer');
         $input = new ArrayInput(array('command' => 'install'));
         $application = new Application();

app/Http/Controllers/ClientPortal/InvoiceController.php

@@ -21,7 +21,6 @@ use App\Models\Invoice;
 use App\Utils\Number;
 use App\Utils\Traits\MakesDates;
 use App\Utils\Traits\MakesHash;
-use Yajra\DataTables\Html\Builder;
 use ZipStream\Option\Archive;
 use ZipStream\ZipStream;
 use function GuzzleHttp\Promise\all;
@@ -44,7 +43,7 @@ class InvoiceController extends Controller
      * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
      * @throws \Exception
      */
-    public function index(InvoiceFilters $filters, Builder $builder)
+    public function index(InvoiceFilters $filters)
     {
         $invoices = auth()->user()->client->company->invoices()->paginate(10);
 

app/Http/Controllers/ClientPortal/PaymentController.php

@@ -21,10 +21,6 @@ use App\Utils\Traits\MakesDates;
 use App\Utils\Traits\MakesHash;
 use Cache;
 use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Log;
-use Yajra\DataTables\Facades\DataTables;
-use Yajra\DataTables\Html\Builder;
-
 /**
  * Class PaymentController
  * @package App\Http\Controllers\ClientPortal\PaymentController
@@ -39,11 +35,9 @@ class PaymentController extends Controller
      * Show the list of Invoices
      *
      * @param PaymentFilters $filters The filters
-     *
-     * @param Builder $builder
      * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
      */
-    public function index(PaymentFilters $filters, Builder $builder)
+    public function index(PaymentFilters $filters)
     {
         //$payments = Payment::filter($filters);
         $payments = Payment::with('type', 'client')->paginate(10);

app/Http/Controllers/ClientPortal/PaymentMethodController.php

@@ -17,8 +17,6 @@ use App\Http\Requests\ClientPortal\CreatePaymentMethodRequest;
 use App\Models\ClientGatewayToken;
 use App\Utils\Traits\MakesDates;
 use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Log;
-use Yajra\DataTables\Html\Builder;
 
 class PaymentMethodController extends Controller
 {
@@ -30,7 +28,7 @@ class PaymentMethodController extends Controller
      * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
      * @throws \Exception
      */
-    public function index(Builder $builder)
+    public function index()
     {
         $payment_methods = ClientGatewayToken::with('gateway_type')
             ->whereClientId(auth()->user()->client->id)

app/Http/Controllers/ClientPortal/RecurringInvoiceController.php

@@ -20,11 +20,8 @@ use App\Utils\Number;
 use App\Utils\Traits\MakesDates;
 use App\Utils\Traits\MakesHash;
 use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Facades\Mail;
 use Illuminate\Support\Facades\Notification;
-use Yajra\DataTables\Facades\DataTables;
-use Yajra\DataTables\Html\Builder;
 
 /**
  * Class InvoiceController
@@ -42,7 +39,7 @@ class RecurringInvoiceController extends Controller
      * @param Builder $builder
      * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
      */
-    public function index(Builder $builder)
+    public function index()
     {
         $invoices = RecurringInvoice::whereClientId(auth()->user()->client->id)
             ->whereIn('status_id', [RecurringInvoice::STATUS_PENDING, RecurringInvoice::STATUS_ACTIVE, RecurringInvoice::STATUS_COMPLETED])

composer.json

@@ -52,9 +52,7 @@
     "require-dev": {
         "laravelcollective/html": "^6",
         "wildbit/postmark-php": "^2.6",
-        "yajra/laravel-datatables-html": "^4.0",
         "anahkiasen/former": "^4.2",
-        "yajra/laravel-datatables-oracle": "~9.0",
         "barryvdh/laravel-debugbar": "^3.2",
         "beyondcode/laravel-dump-server": "^1.0",
         "darkaonline/l5-swagger": "^6.0",