10111 retail sale medicine search optimization

src/main/java/com/divudi/bean/cashTransaction/FinancialTransactionController.java

@@ -2404,20 +2404,24 @@ public String navigateToCreateShiftEndSummaryBillForHandover() {
             shiftPayments.stream()
                     .forEach(p -> p.setTransientPaymentHandover(PaymentHandover.USER_COLLECTED));
         }
+        System.out.println("shiftPayments = " + shiftPayments);
 
         List<Payment> shiftFloats = fetchShiftFloatsFromShiftStartToEnd(startBill, null, sessionController.getLoggedUser());
         if (shiftFloats != null) {
             shiftFloats.stream()
                     .forEach(p -> p.setTransientPaymentHandover(PaymentHandover.FLOATS));
         }
+        System.out.println("shiftFloats = " + shiftFloats);
 
-        List<Payment> othersPayments = fetchAllPaymentInMyHold(sessionController.getLoggedUser());
+        List<Payment> othersPayments = fetchAllPaymentInMyHold(startBill, sessionController.getLoggedUser());
         if (othersPayments != null) {
             othersPayments.stream()
                     .forEach(p -> p.setTransientPaymentHandover(PaymentHandover.OTHER_USERS_COLLECTED_AND_HANDED_OVER));
         }
+        System.out.println("othersPayments = " + othersPayments);
 
         List<Payment> bankPayments = fetchBankPayments(startBill, null, sessionController.getLoggedUser());
+        System.out.println("bankPayments = " + bankPayments);
 
         Set<Payment> uniquePaymentSet = new HashSet<>();
         if (shiftPayments != null) {
@@ -2527,7 +2531,7 @@ public String navigateToHandoverCreateBillForCurrentShift() {
                     .forEach(p -> p.setTransientPaymentHandover(PaymentHandover.FLOATS));
         }
 
-        List<Payment> othersPayments = fetchAllPaymentInMyHold(sessionController.getLoggedUser());
+        List<Payment> othersPayments = fetchAllPaymentInMyHold(startBill, sessionController.getLoggedUser());
         if (othersPayments != null) {
             othersPayments.stream()
                     .forEach(p -> p.setTransientPaymentHandover(PaymentHandover.OTHER_USERS_COLLECTED_AND_HANDED_OVER));
@@ -2580,7 +2584,7 @@ public String navigateToHandoverCreateBillForCurrentShift() {
 //        bundle.aggregateTotalsFromAllChildBundles();
         bundle.setDenominationTransactions(denominationTransactionController.createDefaultDenominationTransaction());
         bundle.sortByDateInstitutionSiteDepartmentType();
-        
+
         bundle.setPatientDepositsAreConsideredInHandingover(getPatientDepositsAreConsideredInHandingover());
         bundle.calculateTotalsByChildBundlesForHandover();
         return "/cashier/handover_start_all?faces-redirect=true";
@@ -2599,7 +2603,7 @@ public void processToHandoverCreateBillForSelectedPeriod() {
 
         List<Payment> shiftPayments = fetchPaymentsFromShiftStartToEndByDateAndDepartment(fromDate, toDate, sessionController.getLoggedUser());
         List<Payment> shiftFloats = fetchShiftFloatsFromShiftStartToEnd(fromDate, toDate, sessionController.getLoggedUser());
-        List<Payment> othersPayments = fetchAllPaymentInMyHold(sessionController.getLoggedUser());
+        List<Payment> othersPayments = fetchAllPaymentInMyHold(fromDate, toDate, sessionController.getLoggedUser());
 
         Set<Payment> uniquePaymentSet = new HashSet<>();
         if (shiftPayments != null) {
@@ -2654,7 +2658,7 @@ public String navigateToHandoverCreateBillForSelectedShift(Bill startBill) {
                     .forEach(p -> p.setTransientPaymentHandover(PaymentHandover.FLOATS));
         }
 
-        List<Payment> othersPayments = fetchAllPaymentInMyHold(sessionController.getLoggedUser());
+        List<Payment> othersPayments = fetchAllPaymentInMyHold(startBill, sessionController.getLoggedUser());
         if (othersPayments != null) {
             othersPayments.stream()
                     .forEach(p -> p.setTransientPaymentHandover(PaymentHandover.OTHER_USERS_COLLECTED_AND_HANDED_OVER));
@@ -3648,7 +3652,44 @@ public List<Payment> fetchShiftFloatsFromShiftStartToEnd(
         return myFloats;
     }
 
-    public List<Payment> fetchAllPaymentInMyHold(WebUser wu) {
+    public List<Payment> fetchAllPaymentInMyHold(Bill shiftStartBill, WebUser wu) {
+        WebUser paymentUser = wu;
+        StringBuilder jpqlBuilder = new StringBuilder("SELECT p ")
+                .append("FROM Payment p ")
+                .append("JOIN p.bill b ")
+                .append("WHERE p.retired=:pret ")
+                .append("AND p.currentHolder=:cr ")
+                .append("AND p.retired=:bret ")
+                .append("AND p.cancelled=:can ")
+                .append("AND p.handingOverStarted=:hs ")
+                .append("ORDER BY p.createdAt, b.department, p.creater");
+        Map<String, Object> params = new HashMap<>();
+        params.put("cr", paymentUser);
+        params.put("pret", false);
+        params.put("bret", false);
+        params.put("can", false);
+        params.put("hs", false);
+        String jpql = jpqlBuilder.toString();
+        List<Payment> initialOtherPayments = paymentFacade.findByJpql(jpql, params, TemporalType.TIMESTAMP);
+        List<Payment> finalOtherPayments = new ArrayList<>();
+        if (initialOtherPayments != null) {
+            for (Payment p : initialOtherPayments) {
+                if (p.getBill() == null) {
+                    continue;
+                }
+                if (p.getBill().getBillTypeAtomic() != null && p.getBill().getBillTypeAtomic() == BillTypeAtomic.FUND_TRANSFER_RECEIVED_BILL) {
+                    if (p.getId() > shiftStartBill.getId()) {
+                        finalOtherPayments.add(p);
+                    }
+                } else {
+                    finalOtherPayments.add(p);
+                }
+            }
+        }
+        return finalOtherPayments;
+    }
+
+    public List<Payment> fetchAllPaymentInMyHold(Date paramFromDate, Date paramToDate, WebUser wu) {
         WebUser paymentUser = wu;
         StringBuilder jpqlBuilder = new StringBuilder("SELECT p ")
                 .append("FROM Payment p ")
@@ -3666,8 +3707,23 @@ public List<Payment> fetchAllPaymentInMyHold(WebUser wu) {
         params.put("can", false);
         params.put("hs", false);
         String jpql = jpqlBuilder.toString();
-        List<Payment> othersPayments = paymentFacade.findByJpql(jpql, params, TemporalType.TIMESTAMP);
-        return othersPayments;
+        List<Payment> initialOtherPayments = paymentFacade.findByJpql(jpql, params, TemporalType.TIMESTAMP);
+        List<Payment> finalOtherPayments = new ArrayList<>();
+        if (initialOtherPayments != null) {
+            for (Payment p : initialOtherPayments) {
+                if (p.getBill() == null) {
+                    continue;
+                }
+                if (p.getBill().getBillTypeAtomic() != null && p.getBill().getBillTypeAtomic() == BillTypeAtomic.FUND_TRANSFER_RECEIVED_BILL) {
+                    if (p.getCreatedAt().getTime() > paramFromDate.getTime() && p.getCreatedAt().getTime() < paramToDate.getTime()) {
+                        finalOtherPayments.add(p);
+                    }
+                } else {
+                    finalOtherPayments.add(p);
+                }
+            }
+        }
+        return finalOtherPayments;
     }
 
     public ReportTemplateRowBundle generatePaymentBundleForHandovers(

src/main/java/com/divudi/bean/pharmacy/GrnController.java

@@ -578,6 +578,11 @@ public void settle() {
         }
 
         saveBill();
+
+        getGrnBill().setBillExpenses(billExpenses);
+        getGrnBill().setExpenseTotal(calExpenses());
+        calGrossTotal();
+        getGrnBill().setNetTotal(getGrnBill().getNetTotal() - calExpenses());
 
         Payment p = createPayment(getGrnBill(), getGrnBill().getPaymentMethod());
 
@@ -643,10 +648,7 @@ public void settle() {
         getGrnBill().setCreater(getSessionController().getLoggedUser());
         getGrnBill().setCreatedAt(Calendar.getInstance().getTime());
 
-        getGrnBill().setBillExpenses(billExpenses);
-        getGrnBill().setExpenseTotal(calExpenses());
-        calGrossTotal();
-        getGrnBill().setNetTotal(getGrnBill().getNetTotal() - calExpenses());
+
 
         pharmacyCalculation.calculateRetailSaleValueAndFreeValueAtPurchaseRate(getGrnBill());
         updateBalanceForGrn(getGrnBill());

src/main/webapp/analytics/payments.xhtml

@@ -80,13 +80,46 @@
                             scrollable="true"
                             scrollWidth="100%">
 
+                             <p:column 
+                                headerText="Payment ID"
+                                sortBy="#{payment.id}" 
+                                filterBy="#{payment.id}" 
+                                filterMatchMode="contains">
+                                <p:outputLabel value="#{payment.id}" />
+                            </p:column>
+
+
+                            <p:column 
+                                headerText="Bill ID"
+                                sortBy="#{payment.bill.id}" 
+                                filterBy="#{payment.bill.id}" 
+                                filterMatchMode="contains">
+                                <p:outputLabel value="#{payment.bill.id}" />
+                            </p:column>
+
                             <p:column 
                                 headerText="Bill No"
                                 sortBy="#{payment.bill.deptId}" 
                                 filterBy="#{payment.bill.deptId}" 
                                 filterMatchMode="contains">
                                 <p:outputLabel value="#{payment.bill.deptId}" />
                             </p:column>
+
+                            <p:column 
+                                headerText="Payment Creator"
+                                sortBy="#{payment.creater.webUserPerson.nameWithTitle}" 
+                                filterBy="#{payment.creater.webUserPerson.nameWithTitle}" 
+                                filterMatchMode="contains">
+                                <p:outputLabel value="#{payment.creater.webUserPerson.nameWithTitle}" />
+                            </p:column>
+
+                             <p:column 
+                                headerText="CUrrent Holder"
+                                sortBy="#{payment.currentHolder.webUserPerson.nameWithTitle}" 
+                                filterBy="#{payment.currentHolder.webUserPerson.nameWithTitle}" 
+                                filterMatchMode="contains">
+                                <p:outputLabel value="#{payment.currentHolder.webUserPerson.nameWithTitle}" />
+                            </p:column>
 
                             <p:column 
                                 headerText="Date"