From 176040f96b94585e54a0589665c8d367b8417009 Mon Sep 17 00:00:00 2001 From: Nicolas Demangeat Date: Fri, 15 Dec 2023 14:32:34 +0100 Subject: [PATCH] delete id call on routable model + add somes translations --- resources/lang/en/crud.php | 3 +- resources/lang/en/validation.php | 2 +- resources/lang/fr/crud.php | 1 + resources/lang/fr/validation.php | 2 +- .../views/bo/modules/change-status.blade.php | 2 +- .../views/bo/pages/brands/edit.blade.php | 2 +- .../bo/pages/brands/index-list.blade.php | 4 +- .../views/bo/pages/coupons/edit.blade.php | 2 +- .../bo/pages/coupons/form-inputs.blade.php | 117 +++++++++--------- .../bo/pages/coupons/index-list.blade.php | 4 +- 10 files changed, 71 insertions(+), 68 deletions(-) diff --git a/resources/lang/en/crud.php b/resources/lang/en/crud.php index 61b6902..f63bca6 100644 --- a/resources/lang/en/crud.php +++ b/resources/lang/en/crud.php @@ -38,7 +38,8 @@ return [ 'has_been_updated' => ':model has been updated', 'cannot_be_updated' => ':model cannot be updated', 'has_been_deleted' => ':model has been deleted', - 'cannot_be_deleted' => ':model cannot be deleted' + 'cannot_be_deleted' => ':model cannot be deleted', + 'cannot_be_deleted_relation' => ':model cannot be deleted because some :relations are attached to it', ], 'minicrud' => [ diff --git a/resources/lang/en/validation.php b/resources/lang/en/validation.php index d30abc5..9aa5fb8 100644 --- a/resources/lang/en/validation.php +++ b/resources/lang/en/validation.php @@ -127,7 +127,7 @@ return [ 'crm_password' => 'CRM Password', 'type' => 'Type', 'status' => 'Status', - 'brand_id' => 'Brand id', + 'brand_id' => 'Linked brand', 'updated_at' => 'Updated at', 'process_code' => 'Process code', 'amount' => 'Amount', diff --git a/resources/lang/fr/crud.php b/resources/lang/fr/crud.php index 5de5ed6..bfd7b49 100644 --- a/resources/lang/fr/crud.php +++ b/resources/lang/fr/crud.php @@ -42,6 +42,7 @@ return [ 'cannot_be_updated' => ':model ne peut être mis à jour', 'has_been_deleted' => ':model a été supprimé', 'cannot_be_deleted' => ':model ne peut être supprimé', + "cannot_be_deleted_relation" => ':model ne peut être supprimé car des :relations lui sont attaché(e)s', 'order_changed' => 'L\'ordre a été changé !', 'order_not_changed' => 'L\'ordre n\'a pas été changé !', 'publish_status_saved' => 'Changement de l\'état de publication réussi !', diff --git a/resources/lang/fr/validation.php b/resources/lang/fr/validation.php index e5e9c3a..af007ff 100644 --- a/resources/lang/fr/validation.php +++ b/resources/lang/fr/validation.php @@ -127,7 +127,7 @@ return [ 'crm_password' => 'Mot de passe CRM', 'type' => 'Type', 'status' => 'Status', - 'brand_id' => 'ID de la marque', + 'brand_id' => 'Marque associée', 'updated_at' => 'Date de modification', 'process_code' => 'Code de processus', 'amount' => 'Montant', diff --git a/resources/views/bo/modules/change-status.blade.php b/resources/views/bo/modules/change-status.blade.php index 1e27d28..1c276da 100644 --- a/resources/views/bo/modules/change-status.blade.php +++ b/resources/views/bo/modules/change-status.blade.php @@ -1,5 +1,5 @@ -
+ @csrf