Merge branch 'master' into add-fields-to-admin-donation-panel

podkrepi-bg · Mar 14, 2024 · 1946bb7 · 1946bb7
2 parents 1aa9011 + 20bb3fc
commit 1946bb7
Show file tree

Hide file tree

Showing 3 changed files with 83 additions and 10 deletions.
diff --git a/src/components/admin/donations/grid/Grid.tsx b/src/components/admin/donations/grid/Grid.tsx
@@ -1,8 +1,9 @@
 import React, { useState } from 'react'
-import { UseQueryResult } from '@tanstack/react-query'
+import { UseQueryResult, useMutation, useQueryClient } from '@tanstack/react-query'
 import { useTranslation } from 'next-i18next'
-import { Box, Tooltip } from '@mui/material'
-import { Edit } from '@mui/icons-material'
+import { Box, IconButton, Tooltip } from '@mui/material'
+
+import { Autorenew, Edit } from '@mui/icons-material'
 import {
   DataGrid,
   GridColDef,
@@ -23,6 +24,11 @@ import RenderEditPersonCell from './RenderEditPersonCell'
 import { useStores } from '../../../../common/hooks/useStores'
 
 import Link from 'next/link'
+import { useSession } from 'next-auth/react'
+import { endpoints } from 'service/apiEndpoints'
+import { apiClient } from 'service/apiClient'
+import { authConfig } from 'service/restRequests'
+import { AlertStore } from 'stores/AlertStore'
 
 interface RenderCellProps {
   params: GridRenderCellParams
@@ -36,6 +42,7 @@ const addIconStyles = {
 }
 export default observer(function Grid() {
   const { donationStore } = useStores()
+  const queryClient = useQueryClient()
 
   const [paginationModel, setPaginationModel] = useState({
     pageSize: 10,
@@ -48,9 +55,48 @@ export default observer(function Grid() {
   const campaignId = router.query.campaignId as string | undefined
   const paymentId = router.query.paymentId as string | undefined
 
+  const syncMutation = useMutation({
+    mutationFn: async (id: string) => {
+      return await apiClient.patch(
+        endpoints.donation.synchronizeWithPayment(id).url,
+        null,
+        authConfig(session?.accessToken),
+      )
+    },
+    onError: () => {
+      AlertStore.show(t('common:alerts.error'), 'error')
+      queryClient.invalidateQueries([
+        endpoints.donation.donationsList(
+          paymentId,
+          campaignId,
+          { pageIndex: paginationModel.page, pageSize: paginationModel.pageSize },
+          donationStore.donationFilters,
+          donationStore.donationSearch ?? '',
+        ).url,
+      ])
+    },
+    onSuccess: () => {
+      AlertStore.show(t('common:alerts.message-sent'), 'success')
+      queryClient.invalidateQueries([
+        endpoints.donation.donationsList(
+          paymentId,
+          campaignId,
+          { pageIndex: paginationModel.page, pageSize: paginationModel.pageSize },
+          donationStore.donationFilters,
+          donationStore.donationSearch ?? '',
+        ).url,
+      ])
+    },
+  })
+  const { data: session } = useSession()
+
+  const canEditFinancials = session?.user?.realm_access?.roles.includes(
+    'account-edit-financials-requests',
+  )
+
   const {
     data: { items: donations, total: allDonationsCount } = { items: [], total: 0 },
-    // error: donationHistoryError,
+    error: donationHistoryError,
     isLoading: isDonationHistoryLoading,
     refetch,
   }: UseQueryResult<CampaignDonationHistoryResponse> = useDonationsList(
@@ -109,6 +155,31 @@ export default observer(function Grid() {
   }
 
   const columns: GridColDef[] = [
+    {
+      field: 'actions',
+      headerName: 'Actions',
+      type: 'actions',
+      width: 120,
+      resizable: false,
+      renderCell: (params: GridRenderCellParams) => {
+        if (!canEditFinancials) {
+          return ''
+        }
+
+        return (
+          <>
+            <Tooltip title={t('Синхронизиране на дарение с плащане')}>
+              <IconButton
+                size="small"
+                color="primary"
+                onClick={() => syncMutation.mutate(params.row.id)}>
+                <Autorenew color="primary" />
+              </IconButton>
+            </Tooltip>
+          </>
+        )
+      },
+    },
     {
       field: 'paymentId',
       //TODO:Ttranslate
@@ -125,15 +196,15 @@ export default observer(function Grid() {
       //TODO:Ttranslate
       headerName: 'Статус на плащане',
       renderCell(params) {
-        return params.row.payment.status
+        return params.row.payment?.status
       },
     },
     {
       field: 'payment.provider',
       //TODO:Ttranslate
       headerName: 'Разплащателна система',
       renderCell(params) {
-        return params.row.payment.provider
+        return params.row.payment?.provider
       },
     },
     {
@@ -149,7 +220,7 @@ export default observer(function Grid() {
       headerName: 'billingName',
       width: 250,
       renderCell(params) {
-        return params.row.payment.billingName
+        return params.row.payment?.billingName
       },
     },
     {
@@ -158,7 +229,7 @@ export default observer(function Grid() {
       headerName: 'billingEmail',
       width: 300,
       renderCell(params) {
-        return params.row.payment.billingEmail
+        return params.row.payment?.billingEmail
       },
     },
     {
@@ -176,7 +247,7 @@ export default observer(function Grid() {
       ...commonProps,
       width: 100,
       renderCell(params) {
-        return params.row.payment.currency
+        return params.row.payment?.currency
       },
     },
     {

diff --git a/src/components/client/notifications/SubscriptionPage.tsx b/src/components/client/notifications/SubscriptionPage.tsx
@@ -116,7 +116,7 @@ export default function SubscriptionPage(data: Props) {
   >({
     mutationFn: useSubscribePublicEmail(),
     onError: (error) => handleError(error),
-    onSuccess: () => handleSuccess,
+    onSuccess: () => handleSuccess(),
   })
 
   async function callSubscribeApiRoute(values: {

diff --git a/src/service/apiEndpoints.ts b/src/service/apiEndpoints.ts
@@ -152,6 +152,8 @@ export const endpoints = {
     createCheckoutSession: <Endpoint>{ url: '/donation/create-checkout-session', method: 'POST' },
     createPaymentIntent: <Endpoint>{ url: '/donation/create-payment-intent', method: 'POST' },
     createBankDonation: <Endpoint>{ url: '/donation/create-bank-payment', method: 'POST' },
+    synchronizeWithPayment: (id: string) =>
+      <Endpoint>{ url: `/donation/${id}/sync-with-payment`, method: 'PATCH' },
     refundStripePayment: (id: string) =>
       <Endpoint>{ url: `/donation/refund-stripe-payment/${id}`, method: 'POST' },
     invalidateStripePayment: (id: string) =>