From b6b06d6cf8c81a958ed9ba654f01c8b21c44e287 Mon Sep 17 00:00:00 2001 From: Noah Lancien Date: Wed, 17 Sep 2025 10:49:43 +0200 Subject: [PATCH 01/24] chore: bump laravel-common to 4.1.1 --- composer.json | 4 ++-- composer.lock | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/composer.json b/composer.json index 5ecae06..3c04fea 100644 --- a/composer.json +++ b/composer.json @@ -1,6 +1,6 @@ { "name": "ldc/ldccrm", - "version": "4.1.5", + "version": "4.1.6", "type": "project", "description": "LDC CRM", "license": "MIT", @@ -41,7 +41,7 @@ "sentry/sentry-laravel": "^4.10", "uwil/admin-secure-laravel": "^3.0", "uwil/k8s-laravel": "^1.4", - "uwil/laravel-common": "^4.1.0" + "uwil/laravel-common": "^4.1" }, "require-dev": { "brianium/paratest": "^7.2", diff --git a/composer.lock b/composer.lock index f8df817..b076c98 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "0009b353976d02e41558711de87179a6", + "content-hash": "c078e9a537be5c78427890f22fc24612", "packages": [ { "name": "24slides/laravel-saml2", @@ -7859,16 +7859,16 @@ }, { "name": "uwil/laravel-common", - "version": "4.1.0", + "version": "4.1.1", "source": { "type": "git", "url": "git@lab.s-web.fr:ldc-web/projets/laravel-common.git", - "reference": "01af52e206e690d511752e9f6a52c8b2c537ca8a" + "reference": "7c08c4f545307bdba8bd09835b59982094b06e49" }, "dist": { "type": "zip", - "url": "https://lab.s-web.fr/api/v4/projects/215/packages/composer/archives/uwil/laravel-common.zip?sha=01af52e206e690d511752e9f6a52c8b2c537ca8a", - "reference": "01af52e206e690d511752e9f6a52c8b2c537ca8a", + "url": "https://lab.s-web.fr/api/v4/projects/215/packages/composer/archives/uwil/laravel-common.zip?sha=7c08c4f545307bdba8bd09835b59982094b06e49", + "reference": "7c08c4f545307bdba8bd09835b59982094b06e49", "shasum": "" }, "require": { @@ -11830,7 +11830,7 @@ ], "aliases": [], "minimum-stability": "stable", - "stability-flags": {}, + "stability-flags": [], "prefer-stable": true, "prefer-lowest": false, "platform": { @@ -11839,6 +11839,6 @@ "ext-dom": "*", "ext-json": "*" }, - "platform-dev": {}, - "plugin-api-version": "2.6.0" + "platform-dev": [], + "plugin-api-version": "2.3.0" } From 44035c958943c49a665eb5c7156674f442fe2cca Mon Sep 17 00:00:00 2001 From: Alexis Gousseau Date: Mon, 6 Oct 2025 16:36:11 +0200 Subject: [PATCH 02/24] =?UTF-8?q?fix:=20=F0=9F=8C=90=20update=20claim=20me?= =?UTF-8?q?ssages=20translations?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Http/Controllers/Bo/ClaimController.php | 2 +- .../Bo/ClaimSubjects/ClaimSubjectRequest.php | 2 +- app/Listeners/AddClaimMessageSystem.php | 8 ++-- .../bo/components/ClaimActionsComponent.vue | 11 ++--- .../components/ClaimConversationComponent.vue | 2 +- .../ClaimManualResponseComponent.vue | 6 +-- .../bo/components/ClaimMessageComponent.vue | 2 +- .../views/bo/pages/brands/form.blade.php | 3 +- .../bo/pages/claims/index-list.blade.php | 44 ++++++++++--------- 9 files changed, 43 insertions(+), 37 deletions(-) diff --git a/app/Http/Controllers/Bo/ClaimController.php b/app/Http/Controllers/Bo/ClaimController.php index a6586bc..13802ec 100644 --- a/app/Http/Controllers/Bo/ClaimController.php +++ b/app/Http/Controllers/Bo/ClaimController.php @@ -168,7 +168,7 @@ class ClaimController extends Controller "%s %s %s %s
%s", $userModel->first_name, $userModel->last_name, - trans('a modifié le :field en', ['field' => trans('validation.custom.response_type')]), + trans('a modifié :field en', ['field' => trans('validation.custom.response_type')]), $claim->response_type->label(), clean($request->validated()['content']), ); diff --git a/app/Http/Requests/Bo/ClaimSubjects/ClaimSubjectRequest.php b/app/Http/Requests/Bo/ClaimSubjects/ClaimSubjectRequest.php index 0f7cde8..6ef52c7 100644 --- a/app/Http/Requests/Bo/ClaimSubjects/ClaimSubjectRequest.php +++ b/app/Http/Requests/Bo/ClaimSubjects/ClaimSubjectRequest.php @@ -38,7 +38,7 @@ class ClaimSubjectRequest extends FormRequest { return [ 'brand_id' => trans('models.classes.brands'), - 'label' => trans('validation.attributes.label'), + 'label' => trans('validation.custom.label'), ]; } } diff --git a/app/Listeners/AddClaimMessageSystem.php b/app/Listeners/AddClaimMessageSystem.php index 7e4570f..119148b 100644 --- a/app/Listeners/AddClaimMessageSystem.php +++ b/app/Listeners/AddClaimMessageSystem.php @@ -68,7 +68,7 @@ class AddClaimMessageSystem { $enumLabel = $event->claim->{$event->field}->label(); $enumColor = $event->claim->{$event->field}->color(); - $baseMessage = trans(':field est passé à', ['field' => $event->label]); + $baseMessage = trans('Modification :field en', ['field' => $event->label]); // If the user is available, include user details in the message. if ($event->user) { @@ -76,7 +76,7 @@ class AddClaimMessageSystem "%s %s %s %s", $event->user->first_name, $event->user->last_name, - trans('a modifié le :field en', ['field' => $event->label]), + trans('a modifié :field en', ['field' => $event->label]), $enumColor, $enumLabel, ); @@ -101,7 +101,7 @@ class AddClaimMessageSystem { $field = $event->claim->{$event->field}; $label = Str::of($event->label)->lower()->singular(); - $baseMessage = trans(':field est passé à', ['field' => $label]); + $baseMessage = trans('Modification :field en', ['field' => $label]); $fieldLabel = $field->label ?? $field->name; // If the user is available, include user details in the message. @@ -110,7 +110,7 @@ class AddClaimMessageSystem "%s %s %s %s", $event->user->first_name, $event->user->last_name, - trans('a modifié le :field en', ['field' => $label]), + trans('a modifié :field en', ['field' => $label]), $fieldLabel, ); } diff --git a/resources/ts/bo/components/ClaimActionsComponent.vue b/resources/ts/bo/components/ClaimActionsComponent.vue index e11e71f..889107f 100644 --- a/resources/ts/bo/components/ClaimActionsComponent.vue +++ b/resources/ts/bo/components/ClaimActionsComponent.vue @@ -5,7 +5,7 @@ > - +