feat: deal group and stuff

This commit is contained in:
2024-11-09 02:33:17 +03:00
parent 1fa0f63c82
commit 1ee8135508
4 changed files with 21 additions and 21 deletions

View File

@@ -1,8 +1,5 @@
import { useParams } from "@tanstack/react-router";
import {
DealPageContextProvider,
useDealPageContext,
} from "../../LeadsPage/contexts/DealPageContext.tsx";
import { DealPageContextProvider, useDealPageContext } from "../../LeadsPage/contexts/DealPageContext.tsx";
import ProductAndServiceTab from "../../LeadsPage/tabs/ProductAndServiceTab/ProductAndServiceTab.tsx";
import { FC, useEffect } from "react";
import { DealService } from "../../../client";
@@ -20,7 +17,8 @@ const DealPageContent: FC<Props> = ({ dealId }) => {
return <ProductAndServiceTab />;
};
const DealPageWrapper: FC<{ children: React.ReactNode }> = ({ children }) => {
return <DealPageContextProvider>{children}</DealPageContextProvider>;
return <DealPageContextProvider refetchDeals={async () => {
}}>{children}</DealPageContextProvider>;
};
export const DealPage = () => {
const { dealId } = useParams({ strict: false });

View File

@@ -44,12 +44,12 @@ const useDealsTableColumns = () => {
},
{
Cell: ({ row }) =>
new Date(row.original.deadline).toLocaleString("ru-RU"),
new Date(row.original.deadline || 0).toLocaleString("ru-RU"),
accessorKey: "deadline",
header: "Дедлайн",
sortingFn: (rowA, rowB) =>
new Date(rowB.original.deadline).getTime() -
new Date(rowA.original.deadline).getTime(),
new Date(rowB.original.deadline || 0).getTime() -
new Date(rowA.original.deadline || 0).getTime(),
},
{
header: "Общая стоимость",
@@ -58,7 +58,7 @@ const useDealsTableColumns = () => {
accessorKey: "totalPrice",
},
],
[]
[],
);
};

View File

@@ -13,7 +13,9 @@ export const DealsPage: FC = () => {
const { data, form } = useDealsPageState();
return (
<>
<DealPageContextProvider>
<DealPageContextProvider refetchDeals={async () => {
}}>
<div className={styles["container"]}>
<PageBlock>
<div className={styles["top-panel"]}>

View File

@@ -1,6 +1,4 @@
import BaseFormModal, {
CreateEditFormProps,
} from "../../ClientsPage/modals/BaseFormModal/BaseFormModal.tsx";
import BaseFormModal, { CreateEditFormProps } from "../../ClientsPage/modals/BaseFormModal/BaseFormModal.tsx";
import { DealSummary, ShippingWarehouseSchema } from "../../../client";
import { ContextModalProps } from "@mantine/modals";
import { useForm } from "@mantine/form";
@@ -17,7 +15,7 @@ const ShippingWarehouseForm = ({
context,
innerProps,
id,
}: ContextModalProps<Props>) => {
}: ContextModalProps<Props>) => {
const isEditing = "onChange" in innerProps;
const form = useForm<ShippingWarehouseSchema>({
@@ -29,7 +27,9 @@ const ShippingWarehouseForm = ({
},
});
return (
<DealPageContextProvider>
<DealPageContextProvider refetchDeals={async () => {
}}>
<BaseFormModal
{...innerProps}
closeOnSubmit