Skip to content

Commit bee2bb3

Browse files
authored
Merge pull request #1426 from Northeastern-Electric-Racing/#1293-PeterMoise-Refund-Sources
#1293: Added the code of the refund sources to prefix their names
2 parents 98746f9 + ce47fa7 commit bee2bb3

3 files changed

Lines changed: 25 additions & 5 deletions

File tree

src/frontend/src/pages/FinancePage/ReimbursementRequestDetailPage/ReimbursementRequestDetailsView.tsx

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,14 @@ import VerticalDetailDisplay from '../../../components/VerticalDetailDisplay';
2121
import { useDeleteReimbursementRequest, useMarkReimbursementRequestAsDelivered } from '../../../hooks/finance.hooks';
2222
import { useToast } from '../../../hooks/toasts.hooks';
2323
import { useCurrentUser } from '../../../hooks/users.hooks';
24-
import { centsToDollar, datePipe, dateUndefinedPipe, fullNamePipe, undefinedPipe } from '../../../utils/pipes';
24+
import {
25+
centsToDollar,
26+
codeAndRefundSourceName,
27+
datePipe,
28+
dateUndefinedPipe,
29+
fullNamePipe,
30+
undefinedPipe
31+
} from '../../../utils/pipes';
2532
import {
2633
imagePreviewUrl,
2734
isReimbursementRequestAdvisorApproved,
@@ -116,7 +123,7 @@ const ReimbursementRequestDetailsView: React.FC<ReimbursementRequestDetailsViewP
116123
<VerticalDetailDisplay label="Sabo Number" content={`${undefinedPipe(reimbursementRequest.saboId)}`} />
117124
</Grid>
118125
<Grid item sm={6} xs={12}>
119-
<VerticalDetailDisplay label="Refund Source" content={`${reimbursementRequest.account}`} />
126+
<VerticalDetailDisplay label="Refund Source" content={codeAndRefundSourceName(reimbursementRequest.account)} />
120127
</Grid>
121128
<Grid item sm={6} xs={12}>
122129
<VerticalDetailDisplay label="Expense Type" content={expenseTypePipe(reimbursementRequest.expenseType)} />

src/frontend/src/pages/FinancePage/ReimbursementRequestForm/ReimbursementFormView.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import NERSuccessButton from '../../../components/NERSuccessButton';
2929
import { ReimbursementRequestFormInput } from './ReimbursementRequestForm';
3030
import { useState } from 'react';
3131
import { useToast } from '../../../hooks/toasts.hooks';
32-
import { expenseTypePipe } from '../../../utils/pipes';
32+
import { codeAndRefundSourceName, expenseTypePipe } from '../../../utils/pipes';
3333

3434
interface ReimbursementRequestFormViewProps {
3535
allVendors: Vendor[];
@@ -143,7 +143,7 @@ const ReimbursementRequestFormView: React.FC<ReimbursementRequestFormViewProps>
143143
>
144144
{Object.values(ClubAccount).map((account) => (
145145
<MenuItem key={account} value={account}>
146-
{account}
146+
{codeAndRefundSourceName(account)}
147147
</MenuItem>
148148
))}
149149
</Select>

src/frontend/src/utils/pipes.ts

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* See the LICENSE file in the repository root folder for details.
44
*/
55

6-
import { WbsNumber, User, wbsPipe, WbsElement, ExpenseType } from 'shared';
6+
import { WbsNumber, User, wbsPipe, WbsElement, ClubAccount, ExpenseType } from 'shared';
77

88
/**
99
* Pipes:
@@ -128,3 +128,16 @@ export const dateUndefinedPipe = (date?: Date): string => {
128128
export const centsToDollar = (cents: number) => {
129129
return (cents / 100.0).toFixed(2);
130130
};
131+
132+
/** Displays a refund source as a string "Code - Name" */
133+
export const codeAndRefundSourceName = (refundSource: ClubAccount) => {
134+
const CASH_ACCOUNT_CODE = 830667;
135+
const BUDGET_ACCOUNT_CODE = 800462;
136+
137+
switch (refundSource) {
138+
case ClubAccount.CASH:
139+
return `${CASH_ACCOUNT_CODE} - ${refundSource}`;
140+
case ClubAccount.BUDGET:
141+
return `${BUDGET_ACCOUNT_CODE} - ${refundSource}`;
142+
}
143+
};

0 commit comments

Comments
 (0)