From f0115de25c5902106b7a32048c474a6177164967 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Munsch?= Date: Tue, 28 Sep 2021 10:52:14 +0200 Subject: [PATCH 1/4] Fix ticket message.user on ticket.show --- resources/views/ticket/show.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/ticket/show.blade.php b/resources/views/ticket/show.blade.php index 77c3c69..6b562e9 100644 --- a/resources/views/ticket/show.blade.php +++ b/resources/views/ticket/show.blade.php @@ -105,7 +105,7 @@ @if ($message->file !== null)
Ouvrir la pièce jointe
@endif

- Le {{ \Carbon\Carbon::parse($message->created_at)->format('d/m/Y à H:i')}} par {{ $ticket->user ? $ticket->user->name : __('Utilisateur supprimé') }} + Le {{ \Carbon\Carbon::parse($message->created_at)->format('d/m/Y à H:i')}} par {{ $message->user ? $message->user->name : __('Utilisateur supprimé') }} @endif @endforeach From db4d33211ad3851813300fe8c18e6b937f5e1c4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Munsch?= Date: Tue, 28 Sep 2021 10:52:53 +0200 Subject: [PATCH 2/4] Ticket 320 fix --- app/Models/User.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Models/User.php b/app/Models/User.php index bcaff45..0776c47 100644 --- a/app/Models/User.php +++ b/app/Models/User.php @@ -127,7 +127,7 @@ class User extends Authenticatable ] ], 'sites' => [ - 'label' => trans('Projets'), + 'label' => trans('Sites'), 'type' => CrudType::belongsToMany(), 'belongsToMany' => Site::class, 'belongsToManyLabel' => 'name', From 1766f538279cd3ff13e6e142b92b051d03647a59 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Munsch?= Date: Tue, 28 Sep 2021 10:54:54 +0200 Subject: [PATCH 3/4] Ticket Controller remove duplicated soce on sticket store with model event --- app/Http/Controllers/TicketController.php | 4 ---- 1 file changed, 4 deletions(-) diff --git a/app/Http/Controllers/TicketController.php b/app/Http/Controllers/TicketController.php index bf57618..6e96c46 100644 --- a/app/Http/Controllers/TicketController.php +++ b/app/Http/Controllers/TicketController.php @@ -165,10 +165,6 @@ class TicketController extends Controller $ticket->file2 = Ticket::saveFile($site, $ticket, $ticket->type, $request->file_ticket2); } - if ($request->type === TicketType::evolution()) { - $ticket->status = TicketStatus::estimateTodo(); - } - $ticket->user()->associate(auth()->user()); $ticket->saveOrFail(); /** @var \App\Models\User */ From 71933e27a8b3ef2e6052877e2b6740353fd61621 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Munsch?= Date: Tue, 28 Sep 2021 11:37:20 +0200 Subject: [PATCH 4/4] phpcbf pass --- app/Console/Commands/CreateUser.php | 2 -- app/Http/Middleware/IsAdmin.php | 1 - app/Http/Requests/ChangeTicketStatus.php | 1 - app/Http/Requests/CreateMessage.php | 1 - app/Http/Requests/StoreTicket.php | 1 - app/Http/Requests/UpdateTicket.php | 3 --- app/Listeners/SendNotificationMailToTicketCreator.php | 3 --- app/Listeners/SendSubscriptionsNotificationsMail.php | 2 -- app/Mail/NewTicket.php | 1 - app/Mail/TicketUpdate.php | 1 - app/Policies/TicketPolicy.php | 3 --- app/Providers/EventServiceProvider.php | 1 - routes/web.php | 1 - tests/Feature/ExampleTest.php | 1 - 14 files changed, 22 deletions(-) diff --git a/app/Console/Commands/CreateUser.php b/app/Console/Commands/CreateUser.php index b2f2617..d06c319 100644 --- a/app/Console/Commands/CreateUser.php +++ b/app/Console/Commands/CreateUser.php @@ -3,10 +3,8 @@ namespace App\Console\Commands; use App\Enums\Role; -use App\Models\Site; use App\Models\User; use Illuminate\Console\Command; -use Illuminate\Database\Eloquent\ModelNotFoundException; use Illuminate\Support\Facades\Hash; class CreateUser extends Command diff --git a/app/Http/Middleware/IsAdmin.php b/app/Http/Middleware/IsAdmin.php index 138af08..e53ae9d 100644 --- a/app/Http/Middleware/IsAdmin.php +++ b/app/Http/Middleware/IsAdmin.php @@ -2,7 +2,6 @@ namespace App\Http\Middleware; -use App\Enums\Role; use Closure; use Illuminate\Http\Request; diff --git a/app/Http/Requests/ChangeTicketStatus.php b/app/Http/Requests/ChangeTicketStatus.php index d60fdc4..ec925ad 100644 --- a/app/Http/Requests/ChangeTicketStatus.php +++ b/app/Http/Requests/ChangeTicketStatus.php @@ -2,7 +2,6 @@ namespace App\Http\Requests; -use App\Enums\Role; use App\Enums\TicketStatus; use Illuminate\Foundation\Http\FormRequest; diff --git a/app/Http/Requests/CreateMessage.php b/app/Http/Requests/CreateMessage.php index 71b5086..68c443a 100644 --- a/app/Http/Requests/CreateMessage.php +++ b/app/Http/Requests/CreateMessage.php @@ -2,7 +2,6 @@ namespace App\Http\Requests; -use App\Enums\Role; use Illuminate\Foundation\Http\FormRequest; class CreateMessage extends FormRequest diff --git a/app/Http/Requests/StoreTicket.php b/app/Http/Requests/StoreTicket.php index 7ea4ea8..0ca9d21 100644 --- a/app/Http/Requests/StoreTicket.php +++ b/app/Http/Requests/StoreTicket.php @@ -2,7 +2,6 @@ namespace App\Http\Requests; -use App\Enums\Role; use App\Enums\TicketStatus; use App\Enums\TicketType; use Illuminate\Foundation\Http\FormRequest; diff --git a/app/Http/Requests/UpdateTicket.php b/app/Http/Requests/UpdateTicket.php index 0833698..0ec1413 100644 --- a/app/Http/Requests/UpdateTicket.php +++ b/app/Http/Requests/UpdateTicket.php @@ -2,9 +2,6 @@ namespace App\Http\Requests; -use App\Enums\Role; -use App\Enums\TicketStatus; - class UpdateTicket extends StoreTicket { public function authorize() diff --git a/app/Listeners/SendNotificationMailToTicketCreator.php b/app/Listeners/SendNotificationMailToTicketCreator.php index b7089bb..fc8c7a3 100644 --- a/app/Listeners/SendNotificationMailToTicketCreator.php +++ b/app/Listeners/SendNotificationMailToTicketCreator.php @@ -4,9 +4,6 @@ namespace App\Listeners; use App\Events\NotifyTicketCreator; use App\Mail\TicketUpdate; -use Illuminate\Contracts\Queue\ShouldQueue; -use Illuminate\Queue\InteractsWithQueue; -use Illuminate\Support\Facades\Auth; use Illuminate\Support\Facades\Mail; class SendNotificationMailToTicketCreator diff --git a/app/Listeners/SendSubscriptionsNotificationsMail.php b/app/Listeners/SendSubscriptionsNotificationsMail.php index 00fecff..fe5d622 100644 --- a/app/Listeners/SendSubscriptionsNotificationsMail.php +++ b/app/Listeners/SendSubscriptionsNotificationsMail.php @@ -4,8 +4,6 @@ namespace App\Listeners; use App\Events\NotifySubscriptions; use App\Mail\TicketUpdate; -use Illuminate\Contracts\Queue\ShouldQueue; -use Illuminate\Queue\InteractsWithQueue; use Illuminate\Support\Facades\Auth; use Illuminate\Support\Facades\Mail; diff --git a/app/Mail/NewTicket.php b/app/Mail/NewTicket.php index 1188e29..4ed5640 100644 --- a/app/Mail/NewTicket.php +++ b/app/Mail/NewTicket.php @@ -3,7 +3,6 @@ namespace App\Mail; use Illuminate\Bus\Queueable; -use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Mail\Mailable; use Illuminate\Queue\SerializesModels; diff --git a/app/Mail/TicketUpdate.php b/app/Mail/TicketUpdate.php index 253647c..8d7db72 100644 --- a/app/Mail/TicketUpdate.php +++ b/app/Mail/TicketUpdate.php @@ -5,7 +5,6 @@ namespace App\Mail; use App\Lib\Utils; use App\Models\Ticket; use Illuminate\Bus\Queueable; -use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Mail\Mailable; use Illuminate\Queue\SerializesModels; diff --git a/app/Policies/TicketPolicy.php b/app/Policies/TicketPolicy.php index a101e33..7c81f8c 100644 --- a/app/Policies/TicketPolicy.php +++ b/app/Policies/TicketPolicy.php @@ -2,14 +2,11 @@ namespace App\Policies; -use App\Enums\TicketStatus; -use App\Models\Ticket; use App\Models\User; use App\Policies\Rules\SiteStaticRules as SSR; use App\Policies\Rules\TicketStaticRules; use App\Policies\Rules\UserRoleRules as URR; use Illuminate\Auth\Access\HandlesAuthorization; -use Illuminate\Auth\Access\Response; use Illuminate\Database\Eloquent\Model; use Kwaadpepper\CrudPolicies\Policies\RootPolicy; use Kwaadpepper\CrudPolicies\Policies\Rules\StaticRules; diff --git a/app/Providers/EventServiceProvider.php b/app/Providers/EventServiceProvider.php index 977db88..d9d8aef 100644 --- a/app/Providers/EventServiceProvider.php +++ b/app/Providers/EventServiceProvider.php @@ -10,7 +10,6 @@ use App\Events\SiteUpdated; use App\Events\TicketStatusChanged; use App\Listeners\AddStatusMessages; use App\Listeners\HandleLoggable; -use App\Listeners\SendNotificationMail; use App\Listeners\SendNotificationMailToTicketCreator; use App\Listeners\SendSubscriptionsNotificationsMail; use Illuminate\Auth\Events\Registered; diff --git a/routes/web.php b/routes/web.php index 3659ffb..54307d3 100644 --- a/routes/web.php +++ b/routes/web.php @@ -3,7 +3,6 @@ use App\Http\Controllers\FileController; use App\Http\Controllers\HomeController; use App\Http\Controllers\LogController; -use App\Http\Controllers\LoginController; use App\Http\Controllers\ProjectController; use App\Http\Controllers\SiteController; use App\Http\Controllers\TicketController; diff --git a/tests/Feature/ExampleTest.php b/tests/Feature/ExampleTest.php index cdb5111..8fbf370 100644 --- a/tests/Feature/ExampleTest.php +++ b/tests/Feature/ExampleTest.php @@ -2,7 +2,6 @@ namespace Tests\Feature; -use Illuminate\Foundation\Testing\RefreshDatabase; use Tests\TestCase; class ExampleTest extends TestCase