From b1f3df5c055fc8ca23e1bcffeb459d4faa981568 Mon Sep 17 00:00:00 2001
From: admin <fakc445@gmail.com>
Date: Tue, 15 Oct 2024 07:41:43 +0300
Subject: [PATCH] feat: add comment, creating refactor

---
 src/client/models/ClientSchema.ts             |  1 +
 .../ClientFormModal/ClientFormModal.tsx       | 38 +++++++++++--------
 .../drawers/DealEditDrawer/tabs/ClientTab.tsx |  8 +++-
 3 files changed, 31 insertions(+), 16 deletions(-)

diff --git a/src/client/models/ClientSchema.ts b/src/client/models/ClientSchema.ts
index be3caa4..b59f6af 100644
--- a/src/client/models/ClientSchema.ts
+++ b/src/client/models/ClientSchema.ts
@@ -9,6 +9,7 @@ export type ClientSchema = {
     name: string;
     companyName: string;
     barcodeTemplate?: (BarcodeTemplateSchema | null);
+    comment?: (string | null);
     details?: (ClientDetailsSchema | null);
 };
 
diff --git a/src/pages/ClientsPage/modals/ClientFormModal/ClientFormModal.tsx b/src/pages/ClientsPage/modals/ClientFormModal/ClientFormModal.tsx
index 5b51f75..8596577 100644
--- a/src/pages/ClientsPage/modals/ClientFormModal/ClientFormModal.tsx
+++ b/src/pages/ClientsPage/modals/ClientFormModal/ClientFormModal.tsx
@@ -1,5 +1,5 @@
 import { ContextModalProps } from "@mantine/modals";
-import { Fieldset, TextInput } from "@mantine/core";
+import { Fieldset, Textarea, TextInput } from "@mantine/core";
 import { useForm } from "@mantine/form";
 import { ClientSchema } from "../../../../client";
 import BaseFormModal, {
@@ -10,25 +10,26 @@ import BarcodeTemplateSelect from "../../../../components/Selects/BarcodeTemplat
 type Props = CreateEditFormProps<ClientSchema>;
 
 const ClientFormModal = ({
-    context,
-    id,
-    innerProps,
-}: ContextModalProps<Props>) => {
+                             context,
+                             id,
+                             innerProps,
+                         }: ContextModalProps<Props>) => {
     const isEditing = "onChange" in innerProps;
 
     const initialValues: ClientSchema = isEditing
         ? innerProps.element
         : {
-              id: -1,
-              name: "",
-              companyName: "",
-              details: {
-                  telegram: "",
-                  phoneNumber: "",
-                  email: "",
-                  inn: undefined,
-              },
-          };
+            id: -1,
+            name: "",
+            companyName: "",
+            details: {
+                telegram: "",
+                phoneNumber: "",
+                email: "",
+                inn: undefined,
+            },
+            comment: "",
+        };
     const form = useForm<ClientSchema>({
         initialValues: initialValues,
         validate: {
@@ -63,6 +64,7 @@ const ClientFormModal = ({
                             placeholder={"Введите название клиента"}
                             {...form.getInputProps("name")}
                         />
+
                     </Fieldset>
                     <Fieldset legend={"Дополнительная информация"}>
                         <TextInput
@@ -90,6 +92,12 @@ const ClientFormModal = ({
                             placeholder={"Введите название компании"}
                             {...form.getInputProps("companyName")}
                         />
+                        <Textarea
+                            label={"Комментарий"}
+                            placeholder={"Введите комментарий"}
+                            {...form.getInputProps("comment")}
+                        />
+
                     </Fieldset>
                     <Fieldset legend={"Настройки"}>
                         <BarcodeTemplateSelect
diff --git a/src/pages/LeadsPage/drawers/DealEditDrawer/tabs/ClientTab.tsx b/src/pages/LeadsPage/drawers/DealEditDrawer/tabs/ClientTab.tsx
index 4ab7bcb..098a0f7 100644
--- a/src/pages/LeadsPage/drawers/DealEditDrawer/tabs/ClientTab.tsx
+++ b/src/pages/LeadsPage/drawers/DealEditDrawer/tabs/ClientTab.tsx
@@ -1,4 +1,4 @@
-import { Button, Fieldset, Flex, rem, TextInput } from "@mantine/core";
+import { Button, Fieldset, Flex, rem, Textarea, TextInput } from "@mantine/core";
 import { useDealPageContext } from "../../../contexts/DealPageContext.tsx";
 import { useForm } from "@mantine/form";
 import { DealGeneralFormType } from "./DealEditDrawerGeneralTab.tsx";
@@ -75,6 +75,12 @@ const ClientTab = () => {
                         label={"ИНН"}
                         {...form.getInputProps("client.details.inn")}
                     />
+                    <Textarea
+                        placeholder={"Введите комментарий"}
+                        label={"Комментарий"}
+                        {...form.getInputProps("client.comment")}
+                    />
+
                 </Fieldset>
             </Flex>
             <Flex