diff --git a/app/.env b/app/.env
index 2002315..1c053c8 100644
--- a/app/.env
+++ b/app/.env
@@ -1 +1 @@
-VUE_APP_WAXIOS_URL=https://taskmanager.internal.studiotem.com/api/
\ No newline at end of file
+VUE_APP_WAXIOS_URL=https://tm.jandl.sk/api/
diff --git a/be/app/Listeners/SendEditedSubTaskNotification.php b/be/app/Listeners/SendEditedSubTaskNotification.php
index 503900a..8410633 100644
--- a/be/app/Listeners/SendEditedSubTaskNotification.php
+++ b/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 {
diff --git a/be/app/Mail/NewTask.php b/be/app/Mail/NewTask.php
index 40777b0..4a5c00a 100644
--- a/be/app/Mail/NewTask.php
+++ b/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',
);
}
diff --git a/be/resources/views/emails/task/sub_task_created.blade.php b/be/resources/views/emails/task/sub_task_created.blade.php
index 63d64d6..ce9a0b5 100644
--- a/be/resources/views/emails/task/sub_task_created.blade.php
+++ b/be/resources/views/emails/task/sub_task_created.blade.php
@@ -1,12 +1,13 @@
Task založil: {{($creator) ? $creator->firstname . ' ' . $creator->lastname : ''}}
Job number: {{$subtask->mastertask->project->code}}
Názov Tasku: {{($subtask->title) ?: $subtask->mastertask->title}}
-Deadline do: {{($subtask->deadline) ?: $subtask->mastertask->deadline}}
+Deadline do: {{($subtask->deadline) ?: $subtask->mastertask->deadline}}
Ľudia v Master Tasku:
@foreach($usersInMasterTask as $key => $user)
{{ $user->firstname }} {{ $user->lastname }}
@endforeach
+
Odkaz na Task: {{ url( env( 'APP_URL_FE' ) . '/#/app/dashboard/tasks?subtask=' . $subtask->id) }}
Popis: {!!($subtask->description) ?: $subtask->mastertask->description !!}