Fix second payment method reports (#352)

uwblueprint · Feb 25, 2024 · 7ee6e1a · 7ee6e1a
1 parent f542721
commit 7ee6e1a
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 2 deletions.
diff --git a/lib/graphql/types.ts b/lib/graphql/types.ts
@@ -182,6 +182,9 @@ export type ApplicationsReportColumn =
   | 'PAYMENT_METHOD'
   | 'FEE_AMOUNT'
   | 'DONATION_AMOUNT'
+  | 'SECOND_PAYMENT_METHOD'
+  | 'SECOND_FEE_AMOUNT'
+  | 'SECOND_DONATION_AMOUNT'
   | 'TOTAL_AMOUNT';
 
 export type ApplicationsResult = {

diff --git a/lib/reports/resolvers.ts b/lib/reports/resolvers.ts
@@ -275,8 +275,10 @@ export const generateApplicationsReport: Resolver<
         dateOfBirth: dateOfBirth && formatDateYYYYMMDD(dateOfBirth),
         applicationDate: createdAt ? formatDateYYYYMMDDLocal(createdAt, true) : null,
         applicantName: formatFullName(firstName, middleName, lastName),
-        processingFee: `$${Prisma.Decimal.add(processingFee, secondProcessingFee || 0)}`,
-        donationAmount: `$${Prisma.Decimal.add(donationAmount, secondDonationAmount || 0)}`,
+        processingFee: `$${processingFee}`,
+        donationAmount: `$${donationAmount}`,
+        secondProcessingFee: `$${secondProcessingFee || 0}`,
+        secondDonationAmount: `$${secondDonationAmount || 0}`,
         totalAmount: `$${Prisma.Decimal.add(
           Prisma.Decimal.add(processingFee, donationAmount),
           Prisma.Decimal.add(secondProcessingFee || 0, secondDonationAmount || 0)

diff --git a/lib/reports/schema.ts b/lib/reports/schema.ts
@@ -29,6 +29,9 @@ export default gql`
     PAYMENT_METHOD
     FEE_AMOUNT
     DONATION_AMOUNT
+    SECOND_PAYMENT_METHOD
+    SECOND_FEE_AMOUNT
+    SECOND_DONATION_AMOUNT
     TOTAL_AMOUNT
   }
 

diff --git a/tools/admin/reports.ts b/tools/admin/reports.ts
@@ -54,6 +54,21 @@ export const APPLICATIONS_COLUMNS: Array<{
     value: 'DONATION_AMOUNT',
     reportColumnId: 'donationAmount',
   },
+  {
+    name: 'Second Payment Method',
+    value: 'SECOND_PAYMENT_METHOD',
+    reportColumnId: 'secondPaymentMethod',
+  },
+  {
+    name: 'Second Fee Amount',
+    value: 'SECOND_FEE_AMOUNT',
+    reportColumnId: 'secondProcessingFee',
+  },
+  {
+    name: 'Second Donation Amount',
+    value: 'SECOND_DONATION_AMOUNT',
+    reportColumnId: 'secondDonationAmount',
+  },
   {
     name: 'Total Amount',
     value: 'TOTAL_AMOUNT',