From 9ec7d78a4ce1b08f82c98ecd09ab86c71d20a1e0 Mon Sep 17 00:00:00 2001
From: tristan <tristan@yuno.malio.fr>
Date: Wed, 17 Jun 2026 10:14:55 +0200
Subject: [PATCH] =?UTF-8?q?fix(transport)=20:=20bloc=20prix=20=E2=80=94=20?=
 =?UTF-8?q?radios=20sans=20label=20de=20groupe,=20sens=20en=20colonne=201,?=
 =?UTF-8?q?=20d=C3=A9faut=20Benne/Forfait=20(ERP-169)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/CarrierPriceBlock.vue          | 59 ++++++++-----------
 .../modules/transport/types/carrierForm.ts    |  5 +-
 2 files changed, 26 insertions(+), 38 deletions(-)

diff --git a/frontend/modules/transport/components/CarrierPriceBlock.vue b/frontend/modules/transport/components/CarrierPriceBlock.vue
index 09001ba..c46ee46 100644
--- a/frontend/modules/transport/components/CarrierPriceBlock.vue
+++ b/frontend/modules/transport/components/CarrierPriceBlock.vue
@@ -10,32 +10,27 @@
             @click="$emit('remove')"
         />
 
-        <!-- RG-4.09 : sens du prix (CLIENT / FOURNISSEUR). Tout le reste masqué tant
-             qu'aucun sens n'est choisi. -->
-        <div class="col-span-4 flex flex-col">
-            <span class="mb-1 text-sm font-medium text-m-muted">
-                {{ t('transport.carriers.form.price.direction') }}<span class="text-m-danger"> *</span>
-            </span>
-            <div class="flex gap-6">
-                <MalioRadioButton
-                    :model-value="model.direction"
-                    name="price-direction"
-                    value="CLIENT"
-                    :label="t('transport.carriers.form.price.directionClient')"
-                    :disabled="readonly"
-                    group-class="mt-0"
-                    @update:model-value="onDirectionChange"
-                />
-                <MalioRadioButton
-                    :model-value="model.direction"
-                    name="price-direction"
-                    value="FOURNISSEUR"
-                    :label="t('transport.carriers.form.price.directionSupplier')"
-                    :disabled="readonly"
-                    group-class="mt-0"
-                    @update:model-value="onDirectionChange"
-                />
-            </div>
+        <!-- RG-4.09 : sens du prix (CLIENT / FOURNISSEUR), empilé en colonne 1 (pas de
+             label de groupe). Tout le reste masqué tant qu'aucun sens n'est choisi. -->
+        <div class="flex flex-col justify-center gap-2">
+            <MalioRadioButton
+                :model-value="model.direction"
+                name="price-direction"
+                value="CLIENT"
+                :label="t('transport.carriers.form.price.directionClient')"
+                :disabled="readonly"
+                group-class="mt-0"
+                @update:model-value="onDirectionChange"
+            />
+            <MalioRadioButton
+                :model-value="model.direction"
+                name="price-direction"
+                value="FOURNISSEUR"
+                :label="t('transport.carriers.form.price.directionSupplier')"
+                :disabled="readonly"
+                group-class="mt-0"
+                @update:model-value="onDirectionChange"
+            />
             <p v-if="errors?.direction" class="mt-1 ml-[2px] text-xs text-m-danger">{{ errors.direction }}</p>
         </div>
 
@@ -71,7 +66,6 @@
                 :error="errors?.departureSite"
                 @update:model-value="(v: string | number | null) => update('departureSiteIri', v === null ? null : String(v))"
             />
-            <div aria-hidden="true" />
         </template>
 
         <!-- Branche FOURNISSEUR (RG-4.11). -->
@@ -106,16 +100,12 @@
                 :error="errors?.deliverySite"
                 @update:model-value="(v: string | number | null) => update('deliverySiteIri', v === null ? null : String(v))"
             />
-            <div aria-hidden="true" />
         </template>
 
         <!-- Communs (visibles dès qu'un sens est choisi). -->
         <template v-if="model.direction !== null">
-            <!-- Contenant : Benne / Fond mouvant. -->
+            <!-- Contenant : Benne / Fond mouvant (pas de label de groupe). -->
             <div class="flex flex-col justify-center">
-                <span class="mb-1 text-sm font-medium text-m-muted">
-                    {{ t('transport.carriers.form.price.containerType') }}<span class="text-m-danger"> *</span>
-                </span>
                 <div class="flex gap-4">
                     <MalioRadioButton
                         :model-value="model.containerType"
@@ -139,11 +129,8 @@
                 <p v-if="errors?.containerType" class="mt-1 ml-[2px] text-xs text-m-danger">{{ errors.containerType }}</p>
             </div>
 
-            <!-- Tarification : Forfait / Tonne. -->
+            <!-- Tarification : Forfait / Tonne (pas de label de groupe). -->
             <div class="flex flex-col justify-center">
-                <span class="mb-1 text-sm font-medium text-m-muted">
-                    {{ t('transport.carriers.form.price.pricingUnit') }}<span class="text-m-danger"> *</span>
-                </span>
                 <div class="flex gap-4">
                     <MalioRadioButton
                         :model-value="model.pricingUnit"
diff --git a/frontend/modules/transport/types/carrierForm.ts b/frontend/modules/transport/types/carrierForm.ts
index 37a5e6c..9d8eb4e 100644
--- a/frontend/modules/transport/types/carrierForm.ts
+++ b/frontend/modules/transport/types/carrierForm.ts
@@ -164,8 +164,9 @@ export function emptyCarrierPrice(): CarrierPriceFormDraft {
         supplierIri: null,
         supplierSupplyAddressIri: null,
         deliverySiteIri: null,
-        containerType: null,
-        pricingUnit: null,
+        // Défauts métier : Benne + Forfait pré-sélectionnés à l'ajout d'un bloc prix.
+        containerType: 'BENNE',
+        pricingUnit: 'FORFAIT',
         price: null,
         priceState: null,
     }