Enabled modules RecurringInvoiceController.php

app/Http/Controllers/ClientPortal/RecurringInvoiceController.php

@@ -12,7 +12,9 @@
 namespace App\Http\Controllers\ClientPortal;
 
 use App\Http\Controllers\Controller;
-use App\Http\Requests\ClientPortal\ShowRecurringInvoiceRequest;
+use App\Http\Requests\ClientPortal\RecurringInvoices\RequestCancellationRequest;
+use App\Http\Requests\ClientPortal\RecurringInvoices\ShowRecurringInvoicesRequest;
+use App\Http\Requests\ClientPortal\RecurringInvoices\ShowRecurringInvoiceRequest;
 use App\Jobs\Mail\NinjaMailer;
 use App\Jobs\Mail\NinjaMailerJob;
 use App\Jobs\Mail\NinjaMailerObject;
@@ -23,7 +25,6 @@ use App\Utils\Traits\MakesDates;
 use App\Utils\Traits\MakesHash;
 use App\Utils\Traits\Notifications\UserNotifies;
 use Illuminate\Contracts\View\Factory;
-use Illuminate\Http\Request;
 use Illuminate\View\View;
 
 /**
@@ -40,7 +41,7 @@ class RecurringInvoiceController extends Controller
      *
      * @return Factory|View
      */
-    public function index()
+    public function index(ShowRecurringInvoicesRequest $request)
     {
         return $this->render('recurring_invoices.index');
     }
@@ -59,7 +60,7 @@ class RecurringInvoiceController extends Controller
         ]);
     }
 
-    public function requestCancellation(Request $request, RecurringInvoice $recurring_invoice)
+    public function requestCancellation(RequestCancellationRequest $request, RecurringInvoice $recurring_invoice)
     {
         if (is_null($recurring_invoice->subscription_id) || optional($recurring_invoice->subscription)->allow_cancellation) {
             $nmo = new NinjaMailerObject;

app/Http/Requests/ClientPortal/RecurringInvoices/RequestCancellationRequest.php

@@ -0,0 +1,21 @@
+<?php
+
+namespace App\Http\Requests\ClientPortal\RecurringInvoices;
+
+use App\Http\ViewComposers\PortalComposer;
+use Illuminate\Foundation\Http\FormRequest;
+
+class RequestCancellationRequest extends FormRequest
+{
+    public function authorize()
+    {
+        return auth('contact')->user()->company->enabled_modules & PortalComposer::MODULE_RECURRING_INVOICES;
+    }
+
+    public function rules()
+    {
+        return [
+            //
+        ];
+    }
+}

app/Http/Requests/ClientPortal/RecurringInvoices/ShowRecurringInvoiceRequest.php

@@ -9,19 +9,23 @@
  * @license https://www.elastic.co/licensing/elastic-license
  */
 
-namespace App\Http\Requests\ClientPortal;
+namespace App\Http\Requests\ClientPortal\RecurringInvoices;
 
 use App\Http\Requests\Request;
+use App\Http\ViewComposers\PortalComposer;
 
 class ShowRecurringInvoiceRequest extends Request
 {
-    /**
-     * Determine if the user is authorized to make this request.
-     *
-     * @return bool
-     */
     public function authorize() : bool
     {
-        return auth()->user()->client->id === $this->recurring_invoice->client_id;
+        return auth('contact')->user()->client->id === $this->recurring_invoice->client_id
+            && auth('contact')->user()->company->enabled_modules & PortalComposer::MODULE_RECURRING_INVOICES;
+    }
+
+    public function rules()
+    {
+        return [
+            //
+        ];
     }
 }

app/Http/Requests/ClientPortal/RecurringInvoices/ShowRecurringInvoicesRequest.php

@@ -0,0 +1,31 @@
+<?php
+
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
+
+namespace App\Http\Requests\ClientPortal\RecurringInvoices;
+
+use App\Http\ViewComposers\PortalComposer;
+use Illuminate\Foundation\Http\FormRequest;
+
+class ShowRecurringInvoicesRequest extends FormRequest
+{
+    public function authorize()
+    {
+        return auth('contact')->user()->company->enabled_modules & PortalComposer::MODULE_RECURRING_INVOICES;
+    }
+
+    public function rules()
+    {
+        return [
+            //
+        ];
+    }
+}