fix: view pending count tab

Author: dedywahyudi

src/main/com/topcoder/web/tc/controller/legacy/pacts/controller/request/member/PaymentHistory.java

@@ -154,45 +154,36 @@ protected void businessProcessing() throws TCWebException {
                 if (payment.getPaymentType() == 3 || payment.getPaymentType() == 5) {
                     removePayments.add(payment);
                 } else {
-                    if (payment.getCurrentStatus().equals(PaymentStatusFactory.createStatus(PaymentStatus.CANCELLED_PAYMENT_STATUS)) ||
-                        payment.getCurrentStatus().equals(PaymentStatusFactory.createStatus(PaymentStatus.EXPIRED_PAYMENT_STATUS)) ||
-                        payment.getCurrentStatus().equals(PaymentStatusFactory.createStatus(PaymentStatus.PAID_PAYMENT_STATUS))) {
+                    if (!(payment.getCurrentStatus().equals(PaymentStatusFactory.createStatus(PaymentStatus.OWED_PAYMENT_STATUS))) &&
+                        !(payment.getCurrentStatus().equals(PaymentStatusFactory.createStatus(PaymentStatus.ENTERED_INTO_PAYMENT_SYSTEM_PAYMENT_STATUS))) &&
+                        !(payment.getCurrentStatus().equals(PaymentStatusFactory.createStatus(PaymentStatus.ACCRUING_PAYMENT_STATUS)))) {
                         removeNonPending.add(payment);
                     }
-
-                    // Deleted payments should not be shown either way.
-                    if (payment.getCurrentStatus().equals(PaymentStatusFactory.createStatus(PaymentStatus.DELETED_PAYMENT_STATUS))) {
-                        removePayments.add(payment);
-                    }
                 }
             }
 
             payments.removeAll(removePayments);
 
-            int totalPayment = payments.size();
-
-            if (!fullList && !exportToExcel) {
-                if (removeNonPending.size() > 0) {
-                    payments.removeAll(removeNonPending);
-                }
-            }
-
-            int PaymentsPending = totalPayment - removeNonPending.size();
-
             // sort the result in the first place
             sortResult(payments, sortCol, sortAscending);
 
             if ("on".equalsIgnoreCase(com.topcoder.web.tc.Constants.GLOBAL_AD_FLAG)) {
                 removeDuplicateReasons(payments);
             }
 
+            int totalPayment = payments.size();
+
             if (!fullList && !exportToExcel) {
-                getRequest().setAttribute("NUM_TOTAL", PaymentsPending);
-            } else {
-                getRequest().setAttribute("NUM_TOTAL", totalPayment);
+                if (removeNonPending.size() > 0) {
+                    payments.removeAll(removeNonPending);
+                }
             }
+
+            int pendingPayments = totalPayment - removeNonPending.size();
+
+            getRequest().setAttribute("NUM_TOTAL", payments.size());
             getRequest().setAttribute("NUM_PER_PAGE", numRecords);
-            getRequest().setAttribute("NUM_PENDING", PaymentsPending);
+            getRequest().setAttribute("NUM_PENDING", pendingPayments);
 
             if (exportToExcel) {
                 produceXLS(payments);

src/main/com/topcoder/web/tc/controller/legacy/pacts/controller/request/member/PaymentStatusSummary.java

@@ -83,8 +83,7 @@ private int getPendingPaymentsNumber() throws Exception {
         for (BasePayment payment : payments) {
             if (payment.getCurrentStatus().equals(PaymentStatusFactory.createStatus(PaymentStatus.OWED_PAYMENT_STATUS)) ||
                 payment.getCurrentStatus().equals(PaymentStatusFactory.createStatus(PaymentStatus.ENTERED_INTO_PAYMENT_SYSTEM_PAYMENT_STATUS)) ||
-                payment.getCurrentStatus().equals(PaymentStatusFactory.createStatus(PaymentStatus.ACCRUING_PAYMENT_STATUS)) ||
-                payment.getCurrentStatus().equals(PaymentStatusFactory.createStatus(PaymentStatus.ON_HOLD_PAYMENT_STATUS))) {
+                payment.getCurrentStatus().equals(PaymentStatusFactory.createStatus(PaymentStatus.ACCRUING_PAYMENT_STATUS))) {
                 paymentPendings.add(payment);
             }
         }