diff --git a/app/Architecture/Providers/EventServiceProvider.php b/app/Architecture/Providers/EventServiceProvider.php index 50cfebd..14bd1e2 100644 --- a/app/Architecture/Providers/EventServiceProvider.php +++ b/app/Architecture/Providers/EventServiceProvider.php @@ -8,14 +8,14 @@ use Illuminate\Foundation\Support\Providers\EventServiceProvider as ServiceProvi use Toby\Domain\Events\VacationRequestAcceptedByAdministrative; use Toby\Domain\Events\VacationRequestAcceptedByTechnical; use Toby\Domain\Events\VacationRequestApproved; -use Toby\Domain\Events\VacationRequestCanceled; +use Toby\Domain\Events\VacationRequestCancelled; use Toby\Domain\Events\VacationRequestCreated; use Toby\Domain\Events\VacationRequestStateChanged; use Toby\Domain\Listeners\CreateVacationRequestActivity; use Toby\Domain\Listeners\HandleAcceptedByAdministrativeVacationRequest; use Toby\Domain\Listeners\HandleAcceptedByTechnicalVacationRequest; use Toby\Domain\Listeners\HandleApprovedVacationRequest; -use Toby\Domain\Listeners\HandleCanceledVacationRequest; +use Toby\Domain\Listeners\HandleCancelledVacationRequest; use Toby\Domain\Listeners\HandleCreatedVacationRequest; class EventServiceProvider extends ServiceProvider @@ -26,6 +26,6 @@ class EventServiceProvider extends ServiceProvider VacationRequestAcceptedByTechnical::class => [HandleAcceptedByTechnicalVacationRequest::class], VacationRequestAcceptedByAdministrative::class => [HandleAcceptedByAdministrativeVacationRequest::class], VacationRequestApproved::class => [HandleApprovedVacationRequest::class], - VacationRequestCanceled::class => [HandleCanceledVacationRequest::class], + VacationRequestCancelled::class => [HandleCancelledVacationRequest::class], ]; } diff --git a/app/Domain/Enums/VacationRequestState.php b/app/Domain/Enums/VacationRequestState.php index 7fcbae5..cde2e2f 100644 --- a/app/Domain/Enums/VacationRequestState.php +++ b/app/Domain/Enums/VacationRequestState.php @@ -7,7 +7,7 @@ namespace Toby\Domain\Enums; enum VacationRequestState: string { case Created = "created"; - case Canceled = "canceled"; + case Cancelled = "cancelled"; case Rejected = "rejected"; case Approved = "approved"; case WaitingForTechnical = "waiting_for_technical"; @@ -40,7 +40,7 @@ enum VacationRequestState: string { return [ self::Rejected, - self::Canceled, + self::Cancelled, ]; } diff --git a/app/Domain/Events/VacationRequestCanceled.php b/app/Domain/Events/VacationRequestCancelled.php similarity index 91% rename from app/Domain/Events/VacationRequestCanceled.php rename to app/Domain/Events/VacationRequestCancelled.php index a953392..a25e626 100644 --- a/app/Domain/Events/VacationRequestCanceled.php +++ b/app/Domain/Events/VacationRequestCancelled.php @@ -8,7 +8,7 @@ use Illuminate\Foundation\Events\Dispatchable; use Illuminate\Queue\SerializesModels; use Toby\Eloquent\Models\VacationRequest; -class VacationRequestCanceled +class VacationRequestCancelled { use Dispatchable; use SerializesModels; diff --git a/app/Domain/Listeners/HandleCanceledVacationRequest.php b/app/Domain/Listeners/HandleCancelledVacationRequest.php similarity index 61% rename from app/Domain/Listeners/HandleCanceledVacationRequest.php rename to app/Domain/Listeners/HandleCancelledVacationRequest.php index de76a7a..87d333d 100644 --- a/app/Domain/Listeners/HandleCanceledVacationRequest.php +++ b/app/Domain/Listeners/HandleCancelledVacationRequest.php @@ -4,12 +4,12 @@ declare(strict_types=1); namespace Toby\Domain\Listeners; -use Toby\Domain\Events\VacationRequestCanceled; +use Toby\Domain\Events\VacationRequestCancelled; use Toby\Infrastructure\Jobs\ClearVacationRequestDaysInGoogleCalendar; -class HandleCanceledVacationRequest +class HandleCancelledVacationRequest { - public function handle(VacationRequestCanceled $event): void + public function handle(VacationRequestCancelled $event): void { ClearVacationRequestDaysInGoogleCalendar::dispatch($event->vacationRequest); } diff --git a/app/Domain/VacationRequestStateManager.php b/app/Domain/VacationRequestStateManager.php index cf4c785..c3e3e2d 100644 --- a/app/Domain/VacationRequestStateManager.php +++ b/app/Domain/VacationRequestStateManager.php @@ -10,7 +10,7 @@ use Toby\Domain\Enums\VacationRequestState; use Toby\Domain\Events\VacationRequestAcceptedByAdministrative; use Toby\Domain\Events\VacationRequestAcceptedByTechnical; use Toby\Domain\Events\VacationRequestApproved; -use Toby\Domain\Events\VacationRequestCanceled; +use Toby\Domain\Events\VacationRequestCancelled; use Toby\Domain\Events\VacationRequestCreated; use Toby\Eloquent\Models\VacationRequest; @@ -43,9 +43,9 @@ class VacationRequestStateManager public function cancel(VacationRequest $vacationRequest): void { - $this->changeState($vacationRequest, VacationRequestState::Canceled); + $this->changeState($vacationRequest, VacationRequestState::Cancelled); - $this->dispatcher->dispatch(new VacationRequestCanceled($vacationRequest)); + $this->dispatcher->dispatch(new VacationRequestCancelled($vacationRequest)); } public function acceptAsTechnical(VacationRequest $vacationRequest): void diff --git a/app/Infrastructure/Http/Controllers/VacationRequestController.php b/app/Infrastructure/Http/Controllers/VacationRequestController.php index 060afd6..c24cbe2 100644 --- a/app/Infrastructure/Http/Controllers/VacationRequestController.php +++ b/app/Infrastructure/Http/Controllers/VacationRequestController.php @@ -116,7 +116,7 @@ class VacationRequestController extends Controller $stateManager->cancel($vacationRequest); return redirect()->back() - ->with("success", __("Vacation request has been canceled.")); + ->with("success", __("Vacation request has been cancelled.")); } public function acceptAsTechnical( diff --git a/resources/js/Composables/statusInfo.js b/resources/js/Composables/statusInfo.js index 94026d7..6a459ca 100644 --- a/resources/js/Composables/statusInfo.js +++ b/resources/js/Composables/statusInfo.js @@ -110,7 +110,7 @@ const statuses = [ }, { text: 'Anulowany', - value: 'canceled', + value: 'cancelled', outline: { icon: OutlineXIcon, foreground: 'text-white', diff --git a/resources/lang/pl.json b/resources/lang/pl.json index b79661d..d512566 100644 --- a/resources/lang/pl.json +++ b/resources/lang/pl.json @@ -19,7 +19,7 @@ "technical_approver": "Techniczny akceptujący", "administrative_approver": "Administracyjny akceptujący", "created": "Utworzony", - "canceled": "Anulowany", + "cancelled": "Anulowany", "rejected": "Odrzucony", "approved": "Zatwierdzony", "waiting_for_technical": "Czeka na akceptację od technicznego", @@ -43,6 +43,6 @@ "Vacation request has been created.": "Wniosek urlopowy został utworzony.", "Vacation request has been accepted.": "Wniosek urlopowy został zaakceptowany.", "Vacation request has been rejected.": "Wniosek urlopowy został odrzucony.", - "Vacation request has been canceled.": "Wniosek urlopowy został anulowany." + "Vacation request has been cancelled.": "Wniosek urlopowy został anulowany." }