From 1bac2955664b7f448b67c74f638abbe0d6ddb0b6 Mon Sep 17 00:00:00 2001
From: Alexander Petkov <sashko506@gmail.com>
Date: Thu, 14 Mar 2024 00:28:37 +0200
Subject: [PATCH 1/3] admin/donations: Add payment related to donation section
 Includes payment data such as provider, billingName, billingEmail

---
 src/components/admin/donations/grid/Grid.tsx | 51 +++++++++++++++++---
 src/gql/campaigns.ts                         |  7 +--
 2 files changed, 46 insertions(+), 12 deletions(-)

diff --git a/src/components/admin/donations/grid/Grid.tsx b/src/components/admin/donations/grid/Grid.tsx
index 6fe74ff43..f1af19bb6 100644
--- a/src/components/admin/donations/grid/Grid.tsx
+++ b/src/components/admin/donations/grid/Grid.tsx
@@ -113,7 +113,7 @@ export default observer(function Grid() {
       field: 'paymentId',
       //TODO:Ttranslate
       headerName: 'Плащане номер',
-      width: 300,
+      width: 150,
       renderCell: (params: GridRenderCellParams) => {
         return (
           <Link href={`/admin/payments?id=${params.row.paymentId}`}>{params.row.paymentId}</Link>
@@ -121,12 +121,19 @@ export default observer(function Grid() {
       },
     },
     {
-      field: 'createdAt',
-      headerName: t('donations:date'),
-      ...commonProps,
-      width: 250,
-      renderCell: (params: GridRenderCellParams) => {
-        return getExactDateTime(params?.row.createdAt)
+      field: 'payment.status',
+      //TODO:Ttranslate
+      headerName: 'Статус на плащане',
+      renderCell(params) {
+        return params.row.payment.status
+      },
+    },
+    {
+      field: 'payment.provider',
+      //TODO:Ttranslate
+      headerName: 'Разплащателна система',
+      renderCell(params) {
+        return params.row.payment.provider
       },
     },
     {
@@ -136,11 +143,41 @@ export default observer(function Grid() {
         return <RenderMoneyCell params={params} />
       },
     },
+    {
+      field: 'payment.billingName',
+      //TODO:Ttranslate
+      headerName: 'billingName',
+      width: 250,
+      renderCell(params) {
+        return params.row.payment.billingName
+      },
+    },
+    {
+      field: 'payment.billingEmail',
+      //TODO:Ttranslate
+      headerName: 'billingEmail',
+      width: 300,
+      renderCell(params) {
+        return params.row.payment.billingEmail
+      },
+    },
+    {
+      field: 'createdAt',
+      headerName: t('donations:date'),
+      ...commonProps,
+      width: 250,
+      renderCell: (params: GridRenderCellParams) => {
+        return getExactDateTime(params?.row.createdAt)
+      },
+    },
     {
       field: 'currency',
       headerName: t('donations:currency'),
       ...commonProps,
       width: 100,
+      renderCell(params) {
+        return params.row.payment.currency
+      },
     },
     {
       field: 'person',
diff --git a/src/gql/campaigns.ts b/src/gql/campaigns.ts
index 97fba81a5..ee6e16d8a 100644
--- a/src/gql/campaigns.ts
+++ b/src/gql/campaigns.ts
@@ -7,6 +7,7 @@ import { CampaignState } from 'components/client/campaigns/helpers/campaign.enum
 import { BeneficiaryType } from '../components/admin/beneficiary/BeneficiaryTypes'
 import { VaultResponse } from './vault'
 import { CampaignNewsResponse } from './campaign-news'
+import { TPaymentResponse } from './donations'
 
 export type CampaignType = {
   id: UUID
@@ -178,12 +179,8 @@ export type CampaignUploadImage = {
 export type CampaignDonation = {
   id: UUID
   type: string
-  status: string
-  provider: PaymentProvider
+  payment: TPaymentResponse
   targetVaultId: UUID
-  extCustomerId: UUID
-  extPaymentIntentId: UUID
-  extPaymentMethodId: UUID
   createdAt: string
   updatedAt: string
   amount: number

From 5bc03eae888909d429df95ddf5374b2a31b68ba1 Mon Sep 17 00:00:00 2001
From: Alexander Petkov <sashko506@gmail.com>
Date: Thu, 14 Mar 2024 00:29:44 +0200
Subject: [PATCH 2/3] admin/payments: Remove duplicate filter dropdown

---
 src/components/admin/payments/grid/GridFilters.tsx | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/src/components/admin/payments/grid/GridFilters.tsx b/src/components/admin/payments/grid/GridFilters.tsx
index 765bff1c1..8e6f4e64d 100644
--- a/src/components/admin/payments/grid/GridFilters.tsx
+++ b/src/components/admin/payments/grid/GridFilters.tsx
@@ -90,12 +90,6 @@ export default observer(function GridFilters() {
         onChange={handleChange}
         menuItems={donationStatusMenuItems}
       />
-      <Filter
-        value={donationStore.donationFilters.status}
-        options={donationStatusOptions}
-        onChange={handleChange}
-        menuItems={donationStatusMenuItems}
-      />
       <Filter
         value={donationStore.donationFilters.provider}
         options={paymentProviderOptions}

From 1aa9011cb9400b997111b47fcecc2e7e6b09b56f Mon Sep 17 00:00:00 2001
From: Alexander Petkov <sashko506@gmail.com>
Date: Thu, 14 Mar 2024 00:33:50 +0200
Subject: [PATCH 3/3] admin/payments: Reorder payment fields

---
 src/components/admin/payments/grid/Grid.tsx | 32 ++++++++++-----------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/components/admin/payments/grid/Grid.tsx b/src/components/admin/payments/grid/Grid.tsx
index b844e2a8f..35fd0e982 100644
--- a/src/components/admin/payments/grid/Grid.tsx
+++ b/src/components/admin/payments/grid/Grid.tsx
@@ -164,11 +164,15 @@ export default observer(function Grid() {
         )
       },
     },
+    {
+      field: 'type',
+      headerName: t('donations:type'),
+    },
     {
       field: 'createdAt',
       headerName: t('donations:date'),
       ...commonProps,
-      width: 250,
+      width: 200,
       renderCell: (params: GridRenderCellParams) => {
         return getExactDateTime(params?.row.createdAt)
       },
@@ -177,6 +181,17 @@ export default observer(function Grid() {
       field: 'status',
       headerName: t('donations:status'),
     },
+    {
+      field: 'id',
+      headerName: 'ID',
+      width: 320,
+    },
+    {
+      field: 'provider',
+      headerName: t('donations:provider'),
+      ...commonProps,
+      width: 100,
+    },
     {
       field: 'amount',
       headerName: t('donations:amount'),
@@ -210,21 +225,6 @@ export default observer(function Grid() {
         )
       },
     },
-    {
-      field: 'id',
-      headerName: 'ID',
-      width: 320,
-    },
-    {
-      field: 'type',
-      headerName: t('donations:type'),
-    },
-    {
-      field: 'provider',
-      headerName: t('donations:provider'),
-      ...commonProps,
-      width: 200,
-    },
     {
       field: 'donations',
       headerName: t('Дарения\n брой'),