Merge branch 'develop' into feat/276-lister-expeditions-terminees

# Conflicts:
#	CHANGELOG.md

.idea/data_source_mapping.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="DataSourcePerFileMappings">
+    <file url="file://$APPLICATION_CONFIG_DIR$/consoles/db/f407a514-c6b4-4b26-9555-445a85892502/console.sql" value="f407a514-c6b4-4b26-9555-445a85892502" />
+    <file url="file://$APPLICATION_CONFIG_DIR$/consoles/db/f407a514-c6b4-4b26-9555-445a85892502/console_1.sql" value="f407a514-c6b4-4b26-9555-445a85892502" />
+    <file url="file://$APPLICATION_CONFIG_DIR$/consoles/db/f407a514-c6b4-4b26-9555-445a85892502/console_2.sql" value="f407a514-c6b4-4b26-9555-445a85892502" />
+    <file url="file://$APPLICATION_CONFIG_DIR$/consoles/db/f407a514-c6b4-4b26-9555-445a85892502/console_3.sql" value="f407a514-c6b4-4b26-9555-445a85892502" />
+    <file url="file://$APPLICATION_CONFIG_DIR$/consoles/db/f407a514-c6b4-4b26-9555-445a85892502/console_4.sql" value="f407a514-c6b4-4b26-9555-445a85892502" />
+  </component>
+</project>

.idea/workspace.xml

@@ -4,10 +4,28 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="7c107abe-5995-4428-8429-b146aaca8386" name="Changes" comment="fix : corrections diverses">
-      <change beforePath="$PROJECT_DIR$/.idea/data_source_mapping.xml" beforeDir="false" />
+    <list default="true" id="7c107abe-5995-4428-8429-b146aaca8386" name="Changes" comment="feat : Ajout de la sélection des bovins étape 3 d'une réception (WIP)">
+      <change afterPath="$PROJECT_DIR$/frontend/components/shipment/shipment-form.vue" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/frontend/pages/shipment/[[id]].vue" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/frontend/services/bovin-shipment.ts" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/frontend/services/customer.ts" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/frontend/services/dto/bovin-shipment-data.ts" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/frontend/services/dto/customer-data.ts" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/frontend/services/dto/shipment-data.ts" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/frontend/services/dto/shipment-type-data.ts" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/frontend/services/shipment-type.ts" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/frontend/services/shipment.ts" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/frontend/stores/shipment.ts" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/CHANGELOG.md" beforeDir="false" afterPath="$PROJECT_DIR$/CHANGELOG.md" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/config/reference.php" beforeDir="false" afterPath="$PROJECT_DIR$/config/reference.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/frontend/components/ui/UiNumberInput.vue" beforeDir="false" afterPath="$PROJECT_DIR$/frontend/components/ui/UiNumberInput.vue" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/frontend/constants/steps.ts" beforeDir="false" afterPath="$PROJECT_DIR$/frontend/constants/steps.ts" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/frontend/i18n/locales/fr.json" beforeDir="false" afterPath="$PROJECT_DIR$/frontend/i18n/locales/fr.json" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/frontend/pages/index.vue" beforeDir="false" afterPath="$PROJECT_DIR$/frontend/pages/index.vue" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/frontend/services/reception.ts" beforeDir="false" afterPath="$PROJECT_DIR$/frontend/services/reception.ts" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Entity/Address.php" beforeDir="false" afterPath="$PROJECT_DIR$/src/Entity/Address.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Entity/BovinShipment.php" beforeDir="false" afterPath="$PROJECT_DIR$/src/Entity/BovinShipment.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Entity/Shipment.php" beforeDir="false" afterPath="$PROJECT_DIR$/src/Entity/Shipment.php" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -32,21 +50,17 @@
       <list>
         <option value="Vue Composition API Component" />
         <option value="TypeScript File" />
-        <option value="PHP File" />
       </list>
     </option>
   </component>
   <component name="Git.Settings">
     <option name="RECENT_BRANCH_BY_REPOSITORY">
       <map>
-        <entry key="$PROJECT_DIR$" value="feat/276-lister-expeditions-terminees" />
+        <entry key="$PROJECT_DIR$" value="fix/makefile" />
       </map>
     </option>
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
   </component>
-  <component name="HighlightingSettingsPerFile">
-    <setting file="file://$PROJECT_DIR$/frontend/pages/admin/supplier/supplier-list.vue" root0="FORCE_HIGHLIGHTING" />
-  </component>
   <component name="McpProjectServerCommands">
     <commands />
     <urls />
@@ -223,42 +237,37 @@
     <option name="hideEmptyMiddlePackages" value="true" />
     <option name="showLibraryContents" value="true" />
   </component>
-  <component name="PropertiesComponent">{
-  &quot;keyToString&quot;: {
-    &quot;RunOnceActivity.MCP Project settings loaded&quot;: &quot;true&quot;,
-    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
-    &quot;RunOnceActivity.TerminalTabsStorage.copyFrom.TerminalArrangementManager.252&quot;: &quot;true&quot;,
-    &quot;RunOnceActivity.git.unshallow&quot;: &quot;true&quot;,
-    &quot;RunOnceActivity.typescript.service.memoryLimit.init&quot;: &quot;true&quot;,
-    &quot;git-widget-placeholder&quot;: &quot;fix/325-corrections-diverses&quot;,
-    &quot;last_opened_file_path&quot;: &quot;//wsl.localhost/Ubuntu-24.04/home/kevin/Stage/Ferme/frontend/pages/shipment&quot;,
-    &quot;node.js.detected.package.eslint&quot;: &quot;true&quot;,
-    &quot;node.js.detected.package.tslint&quot;: &quot;true&quot;,
-    &quot;node.js.selected.package.eslint&quot;: &quot;(autodetect)&quot;,
-    &quot;node.js.selected.package.tslint&quot;: &quot;(autodetect)&quot;,
-    &quot;nodejs_package_manager_path&quot;: &quot;npm&quot;,
-    &quot;settings.editor.selected.configurable&quot;: &quot;preferences.pluginManager&quot;,
-    &quot;ts.external.directory.path&quot;: &quot;/opt/phpstorm/plugins/javascript-plugin/jsLanguageServicesImpl/external&quot;,
-    &quot;vue.rearranger.settings.migration&quot;: &quot;true&quot;
+  <component name="PropertiesComponent"><![CDATA[{
+  "keyToString": {
+    "RunOnceActivity.MCP Project settings loaded": "true",
+    "RunOnceActivity.ShowReadmeOnStart": "true",
+    "RunOnceActivity.TerminalTabsStorage.copyFrom.TerminalArrangementManager.252": "true",
+    "RunOnceActivity.git.unshallow": "true",
+    "RunOnceActivity.typescript.service.memoryLimit.init": "true",
+    "git-widget-placeholder": "feat/271-expedition-etape-1",
+    "last_opened_file_path": "/home/sroy/Documents/test/Ferme",
+    "node.js.detected.package.eslint": "true",
+    "node.js.detected.package.tslint": "true",
+    "node.js.selected.package.eslint": "(autodetect)",
+    "node.js.selected.package.tslint": "(autodetect)",
+    "nodejs_package_manager_path": "npm",
+    "settings.editor.selected.configurable": "configurable.tailwindcss",
+    "ts.external.directory.path": "/opt/phpstorm/plugins/javascript-plugin/jsLanguageServicesImpl/external",
+    "vue.rearranger.settings.migration": "true"
   },
-  &quot;keyToStringList&quot;: {
-    &quot;DatabaseDriversLRU&quot;: [
-      &quot;postgresql&quot;
+  "keyToStringList": {
+    "DatabaseDriversLRU": [
+      "postgresql"
     ],
-    &quot;com.intellij.ide.scratch.ScratchImplUtil$2/New Scratch File&quot;: [
-      &quot;TEXT&quot;
+    "com.intellij.ide.scratch.ScratchImplUtil$2/New Scratch File": [
+      "TEXT"
     ],
-    &quot;vue.recent.templates&quot;: [
-      &quot;Vue Composition API Component&quot;
+    "vue.recent.templates": [
+      "Vue Composition API Component"
     ]
   }
-}</component>
+}]]></component>
   <component name="RecentsManager">
-    <key name="CopyFile.RECENT_KEYS">
-      <recent name="\\wsl.localhost\Ubuntu-24.04\home\kevin\Stage\Ferme\frontend\pages\shipment" />
-      <recent name="\\wsl.localhost\Ubuntu-24.04\home\kevin\Stage\Ferme\frontend\composables" />
-      <recent name="\\wsl.localhost\Ubuntu-24.04\home\kevin\Stage\Ferme\frontend\components\shipment" />
-    </key>
     <key name="MoveFile.RECENT_KEYS">
       <recent name="\\wsl.localhost\Ubuntu-24.04\home\m-tristan\workspace\Ferme" />
       <recent name="\\wsl.localhost\Ubuntu-24.04\home\tristan\workspace\ferme\templates" />
@@ -304,10 +313,54 @@
       <workItem from="1770195718952" duration="215000" />
       <workItem from="1770195959162" duration="18915000" />
       <workItem from="1770274844804" duration="3940000" />
-      <workItem from="1770798536017" duration="20774000" />
-      <workItem from="1770879701502" duration="25805000" />
-      <workItem from="1770966186589" duration="914000" />
-      <workItem from="1770967274060" duration="2388000" />
+    </task>
+    <task id="LOCAL-00001" summary="feat : Ajout de pinia, création de la table weight et reception mise en place du système de step pour les receptions (WIP)">
+      <option name="closed" value="true" />
+      <created>1768237763998</created>
+      <option name="number" value="00001" />
+      <option name="presentableId" value="LOCAL-00001" />
+      <option name="project" value="LOCAL" />
+      <updated>1768237763998</updated>
+    </task>
+    <task id="LOCAL-00002" summary="feat : Ajout de zod, création d'un composant de chargement loading-dots.vue et finalisation du flow d'une reception">
+      <option name="closed" value="true" />
+      <created>1768316052474</created>
+      <option name="number" value="00002" />
+      <option name="presentableId" value="LOCAL-00002" />
+      <option name="project" value="LOCAL" />
+      <updated>1768316052474</updated>
+    </task>
+    <task id="LOCAL-00003" summary="feat : Ajout d'un composable pour la pesée qui sera réutilisable pour l'expédition, ajout de contrainte sur les entity de reception et weight pour plus de robustesse et correction de la class active des liens dans la nav">
+      <option name="closed" value="true" />
+      <created>1768316835575</created>
+      <option name="number" value="00003" />
+      <option name="presentableId" value="LOCAL-00003" />
+      <option name="project" value="LOCAL" />
+      <updated>1768316835575</updated>
+    </task>
+    <task id="LOCAL-00004" summary="feat : update du fichier AGENTS.md">
+      <option name="closed" value="true" />
+      <created>1768316965511</created>
+      <option name="number" value="00004" />
+      <option name="presentableId" value="LOCAL-00004" />
+      <option name="project" value="LOCAL" />
+      <updated>1768316965511</updated>
+    </task>
+    <task id="LOCAL-00005" summary="feat : update du fichier README.md et CHANGELOG.md">
+      <option name="closed" value="true" />
+      <created>1768317786187</created>
+      <option name="number" value="00005" />
+      <option name="presentableId" value="LOCAL-00005" />
+      <option name="project" value="LOCAL" />
+      <updated>1768317786187</updated>
+    </task>
+    <task id="LOCAL-00006" summary="fix : correction du useApi pour qu'il n'y ait plus de retry lors d'une erreur 500 par exemple">
+      <option name="closed" value="true" />
+      <created>1768318875533</created>
+      <option name="number" value="00006" />
+      <option name="presentableId" value="LOCAL-00006" />
+      <option name="project" value="LOCAL" />
+      <updated>1768318875533</updated>
     </task>
     <task id="LOCAL-00007" summary="test : ajout de TU sur les services et providers">
       <option name="closed" value="true" />
@@ -653,55 +706,7 @@
       <option name="project" value="LOCAL" />
       <updated>1770217875423</updated>
     </task>
-    <task id="LOCAL-00050" summary="feat : creer une nouvelle expedtion (WIP)">
-      <option name="closed" value="true" />
-      <created>1770736570645</created>
-      <option name="number" value="00050" />
-      <option name="presentableId" value="LOCAL-00050" />
-      <option name="project" value="LOCAL" />
-      <updated>1770736570645</updated>
-    </task>
-    <task id="LOCAL-00051" summary="feat : ajout d'une page de creation d'une expedition">
-      <option name="closed" value="true" />
-      <created>1770880791564</created>
-      <option name="number" value="00051" />
-      <option name="presentableId" value="LOCAL-00051" />
-      <option name="project" value="LOCAL" />
-      <updated>1770880791565</updated>
-    </task>
-    <task id="LOCAL-00052" summary="feat : changelog">
-      <option name="closed" value="true" />
-      <created>1770881437439</created>
-      <option name="number" value="00052" />
-      <option name="presentableId" value="LOCAL-00052" />
-      <option name="project" value="LOCAL" />
-      <updated>1770881437439</updated>
-    </task>
-    <task id="LOCAL-00053" summary="feat : lister les expeditions terminees">
-      <option name="closed" value="true" />
-      <created>1770883114609</created>
-      <option name="number" value="00053" />
-      <option name="presentableId" value="LOCAL-00053" />
-      <option name="project" value="LOCAL" />
-      <updated>1770883114609</updated>
-    </task>
-    <task id="LOCAL-00054" summary="feat : lister les expeditions terminees">
-      <option name="closed" value="true" />
-      <created>1770884154297</created>
-      <option name="number" value="00054" />
-      <option name="presentableId" value="LOCAL-00054" />
-      <option name="project" value="LOCAL" />
-      <updated>1770884154297</updated>
-    </task>
-    <task id="LOCAL-00055" summary="fix : corrections diverses">
-      <option name="closed" value="true" />
-      <created>1770969471135</created>
-      <option name="number" value="00055" />
-      <option name="presentableId" value="LOCAL-00055" />
-      <option name="project" value="LOCAL" />
-      <updated>1770969471135</updated>
-    </task>
-    <option name="localTasksCounter" value="56" />
+    <option name="localTasksCounter" value="50" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -751,6 +756,12 @@
     </option>
   </component>
   <component name="VcsManagerConfiguration">
+    <MESSAGE value="fix : correction du path URI pour la création d'un poids dans une réception" />
+    <MESSAGE value="feat : Ajout du bundle Monolog pour la gestion des logs" />
+    <MESSAGE value="fix : affiche plus détail dans les logs en recette/prod" />
+    <MESSAGE value="fix : modification du script de déploiement pour corriger le problème d'écriture des logs de prod" />
+    <MESSAGE value="fix : doc de déploiement" />
+    <MESSAGE value="fix : doc et script de déploiement" />
     <MESSAGE value="fix : gitea workflow" />
     <MESSAGE value="fix : script de déploiement" />
     <MESSAGE value="feat : ajout plus d'information sur la liste des réceptions côté front sur la page d'accueil" />
@@ -770,13 +781,7 @@
     <MESSAGE value="feat : ajout de colonne pour les Supplier, Address. Modification du numéro de réception et ajout de fixtures" />
     <MESSAGE value="feat : mise à jour du bon de réception" />
     <MESSAGE value="feat : Ajout de la sélection des bovins étape 3 d'une réception (WIP)" />
-    <MESSAGE value="feat : creer une nouvelle expedtion (WIP)" />
-    <MESSAGE value="feat : ajout d'une page de creation d'une expedition" />
-    <MESSAGE value="feat : changelog" />
-    <MESSAGE value="feat : lister les expeditions terminees" />
-    <MESSAGE value="fix: corrections diverses" />
-    <MESSAGE value="fix : corrections diverses" />
-    <option name="LAST_COMMIT_MESSAGE" value="fix : corrections diverses" />
+    <option name="LAST_COMMIT_MESSAGE" value="feat : Ajout de la sélection des bovins étape 3 d'une réception (WIP)" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -786,19 +791,10 @@
           <line>6</line>
           <option name="timeStamp" value="3" />
         </line-breakpoint>
-        <line-breakpoint enabled="true" type="php">
-          <url>file://$PROJECT_DIR$/src/Entity/Shipment.php</url>
-          <line>6</line>
-          <option name="timeStamp" value="45" />
-        </line-breakpoint>
         <line-breakpoint enabled="true" type="javascript">
-          <url>file://$PROJECT_DIR$/frontend/services/dto/shipment-data.ts</url>
-          <option name="timeStamp" value="43" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="javascript">
-          <url>file://$PROJECT_DIR$/frontend/layouts/default.vue</url>
-          <line>72</line>
-          <option name="timeStamp" value="48" />
+          <url>file://$PROJECT_DIR$/frontend/services/shipment.ts</url>
+          <properties lambdaOrdinal="-1" />
+          <option name="timeStamp" value="37" />
         </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>

CHANGELOG.md

@@ -43,10 +43,6 @@ Ajouter dans le fichier .env du frontend
 * [#313] Admin modification creation fournisseur
 * [#275] Lister les expéditions en attente
 * [#276] Lister les expéditions terminées
-* [#324] Creation page admin listing clients
-* [#326] Admin modification creation client
-* [#325] Correction diverses
-* fix layout admin
 
 ### Changed
 

config/version.yaml

@@ -1,2 +1,2 @@
 parameters:
-    app.version: '0.0.48'
+    app.version: '0.0.41'

frontend/components/card-link.vue

@@ -2,9 +2,9 @@
 
 <template>
     <NuxtLink :to="link">
-        <div class="w-[324px] h-[228px] border border-black rounded-lg p-6 flex flex-col justify-between">
+        <div class="w-[324px] h-[228px] border border-black rounded-md p-6 flex flex-col justify-between">
             <div class="flex justify-between">
-                <div class="rounded-full w-[80px] h-[80px] bg-[#D9D9D9] flex justify-center items-center">
+                <div class="rounded-full w-[80px] h-[80px] bg-neutral-400 flex justify-center items-center">
                     <Icon :name="iconName" style="color: black" size="44" />
                 </div>
                 <div>

frontend/components/reception/reception-bovine-received.vue

@@ -2,7 +2,7 @@
     <div
         v-if="receptionStore.current?.receptionType?.code === RECEPTION_TYPE_CODES.BOVINS"
         class="flex flex-col items-center gap-16">
-        <h1 class="text-4xl uppercase font-bold">Sélection des races réceptionnées</h1>
+        <h1 class="text-4xl uppercase font-bold">Sélection des marchandises réceptionnnées</h1>
         <div
             class="flex flex-row gap-8 items-center">
             <div
@@ -10,7 +10,6 @@
                 :key="type.id"
                 class="mt-8 flex flex-row mb-2 gap-6">
                 <UiNumberInput
-                    :id="type.id"
                     :label="type.label"
                     :code="type.code"
                     v-model="bovineQuantities[String(type.id)]"
@@ -30,7 +29,7 @@
         <button
             class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px]"
             @click="goNext"
-        >Valider
+        >Peser
         </button>
     </div>
 </template>
@@ -78,14 +77,14 @@ onMounted(async () => {
 })
 
 watch(
-    [() => receptionId.value, () => bovineType.value],
-    async ([id, types]) => {
-        if (!id || !receptionIri.value || types.length === 0) {
+    () => receptionId.value,
+    async (id) => {
+        if (!id || !receptionIri.value) {
             return
         }
 
         const selectionMap: Record<string, number | null> = {}
-        for (const type of types) {
+        for (const type of bovineType.value) {
             selectionMap[String(type.id)] = 0
         }
 

frontend/components/reception/reception-form.vue

@@ -91,7 +91,6 @@
                     label: driver.name
                 }))"
                 :loading="isLoadingDrivers"
-                v-if="isLiotCarrier"
                 wrapper-class="col-start-2 row-start-4"
             />
             <!--    Plaque d'immatriculation       -->
@@ -120,7 +119,7 @@
             <button
                 type="submit"
                 class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px] justify-self-end"
-            >Valider
+            >Peser
             </button>
         </div>
     </form>
@@ -343,7 +342,7 @@ onMounted(async () => {
 
 // Ajuste driver/vehicle quand le transporteur change (logique LIOT)
 watch(
-    () => [form.supplierId, form.addressId, suppliers.value],
+    () => [form.supplierId, suppliers.value],
     () => {
         if (!form.supplierId) {
             form.addressId = ''
@@ -360,11 +359,7 @@ watch(
             (address) => String(address.id) === form.addressId
         )
         if (!matches) {
-            if (supplierAddresses.value.length === 1) {
-                form.addressId = String(supplierAddresses.value[0].id)
-            } else {
-                form.addressId = ''
-            }
+            form.addressId = ''
         }
     },
     {immediate: true}

frontend/components/reception/reception-product-received.vue

@@ -26,7 +26,7 @@
 
             <div
                 v-if="selectedMerchandiseTypeId && !isGranule"
-                class="flex gap-4 w-[550px] justify-between"
+                class="flex gap-4 w-[550px] justify-evenly"
             >
                 <div
                     v-for="building in buildings"
@@ -51,13 +51,13 @@
                         <div
                             v-for="building in buildings"
                             :key="building.id"
-                            class="flex items-center gap-2 text-lg pl-[2px]"
+                            class="flex items-center gap-2 text-lg"
                         >
                             <UiCheckbox
                                 v-model="selectedPelletBuildingIds[String(type.id)]"
                                 :value="String(building.id)"
                                 :label="building.label"
-                                label-class="text-xl"
+                                label-class="text-lg"
                             />
                         </div>
                     </div>
@@ -67,7 +67,7 @@
         <button
             class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px]"
             @click="goNext"
-        >Valider
+        >Peser
         </button>
     </div>
 </template>

frontend/components/reception/reception-weight.vue

@@ -26,7 +26,7 @@
             v-if="displayWeight !== null && !showGenerateReceipt"
             class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px] ml-4"
             @click="saveWeight"
-        >Valider</button>
+        >Valider la pesée</button>
         <button
             v-if="showGenerateReceipt"
             class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px] ml-4"
@@ -36,7 +36,7 @@
 </template>
 
 <script setup lang="ts">
-import {computed, onMounted} from 'vue'
+import { computed } from 'vue'
 import { storeToRefs } from 'pinia'
 import { useWeighing } from '~/composables/useWeighing'
 import { usePdfPrinter } from '~/composables/usePdfPrinter'
@@ -94,7 +94,7 @@ const printReceipt = async () => {
 
 // Récupère le poids dès l'arrivée sur l'écran
 onMounted(() => {
-    if (displayWeight.value === null) {
+    if (false === displayWeight.value) {
         fetchWeight()
     }
 })

frontend/components/reception/update-bovin.vue

@@ -83,14 +83,14 @@ onMounted(async () => {
 })
 
 watch(
-    [() => receptionId, () => bovineType.value],
-    async ([id, types]) => {
-        if (!id || !receptionIri.value || types.length === 0) {
+    () => receptionId,
+    async (id) => {
+        if (!id || !receptionIri.value) {
             return
         }
 
         const selectionMap: Record<string, number | null> = {}
-        for (const type of types) {
+        for (const type of bovineType.value) {
             selectionMap[String(type.id)] = 0
         }
 
@@ -105,7 +105,7 @@ watch(
         }
         Object.assign(bovineQuantities, selectionMap)
 
-        const existingOther = reception.bovineDetail
+        const existingOther = await reception.bovineDetail
         const parsedOther =
             typeof existingOther === 'string' && existingOther.trim() !== ''
                 ? Number(existingOther)

frontend/components/reception/update-merchandise.vue

@@ -1,80 +1,79 @@
 <template>
     <form @submit.prevent="validate">
-        <div class="flex flex-col items-center gap-16">
+    <div class="flex flex-col items-center gap-16">
+        <div
+            class="flex flex-col gap-16 items-center w-full">
+            <UiTextInput
+                id="merchandise-type"
+                v-model="selectedMerchandiseTypeId"
+                label="Type de marchandises"
+                :value="reception.merchandiseType?.label"
+                wrapper-class="w-[550px]"
+                :disabled="true"
+            />
             <div
-                class="flex flex-col gap-16 items-center w-full">
+                v-if="merchandiseTypeId && isAutres"
+                class="flex flex-col w-full max-w-[550px]"
+            >
                 <UiTextInput
-                    id="merchandise-type"
-                    v-model="selectedMerchandiseTypeId"
-                    label="Type de marchandises"
-                    :value="reception.merchandiseType?.label"
-                    wrapper-class="w-[550px]"
-                    :disabled="true"
+                    id="merchandise-detail"
+                    :disabled="!auth.isAdmin"
+                    v-model="merchandiseDetail"
+                    label="Préciser"
+                    placeholder="Précisions complémentaires"
+                    :maxlength="255"
                 />
+            </div>
+
+            <div
+                v-if="merchandiseTypeId && !isGranule"
+                class="flex gap-4 w-[550px] justify-evenly"
+            >
                 <div
-                    v-if="merchandiseTypeId && isAutres"
-                    class="flex flex-col w-full max-w-[550px]"
+                    v-for="building in buildings"
+                    :key="building.id"
                 >
-                    <UiTextInput
-                        id="merchandise-detail"
+                    <UiCheckbox
+                        v-model="selectedBuildingIds"
+                        :value="String(building.id)"
+                        :label="building.label"
                         :disabled="!auth.isAdmin"
-                        v-model="merchandiseDetail"
-                        label="Préciser"
-                        placeholder="Précisions complémentaires"
-                        :maxlength="255"
+                        label-class="text-xl"
                     />
                 </div>
+            </div>
 
-                <div
-                    v-if="merchandiseTypeId && !isGranule"
-                    class="flex gap-4 w-[550px] justify-evenly"
-                >
-                    <div
-                        v-for="building in buildings"
-                        :key="building.id"
-                    >
-                        <UiCheckbox
-                            v-model="selectedBuildingIds"
-                            :value="String(building.id)"
-                            :label="building.label"
-                            :disabled="!auth.isAdmin"
-                            label-class="text-xl"
-                        />
-                    </div>
-                </div>
-
-                <div
-                    v-if="merchandiseTypeId && isGranule"
-                    class="flex flex-col gap-10 w-full max-w-[1100px]"
-                >
-                    <div class="grid grid-cols-1 gap-10 md:grid-cols-4">
-                        <div v-for="type in pelletTypes" :key="type.id" class="flex flex-col gap-4">
-                            <p class="font-bold uppercase">{{ type.label }}</p>
-                            <div
-                                v-for="building in buildings"
-                                :key="building.id"
-                                class="flex items-center gap-2 text-lg"
-                            >
-                                <UiCheckbox
-                                    v-model="selectedPelletBuildingIds[String(type.id)]"
-                                    :value="String(building.id)"
-                                    :label="building.label"
-                                    :disabled="!auth.isAdmin"
-                                    label-class="text-lg"
-                                />
-                            </div>
+            <div
+                v-if="merchandiseTypeId && isGranule"
+                class="flex flex-col gap-10 w-full max-w-[1100px]"
+            >
+                <div class="grid grid-cols-1 gap-10 md:grid-cols-4">
+                    <div v-for="type in pelletTypes" :key="type.id" class="flex flex-col gap-4">
+                        <p class="font-bold uppercase">{{ type.label }}</p>
+                        <div
+                            v-for="building in buildings"
+                            :key="building.id"
+                            class="flex items-center gap-2 text-lg"
+                        >
+                            <UiCheckbox
+                                v-model="selectedPelletBuildingIds[String(type.id)]"
+                                :value="String(building.id)"
+                                :label="building.label"
+                                :disabled="!auth.isAdmin"
+                                label-class="text-lg"
+                            />
                         </div>
                     </div>
                 </div>
             </div>
-            <button
-                v-if="auth.isAdmin"
-                type="submit"
-                class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px]"
-                :disabled="!auth.isAdmin"
-            >Valider
-            </button>
         </div>
+        <button
+            type="submit"
+            class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px]"
+            :disabled="!auth.isAdmin"
+        >Valider
+        </button>
+    </div>
     </form>
 </template>
 

frontend/components/reception/update-weight.vue

@@ -1,40 +1,27 @@
 <template>
     <form @submit.prevent="validate">
-        <div class="grid grid-cols-2 gap-x-40 gap-y-8 mb-8">
+
+        <div class="grid grid-cols-2 gap-x-40 gap-y-8 mb-16">
             <UiNumberInput
-                label="Dsd"
-                class="col-start-2"
-                labelClass="font-bold uppercase"
-                v-model="sharedWeightMeta.dsd"
-                :disabled="!auth.isAdmin"
-            />
-            <UiDateInput
-                label="Date pesée"
-                v-model="sharedWeightMeta.weighedAt"
-                :disabled="!auth.isAdmin"
-            />
-        </div>
-        <div class="grid grid-cols-2 gap-x-40 mb-16">
-            <UiNumberInput
-                v-for="weight in form.weights"
-                :key="weight.type"
-                :label="getWeightLabel(weight.type)"
-                labelClass="font-bold uppercase text-xl"
-                inputClass="w-24"
-                v-model="weight.weight"
-                :wrapper-class="weight.type === 'tare' ? 'col-start-1 row-start-1' : 'col-start-2 row-start-1'"
+                label="Pesée à vide"
+                v-model="form.weights[0].weight"
+                :disabled="!auth.isAdmin"
+                :min="0"
+            />
+
+            <UiNumberInput
+                label="Pesée à plein"
+                v-model="form.weights[1].weight"
                 :disabled="!auth.isAdmin"
                 :min="0"
-                :max="48000"
             />
         </div>
 
         <div class="flex justify-center">
             <button
-                v-if="auth.isAdmin"
                 type="submit"
                 class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px]"
-
+                :disabled="!auth.isAdmin"
             >
                 Valider
             </button>
@@ -45,7 +32,7 @@
 
 <script setup lang="ts">
 import type {ReceptionFormWeight} from '~/services/dto/reception-data'
-import {getReception} from '~/services/reception'
+import { getReception } from '~/services/reception'
 import {updateWeight} from "~/services/weight";
 import {useAuthStore} from "~/stores/auth";
 
@@ -58,42 +45,17 @@ const auth = useAuthStore()
 
 const form = reactive({
     weights: [
-        {id: 0, type: 'tare' as const, weight: 0, dsd: null, weighedAt: null},
-        {id: 0, type: 'gross' as const, weight: 0, dsd: null, weighedAt: null}
+        { id: 0, type: 'tare' as const, weight: 0 },
+        { id: 0, type: 'gross' as const, weight: 0 }
     ]
 })
-// DSD et date de pesée sont partagés entre tare et gross dans l'UI.
-const sharedWeightMeta = reactive<{
-    dsd: number | string | null
-    weighedAt: string | null
-}>({
-    dsd: null,
-    weighedAt: null
-})
-
-const getWeightLabel = (type: 'tare' | 'gross'): string => {
-    return type === 'tare' ? 'Pesée à vide' : 'Pesée à plein'
-}
 
 const hydrateFromReception = (reception: ReceptionFormWeight) => {
-    // On hydrate chaque ligne par son type (tare/gross), sans dépendre d'un index.
-    for (const receptionWeight of reception.weights) {
-        const formWeight = form.weights.find(weight => weight.type === receptionWeight.type)
-        if (formWeight) {
-            Object.assign(formWeight, receptionWeight)
-        }
-    }
+    const tare = reception.weights.find(weight => weight.type === 'tare')
+    const gross = reception.weights.find(weight => weight.type === 'gross')
 
-    // On récupère une valeur existante pour préremplir les champs partagés.
-    const weightWithMeta = reception.weights.find(weight =>
-        (weight.dsd !== null && weight.dsd !== undefined)
-        || (weight.weighedAt !== null && weight.weighedAt !== undefined && weight.weighedAt !== '')
-    )
-
-    if (weightWithMeta) {
-        sharedWeightMeta.dsd = weightWithMeta.dsd ?? null
-        sharedWeightMeta.weighedAt = weightWithMeta.weighedAt ?? null
-    }
+    if (tare) form.weights[0] = { ...tare }
+    if (gross) form.weights[1] = { ...gross }
 }
 
 onMounted(async () => {
@@ -102,23 +64,11 @@ onMounted(async () => {
 })
 
 async function validate() {
-    const sharedDsd =
-        sharedWeightMeta.dsd === null || sharedWeightMeta.dsd === undefined || sharedWeightMeta.dsd === ''
-            ? null
-            : Number(sharedWeightMeta.dsd)
-    const sharedWeighedAt =
-        sharedWeightMeta.weighedAt === null || sharedWeightMeta.weighedAt === undefined || sharedWeightMeta.weighedAt === ''
-            ? null
-            : sharedWeightMeta.weighedAt
+
     for (const weight of form.weights) {
         if (weight.id) {
-            await updateWeight(weight.id, {
-                weight: weight.weight,
-                dsd: Number.isFinite(sharedDsd) ? sharedDsd : null,
-                weighedAt: sharedWeighedAt
-            })
+            await updateWeight(weight.id, {weight: weight.weight})
         }
     }
-
 }
 </script>

frontend/components/shipment/shipment-form.vue

@@ -22,27 +22,24 @@
                 wrapper-class="col-start-1 row-start-3"
             />
             <!--    Type d'expédition        -->
-            <div class="col-start-1 row-start-4 h-[64px]">
-                <div class="flex items-end gap-8">
-                    <UiRadioGroup
-                        id="shipment-type"
-                        name="shipment-type"
-                        label="Type d'expédition"
-                        v-model="selectedShipmentTypeId"
-                        :options="bovineShipment.map((type) => ({
-                            value: String(type.id),
-                            label: type.label
-                        }))"
-                    />
-                    <UiNumberInput
-                        id="shipment-type-quantity"
-                        label="Quantité"
-                        v-model="shipmentQuantity"
-                        :placeholder="0"
-                        :min="0"
-                        :max="1200"
-                        :disabled="!selectedShipmentTypeId"
-                    />
+            <div class="col-start-1 row-start-4">
+                <label class="font-bold uppercase text-xl mb-2 block">
+                    Type d'expédition
+                </label>
+                <div class="grid grid-cols-2 gap-x-8">
+                    <div
+                        v-for="type in bovineShipment"
+                        :key="type.id"
+                        class="mt-8 flex flex-row gap-6"
+                    >
+                        <UiNumberInput
+                            :label="type.label"
+                            v-model="bovineQuantities[String(type.id)]"
+                            :placeholder="0"
+                            :min="0"
+                            :max="10"
+                        />
+                    </div>
                 </div>
             </div>
             <!--    Client        -->
@@ -52,7 +49,7 @@
                 label="Client"
                 :options="customers.map((customer) => ({
                     value: String(customer.id),
-                    label: customer.name || `Client #${customer.id}`
+                    label: customer.label
                 }))"
                 :loading="isLoadingCustomers"
                 wrapper-class="col-start-1 row-start-5"
@@ -100,7 +97,6 @@
                 }))"
                 :loading="isLoadingDrivers"
                 wrapper-class="col-start-2 row-start-4"
-                v-if="isLiotCarrier"
             />
             <!-- Plaque d'immatriculation (hors LIOT)        -->
             <div v-if="!isLiotCarrier" class="col-start-2 row-start-5">
@@ -181,9 +177,8 @@ const isLoadingDrivers = ref(false)
 const authStore = useAuthStore()
 const shipmentStore = useShipmentStore()
 const router = useRouter()
+const bovineQuantities = ref<Record<string, number | null>>({})
 const bovineShipment = ref<ShipmentTypeData[]>([])
-const selectedShipmentTypeId = ref('')
-const shipmentQuantity = ref<number | null>(0)
 // Transporteur sélectionné dans le formulaire
 const selectedCarrier = computed(() =>
     carriers.value.find((carrier) => String(carrier.id) === form.carrierId) ?? null
@@ -333,21 +328,15 @@ watch(
         form.driverId = shipment?.driver?.id ? String(shipment.driver.id) : ''
         form.vehicleId = shipment?.vehicle?.id ? String(shipment.vehicle.id) : ''
         if (!shipment || !shipment.bovinShipments) {
-            selectedShipmentTypeId.value = ''
-            shipmentQuantity.value = 0
+            bovineQuantities.value = {}
         } else {
-            const selectedEntry = shipment.bovinShipments.find((entry) => {
+            const next: Record<string, number | null> = {}
+            for (const entry of shipment.bovinShipments) {
                 const typeId = entry.shipmentType?.id
-                return Boolean(typeId) && Number(entry.nbBovinSend ?? 0) > 0
-            }) ?? shipment.bovinShipments.find((entry) => Boolean(entry.shipmentType?.id))
-
-            if (!selectedEntry?.shipmentType?.id) {
-                selectedShipmentTypeId.value = ''
-                shipmentQuantity.value = 0
-            } else {
-                selectedShipmentTypeId.value = String(selectedEntry.shipmentType.id)
-                shipmentQuantity.value = selectedEntry.nbBovinSend ?? 0
+                if (!typeId) continue
+                next[String(typeId)] = entry.nbBovinSend ?? null
             }
+            bovineQuantities.value = next
         }
         isHydrating.value = false
     },
@@ -355,7 +344,7 @@ watch(
 )
 // Ajuste driver/vehicle quand le transporteur change (logique LIOT)
 watch(
-    () => [form.customerId, form.addressId, customers.value],
+    () => [form.customerId, customers.value],
     () => {
         if (!form.customerId) {
             form.addressId = ''
@@ -372,11 +361,7 @@ watch(
             (address) => String(address.id) === form.addressId
         )
         if (!matches) {
-            if (customerAddresses.value.length === 1) {
-                form.addressId = String(customerAddresses.value[0].id)
-            } else {
-                form.addressId = ''
-            }
+            form.addressId = ''
         }
     },
     {immediate: true}
@@ -475,22 +460,16 @@ watch(
     }
 )
 const buildDesiredBovinShipments = () => {
-    const typeId = Number(selectedShipmentTypeId.value)
-    if (!Number.isFinite(typeId)) {
-        return []
-    }
-    const type = bovineShipment.value.find((entry) => entry.id === typeId)
-    if (!type) {
-        return []
-    }
-    const raw = shipmentQuantity.value
-    const quantity = raw === null || raw === undefined ? 0 : Number(raw)
-    const normalizedQuantity = Number.isFinite(quantity) ? Math.max(0, Math.trunc(quantity)) : 0
-    if (normalizedQuantity <= 0) {
-        return []
-    }
-
-    return [{type, quantity: normalizedQuantity}]
+    return bovineShipment.value
+        .map((type) => {
+            const raw = bovineQuantities.value[String(type.id)]
+            const quantity = raw === null || raw === undefined ? 0 : Number(raw)
+            return {
+                type,
+                quantity: Number.isFinite(quantity) ? Math.max(0, Math.trunc(quantity)) : 0
+            }
+        })
+        .filter((entry) => entry.quantity > 0)
 }
 const syncBovinShipments = async (
     shipmentId: number,

frontend/components/shipment/shipment-loading.vue

@@ -1,26 +0,0 @@
-<template>
-    <div class="flex flex-col items-center gap-16">
-        <h1 class="font-bold text-5xl uppercase">Charment des bovins</h1>
-        <div
-            class="w-full flex flex-col items-center justify-center">
-            <UiLoadingDots />
-        </div>
-        <button
-            class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px] ml-4"
-            @click="goNext"
-        >Pesée</button>
-    </div>
-</template>
-
-<script setup lang="ts">
-import {useShipmentStore} from "~/stores/shipment";
-
-const shipmentStore = useShipmentStore()
-
-const goNext = async () => {
-    const nextStep = shipmentStore.current.currentStep + 1
-    await shipmentStore.updateShipment(shipmentStore.current.id, {
-        currentStep: nextStep
-    })
-}
-</script>

frontend/components/ui/UiCheckbox.vue

@@ -1,14 +1,14 @@
 <template>
     <div :class="wrapperClass">
         <label
-            class="flex items-center gap-2 cursor-pointer"
+            class="flex items-center gap-2"
             :class="labelClass"
         >
             <input
                 type="checkbox"
                 :checked="checked"
                 :disabled="disabled"
-                :class="['cursor-pointer', inputClass]"
+                :class="inputClass"
                 @change="onChange"
             >
             <span v-if="label">{{ label }}</span>

frontend/components/ui/UiDateInput.vue

@@ -3,7 +3,7 @@
         <label
             v-if="label"
             :for="id"
-            class="font-bold uppercase text-xl"
+            class="font-bold uppercase text-xl mb-2"
             :class="labelClass"
         >
             {{ label }}
@@ -14,7 +14,7 @@
             :value="modelValue ?? ''"
             :disabled="disabled"
             v-bind="attrs"
-            class="border-b border-black justify-self-start text-xl py-[6px] uppercase bg-transparent appearance-none h-[34px]"
+            class="border-b border-black justify-self-start text-xl pb-[6px] uppercase bg-transparent appearance-none h-[34px]"
             :class="[
                 isEmpty ? 'text-neutral-400' : 'text-black',
                 disabled ? 'cursor-not-allowed' : 'cursor-pointer',

frontend/components/ui/UiNumberInput.vue

@@ -3,7 +3,7 @@
         <label
             v-if="label"
             :for="id"
-            class="text-xl flex items-center gap-2"
+            class="text-xl text-bold flex items-center"
             :class="labelClass"
         >
             <span
@@ -25,7 +25,7 @@
             :step="step"
             :disabled="disabled"
             v-bind="attrs"
-            class="border-b border-black text-xl bg-transparent w-16"
+            class="border-b border-black text-xl bg-transparent w-12"
             :class="[
                 isEmpty ? 'text-neutral-400' : 'text-black',
                 disabled ? 'cursor-not-allowed' : 'cursor-text',
@@ -74,41 +74,14 @@ const emit = defineEmits<{
 const attrs = useAttrs()
 const isEmpty = computed(() => props.modelValue === null || props.modelValue === undefined || props.modelValue === '')
 
-const toNumberOrNull = (value: number | string | undefined) => {
-    if (value === undefined || value === '') {
-        return null
-    }
-    const parsed = Number(value)
-    return Number.isFinite(parsed) ? parsed : null
-}
-
 const onInput = (event: Event) => {
     const target = event.target as HTMLInputElement
     if (target.value === '') {
         emit('update:modelValue', null)
         return
     }
-    const parsed = Number(target.value)
-    if (!Number.isFinite(parsed)) {
-        emit('update:modelValue', null)
-        return
-    }
-
-    const min = toNumberOrNull(props.min)
-    const max = toNumberOrNull(props.max)
-
-    let numeric = parsed
-    if (min !== null) {
-        numeric = Math.max(min, numeric)
-    } else {
-        numeric = Math.max(0, numeric)
-    }
-    if (max !== null) {
-        numeric = Math.min(max, numeric)
-    }
-
-    target.value = String(numeric)
-    emit('update:modelValue', numeric)
+    const numeric = Math.max(0, Number(target.value))
+    emit('update:modelValue', Number.isNaN(numeric) ? null : numeric)
 }
 
 const onKeydown = (event: KeyboardEvent) => {

frontend/components/ui/UiRadioGroup.vue

@@ -1,93 +0,0 @@
-<template>
-    <div :class="['flex flex-col', wrapperClass]">
-        <label
-            v-if="label"
-            class="font-bold uppercase text-xl"
-            :class="labelClass"
-        >
-            {{ label }}
-        </label>
-        <div
-            role="radiogroup"
-            :aria-label="label || id || 'radio-group'"
-            :class="['flex items-center gap-6 mt-1', groupClass]"
-        >
-            <label
-                v-for="option in options"
-                :key="String(option.value)"
-                :for="`${id || 'radio'}-${option.value}`"
-                class="flex items-center gap-2"
-                :class="itemClass"
-            >
-                <input
-                    :id="`${id || 'radio'}-${option.value}`"
-                    type="radio"
-                    :name="name || id || 'radio-group'"
-                    :value="String(option.value)"
-                    :checked="String(modelValue ?? '') === String(option.value)"
-                    :disabled="disabled"
-                    v-bind="attrs"
-                    class="h-4 w-4 border-slate-300 text-primary-500 focus:ring-primary-500"
-                    :class="[
-                        disabled ? 'cursor-not-allowed' : 'cursor-pointer',
-                        inputClass
-                    ]"
-                    @change="onChange"
-                >
-                <span class="text-xl" :class="optionLabelClass">
-                    {{ option.label }}
-                </span>
-            </label>
-        </div>
-    </div>
-</template>
-
-<script setup lang="ts">
-import { useAttrs } from 'vue'
-
-type RadioOption = {
-    value: string | number
-    label: string
-}
-
-defineOptions({ inheritAttrs: false })
-
-const props = withDefaults(
-    defineProps<{
-        id?: string
-        name?: string
-        label?: string
-        modelValue: string | number | null | undefined
-        options: RadioOption[]
-        disabled?: boolean
-        wrapperClass?: string
-        labelClass?: string
-        groupClass?: string
-        itemClass?: string
-        inputClass?: string
-        optionLabelClass?: string
-    }>(),
-    {
-        name: '',
-        label: '',
-        disabled: false,
-        wrapperClass: '',
-        labelClass: '',
-        groupClass: '',
-        itemClass: '',
-        inputClass: '',
-        optionLabelClass: ''
-    }
-)
-
-const emit = defineEmits<{
-    (event: 'update:modelValue', value: string): void
-}>()
-
-const attrs = useAttrs()
-
-const onChange = (event: Event) => {
-    const target = event.target as HTMLInputElement
-    emit('update:modelValue', target.value)
-}
-</script>

frontend/components/ui/UiSelect.vue

@@ -3,7 +3,7 @@
         <label
             v-if="label"
             :for="id"
-            class="font-bold uppercase text-xl"
+            class="font-bold uppercase text-xl mb-2"
             :class="labelClass"
         >
             {{ label }}
@@ -13,7 +13,7 @@
             :value="modelValue ?? ''"
             :disabled="disabled || loading"
             v-bind="attrs"
-            class="border-b border-black justify-self-start text-xl py-[6px] bg-transparent"
+            class="border-b border-black justify-self-start text-xl pb-[6px] bg-transparent"
             :class="[
                 isEmpty ? 'text-neutral-400' : 'text-black',
                 disabled || loading ? 'cursor-not-allowed' : 'cursor-pointer',

frontend/components/ui/UiTextInput.vue

@@ -3,7 +3,7 @@
         <label
             v-if="label"
             :for="id"
-            class="font-bold uppercase text-xl"
+            class="font-bold uppercase text-xl mb-2"
             :class="labelClass"
         >
             {{ label }}
@@ -16,7 +16,7 @@
             :maxlength="maxlength"
             :disabled="disabled"
             v-bind="attrs"
-            class="border-b border-black text-xl py-[6px] bg-transparent"
+            class="border-b border-black text-xl pb-[6px] bg-transparent"
             :class="[
                 isEmpty ? 'text-neutral-400' : 'text-black',
                 disabled ? 'cursor-not-allowed' : 'cursor-text',

frontend/components/ui/license-plate-input.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="flex flex-col">
-    <label :for="inputId" class="font-bold uppercase text-xl">{{ label }}</label>
+    <label :for="inputId" class="font-bold uppercase text-xl mb-2">{{ label }}</label>
       <div class="flex items-end gap-8">
           <input
               :id="inputId"

frontend/constants/steps.ts

@@ -1,10 +1,9 @@
 export enum StepLabel {
     Reception = 'Réception',
     GrossWeighing = 'Pesée à plein',
-    Selection = 'Sélection réception',
+    Selection = 'Sélection réceptionnées',
     TareWeighing = 'Pesée à vide',
     Shipment = 'Expédition',
-    ShipmentLoading = 'Chargement',
 }
 
 export const RECEPTION_STEP_LABELS = [
@@ -17,6 +16,5 @@ export const RECEPTION_STEP_LABELS = [
 export const SHIPMENT_STEP_LABELS = [
     StepLabel.Shipment,
     StepLabel.TareWeighing,
-    StepLabel.ShipmentLoading,
     StepLabel.GrossWeighing,
 ]

frontend/i18n/locales/fr.json

@@ -115,10 +115,6 @@
             "create": "Fournisseur créé avec succès.",
             "update": "Fournisseur mis à jour avec succès."
         },
-        "customer": {
-            "create": "Client créé avec succès.",
-            "update": "Client mis à jour avec succès."
-        },
         "address": {
             "create": "Adresse créée avec succès.",
             "update": "Adresse mise à jour avec succès."

frontend/layouts/admin.vue

@@ -0,0 +1,74 @@
+<template>
+    <div class="min-h-screen text-neutral-900 grid grid-rows-[85px,1fr]">
+        <!-- HEADER -->
+        <header class="bg-primary-500 z-50 h-[85px]">
+            <div class="h-full w-full px-6 grid grid-cols-[auto,1fr,auto] items-center gap-8">
+                <NuxtLink to="/" class="grid place-items-center">
+          <span class="grid place-items-center bg-white text-xl font-bold uppercase text-primary-500 p-4">
+            LOGO
+          </span>
+                </NuxtLink>
+
+                <nav class="text-2xl font-bold uppercase text-white"></nav>
+
+                <NuxtLink
+                    to="/"
+                    class="text-xl font-bold uppercase text-white transition hover:opacity-80 justify-self-end"
+                >
+                    Quitter le panel admin
+                </NuxtLink>
+            </div>
+        </header>
+
+        <div class="grid grid-cols-[16rem,1fr] h-[calc(100vh-85px)] min-h-0">
+            <aside class="bg-primary-500 text-white min-h-0 flex flex-col justify-between">
+                <div class="flex flex-col gap-4 p-4 font-bold text-xl">
+                    <!-- Liste des liens à ajouter ci-dessous -->
+                    <NuxtLink to="/admin/dashboard">
+                        Tableau de bord
+                    </NuxtLink>
+                    <NuxtLink to="/admin/supplier/supplier-list">
+                        Fournisseur
+                    </NuxtLink>
+                    <NuxtLink to="/admin/carrier/carrier-list">
+                        Transporteur
+                    </NuxtLink>
+                    <NuxtLink to="/admin/user/list">
+                        Utilisateurs
+                    </NuxtLink>
+                </div>
+
+                <div class="p-4">
+                        <p class="font-bold text-white text-left">v{{ version }}</p>
+                    <button
+                        @click="handleLogout"
+                        class="w-full bg-red-600 hover:bg-red-700 py-2 rounded font-bold"
+                    >
+                        Déconnexion
+                    </button>
+                </div>
+            </aside>
+
+            <main class="min-h-0 overflow-auto px-12 py-12 ">
+                <div class="w-full ">
+                    <slot />
+                </div>
+            </main>
+        </div>
+    </div>
+</template>
+
+
+<script setup lang="ts">
+import {useAuthStore} from '~/stores/auth'
+
+const auth = useAuthStore()
+const { version } = useAppVersion()
+const handleLogout = async () => {
+    try {
+        await auth.logout()
+    } finally {
+        await navigateTo('/login')
+    }
+}
+</script>

frontend/layouts/default.vue

@@ -1,148 +1,53 @@
 <template>
-    <div class="min-h-screen text-neutral-900 flex flex-col">
-        <!-- HEADER -->
-        <header class="w-full bg-primary-500 py-5 px-6">
-            <div class="flex w-full items-center ">
-                <!-- Burger (mobile) -->
+    <div class="min-h-screen bg-white text-neutral-900">
+        <header class="w-full border-b border-neutral-200 bg-primary-500">
+            <div class="flex w-full items-center justify-center px-6 py-4">
                 <button
                     type="button"
                     class="inline-flex items-center justify-center text-3xl text-white md:hidden"
                     aria-label="Ouvrir le menu"
                     @click="toggleMenu"
                 >
-          <span aria-hidden="true" class="flex items-center">
-            <Icon name="mdi:menu" size="44"/>
-          </span>
+                    <span aria-hidden="true" class="flex items-center"><Icon name="mdi:menu" size="44"/></span>
                 </button>
-
-                <!-- Logo -->
-                <NuxtLink to="/" class="shrink-0">
-          <span class="flex items-center justify-center bg-white text-xl font-bold uppercase px-6 py-4">
-            LOGO
-          </span>
-                </NuxtLink>
-
-                <!-- NAV centré (desktop) -->
-                <nav
-                    class="hidden md:flex flex-1 items-center justify-center gap-8 text-xl font-bold uppercase text-white"
-                >
-                    <NuxtLink to="/" custom v-slot="{ href, navigate }">
+                <nav class="ml-4 hidden items-center gap-8 text-2xl font-bold uppercase text-white md:flex">
+                    <NuxtLink to="/" custom v-slot="{ href, navigate, isExactActive }">
                         <a
                             :href="href"
                             @click="navigate"
-                            :class="route.path === '/'
-                ? 'opacity-100'
-                : 'opacity-65 hover:opacity-100 transition'"
+                            :class="isExactActive ? 'opacity-100' : 'opacity-50'"
                         >
                             Accueil
                         </a>
                     </NuxtLink>
-
                     <NuxtLink
+                        to="/admin/dashboard" custom v-slot="{ href, navigate, isActive }"
                         v-if="auth.isAdmin"
-                        to="/admin/supplier/supplier-list"
-                        custom
-                        v-slot="{ href, navigate }"
                     >
                         <a
                             :href="href"
                             @click="navigate"
-                            :class="route.path.startsWith('/admin/supplier')
-                ? 'opacity-100'
-                : 'opacity-65 hover:opacity-100 transition'"
                         >
-                            Fournisseurs
-                        </a>
-                    </NuxtLink>
-
-                    <NuxtLink
-                        v-if="auth.isAdmin"
-                        to="/admin/carrier/carrier-list"
-                        custom
-                        v-slot="{ href, navigate }"
-                    >
-                        <a
-                            :href="href"
-                            @click="navigate"
-                            :class="route.path.startsWith('/admin/carrier')
-                ? 'opacity-100'
-                : 'opacity-65 hover:opacity-100 transition'"
-                        >
-                            Transporteurs
-                        </a>
-                    </NuxtLink>
-
-                    <NuxtLink
-                        v-if="auth.isAdmin"
-                        to="/admin/user/list"
-                        custom
-                        v-slot="{ href, navigate }"
-                    >
-                        <a
-                            :href="href"
-                            @click="navigate"
-                            :class="route.path.startsWith('/admin/user')
-                ? 'opacity-100'
-                : 'opacity-65 hover:opacity-100 transition'"
-                        >
-                            Utilisateurs
-                        </a>
-                    </NuxtLink>
-
-                    <NuxtLink
-                        v-if="auth.isAdmin"
-                        to="/admin/customer/customer-list"
-                        custom
-                        v-slot="{ href, navigate }"
-                    >
-                        <a
-                            :href="href"
-                            @click="navigate"
-                            :class="route.path.startsWith('/admin/customer')
-                ? 'opacity-100'
-                : 'opacity-65 hover:opacity-100 transition'"
-                        >
-                            Clients
+                            Admin
                         </a>
                     </NuxtLink>
                 </nav>
-
-                <!-- Spacer mobile (pour centrer visuellement le header si besoin) -->
+                <NuxtLink to="/" class="flex flex-1 items-center justify-center gap-3">
+                  <span
+                      class="flex items-center justify-center bg-white text-xl font-bold uppercase text-primary-500 p-4"
+                  >
+                    LOGO
+                  </span>
+                </NuxtLink>
                 <div class="w-[44px] md:hidden"></div>
-
-                <!-- User dropdown à droite (desktop) -->
-                <div v-if="auth.isAuthenticated" class="ml-auto relative hidden md:flex items-center text-white">
-                    <button
-                        type="button"
-                        class="inline-flex items-center text-xl leading-none transition hover:opacity-80"
-                        @click="toggleUserMenu"
-                        aria-haspopup="true"
-                        :aria-expanded="isUserMenuOpen ? 'true' : 'false'"
-                    >
-                        <span class="capitalize font-bold">{{ userDisplayName }}</span>
-                        <span class="ml-[6px] inline-flex items-center font-bold">
-                            <Icon v-if="isUserMenuOpen" name="mdi:chevron-up" size="20"/>
-                            <Icon v-else name="mdi:chevron-down" size="20"/>
-                        </span>
-                    </button>
-
-                    <div
-                        v-if="isUserMenuOpen"
-                        class="absolute right-0 top-full z-10 mt-2 w-56 rounded-md bg-primary-500 py-2 border-neutral-300 border shadow-lg"
-                        role="menu"
-                    >
-                        <button
-                            type="button"
-                            class="w-full px-4 py-2 text-left text-sm font-semibold text-white opacity-85 hover:opacity-100 transition"
-                            @click="handleLogout"
-                        >
-                            Déconnexion
-                        </button>
-                    </div>
-                </div>
+                <button
+                    type="button"
+                    class="ml-auto hidden text-xl font-bold uppercase text-white transition hover:opacity-80 md:inline-flex"
+                    @click="handleLogout"
+                >
+                    Déconnexion
+                </button>
             </div>
-
-            <!-- Overlay (mobile) -->
             <transition
                 enter-active-class="transition duration-200 ease-out"
                 enter-from-class="opacity-0"
@@ -157,8 +62,6 @@
                     @click="closeMenu"
                 />
             </transition>
-
-            <!-- Drawer (mobile) -->
             <transition
                 enter-active-class="transition duration-200 ease-out"
                 enter-from-class="-translate-x-full"
@@ -184,27 +87,12 @@
                             <Icon name="mdi:close" size="44"/>
                         </button>
                     </div>
-
                     <nav class="mt-8 flex flex-col gap-6 text-xl font-bold uppercase">
-                        <NuxtLink to="/admin/dashboard" @click="closeMenu">Accueil</NuxtLink>
-                        <NuxtLink v-if="auth.isAdmin" to="/admin/supplier/supplier-list" @click="closeMenu">
-                            Fournisseurs
-                        </NuxtLink>
-                        <NuxtLink v-if="auth.isAdmin" to="/admin/carrier/carrier-list" @click="closeMenu">
-                            Transporteurs
-                        </NuxtLink>
-                        <NuxtLink v-if="auth.isAdmin" to="/admin/user/list" @click="closeMenu">
-                            Utilisateurs
-                        </NuxtLink>
-                        <NuxtLink v-if="auth.isAdmin" to="/admin/customer/customer-list" @click="closeMenu">
-                            Clients
-                        </NuxtLink>
+                        <NuxtLink to="/" class="opacity-100" @click="closeMenu">Accueil</NuxtLink>
                     </nav>
-
                     <button
-                        v-if="auth.isAuthenticated"
                         type="button"
-                        class="mt-6 text-xl font-bold uppercase"
+                        class="mt-5 text-xl font-bold uppercase"
                         @click="handleLogout"
                     >
                         Déconnexion
@@ -212,12 +100,10 @@
                 </aside>
             </transition>
         </header>
-
-        <main class="mx-auto w-full max-w-[1280px] py-2 flex-1">
+        <main class="mx-auto w-full max-w-[1280px] pb-0">
             <slot/>
         </main>
-
-        <footer class="w-full mt-auto bg-primary-500 px-6 py-3">
+        <footer class="w-full mt-8 bg-primary-500 p-6">
             <p class="font-bold text-white text-right">v{{ version }}</p>
         </footer>
     </div>
@@ -228,12 +114,8 @@ import {useAuthStore} from '~/stores/auth'
 
 const route = useRoute()
 const auth = useAuthStore()
-const {version} = useAppVersion()
-
 const isMenuOpen = ref(false)
-const isUserMenuOpen = ref(false)
-
-const userDisplayName = computed(() => auth.user?.username ?? 'Utilisateur')
+const {version} = useAppVersion()
 
 const closeMenu = () => {
     isMenuOpen.value = false
@@ -241,14 +123,6 @@ const closeMenu = () => {
 
 const toggleMenu = () => {
     isMenuOpen.value = !isMenuOpen.value
-    // évite d’avoir deux menus ouverts en même temps
-    if (isMenuOpen.value) isUserMenuOpen.value = false
-}
-
-const toggleUserMenu = () => {
-    isUserMenuOpen.value = !isUserMenuOpen.value
-    // idem
-    if (isUserMenuOpen.value) isMenuOpen.value = false
 }
 
 const handleLogout = async () => {
@@ -256,7 +130,6 @@ const handleLogout = async () => {
         await auth.logout()
     } finally {
         closeMenu()
-        isUserMenuOpen.value = false
         await navigateTo('/login')
     }
 }

frontend/pages/admin/carrier/[[id]].vue

@@ -45,7 +45,7 @@ const form = reactive<CarrierFormData>({
 })
 
 definePageMeta({
-    layout: 'default'
+    layout: 'admin'
 })
 
 const hydrateFromUser = (carrier: CarrierData | null) => {

frontend/pages/admin/carrier/carrier-list.vue

@@ -42,7 +42,7 @@ const goToCarrier = (id: number) => {
 }
 
 definePageMeta({
-    layout: 'default'
+    layout: 'admin'
 })
 
 onMounted(async () => {

frontend/pages/admin/customer/[[id]].vue

@@ -1,197 +0,0 @@
-<template>
-    <form @submit.prevent="validate">
-        <div class="flex items-center justify-between">
-            <h1 class="text-3xl font-bold uppercase">
-                {{ customerId ? "Modifications du client" : "Ajout d'un client" }}
-            </h1>
-
-            <button
-                class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px]"
-                type="submit"
-                :disabled="isLoading || !auth.isAdmin"
-            >
-                {{ customerId ? "Sauvegarder" : "Ajouter" }}
-            </button>
-        </div>
-
-        <div class="grid grid-cols-2 gap-y-8 gap-x-80 mb-10 py-12">
-            <UiTextInput id="customer-name" v-model="form.name" label="Nom du client" :disabled="!auth.isAdmin"/>
-            <UiTextInput id="customer-phone" v-model="form.phone" label="Téléphone" :disabled="!auth.isAdmin"/>
-            <UiTextInput id="customer-email" v-model="form.email" label="Email" :disabled="!auth.isAdmin"/>
-        </div>
-
-        <div class="mx-24 mb-4 py-6 border-t border-black"></div>
-        <div class="flex items-center justify-between mb-4">
-            <h2 class="text-3xl font-bold uppercase">Adresses client</h2>
-            <button
-                type="button"
-                class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px]"
-                :disabled="customerId === null || !auth.isAdmin"
-                @click="goToAddAddress"
-            >
-                Ajouter
-            </button>
-        </div>
-        <div class="overflow-x-auto mb-10">
-            <table class="w-full border-collapse">
-                <thead>
-                <tr class="text-left border-b border-gray-200">
-                    <th class="py-3 pr-4 text-sm uppercase">Libellé</th>
-                    <th class="py-3 pr-4 text-sm uppercase">Rue</th>
-                    <th class="py-3 pr-4 text-sm uppercase">Complément</th>
-                    <th class="py-3 pr-4 text-sm uppercase">Code postal</th>
-                    <th class="py-3 pr-4 text-sm uppercase">Ville</th>
-                    <th class="py-3 pr-4 text-sm uppercase">Pays</th>
-                </tr>
-                </thead>
-                <tbody>
-                <template v-if="form.addresses.length === 0">
-                    <tr>
-                        <td colspan="6" class="py-4 text-slate-400">
-                            Aucune adresse.
-                        </td>
-                    </tr>
-                </template>
-                <template v-else>
-                    <tr
-                        v-for="(address, index) in form.addresses"
-                        :key="address.id ?? index"
-                        class="border-b border-gray-100 hover:bg-slate-50"
-                        :class="auth.isAdmin ? 'cursor-pointer' : 'cursor-not-allowed opacity-60'"
-                        @click="goToEditAddress(address.id ?? null)"
-                    >
-                        <td class="py-3 pr-4">{{ address.label || "—" }}</td>
-                        <td class="py-3 pr-4">{{ address.street || "—" }}</td>
-                        <td class="py-3 pr-4">{{ address.street2 || "—" }}</td>
-                        <td class="py-3 pr-4">{{ address.postalCode || "—" }}</td>
-                        <td class="py-3 pr-4">{{ address.city || "—" }}</td>
-                        <td class="py-3 pr-4">{{ address.countryCode || "—" }}</td>
-                    </tr>
-                </template>
-                </tbody>
-            </table>
-        </div>
-    </form>
-</template>
-
-<script setup lang="ts">
-import {computed, reactive, ref, watch} from "vue"
-import {createCustomer, getCustomer, updateCustomer} from "~/services/customer"
-import type {CustomerData, CustomerFormData, CustomerPayload} from "~/services/dto/customer-data"
-import {useAuthStore} from "~/stores/auth"
-
-definePageMeta({layout: "default"})
-
-const route = useRoute()
-const router = useRouter()
-const auth = useAuthStore()
-
-const resolveId = (param: unknown) => {
-    const idStr = Array.isArray(param) ? param[0] : param
-    if (!idStr) return null
-    const id = Number(idStr)
-    return Number.isFinite(id) ? id : null
-}
-const customerId = computed(() => resolveId(route.params.id))
-const isLoading = ref(false)
-const form = reactive<CustomerFormData>({
-    name: "",
-    phone: "",
-    email: "",
-    addresses: [],
-})
-
-const goToAddAddress = () => {
-    if (customerId.value === null || !auth.isAdmin) return
-    router.push({
-        path: "/admin/customer/address",
-        query: {
-            customerId: String(customerId.value),
-        },
-    })
-}
-
-const goToEditAddress = (addressId: number | null) => {
-    if (customerId.value === null || addressId === null || !auth.isAdmin) return
-    router.push({
-        path: "/admin/customer/address",
-        query: {
-            customerId: String(customerId.value),
-            addressId: String(addressId),
-        },
-    })
-}
-
-const hydrateFromCustomer = (customer: CustomerData | null) => {
-    if (!customer) return
-    form.name = customer.name ?? ""
-    form.phone = customer.phone ?? ""
-    form.email = customer.email ?? ""
-    if (!Array.isArray(customer.addresses) || customer.addresses.length === 0) {
-        form.addresses = []
-        return
-    }
-    if (typeof customer.addresses[0] === "string") {
-        form.addresses = []
-        return
-    }
-
-    form.addresses = customer.addresses.map((address) => ({
-        id: address.id ?? null,
-        label: address.label ?? "",
-        street: address.street ?? "",
-        street2: address.street2 ?? null,
-        postalCode: address.postalCode ?? "",
-        city: address.city ?? "",
-        countryCode: address.countryCode ?? "",
-    }))
-}
-
-watch(
-    () => customerId.value,
-    async (id) => {
-        if (id === null) return
-        isLoading.value = true
-        try {
-            const customer = await getCustomer(id)
-            hydrateFromCustomer(customer)
-        } finally {
-            isLoading.value = false
-        }
-    },
-    {immediate: true}
-)
-
-async function validate() {
-    if (isLoading.value) return
-    if (!auth.isAdmin) return
-    isLoading.value = true
-
-    try {
-        const name = form.name.trim()
-        const phone = form.phone?.trim() || null
-        const email = form.email?.trim() || null
-
-        const customerPayload: CustomerPayload = {
-            name,
-            phone,
-            email,
-        }
-        let targetId: number | null = null
-
-        if (customerId.value !== null) {
-            await updateCustomer(customerId.value, customerPayload)
-            targetId = customerId.value
-        } else {
-            const created = await createCustomer(customerPayload)
-            targetId = created.id
-        }
-
-        if (targetId !== null) {
-            await router.push(`/admin/customer/${targetId}`)
-        }
-    } finally {
-        isLoading.value = false
-    }
-}
-</script>

frontend/pages/admin/customer/address.vue

@@ -1,49 +0,0 @@
-<template>
-    <Address type="customer" :address="address" @validate="validate"/>
-</template>
-
-<script setup lang="ts">
-import type { AddressData, AddressPayload } from "~/services/address"
-import { createAddress, getAddress, updateAddress } from "~/services/address"
-import { getCustomer, updateCustomer } from "~/services/customer"
-import type { CustomerData } from "~/services/dto/customer-data"
-
-definePageMeta({ layout: "default" })
-
-const route = useRoute()
-const router = useRouter()
-const customerId = computed(() => Number(route.query.customerId))
-const customer = ref<CustomerData | null>(null)
-const addressId = computed(() => (route.query.addressId !== undefined ? Number(route.query.addressId) : null))
-const address = ref<AddressData | null>(null)
-
-const validate = async (payload: AddressPayload) => {
-    try {
-        if (addressId.value !== null) {
-            await updateAddress(addressId.value, payload)
-        } else {
-            await addAddress(payload)
-        }
-    } finally {
-        await router.push("/admin/customer/" + customerId.value)
-    }
-}
-
-const addAddress = async (payload: AddressPayload) => {
-    const response: AddressData = await createAddress(payload)
-    const addressIRI = `/api/addresses/${response.id}`
-    const existingIris = (customer.value?.addresses ?? [])
-        .map((item: any) => (typeof item === "string" ? item : `/api/addresses/${item.id}`))
-        .filter((iri: string | null) => Boolean(iri)) as string[]
-    const next = [...new Set([...existingIris, addressIRI])]
-
-    return await updateCustomer(customerId.value, { addresses: next })
-}
-
-onMounted(async () => {
-    customer.value = await getCustomer(customerId.value)
-    if (addressId.value !== null) {
-        address.value = await getAddress(addressId.value)
-    }
-})
-</script>

frontend/pages/admin/customer/customer-list.vue

@@ -1,116 +0,0 @@
-<template>
-    <div class="flex items-center justify-between">
-        <h1 class="text-3xl font-bold uppercase">Liste des Clients</h1>
-        <NuxtLink
-            to="/admin/customer"
-            class="flex items-center justify-center text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px]"
-            :class="auth.isAdmin ? '' : 'cursor-not-allowed opacity-60'"
-            @click="handleAddClick"
-        >
-            Ajouter
-        </NuxtLink>
-    </div>
-
-    <div v-if="auth.isAdmin" class="mt-6 border border-slate-200 mb-16">
-        <div class="max-h-96 overflow-y-auto">
-            <div
-                class="sticky top-0 z-10 grid grid-cols-8 gap-4 bg-slate-100 px-4 py-3 text-sm font-semibold uppercase tracking-wide"
-            >
-                <div>Nom</div>
-                <div>Téléphone</div>
-                <div>Email</div>
-                <div>Rue</div>
-                <div>Complément</div>
-                <div>Code Postal</div>
-                <div>Ville</div>
-                <div>Pays</div>
-            </div>
-
-            <div v-if="customerList.length === 0" class="px-4 py-6 text-slate-400">
-                Aucun client.
-            </div>
-
-            <div v-for="customer in customerList" :key="customer.id">
-                <div
-                    v-if="!customer.addresses || customer.addresses.length === 0"
-                    class="grid grid-cols-8 border-t gap-4 px-4 py-2 hover:bg-slate-50 cursor-pointer"
-                    @click="goToCustomer(customer.id)"
-                >
-                    <div class="truncate">{{ customer.name || "—" }}</div>
-                    <div class="truncate">{{ customer.phone || "—" }}</div>
-                    <div class="truncate">{{ customer.email || "—" }}</div>
-                    <div class="col-span-1">Pas d'adresse</div>
-                    <div class="uppercase truncate">{{"—"}}</div>
-                    <div class="uppercase truncate">{{"—"}}</div>
-                    <div class="uppercase truncate">{{"—"}}</div>
-                    <div class="uppercase truncate">{{"—"}}</div>
-                </div>
-
-                <template v-else-if="customer.addresses.length > 0">
-                    <div
-                        v-for="(address, idx) in customer.addresses"
-                        :key="address.id ?? `${customer.id}-${idx}-${address.street}-${address.postalCode}`"
-                        class="grid grid-cols-8 hover:bg-slate-50 border-t gap-4 px-4 py-2 cursor-pointer"
-                        :class="idx > 0 ? 'pl-4 border-l-4 border-l-slate-200 bg-slate-50' : ''"
-                        @click="goToCustomer(customer.id)"
-                    >
-                        <div class="truncate">
-                            {{ idx === 0 ? (customer.name || "—") : "↳" }}
-                        </div>
-                        <div class="truncate">{{ idx === 0 ? (customer.phone || "—") : ""  }}</div>
-                        <div class="truncate">{{ idx === 0 ? (customer.email || "—") : ""  }}</div>
-                        <div class="truncate">{{ address.street || "—" }}</div>
-                        <div class="truncate">{{ address.street2 || "—" }}</div>
-                        <div>{{ address.postalCode || "—"  }}</div>
-                        <div class="uppercase truncate">{{ address.city || "—"  }}</div>
-                        <div class="uppercase truncate">{{ address.countryCode || "—" }}</div>
-                    </div>
-                </template>
-
-                <template v-else>
-                    <div
-                        class="grid grid-cols-8 hover:bg-slate-50 border-t gap-4 px-4 py-2 cursor-pointer"
-                        @click="goToCustomer(customer.id)"
-                    >
-                        <div class="truncate">{{ customer.name || "—" }}</div>
-                        <div class="truncate">{{ customer.phone || "—" }}</div>
-                        <div class="truncate">{{ customer.email || "—" }}</div>
-                        <div class="col-span-5 text-slate-400">
-                            Adresses non chargées
-                        </div>
-                    </div>
-                </template>
-            </div>
-        </div>
-    </div>
-    <div v-else class="mt-6 border border-slate-200 mb-16 px-4 py-6 text-slate-400">
-        Accès réservé aux administrateurs.
-    </div>
-</template>
-
-<script setup lang="ts">
-import { getCustomerList } from "~/services/customer"
-import type { CustomerData } from "~/services/dto/customer-data"
-import { useAuthStore } from "~/stores/auth"
-
-definePageMeta({ layout: "default" })
-
-const customerList = ref<CustomerData[]>([])
-const router = useRouter()
-const auth = useAuthStore()
-
-const goToCustomer = (id: number) => {
-    if (!auth.isAdmin) return
-    router.push(`/admin/customer/${id}`)
-}
-
-const handleAddClick = (event: Event) => {
-    if (auth.isAdmin) return
-    event.preventDefault()
-}
-
-onMounted(async () => {
-    if (!auth.isAdmin) return
-    customerList.value = await getCustomerList()
-})
-</script>

frontend/pages/admin/dashboard.vue

@@ -2,6 +2,6 @@
 </template>
 <script setup lang="ts">
 definePageMeta({
-    layout: 'default'
+    layout: 'admin'
 })
 </script>

frontend/pages/admin/supplier/[[id]].vue

@@ -1,6 +1,6 @@
 <template>
     <form @submit.prevent="validate">
-        <div class="flex items-center justify-between">
+        <div class="flex items-center justify-between gap-10">
             <h1 class="text-3xl font-bold uppercase">
                 {{ supplierId ? "Modifications du fournisseur" : "Ajout d'un fournisseur" }}
             </h1>
@@ -14,13 +14,13 @@
             </button>
         </div>
 
-        <div class="grid grid-cols-2 gap-y-8 gap-x-80 mb-10 py-12">
+        <div class="grid grid-cols-2 gap-y-16 gap-x-12 mb-10 py-12  border-b border-black ">
             <UiTextInput id="supplier-name" v-model="form.name" label="Nom du fournisseur" :disabled="!auth.isAdmin"/>
             <UiTextInput id="supplier-email" v-model="form.email" label="Email" :disabled="!auth.isAdmin"/>
             <UiTextInput id="supplier-phone" v-model="form.phone" label="Téléphone" :disabled="!auth.isAdmin"/>
         </div>
 
-        <div class="mx-24 mb-4 py-6 border-t border-black"></div>
+        <div class="flex items-center justify-between mb-4 py-6 border-t border-black"></div>
         <div class="flex items-center justify-between mb-4">
             <h2 class="text-3xl font-bold uppercase">Adresses fournisseur</h2>
             <button
@@ -80,7 +80,7 @@ import {createSupplier, getSupplier, updateSupplier} from "~/services/supplier"
 import type {SupplierData, SupplierFormData, SupplierPayload} from "~/services/dto/supplier-data"
 import {useAuthStore} from "~/stores/auth"
 
-definePageMeta({layout: "default"})
+definePageMeta({layout: "admin"})
 
 const route = useRoute()
 const router = useRouter()
@@ -179,17 +179,14 @@ async function validate() {
             email,
             phone,
         }
-        let targetId: number | null = null
 
         if (supplierId.value !== null) {
             await updateSupplier(supplierId.value, supplierPayload)
-            targetId = supplierId.value
         } else {
-            const created = await createSupplier(supplierPayload)
-            targetId = created.id
+            await createSupplier(supplierPayload)
         }
 
-        await router.push(`/admin/supplier/${targetId}`)
+        await router.push("/admin/supplier/supplier-list")
     } finally {
         isLoading.value = false
     }

frontend/pages/admin/supplier/address.vue

@@ -8,7 +8,7 @@ import {createAddress, getAddress, updateAddress} from "~/services/address";
 import {getSupplier, updateSupplier} from "~/services/supplier";
 import type {SupplierData} from "~/services/dto/supplier-data";
 
-definePageMeta({ layout: "default" })
+definePageMeta({ layout: "admin" })
 
 const route = useRoute()
 const router = useRouter()

frontend/pages/admin/supplier/supplier-list.vue

@@ -1,6 +1,6 @@
 <template>
     <div class="flex items-center justify-between">
-        <h1 class="text-3xl font-bold uppercase">Liste des fournisseurs</h1>
+        <h1 class="text-3xl font-bold uppercase">Fournisseurs</h1>
         <NuxtLink
             to="/admin/supplier"
             class="flex items-center justify-center text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px]"
@@ -89,7 +89,7 @@ import { getSupplierList } from "~/services/supplier"
 import type { SupplierData } from "~/services/dto/supplier-data"
 import { useAuthStore } from "~/stores/auth"
 
-definePageMeta({ layout: "default" })
+definePageMeta({ layout: "admin" })
 
 const supplierList = ref<SupplierData[]>([])
 const router = useRouter()

frontend/pages/admin/user/[[id]].vue

@@ -39,13 +39,13 @@
 </template>
 <script setup lang="ts">
 definePageMeta({
-    layout: 'default'
+    layout: 'admin'
 })
 
 import {computed, reactive, ref, watch} from 'vue'
 import {ROLE} from '~/utils/constants'
 import {createUser, updateUser, getUser} from '~/services/auth'
-import type {UserData, UserFormData, UserPayload} from '~/services/dto/user-data'
+import type {UserData, UserFormData} from '~/services/dto/user-data'
 
 const route = useRoute()
 const router = useRouter()
@@ -105,12 +105,10 @@ async function validate() {
     const normalizedRole = form.role.trim()
     const normalizedPassword = form.password.trim()
 
-    const basePayload: UserPayload = {
+    const basePayload = {
         username: normalizedUsername,
         roles: normalizedRole ? [normalizedRole] : undefined,
-    }
-    if (normalizedPassword) {
-        basePayload.password = normalizedPassword
+        password: normalizedPassword || undefined
     }
 
     if (userId.value) {

frontend/pages/admin/user/list.vue

@@ -28,7 +28,7 @@
                     {{ user.username }}
                 </div>
                 <div>
-                    {{ getRoleLabels(user.roles) }}
+                    {{ user.roles?.join(', ') || ' ---' }}
                 </div>
             </div>
         </div>
@@ -38,31 +38,19 @@
 
 <script setup lang="ts">
 definePageMeta({
-    layout: 'default'
+    layout: 'admin'
 })
 
 import type {UserData} from "~/services/dto/user-data";
-import {getAdminUsers} from "~/services/auth";
-import {ROLE} from "~/utils/constants";
+import {getAdminUsers, getUsers} from "~/services/auth";
 
 const userList = ref<UserData[]>([])
 const router = useRouter()
-const roleLabelByValue = new Map(ROLE.map((role) => [role.value, role.label]))
 
 const goToUser = (id: number) => {
     router.push(`/admin/user/${id}`)
 }
 
-const getRoleLabels = (roles?: string[]) => {
-    if (!roles || roles.length === 0) {
-        return ' ---'
-    }
-
-    return roles
-        .map((role) => roleLabelByValue.get(role) ?? role)
-        .join(', ')
-}
-
 onMounted(async () => {
     userList.value = await getAdminUsers()
 })

frontend/pages/index.vue

@@ -1,13 +1,13 @@
 <script setup lang="ts">
 </script>
 <template>
-    <div class="flex flex-wrap justify-center mt-8 gap-12 mb-8 md:mb-0">
+    <div class="flex flex-wrap justify-center mt-8 gap-8 mb-8 md:mb-0">
         <card-link label="NOUVELLE RÉCEPTION" link="/reception" iconName="mdi:truck-outline" />
         <card-link label="NOUVELLE EXPÉDITION" link="/shipment" iconName="mdi:truck-fast-outline" />
-        <card-link label="PLAN DE SITE" link="/" iconName="material-symbols:warehouse-outline-rounded" />
+        <card-link label="PLAN DE SITE" link="/" iconName="mdi:warehouse" />
         <card-link label="RÉCEPTIONS EN ATTENTE" link="/reception/waiting-reception" iconName="mdi:truck-remove-outline" />
         <card-link label="EXPÉDITIONS EN ATTENTE" link="/shipment/waiting-shipment" iconName="mdi:truck-cargo-container" />
-        <card-link label="CASES" link="/" iconName="material-symbols:bottom-sheets-outline" />
+        <card-link label="CASES" link="/" iconName="mdi:cube-outline" />
         <card-link label="RÉCEPTIONS FINIES" link="/reception/finish-reception" iconName="mdi:truck-check-outline" />
         <card-link label="EXPÉDITIONS FINIES" link="/shipment/finish-shipment" iconName="mdi:truck-delivery-outline" />
         <card-link label="PASSEPORT DU BOVIN" link="/" iconName="mdi:cow" />

frontend/pages/reception/[[id]].vue

@@ -1,28 +1,29 @@
 <template>
-    <div class="flex justify-between h-[52px] mt-16 mb-[80px]">
-        <div class="flex flex-1 mr-16">
-            <UiStepper
-                :labels="RECEPTION_STEP_LABELS"
-                :current-step="storeReception?.currentStep ?? 0"
-                @select="handleStepSelect"
-            />
+    <div>
+        <div class="flex justify-between h-[52px] mb-[80px]">
+            <div class="flex flex-1 mr-16">
+                <UiStepper
+                    :labels="RECEPTION_STEP_LABELS"
+                    :current-step="storeReception?.currentStep ?? 0"
+                    @select="handleStepSelect"
+                />
+            </div>
+            <button
+                type="button"
+                class="flex flex-col justify-center uppercase text-xl bg-black text-white h-[50px] w-[272px] text-center"
+                @click="saveAndHold"
+            >Mettre en attente</button>
         </div>
-        <button
-            type="button"
-            class="flex flex-col justify-center uppercase text-xl bg-black text-white h-[50px] w-[272px] text-center"
-            @click="saveAndHold"
-        >Mettre en attente
-        </button>
-    </div>
-    <ReceptionForm v-if="!storeReception || storeReception.currentStep === 0"/>
-    <ReceptionWeight v-if="storeReception?.currentStep === 1" mode="gross"/>
-    <ReceptionProductReceived
-        v-if="storeReception?.currentStep === 2 &&
+        <ReceptionForm v-if="!storeReception || storeReception.currentStep === 0"/>
+        <ReceptionWeight v-if="storeReception?.currentStep === 1" mode="gross"/>
+        <ReceptionProductReceived
+            v-if="storeReception?.currentStep === 2 &&
             receptionStore.current?.receptionType?.code === RECEPTION_TYPE_CODES.MERCHANDISES"/>
-    <ReceptionBovineReceived
-        v-if="storeReception?.currentStep === 2 &&
+        <ReceptionBovineReceived
+            v-if="storeReception?.currentStep === 2 &&
             receptionStore.current?.receptionType?.code === RECEPTION_TYPE_CODES.BOVINS"/>
-    <ReceptionWeight v-if="storeReception?.currentStep !== null && storeReception?.currentStep >= 3" mode="tare"/>
+        <ReceptionWeight v-if="storeReception?.currentStep !== null && storeReception?.currentStep >= 3" mode="tare"/>
+    </div>
 </template>
 
 <script setup lang="ts">

frontend/pages/reception/finish-reception.vue

@@ -1,10 +1,10 @@
 <template>
-    <div class="flex items-center justify-start gap-10 mt-16">
-            <Icon @click="router.push('/')" name="gg:arrow-left-o" style="color: black" size="44" class="cursor-pointer"/>
+    <div class="flex items-center justify-start gap-10">
+            <Icon @click="router.push('/')" name="gg:arrow-left-o" style="color: black" size="44" />
             <h1 class="text-3xl font-bold uppercase">listes des réceptions finie</h1>
     </div>
 
-    <div class="px-[86px]">
+    <div class="ps-20 " >
         <div class="mt-6 border border-slate-200 mb-16 ">
             <div class="grid grid-cols-6 gap-4 bg-slate-100 px-4 py-3 text-sm font-semibold uppercase tracking-wide">
                 <div>Numéro</div>
@@ -27,7 +27,7 @@
                 <div>{{ reception.supplier?.name }}</div>
                 <div>{{ reception.address?.fullAddress }}</div>
                 <div>{{ reception.receptionType?.label }}</div>
-                <div>Plein : {{ formatWeighing(reception, 'gross') }} <br> Vide : {{ formatWeighing(reception, 'tare') }}</div>
+                <div>{{ formatWeighing(reception, 'gross') }} | {{ formatWeighing(reception, 'tare') }}</div>
             </div>
         </div>
     </div>

frontend/pages/reception/update/[[id]].vue

@@ -1,10 +1,16 @@
 <template>
 
     <form @submit.prevent="validate">
-        <div class="flex items-center justify-between mt-12 mb-8 ">
-            <h1 class="font-bold text-5xl uppercase">Réception {{ receptionLoad?.identificationNumber }}</h1>
+        <div class="flex items-center justify-between mt-8 mb-8 ">
+        <h1 class="font-bold text-5xl uppercase">Réception {{receptionLoad?.identificationNumber}}</h1>
+        <button
+            type="submit"
+            class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px] justify-self-end"
+            :disabled="!auth.isAdmin"
+        >Enregistrer
+        </button>
         </div>
-        <div class="grid grid-cols-2 items-start gap-y-8 gap-x-40 mb-12">
+        <div class="grid grid-cols-2 items-start gap-y-8 gap-x-40 mb-16">
             <!--    Nom de l'utilisateur       -->
             <UiSelect
                 id="reception-user"
@@ -114,50 +120,28 @@
                 wrapper-class="col-start-2 row-start-4"
             />
         </div>
-        <div class="flex justify-center mb-2">
-            <button
-                v-if="auth.isAdmin"
-                type="submit"
-                class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px] mb-16"
-
-            >
-                Enregistrer
-            </button>
+        <div class="grid grid-cols-2 items-start gap-y-8 gap-x-40 mb-16">
+        <h1 class="font-bold text-5xl uppercase col-start-1 row-start-1" @click="isBtWeight = true" >pesées</h1>
+        <h1 class="font-bold text-5xl uppercase col-start-2 row-start-1" @click="isBtWeight = false">{{isMerchandise ? "Marchandises" : "Bovins"}}</h1>
         </div>
-            <div class="flex justify-evenly gap-y-8 gap-x-40 mb-8 border-b border-slate-400">
-                <h1
-                    class="font-bold text-3xl uppercase col-start-1 row-start-1 cursor-pointer"
-                    :class="activeTab === 'weights' ? 'underline' : ''"
-                    @click="activeTab = 'weights'"
-                >
-                    pesées
-                </h1>
-                <h1
-                    class="font-bold text-3xl uppercase col-start-2 row-start-1 cursor-pointer"
-                    :class="activeTab === 'merchandise' ? 'underline' : ''"
-                    @click="activeTab = 'merchandise'"
-                >
-                    {{ isMerchandise ? "Marchandise" : "Bovins" }}
-                </h1>
-            </div>
+        <update-weight
+            v-if="isBtWeight"
+            :idReception="idReception"
+            :disabled="!auth.isAdmin"
+        />
 
-            <update-weight
-                v-if="activeTab === 'weights'"
-                :idReception="idReception"
-                :disabled="!auth.isAdmin"
-            />
+        <update-merchandise
+            v-else-if="isMerchandise"
+            :idReception="idReception"
+            :disabled="!auth.isAdmin"
+        />
 
-            <update-merchandise
-                v-else-if="activeTab === 'merchandise' && isMerchandise"
-                :idReception="idReception"
-                :disabled="!auth.isAdmin"
-            />
+        <update-bovin
+            v-else
+            :idReception="idReception"
+            :disabled="!auth.isAdmin"
+        />
 
-            <update-bovin
-                v-else
-                :idReception="idReception"
-                :disabled="!auth.isAdmin"
-            />
     </form>
 </template>
 
@@ -184,7 +168,6 @@ import UpdateWeight from "~/components/reception/update-weight.vue";
 import UpdateMerchandise from "~/components/reception/update-merchandise.vue";
 import UpdateBovin from "~/components/reception/update-bovin.vue";
 
-const activeTab = ref<'weights' | 'merchandise'>('weights')
 const router = useRouter()
 const receptionStore = useReceptionStore()
 const form = reactive<ReceptionFormData>({
@@ -266,7 +249,7 @@ const clearReceptionBovines = async (receptionIri: string) => {
     }
 }
 
-const hydrateFromUser = (reception: ReceptionData | null) => {
+const hydrateFromUser = (reception: ReceptionData | null)=> {
     if (!reception) {
         return
     }
@@ -395,7 +378,7 @@ onMounted(async () => {
 
 // Ajuste driver/vehicle quand le transporteur change (logique LIOT)
 watch(
-    () => [form.supplierId, form.addressId, suppliers.value],
+    () => [form.supplierId, suppliers.value],
     () => {
         if (!form.supplierId) {
             form.addressId = ''
@@ -412,11 +395,7 @@ watch(
             (address) => String(address.id) === form.addressId
         )
         if (!matches) {
-            if (supplierAddresses.value.length === 1) {
-                form.addressId = String(supplierAddresses.value[0].id)
-            } else {
-                form.addressId = ''
-            }
+            form.addressId = ''
         }
     },
     {immediate: true}
@@ -553,7 +532,7 @@ async function validate() {
     }
 
     if (idReception) {
-        const updated = await receptionStore.updateReception(idReception, {
+        const updated = await receptionStore.updateReception(idReception,{
             ...payload
         })
         if (updated) {

frontend/pages/reception/waiting-reception.vue

@@ -1,12 +1,12 @@
 <template>
-    <div class="flex items-center justify-between mt-16">
+    <div class="flex items-center justify-between ">
         <div class="flex items-center gap-10">
-            <Icon @click="router.push('/')" name="gg:arrow-left-o" style="color: black" size="44" class="cursor-pointer"/>
+            <Icon @click="router.push('/')" name="gg:arrow-left-o" style="color: black" size="44" />
             <h1 class="text-3xl font-bold uppercase">listes des réceptions en attente</h1>
         </div>
     </div>
 
-    <div class="px-[86px]">
+    <div class="ps-20 " >
         <div class="mt-6 border border-slate-200 mb-16 ">
             <div class="grid grid-cols-5 gap-4 bg-slate-100 px-4 py-3 text-sm font-semibold uppercase tracking-wide">
                 <div>Fournisseur</div>

frontend/pages/shipment/[[id]].vue

@@ -1,6 +1,6 @@
 <template>
     <div>
-        <div class="flex justify-between h-[52px] mt-16 mb-[80px]">
+        <div class="flex justify-between h-[52px] mb-[80px]">
             <div class="flex flex-1 mr-16">
                 <UiStepper
                     :labels="SHIPMENT_STEP_LABELS"
@@ -18,8 +18,7 @@
         </div>
         <ShipmentForm v-if="!storeShipment || storeShipment.currentStep === 0" ref="shipmentFormRef"/>
         <ShipmentWeight v-if="storeShipment?.currentStep === 1" mode="gross"/>
-        <ShipmentLoading v-if="storeShipment?.currentStep === 2"/>
-        <ShipmentWeight v-if="storeShipment?.currentStep === 3" mode="tare"/>
+        <ShipmentWeight v-if="storeShipment?.currentStep >= 2" mode="tare"/>
 
     </div>
 </template>

frontend/pages/shipment/finish-shipment.vue

@@ -1,10 +1,10 @@
 <template>
-    <div class="flex items-center justify-start gap-10 mt-16">
-        <Icon @click="router.push('/')" name="gg:arrow-left-o" style="color: black" size="44" class="cursor-pointer"/>
+    <div class="flex items-center justify-start gap-10">
+        <Icon @click="router.push('/')" name="gg:arrow-left-o" style="color: black" size="44"/>
         <h1 class="text-3xl font-bold uppercase">listes des expéditions finie</h1>
     </div>
 
-    <div class="px-[86px]">
+    <div class="ps-20 ">
         <div class="mt-6 border border-slate-200 mb-16 ">
             <div class="grid grid-cols-6 gap-4 bg-slate-100 px-4 py-3 text-sm font-semibold uppercase tracking-wide">
                 <div>Numéro</div>
@@ -21,11 +21,11 @@
                 class="grid grid-cols-6 gap-4 px-4 py-3 text-sm hover:bg-slate-50 cursor-pointer border-t border-slate-200"
                 role="button"
                 tabindex="0"
-                @click="goShipment(shipment.id)"
+                @click="goToshipment(shipment.id)"
             >
                 <div>{{ shipment.identificationNumber }}</div>
                 <div>{{ shipment.shipmentDate }}</div>
-                <div>{{ shipment.customer?.name }}</div>
+                <div>{{ shipment.customer?.label }}</div>
                 <div>{{ shipment.address?.fullAddress }}</div>
                 <div>
                     <template v-if="formatBovinShipmentLines(shipment).length">
@@ -38,7 +38,7 @@
                         </div>
                     </template>
                 </div>
-                <div>Vide : {{ formatWeighing(shipment, 'tare') }} <br>  Plein :{{ formatWeighing(shipment, 'gross') }}</div>
+                <div>{{ formatWeighing(shipment, 'gross') }} | {{ formatWeighing(shipment, 'tare') }}</div>
             </div>
         </div>
     </div>
@@ -71,8 +71,8 @@ const formatBovinShipmentLines = (shipment: ShipmentData) => {
     })
 }
 
-const goShipment = (id: number) => {
-    router.push(`/shipment/update/${id}`)
+const goToshipment = (id: number) => {
+    //router.push(`/shipment/update/${id}`)
 }
 
 onMounted(async () => {

frontend/pages/shipment/waiting-shipment.vue

@@ -1,12 +1,12 @@
 <template>
-    <div class="flex items-center justify-between mt-16">
+    <div class="flex items-center justify-between ">
         <div class="flex items-center gap-10">
-            <Icon @click="router.push('/')" name="gg:arrow-left-o" style="color: black" size="44" class="cursor-pointer"/>
+            <Icon @click="router.push('/')" name="gg:arrow-left-o" style="color: black" size="44"/>
             <h1 class="text-3xl font-bold uppercase">listes des expéditions en attente</h1>
         </div>
     </div>
 
-    <div class="px-[86px]">
+    <div class="ps-20 ">
         <div class="mt-6 border border-slate-200 mb-16 ">
             <div class="grid grid-cols-5 gap-4 bg-slate-100 px-4 py-3 text-sm font-semibold uppercase tracking-wide">
                 <div>Client</div>

frontend/services/customer.ts

@@ -1,43 +1,23 @@
-import { useApi } from "~/composables/useApi"
-import type { CustomerData, CustomerPayload } from "~/services/dto/customer-data"
+import { useApi } from '~/composables/useApi'
+import type { CustomerData } from '~/services/dto/customer-data'
 
 export type CustomerListResponse =
     | CustomerData[]
-    | { "hydra:member"?: CustomerData[] }
+    | { 'hydra:member'?: CustomerData[] }
 
 export async function getCustomerList(): Promise<CustomerData[]> {
     const api = useApi()
-    const response = await api.get<CustomerListResponse>("customers", {}, {
-        toastErrorKey: "errors.customer.list",
+    const response = await api.get<CustomerListResponse>('customers', {}, {
+        toastErrorKey: 'errors.customer.list'
     })
 
-    if (Array.isArray(response)) return response
-    if (response && typeof response === "object" && Array.isArray(response["hydra:member"])) {
-        return response["hydra:member"]
+    if (Array.isArray(response)) {
+        return response
     }
+
+    if (response && typeof response === 'object' && Array.isArray(response['hydra:member'])) {
+        return response['hydra:member']
+    }
+
     return []
 }
-
-export async function getCustomer(id: number): Promise<CustomerData> {
-    const api = useApi()
-    return api.get<CustomerData>(`customers/${id}`, {}, {
-        toastErrorKey: "errors.customer.fetch",
-    })
-}
-
-export async function updateCustomer(id: number, payload: Partial<CustomerPayload>): Promise<CustomerData> {
-    const api = useApi()
-    return api.patch<CustomerData>(`customers/${id}`, payload, {
-        toastErrorKey: "errors.customer.update",
-        toastSuccessKey: "success.customer.update",
-    })
-}
-
-export async function createCustomer(payload: CustomerPayload): Promise<CustomerData> {
-    const api = useApi()
-    return api.post<CustomerData>("customers", payload, {
-        toastErrorKey: "errors.customer.create",
-        toastSuccessKey: "success.customer.create",
-    })
-}
-

frontend/services/dto/address-data.ts

@@ -6,7 +6,6 @@ export interface AddressData {
     postalCode: string
     city: string
     countryCode: string
-    fullAddress: string
 }
 
 export interface AddressFormData {

frontend/services/dto/customer-data.ts

@@ -1,25 +1,8 @@
-import type { AddressFormData } from "~/services/dto/address-data"
-
-export type CustomerAddresses = AddressFormData[] | string[]
+import type { AddressData } from "~/services/dto/address-data"
 
 export interface CustomerData {
     id: number
-    name: string
-    phone?: string | null
-    email?: string | null
-    addresses: CustomerAddresses
-}
-
-export interface CustomerFormData {
-    name: string
-    phone?: string
-    email?: string
-    addresses: AddressFormData[]
-}
-
-export type CustomerPayload = {
-    name: string
-    phone?: string | null
-    email?: string | null
-    addresses?: string[]
+    label: string
+    code?: string | null
+    addresses?: AddressData[] | null
 }

frontend/services/dto/weight-data.ts

@@ -2,5 +2,4 @@ export interface WeightData {
     weight: number | null
     dsd: number | null
     weighedAt: string | null
-    type : string | null
 }

migrations/Version20260213093000.php

@@ -1,32 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace DoctrineMigrations;
-
-use Doctrine\DBAL\Schema\Schema;
-use Doctrine\Migrations\AbstractMigration;
-
-final class Version20260213093000 extends AbstractMigration
-{
-    public function getDescription(): string
-    {
-        return 'Add name, phone and email fields to customer.';
-    }
-
-    public function up(Schema $schema): void
-    {
-        $this->addSql('ALTER TABLE customer ADD name VARCHAR(255) DEFAULT NULL');
-        $this->addSql('ALTER TABLE customer ADD phone VARCHAR(255) DEFAULT NULL');
-        $this->addSql('ALTER TABLE customer ADD email VARCHAR(255) DEFAULT NULL');
-        $this->addSql('UPDATE customer SET name = label WHERE name IS NULL');
-        $this->addSql('ALTER TABLE customer ALTER COLUMN name SET NOT NULL');
-    }
-
-    public function down(Schema $schema): void
-    {
-        $this->addSql('ALTER TABLE customer DROP name');
-        $this->addSql('ALTER TABLE customer DROP phone');
-        $this->addSql('ALTER TABLE customer DROP email');
-    }
-}

migrations/Version20260213101500.php

@@ -1,37 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace DoctrineMigrations;
-
-use Doctrine\DBAL\Schema\Schema;
-use Doctrine\Migrations\AbstractMigration;
-
-final class Version20260213101500 extends AbstractMigration
-{
-    public function getDescription(): string
-    {
-        return 'Align customer with supplier: keep name/email/phone and drop label/code.';
-    }
-
-    public function up(Schema $schema): void
-    {
-        $this->addSql('ALTER TABLE customer ALTER COLUMN name TYPE VARCHAR(180)');
-        $this->addSql('ALTER TABLE customer ALTER COLUMN email TYPE VARCHAR(180)');
-        $this->addSql('ALTER TABLE customer ALTER COLUMN phone TYPE VARCHAR(40)');
-        $this->addSql('ALTER TABLE customer DROP COLUMN label');
-        $this->addSql('ALTER TABLE customer DROP COLUMN code');
-    }
-
-    public function down(Schema $schema): void
-    {
-        $this->addSql('ALTER TABLE customer ADD label VARCHAR(255) DEFAULT NULL');
-        $this->addSql('ALTER TABLE customer ADD code VARCHAR(255) DEFAULT NULL');
-        $this->addSql('UPDATE customer SET label = name WHERE label IS NULL');
-        $this->addSql("UPDATE customer SET code = regexp_replace(upper(name), '[^A-Z0-9]+', '_', 'g') WHERE code IS NULL");
-        $this->addSql('ALTER TABLE customer ALTER COLUMN label SET NOT NULL');
-        $this->addSql('ALTER TABLE customer ALTER COLUMN code SET NOT NULL');
-        $this->addSql('ALTER TABLE customer ALTER COLUMN email TYPE VARCHAR(255)');
-        $this->addSql('ALTER TABLE customer ALTER COLUMN phone TYPE VARCHAR(255)');
-    }
-}

migrations/Version20260213114000.php

@@ -1,40 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace DoctrineMigrations;
-
-use Doctrine\DBAL\Schema\Schema;
-use Doctrine\Migrations\AbstractMigration;
-
-final class Version20260213114000 extends AbstractMigration
-{
-    public function getDescription(): string
-    {
-        return 'Allow only one bovin_shipment row per shipment.';
-    }
-
-    public function up(Schema $schema): void
-    {
-        // Keep one row per shipment (latest id), required before adding unique index.
-        $this->addSql(<<<'SQL'
-            DELETE FROM bovin_shipment bs
-            USING (
-                SELECT id, ROW_NUMBER() OVER (PARTITION BY shipment_id ORDER BY id DESC) AS rn
-                FROM bovin_shipment
-                WHERE shipment_id IS NOT NULL
-            ) d
-            WHERE bs.id = d.id
-              AND d.rn > 1
-            SQL);
-
-        $this->addSql('DROP INDEX IF EXISTS uniq_bovin_shipment');
-        $this->addSql('CREATE UNIQUE INDEX uniq_bovin_shipment_one_type ON bovin_shipment (shipment_id)');
-    }
-
-    public function down(Schema $schema): void
-    {
-        $this->addSql('DROP INDEX IF EXISTS uniq_bovin_shipment_one_type');
-        $this->addSql('CREATE UNIQUE INDEX uniq_bovin_shipment ON bovin_shipment (shipment_id, shipment_type_id)');
-    }
-}

src/Command/SeedCommand.php

@@ -5,15 +5,12 @@ declare(strict_types=1);
 namespace App\Command;
 
 use App\Entity\Address;
-use App\Entity\BovineType;
 use App\Entity\Building;
 use App\Entity\Carrier;
-use App\Entity\Customer;
 use App\Entity\Driver;
 use App\Entity\MerchandiseType;
 use App\Entity\PelletType;
 use App\Entity\ReceptionType;
-use App\Entity\ShipmentType;
 use App\Entity\Supplier;
 use App\Entity\Truck;
 use App\Entity\Vehicle;
@@ -53,11 +50,7 @@ class SeedCommand extends Command
         $this->seedPelletTypes();
         $this->seedBuildings();
         $this->seedReceptionTypes();
-        $this->seedBovineTypes();
-        $this->seedShipmentTypes();
         $this->seedSuppliers();
-        $this->entityManager->flush();
-        $this->seedCustomers($io);
 
         $this->entityManager->flush();
 
@@ -68,7 +61,7 @@ class SeedCommand extends Command
 
     private function seedTrucks(): array
     {
-        $trucks  = ['Citerne', 'Porteur', 'Plateau', 'Remorque', 'Benne'];
+        $trucks  = ['Citerne', 'Porteur'];
         $citerne = null;
         $porteur = null;
         foreach ($trucks as $name) {
@@ -168,7 +161,6 @@ class SeedCommand extends Command
             ['label' => 'Foin', 'code' => 'FOIN'],
             ['label' => 'Paille', 'code' => 'PAILLE'],
             ['label' => 'Granule', 'code' => 'GRANULE'],
-            ['label' => 'Autres', 'code' => 'AUTRES'],
         ];
         foreach ($merchandiseTypes as $type) {
             $this->upsertByCode(MerchandiseType::class, $type['code'], static function (MerchandiseType $entity) use ($type) {
@@ -231,39 +223,6 @@ class SeedCommand extends Command
         }
     }
 
-    private function seedBovineTypes(): void
-    {
-        $bovineTypes = [
-            ['label' => 'Limousine', 'code' => '34'],
-            ['label' => 'Charolaise', 'code' => '38'],
-            ['label' => 'Parthenaise', 'code' => '71'],
-        ];
-        foreach ($bovineTypes as $type) {
-            $this->upsertByCode(BovineType::class, $type['code'], static function (BovineType $entity) use ($type) {
-                $entity
-                    ->setLabel($type['label'])
-                    ->setCode($type['code'])
-                ;
-            });
-        }
-    }
-
-    private function seedShipmentTypes(): void
-    {
-        $shipmentTypes = [
-            ['label' => 'Bovin de boucherie', 'code' => 'BDB'],
-            ['label' => "Bovin d'équarrissage", 'code' => 'BE'],
-        ];
-        foreach ($shipmentTypes as $type) {
-            $this->upsertByCode(ShipmentType::class, $type['code'], static function (ShipmentType $entity) use ($type) {
-                $entity
-                    ->setLabel($type['label'])
-                    ->setCode($type['code'])
-                ;
-            });
-        }
-    }
-
     private function seedSuppliers(): void
     {
         $suppliers = [
@@ -499,130 +458,6 @@ class SeedCommand extends Command
         }
     }
 
-    private function seedCustomers(SymfonyStyle $io): void
-    {
-        $addressRepo = $this->entityManager->getRepository(Address::class);
-        $customers   = [
-            [
-                'name'      => 'ARNAULT EURL',
-                'phone'     => '05.49.02.65.27',
-                'email'     => 'eurl.arnault86@orange.fr',
-                'addresses' => [
-                    [
-                        'label'       => 'ARNAULT EURL',
-                        'street'      => 'Moulin du Guéret',
-                        'street2'     => 'B.P 30425',
-                        'postalCode'  => '86100',
-                        'city'        => 'Antran',
-                        'countryCode' => 'FR',
-                    ],
-                ],
-            ],
-            [
-                'name'      => 'COVILIM',
-                'phone'     => '05.55.30.03.10',
-                'email'     => 'sandra.robineaux@covilim.com',
-                'addresses' => [
-                    [
-                        'label'       => 'COVILIM',
-                        'street'      => 'Rue de Nexon',
-                        'street2'     => null,
-                        'postalCode'  => '87000',
-                        'city'        => 'LIMOGES',
-                        'countryCode' => 'FR',
-                    ],
-                ],
-            ],
-            [
-                'name'      => 'Les producteurs de la marche (LPM)',
-                'phone'     => '05.55.63.04.53',
-                'email'     => 'f.legalliard@lpmcoop.fr',
-                'addresses' => [
-                    [
-                        'label'       => 'Les producteurs de la marche (LPM)',
-                        'street'      => 'Rue de Nexon',
-                        'street2'     => null,
-                        'postalCode'  => '87000',
-                        'city'        => 'LIMOGES',
-                        'countryCode' => 'FR',
-                    ],
-                ],
-            ],
-            [
-                'name'      => 'LORTHOLARY BETAIL',
-                'phone'     => '05.49.52.77.10',
-                'email'     => 'contact86@lortholarybetail.com',
-                'addresses' => [
-                    [
-                        'label'       => 'LORTHOLARY BETAIL',
-                        'street'      => 'FERME DE GENIEC',
-                        'street2'     => null,
-                        'postalCode'  => '86550',
-                        'city'        => 'MIGNALOUX BEAUVOIR',
-                        'countryCode' => 'FR',
-                    ],
-                ],
-            ],
-            [
-                'name'      => 'TERRENA',
-                'phone'     => '02.51.67.17.98',
-                'email'     => null,
-                'addresses' => [
-                    [
-                        'label'       => 'TERRENA',
-                        'street'      => 'La Blanchardière',
-                        'street2'     => null,
-                        'postalCode'  => '44522',
-                        'city'        => 'MESANGER',
-                        'countryCode' => 'FR',
-                    ],
-                ],
-            ],
-        ];
-
-        foreach ($customers as $customerData) {
-            $customerName = $customerData['name'] ?? $customerData['label'] ?? null;
-            if (!$customerName) {
-                $io->warning('Customer skipped: missing "name".');
-
-                continue;
-            }
-            $customer = $this->upsertByName(Customer::class, $customerName, static function (Customer $customer) use ($customerData, $customerName) {
-                $customer
-                    ->setName($customerName)
-                    ->setPhone($customerData['phone'] ?? null)
-                    ->setEmail($customerData['email'] ?? null)
-                ;
-            });
-
-            $addresses = [];
-            if (isset($customerData['addresses']) && is_array($customerData['addresses'])) {
-                foreach ($customerData['addresses'] as $addressData) {
-                    $addresses[] = $this->upsertAddress($addressData);
-                }
-            } else {
-                // Backward compatibility for older seed format with address ids.
-                $addressIds = $customerData['addressIds'] ?? (isset($customerData['addressId']) ? [$customerData['addressId']] : []);
-                foreach ($addressIds as $addressId) {
-                    $address = $addressRepo->find($addressId);
-                    if (!$address instanceof Address) {
-                        $io->warning(sprintf(
-                            'Customer "%s" skipped address id %d: not found.',
-                            $customerName,
-                            $addressId
-                        ));
-
-                        continue;
-                    }
-                    $addresses[] = $address;
-                }
-            }
-
-            $customer->setAddresses($addresses);
-            $this->entityManager->persist($customer);
-        }
-    }
-
     private function upsertByCode(string $entityClass, string $code, callable $apply): object
     {
         $repo   = $this->entityManager->getRepository($entityClass);

src/DataFixtures/AppFixtures.php

@@ -20,6 +20,7 @@ class AppFixtures extends Fixture implements DependentFixtureInterface
         return [
             TransportFixtures::class,
             ReferenceFixtures::class,
+            SupplierFixtures::class,
             UserFixtures::class,
         ];
     }

src/DataFixtures/ReferenceFixtures.php

@@ -5,13 +5,10 @@ declare(strict_types=1);
 namespace App\DataFixtures;
 
 use App\Entity\Address;
-use App\Entity\BovineType;
 use App\Entity\Building;
-use App\Entity\Customer;
 use App\Entity\MerchandiseType;
 use App\Entity\PelletType;
 use App\Entity\ReceptionType;
-use App\Entity\ShipmentType;
 use App\Entity\Supplier;
 use Doctrine\Bundle\FixturesBundle\Fixture;
 use Doctrine\Persistence\ObjectManager;
@@ -20,13 +17,10 @@ class ReferenceFixtures extends Fixture
 {
     public function load(ObjectManager $manager): void
     {
-        $addressIndex = [];
-
         $merchandiseTypes = [
             ['label' => 'Foin', 'code' => 'FOIN'],
             ['label' => 'Paille', 'code' => 'PAILLE'],
             ['label' => 'Granule', 'code' => 'GRANULE'],
-            ['label' => 'Autres', 'code' => 'AUTRES'],
         ];
         foreach ($merchandiseTypes as $type) {
             $merchandiseType = new MerchandiseType()
@@ -75,31 +69,6 @@ class ReferenceFixtures extends Fixture
             $manager->persist($receptionType);
         }
 
-        $bovineTypes = [
-            ['label' => 'Limousine', 'code' => '34'],
-            ['label' => 'Charolaise', 'code' => '38'],
-            ['label' => 'Parthenaise', 'code' => '71'],
-        ];
-        foreach ($bovineTypes as $type) {
-            $bovineType = new BovineType()
-                ->setLabel($type['label'])
-                ->setCode($type['code'])
-            ;
-            $manager->persist($bovineType);
-        }
-
-        $shipmentTypes = [
-            ['label' => 'Bovin de boucherie', 'code' => 'BDB'],
-            ['label' => "Bovin d'équarrissage", 'code' => 'BE'],
-        ];
-        foreach ($shipmentTypes as $type) {
-            $shipmentType = new ShipmentType()
-                ->setLabel($type['label'])
-                ->setCode($type['code'])
-            ;
-            $manager->persist($shipmentType);
-        }
-
         $suppliers = [
             [
                 'name'      => 'LIOT',
@@ -321,129 +290,21 @@ class ReferenceFixtures extends Fixture
             ;
 
             foreach ($supplierData['addresses'] as $addressData) {
-                $addressKey = sprintf('%s|%s', $addressData['label'], $addressData['postalCode']);
-                if (!isset($addressIndex[$addressKey])) {
-                    $addressIndex[$addressKey] = new Address()
-                        ->setLabel($addressData['label'])
-                        ->setStreet($addressData['street'])
-                        ->setStreet2($addressData['street2'])
-                        ->setPostalCode($addressData['postalCode'])
-                        ->setCity($addressData['city'])
-                        ->setCountryCode($addressData['countryCode'])
-                    ;
-                    $manager->persist($addressIndex[$addressKey]);
-                }
-                $address = $addressIndex[$addressKey];
+                $address = new Address()
+                    ->setLabel($addressData['label'])
+                    ->setStreet($addressData['street'])
+                    ->setStreet2($addressData['street2'])
+                    ->setPostalCode($addressData['postalCode'])
+                    ->setCity($addressData['city'])
+                    ->setCountryCode($addressData['countryCode'])
+                ;
+                $manager->persist($address);
                 $supplier->getAddresses()->add($address);
             }
 
             $manager->persist($supplier);
         }
 
-        $customers = [
-            [
-                'name'      => 'ARNAULT EURL',
-                'phone'     => '05.49.02.65.27',
-                'email'     => 'eurl.arnault86@orange.fr',
-                'addresses' => [
-                    [
-                        'label'       => 'ARNAULT EURL',
-                        'street'      => 'Moulin du Guéret',
-                        'street2'     => 'B.P 30425',
-                        'postalCode'  => '86100',
-                        'city'        => 'Antran',
-                        'countryCode' => 'FR',
-                    ],
-                ],
-            ],
-            [
-                'name'      => 'COVILIM',
-                'phone'     => '05.55.30.03.10',
-                'email'     => 'sandra.robineaux@covilim.com',
-                'addresses' => [
-                    [
-                        'label'       => 'COVILIM',
-                        'street'      => 'Rue de Nexon',
-                        'street2'     => null,
-                        'postalCode'  => '87000',
-                        'city'        => 'LIMOGES',
-                        'countryCode' => 'FR',
-                    ],
-                ],
-            ],
-            [
-                'name'      => 'Les producteurs de la marche (LPM)',
-                'phone'     => '05.55.63.04.53',
-                'email'     => 'f.legalliard@lpmcoop.fr',
-                'addresses' => [
-                    [
-                        'label'       => 'Les producteurs de la marche (LPM)',
-                        'street'      => 'Rue de Nexon',
-                        'street2'     => null,
-                        'postalCode'  => '87000',
-                        'city'        => 'LIMOGES',
-                        'countryCode' => 'FR',
-                    ],
-                ],
-            ],
-            [
-                'name'      => 'LORTHOLARY BETAIL',
-                'phone'     => '05.49.52.77.10',
-                'email'     => 'contact86@lortholarybetail.com',
-                'addresses' => [
-                    [
-                        'label'       => 'LORTHOLARY BETAIL',
-                        'street'      => 'FERME DE GENIEC',
-                        'street2'     => null,
-                        'postalCode'  => '86550',
-                        'city'        => 'MIGNALOUX BEAUVOIR',
-                        'countryCode' => 'FR',
-                    ],
-                ],
-            ],
-            [
-                'name'      => 'TERRENA',
-                'phone'     => '02.51.67.17.98',
-                'email'     => null,
-                'addresses' => [
-                    [
-                        'label'       => 'TERRENA',
-                        'street'      => 'La Blanchardière',
-                        'street2'     => null,
-                        'postalCode'  => '44522',
-                        'city'        => 'MESANGER',
-                        'countryCode' => 'FR',
-                    ],
-                ],
-            ],
-        ];
-
-        foreach ($customers as $customerData) {
-            $customer = new Customer()
-                ->setName($customerData['name'])
-                ->setPhone($customerData['phone'])
-                ->setEmail($customerData['email'])
-            ;
-
-            foreach ($customerData['addresses'] as $addressData) {
-                $addressKey = sprintf('%s|%s', $addressData['label'], $addressData['postalCode']);
-                if (!isset($addressIndex[$addressKey])) {
-                    $addressIndex[$addressKey] = new Address()
-                        ->setLabel($addressData['label'])
-                        ->setStreet($addressData['street'])
-                        ->setStreet2($addressData['street2'])
-                        ->setPostalCode($addressData['postalCode'])
-                        ->setCity($addressData['city'])
-                        ->setCountryCode($addressData['countryCode'])
-                    ;
-                    $manager->persist($addressIndex[$addressKey]);
-                }
-                $customer->getAddresses()->add($addressIndex[$addressKey]);
-            }
-
-            $manager->persist($customer);
-        }
-
         $manager->flush();
     }
 }

src/DataFixtures/SupplierFixtures.php

@@ -0,0 +1,38 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\DataFixtures;
+
+use App\Entity\Address;
+use App\Entity\Supplier;
+use Doctrine\Bundle\FixturesBundle\Fixture;
+use Doctrine\Persistence\ObjectManager;
+
+class SupplierFixtures extends Fixture
+{
+    public function load(ObjectManager $manager): void
+    {
+        $address = new Address()
+            ->setLabel('LIOT CHATELLERAULT')
+            ->setStreet("14 Allée d'Argenson")
+            ->setStreet2('ZI Nord')
+            ->setPostalCode('86100')
+            ->setCity('CHATELLERAULT')
+            ->setCountryCode('FR')
+        ;
+
+        $supplier = new Supplier()
+            ->setName('LIOT')
+            ->setEmail('lpc.contacts@lpc-liot.fr')
+            ->setPhone('05.49.20.09.10')
+        ;
+
+        $supplier->getAddresses()->add($address);
+
+        $manager->persist($address);
+        $manager->persist($supplier);
+
+        $manager->flush();
+    }
+}

src/DataFixtures/TransportFixtures.php

@@ -15,17 +15,11 @@ class TransportFixtures extends Fixture
 {
     public function load(ObjectManager $manager): void
     {
-        $citerne  = new Truck()->setName('Citerne');
-        $porteur  = new Truck()->setName('Porteur');
-        $plateau  = new Truck()->setName('Plateau');
-        $remorque = new Truck()->setName('Remorque');
-        $benne    = new Truck()->setName('Benne');
+        $citerne = new Truck()->setName('Citerne');
+        $porteur = new Truck()->setName('Porteur');
 
         $manager->persist($citerne);
         $manager->persist($porteur);
-        $manager->persist($plateau);
-        $manager->persist($remorque);
-        $manager->persist($benne);
 
         $liot = new Carrier()
             ->setName('LIOT')

src/Entity/BovinShipment.php

@@ -18,7 +18,7 @@ use Symfony\Component\Serializer\Attribute\Groups;
 
 #[ORM\Entity]
 #[ApiFilter(SearchFilter::class, properties: ['shipment' => 'exact'])]
-#[ORM\UniqueConstraint(name: 'uniq_bovin_shipment_one_type', columns: ['shipment_id'])]
+#[ORM\UniqueConstraint(name: 'uniq_bovin_shipment', columns: ['shipment_id', 'shipment_type_id'])]
 #[ORM\Table(name: 'bovin_shipment')]
 #[ApiResource(
     operations: [

src/Entity/Carrier.php

@@ -19,11 +19,9 @@ use Symfony\Component\Serializer\Attribute\Groups;
         new Get(
             requirements: ['id' => '\d+'],
             normalizationContext: ['groups' => ['carrier:read']],
-            security: "is_granted('ROLE_USER')"
         ),
         new GetCollection(
             normalizationContext: ['groups' => ['carrier:read']],
-            security: "is_granted('ROLE_USER')"
         ),
         new Post(
             normalizationContext: ['groups' => ['carrier:read']],

src/Entity/Customer.php

@@ -8,8 +8,6 @@ use ApiPlatform\Metadata\ApiProperty;
 use ApiPlatform\Metadata\ApiResource;
 use ApiPlatform\Metadata\Get;
 use ApiPlatform\Metadata\GetCollection;
-use ApiPlatform\Metadata\Patch;
-use ApiPlatform\Metadata\Post;
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
 use Doctrine\ORM\Mapping as ORM;
@@ -26,16 +24,6 @@ use Symfony\Component\Serializer\Attribute\Groups;
         new GetCollection(
             normalizationContext: ['groups' => ['customer:read']],
         ),
-        new Post(
-            normalizationContext: ['groups' => ['customer:read']],
-            denormalizationContext: ['groups' => ['customer:write']],
-            security: "is_granted('ROLE_ADMIN')",
-        ),
-        new Patch(
-            normalizationContext: ['groups' => ['customer:read']],
-            denormalizationContext: ['groups' => ['customer:write']],
-            security: "is_granted('ROLE_ADMIN')",
-        ),
     ],
     security: "is_granted('ROLE_USER')",
 )]
@@ -47,24 +35,20 @@ class Customer
     #[Groups(['shipment:read', 'customer:read'])]
     private ?int $id = null;
 
-    #[ORM\Column(length: 180)]
-    #[Groups(['customer:read', 'customer:write', 'shipment:read'])]
-    private string $name = '';
+    #[ORM\Column(length: 255)]
+    #[Groups(['customer:read', 'shipment:read'])]
+    private ?string $label = null;
 
-    #[ORM\Column(length: 180, nullable: true)]
-    #[Groups(['customer:read', 'customer:write', 'shipment:read'])]
-    private ?string $email = null;
-
-    #[ORM\Column(length: 40, nullable: true)]
-    #[Groups(['customer:read', 'customer:write', 'shipment:read'])]
-    private ?string $phone = null;
+    #[ORM\Column(length: 255)]
+    #[Groups(['customer:read', 'shipment:read'])]
+    private ?string $code = null;
 
     /**
      * @var Collection<int, Address>
      */
     #[ORM\ManyToMany(targetEntity: Address::class, inversedBy: 'customers')]
     #[ORM\JoinTable(name: 'customer_address')]
-    #[Groups(['customer:read', 'customer:write'])]
+    #[Groups(['customer:read'])]
     #[ApiProperty(readableLink: true)]
     private Collection $addresses;
 
@@ -78,40 +62,24 @@ class Customer
         return $this->id;
     }
 
-    public function getName(): string
+    public function getLabel(): ?string
     {
-        return $this->name;
+        return $this->label;
     }
 
-    public function setName(string $name): self
+    public function setLabel(?string $label): void
     {
-        $this->name = $name;
-
-        return $this;
+        $this->label = $label;
     }
 
-    public function getEmail(): ?string
+    public function getCode(): ?string
     {
-        return $this->email;
+        return $this->code;
     }
 
-    public function setEmail(?string $email): self
+    public function setCode(?string $code): void
     {
-        $this->email = $email;
-
-        return $this;
-    }
-
-    public function getPhone(): ?string
-    {
-        return $this->phone;
-    }
-
-    public function setPhone(?string $phone): self
-    {
-        $this->phone = $phone;
-
-        return $this;
+        $this->code = $code;
     }
 
     public function getAddresses(): Collection
@@ -119,29 +87,8 @@ class Customer
         return $this->addresses;
     }
 
-    public function setAddresses(iterable $addresses): self
+    public function setAddresses(Collection $addresses): void
     {
-        $this->addresses->clear();
-        foreach ($addresses as $address) {
-            $this->addAddress($address);
-        }
-
-        return $this;
-    }
-
-    public function addAddress(Address $address): self
-    {
-        if (!$this->addresses->contains($address)) {
-            $this->addresses->add($address);
-        }
-
-        return $this;
-    }
-
-    public function removeAddress(Address $address): self
-    {
-        $this->addresses->removeElement($address);
-
-        return $this;
+        $this->addresses = $addresses;
     }
 }

src/Entity/Shipment.php

@@ -328,7 +328,7 @@ class Shipment
             return;
         }
 
-        $number                     = sprintf('P-BL-%04d', $this->id);
+        $number                     = sprintf('P-BR-%04d', $this->id);
         $this->identificationNumber = $number;
 
         $args->getObjectManager()

src/Entity/Supplier.php

@@ -22,10 +22,13 @@ use Symfony\Component\Serializer\Attribute\Groups;
         new Get(
             requirements: ['id' => '\d+'],
             normalizationContext: ['groups' => ['supplier:read']],
-            security: "is_granted('ROLE_USER')"
         ),
         new GetCollection(
             normalizationContext: ['groups' => ['supplier:read']],
+        ),
+        new GetCollection(
+            uriTemplate: '/admin/suppliers',
+            normalizationContext: ['groups' => ['supplier:read']],
             security: "is_granted('ROLE_ADMIN')"
         ),
         new Post(

src/State/UserPasswordProcessor.php

@@ -21,12 +21,8 @@ final class UserPasswordProcessor implements ProcessorInterface
     public function process(mixed $data, Operation $operation, array $uriVariables = [], array $context = []): mixed
     {
         if ($data instanceof User) {
-            $plain    = $data->getPassword();
-            $previous = $context['previous_data'] ?? null;
-            if ($previous instanceof User && $plain === $previous->getPassword()) {
-                // Password not changed in payload: keep existing hash.
-                $data->setPassword($previous->getPassword());
-            } elseif ('' !== $plain) {
+            $plain = $data->getPassword();
+            if ('' !== $plain) {
                 $data->setPassword($this->hasher->hashPassword(
                     $data,
                     $plain

templates/shipment_voucher.html.twig

@@ -174,7 +174,7 @@
 
         <td style="width:30%; text-align:right; vertical-align:top; font-size: 14px;">
             <div style="display:inline-block; width:75mm; line-height:1.3;">
-                <strong>{{ shipment.customer ? shipment.customer.name : '-' }}</strong><br>
+                <strong>{{ shipment.customer ? shipment.customer.label : '-' }}</strong><br>
                 <span>{{ shipment.address ? shipment.address.street : '' }}</span><br>
                 {% if shipment.address and shipment.address.street2 %}
                     <span>{{ shipment.address.street2 }}</span><br>
@@ -198,7 +198,7 @@
     </tr>
     <tr>
         <td style="width:55%; text-align:center;">
-            {{ shipment.customer ? shipment.customer.name : '-' }}
+            {{ shipment.customer ? shipment.customer.code : '-' }}
         </td>
         <td style="width:20%; text-align:center; white-space:nowrap;">
             {{ shipment.shipmentDate|date('d/m/Y') }}
@@ -276,7 +276,7 @@
         <td style="width:60%; padding-right:8mm; vertical-align:top;">
             <div class="meta">
                 <p>Transporteur : {{ shipment.carrier ? shipment.carrier.name : '-' }}</p>
-                <p>Mode d'expédition : {{ shipment.truck ? shipment.truck.name : '-' }}</p>
+                <p>Mode de livraison : {{ shipment.truck ? shipment.truck.name : '-' }}</p>
                 <p>Immatriculation : {{ shipment.licencePlate ?? '-' }}</p>
             </div>
         </td>