|
5 | 5 | -
|
6 | 6 | - Description: This page displays the payments for current user.
|
7 | 7 | -
|
8 |
| - - Version 1.1 (Member Payments Automation assembly) changes: |
| 8 | + - Version 1.1 (Member Payments Automation assembly) changes: |
9 | 9 | - added logic for displaying payment's release date.
|
10 | 10 | - added controls for data pagination parameters setting.
|
11 | 11 | - fixed a bug with passing sr, er parameters when sorting the paginated data.
|
|
80 | 80 | USER_PAYMENT_METHOD = ${userPaymentMethod eq null ? 'null' : userPaymentMethod};
|
81 | 81 | MINIMUM_PAYMENT_ACCRUAL_AMOUNT = ${MINIMUM_PAYMENT_ACCRUAL_AMOUNT};
|
82 | 82 | PAY_ME_CONFIRMATION_TEMPLATE = '${paymentConfirmationTemplate}';
|
83 |
| - |
| 83 | +
|
84 | 84 | function next() {
|
85 | 85 | var myForm = document.f;
|
86 | 86 | myForm.<%=DataAccessConstants.START_RANK%>.value = ${requestScope[defaults][startRank]} + parseInt(myForm.<%=DataAccessConstants.NUMBER_RECORDS%>.value);
|
|
138 | 138 | var paymentId = this.getAttribute('data-value');
|
139 | 139 | $('.payable[value="' + paymentId + '"]').click();
|
140 | 140 | });
|
141 |
| -
|
142 |
| - $('.payable').click(function() { |
143 |
| - var hasSelected = false; |
144 |
| - $('.payable:checked').each(function () { |
145 |
| - hasSelected = true; |
146 |
| - }); |
147 |
| -
|
148 |
| - if (hasSelected) { |
149 |
| - $('.table-pagination').addClass('hiddenOnSelected'); |
150 |
| - } else { |
151 |
| - $('.table-pagination').removeClass('hiddenOnSelected'); |
152 |
| - } |
153 |
| - }); |
154 | 141 | });
|
155 | 142 | }
|
156 | 143 | </script>
|
|
309 | 296 | <c:when test="${not empty payments}">
|
310 | 297 | <form name="f" action="${sessionInfo.servletPath}" method="get" onsubmit="return checkPaymentHistoryForm();" class="form-container"
|
311 | 298 | id="PaymentHistoryForm">
|
312 |
| - |
| 299 | + |
313 | 300 | <c:if test="${!isReskin}">
|
314 | 301 | <c:if test="${croppedDataBefore or croppedDataAfter}" >
|
315 | 302 | <div class="pagingBox">
|
|
321 | 308 | << prev
|
322 | 309 | </c:otherwise>
|
323 | 310 | </c:choose>
|
324 |
| - |
| 311 | + |
325 | 312 | <c:choose>
|
326 | 313 | <c:when test="${croppedDataAfter}">
|
327 | 314 | <a href="Javascript:next()" class="bcLink getable">next >></a>
|
|
378 | 365 | </td>
|
379 | 366 | <td class="header"> </td>
|
380 | 367 | </tr>
|
381 |
| - |
| 368 | + |
382 | 369 | <c:forEach items="${payments}" var="payment">
|
383 |
| - |
| 370 | + |
384 | 371 | <c:set var="typeId" value="${payment.paymentType}" />
|
385 | 372 | <tr class="<%=even?"light":"dark"%> ${(payment.currentStatus.id eq OWED or payment.currentStatus.id eq ACCRUING) ? 'highlight' : '' }">
|
386 | 373 | <td class="value description">
|
|
397 | 384 | <c:when test="${payment.installmentNumber == 3}">(${payment.installmentNumber}rd</c:when>
|
398 | 385 | <c:otherwise>(${payment.installmentNumber}th</c:otherwise>
|
399 | 386 | </c:choose>
|
400 |
| - installment, total amount=${payment.totalAmount}) |
| 387 | + installment, total amount=${payment.totalAmount}) |
401 | 388 | </c:if>
|
402 |
| - </A> |
| 389 | + </A> |
403 | 390 | </c:when>
|
404 | 391 | <c:when test="${(typeId == 17 || typeId == 25) && payment.stageId > 0}">
|
405 |
| - <A href="/tc?module=LeaderBoard&ph=112&staid=${payment.stageId}" class="bcLink">${payment.description}</A> |
| 392 | + <A href="/tc?module=LeaderBoard&ph=112&staid=${payment.stageId}" class="bcLink">${payment.description}</A> |
406 | 393 | </c:when>
|
407 | 394 | <c:when test="${typeId == 18 && payment.seasonId > 0}">
|
408 |
| - <A href="/tc?module=RookieBoard&ph=112&seid=${payment.seasonId}" class="bcLink">${payment.description}</A> |
| 395 | + <A href="/tc?module=RookieBoard&ph=112&seid=${payment.seasonId}" class="bcLink">${payment.description}</A> |
409 | 396 | </c:when>
|
410 | 397 | <c:when test="${(typeId == 40 || typeId == 41) && payment.trackId > 0}">
|
411 |
| - <A href="/dr?module=ViewLeaderBoard&tid=${payment.trackId}" class="bcLink">${payment.description}</A> |
| 398 | + <A href="/dr?module=ViewLeaderBoard&tid=${payment.trackId}" class="bcLink">${payment.description}</A> |
412 | 399 | </c:when>
|
413 | 400 | <c:when test="${typeId == 21 && payment.roundId > 0}">
|
414 |
| - <A href="/longcontest/?module=ViewOverview&rd=${payment.roundId}>" class="bcLink">${payment.description}</A> |
415 |
| - </c:when> |
| 401 | + <A href="/longcontest/?module=ViewOverview&rd=${payment.roundId}>" class="bcLink">${payment.description}</A> |
| 402 | + </c:when> |
416 | 403 | <c:otherwise>
|
417 | 404 | ${payment.description}
|
418 | 405 | </c:otherwise>
|
419 | 406 | </c:choose>
|
420 |
| - |
421 |
| - |
| 407 | + |
| 408 | + |
422 | 409 | </td>
|
423 | 410 | <td class="value type">${payment.paymentTypeDesc}</td>
|
424 | 411 | <td class="valueC create-date"><fmt:formatDate value="${payment.createDate}" pattern="dd/MM/yyyy"/></td>
|
425 | 412 | <td class="valueR net-payment"><fmt:formatNumber value="${payment.netAmount}" type="currency" currencySymbol="$"/></td>
|
426 | 413 | <td class="value status"><span class="status ${payment.currentStatus.desc}"><span class="status-label">${payment.currentStatus.desc}</span></span>
|
427 |
| - <c:forEach items="${payment.currentStatus.reasons}" var="reason"> |
| 414 | + <c:forEach items="${payment.currentStatus.reasons}" var="reason"> |
428 | 415 | <br>- ${reason.desc}
|
429 | 416 | </c:forEach>
|
430 | 417 | </td>
|
|
628 | 615 | <div align="right" class="pay-me-btn">
|
629 | 616 | <input type="button" value="Pay Me" id="payMe" disabled="disabled"/>
|
630 | 617 | <span class="payMeValue">Total: <span id="payMeValue"></span></span>
|
631 |
| - </div> |
632 |
| - |
| 618 | + </div> |
| 619 | + |
633 | 620 | <tc-webtag:hiddenInput name="<%=Constants.MODULE_KEY%>" value="PaymentHistory"/>
|
634 | 621 | <tc-webtag:hiddenInput name="<%=DataAccessConstants.SORT_COLUMN%>"/>
|
635 | 622 | <tc-webtag:hiddenInput name="<%=DataAccessConstants.SORT_DIRECTION%>"/>
|
636 | 623 | <input type="hidden" name="<%= PaymentHistory.FULL_LIST %>" value="<c:out value="${fullList}"/>" />
|
637 |
| - |
| 624 | + |
638 | 625 | <div class="pagingBox table-pagination ${croppedDataBefore ? 'croppedDataBefore' : ''} ${croppedDataAfter ? 'croppedDataAfter' : ''} ${numTotal > 10 ? 'more-than-10-items' : ''}">
|
639 | 626 | <c:if test="${croppedDataBefore or croppedDataAfter}">
|
640 | 627 | <c:choose>
|
|
719 | 706 | </div><!-- // end .table-footer -->
|
720 | 707 | </c:if>
|
721 | 708 |
|
722 |
| - </form> |
| 709 | + </form> |
723 | 710 | </c:when>
|
724 | 711 | <c:otherwise>
|
725 | 712 | <div align="center" class="no-payments-found">
|
|
0 commit comments