Skip to content

Commit 6102f01

Browse files
committed
Merge branch 'dev' of github.com:topcoder-platform/tc-finance-api into dev
2 parents 660818a + 258d602 commit 6102f01

2 files changed

Lines changed: 4 additions & 1 deletion

File tree

.circleci/config.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@ workflows:
7575
only:
7676
- dev
7777
- engagements
78+
- PM-4165_allow-editing-credited-payments
7879
- 'build-prod':
7980
context: org-global
8081
filters:

src/api/admin/admin.service.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -365,7 +365,8 @@ export class AdminService {
365365
// Update payment amount if requested
366366
if (
367367
body.paymentAmount !== undefined &&
368-
(payment.payment_status === PaymentStatus.OWED ||
368+
(payment.payment_status === PaymentStatus.CREDITED ||
369+
payment.payment_status === PaymentStatus.OWED ||
369370
payment.payment_status === PaymentStatus.ON_HOLD ||
370371
payment.payment_status === PaymentStatus.ON_HOLD_ADMIN)
371372
) {
@@ -643,6 +644,7 @@ export class AdminService {
643644
version: currentVersion,
644645
payment_status: {
645646
in: [
647+
PaymentStatus.CREDITED,
646648
PaymentStatus.OWED,
647649
PaymentStatus.ON_HOLD,
648650
PaymentStatus.ON_HOLD_ADMIN,

0 commit comments

Comments
 (0)