Merge branch 'main' of gitea.aldon.fr:Mop/amap

backend/src/contracts/templates/layout.html

@@ -274,7 +274,7 @@
                 else ""}}
               </td>
               <td>
-                {{rec.product.quantity if rec.product.quantity != None else ""}}{{"g" if rec.product.unit == "1" else "kg" if
+                {{rec.quantity if rec.quantity != None else ""}}{{"g" if rec.product.unit == "1" else "kg" if
                 rec.product.unit == "2" else "p" }}
               </td>
             </tr>
@@ -317,7 +317,7 @@
                 product.product.quantity_unit != None else ""}}
               </td>
               <td>
-                {{product.product.quantity if product.product.quantity != None
+                {{product.quantity if product.quantity != None
                 else ""}}{{"g" if product.product.unit == "1" else
                 "kg" if product.product.unit == "2" else "p" }}
               </td>

frontend/src/components/PaymentMethods/Cheque/index.tsx

@@ -57,7 +57,7 @@ export function ContractCheque({ inputForm, price, productor }: ContractChequePr
                     { capfirst: true },
                 )}
                 min={1}
-                max={paymentMethod?.max || 3}
+                max={paymentMethod?.max && paymentMethod?.max !== "" ? Number(paymentMethod?.max) : 3}
                 {...inputForm.getInputProps(`cheque_quantity`)}
             />
             <Group grow>

frontend/src/components/Productors/Modal/index.tsx

@@ -109,7 +109,7 @@ export function ProductorModal({
                                 existing ?? {
                                     name,
                                     details: "",
-                                    max: null,
+                                    max: "",
                                 }
                             );
                         }),

frontend/src/pages/Productors/index.tsx

@@ -58,6 +58,11 @@ export default function Productors() {
         async (productor: ProductorInputs) => {
             await createProductorMutation.mutateAsync({
                 ...productor,
+                payment_methods: productor.payment_methods.map((payment) =>( {
+                    name: payment.name,
+                    details: payment.details,
+                    max: payment.max === "" ? null : payment.max
+                }))
             });
             closeModal();
         },
@@ -69,7 +74,14 @@ export default function Productors() {
             if (!id) return;
             await editProductorMutation.mutateAsync({
                 id: id,
-                productor: productor,
+                productor: {
+                    ...productor,
+                    payment_methods: productor.payment_methods.map((payment) =>( {
+                    name: payment.name,
+                    details: payment.details,
+                    max: payment.max === "" ? null : payment.max
+                }))
+                },
             });
             closeModal();
         },

frontend/src/services/resources/productors.ts

@@ -9,7 +9,7 @@ export const PaymentMethods = [
 export type PaymentMethod = {
     name: string;
     details: string;
-    max: number | null;
+    max: number | string | null;
 };
 
 export type Productor = {