Skip to content
This repository was archived by the owner on Jan 23, 2025. It is now read-only.

Commit 4381768

Browse files
committed
fix: accruing & owed label updates
1 parent 69337a0 commit 4381768

File tree

2 files changed

+37
-2
lines changed

2 files changed

+37
-2
lines changed

src/main/com/topcoder/web/tc/view/pacts/client/PaymentHistory.jsp

Lines changed: 31 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -446,7 +446,22 @@
446446
<td class="value type">${payment.paymentTypeDesc}</td>
447447
<td class="valueC create-date"><fmt:formatDate value="${payment.createDate}" pattern="dd/MM/yyyy"/></td>
448448
<td class="valueR net-payment"><fmt:formatNumber value="${payment.netAmount}" type="currency" currencySymbol="$"/></td>
449-
<td class="value status"><span class="status ${payment.currentStatus.desc}"><span class="status-label">${payment.currentStatus.desc}</span></span>
449+
<td class="value status">
450+
<span class="status ${payment.currentStatus.desc}">
451+
<span class="status-label">
452+
<c:choose>
453+
<c:when test="${payment.currentStatus.id eq OWED}">
454+
Available
455+
</c:when>
456+
<c:when test="${payment.currentStatus.id eq ACCRUING}">
457+
Pending
458+
</c:when>
459+
<c:otherwise>
460+
${payment.currentStatus.desc}
461+
</c:otherwise>
462+
</c:choose>
463+
</span>
464+
</span>
450465
<c:forEach items="${payment.currentStatus.reasons}" var="reason">
451466
<br>- ${reason.desc}
452467
</c:forEach>
@@ -572,7 +587,21 @@
572587
<div class="row status">
573588
<div class="col col-label">Status</div>
574589
<div class="col col-value">
575-
<span class="status ${paymentItem.currentStatus.desc}"><span class="status-label">${paymentItem.currentStatus.desc}</span></span>
590+
<span class="status ${paymentItem.currentStatus.desc}">
591+
<span class="status-label">
592+
<c:choose>
593+
<c:when test="${paymentItem.currentStatus.id eq OWED}">
594+
Available
595+
</c:when>
596+
<c:when test="${paymentItem.currentStatus.id eq ACCRUING}">
597+
Pending
598+
</c:when>
599+
<c:otherwise>
600+
${paymentItem.currentStatus.desc}
601+
</c:otherwise>
602+
</c:choose>
603+
</span>
604+
</span>
576605
<c:forEach items="${paymentItem.currentStatus.reasons}" var="reason">
577606
<br>- ${reason.desc}
578607
</c:forEach>

src/main/com/topcoder/web/tc/view/pacts/client/PaymentStatusSummary.jsp

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,13 @@
175175
<rsc:iterator list="<%=rsc%>" id="resultRow">
176176
<tr class="<%=even?"dark":"light"%>">
177177
<TD class="value payment-status">
178+
<% if ("Owed".equals(resultRow.getStringItem("payment_status"))) { %>
179+
Available
180+
<% } else if ("Accruing".equals(resultRow.getStringItem("payment_status"))) { %>
181+
Pending
182+
<% } else { %>
178183
<rsc:item name="payment_status" row="<%=resultRow%>"/>
184+
<% } %>
179185
</TD>
180186
<TD class="valueR net-amount">
181187
<% if (resultRow.getDoubleItem("net_amount") > 0) {

0 commit comments

Comments
 (0)