Merge pull request #18 from pieceowater-dev/dev

fix: qr
pieceowater-dev · Sep 12, 2024 · f3ab794 · f3ab794
2 parents a2cc0d1 + bd31613
commit f3ab794
Show file tree

Hide file tree

Showing 4 changed files with 56 additions and 36 deletions.
diff --git a/src/entities/dashboard/payment-data/model/interface.ts b/src/entities/dashboard/payment-data/model/interface.ts
@@ -2,4 +2,7 @@ export interface IColumnPayments {
   date: string
   post: string
   sum: number
+  id: number
+  status: string
+  type: string
 }
diff --git a/src/entities/dashboard/payment-data/payment-data.ts b/src/entities/dashboard/payment-data/payment-data.ts
@@ -2,7 +2,7 @@ import { TableProps } from 'antd'
 import { useNotify } from 'app/providers/app'
 import { IColumnPayments } from 'entities/dashboard/payment-data/model/interface'
 import { IPostsResponse } from 'entities/settings/posts-table/model/interface'
-import { useEffect, useState } from 'react'
+import React, { useEffect, useState } from 'react'
 import { getAxiosInstance } from 'shared/api/api-query/api-query'
 import { setPaymentsState } from 'shared/redux/dashboard/dashboard-slice'
 import { useAppDispatch } from 'shared/redux/store'
@@ -41,38 +41,5 @@ export const usePaymentData = () => {
     fetchPosts()
   }, [])
 
-  const columns: TableProps<IColumnPayments>['columns'] = [
-    {
-      title: 'Платеж №',
-      dataIndex: 'id',
-      key: 'id',
-    },
-    {
-      title: 'Статус',
-      dataIndex: 'status',
-      key: 'status',
-    },
-    {
-      title: 'Тип',
-      dataIndex: 'type',
-      key: 'type',
-    },
-    {
-      title: 'Дата',
-      dataIndex: 'date',
-      key: 'date',
-    },
-    {
-      title: 'Пост',
-      dataIndex: 'post',
-      key: 'post',
-    },
-    {
-      title: 'Сумма',
-      dataIndex: 'sum',
-      key: 'sum',
-    },
-  ]
-
-  return { fetchData, columns, postSelect }
+  return { fetchData, postSelect }
 }
diff --git a/src/entities/dashboard/table-data/model/interface.ts b/src/entities/dashboard/table-data/model/interface.ts
@@ -15,4 +15,7 @@ export interface ITablePaymentsState {
   date: string
   post: string
   sum: number
+  id: number
+  status: string
+  type: string
 }
diff --git a/src/pages/dashboard/dashboard.tsx b/src/pages/dashboard/dashboard.tsx
@@ -1,13 +1,60 @@
+import { TableProps } from 'antd'
 import { usePaymentData } from 'entities/dashboard/payment-data'
+import { IColumnPayments } from 'entities/dashboard/payment-data/model/interface'
 import { useTableData } from 'entities/dashboard/table-data'
 import { DashboardCharts } from 'pages/dashboard/ui/dashboard-charts'
 import { DashboardFilters } from 'pages/dashboard/ui/dashboard-filters'
 import { DashboardPayment } from 'pages/dashboard/ui/dashboard-payment'
 import React, { FC } from 'react'
 
 export const Dashboard: FC = () => {
-  const { fetchData, columns, postSelect } = usePaymentData()
+  const { fetchData, postSelect } = usePaymentData()
   const { paymentTable, paymentTableSum, totalPaymentTable } = useTableData()
+  const columns: TableProps<IColumnPayments>['columns'] = [
+    {
+      title: 'Платеж №',
+      dataIndex: 'id',
+      key: 'id',
+    },
+    {
+      title: 'Статус',
+      dataIndex: 'status',
+      key: 'status',
+    },
+    {
+      title: 'Тип',
+      dataIndex: 'type',
+      key: 'type',
+    },
+    {
+      title: 'Дата',
+      dataIndex: 'date',
+      key: 'date',
+    },
+    {
+      title: 'Пост',
+      dataIndex: 'post',
+      key: 'post',
+    },
+    {
+      title: 'Сумма',
+      dataIndex: 'sum',
+      key: 'sum',
+    },
+    {
+      title: 'Qr-код',
+      key: 'qr',
+      render: (_, record) => (
+        <a
+          href={`https://kaspi.kz/pay/GrandS?service_id=8248&12789=${record.id}`}
+          target={'_blank'}
+          rel='noreferrer'
+        >
+          Показать
+        </a>
+      ),
+    },
+  ]
 
   return (
     <>