Merge pull request #9828 from hmislk/Issue#9820_Cash_is_not_working_for_cc_deposit

Issue#9820 cash is not working for cc deposit  Closes #9820

Author: Irani96

src/main/java/com/divudi/bean/common/ReportsController.java

@@ -391,6 +391,7 @@ public void setSelectedDateType(String selectedDateType) {
         this.selectedDateType = selectedDateType;
     }
 
+
     public Investigation getInvestigation() {
         return investigation;
     }
@@ -3494,7 +3495,7 @@ private void groupBills() {
         bundle.setGroupedBillItemsByInstitution(billMap);
     }
 
-    public Double calculateNetAmountSubTotalByBills(List<Bill> bills) {
+    public Double calculateNetTotalByBills(List<Bill> bills) {
         Double netTotal = 0.0;
 
         for (Bill bill : bills) {
@@ -3504,7 +3505,7 @@ public Double calculateNetAmountSubTotalByBills(List<Bill> bills) {
         return netTotal;
     }
 
-    public Double calculateDiscountSubTotalByBills(List<Bill> bills) {
+    public Double calculateDiscountByBills(List<Bill> bills) {
         Double discount = 0.0;
 
         for (Bill bill : bills) {
@@ -3515,122 +3516,17 @@ public Double calculateDiscountSubTotalByBills(List<Bill> bills) {
     }
 
 
-    public Double calculateNetAmountNetTotal() {
-        double netAmountNetTotal = 0.0;
-        Map<Institution, List<Bill>> billMap = bundle.getGroupedBillItemsByInstitution();
-
-        for (Map.Entry<Institution, List<Bill>> entry : billMap.entrySet()) {
-            List<Bill> bills = entry.getValue();
-
-            netAmountNetTotal += calculateNetAmountSubTotalByBills(bills);
-        }
-
-        return netAmountNetTotal;
-    }
-    
-    public Double calculateGrossAmountSubTotalByBills(List<Bill> bills) {
-        Double billTotal = 0.0;
-
-        for (Bill bill : bills) {
-            billTotal += bill.getBillTotal();
-        }
-
-        return billTotal;
-    }
-    
-    public Double calculatePatientShareSubTotalByBills(List<Bill> bills) {
-        Double settledAmountByPatient = 0.0;
-
-        for (Bill bill : bills) {
-            settledAmountByPatient += bill.getSettledAmountByPatient();
-        }
-
-        return settledAmountByPatient;
-    }
-    
-    public Double calculateSponsorShareSubTotalByBills(List<Bill> bills) {
-        Double settledAmountBySponsor = 0.0;
-
-        for (Bill bill : bills) {
-            settledAmountBySponsor += bill.getSettledAmountBySponsor();
-        }
-
-        return settledAmountBySponsor;
-    }
-    
-    public Double calculateDueAmountSubTotalByBills(List<Bill> bills) {
-        Double balance = 0.0;
-
-        for (Bill bill : bills) {
-            balance += bill.getBalance();
-        }
-
-        return balance;
-    }
-    
-    public Double calculateGrossAmountNetTotal() {
-        double grossAmountNetTotal = 0.0;
-        Map<Institution, List<Bill>> billMap = bundle.getGroupedBillItemsByInstitution();
-
-        for (Map.Entry<Institution, List<Bill>> entry : billMap.entrySet()) {
-            List<Bill> bills = entry.getValue();
-
-            grossAmountNetTotal += calculateGrossAmountSubTotalByBills(bills);
-        }
-
-        return grossAmountNetTotal;
-    }
-    
-    public Double calculateDiscountNetTotal() {
-        double discountNetTotal = 0.0;
-        Map<Institution, List<Bill>> billMap = bundle.getGroupedBillItemsByInstitution();
-
-        for (Map.Entry<Institution, List<Bill>> entry : billMap.entrySet()) {
-            List<Bill> bills = entry.getValue();
-
-            discountNetTotal += calculateDiscountSubTotalByBills(bills);
-        }
-
-        return discountNetTotal;
-    }
-    
-    public Double calculatePatientShareNetTotal() {
-        double patientShareNetTotal = 0.0;
-        Map<Institution, List<Bill>> billMap = bundle.getGroupedBillItemsByInstitution();
-
-        for (Map.Entry<Institution, List<Bill>> entry : billMap.entrySet()) {
-            List<Bill> bills = entry.getValue();
-
-            patientShareNetTotal += calculatePatientShareSubTotalByBills(bills);
-        }
-
-        return patientShareNetTotal;
-    }
-    
-    public Double calculateDueAmountNetTotal() {
-        double dueAmountNetTotal = 0.0;
-        Map<Institution, List<Bill>> billMap = bundle.getGroupedBillItemsByInstitution();
-
-        for (Map.Entry<Institution, List<Bill>> entry : billMap.entrySet()) {
-            List<Bill> bills = entry.getValue();
-
-            dueAmountNetTotal += calculateDueAmountSubTotalByBills(bills);
-        }
-
-        return dueAmountNetTotal;
-    }
-    
-    public Double calculateSponsorShareNetTotal() {
-        double sponsorShareNetTotal = 0.0;
+    public Double calculateSubTotal() {
+        double subTotal = 0.0;
         Map<Institution, List<Bill>> billMap = bundle.getGroupedBillItemsByInstitution();
 
         for (Map.Entry<Institution, List<Bill>> entry : billMap.entrySet()) {
             List<Bill> bills = entry.getValue();
 
-            sponsorShareNetTotal += calculateSponsorShareSubTotalByBills(bills);
+            subTotal += calculateNetTotalByBills(bills);
         }
 
-        return sponsorShareNetTotal;
+        return subTotal;
     }
 
     public void generateDiscountReport() {

src/main/java/com/divudi/service/PaymentService.java

@@ -203,8 +203,8 @@ private void populatePaymentDetails(Payment payment, PaymentMethod paymentMethod
                 break;
             case Cash:
 //                payment.getBill().getNetTotal();
-                payment.setPaidValue(paymentMethodData.getCash().getTotalValue());
-                payment.setComments(paymentMethodData.getCash().getComment());
+                payment.setPaidValue(payment.getBill().getNetTotal());
+                payment.setComments(payment.getBill().getComments());
                 break;
             case ewallet:
                 payment.setPaidValue(paymentMethodData.getEwallet().getTotalValue());