diff --git a/backend/src/contracts/templates/layout.html b/backend/src/contracts/templates/layout.html
index f4a6116..7870c68 100644
--- a/backend/src/contracts/templates/layout.html
+++ b/backend/src/contracts/templates/layout.html
@@ -274,7 +274,7 @@
else ""}}
- {{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" }}
|
@@ -317,7 +317,7 @@
product.product.quantity_unit != None else ""}}
- {{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" }}
|
diff --git a/frontend/src/components/PaymentMethods/Cheque/index.tsx b/frontend/src/components/PaymentMethods/Cheque/index.tsx
index 64fde29..ef8731e 100644
--- a/frontend/src/components/PaymentMethods/Cheque/index.tsx
+++ b/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`)}
/>
diff --git a/frontend/src/components/Productors/Modal/index.tsx b/frontend/src/components/Productors/Modal/index.tsx
index 7d1e901..183a480 100644
--- a/frontend/src/components/Productors/Modal/index.tsx
+++ b/frontend/src/components/Productors/Modal/index.tsx
@@ -109,7 +109,7 @@ export function ProductorModal({
existing ?? {
name,
details: "",
- max: null,
+ max: "",
}
);
}),
diff --git a/frontend/src/pages/Productors/index.tsx b/frontend/src/pages/Productors/index.tsx
index 7a664d5..f708959 100644
--- a/frontend/src/pages/Productors/index.tsx
+++ b/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();
},
diff --git a/frontend/src/services/resources/productors.ts b/frontend/src/services/resources/productors.ts
index 9845d9c..9c06810 100644
--- a/frontend/src/services/resources/productors.ts
+++ b/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 = {