Merge branch 'dev' into 'staging'

Dev

See merge request frontend/admin!78

src/pages/dashboard/Content/PromocodeManagement/usePromocodeGridColDef.tsx

@@ -4,14 +4,20 @@ import { Promocode } from "@root/model/promocodes";
 import { useMemo, useState } from "react";
 
 import { BarChart, Delete } from "@mui/icons-material";
-import {promocodeApi} from "@root/api/promocode/requests";
+import { promocodeApi } from "@root/api/promocode/requests";
 
 export function usePromocodeGridColDef(
   setStatistics: (id: string) => void,
   deletePromocode: (id: string) => void
 ) {
-    const validity = (value:string|number) => {if(value===0){return "неоганичен"}else {return new Date(value).toLocaleString()}}
+  const validity = (value: string | number) => {
-  return useMemo<GridColDef<Promocode, string | number, string >[]>(
+    if (value === 0) {
+      return "неоганичен";
+    } else {
+      return new Date(value).toLocaleString();
+    }
+  };
+  return useMemo<GridColDef<Promocode, string | number, string>[]>(
     () => [
       {
         field: "id",
@@ -50,6 +56,14 @@ export function usePromocodeGridColDef(
         valueGetter: ({ row }) => row.dueTo * 1000,
         valueFormatter: ({ value }) => `${validity(value)}`,
       },
+      {
+        field: "description",
+        headerName: "Описание",
+        minWidth: 200,
+        flex: 1,
+        sortable: false,
+        valueGetter: ({ row }) => row.description,
+      },
       {
         field: "settings",
         headerName: "",
@@ -57,10 +71,12 @@ export function usePromocodeGridColDef(
         sortable: false,
         renderCell: (params) => {
           return (
-            <IconButton onClick={() => {
+            <IconButton
-                setStatistics(params.row.id,)
+              onClick={() => {
-                promocodeApi.getPromocodeStatistics(params.row.id, 0, 0)
+                setStatistics(params.row.id);
-            }}>
+                promocodeApi.getPromocodeStatistics(params.row.id, 0, 0);
+              }}
+            >
               <BarChart />
             </IconButton>
           );