From f07980f27c3b2de49787c3c2b053a4e360fafb91 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Tue, 13 Jul 2021 21:06:19 +1000 Subject: [PATCH 1/2] Minor Fixes --- VERSION.txt | 2 +- config/ninja.php | 4 ++-- resources/views/email/import/completed.blade.php | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/VERSION.txt b/VERSION.txt index 7ef7e8d8c41c..1567ea7db232 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1 +1 @@ -5.2.11 \ No newline at end of file +5.2.12 \ No newline at end of file diff --git a/config/ninja.php b/config/ninja.php index 6e31749390e2..8d2e235be7e0 100644 --- a/config/ninja.php +++ b/config/ninja.php @@ -14,8 +14,8 @@ return [ 'require_https' => env('REQUIRE_HTTPS', true), 'app_url' => rtrim(env('APP_URL', ''), '/'), 'app_domain' => env('APP_DOMAIN', 'invoicing.co'), - 'app_version' => '5.2.11', - 'app_tag' => '5.2.11', + 'app_version' => '5.2.12', + 'app_tag' => '5.2.12', 'minimum_client_version' => '5.0.16', 'terms_version' => '1.0.1', 'api_secret' => env('API_SECRET', ''), diff --git a/resources/views/email/import/completed.blade.php b/resources/views/email/import/completed.blade.php index acefb2c17802..58bf01c4382d 100644 --- a/resources/views/email/import/completed.blade.php +++ b/resources/views/email/import/completed.blade.php @@ -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 ?? ''])

{{ ctrans('texts.import_complete') }}

Hello, here is the output of your recent import job.

From 293a18761863bdcb7ea4acf6c76578f15a4efe2e Mon Sep 17 00:00:00 2001 From: David Bomba Date: Tue, 13 Jul 2021 21:25:17 +1000 Subject: [PATCH 2/2] Fixes for support messages --- app/Mail/SupportMessageSent.php | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/app/Mail/SupportMessageSent.php b/app/Mail/SupportMessageSent.php index db5c7f6bb2c4..0f0cf099d7c5 100644 --- a/app/Mail/SupportMessageSent.php +++ b/app/Mail/SupportMessageSent.php @@ -52,15 +52,19 @@ class SupportMessageSent extends Mailable $account = auth()->user()->account; - $plan = $account->plan ?: 'Forever Free'; + $priority = ''; + $plan = $account->plan ?: ''; + + if(strlen($plan) >1) + $priority = '[PRIORITY] '; $company = auth()->user()->company(); $user = auth()->user(); if(Ninja::isHosted()) - $subject = "Hosted {$user->present()->name} - [{$plan} - {$company->db}]"; + $subject = "{$priority}Hosted-{$company->db} :: Customer Support - [{$plan}]"; 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()) ->replyTo($user->email, $user->present()->name())