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

Merge pull request #6258 from turbo124/v5-develop

Browse Source 
Minor Fixes
This commit is contained in:
David Bomba 2021-07-13 21:26:27 +10:00 committed by GitHub
commit e37129a449
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 11 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.2.11 5.2.12

10
app/Mail/SupportMessageSent.php
View File

@ -52,15 +52,19 @@ class SupportMessageSent extends Mailable
$account = auth()->user()->account; $account = auth()->user()->account;
$plan = $account->plan ?: 'Forever Free'; $priority = '';
$plan = $account->plan ?: '';
if(strlen($plan) >1)
$priority = '[PRIORITY] ';
$company = auth()->user()->company(); $company = auth()->user()->company();
$user = auth()->user(); $user = auth()->user();
if(Ninja::isHosted()) if(Ninja::isHosted())
$subject = "Hosted {$user->present()->name} - [{$plan} - {$company->db}]"; $subject = "{$priority}Hosted-{$company->db} :: Customer Support - [{$plan}]";
else else
$subject = "Self Host {$user->present()->name} - [{$plan} - {$company->db}]"; $subject = "{$priority}Self Hosted :: Customer Support - [{$plan}]";
return $this->from(config('mail.from.address'), $user->present()->name()) return $this->from(config('mail.from.address'), $user->present()->name())
->replyTo($user->email, $user->present()->name()) ->replyTo($user->email, $user->present()->name())

4
config/ninja.php
View File

@ -14,8 +14,8 @@ 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', 'invoicing.co'), 'app_domain' => env('APP_DOMAIN', 'invoicing.co'),
'app_version' => '5.2.11', 'app_version' => '5.2.12',
'app_tag' => '5.2.11', 'app_tag' => '5.2.12',
'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', ''), 'api_secret' => env('API_SECRET', ''),

2
resources/views/email/import/completed.blade.php
View File

@ -1,4 +1,4 @@
@component('email.template.admin', ['logo' => $logo, 'settings' => $settings, 'company' => $company ?? '']) @component('email.template.admin', ['logo' => 'https://www.invoiceninja.com/wp-content/uploads/2015/10/logo-white-horizontal-1.png', 'settings' => $settings, 'company' => $company ?? ''])
<div class="center"> <div class="center">
<h1>{{ ctrans('texts.import_complete') }}</h1> <h1>{{ ctrans('texts.import_complete') }}</h1>
<p>Hello, here is the output of your recent import job.</p> <p>Hello, here is the output of your recent import job.</p>