Merge pull request #17 from pieceowater-dev/dev

fix: pie and payments
pieceowater-dev · Sep 11, 2024 · a2cc0d1 · a2cc0d1
2 parents fe9599d + cf8aa07
commit a2cc0d1
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 2 deletions.
diff --git a/src/entities/dashboard/payment-data/payment-data.ts b/src/entities/dashboard/payment-data/payment-data.ts
@@ -42,6 +42,21 @@ export const usePaymentData = () => {
   }, [])
 
   const columns: TableProps<IColumnPayments>['columns'] = [
+    {
+      title: 'Платеж №',
+      dataIndex: 'id',
+      key: 'id',
+    },
+    {
+      title: 'Статус',
+      dataIndex: 'status',
+      key: 'status',
+    },
+    {
+      title: 'Тип',
+      dataIndex: 'type',
+      key: 'type',
+    },
     {
       title: 'Дата',
       dataIndex: 'date',

diff --git a/src/entities/dashboard/pie-chart/pie-chart.ts b/src/entities/dashboard/pie-chart/pie-chart.ts
@@ -17,7 +17,7 @@ export const usePieChart = () => {
         params: { dateType: dateType, start: start, end: end, posts: posts },
       })
       if (res.data.length > 0) {
-        setPieData([res.data[0].sum, res.data[1].sum])
+        setPieData([res.data?.[0]?.sum || 0, res.data?.[1]?.sum || 0])
       } else {
         setPieData([0, 0])
       }
@@ -27,7 +27,9 @@ export const usePieChart = () => {
   }
 
   useEffect(() => {
-    fetchData()
+    if (dateType !== 6 || (start && end)) {
+      fetchData()
+    }
   }, [dateType, start, end, posts])
 
   const pie = {

diff --git a/src/entities/dashboard/table-data/model/interface.ts b/src/entities/dashboard/table-data/model/interface.ts
@@ -2,6 +2,8 @@ export interface IRowsPaymentResponse {
   id: number
   datetime: number | string
   sum: string
+  type: number
+  result: number
   device: {
     id: number
     name: string

diff --git a/src/entities/dashboard/table-data/table-data.ts b/src/entities/dashboard/table-data/table-data.ts
@@ -18,6 +18,9 @@ export const useTableData = () => {
     const paymentsRows = payments.items.map((row: IRowsPaymentResponse) => {
       setPaymentTableSum((prevState) => prevState + transformPrice(row.sum))
       return {
+        id: row.id,
+        status: row.result === 0 ? 'Не успешный' : 'Успешный',
+        type: row.type === 0 ? 'Наличные' : 'Безналичные',
         key: row.id,
         date: row.datetime ? unixDate(+row.datetime * 1000, 'DMYHM') : '',
         post: row.device.name,