chore: bump version to v0.0.50

|  | Layout-Admin |
|------------------|-----------------|
|                  |                 |

## Description de la PR

## Modification du .env

## Check list

- [ ] Pas de régression
- [ ] TU/TI/TF rédigée
- [ ] TU/TI/TF OK
- [ ] CHANGELOG modifié

Reviewed-on: #28
Reviewed-by: Autin <tristan@yuno.malio.fr>
Co-authored-by: Matteo <matteo@yuno.malio.fr>
Co-committed-by: Matteo <matteo@yuno.malio.fr>

CHANGELOG.md

@@ -46,6 +46,7 @@ Ajouter dans le fichier .env du frontend
 * [#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.44'
+    app.version: '0.0.50'

frontend/components/card-link.vue

@@ -2,9 +2,9 @@
 
 <template>
     <NuxtLink :to="link">
-        <div class="w-[324px] h-[228px] border border-black rounded-md p-6 flex flex-col justify-between">
+        <div class="w-[300px] h-[216px] border border-black rounded-lg p-6 flex flex-col justify-between gap-4">
             <div class="flex justify-between">
-                <div class="rounded-full w-[80px] h-[80px] bg-neutral-400 flex justify-center items-center">
+                <div class="rounded-full w-[80px] h-[80px] bg-[#D9D9D9] flex justify-center items-center">
                     <Icon :name="iconName" style="color: black" size="44" />
                 </div>
                 <div>
@@ -12,12 +12,12 @@
                 </div>
             </div>
             <div class="uppercase font-bold">
-                <p class="text-3xl"> {{ label }} </p>
+                <p class="text-3xl text-primary-500">
+                    <slot name="label">{{ label }}</slot>
+                </p>
             </div>
         </div>
         </NuxtLink>
-
-
 </template>
 
 <script setup lang="ts">
@@ -27,4 +27,3 @@ const props = defineProps<{
     label: string
 }>()
 </script>
-

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 marchandises réceptionnnées</h1>
+        <h1 class="text-4xl uppercase font-bold text-primary-500">Sélection des races réceptionnées</h1>
         <div
             class="flex flex-row gap-8 items-center">
             <div
@@ -10,6 +10,7 @@
                 :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)]"
@@ -77,14 +78,14 @@ onMounted(async () => {
 })
 
 watch(
-    () => receptionId.value,
-    async (id) => {
-        if (!id || !receptionIri.value) {
+    [() => receptionId.value, () => bovineType.value],
+    async ([id, types]) => {
+        if (!id || !receptionIri.value || types.length === 0) {
             return
         }
 
         const selectionMap: Record<string, number | null> = {}
-        for (const type of bovineType.value) {
+        for (const type of types) {
             selectionMap[String(type.id)] = 0
         }
 

frontend/components/reception/reception-form.vue

@@ -1,7 +1,7 @@
 <template>
     <form @submit.prevent="validate">
         <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">Réception</h1>
+            <h1 class="font-bold text-5xl uppercase col-start-1 row-start-1 text-primary-500">Réception</h1>
             <!--    Nom de l'utilisateur       -->
             <UiSelect
                 id="reception-user"
@@ -81,20 +81,8 @@
                 select-class="h-[34px]"
                 wrapper-class="col-start-2 row-start-3"
             />
-            <!--    Chauffeur (LIOT)        -->
-            <UiSelect
-                id="reception-driver"
-                v-model="form.driverId"
-                label="Nom du chauffeur si LIOT"
-                :options="filteredDrivers.map((driver) => ({
-                    value: String(driver.id),
-                    label: driver.name
-                }))"
-                :loading="isLoadingDrivers"
-                wrapper-class="col-start-2 row-start-4"
-            />
             <!--    Plaque d'immatriculation       -->
-            <div v-if="!isLiotCarrier" class="col-start-2 row-start-5">
+            <div v-if="!isLiotCarrier" class="col-start-2 row-start-4">
                 <UiLicensePlateInput
                     v-model="form.licensePlate"
                     v-model:allowAny="allowAnyLicensePlate"
@@ -112,15 +100,28 @@
                 }))"
                 :loading="isLoadingVehicles"
                 :disabled="isLoadingVehicles || filteredVehicles.length === 0"
+                wrapper-class="col-start-2 row-start-4 h-[64px]"
+            />
+            <!--    Chauffeur (LIOT)        -->
+            <UiSelect
+                id="reception-driver"
+                v-model="form.driverId"
+                label="Nom du chauffeur si LIOT"
+                :options="filteredDrivers.map((driver) => ({
+                    value: String(driver.id),
+                    label: driver.name
+                }))"
+                :loading="isLoadingDrivers"
+                v-if="isLiotCarrier"
                 wrapper-class="col-start-2 row-start-5"
             />
         </div>
         <div class="flex justify-center">
-            <button
+            <UiButton
                 type="submit"
                 class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px] justify-self-end"
             >Valider
-            </button>
+            </UiButton>
         </div>
     </form>
 

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

@@ -3,7 +3,7 @@
         <div
             v-if="receptionStore.current?.receptionType?.code === RECEPTION_TYPE_CODES.MERCHANDISES"
             class="flex flex-col gap-16 items-center w-full">
-            <h1 class="text-4xl uppercase font-bold">Sélection des marchandises réceptionnnées</h1>
+            <h1 class="text-4xl uppercase font-bold text-primary-500">Sélection des marchandises réceptionnnées</h1>
             <UiSelect
                 id="merchandise-type"
                 v-model="selectedMerchandiseTypeId"
@@ -26,7 +26,7 @@
 
             <div
                 v-if="selectedMerchandiseTypeId && !isGranule"
-                class="flex gap-4 w-[550px] justify-evenly"
+                class="flex gap-4 w-[550px] justify-between"
             >
                 <div
                     v-for="building in buildings"
@@ -47,17 +47,17 @@
             >
                 <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>
+                        <p class="font-bold uppercase text-primary-500">{{ type.label }}</p>
                         <div
                             v-for="building in buildings"
                             :key="building.id"
-                            class="flex items-center gap-2 text-lg"
+                            class="flex items-center gap-2 text-lg pl-[2px]"
                         >
                             <UiCheckbox
                                 v-model="selectedPelletBuildingIds[String(type.id)]"
                                 :value="String(building.id)"
                                 :label="building.label"
-                                label-class="text-lg"
+                                label-class="text-xl"
                             />
                         </div>
                     </div>

frontend/components/reception/reception-weight.vue

@@ -1,9 +1,9 @@
 <template>
     <div class="flex justify-center">
         <div class="flex flex-col items-center w-[660px]">
-            <h1 class="font-bold text-5xl uppercase">{{ title }}</h1>
+            <h1 class="font-bold text-5xl uppercase text-primary-500">{{ title }}</h1>
 <!--@TODO Voir comment faire pour savoir si le pont-bascule et bien connecté + ajouter un icon comme sur la maquette-->
-            <p class="text-primary-500 uppercase text-2xl mt-2">Pont-bascule connecté</p>
+            <p class="text-primary-500 uppercase text-2xl text-primary-500 mt-2">Pont-bascule connecté</p>
             <div
                 v-if="showLoadingBox"
                 class="w-full flex flex-col items-center justify-center border border-black h-[90px] mt-12 mb-[86px]">
@@ -11,27 +11,27 @@
             </div>
             <div v-else-if="displayWeight !== null" class="w-full">
                 <div
-                    class="w-full flex flex-col items-center justify-center border border-black h-[90px] mt-12 mb-[25px] text-4xl">
+                    class="w-full flex flex-col items-center justify-center border border-black h-[90px] mt-12 mb-[25px] text-4xl text-primary-500">
                     {{ displayWeight }} kg
                 </div>
             </div>
         </div>
     </div>
     <div class="flex justify-center mt-[54px]">
-        <button
+        <UiButton
             class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px]"
             @click="fetchWeight"
-        >{{ displayWeight !== null ? 'refaire une pesee' : 'peser' }}</button>
-        <button
+        >{{ displayWeight !== null ? 'refaire une pesée' : 'peser' }}</UiButton>
+        <UiButton
             v-if="displayWeight !== null && !showGenerateReceipt"
             class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px] ml-4"
             @click="saveWeight"
-        >Valider</button>
-        <button
+        >Valider la pesée</UiButton>
+        <UiButton
             v-if="showGenerateReceipt"
             class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px] ml-4"
             @click="printReceipt"
-        >Générer le bon</button>
+        >Générer le bon</UiButton>
     </div>
 </template>
 

frontend/components/reception/update-bovin.vue

@@ -27,12 +27,12 @@
                 />
             </div>
         </div>
-        <button
+        <UiButton
             type="submit"
             class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px]"
             :disabled="!auth.isAdmin"
         >Valider
-        </button>
+        </UiButton>
     </div>
     </form>
 </template>
@@ -83,14 +83,14 @@ onMounted(async () => {
 })
 
 watch(
-    () => receptionId,
-    async (id) => {
-        if (!id || !receptionIri.value) {
+    [() => receptionId, () => bovineType.value],
+    async ([id, types]) => {
+        if (!id || !receptionIri.value || types.length === 0) {
             return
         }
 
         const selectionMap: Record<string, number | null> = {}
-        for (const type of bovineType.value) {
+        for (const type of types) {
             selectionMap[String(type.id)] = 0
         }
 
@@ -105,7 +105,7 @@ watch(
         }
         Object.assign(bovineQuantities, selectionMap)
 
-        const existingOther = await reception.bovineDetail
+        const existingOther = reception.bovineDetail
         const parsedOther =
             typeof existingOther === 'string' && existingOther.trim() !== ''
                 ? Number(existingOther)

frontend/components/reception/update-merchandise.vue

@@ -67,13 +67,13 @@
                     </div>
                 </div>
             </div>
-            <button
+            <UiButton
                 v-if="auth.isAdmin"
                 type="submit"
                 class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px]"
                 :disabled="!auth.isAdmin"
             >Valider
-            </button>
+            </UiButton>
         </div>
     </form>
 </template>

frontend/components/reception/update-weight.vue

@@ -1,9 +1,10 @@
 <template>
     <form @submit.prevent="validate">
         <div class="grid grid-cols-2 gap-x-40 gap-y-8 mb-8">
-            <UiTextInput
+            <UiNumberInput
                 label="Dsd"
                 class="col-start-2"
+                labelClass="font-bold uppercase"
                 v-model="sharedWeightMeta.dsd"
                 :disabled="!auth.isAdmin"
             />
@@ -19,21 +20,24 @@
                 :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'"
                 :disabled="!auth.isAdmin"
+                :min="0"
+                :max="48000"
             />
         </div>
 
         <div class="flex justify-center">
-            <button
+            <UiButton
                 v-if="auth.isAdmin"
                 type="submit"
                 class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px]"
 
             >
                 Valider
-            </button>
+            </UiButton>
         </div>
 
     </form>

frontend/components/shipment/shipment-form.vue

@@ -1,7 +1,7 @@
 <template>
     <form @submit.prevent="validate">
         <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">Expédition</h1>
+            <h1 class="font-bold text-5xl uppercase col-start-1 row-start-1 text-primary-500">Expédition</h1>
             <!--    Nom de l'utilisateur       -->
             <UiSelect
                 id="shipment-user"
@@ -22,24 +22,27 @@
                 wrapper-class="col-start-1 row-start-3"
             />
             <!--    Type d'expédition        -->
-            <div class="col-start-1 row-start-4">
-                <label class="font-bold uppercase text-xl mb-2">
-                    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-2 flex flex-row gap-6"
-                    >
-                        <UiNumberInput
-                            :label="type.label"
-                            v-model="bovineQuantities[String(type.id)]"
-                            :placeholder="0"
-                            :min="0"
-                            :max="10"
-                        />
-                    </div>
+            <div class="col-start-1 row-start-4 h-[64px]">
+                <div class="flex items-end gap-8 justify-between">
+                    <UiRadioGroup
+                        id="shipment-type"
+                        name="shipment-type"
+                        label="Type d'expédition bovine"
+                        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>
             </div>
             <!--    Client        -->
@@ -49,7 +52,7 @@
                 label="Client"
                 :options="customers.map((customer) => ({
                     value: String(customer.id),
-                    label: customer.label
+                    label: customer.name || `Client #${customer.id}`
                 }))"
                 :loading="isLoadingCustomers"
                 wrapper-class="col-start-1 row-start-5"
@@ -86,20 +89,8 @@
                 }))"
                 wrapper-class="col-start-2 row-start-3"
             />
-            <!--  Chauffeur (LIOT)        -->
-            <UiSelect
-                id="shipment-driver"
-                v-model="form.driverId"
-                label="Nom du chauffeur si LIOT"
-                :options="filteredDrivers.map((driver) => ({
-                    value: String(driver.id),
-                    label: driver.name
-                }))"
-                :loading="isLoadingDrivers"
-                wrapper-class="col-start-2 row-start-4"
-            />
             <!-- Plaque d'immatriculation (hors LIOT)        -->
-            <div v-if="!isLiotCarrier" class="col-start-2 row-start-5">
+            <div v-if="!isLiotCarrier" class="col-start-2 row-start-4">
                 <UiLicensePlateInput
                     v-model="form.licencePlate"
                     v-model:allowAny="allowAnyLicensePlate"
@@ -117,15 +108,28 @@
                 }))"
                 :loading="isLoadingVehicles"
                 :disabled="isLoadingVehicles || filteredVehicles.length === 0"
+                wrapper-class="col-start-2 row-start-4"
+            />
+            <!--  Chauffeur (LIOT)        -->
+            <UiSelect
+                id="shipment-driver"
+                v-model="form.driverId"
+                label="Nom du chauffeur si LIOT"
+                :options="filteredDrivers.map((driver) => ({
+                    value: String(driver.id),
+                    label: driver.name
+                }))"
+                :loading="isLoadingDrivers"
                 wrapper-class="col-start-2 row-start-5"
+                v-if="isLiotCarrier"
             />
         </div>
         <div class="flex justify-center">
-            <button
+            <UiButton
                 type="submit"
                 class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px] justify-self-end"
             >Valider
-            </button>
+            </UiButton>
         </div>
     </form>
 </template>
@@ -177,8 +181,9 @@ 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
@@ -328,15 +333,21 @@ watch(
         form.driverId = shipment?.driver?.id ? String(shipment.driver.id) : ''
         form.vehicleId = shipment?.vehicle?.id ? String(shipment.vehicle.id) : ''
         if (!shipment || !shipment.bovinShipments) {
-            bovineQuantities.value = {}
+            selectedShipmentTypeId.value = ''
+            shipmentQuantity.value = 0
         } else {
-            const next: Record<string, number | null> = {}
-            for (const entry of shipment.bovinShipments) {
+            const selectedEntry = shipment.bovinShipments.find((entry) => {
                 const typeId = entry.shipmentType?.id
-                if (!typeId) continue
-                next[String(typeId)] = entry.nbBovinSend ?? null
+                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
             }
-            bovineQuantities.value = next
         }
         isHydrating.value = false
     },
@@ -464,16 +475,22 @@ watch(
     }
 )
 const buildDesiredBovinShipments = () => {
-    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 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}]
 }
 const syncBovinShipments = async (
     shipmentId: number,

frontend/components/shipment/shipment-loading.vue

@@ -0,0 +1,26 @@
+<template>
+    <div class="flex flex-col items-center gap-[118px]">
+        <h1 class="font-bold text-5xl uppercase text-primary-500">Charment des bovins</h1>
+        <div
+            class="w-full flex flex-col items-center justify-center">
+            <UiLoadingDots />
+        </div>
+        <UiButton
+            class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px] ml-4"
+            @click="goNext"
+        >Peser</UiButton>
+    </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/shipment/shipment-weight.vue

@@ -1,7 +1,7 @@
 <template>
     <div class="flex justify-center">
         <div class="flex flex-col items-center w-[660px]">
-            <h1 class="font-bold text-5xl uppercase">{{ title }}</h1>
+            <h1 class="font-bold text-5xl uppercase text-primary-500">{{ title }}</h1>
 <!--@TODO Voir comment faire pour savoir si le pont-bascule et bien connecté + ajouter un icon comme sur la maquette-->
             <p class="text-primary-500 uppercase text-2xl mt-2">Pont-bascule connecté</p>
             <div
@@ -11,27 +11,27 @@
             </div>
             <div v-else-if="displayWeight !== null" class="w-full">
                 <div
-                    class="w-full flex flex-col items-center justify-center border border-black h-[90px] mt-12 mb-[25px] text-4xl">
+                    class="w-full flex flex-col items-center justify-center border border-primary-500 h-[90px] mt-12 mb-[25px] text-4xl text-primary-500">
                     {{ displayWeight }} kg
                 </div>
             </div>
         </div>
     </div>
     <div class="flex justify-center mt-[54px]">
-        <button
+        <UiButton
             class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px]"
             @click="fetchWeight"
-        >{{ displayWeight !== null ? 'refaire une pesee' : 'peser' }}</button>
-        <button
+        >{{ displayWeight !== null ? 'refaire une pesée' : 'peser' }}</UiButton>
+        <UiButton
             v-if="displayWeight !== null && !showGenerateReceipt"
             class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px] ml-4"
             @click="saveWeight"
-        >Valider la pesée</button>
-        <button
+        >Valider la pesée</UiButton>
+        <UiButton
             v-if="showGenerateReceipt"
             class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px] ml-4"
             @click="printReceipt"
-        >Générer le bon</button>
+        >Générer le bon</UiButton>
     </div>
 </template>
 

frontend/components/ui/UiButton.vue

@@ -0,0 +1,39 @@
+<template>
+    <component
+        :is="'button'"
+        :type="type"
+        :disabled="isDisabled"
+        class="inline-flex items-center justify-center rounded-md"
+        :class="[
+            isDisabled ? 'cursor-not-allowed opacity-60' : 'cursor-pointer',
+            buttonClass
+        ]"
+        v-bind="attrs"
+    >
+        <slot v-if="!loading" />
+        <UiLoadingDots v-else />
+    </component>
+</template>
+
+<script setup lang="ts">
+import {computed, useAttrs} from 'vue'
+
+defineOptions({inheritAttrs: false})
+
+const props = withDefaults(
+    defineProps<{
+        type?: 'button' | 'submit' | 'reset'
+        disabled?: boolean
+        loading?: boolean
+        buttonClass?: string
+    }>(),
+    {
+        disabled: false,
+        loading: false,
+        buttonClass: ''
+    }
+)
+
+const attrs = useAttrs()
+const isDisabled = computed(() => props.disabled || props.loading)
+</script>

frontend/components/ui/UiCheckbox.vue

@@ -1,14 +1,14 @@
 <template>
     <div :class="wrapperClass">
         <label
-            class="flex items-center gap-2"
+            class="flex items-center gap-2 cursor-pointer text-primary-500"
             :class="labelClass"
         >
             <input
                 type="checkbox"
                 :checked="checked"
                 :disabled="disabled"
-                :class="inputClass"
+                :class="['cursor-pointer text-primary-500', 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 mb-2"
+            class="font-bold uppercase text-xl text-primary-500"
             :class="labelClass"
         >
             {{ label }}
@@ -14,7 +14,7 @@
             :value="modelValue ?? ''"
             :disabled="disabled"
             v-bind="attrs"
-            class="border-b border-black justify-self-start text-xl pb-[6px] uppercase bg-transparent appearance-none h-[34px]"
+            class="border-b border-black justify-self-start text-xl text-primary-500 py-[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"
+            class="text-xl flex items-center gap-2 text-primary-500"
             :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-16 text-primary-500"
             :class="[
                 isEmpty ? 'text-neutral-400' : 'text-black',
                 disabled ? 'cursor-not-allowed' : 'cursor-text',
@@ -74,14 +74,41 @@ 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 numeric = Math.max(0, Number(target.value))
-    emit('update:modelValue', Number.isNaN(numeric) ? null : numeric)
+    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 onKeydown = (event: KeyboardEvent) => {

frontend/components/ui/UiRadioGroup.vue

@@ -0,0 +1,93 @@
+<template>
+    <div :class="['flex flex-col', wrapperClass]">
+        <label
+            v-if="label"
+            class="font-bold uppercase text-xl text-primary-500"
+            :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 text-primary-500"
+                :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 mb-2"
+            class="font-bold uppercase text-xl text-primary-500"
             :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 pb-[6px] bg-transparent"
+            class="border-b border-black justify-self-start text-xl text-primary-500 py-[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 mb-2"
+            class="font-bold uppercase text-xl text-primary-500"
             :class="labelClass"
         >
             {{ label }}
@@ -16,7 +16,7 @@
             :maxlength="maxlength"
             :disabled="disabled"
             v-bind="attrs"
-            class="border-b border-black text-xl pb-[6px] bg-transparent"
+            class="border-b border-black text-xl py-[6px] bg-transparent text-primary-500"
             :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 mb-2">{{ label }}</label>
+    <label :for="inputId" class="font-bold uppercase text-xl text-primary-500">{{ label }}</label>
       <div class="flex items-end gap-8">
           <input
               :id="inputId"
@@ -9,7 +9,7 @@
               type="text"
               :maxlength="maxLength"
               :placeholder="placeholderText"
-              class="border-b border-black flex-1 min-w-0 text-xl uppercase h-[30px]"
+              class="border-b border-black flex-1 min-w-0 text-xl text-primary-500 uppercase h-[36px] py-[6px]"
               @input="handleInput"
           />
           <UiCheckbox

frontend/components/ui/stepper.vue

@@ -4,7 +4,7 @@
             <div
                 v-for="(label, index) in labels"
                 :key="label"
-                class="absolute top-0 whitespace-nowrap"
+                class="absolute top-0 whitespace-nowrap text-primary-500"
                 :class="labelClass(index)"
                 :style="positionStyle(index)"
             >

frontend/constants/steps.ts

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

frontend/layouts/admin.vue

@@ -1,106 +0,0 @@
-<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"
-                        custom v-slot="{ href, navigate, isExactActive }">
-                        <a :href="href"
-                           @click="navigate"
-                           :class="isExactActive ? 'opacity-100' : 'opacity-50'">
-                            Tableau de bord
-                        </a>
-                    </NuxtLink>
-                    <NuxtLink
-                        to="/admin/supplier/supplier-list"
-                        custom v-slot="{ href, navigate }">
-                        <a :href="href"
-                           @click="navigate"
-                           :class="route.path.startsWith('/admin/supplier') ? 'opacity-100' : 'opacity-50'">
-                            Fournisseur
-                        </a>
-                    </NuxtLink>
-                    <NuxtLink
-                        to="/admin/carrier/carrier-list"
-                        custom v-slot="{ href, navigate }">
-                        <a :href="href"
-                           @click="navigate"
-                           :class="route.path.startsWith('/admin/carrier') ? 'opacity-100' : 'opacity-50'">
-                            Transporteur
-                        </a>
-                    </NuxtLink>
-                    <NuxtLink to="/admin/user/list" custom v-slot="{ href, navigate }">
-                        <a
-                            :href="href"
-                            @click="navigate"
-                            :class="route.path.startsWith('/admin/user') ? 'opacity-100' : 'opacity-50'"
-                        >
-                            Utilisateurs
-                        </a>
-                    </NuxtLink>
-                    <NuxtLink to="/admin/customer/customer-list">
-                        Client
-                    </NuxtLink>
-                </div>
-
-                <div class="p-4">
-
-                    <button
-                        @click="handleLogout"
-                        class="w-full bg-red-600 hover:bg-red-700 py-2 rounded font-bold"
-                    >
-                        Déconnexion
-                    </button>
-                    <p class="font-bold text-white text-center pt-2">
-                        v{{ version }}
-                    </p>
-                </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 route = useRoute()
-const handleLogout = async () => {
-    try {
-        await auth.logout()
-    } finally {
-        await navigateTo('/login')
-    }
-}
-</script>

frontend/layouts/default.vue

@@ -1,54 +1,147 @@
 <template>
-    <div class="min-h-screen text-neutral-900 grid grid-rows-[85px,1fr]">
-    <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">
+    <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 justify-between">
+                <!-- Burger (mobile) -->
                 <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>
-                <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 }">
+
+                <!-- 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 }">
                         <a
                             :href="href"
                             @click="navigate"
-                            :class="isExactActive ? 'opacity-100' : 'opacity-50'"
+                            :class="route.path === '/'
+                ? 'opacity-100'
+                : 'opacity-65 hover:opacity-100 transition'"
                         >
                             Accueil
                         </a>
                     </NuxtLink>
+
                     <NuxtLink
-                        to="/admin/dashboard" custom v-slot="{ href, navigate, isExactActive }"
                         v-if="auth.isAdmin"
+                        to="/admin/supplier/supplier-list"
+                        custom
+                        v-slot="{ href, navigate }"
                     >
                         <a
                             :href="href"
                             @click="navigate"
-                            :class="isExactActive ? 'opacity-100' : 'opacity-50'"
+                            :class="route.path.startsWith('/admin/supplier')
+                ? 'opacity-100'
+                : 'opacity-65 hover:opacity-100 transition'"
                         >
-                            Admin
+                            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
                         </a>
                     </NuxtLink>
                 </nav>
-                <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>
+
+                <!-- Spacer mobile (pour centrer visuellement le header si besoin) -->
                 <div class="w-[44px] md:hidden"></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>
+
+                <!-- User dropdown à droite (desktop) -->
+                <div v-if="auth.isAuthenticated" class="ml-auto relative hidden md:flex items-center text-white group">
+                    <button
+                        type="button"
+                        class="inline-flex items-center py-2 -my-2 text-xl leading-none transition hover:opacity-80"
+                        aria-haspopup="true"
+                    >
+                        <span class="capitalize font-bold">{{ userDisplayName }}</span>
+                        <span class="ml-[6px] inline-flex items-center font-bold transition-transform group-hover:rotate-180 group-focus-within:rotate-180">
+                            <Icon name="mdi:chevron-down" size="20"/>
+                        </span>
+                    </button>
+
+                    <div
+                        class="absolute right-0 top-full z-10 w-56 rounded-md bg-primary-500 py-2 border-neutral-300 border shadow-lg
+                        opacity-0 invisible pointer-events-none transition
+                        group-hover:opacity-100 group-hover:visible group-hover:pointer-events-auto
+                        group-focus-within:opacity-100 group-focus-within:visible group-focus-within:pointer-events-auto"
+                        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>
             </div>
+
+            <!-- Overlay (mobile) -->
             <transition
                 enter-active-class="transition duration-200 ease-out"
                 enter-from-class="opacity-0"
@@ -63,6 +156,8 @@
                     @click="closeMenu"
                 />
             </transition>
+
+            <!-- Drawer (mobile) -->
             <transition
                 enter-active-class="transition duration-200 ease-out"
                 enter-from-class="-translate-x-full"
@@ -73,9 +168,7 @@
             >
                 <aside
                     v-if="isMenuOpen"
-                    class="fixed left-0 top-0 z-50 h-full w-full bg-primary-600 px-6 pb-8 pt-6 text-white shadow-xl md:hidden"
-                    role="dialog"
-                    aria-modal="true"
+                    class="fixed left-0 top-0 z-50 h-full w-full bg-primary-500 px-6 pb-8 pt-6 text-white shadow-xl md:hidden"
                 >
                     <div class="flex items-center justify-between">
                         <span class="text-2xl font-bold uppercase">Menu</span>
@@ -88,12 +181,27 @@
                             <Icon name="mdi:close" size="44"/>
                         </button>
                     </div>
+
                     <nav class="mt-8 flex flex-col gap-6 text-xl font-bold uppercase">
-                        <NuxtLink to="/" class="opacity-100" @click="closeMenu">Accueil</NuxtLink>
+                        <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>
                     </nav>
+
                     <button
+                        v-if="auth.isAuthenticated"
                         type="button"
-                        class="mt-5 text-xl font-bold uppercase"
+                        class="mt-6 text-xl font-bold uppercase"
                         @click="handleLogout"
                     >
                         Déconnexion
@@ -101,10 +209,10 @@
                 </aside>
             </transition>
         </header>
-        <main class="mx-auto w-full max-w-[1280px]">
+        <main class="mx-auto w-full max-w-[1280px] mt-16">
             <slot/>
         </main>
-        <footer class="w-full mt-8 bg-primary-500 p-6">
+        <footer class="w-full mt-auto bg-primary-500 px-6 py-3">
             <p class="font-bold text-white text-right">v{{ version }}</p>
         </footer>
     </div>
@@ -115,9 +223,12 @@ import {useAuthStore} from '~/stores/auth'
 
 const route = useRoute()
 const auth = useAuthStore()
-const isMenuOpen = ref(false)
 const {version} = useAppVersion()
 
+const isMenuOpen = ref(false)
+
+const userDisplayName = computed(() => auth.user?.username ?? 'Utilisateur')
+
 const closeMenu = () => {
     isMenuOpen.value = false
 }

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

@@ -1,19 +1,19 @@
 
 <template>
     <form @submit.prevent="validate">
-    <div class="flex items-center justify-between ">
+    <div class="flex items-center justify-between">
         <h1 class="text-3xl font-bold uppercase">
             {{ route.params.id ? 'Modifier transporteur' : 'Ajout transporteur' }}
         </h1>
 
-        <button
+        <UiButton
             type="submit"
             class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px] justify-self-end"
         >Enregistrer
-        </button>
+        </UiButton>
     </div>
 
-    <div class="grid grid-cols-2 items-start gap-y-8 gap-x-40 mb-16">
+    <div class="grid grid-cols-2 items-start gap-y-8 gap-x-40 py-12">
         <UiTextInput
             label = "nom du fournisseur"
             id="carrier-name"
@@ -33,19 +33,27 @@
 <script setup lang="ts">
 import {createCarrier, getCarrier, updateCarrier} from "~/services/carrier";
 import type {CarrierData, CarrierFormData} from "~/services/dto/carrier-data";
+import {computed} from "vue";
 const router = useRouter()
 const route = useRoute()
-const idCarrier = Number(route.params.id)
+const idCarrier = computed(() => resolveId(route.params.id))
 const isLoading = ref(false)
 const isHydrating = ref(false)
 
+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 form = reactive<CarrierFormData>({
     code:'',
     name:''
 })
 
 definePageMeta({
-    layout: 'admin'
+    layout: 'default'
 })
 
 const hydrateFromUser = (carrier: CarrierData | null) => {
@@ -59,7 +67,7 @@ const hydrateFromUser = (carrier: CarrierData | null) => {
 }
 
 watch(
-    () => idCarrier,
+    () => idCarrier.value,
     async (id) => {
         if (id === null) {
             return
@@ -85,8 +93,8 @@ async function validate() {
 
     }
 
-    if(idCarrier){
-        await updateCarrier(idCarrier, basePayload)
+    if(idCarrier.value){
+        await updateCarrier(idCarrier.value, basePayload)
         navigate()
         return
     }

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

@@ -1,11 +1,13 @@
 <template>
 
     <div class="flex items-center justify-between ">
-            <h1 class="text-3xl font-bold uppercase">listes des transporteurs</h1>
+            <h1 class="text-3xl font-bold uppercase text-primary-500">listes des transporteurs</h1>
             <NuxtLink
                 to="/admin/carrier"
-                class="flex items-center justify-center text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px]"
-            >Ajouter
+                class="inline-flex items-center justify-center gap-2 text-xl uppercase bg-primary-500 text-white h-[50px] px-8 rounded"
+            >
+                <Icon name="mdi:plus" size="28"  />
+                Ajouter
             </NuxtLink>
     </div>
 
@@ -42,7 +44,7 @@ const goToCarrier = (id: number) => {
 }
 
 definePageMeta({
-    layout: 'admin'
+    layout: 'default'
 })
 
 onMounted(async () => {

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

@@ -5,31 +5,32 @@
                 {{ customerId ? "Modifications du client" : "Ajout d'un client" }}
             </h1>
 
-            <button
+            <UiButton
                 class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px]"
                 type="submit"
                 :disabled="isLoading || !auth.isAdmin"
             >
                 {{ customerId ? "Sauvegarder" : "Ajouter" }}
-            </button>
+            </UiButton>
         </div>
 
         <div class="grid grid-cols-2 gap-y-8 gap-x-80 mb-10 py-12">
-            <UiTextInput id="customer-label" v-model="form.label" label="Nom du client" :disabled="!auth.isAdmin"/>
-            <UiTextInput id="customer-code" v-model="form.code" label="Code" :disabled="!auth.isAdmin"/>
+            <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
+            <UiButton
                 type="button"
                 class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px]"
                 :disabled="customerId === null || !auth.isAdmin"
                 @click="goToAddAddress"
             >
                 Ajouter
-            </button>
+            </UiButton>
         </div>
         <div class="overflow-x-auto mb-10">
             <table class="w-full border-collapse">
@@ -79,7 +80,7 @@ import {createCustomer, getCustomer, updateCustomer} from "~/services/customer"
 import type {CustomerData, CustomerFormData, CustomerPayload} from "~/services/dto/customer-data"
 import {useAuthStore} from "~/stores/auth"
 
-definePageMeta({layout: "admin"})
+definePageMeta({layout: "default"})
 
 const route = useRoute()
 const router = useRouter()
@@ -94,8 +95,9 @@ const resolveId = (param: unknown) => {
 const customerId = computed(() => resolveId(route.params.id))
 const isLoading = ref(false)
 const form = reactive<CustomerFormData>({
-    label: "",
-    code: "",
+    name: "",
+    phone: "",
+    email: "",
     addresses: [],
 })
 
@@ -122,8 +124,9 @@ const goToEditAddress = (addressId: number | null) => {
 
 const hydrateFromCustomer = (customer: CustomerData | null) => {
     if (!customer) return
-    form.label = customer.label ?? ""
-    form.code = customer.code ?? ""
+    form.name = customer.name ?? ""
+    form.phone = customer.phone ?? ""
+    form.email = customer.email ?? ""
     if (!Array.isArray(customer.addresses) || customer.addresses.length === 0) {
         form.addresses = []
         return
@@ -165,12 +168,14 @@ async function validate() {
     isLoading.value = true
 
     try {
-        const label = form.label.trim()
-        const code = form.code.trim()
+        const name = form.name.trim()
+        const phone = form.phone?.trim() || null
+        const email = form.email?.trim() || null
 
         const customerPayload: CustomerPayload = {
-            label,
-            code,
+            name,
+            phone,
+            email,
         }
         let targetId: number | null = null
 

frontend/pages/admin/customer/address.vue

@@ -8,7 +8,7 @@ import { createAddress, getAddress, updateAddress } from "~/services/address"
 import { getCustomer, updateCustomer } from "~/services/customer"
 import type { CustomerData } from "~/services/dto/customer-data"
 
-definePageMeta({ layout: "admin" })
+definePageMeta({ layout: "default" })
 
 const route = useRoute()
 const router = useRouter()

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

@@ -1,12 +1,13 @@
 <template>
     <div class="flex items-center justify-between">
-        <h1 class="text-3xl font-bold uppercase">Liste des Clients</h1>
+        <h1 class="text-3xl font-bold uppercase text-primary-500">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="inline-flex items-center justify-center gap-2 text-xl uppercase bg-primary-500 text-white h-[50px] px-8 rounded-md"
             :class="auth.isAdmin ? '' : 'cursor-not-allowed opacity-60'"
             @click="handleAddClick"
         >
+            <Icon name="mdi:plus" size="28"  />
             Ajouter
         </NuxtLink>
     </div>
@@ -14,10 +15,11 @@
     <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-7 gap-4 bg-slate-100 px-4 py-3 text-sm font-semibold uppercase tracking-wide"
+                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>Code</div>
+                <div>Téléphone</div>
+                <div>Email</div>
                 <div>Rue</div>
                 <div>Complément</div>
                 <div>Code Postal</div>
@@ -26,17 +28,18 @@
             </div>
 
             <div v-if="customerList.length === 0" class="px-4 py-6 text-slate-400">
-                Aucun fournisseur.
+                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-7 border-t gap-4 px-4 py-2 hover:bg-slate-50 cursor-pointer"
+                    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.label }}</div>
-                    <div class="truncate">{{ customer.code }}</div>
+                    <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>
@@ -48,14 +51,15 @@
                     <div
                         v-for="(address, idx) in customer.addresses"
                         :key="address.id ?? `${customer.id}-${idx}-${address.street}-${address.postalCode}`"
-                        class="grid grid-cols-7 hover:bg-slate-50 border-t gap-4 px-4 py-2 cursor-pointer"
+                        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.label : "↳" }}
+                            {{ idx === 0 ? (customer.name || "—") : "↳" }}
                         </div>
-                        <div class="truncate">{{ idx === 0 ? customer.code : ""  }}</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>
@@ -66,11 +70,12 @@
 
                 <template v-else>
                     <div
-                        class="grid grid-cols-7 hover:bg-slate-50 border-t gap-4 px-4 py-2 cursor-pointer"
+                        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.label }}</div>
-                        <div class="truncate">{{ customer.code }}</div>
+                        <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>
@@ -89,7 +94,7 @@ import { getCustomerList } from "~/services/customer"
 import type { CustomerData } from "~/services/dto/customer-data"
 import { useAuthStore } from "~/stores/auth"
 
-definePageMeta({ layout: "admin" })
+definePageMeta({ layout: "default" })
 
 const customerList = ref<CustomerData[]>([])
 const router = useRouter()

frontend/pages/admin/dashboard.vue

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

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

@@ -5,13 +5,13 @@
                 {{ supplierId ? "Modifications du fournisseur" : "Ajout d'un fournisseur" }}
             </h1>
 
-            <button
+            <UiButton
                 class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px]"
                 type="submit"
                 :disabled="isLoading || !auth.isAdmin"
             >
                 {{ supplierId ? "Sauvegarder" : "Ajouter" }}
-            </button>
+            </UiButton>
         </div>
 
         <div class="grid grid-cols-2 gap-y-8 gap-x-80 mb-10 py-12">
@@ -23,14 +23,14 @@
         <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 fournisseur</h2>
-            <button
+            <UiButton
                 type="button"
                 class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px]"
                 :disabled="supplierId === null || !auth.isAdmin"
                 @click="goToAddAddress"
             >
                 Ajouter
-            </button>
+            </UiButton>
         </div>
         <div class="overflow-x-auto mb-10">
             <table class="w-full border-collapse">
@@ -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: "admin"})
+definePageMeta({layout: "default"})
 
 const route = useRoute()
 const router = useRouter()

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: "admin" })
+definePageMeta({ layout: "default" })
 
 const route = useRoute()
 const router = useRouter()

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

@@ -1,12 +1,13 @@
 <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 text-primary-500">Liste des fournisseurs</h1>
         <NuxtLink
             to="/admin/supplier"
-            class="flex items-center justify-center text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px]"
+            class="inline-flex items-center justify-center gap-2 text-xl uppercase bg-primary-500 text-white h-[50px] px-8 rounded"
             :class="auth.isAdmin ? '' : 'cursor-not-allowed opacity-60'"
             @click="handleAddClick"
         >
+            <Icon name="mdi:plus" size="28"  />
             Ajouter
         </NuxtLink>
     </div>
@@ -89,7 +90,7 @@ import { getSupplierList } from "~/services/supplier"
 import type { SupplierData } from "~/services/dto/supplier-data"
 import { useAuthStore } from "~/stores/auth"
 
-definePageMeta({ layout: "admin" })
+definePageMeta({ layout: "default" })
 
 const supplierList = ref<SupplierData[]>([])
 const router = useRouter()

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

@@ -5,15 +5,15 @@
             <h1 class="text-3xl font-bold uppercase">
                 {{ userId ? "Modifications de l'utilisateur" : "Ajout d'un utilisateur" }}
             </h1>
-            <button
+            <UiButton
                 class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px]"
                 type="submit"
             >
                 {{ userId ? 'Sauvegarder' : 'Ajouter' }}
-            </button>
+            </UiButton>
         </div>
 
-        <div class="grid gap-y-16 gap-x-40 mb-16">
+        <div class="grid gap-y-16 gap-x-40 py-12">
             <UiTextInput
                 id="user-name"
                 v-model="form.username"
@@ -39,7 +39,7 @@
 </template>
 <script setup lang="ts">
 definePageMeta({
-    layout: 'admin'
+    layout: 'default'
 })
 
 import {computed, reactive, ref, watch} from 'vue'

frontend/pages/admin/user/list.vue

@@ -1,10 +1,11 @@
 <template>
     <div class="flex items-center justify-between">
-        <h1 class="text-3xl font-bold uppercase">Liste des utilisateurs</h1>
+        <h1 class="text-3xl font-bold uppercase text-primary-500">Liste des utilisateurs</h1>
         <NuxtLink
-            class="flex items-center justify-center text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px]"
+            class="inline-flex items-center justify-center gap-2 text-xl uppercase bg-primary-500 text-white h-[50px] px-8 rounded-md"
             @click="router.push('/admin/user/')"
         >
+            <Icon name="mdi:plus" size="28"  />
             Ajouter
         </NuxtLink>
 
@@ -28,7 +29,7 @@
                     {{ user.username }}
                 </div>
                 <div>
-                    {{ user.roles?.join(', ') || ' ---' }}
+                    {{ getRoleLabels(user.roles) }}
                 </div>
             </div>
         </div>
@@ -38,19 +39,31 @@
 
 <script setup lang="ts">
 definePageMeta({
-    layout: 'admin'
+    layout: 'default'
 })
 
 import type {UserData} from "~/services/dto/user-data";
-import {getAdminUsers, getUsers} from "~/services/auth";
+import {getAdminUsers} from "~/services/auth";
+import {ROLE} from "~/utils/constants";
 
 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/identification-bovin.vue

@@ -1,49 +0,0 @@
-<template>
-    <div>
-        <div class="flex justify-between">
-            <h1 class="font-bold text-4xl uppercase">Passeport du bovin</h1>
-            <p v-if="bovinData">{{ bovinData.presencePeriod }}</p>
-        </div>
-        <div class="overflow-x-auto mt-12" v-if="bovinData">
-            <table class="w-full border-collapse border border-black text-sm">
-                <tr>
-                    <th
-                        rowspan="2"
-                        class="w-10 border border-black p-0 align-middle"
-                    >
-                        <div class="flex h-full w-full items-center justify-center">
-                          <span class="-rotate-90 whitespace-nowrap font-semibold tracking-widest">
-                            VEAU
-                          </span>
-                        </div>
-                    </th>
-                    <th class="border border-black px-4 py-3 text-center font-semibold">N° de travail</th>
-                    <th class="border border-black px-4 py-3 text-center font-semibold">Sexe</th>
-                    <th class="border border-black px-4 py-3 text-center font-semibold">Code Race</th>
-                    <th class="border border-black px-4 py-3 text-center font-semibold">Code pays</th>
-                    <th class="border border-black px-4 py-3 text-center font-semibold">Type de racial</th>
-                    <th class="border border-black px-4 py-3 text-center font-semibold">Date de naissance</th>
-                </tr>
-
-                <tr>
-                    <th class="border border-black px-4 py-3 text-center font-semibold">{{ bovinData.workNumber }}</th>
-                    <th class="border border-black px-4 py-3 text-center font-semibold">{{ bovinData.sex }}</th>
-                    <th class="border border-black px-4 py-3 text-center font-semibold">{{ bovinData.breedType }}</th>
-                    <th class="border border-black px-4 py-3 text-center font-semibold">FR {{ bovinData.numeroNational }}</th>
-                    <th class="border border-black px-4 py-3 text-center font-semibold">???</th>
-                    <th class="border border-black px-4 py-3 text-center font-semibold">{{ bovinData.birthDate }}</th>
-                </tr>
-            </table>
-        </div>
-    </div>
-</template>
-
-<script setup lang="ts">
-import {getBovinData} from "~/services/identification-bovin";
-
-const bovinData = ref<IdentificationBovinData|null>()
-
-onMounted(async () => {
-    bovinData.value = await getBovinData('7979580026');
-})
-</script>

frontend/pages/index.vue

@@ -1,15 +1,27 @@
 <script setup lang="ts">
 </script>
 <template>
-    <div class="flex flex-wrap justify-center mt-8 gap-8 mb-8 md:mb-0">
+    <div class="flex flex-wrap justify-center pb-16 gap-12">
         <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="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="mdi:cube-outline" />
+        <card-link label="PLAN DE SITE" link="/" iconName="material-symbols:warehouse-outline-rounded" />
+        <card-link link="/reception/waiting-reception" iconName="mdi:truck-remove-outline">
+            <template #label>
+                Réceptions<br>EN ATTENTE
+            </template>
+        </card-link>
+        <card-link link="/shipment/waiting-shipment" iconName="mdi:truck-cargo-container">
+            <template #label>
+                EXPÉDITIONS<br>EN ATTENTE
+            </template>
+        </card-link>
+        <card-link label="CASES" link="/" iconName="material-symbols:bottom-sheets-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" />
+        <card-link link="/" iconName="mdi:cow">
+            <template #label>
+                PASSEPORT<br>DU BOVIN
+            </template>
+        </card-link>
     </div>
 </template>

frontend/pages/login.vue

@@ -39,13 +39,13 @@
         />
       </div>
 
-      <button
+      <UiButton
         type="submit"
         class="w-full rounded-md bg-primary-500 px-4 py-2 text-base font-semibold text-white transition hover:bg-primary-600 disabled:cursor-not-allowed disabled:opacity-60"
         :disabled="isSubmitting"
       >
         Connexion
-      </button>
+      </UiButton>
           <p class="font-bold">v{{ version }}</p>
       </form>
   </div>

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

@@ -1,29 +1,28 @@
 <template>
-    <div>
-        <div class="flex justify-between h-[52px] mt-6 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 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>
-        <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 &&
-            receptionStore.current?.receptionType?.code === RECEPTION_TYPE_CODES.BOVINS"/>
-        <ReceptionWeight v-if="storeReception?.currentStep !== null && storeReception?.currentStep >= 3" mode="tare"/>
+        <UiButton
+            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
+        </UiButton>
     </div>
+    <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 &&
+            receptionStore.current?.receptionType?.code === RECEPTION_TYPE_CODES.BOVINS"/>
+    <ReceptionWeight v-if="storeReception?.currentStep !== null && storeReception?.currentStep >= 3" mode="tare"/>
 </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">
-            <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>
+            <Icon @click="router.push('/')" name="gg:arrow-left-o" size="44" class="cursor-pointer text-primary-500"/>
+            <h1 class="text-3xl font-bold uppercase text-primary-500">listes des réceptions finie</h1>
     </div>
 
-    <div class="ps-20 " >
+    <div class="px-[86px]">
         <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>{{ formatWeighing(reception, 'gross') }} | {{ formatWeighing(reception, 'tare') }}</div>
+                <div>{{ formatWeighing(reception) }}</div>
             </div>
         </div>
     </div>
@@ -36,16 +36,20 @@
 <script setup lang="ts">
 import type {ReceptionData} from "~/services/dto/reception-data";
 import {getReceptionList} from "~/services/reception";
+import type {ShipmentData} from "~/services/dto/shipment-data";
 
 const receptionList = ref<ReceptionData[]>()
 const router = useRouter()
 
-const formatWeighing = (reception: ReceptionData, type: 'gross' | 'tare') => {
-    const entry = reception.weights?.find((weight) => weight.type === type)
-    if (!entry || entry.weight == null || entry.dsd == null) {
+const formatWeighing = (reception: ReceptionData) => {
+    const gross = reception.weights?.find((weight) => weight.type === 'gross')?.weight
+    const tare = reception.weights?.find((weight) => weight.type === 'tare')?.weight
+
+    if (gross == null || tare == null) {
         return '—'
     }
-    return `${entry.weight} kg`
+
+    return `${gross - tare} kg`
 }
 
 const goToReception = (id: number) => {

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

@@ -115,14 +115,14 @@
             />
         </div>
         <div class="flex justify-center mb-2">
-            <button
+            <UiButton
                 v-if="auth.isAdmin"
                 type="submit"
                 class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px] mb-16"
 
             >
                 Enregistrer
-            </button>
+            </UiButton>
         </div>
             <div class="flex justify-evenly gap-y-8 gap-x-40 mb-8 border-b border-slate-400">
                 <h1

frontend/pages/reception/waiting-reception.vue

@@ -1,13 +1,13 @@
 <template>
-    <div class="flex items-center justify-between ">
+    <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" />
-            <h1 class="text-3xl font-bold uppercase">listes des réceptions en attente</h1>
+            <Icon @click="router.push('/')" name="gg:arrow-left-o" size="44" class="cursor-pointer text-primary-500"/>
+            <h1 class="text-3xl font-bold uppercase text-primary-500">listes des réceptions en attente</h1>
         </div>
     </div>
 
-    <div class="ps-20 " >
-        <div class="mt-6 border border-slate-200 mb-16 ">
+    <div class="px-[86px]">
+        <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>
                 <div>Adresse</div>

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

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

frontend/pages/shipment/finish-shipment.vue

@@ -1,10 +1,10 @@
 <template>
     <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>
+        <Icon @click="router.push('/')" name="gg:arrow-left-o" size="44" class="cursor-pointer text-primary-500"/>
+        <h1 class="text-3xl font-bold uppercase text-primary-500">listes des expéditions finie</h1>
     </div>
 
-    <div class="ps-20 ">
+    <div class="px-[86px]">
         <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="goToshipment(shipment.id)"
+                @click="goShipment(shipment.id)"
             >
                 <div>{{ shipment.identificationNumber }}</div>
                 <div>{{ shipment.shipmentDate }}</div>
-                <div>{{ shipment.customer?.label }}</div>
+                <div>{{ shipment.customer?.name }}</div>
                 <div>{{ shipment.address?.fullAddress }}</div>
                 <div>
                     <template v-if="formatBovinShipmentLines(shipment).length">
@@ -38,7 +38,7 @@
                         </div>
                     </template>
                 </div>
-                <div>{{ formatWeighing(shipment, 'gross') }} | {{ formatWeighing(shipment, 'tare') }}</div>
+                <div>{{ formatWeighing(shipment) }}</div>
             </div>
         </div>
     </div>
@@ -51,12 +51,15 @@ import {getShipmentList} from "~/services/shipment";
 const shipmentList = ref<ShipmentData[]>()
 const router = useRouter()
 
-const formatWeighing = (shipment: ShipmentData, type: 'gross' | 'tare') => {
-    const entry = shipment.weights?.find((weight) => weight.type === type)
-    if (!entry || entry.weight == null || entry.dsd == null) {
+const formatWeighing = (shipment: ShipmentData) => {
+    const gross = shipment.weights?.find((weight) => weight.type === 'gross')?.weight
+    const tare = shipment.weights?.find((weight) => weight.type === 'tare')?.weight
+
+    if (gross == null || tare == null) {
         return '—'
     }
-    return `${entry.weight} kg`
+
+    return `${gross - tare} kg`
 }
 
 const formatBovinShipmentLines = (shipment: ShipmentData) => {
@@ -71,8 +74,8 @@ const formatBovinShipmentLines = (shipment: ShipmentData) => {
     })
 }
 
-const goToshipment = (id: number) => {
-    //router.push(`/shipment/update/${id}`)
+const goShipment = (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 ">
+    <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"/>
-            <h1 class="text-3xl font-bold uppercase">listes des expéditions en attente</h1>
+            <Icon @click="router.push('/')" name="gg:arrow-left-o" size="44" class="cursor-pointer text-primary-500"/>
+            <h1 class="text-3xl font-bold uppercase text-primary-500">listes des expéditions en attente</h1>
         </div>
     </div>
 
-    <div class="ps-20 ">
+    <div class="px-[86px]">
         <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/dto/address-data.ts

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

frontend/services/dto/customer-data.ts

@@ -4,19 +4,22 @@ export type CustomerAddresses = AddressFormData[] | string[]
 
 export interface CustomerData {
     id: number
-    label: string
-    code?: string | null
+    name: string
+    phone?: string | null
+    email?: string | null
     addresses: CustomerAddresses
 }
 
 export interface CustomerFormData {
-    label: string
-    code?: string
+    name: string
+    phone?: string
+    email?: string
     addresses: AddressFormData[]
 }
 
 export type CustomerPayload = {
-    label: string
-    code?: string | null
+    name: string
+    phone?: string | null
+    email?: string | null
     addresses?: string[]
 }

frontend/services/dto/identification-bovin-data.ts

@@ -1,22 +0,0 @@
-interface IdentificationBovinData {
-    numeroNational: string,
-    sex: string | null,
-    breedType: string | null,
-    workNumber: string | null,
-    birthDate: string | null,
-    birthDateCompletenessFlag: string | null,
-    isFilie: boolean | null,
-    motherNationalNumber: string | null,
-    motherBreedType: string | null,
-    fatherNationalNumber: string | null,
-    fatherBreedType: string | null,
-    birthExploitationNumber: string | null,
-    presencePeriod: PresencePeriod[]
-}
-
-interface PresencePeriod {
-    entryDate: string | null,
-    entryCause: string | null,
-    exitDate: string | null,
-    exitCause: string | null
-}

frontend/services/identification-bovin.ts

@@ -1,25 +0,0 @@
-import { useApi } from '~/composables/useApi'
-
-export type BovinDataResponse =
-    | IdentificationBovinData
-    | { 'hydra:member'?: IdentificationBovinData }
-
-export async function getBovinData(
-    nationalNumber: string
-): Promise<IdentificationBovinData | null> {
-    const api = useApi()
-    const response = await api.get<BovinDataResponse>(
-        `bovins/${nationalNumber}/identification`,
-        {},
-        { toastErrorKey: 'errors.building.list' }
-    )
-
-    if (response && typeof response === 'object') {
-        // direct item
-        if (!('hydra:member' in response)) return response as IdentificationBovinData
-        // hydra format
-        if (response['hydra:member']) return response['hydra:member']
-    }
-
-    return null
-}

frontend/tailwind.config.ts

@@ -8,16 +8,7 @@ export default <Partial<Config>>{
       },
       colors: {
         primary: {
-          50: '#f6f9ea',
-          100: '#eaf2cf',
-          200: '#d6e3a4',
-          300: '#c1d47a',
-          400: '#afc85a',
-          500: '#9ebb43',
-          600: '#7e9735',
-          700: '#607228',
-          800: '#414d1a',
-          900: '#24290d'
+          500: '#456452',
         }
       }
     }

migrations/Version20260213093000.php

@@ -0,0 +1,32 @@
+<?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

@@ -0,0 +1,37 @@
+<?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

@@ -0,0 +1,40 @@
+<?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/ApiResource/BovinIdentification.php

@@ -15,8 +15,7 @@ use App\State\BovinIdentificationProvider;
             uriTemplate: '/bovins/{numeroNational}/identification',
             provider: BovinIdentificationProvider::class
         ),
-    ],
-    security: "is_granted('ROLE_USER')",
+    ]
 )]
 final class BovinIdentification
 {

src/Command/SeedCommand.php

@@ -5,12 +5,15 @@ 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;
@@ -50,7 +53,11 @@ 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();
 
@@ -61,7 +68,7 @@ class SeedCommand extends Command
 
     private function seedTrucks(): array
     {
-        $trucks  = ['Citerne', 'Porteur'];
+        $trucks  = ['Citerne', 'Porteur', 'Plateau', 'Remorque', 'Benne'];
         $citerne = null;
         $porteur = null;
         foreach ($trucks as $name) {
@@ -161,6 +168,7 @@ 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) {
@@ -223,6 +231,39 @@ 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' => 'Boucherie', 'code' => 'BDB'],
+            ['label' => 'É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 = [
@@ -458,6 +499,130 @@ 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'      => 'Malonze',
+                        'street2'     => null,
+                        'postalCode'  => '23300',
+                        'city'        => 'LA SOUTERRAINE',
+                        '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.40.98.90.00',
+                'email'     => 'scouillaud@terrena.fr',
+                'addresses' => [
+                    [
+                        'label'       => 'TERRENA',
+                        'street'      => 'LA NOELLE',
+                        'street2'     => 'BP 20199',
+                        'postalCode'  => '44155',
+                        'city'        => 'ANCENIS CEDEX',
+                        '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,7 +20,6 @@ class AppFixtures extends Fixture implements DependentFixtureInterface
         return [
             TransportFixtures::class,
             ReferenceFixtures::class,
-            SupplierFixtures::class,
             UserFixtures::class,
         ];
     }

src/DataFixtures/ReferenceFixtures.php

@@ -5,10 +5,13 @@ 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;
@@ -17,10 +20,13 @@ 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()
@@ -69,6 +75,31 @@ 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',
@@ -290,21 +321,129 @@ class ReferenceFixtures extends Fixture
             ;
 
             foreach ($supplierData['addresses'] as $addressData) {
-                $address = new Address()
-                    ->setLabel($addressData['label'])
-                    ->setStreet($addressData['street'])
-                    ->setStreet2($addressData['street2'])
-                    ->setPostalCode($addressData['postalCode'])
-                    ->setCity($addressData['city'])
-                    ->setCountryCode($addressData['countryCode'])
-                ;
-                $manager->persist($address);
+                $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];
                 $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'      => 'Malonze',
+                        'street2'     => null,
+                        'postalCode'  => '23300',
+                        'city'        => 'LA SOUTERRAINE',
+                        '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.40.98.90.00',
+                'email'     => 'scouillaud@terrena.fr',
+                'addresses' => [
+                    [
+                        'label'       => 'TERRENA',
+                        'street'      => 'LA NOELLE',
+                        'street2'     => 'BP 20199',
+                        'postalCode'  => '44155',
+                        'city'        => 'ANCENIS CEDEX',
+                        '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

@@ -1,38 +0,0 @@
-<?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,11 +15,17 @@ class TransportFixtures extends Fixture
 {
     public function load(ObjectManager $manager): void
     {
-        $citerne = new Truck()->setName('Citerne');
-        $porteur = new Truck()->setName('Porteur');
+        $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');
 
         $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', columns: ['shipment_id', 'shipment_type_id'])]
+#[ORM\UniqueConstraint(name: 'uniq_bovin_shipment_one_type', columns: ['shipment_id'])]
 #[ORM\Table(name: 'bovin_shipment')]
 #[ApiResource(
     operations: [

src/Entity/Customer.php

@@ -47,13 +47,17 @@ class Customer
     #[Groups(['shipment:read', 'customer:read'])]
     private ?int $id = null;
 
-    #[ORM\Column(length: 255)]
+    #[ORM\Column(length: 180)]
     #[Groups(['customer:read', 'customer:write', 'shipment:read'])]
-    private ?string $label = null;
+    private string $name = '';
 
-    #[ORM\Column(length: 255)]
+    #[ORM\Column(length: 180, nullable: true)]
     #[Groups(['customer:read', 'customer:write', 'shipment:read'])]
-    private ?string $code = null;
+    private ?string $email = null;
+
+    #[ORM\Column(length: 40, nullable: true)]
+    #[Groups(['customer:read', 'customer:write', 'shipment:read'])]
+    private ?string $phone = null;
 
     /**
      * @var Collection<int, Address>
@@ -74,24 +78,40 @@ class Customer
         return $this->id;
     }
 
-    public function getLabel(): ?string
+    public function getName(): string
     {
-        return $this->label;
+        return $this->name;
     }
 
-    public function setLabel(?string $label): void
+    public function setName(string $name): self
     {
-        $this->label = $label;
+        $this->name = $name;
+
+        return $this;
     }
 
-    public function getCode(): ?string
+    public function getEmail(): ?string
     {
-        return $this->code;
+        return $this->email;
     }
 
-    public function setCode(?string $code): void
+    public function setEmail(?string $email): self
     {
-        $this->code = $code;
+        $this->email = $email;
+
+        return $this;
+    }
+
+    public function getPhone(): ?string
+    {
+        return $this->phone;
+    }
+
+    public function setPhone(?string $phone): self
+    {
+        $this->phone = $phone;
+
+        return $this;
     }
 
     public function getAddresses(): Collection

src/Entity/Shipment.php

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

src/Entity/Supplier.php

@@ -26,7 +26,7 @@ use Symfony\Component\Serializer\Attribute\Groups;
         ),
         new GetCollection(
             normalizationContext: ['groups' => ['supplier:read']],
-            security: "is_granted('ROLE_ADMIN')"
+            security: "is_granted('ROLE_USER')"
         ),
         new Post(
             normalizationContext: ['groups' => ['supplier:read']],

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.label : '-' }}</strong><br>
+                <strong>{{ shipment.customer ? shipment.customer.name : '-' }}</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.code : '-' }}
+            {{ shipment.customer ? shipment.customer.name : '-' }}
         </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 de livraison : {{ shipment.truck ? shipment.truck.name : '-' }}</p>
+                <p>Mode d'expédition : {{ shipment.truck ? shipment.truck.name : '-' }}</p>
                 <p>Immatriculation : {{ shipment.licencePlate ?? '-' }}</p>
             </div>
         </td>