From a7a76e806cd1b052a809aab6af7dc0e4b16b2dda Mon Sep 17 00:00:00 2001 From: David Bomba Date: Thu, 30 Sep 2021 08:13:48 +1000 Subject: [PATCH] Minor fixes --- app/Http/Controllers/BaseController.php | 2 ++ .../Support/Messages/SendingController.php | 2 +- app/Mail/SupportMessageSent.php | 16 +++++++++------- app/Transformers/RecurringExpenseTransformer.php | 1 + app/Transformers/RecurringInvoiceTransformer.php | 2 +- app/Utils/HtmlEngine.php | 2 ++ resources/views/index/index.blade.php | 2 +- 7 files changed, 17 insertions(+), 10 deletions(-) diff --git a/app/Http/Controllers/BaseController.php b/app/Http/Controllers/BaseController.php index 2da7852bed65..d5df45487874 100644 --- a/app/Http/Controllers/BaseController.php +++ b/app/Http/Controllers/BaseController.php @@ -746,6 +746,8 @@ class BaseController extends Controller //pass referral code to front end $data['rc'] = request()->has('rc') ? request()->input('rc') : ''; $data['build'] = request()->has('build') ? request()->input('build') : ''; + $data['login'] = request()->has('login') ? request()->input('login') : "false"; + $data['user_agent'] = request()->server('HTTP_USER_AGENT'); $data['path'] = $this->setBuild(); diff --git a/app/Http/Controllers/Support/Messages/SendingController.php b/app/Http/Controllers/Support/Messages/SendingController.php index 62baf5eacde4..38082d581e56 100644 --- a/app/Http/Controllers/Support/Messages/SendingController.php +++ b/app/Http/Controllers/Support/Messages/SendingController.php @@ -76,7 +76,7 @@ class SendingController extends Controller } Mail::to(config('ninja.contact.ninja_official_contact')) - ->send(new SupportMessageSent($request->input('message'), $send_logs)); + ->send(new SupportMessageSent($request->all(), $send_logs)); return response()->json([ 'success' => true, diff --git a/app/Mail/SupportMessageSent.php b/app/Mail/SupportMessageSent.php index ec371fc919e1..b326ba45086d 100644 --- a/app/Mail/SupportMessageSent.php +++ b/app/Mail/SupportMessageSent.php @@ -13,13 +13,13 @@ class SupportMessageSent extends Mailable { // use Queueable, SerializesModels; - public $support_message; + public $data; public $send_logs; - public function __construct($support_message, $send_logs) + public function __construct(array $data, $send_logs) { - $this->support_message = $support_message; + $this->data = $data; $this->send_logs = $send_logs; } @@ -63,17 +63,19 @@ class SupportMessageSent extends Mailable $user = auth()->user(); $db = str_replace("db-ninja-", "", $company->db); $is_large = $company->is_large ? "L" : "S"; - + $platform = array_key_exists('platform', $this->data) ? $this->data['platform'] : "U"; + $migrated = strlen($company->company_key) == 32 ? "M" : ""; + if(Ninja::isHosted()) - $subject = "{$priority}Hosted-{$db}-{$is_large} :: {$plan} :: ".date('M jS, g:ia'); + $subject = "{$priority}Hosted-{$db}-{$is_large}{$platform}{$migrated} :: {$plan} :: ".date('M jS, g:ia'); else - $subject = "{$priority}Self Hosted :: {$plan} :: ".date('M jS, g:ia'); + $subject = "{$priority}Self Hosted :: {$plan}{$platform} :: ".date('M jS, g:ia'); return $this->from(config('mail.from.address'), $user->present()->name()) ->replyTo($user->email, $user->present()->name()) ->subject($subject) ->view('email.support.message', [ - 'support_message' => $this->support_message, + 'support_message' => $this->data['support_message'], 'system_info' => $system_info, 'laravel_log' => $log_lines, 'logo' => $company->present()->logo(), diff --git a/app/Transformers/RecurringExpenseTransformer.php b/app/Transformers/RecurringExpenseTransformer.php index 6332e4535aa1..c7b59a795e7c 100644 --- a/app/Transformers/RecurringExpenseTransformer.php +++ b/app/Transformers/RecurringExpenseTransformer.php @@ -101,6 +101,7 @@ class RecurringExpenseTransformer extends EntityTransformer 'remaining_cycles' => (int) $recurring_expense->remaining_cycles, 'last_sent_date' => $recurring_expense->last_sent_date ?: '', 'next_send_date' => $recurring_expense->next_send_date ?: '', + 'recurring_dates' => (array) [], ]; if(request()->has('show_dates') && request()->query('show_dates') == 'true') diff --git a/app/Transformers/RecurringInvoiceTransformer.php b/app/Transformers/RecurringInvoiceTransformer.php index a845e447c105..ce55314599cf 100644 --- a/app/Transformers/RecurringInvoiceTransformer.php +++ b/app/Transformers/RecurringInvoiceTransformer.php @@ -127,7 +127,7 @@ class RecurringInvoiceTransformer extends EntityTransformer 'due_date_days' => (string) $invoice->due_date_days ?: '', 'paid_to_date' => (float) $invoice->paid_to_date, 'subscription_id' => (string)$this->encodePrimaryKey($invoice->subscription_id), - + 'recurring_dates' => (array) [], ]; diff --git a/app/Utils/HtmlEngine.php b/app/Utils/HtmlEngine.php index 808c7b5a3e9e..713dacd71cbb 100644 --- a/app/Utils/HtmlEngine.php +++ b/app/Utils/HtmlEngine.php @@ -158,6 +158,7 @@ class HtmlEngine $data['$view_link'] = ['value' => ''.ctrans('texts.view_quote').'', 'label' => ctrans('texts.view_quote')]; $data['$viewLink'] = &$data['$view_link']; $data['$viewButton'] = &$data['$view_link']; + $data['$view_button'] = &$data['$view_link']; $data['$approveButton'] = ['value' => ''.ctrans('texts.view_quote').'', 'label' => ctrans('texts.approve')]; $data['$view_url'] = ['value' => $this->invitation->getLink(), 'label' => ctrans('texts.view_quote')]; $data['$date'] = ['value' => $this->translateDate($this->entity->date, $this->entity->client->date_format(), $this->entity->client->locale()) ?: ' ', 'label' => ctrans('texts.quote_date')]; @@ -171,6 +172,7 @@ class HtmlEngine $data['$terms'] = &$data['$entity.terms']; $data['$view_link'] = ['value' => ''.ctrans('texts.view_credit').'', 'label' => ctrans('texts.view_credit')]; $data['$viewButton'] = &$data['$view_link']; + $data['$view_button'] = &$data['$view_link']; $data['$viewLink'] = &$data['$view_link']; $data['$view_url'] = ['value' => $this->invitation->getLink(), 'label' => ctrans('texts.view_credit')]; // $data['$view_link'] = ['value' => $this->invitation->getLink(), 'label' => ctrans('texts.view_credit')]; diff --git a/resources/views/index/index.blade.php b/resources/views/index/index.blade.php index bf4de0c63056..2ec7fc0ff4e3 100644 --- a/resources/views/index/index.blade.php +++ b/resources/views/index/index.blade.php @@ -1,5 +1,5 @@ - +