From c2e177e13b313a4ea83a579972a0e0676ca049d7 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Wed, 1 Feb 2023 08:43:32 +1100
Subject: [PATCH] Change error page for subscriptions where upgrade is not
 available

---
 app/Exceptions/Handler.php                    |  2 +-
 .../SubscriptionPlanSwitchController.php      |  5 +++++
 .../Subscriptions/ShowPlanSwitchRequest.php   | 20 ++++++++++++++++---
 app/Jobs/Util/WebhookSingle.php               |  2 +-
 resources/views/errors/guest.blade.php        |  4 ++--
 .../views/errors/illustrated-layout.blade.php |  7 +++----
 6 files changed, 29 insertions(+), 11 deletions(-)

diff --git a/app/Exceptions/Handler.php b/app/Exceptions/Handler.php
index 1d6676407a..f2d53abf67 100644
--- a/app/Exceptions/Handler.php
+++ b/app/Exceptions/Handler.php
@@ -222,7 +222,7 @@ class Handler extends ExceptionHandler
             return response()->json(['message'=>'Too many requests'], 429);
         // } elseif ($exception instanceof FatalThrowableError && $request->expectsJson()) {
         //     return response()->json(['message'=>'Fatal error'], 500); //@deprecated
-        } elseif ($exception instanceof AuthorizationException) {
+        } elseif ($exception instanceof AuthorizationException && $request->expectsJson()) {
             return response()->json(['message'=> $exception->getMessage()], 401);
         } elseif ($exception instanceof TokenMismatchException) {
             return redirect()
diff --git a/app/Http/Controllers/ClientPortal/SubscriptionPlanSwitchController.php b/app/Http/Controllers/ClientPortal/SubscriptionPlanSwitchController.php
index 3390512616..6fd26bbba7 100644
--- a/app/Http/Controllers/ClientPortal/SubscriptionPlanSwitchController.php
+++ b/app/Http/Controllers/ClientPortal/SubscriptionPlanSwitchController.php
@@ -55,4 +55,9 @@ class SubscriptionPlanSwitchController extends Controller
         ]);
         
     }
+
+    public function not_availabe()
+    {
+        abort(404, 'ewwo');
+    }
 }
diff --git a/app/Http/Requests/ClientPortal/Subscriptions/ShowPlanSwitchRequest.php b/app/Http/Requests/ClientPortal/Subscriptions/ShowPlanSwitchRequest.php
index a3fe7e8fb2..1a906018d8 100644
--- a/app/Http/Requests/ClientPortal/Subscriptions/ShowPlanSwitchRequest.php
+++ b/app/Http/Requests/ClientPortal/Subscriptions/ShowPlanSwitchRequest.php
@@ -1,14 +1,21 @@
 <?php
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2023. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://www.elastic.co/licensing/elastic-license
+ */
 
 namespace App\Http\Requests\ClientPortal\Subscriptions;
 
-use App\Models\Subscription;
-use App\Utils\Traits\MakesHash;
+use App\Exceptions\Ninja\ClientPortalAuthorizationException;
 use Illuminate\Foundation\Http\FormRequest;
 
 class ShowPlanSwitchRequest extends FormRequest
 {
-    use MakesHash;
 
     /**
      * Determine if the user is authorized to make this request.
@@ -31,4 +38,11 @@ class ShowPlanSwitchRequest extends FormRequest
             //
         ];
     }
+
+    protected function failedAuthorization()
+    {
+
+        throw new ClientPortalAuthorizationException('Unable to change plans due to a restriction on this product.', 400);
+
+    }
 }
diff --git a/app/Jobs/Util/WebhookSingle.php b/app/Jobs/Util/WebhookSingle.php
index 31cc4fbf74..ec13219d82 100644
--- a/app/Jobs/Util/WebhookSingle.php
+++ b/app/Jobs/Util/WebhookSingle.php
@@ -248,7 +248,7 @@ class WebhookSingle implements ShouldQueue
             return $this->entity->client;
         }
 
-        return false;
+        return null;
     }
 
     public function failed($exception = null)
diff --git a/resources/views/errors/guest.blade.php b/resources/views/errors/guest.blade.php
index 9df84c302c..0b2500ba83 100644
--- a/resources/views/errors/guest.blade.php
+++ b/resources/views/errors/guest.blade.php
@@ -1,5 +1,5 @@
 @extends('portal.ninja2020.layout.error')
 
-@section('title', __('Server Error'))
-@section('code', '500')
+@section('title', __($title) ?: 'Server Error')
+@section('code', __($code) ?: '500')
 @section('message', __($message) ?: 'System Error')
diff --git a/resources/views/errors/illustrated-layout.blade.php b/resources/views/errors/illustrated-layout.blade.php
index 3f81c6cae1..0c6eb3f087 100644
--- a/resources/views/errors/illustrated-layout.blade.php
+++ b/resources/views/errors/illustrated-layout.blade.php
@@ -481,11 +481,10 @@
                         @yield('message')
                     </p>
 
-                    <a href="{{ app('router')->has('home') ? route('home') : url('/') }}">
-                        <button class="bg-transparent text-grey-darkest font-bold uppercase tracking-wide py-3 px-6 border-2 border-grey-light hover:border-grey rounded-lg">
-                            {{ __('Go Home') }}
-                        </button>
+                    <a class="button-link text-sm mt-2" href="{{ url(request()->getSchemeAndHttpHost() . '/client') }}">
+                        {{ ctrans('texts.back_to', ['url' => parse_url(request()->getHttpHost())['host'] ?? request()->getHttpHost()]) }}
                     </a>
+
                 </div>
             </div>