Skip to content

finance #288

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kensac merged 5 commits into from
Sep 2, 2025
Merged

finance #288

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4cdfdf5
Added new rejection types and submitted to ASA status
Ny1ka Apr 22, 2025
46a4d58
feat: add reimbursement rejection types and submitted_to_asa status
Aug 29, 2025
cba6cf5
removed rejectionReason enum and ApiProperty and updated controller t…
Sep 1, 2025
8d244e2
Remove email
kensac Sep 1, 2025
31e0731
Merge pull request #150 from Hack-PSU/nyika/financeapi
kensac Sep 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion src/entities/finance.entity.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,18 @@ import { ID, Column, Table } from "common/objection";
export enum Status {
PENDING = "PENDING",
APPROVED = "APPROVED",
REJECTED = "REJECTED",
SUBMITTED_TO_ASA = "SUBMITTED_TO_ASA",
DEPOSIT = "DEPOSIT",

REJECTED_INVALID_RECEIPT = "REJECTED_INVALID_RECEIPT",
REJECTED_WRONG_ADDRESS = "REJECTED_WRONG_ADDRESS",
REJECTED_WRONG_DESCRIPTION = "REJECTED_WRONG_DESCRIPTION",
REJECTED_INCORRECT_AMOUNT = "REJECTED_INCORRECT_AMOUNT",
REJECTED_DUPLICATE_SUBMISSION = "REJECTED_DUPLICATE_SUBMISSION",
REJECTED_MISSING_INFORMATION = "REJECTED_MISSING_INFORMATION",
REJECTED_INELIGIBLE_EXPENSE = "REJECTED_INELIGIBLE_EXPENSE",
REJECTED_EXPIRED_SUBMISSION = "REJECTED_EXPIRED_SUBMISSION",
REJECTED_OTHER = "REJECTED_OTHER",
}

export enum SubmitterType {
Expand Down
2 changes: 1 addition & 1 deletion src/modules/finance/finance.controller.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -352,7 +352,7 @@ export class FinanceController {
subject: "HackPSU Reimbursement Approved",
message: reimbursementApprovedMessage,
});
} else if (updatedFinance.status === Status.REJECTED) {
} else if (updatedFinance.status.startsWith("REJECTED")) {
const reimbursementRejectedMessage =
await this.sendGridService.populateTemplate(
DefaultTemplate.reimbursementRejected,
Expand Down