From 69f6179e6a3451dac9617e58a297fa0df43a6a1e Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Tue, 6 Apr 2021 20:38:56 +1000
Subject: [PATCH] 5.1.36

---
 VERSION.txt                                       |  2 +-
 app/Mail/Admin/PaymentFailureObject.php           |  8 ++++----
 app/Services/Subscription/SubscriptionService.php |  1 -
 config/ninja.php                                  |  2 +-
 tests/Feature/Ninja/PlanTest.php                  | 10 ++++++++++
 5 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/VERSION.txt b/VERSION.txt
index ba7fe367e31c..9a45b61bfd27 100644
--- a/VERSION.txt
+++ b/VERSION.txt
@@ -1 +1 @@
-5.1.35
\ No newline at end of file
+5.1.36
\ No newline at end of file
diff --git a/app/Mail/Admin/PaymentFailureObject.php b/app/Mail/Admin/PaymentFailureObject.php
index 49ddfa4abe0c..3f5b4f7689fd 100644
--- a/app/Mail/Admin/PaymentFailureObject.php
+++ b/app/Mail/Admin/PaymentFailureObject.php
@@ -114,12 +114,12 @@ class PaymentFailureObject
 
         $text = '';
 
-        foreach($this->invoices as $invoice)
-        {
+        // foreach($this->invoices as $invoice)
+        // {
 
-            $text .= ctrans('texts.notification_invoice_payment_failed_subject', ['invoice' => $invoice->number]) . "\n";
+        //     $text .= ctrans('texts.notification_invoice_payment_failed_subject', ['invoice' => $invoice->number]) . "\n";
 
-        }
+        // }
 
         return $text;
 
diff --git a/app/Services/Subscription/SubscriptionService.php b/app/Services/Subscription/SubscriptionService.php
index aa2a47ac2ad9..bffc54e4799f 100644
--- a/app/Services/Subscription/SubscriptionService.php
+++ b/app/Services/Subscription/SubscriptionService.php
@@ -124,7 +124,6 @@ class SubscriptionService
 
         $response = $this->triggerWebhook($context);
 
-
     }
 
     /* Starts the process to create a trial 
diff --git a/config/ninja.php b/config/ninja.php
index 407fcb0b25de..e3ade7f52457 100644
--- a/config/ninja.php
+++ b/config/ninja.php
@@ -14,7 +14,7 @@ return [
     'require_https' => env('REQUIRE_HTTPS', true),
     'app_url' => rtrim(env('APP_URL', ''), '/'),
     'app_domain' => env('APP_DOMAIN', ''),
-    'app_version' => '5.1.35',
+    'app_version' => '5.1.36',
     'minimum_client_version' => '5.0.16',
     'terms_version' => '1.0.1',
     'api_secret' => env('API_SECRET', false),
diff --git a/tests/Feature/Ninja/PlanTest.php b/tests/Feature/Ninja/PlanTest.php
index c2e36583d535..1524500e8c72 100644
--- a/tests/Feature/Ninja/PlanTest.php
+++ b/tests/Feature/Ninja/PlanTest.php
@@ -61,5 +61,15 @@ class PlanTest extends TestCase
 
     }
 
+    public function testTrialFilter()
+    {
+        $plans = collect(['trial_pro','trial_enterprise','no_freebies']);
+
+        $filtered_plans = $plans->filter(function ($plan){
+                                return strpos($plan, 'trial_') !== false;
+                            });
+
+        $this->assertEquals($filtered_plans->count(), 2);
+    }
 
 }