From 43c52ab75359274d6e95da4cbe78ba5e54bd9fe1 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Thu, 3 Jun 2021 15:47:09 +1000 Subject: [PATCH] Bug fixes --- app/Http/Controllers/ImportJsonController.php | 2 +- app/Http/Livewire/BillingPortalPurchase.php | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/ImportJsonController.php b/app/Http/Controllers/ImportJsonController.php index d6081c5a2d4b..73dcac41f943 100644 --- a/app/Http/Controllers/ImportJsonController.php +++ b/app/Http/Controllers/ImportJsonController.php @@ -56,7 +56,7 @@ class ImportJsonController extends BaseController * ), * ) */ - public function index(ImportJsonRequest $request) + public function import(ImportJsonRequest $request) { $import_file = $request->file('files'); diff --git a/app/Http/Livewire/BillingPortalPurchase.php b/app/Http/Livewire/BillingPortalPurchase.php index 9917921a854e..6b009b6cb361 100644 --- a/app/Http/Livewire/BillingPortalPurchase.php +++ b/app/Http/Livewire/BillingPortalPurchase.php @@ -349,7 +349,10 @@ class BillingPortalPurchase extends Component $is_eligible = $this->subscription->service()->isEligible($this->contact); - if (($is_eligible) || is_array($is_eligible) && $is_eligible['exception']['message'] != 'Success') { + if(is_bool($is_eligible)){ + + } + elseif (is_array($is_eligible) && $is_eligible['exception']['message'] != 'Success') { $this->steps['not_eligible'] = true; $this->steps['not_eligible_message'] = $is_eligible['exception']['message']; $this->steps['show_loading_bar'] = false;