Merge branch 'production' of https://bitbucket.org/studiotem/jandl-taskmanager-app into production

app/.env

@@ -1 +1 @@
-VUE_APP_WAXIOS_URL=https://taskmanager.internal.studiotem.com/api/
+VUE_APP_WAXIOS_URL=https://tm.jandl.sk/api/

be/app/Listeners/SendEditedSubTaskNotification.php

@@ -67,7 +67,7 @@ class SendEditedSubTaskNotification implements ShouldQueue
             }
 
             // aby nechodilo "Updated by: 63"
-            if ($key == 'updated_by' && $diff == 1) {
+            if ($key == 'updated_by') {
                 $user =  User::find($diff);
                 $difference[$key] = ($user) ? $user->firstname . ' ' . $user->lastname : '';
             } else {

be/app/Mail/NewTask.php

@@ -46,7 +46,7 @@ class NewTask extends Mailable
             replyTo: [
                 new Address($this->creator->email, ($this->creator) ? $this->creator->firstname . ' ' . $this->creator->lastname : ''),
             ],
-            subject: $this->subtask->mastertask->project->code . ' ' . $this->subtask->mastertask->project->code . ' - vytvorený Sub Task',
+            subject: $this->subtask->mastertask->project->code . ' ' . $this->subtask->mastertask->project->name . ' - vytvorený Sub Task',
         );
     }
 

be/resources/views/emails/task/sub_task_created.blade.php

@@ -1,12 +1,13 @@
 Task založil: {{($creator) ? $creator->firstname . ' ' . $creator->lastname : ''}} <br>
 Job number: {{$subtask->mastertask->project->code}} <br>
 Názov Tasku: {{($subtask->title) ?: $subtask->mastertask->title}} <br>
-Deadline do: {{($subtask->deadline) ?: $subtask->mastertask->deadline}} <br>
+Deadline do: {{($subtask->deadline) ?: $subtask->mastertask->deadline}} <br> <br>
 Ľudia v Master Tasku: <br>
 
 @foreach($usersInMasterTask as $key => $user)
     {{ $user->firstname }} {{ $user->lastname }} <br>
 @endforeach
+<br>
 
 Odkaz na Task: {{ url( env( 'APP_URL_FE' ) . '/#/app/dashboard/tasks?subtask=' . $subtask->id) }} <br><br>
 Popis: {!!($subtask->description) ?: $subtask->mastertask->description !!} <br>