From 0d9b40dcb68c40d26cdbed82166d08a01b6f5755 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Sun, 28 Jan 2024 11:05:50 +1100
Subject: [PATCH] Fixes for subscription switching

---
 .../SubscriptionPlanSwitchController.php         |  2 +-
 app/Livewire/SubscriptionPlanSwitch.php          |  1 -
 .../livewire/subscription-plan-switch.blade.php  | 16 +++++++++++-----
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/app/Http/Controllers/ClientPortal/SubscriptionPlanSwitchController.php b/app/Http/Controllers/ClientPortal/SubscriptionPlanSwitchController.php
index b616ee161746..d44666ad6704 100644
--- a/app/Http/Controllers/ClientPortal/SubscriptionPlanSwitchController.php
+++ b/app/Http/Controllers/ClientPortal/SubscriptionPlanSwitchController.php
@@ -54,6 +54,6 @@ class SubscriptionPlanSwitchController extends Controller
 
     public function not_availabe()
     {
-        abort(404, 'ewwo');
+        abort(404, 'Not Available');
     }
 }
diff --git a/app/Livewire/SubscriptionPlanSwitch.php b/app/Livewire/SubscriptionPlanSwitch.php
index be3fbb42fbee..a4518efe8453 100644
--- a/app/Livewire/SubscriptionPlanSwitch.php
+++ b/app/Livewire/SubscriptionPlanSwitch.php
@@ -155,7 +155,6 @@ class SubscriptionPlanSwitch extends Component
 
         $this->dispatch('redirectRoute', ['route' => $response]);
 
-        // return redirect($response);
     }
 
     public function render()
diff --git a/resources/views/portal/ninja2020/components/livewire/subscription-plan-switch.blade.php b/resources/views/portal/ninja2020/components/livewire/subscription-plan-switch.blade.php
index 8d3c0301d58b..c1be68fc7043 100644
--- a/resources/views/portal/ninja2020/components/livewire/subscription-plan-switch.blade.php
+++ b/resources/views/portal/ninja2020/components/livewire/subscription-plan-switch.blade.php
@@ -42,7 +42,7 @@
                 @if(!$state['payment_initialised'])
                     @foreach($this->methods as $method)
                         <button
-                            wire:click="handleMethodSelectingEvent('{{ $method['company_gateway_id'] }}', '{{ $method['gateway_type_id'] }}')"
+                            wire:click="handleMethodSelectingEvent('{{ $method['company_gateway_id'] }}', '{{ $method['gateway_type_id'] }}'); $wire.$refresh();"
                             class="px-3 py-2 border bg-white rounded mr-4 hover:border-blue-600">
                             {{ $method['label'] }}
                         </button>
@@ -80,11 +80,17 @@
     </div>
 </div>
 
-<script defer>
-window.addEventListener('redirectRoute', event => {
+<script>
 
-    window.location.href = event.detail.route;
+    document.addEventListener('livewire:init', () => {
+
+        Livewire.on('redirectRoute', (event) => {
+            window.location.href = event[0].route;
+        });
+
+
+    });
 
-})
 </script>
+
 </div>
\ No newline at end of file