From fc444b7c393ddbe4e9d3fa186a99f70a19b801fb Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Wed, 2 Jun 2021 18:55:33 +1000
Subject: [PATCH] Fixes for billing portal

---
 app/Http/Livewire/BillingPortalPurchase.php       | 7 +++++--
 app/Http/Middleware/VerifyCsrfToken.php           | 2 +-
 app/Services/Subscription/SubscriptionService.php | 4 ++--
 config/livewire.php                               | 3 +--
 config/ninja.php                                  | 1 +
 5 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/app/Http/Livewire/BillingPortalPurchase.php b/app/Http/Livewire/BillingPortalPurchase.php
index 4afb18dc6082..e327e177ff67 100644
--- a/app/Http/Livewire/BillingPortalPurchase.php
+++ b/app/Http/Livewire/BillingPortalPurchase.php
@@ -339,7 +339,7 @@ class BillingPortalPurchase extends Component
 
         $is_eligible = $this->subscription->service()->isEligible($this->contact);
 
-        if (is_array($is_eligible) && $is_eligible['exception']['message'] != 'Success') {
+        if (($is_eligible) || 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;
@@ -378,8 +378,11 @@ class BillingPortalPurchase extends Component
     {
 
         $is_eligible = $this->subscription->service()->isEligible($this->contact);
+        
+        if($is_eligible){
 
-        if ($is_eligible['status_code'] != 200) {
+        }
+        elseif ($is_eligible['status_code'] != 200) {
             $this->steps['not_eligible'] = true;
             $this->steps['not_eligible_message'] = $is_eligible['exception']['message'];
             $this->steps['show_loading_bar'] = false;
diff --git a/app/Http/Middleware/VerifyCsrfToken.php b/app/Http/Middleware/VerifyCsrfToken.php
index 121074f3c9b2..84ebee3c064d 100644
--- a/app/Http/Middleware/VerifyCsrfToken.php
+++ b/app/Http/Middleware/VerifyCsrfToken.php
@@ -28,6 +28,6 @@ class VerifyCsrfToken extends Middleware
      * @var array
      */
     protected $except = [
-        'livewire/message/*'
+        // 'livewire/message/*'
     ];
 }
diff --git a/app/Services/Subscription/SubscriptionService.php b/app/Services/Subscription/SubscriptionService.php
index 1342672b1042..4fdd3bf23ab7 100644
--- a/app/Services/Subscription/SubscriptionService.php
+++ b/app/Services/Subscription/SubscriptionService.php
@@ -317,7 +317,7 @@ class SubscriptionService
 
         $days_in_frequency = $this->getDaysInFrequency();
 
-        nlog("days to charge = {$days_to_charge} fays in frequency = {$days_in_frequency}");
+        nlog("days to charge = {$days_to_charge} days in frequency = {$days_in_frequency}");
 
         $pro_rata_charge = round(($days_to_charge/$days_in_frequency) * $invoice->amount ,2);
 
@@ -631,7 +631,7 @@ class SubscriptionService
     public function triggerWebhook($context)
     {
         if (empty($this->subscription->webhook_configuration['post_purchase_url']) || empty($this->subscription->webhook_configuration['post_purchase_rest_method'])) {
-            return true;
+            return ['status_code' => 200];
         }
 
         $response = false;
diff --git a/config/livewire.php b/config/livewire.php
index d6b715dc2b9b..ac2afd93a4bc 100644
--- a/config/livewire.php
+++ b/config/livewire.php
@@ -54,9 +54,8 @@ return [
     |
     */
 
-    //'asset_url' => env('ASSETS_URL', config('app.url')),
+    'asset_url' => env('ASSETS_URL', config('app.url')),
 
-     'asset_url' => '',
     /*
     |--------------------------------------------------------------------------
     | Livewire Endpoint Middleware Group
diff --git a/config/ninja.php b/config/ninja.php
index 8d1e540f642d..ccc31b9721a9 100644
--- a/config/ninja.php
+++ b/config/ninja.php
@@ -152,6 +152,7 @@ return [
     'ninja_stripe_client_id' => env('NINJA_STRIPE_CLIENT_ID', null),
     'ninja_default_company_id' => env('NINJA_COMPANY_ID', null),
     'ninja_default_company_gateway_id' => env('NINJA_COMPANY_GATEWAY_ID', null),
+    'ninja_hosted_secret' => env('NINJA_HOSTED_SECRET', null),
     'pdf_generator' => env('PDF_GENERATOR', false),
     'internal_queue_enabled' => env('INTERNAL_QUEUE_ENABLED', true),
 ];