frontend/components/shipment/shipment-weight.vue

@@ -88,8 +88,8 @@ const printReceipt = async () => {
         return
     }
 
-/*    shipmentStore.clearCurrent()
+    shipmentStore.clearCurrent()
-    await router.push('/')*/
+    await router.push('/')
 }
 
 // Récupère le poids dès l'arrivée sur l'écran

frontend/composables/useWeighing.ts

@@ -1,34 +1,22 @@
 import type {Ref} from 'vue'
 import {computed, ref} from 'vue'
 import type {ReceptionData, ReceptionPayload, WeightEntryData} from '~/services/dto/reception-data'
-import type {ShipmentData, ShipmentPayload, WeightShipmentEntryData } from '~/services/dto/shipment-data'
 import type {WeightData} from '~/services/dto/weight-data'
 import {getWeight} from '~/services/reception'
 import {getWeightShipment} from '~/services/shipment'
 import {createWeight, updateWeight} from '~/services/weight'
+import type {UseWeighingShipmentOptions, UseWeighingOptions} from '~/services/weight'
+import type {WeightShipmentEntryData} from "~/services/dto/shipment-data";
 
 export type WeighingMode = 'gross' | 'tare'
 
-type UseWeighingOptions = {
-    mode: WeighingMode
-    reception: Ref<ReceptionData | null>
-    updateReception: (id: number, payload: ReceptionPayload) => Promise<ReceptionData | null>
-    loadReception?: (id: number) => Promise<ReceptionData | null>
-}
-
-type UseWeighingShipmentOptions = {
-    modeShipment: WeighingMode
-    shipment: Ref<ShipmentData | null>
-    updateShipment: (id: number, payload: ShipmentPayload) => Promise<ShipmentData | null>
-    loadShipment?: (id: number) => Promise<ShipmentData | null>
-}
 
 export const useWeighing = ({
                                 mode,
                                 reception,
                                 updateReception,
                                 loadReception
-}: UseWeighingOptions) => {
+                            }: UseWeighingOptions) => {
     const weightData = ref<WeightData | null>(null)
     const isFetching = ref(false)
 

frontend/services/bovin-shipment.ts

@@ -1,14 +1,6 @@
 import { useApi } from '~/composables/useApi'
 import type { BovinShipmentData } from '~/services/dto/bovin-shipment-data'
-export type BovinShipmentListResponse =
+import type { ShipmentBovinePayload, BovinShipmentListResponse } from '~/services/dto/bovin-shipment-data'
-    | BovinShipmentData[]
-    | { 'hydra:member'?: BovinShipmentData[] }
-
-export type ShipmentBovinePayload = {
-    nbBovinSend: number
-    shipment: string
-    shipmentType: string
-}
 
 export async function getBovinShipmentList(
     shipmentIri: string

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

@@ -6,3 +6,13 @@ export interface BovinShipmentData {
     shipment?: string | null
     shipmentType?: ShipmentTypeData | null
 }
+
+export type ShipmentBovinePayload = {
+    nbBovinSend: number
+    shipment: string
+    shipmentType: string
+}
+
+export type BovinShipmentListResponse =
+    | BovinShipmentData[]
+    | { 'hydra:member'?: BovinShipmentData[] }

frontend/services/weight.ts

@@ -1,5 +1,8 @@
 import { useApi } from '~/composables/useApi'
-import type { WeightEntryData } from '~/services/dto/reception-data'
+import type {ReceptionData, ReceptionPayload, WeightEntryData} from '~/services/dto/reception-data'
+import type {Ref} from "vue";
+import type {ShipmentData, ShipmentPayload} from "~/services/dto/shipment-data";
+import type {WeighingMode} from "~/composables/useWeighing";
 
 export type WeightPayload = {
     reception?: string
@@ -22,3 +25,17 @@ export async function updateWeight(id: number, payload: Partial<WeightPayload>)
     toastSuccessKey: 'success.weight.update'
     })
 }
+
+export type UseWeighingShipmentOptions = {
+    modeShipment: WeighingMode
+    shipment: Ref<ShipmentData | null>
+    updateShipment: (id: number, payload: ShipmentPayload) => Promise<ShipmentData | null>
+    loadShipment?: (id: number) => Promise<ShipmentData | null>
+}
+
+export type UseWeighingOptions = {
+    mode: WeighingMode
+    reception: Ref<ReceptionData | null>
+    updateReception: (id: number, payload: ReceptionPayload) => Promise<ReceptionData | null>
+    loadReception?: (id: number) => Promise<ReceptionData | null>
+}