Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-09 03:14:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5348 from turbo124/v5-stable

Browse Source 
v5.1.36
This commit is contained in:
David Bomba 2021-04-06 20:40:07 +10:00 committed by GitHub
commit 84c0fbc056
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION.txt
View File

@ -1 +1 @@
5.1.35 5.1.36

8
app/Mail/Admin/PaymentFailureObject.php
View File

@ -114,12 +114,12 @@ class PaymentFailureObject
$text = ''; $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; return $text;

1
app/Services/Subscription/SubscriptionService.php
View File

@ -124,7 +124,6 @@ class SubscriptionService
$response = $this->triggerWebhook($context); $response = $this->triggerWebhook($context);
} }
/* Starts the process to create a trial /* Starts the process to create a trial

2
config/ninja.php
View File

@ -14,7 +14,7 @@ return [
'require_https' => env('REQUIRE_HTTPS', true), 'require_https' => env('REQUIRE_HTTPS', true),
'app_url' => rtrim(env('APP_URL', ''), '/'), 'app_url' => rtrim(env('APP_URL', ''), '/'),
'app_domain' => env('APP_DOMAIN', ''), 'app_domain' => env('APP_DOMAIN', ''),
'app_version' => '5.1.35', 'app_version' => '5.1.36',
'minimum_client_version' => '5.0.16', 'minimum_client_version' => '5.0.16',
'terms_version' => '1.0.1', 'terms_version' => '1.0.1',
'api_secret' => env('API_SECRET', false), 'api_secret' => env('API_SECRET', false),

10
tests/Feature/Ninja/PlanTest.php
View File

@ -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);
}
} }