donations: Use companyName when donation is made from corporate profile

podkrepi-bg · Oct 20, 2023 · 76fa2b1 · 76fa2b1
1 parent 2be70ff
commit 76fa2b1
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 4 deletions.
diff --git a/src/components/client/campaigns/DonationWishes.tsx b/src/components/client/campaigns/DonationWishes.tsx
@@ -171,7 +171,11 @@ export default function DonationWishes({ campaignId, pageSize = 5 }: Props) {
                         fontSize: theme.typography.pxToRem(16),
                         color: theme.palette.grey[800],
                       }}>
-                      {person ? person.firstName + ' ' + person.lastName : t('donations.anonymous')}
+                      {person
+                        ? person.company
+                          ? person.company.companyName
+                          : person.firstName + ' ' + person.lastName
+                        : t('donations.anonymous')}
                     </Typography>
                     <Stack direction="row">
                       {donation && (

diff --git a/src/components/client/campaigns/DonorsAndDonations.tsx b/src/components/client/campaigns/DonorsAndDonations.tsx
@@ -93,7 +93,9 @@ export default function DonorsAndDonations({
               <Grid>
                 <Typography className={classes.donatorName}>
                   {person
-                    ? `${person.firstName} ${person.lastName}`
+                    ? person.company
+                      ? `${person.company.companyName}`
+                      : `${person.firstName} ${person.lastName}`
                     : t('campaigns:donations.anonymous')}
                 </Typography>
                 <Grid className={classes.donationQuantityAndTimeWrapper}>

diff --git a/src/gql/campaigns.ts b/src/gql/campaigns.ts
@@ -87,7 +87,14 @@ export type CampaignResponse = BaseCampaignResponse & {
     category: CampaignTypeCategory
     slug: string
   }
-  summary: { reachedAmount: number; donors?: number; guaranteedAmount: number }
+  summary: {
+    reachedAmount: number
+    donors?: number
+    guaranteedAmount: number
+    withdrawnAmount: number
+    blockedAmount: number
+    currentAmount: number
+  }
   beneficiary: {
     id: UUID
     type: BeneficiaryType
@@ -185,6 +192,9 @@ export type CampaignDonation = {
   person: {
     firstName: string
     lastName: string
+    company: {
+      companyName: string
+    }
   }
 }
 

diff --git a/src/gql/donationWish.d.ts b/src/gql/donationWish.d.ts
@@ -11,7 +11,7 @@ export type DonationWishResponse = {
   campaignId: UUID
   donationId?: UUID
   personId?: UUID
-  person?: { firstName: string; lastName: string }
+  person?: { firstName: string; lastName: string; company: { companyName: string } }
   donation?: { amount: number; currency: string }
   createdAt: DateTime
 }