From 16c4d066938afbb479201d0d987e6172e5c95937 Mon Sep 17 00:00:00 2001 From: lunarkid <4476442+dedywahyudi@users.noreply.github.com> Date: Wed, 24 Aug 2022 22:32:11 +0700 Subject: [PATCH 1/5] fix: missing select/deselect all --- .../web/tc/view/pacts/client/PaymentHistory.jsp | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/main/com/topcoder/web/tc/view/pacts/client/PaymentHistory.jsp b/src/main/com/topcoder/web/tc/view/pacts/client/PaymentHistory.jsp index c0c76a03b5..ef330514da 100755 --- a/src/main/com/topcoder/web/tc/view/pacts/client/PaymentHistory.jsp +++ b/src/main/com/topcoder/web/tc/view/pacts/client/PaymentHistory.jsp @@ -151,6 +151,11 @@ error = $('').attr('class', 'bigRed').html('The total net amount for selected payments is less than $25'); $("#PaymentHistoryForm").prev().append('
').append(error) } + if ($('.checkable:checked').length == $('.checkable').length) { + $('.checkAll').attr('checked', true); + } else if ($('.checkable').not(':checked').length == $('.checkable').length) { + $('.checkAll').attr('checked', false); + } }); }); } @@ -377,7 +382,13 @@ " >Date Paid <%----%> -   + + + + + + + <%--   --%> From 69337a0554918e77b201ad77a17e6f57e321dd72 Mon Sep 17 00:00:00 2001 From: lunarkid <4476442+dedywahyudi@users.noreply.github.com> Date: Fri, 26 Aug 2022 11:22:05 +0700 Subject: [PATCH 2/5] fix: quick pay button --- .../controller/request/member/PaymentHistory.java | 12 ++++++++++++ .../web/tc/view/pacts/client/PaymentHistory.jsp | 11 +++++++++++ 2 files changed, 23 insertions(+) diff --git a/src/main/com/topcoder/web/tc/controller/legacy/pacts/controller/request/member/PaymentHistory.java b/src/main/com/topcoder/web/tc/controller/legacy/pacts/controller/request/member/PaymentHistory.java index 75471ed4d7..b48991ab4f 100644 --- a/src/main/com/topcoder/web/tc/controller/legacy/pacts/controller/request/member/PaymentHistory.java +++ b/src/main/com/topcoder/web/tc/controller/legacy/pacts/controller/request/member/PaymentHistory.java @@ -63,6 +63,8 @@ public class PaymentHistory extends BaseProcessor implements PactsConstants { public static final String XLS_FORMAT = "xls"; public static final String FULL_LIST = "full_list"; public static final String PAYMENTS = "payments"; + public static final String OWED_PAYMENTS = "owedPayments"; + public static final String TOTAL_OWED_PAYMENTS = "totalOwedPayments"; /** *

A String providing the name for request attribute holding the ID of a payment method preferred by @@ -150,9 +152,17 @@ protected void businessProcessing() throws TCWebException { List removeNonPending = new ArrayList(); + List owedPayments = new ArrayList(); + double totalOwedPayments = 0.0; + Date currentDate = new Date(); + for (BasePayment payment : payments) { if (payment.getPaymentType() == 3 || payment.getPaymentType() == 5) { removePayments.add(payment); + } else if ((payment.getCurrentStatus().equals(PaymentStatusFactory.createStatus(PaymentStatus.OWED_PAYMENT_STATUS))) && + !(payment.getDueDate().after(currentDate))) { + owedPayments.add(payment.getId()); + totalOwedPayments += payment.getNetAmount(); } else { if (!(payment.getCurrentStatus().equals(PaymentStatusFactory.createStatus(PaymentStatus.OWED_PAYMENT_STATUS))) && !(payment.getCurrentStatus().equals(PaymentStatusFactory.createStatus(PaymentStatus.ENTERED_INTO_PAYMENT_SYSTEM_PAYMENT_STATUS))) && @@ -184,6 +194,8 @@ protected void businessProcessing() throws TCWebException { getRequest().setAttribute("NUM_TOTAL", payments.size()); getRequest().setAttribute("NUM_PER_PAGE", numRecords); getRequest().setAttribute("NUM_PENDING", pendingPayments); + getRequest().setAttribute("OWED_PAYMENTS", owedPayments); + getRequest().setAttribute("TOTAL_OWED_PAYMENTS", totalOwedPayments); if (exportToExcel) { produceXLS(payments); diff --git a/src/main/com/topcoder/web/tc/view/pacts/client/PaymentHistory.jsp b/src/main/com/topcoder/web/tc/view/pacts/client/PaymentHistory.jsp index ef330514da..ac6133967c 100755 --- a/src/main/com/topcoder/web/tc/view/pacts/client/PaymentHistory.jsp +++ b/src/main/com/topcoder/web/tc/view/pacts/client/PaymentHistory.jsp @@ -56,6 +56,8 @@ " var="numTotal" /> " var="numPerPage" /> " var="numPending" /> +" var="owedPayments" /> +" var="totalOwedPayments" /> @@ -81,6 +83,9 @@ MINIMUM_PAYMENT_ACCRUAL_AMOUNT = ${MINIMUM_PAYMENT_ACCRUAL_AMOUNT}; PAY_ME_CONFIRMATION_TEMPLATE = '${paymentConfirmationTemplate}'; + var owedPayments = ${owedPayments}; + var totalOwedPayments = ${totalOwedPayments}; + function next() { var myForm = document.f; myForm.<%=DataAccessConstants.START_RANK%>.value = ${requestScope[defaults][startRank]} + parseInt(myForm.<%=DataAccessConstants.NUMBER_RECORDS%>.value); @@ -229,6 +234,12 @@ +

+
+ +
+
+ <%-- desktop tabs --%>