Updates from development branch

src/main/java/com/divudi/bean/channel/analytics/ReportTemplateController.java

@@ -115,12 +115,30 @@ public ReportTemplate findReportTemplateByName(String name) {
     public List<ReportTemplate> completeReportTemplate(String qry) {
         List<ReportTemplate> list;
         String jpql;
-        HashMap params = new HashMap();
-        jpql = "select c from ReportTemplate c "
-                + " where c.retired=false "
-                + " and (c.name) like :q "
-                + " order by c.name";
-        params.put("q", "%" + qry.toUpperCase() + "%");
+        HashMap<String, Object> params = new HashMap<>();
+        jpql = "SELECT c FROM ReportTemplate c "
+                + "WHERE c.retired = false "
+                + "AND (LOWER(c.name) LIKE :q OR LOWER(c.code) LIKE :q) "
+                + "ORDER BY c.name";
+        params.put("q", "%" + qry.toLowerCase() + "%");
+        list = getFacade().findByJpql(jpql, params);
+
+        if (list == null) {
+            list = new ArrayList<>();
+        }
+        return list;
+    }
+
+    public List<ReportTemplate> completeRootReportTemplate(String qry) {
+        List<ReportTemplate> list;
+        String jpql;
+        HashMap<String, Object> params = new HashMap<>();
+        jpql = "SELECT c FROM ReportTemplate c "
+                + "WHERE c.retired = false "
+                + "AND c.parent is null "
+                + "AND (LOWER(c.name) LIKE :q OR LOWER(c.code) LIKE :q) "
+                + "ORDER BY c.name";
+        params.put("q", "%" + qry.toLowerCase() + "%");
         list = getFacade().findByJpql(jpql, params);
 
         if (list == null) {
@@ -223,7 +241,6 @@ public ReportTemplateRowBundle generateValueByDepartmentReport(
 
         jpql += " group by bill.department";
 
-
         // Assuming you have an EJB or similar service to run the query
         List<ReportTemplateRow> results = (List<ReportTemplateRow>) ejbFacade.findLightsByJpql(jpql, parameters, TemporalType.TIMESTAMP);
 
@@ -244,7 +261,7 @@ public ReportTemplateRowBundle generateBillReport(
             Institution paramSite,
             Boolean excludeCredit,
             Boolean creditOnly) {
-        System.out.println("generateBillReport = " );
+        System.out.println("generateBillReport = ");
         System.out.println("creditOnly = " + creditOnly);
         System.out.println("excludeCredit = " + excludeCredit);
 
@@ -321,7 +338,7 @@ public ReportTemplateRowBundle generateBillReport(
 
         return pb;
     }
-    
+
     public ReportTemplateRowBundle generateBillReportWithoutProfessionalFees(
             List<BillTypeAtomic> btas,
             Date paramFromDate,
@@ -371,7 +388,6 @@ public ReportTemplateRowBundle generateBillReportWithoutProfessionalFees(
 
         jpql += " group by bill";
 
-
         // Assuming you have an EJB or similar service to run the query
         List<ReportTemplateRow> results = (List<ReportTemplateRow>) ejbFacade.findLightsByJpql(jpql, parameters, TemporalType.TIMESTAMP);
 
@@ -411,9 +427,9 @@ public ReportTemplateRowBundle generateBillReportWithoutProfessionalFees(
             jpql += " and bill.billTypeAtomic in :btas ";
             parameters.put("btas", btas);
         }
-        
-        if(creditBillsOnly!=null && creditBillsOnly){
-             jpql += " and bill.paymentMethod in :pms ";
+
+        if (creditBillsOnly != null && creditBillsOnly) {
+            jpql += " and bill.paymentMethod in :pms ";
             parameters.put("pms", PaymentMethod.getMethodsByType(PaymentType.NON_CREDIT));
         }
 
@@ -444,7 +460,6 @@ public ReportTemplateRowBundle generateBillReportWithoutProfessionalFees(
 
         jpql += " group by bill";
 
-
         // Assuming you have an EJB or similar service to run the query
         List<ReportTemplateRow> results = (List<ReportTemplateRow>) ejbFacade.findLightsByJpql(jpql, parameters, TemporalType.TIMESTAMP);
 
@@ -512,7 +527,6 @@ public ReportTemplateRowBundle generatePaymentReport(
 
         jpql += " group by p";
 
-
         // Assuming you have an EJB or similar service to run the query
         List<ReportTemplateRow> results = (List<ReportTemplateRow>) ejbFacade.findLightsByJpql(jpql, parameters, TemporalType.TIMESTAMP);
 
@@ -1599,7 +1613,6 @@ private ReportTemplateRowBundle handleBillTypeAtomicTotalUsingBills(
             parameters.put("wu", paramUser);
         }
 
-
         Double sumResult = ejbFacade.findSingleResultByJpql(jpql, parameters, TemporalType.DATE);
 
         if (sumResult != null) {
@@ -2177,7 +2190,6 @@ private ReportTemplateRowBundle handleItemDepartmentummaryByBill(
             Long paramStartId,
             Long paramEndId) {
 
-
         String jpql;
         Map<String, Object> parameters = new HashMap<>();
         ReportTemplateRowBundle bundle = new ReportTemplateRowBundle();
@@ -2264,7 +2276,6 @@ private ReportTemplateRowBundle handleItemDepartmentummaryByBill(
 //                + " and bi.item.department is not null ";
         jpql += " group by bi.item.department ";
 
-
         List<ReportTemplateRow> rs = (List<ReportTemplateRow>) ejbFacade.findLightsByJpql(jpql, parameters, TemporalType.TIMESTAMP);
 
         if (rs == null || rs.isEmpty()) {

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

@@ -2,8 +2,10 @@
 
 import com.divudi.bean.cashTransaction.DrawerController;
 import com.divudi.bean.cashTransaction.PaymentController;
+import com.divudi.bean.collectingCentre.CollectingCentreBillController;
 import com.divudi.bean.common.util.JsfUtil;
 import com.divudi.data.BillTypeAtomic;
+import com.divudi.data.FeeType;
 import com.divudi.data.HistoryType;
 import com.divudi.data.PaymentMethod;
 import static com.divudi.data.PaymentMethod.Card;
@@ -19,11 +21,19 @@
 
 import com.divudi.ejb.BillNumberGenerator;
 import com.divudi.entity.Bill;
+import com.divudi.entity.BillEntry;
 import com.divudi.entity.BillFee;
 import com.divudi.entity.BillItem;
+import com.divudi.entity.Category;
+import com.divudi.entity.Department;
+import com.divudi.entity.Institution;
+import com.divudi.entity.Item;
 import com.divudi.entity.PatientDeposit;
 import com.divudi.entity.Payment;
+import com.divudi.entity.PaymentScheme;
+import com.divudi.entity.PriceMatrix;
 import com.divudi.entity.RefundBill;
+import com.divudi.entity.Staff;
 
 import com.divudi.entity.cashTransaction.Drawer;
 
@@ -36,6 +46,7 @@
 import javax.inject.Named;
 import javax.enterprise.context.SessionScoped;
 import java.io.Serializable;
+import java.text.DecimalFormat;
 import java.util.ArrayList;
 import java.util.List;
 import javax.ejb.EJB;
@@ -83,6 +94,12 @@ public class BillReturnController implements Serializable, ControllerWithMultipl
     AgentAndCcApplicationController agentAndCcApplicationController;
     @Inject
     PatientDepositController patientDepositController;
+    @Inject
+    PriceMatrixController priceMatrixController;
+    @Inject
+    private BillBeanController billBean;
+    @Inject
+    CollectingCentreBillController collectingCentreBillController;
     // </editor-fold>
 
     // <editor-fold defaultstate="collapsed" desc="Class Variable">
@@ -237,6 +254,8 @@ public boolean checkDraverBalance(Drawer drawer, PaymentMethod paymentMethod) {
         }
         return canReturn;
     }
+
+    private Staff toStaff;
 
     public String settleOpdReturnBill() {
         if (returningStarted) {
@@ -688,4 +707,12 @@ public void recieveRemainAmountAutomatically() {
     public void setPaymentMethodData(PaymentMethodData paymentMethodData) {
         throw new UnsupportedOperationException("Multiple Payments Not supported in Returns and Refunds");
     }
+
+    public Staff getToStaff() {
+        return toStaff;
+    }
+
+    public void setToStaff(Staff toStaff) {
+        this.toStaff = toStaff;
+    }
 }