fix : corrections diverses

CHANGELOG.md

@@ -44,7 +44,6 @@ Ajouter dans le fichier .env du frontend
 * [#275] Lister les expéditions en attente
 * [#276] Lister les expéditions terminées
 * [#324] Creation page admin listing clients
-* [#326] Admin modification creation client
 
 ### Changed
 

config/version.yaml

@@ -1,2 +1,2 @@
 parameters:
-    app.version: '0.0.43'
+    app.version: '0.0.42'

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

@@ -29,7 +29,7 @@
         <button
             class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px]"
             @click="goNext"
-        >Peser
+        >Valider
         </button>
     </div>
 </template>

frontend/components/reception/reception-form.vue

@@ -119,7 +119,7 @@
             <button
                 type="submit"
                 class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px] justify-self-end"
-            >Peser
+            >Valider
             </button>
         </div>
     </form>
@@ -342,7 +342,7 @@ onMounted(async () => {
 
 // Ajuste driver/vehicle quand le transporteur change (logique LIOT)
 watch(
-    () => [form.supplierId, suppliers.value],
+    () => [form.supplierId, form.addressId, suppliers.value],
     () => {
         if (!form.supplierId) {
             form.addressId = ''
@@ -359,7 +359,11 @@ watch(
             (address) => String(address.id) === form.addressId
         )
         if (!matches) {
-            form.addressId = ''
+            if (supplierAddresses.value.length === 1) {
+                form.addressId = String(supplierAddresses.value[0].id)
+            } else {
+                form.addressId = ''
+            }
         }
     },
     {immediate: true}

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

@@ -67,7 +67,7 @@
         <button
             class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px]"
             @click="goNext"
-        >Peser
+        >Valider
         </button>
     </div>
 </template>

frontend/components/reception/reception-weight.vue

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

frontend/components/reception/update-merchandise.vue

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

frontend/components/reception/update-weight.vue

@@ -1,27 +1,42 @@
 <template>
     <form @submit.prevent="validate">
-
-        <div class="grid grid-cols-2 gap-x-40 gap-y-8 mb-16">
+        <div class="grid grid-cols-2 gap-x-40 gap-y-8 mb-8">
+            <UiTextInput
+                label="Dsd"
+                class="col-start-2"
+                v-model="form.weights[0].dsd"
+                :disabled="!auth.isAdmin"
+            />
+            <UiDateInput
+                label="Date pesée"
+                v-model="form.weights[0].weighedAt"
+                :disabled="!auth.isAdmin"
+            />
+        </div>
+        <div class="grid grid-cols-2 gap-x-40 mb-16">
             <UiNumberInput
                 label="Pesée à vide"
+                labelClass="font-bold uppercase text-xl"
                 v-model="form.weights[0].weight"
+                wrapper-class="col-start-1 row-start-1"
                 :disabled="!auth.isAdmin"
-                :min="0"
             />
 
             <UiNumberInput
                 label="Pesée à plein"
+                labelClass="font-bold uppercase text-xl"
                 v-model="form.weights[1].weight"
+                wrapper-class="col-start-2 row-start-1"
                 :disabled="!auth.isAdmin"
-                :min="0"
             />
         </div>
 
         <div class="flex justify-center">
             <button
+                v-if="auth.isAdmin"
                 type="submit"
                 class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px]"
-                :disabled="!auth.isAdmin"
+
             >
                 Valider
             </button>
@@ -32,7 +47,7 @@
 
 <script setup lang="ts">
 import type {ReceptionFormWeight} from '~/services/dto/reception-data'
-import { getReception } from '~/services/reception'
+import {getReception} from '~/services/reception'
 import {updateWeight} from "~/services/weight";
 import {useAuthStore} from "~/stores/auth";
 
@@ -45,8 +60,8 @@ const auth = useAuthStore()
 
 const form = reactive({
     weights: [
-        { id: 0, type: 'tare' as const, weight: 0 },
-        { id: 0, type: 'gross' as const, weight: 0 }
+        {id: 0, type: 'tare' as const, weight: 0, dsd: null, weighedAt: null},
+        {id: 0, type: 'gross' as const, weight: 0, dsd: null, weighedAt: null}
     ]
 })
 
@@ -54,8 +69,8 @@ const hydrateFromReception = (reception: ReceptionFormWeight) => {
     const tare = reception.weights.find(weight => weight.type === 'tare')
     const gross = reception.weights.find(weight => weight.type === 'gross')
 
-    if (tare) form.weights[0] = { ...tare }
-    if (gross) form.weights[1] = { ...gross }
+    if (tare) form.weights[0] = {...form.weights[0], ...tare}
+    if (gross) form.weights[1] = {...form.weights[1], ...gross}
 }
 
 onMounted(async () => {
@@ -64,11 +79,24 @@ onMounted(async () => {
 })
 
 async function validate() {
+    const sharedDsd =
+        form.weights[0].dsd === null || form.weights[0].dsd === undefined || form.weights[0].dsd === ''
+            ? null
+            : Number(form.weights[0].dsd)
+    const sharedWeighedAt =
+        form.weights[0].weighedAt === null || form.weights[0].weighedAt === undefined || form.weights[0].weighedAt === ''
+            ? null
+            : form.weights[0].weighedAt
 
     for (const weight of form.weights) {
         if (weight.id) {
-            await updateWeight(weight.id, {weight: weight.weight})
+            await updateWeight(weight.id, {
+                weight: weight.weight,
+                dsd: Number.isFinite(sharedDsd) ? sharedDsd : null,
+                weighedAt: sharedWeighedAt
+            })
         }
     }
+
 }
 </script>

frontend/components/shipment/shipment-form.vue

@@ -23,14 +23,14 @@
             />
             <!--    Type d'expédition        -->
             <div class="col-start-1 row-start-4">
-                <label class="font-bold uppercase text-xl mb-2 block">
+                <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-8 flex flex-row gap-6"
+                        class="mt-2 flex flex-row gap-6"
                     >
                         <UiNumberInput
                             :label="type.label"
@@ -344,7 +344,7 @@ watch(
 )
 // Ajuste driver/vehicle quand le transporteur change (logique LIOT)
 watch(
-    () => [form.customerId, customers.value],
+    () => [form.customerId, form.addressId, customers.value],
     () => {
         if (!form.customerId) {
             form.addressId = ''
@@ -361,7 +361,11 @@ watch(
             (address) => String(address.id) === form.addressId
         )
         if (!matches) {
-            form.addressId = ''
+            if (customerAddresses.value.length === 1) {
+                form.addressId = String(customerAddresses.value[0].id)
+            } else {
+                form.addressId = ''
+            }
         }
     },
     {immediate: true}

frontend/components/ui/UiNumberInput.vue

@@ -3,7 +3,7 @@
         <label
             v-if="label"
             :for="id"
-            class="text-xl text-bold flex items-center"
+            class="text-xl flex items-center"
             :class="labelClass"
         >
             <span
@@ -25,7 +25,7 @@
             :step="step"
             :disabled="disabled"
             v-bind="attrs"
-            class="border-b border-black text-xl bg-transparent w-12"
+            class="border-b border-black text-xl bg-transparent w-16"
             :class="[
                 isEmpty ? 'text-neutral-400' : 'text-black',
                 disabled ? 'cursor-not-allowed' : 'cursor-text',

frontend/i18n/locales/fr.json

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

frontend/layouts/admin.vue

@@ -24,17 +24,41 @@
             <aside class="bg-primary-500 text-white min-h-0 flex flex-col justify-between">
                 <div class="flex flex-col gap-4 p-4 font-bold text-xl">
                     <!-- Liste des liens à ajouter ci-dessous -->
-                    <NuxtLink to="/admin/dashboard">
-                        Tableau de bord
+                    <NuxtLink
+                        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">
-                        Fournisseur
+                    <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">
-                        Transporteur
+                    <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">
-                        Utilisateurs
+                    <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
@@ -42,19 +66,22 @@
                 </div>
 
                 <div class="p-4">
-                        <p class="font-bold text-white text-left">v{{ version }}</p>
+
                     <button
                         @click="handleLogout"
                         class="w-full bg-red-600 hover:bg-red-700 py-2 rounded font-bold"
                     >
                         Déconnexion
                     </button>
+                    <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 />
+                    <slot/>
                 </div>
             </main>
         </div>
@@ -66,7 +93,9 @@
 import {useAuthStore} from '~/stores/auth'
 
 const auth = useAuthStore()
-const { version } = useAppVersion()
+const {version} = useAppVersion()
+
+const route = useRoute()
 const handleLogout = async () => {
     try {
         await auth.logout()

frontend/layouts/default.vue

@@ -1,6 +1,6 @@
 <template>
-    <div class="min-h-screen bg-white text-neutral-900">
-        <header class="w-full border-b border-neutral-200 bg-primary-500">
+    <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">
                 <button
                     type="button"
@@ -21,12 +21,13 @@
                         </a>
                     </NuxtLink>
                     <NuxtLink
-                        to="/admin/dashboard" custom v-slot="{ href, navigate, isActive }"
+                        to="/admin/dashboard" custom v-slot="{ href, navigate, isExactActive }"
                         v-if="auth.isAdmin"
                     >
                         <a
                             :href="href"
                             @click="navigate"
+                            :class="isExactActive ? 'opacity-100' : 'opacity-50'"
                         >
                             Admin
                         </a>
@@ -100,7 +101,7 @@
                 </aside>
             </transition>
         </header>
-        <main class="mx-auto w-full max-w-[1280px] pb-0">
+        <main class="mx-auto w-full max-w-[1280px]">
             <slot/>
         </main>
         <footer class="w-full mt-8 bg-primary-500 p-6">

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

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

frontend/pages/admin/customer/address.vue

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

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

@@ -1,6 +1,6 @@
 <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">Client</h1>
         <NuxtLink
             to="/admin/customer"
             class="flex items-center justify-center text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px]"

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

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

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

@@ -1,6 +1,6 @@
 <template>
     <div class="flex items-center justify-between">
-        <h1 class="text-3xl font-bold uppercase">Fournisseurs</h1>
+        <h1 class="text-3xl font-bold uppercase">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]"

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

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

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

@@ -1,6 +1,6 @@
 <template>
     <div>
-        <div class="flex justify-between h-[52px] mb-[80px]">
+        <div class="flex justify-between h-[52px] mt-6 mb-[80px]">
             <div class="flex flex-1 mr-16">
                 <UiStepper
                     :labels="RECEPTION_STEP_LABELS"

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

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

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

@@ -1,6 +1,6 @@
 <template>
     <div>
-        <div class="flex justify-between h-[52px] mb-[80px]">
+        <div class="flex justify-between h-[52px] mt-6 mb-[80px]">
             <div class="flex flex-1 mr-16">
                 <UiStepper
                     :labels="SHIPMENT_STEP_LABELS"

frontend/services/customer.ts

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

frontend/services/dto/customer-data.ts

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

src/Entity/Carrier.php

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

src/Entity/Customer.php

@@ -8,8 +8,6 @@ use ApiPlatform\Metadata\ApiProperty;
 use ApiPlatform\Metadata\ApiResource;
 use ApiPlatform\Metadata\Get;
 use ApiPlatform\Metadata\GetCollection;
-use ApiPlatform\Metadata\Patch;
-use ApiPlatform\Metadata\Post;
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
 use Doctrine\ORM\Mapping as ORM;
@@ -26,16 +24,6 @@ use Symfony\Component\Serializer\Attribute\Groups;
         new GetCollection(
             normalizationContext: ['groups' => ['customer:read']],
         ),
-        new Post(
-            normalizationContext: ['groups' => ['customer:read']],
-            denormalizationContext: ['groups' => ['customer:write']],
-            security: "is_granted('ROLE_ADMIN')",
-        ),
-        new Patch(
-            normalizationContext: ['groups' => ['customer:read']],
-            denormalizationContext: ['groups' => ['customer:write']],
-            security: "is_granted('ROLE_ADMIN')",
-        ),
     ],
     security: "is_granted('ROLE_USER')",
 )]
@@ -48,11 +36,11 @@ class Customer
     private ?int $id = null;
 
     #[ORM\Column(length: 255)]
-    #[Groups(['customer:read', 'customer:write', 'shipment:read'])]
+    #[Groups(['customer:read', 'shipment:read'])]
     private ?string $label = null;
 
     #[ORM\Column(length: 255)]
-    #[Groups(['customer:read', 'customer:write', 'shipment:read'])]
+    #[Groups(['customer:read', 'shipment:read'])]
     private ?string $code = null;
 
     /**
@@ -60,7 +48,7 @@ class Customer
      */
     #[ORM\ManyToMany(targetEntity: Address::class, inversedBy: 'customers')]
     #[ORM\JoinTable(name: 'customer_address')]
-    #[Groups(['customer:read', 'customer:write'])]
+    #[Groups(['customer:read'])]
     #[ApiProperty(readableLink: true)]
     private Collection $addresses;
 
@@ -99,29 +87,8 @@ class Customer
         return $this->addresses;
     }
 
-    public function setAddresses(iterable $addresses): self
+    public function setAddresses(Collection $addresses): void
     {
-        $this->addresses->clear();
-        foreach ($addresses as $address) {
-            $this->addAddress($address);
-        }
-
-        return $this;
-    }
-
-    public function addAddress(Address $address): self
-    {
-        if (!$this->addresses->contains($address)) {
-            $this->addresses->add($address);
-        }
-
-        return $this;
-    }
-
-    public function removeAddress(Address $address): self
-    {
-        $this->addresses->removeElement($address);
-
-        return $this;
+        $this->addresses = $addresses;
     }
 }

src/Entity/Supplier.php

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

src/State/UserPasswordProcessor.php

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