From 604da16b6c116b841aec700b1e13ff9dced5929d Mon Sep 17 00:00:00 2001
From: Piyankara N W M G P <pubudupiyankara.me@gmail.com>
Date: Wed, 24 Jul 2024 17:54:27 +0530
Subject: [PATCH] Signed-off-by: Piyankara N W M G P
 <pubudupiyankara.me@gmail.com> closes Issue#6559

---
 .../lab/PatientInvestigationController.java   | 25 ++++-
 src/main/resources/META-INF/persistence.xml   |  4 +-
 src/main/webapp/lab/accept_samples.xhtml      | 20 ++++
 src/main/webapp/lab/collect_samples.xhtml     | 20 ++++
 src/main/webapp/lab/divide_samples.xhtml      | 20 ++++
 .../lab/generate_barcodes_for_lab.xhtml       | 19 ++++
 src/main/webapp/lab/reject_samples.xhtml      | 20 ++++
 src/main/webapp/lab/revert_samples.xhtml      | 20 ++++
 src/main/webapp/lab/sample_at_lab_index.xhtml | 85 +++++++++++++++++
 src/main/webapp/lab/sample_index.xhtml        | 53 ++++++-----
 src/main/webapp/lab/sent_to_lab.xhtml         | 13 +++
 src/main/webapp/resources/ezcomp/menu.xhtml   | 91 ++++++++++---------
 12 files changed, 316 insertions(+), 74 deletions(-)
 create mode 100644 src/main/webapp/lab/accept_samples.xhtml
 create mode 100644 src/main/webapp/lab/collect_samples.xhtml
 create mode 100644 src/main/webapp/lab/divide_samples.xhtml
 create mode 100644 src/main/webapp/lab/generate_barcodes_for_lab.xhtml
 create mode 100644 src/main/webapp/lab/reject_samples.xhtml
 create mode 100644 src/main/webapp/lab/revert_samples.xhtml
 create mode 100644 src/main/webapp/lab/sample_at_lab_index.xhtml
 create mode 100644 src/main/webapp/lab/sent_to_lab.xhtml

diff --git a/src/main/java/com/divudi/bean/lab/PatientInvestigationController.java b/src/main/java/com/divudi/bean/lab/PatientInvestigationController.java
index ca68b449ee..462602c82e 100644
--- a/src/main/java/com/divudi/bean/lab/PatientInvestigationController.java
+++ b/src/main/java/com/divudi/bean/lab/PatientInvestigationController.java
@@ -1134,7 +1134,30 @@ public String navigateToCollelcted() {
         listPatientInvestigationsWhereSamplingCompleting();
         return "/lab/patient_investigations_collected?faces-redirect=true";
     }
-
+    public String navigateToSentToLab(){
+        return "/lab/sent_to_lab?faces-redirect=true";
+    }
+    
+//  Navigation Lab sampling at lab for barcode generate page
+    public String navigateToGenerateBarcodesForLab(){
+        return "/lab/generate_barcodes_for_lab?faces-redirect=true";
+    }
+    
+    public String navigateToCollectSamples(){
+        return "/lab/collect_samples?faces-redirect=true";
+    }
+    public String navigateToAcceptSamples(){
+        return "/lab/accept_samples?faces-redirect=true";
+    }
+    public String navigateToRejectSamples(){
+        return "/lab/reject_samples?faces-redirect=true";
+    }
+    public String navigateToRevertSamples(){
+        return "/lab/revert_samples?faces-redirect=true";
+    }
+    public String navigateToDivideSamples(){
+        return "/lab/divide_samples?faces-redirect=true";
+    }
     public void prepareToSample() {
         String temSql;
         Map temMap = new HashMap();
diff --git a/src/main/resources/META-INF/persistence.xml b/src/main/resources/META-INF/persistence.xml
index 6d8623993e..42fe5625f4 100644
--- a/src/main/resources/META-INF/persistence.xml
+++ b/src/main/resources/META-INF/persistence.xml
@@ -2,14 +2,14 @@
 <persistence version="2.0" xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd">
     <persistence-unit name="hmisPU" transaction-type="JTA">
 
-        <jta-data-source>jdbc/arogya</jta-data-source>
+        <jta-data-source>jdbc/hims</jta-data-source>
         <exclude-unlisted-classes>false</exclude-unlisted-classes>
         <properties>
             <property name="javax.persistence.schema-generation.database.action" value="create-or-extend-tables"/>
         </properties>
     </persistence-unit>
     <persistence-unit name="hmisAuditPU" transaction-type="JTA">
-        <jta-data-source>jdbc/arogyaAudit</jta-data-source>
+        <jta-data-source>jdbc/himsAduit</jta-data-source>
         <exclude-unlisted-classes>false</exclude-unlisted-classes>
         <properties>
         </properties>
diff --git a/src/main/webapp/lab/accept_samples.xhtml b/src/main/webapp/lab/accept_samples.xhtml
new file mode 100644
index 0000000000..8103a6d806
--- /dev/null
+++ b/src/main/webapp/lab/accept_samples.xhtml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license
+Click nbfs://nbhost/SystemFileSystem/Templates/JSP_Servlet/XHtml.xhtml to edit this template
+-->
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:h="http://xmlns.jcp.org/jsf/html"
+      xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+
+    <h:body>
+        <ui:composition template="/lab/sample_at_lab_index.xhtml">
+            <ui:define name="subcontent">
+                <h:panelGrid>                
+                    <h:outputLabel value="Accept"></h:outputLabel>
+                </h:panelGrid>                
+            </ui:define>
+        </ui:composition>
+    </h:body>
+</html>
diff --git a/src/main/webapp/lab/collect_samples.xhtml b/src/main/webapp/lab/collect_samples.xhtml
new file mode 100644
index 0000000000..4655ff9616
--- /dev/null
+++ b/src/main/webapp/lab/collect_samples.xhtml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license
+Click nbfs://nbhost/SystemFileSystem/Templates/JSP_Servlet/XHtml.xhtml to edit this template
+-->
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:h="http://xmlns.jcp.org/jsf/html"
+      xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+
+    <h:body>
+        <ui:composition template="/lab/sample_at_lab_index.xhtml">
+            <ui:define name="subcontent">
+                <h:panelGrid>                
+                    <h:outputLabel value="Collect Samples"></h:outputLabel>
+                </h:panelGrid>                
+            </ui:define>
+        </ui:composition>
+    </h:body>
+</html>
diff --git a/src/main/webapp/lab/divide_samples.xhtml b/src/main/webapp/lab/divide_samples.xhtml
new file mode 100644
index 0000000000..b1670b801c
--- /dev/null
+++ b/src/main/webapp/lab/divide_samples.xhtml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license
+Click nbfs://nbhost/SystemFileSystem/Templates/JSP_Servlet/XHtml.xhtml to edit this template
+-->
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:h="http://xmlns.jcp.org/jsf/html"
+      xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+
+    <h:body>
+        <ui:composition template="/lab/sample_at_lab_index.xhtml">
+            <ui:define name="subcontent">
+                <h:panelGrid>                
+                    <h:outputLabel value="Divide"></h:outputLabel>
+                </h:panelGrid>                
+            </ui:define>
+        </ui:composition>
+    </h:body>
+</html>
diff --git a/src/main/webapp/lab/generate_barcodes_for_lab.xhtml b/src/main/webapp/lab/generate_barcodes_for_lab.xhtml
new file mode 100644
index 0000000000..31729ee468
--- /dev/null
+++ b/src/main/webapp/lab/generate_barcodes_for_lab.xhtml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license
+Click nbfs://nbhost/SystemFileSystem/Templates/JSP_Servlet/XHtml.xhtml to edit this template
+-->
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:h="http://xmlns.jcp.org/jsf/html"
+      xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+    <h:body>
+        <ui:composition template="/lab/sample_at_lab_index.xhtml">
+            <ui:define name="subcontent">
+                <h:panelGrid>                
+                    <h:outputLabel value="Generate Barcodes for lab"></h:outputLabel>
+                </h:panelGrid>                
+            </ui:define>
+        </ui:composition>
+    </h:body>
+</html>
diff --git a/src/main/webapp/lab/reject_samples.xhtml b/src/main/webapp/lab/reject_samples.xhtml
new file mode 100644
index 0000000000..45fe692674
--- /dev/null
+++ b/src/main/webapp/lab/reject_samples.xhtml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license
+Click nbfs://nbhost/SystemFileSystem/Templates/JSP_Servlet/XHtml.xhtml to edit this template
+-->
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:h="http://xmlns.jcp.org/jsf/html"
+      xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+
+    <h:body>
+        <ui:composition template="/lab/sample_at_lab_index.xhtml">
+            <ui:define name="subcontent">
+                <h:panelGrid>                
+                    <h:outputLabel value="Reject"></h:outputLabel>
+                </h:panelGrid>                
+            </ui:define>
+        </ui:composition>
+    </h:body>
+</html>
diff --git a/src/main/webapp/lab/revert_samples.xhtml b/src/main/webapp/lab/revert_samples.xhtml
new file mode 100644
index 0000000000..b10a3445e6
--- /dev/null
+++ b/src/main/webapp/lab/revert_samples.xhtml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license
+Click nbfs://nbhost/SystemFileSystem/Templates/JSP_Servlet/XHtml.xhtml to edit this template
+-->
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:h="http://xmlns.jcp.org/jsf/html"
+      xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+
+    <h:body>
+        <ui:composition template="/lab/sample_at_lab_index.xhtml">
+            <ui:define name="subcontent">
+                <h:panelGrid>                
+                    <h:outputLabel value="Revert"></h:outputLabel>
+                </h:panelGrid>                
+            </ui:define>
+        </ui:composition>
+    </h:body>
+</html>
diff --git a/src/main/webapp/lab/sample_at_lab_index.xhtml b/src/main/webapp/lab/sample_at_lab_index.xhtml
new file mode 100644
index 0000000000..25647ac3d8
--- /dev/null
+++ b/src/main/webapp/lab/sample_at_lab_index.xhtml
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license
+Click nbfs://nbhost/SystemFileSystem/Templates/JSP_Servlet/XHtml.xhtml to edit this template
+-->
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:h="http://xmlns.jcp.org/jsf/html"
+      xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+      xmlns:p="http://primefaces.org/ui">
+
+    <h:body>
+        <ui:composition template="/resources/template/template.xhtml">
+            <ui:define name="content">
+                <p:panel header="Sample Management at Lab">
+                    <div class="row"> 
+                        <div class="col-2" id="first-column"> 
+                            <h:form>
+                                <div class="d-grid gap-2">
+                                    <p:commandButton 
+                                        class="w-100 my-1" 
+                                        ajax="false"
+                                        value="Generate Barcodes for lab" 
+                                        icon="fa fa-barcode"
+                                        action="#{patientInvestigationController.navigateToGenerateBarcodesForLab()}"
+                                        >
+                                    </p:commandButton>
+                                    <p:commandButton 
+                                        class="w-100 my-1" 
+                                        ajax="false" 
+                                        value="Collect Samples" 
+                                        icon="fa fa-vial"
+                                        action="#{patientInvestigationController.navigateToCollectSamples()}"
+                                        >
+                                    </p:commandButton>
+                                    <p:commandButton
+                                        style="float: right;"
+                                        class="w-100 my-1"
+                                        icon="fa fa-check"
+                                        value="Accept Samples" 
+                                        ajax="false" 
+                                        action="#{patientInvestigationController.navigateToAcceptSamples()}"
+                                        >
+                                    </p:commandButton>
+                                    <p:commandButton 
+                                        class="w-100 my-1"  
+                                        ajax="false" 
+                                        immediate="true"
+                                        value="Reject Samples"
+                                        icon="fa fa-times"
+                                        action="#{patientInvestigationController.navigateToRejectSamples()}"
+                                        >
+                                    </p:commandButton>
+                                    <p:commandButton 
+                                        class="w-100 my-1" 
+                                        ajax="false" 
+                                        immediate="true"
+                                        value="Revert Samples"
+                                        icon="fa fa-undo"
+                                        action="#{patientInvestigationController.navigateToRevertSamples()}"
+                                        >
+                                    </p:commandButton>
+                                    <p:commandButton 
+                                        class="w-100 my-1" 
+                                        ajax="false" 
+                                        immediate="true"
+                                        value="Divide Samples"
+                                        icon="fa fa-cut"
+                                        action="#{patientInvestigationController.navigateToDivideSamples()}"
+                                        >
+                                    </p:commandButton>
+                                </div>
+                            </h:form>
+                        </div>
+                        <div id="second-column" class="col-9"> 
+                            <ui:insert name="subcontent" >
+
+                            </ui:insert>
+                        </div>
+                    </div>                   
+                </p:panel>
+            </ui:define>
+        </ui:composition>
+    </h:body>
+</html>
diff --git a/src/main/webapp/lab/sample_index.xhtml b/src/main/webapp/lab/sample_index.xhtml
index 567ff86705..ea8005118b 100644
--- a/src/main/webapp/lab/sample_index.xhtml
+++ b/src/main/webapp/lab/sample_index.xhtml
@@ -7,7 +7,7 @@
     <h:body>
         <ui:composition template="/resources/template/template.xhtml">
             <ui:define name="content">
-                <p:panel header="Sample Management">
+                <p:panel header="Sample Management at Phlebotomy Room">
                     <div class="row"> 
                         <div class="col-3" id="first-column"> 
                             <h:form>
@@ -15,7 +15,8 @@
                                     <p:commandButton 
                                         class="w-100" 
                                         ajax="false"
-                                        value="To Collect Samples" 
+                                        value="Generate Barcode for Phlebotomy Room" 
+                                        icon="fa fa-barcode"
                                         action="#{patientInvestigationController.navigateToToCollelct()}" 
                                         >
                                     </p:commandButton>
@@ -23,46 +24,44 @@
                                         class="w-100" 
                                         ajax="false" 
                                         value="Collected Samples" 
-                                        action="#{patientInvestigationController.navigateToCollelcted()}" />
-                                    <p:commandButton
-                                        style="float: right;"
-                                        class="ui-button-warning"
-                                        icon="fa fa-barcode"
-                                        value="To Barcode Printing" 
-                                        ajax="false" 
-                                        action="#{patientInvestigationController.navigateToPrintBarcodeFromMenu}" >
+                                        icon="fa fa-vials"
+                                        action="#{patientInvestigationController.navigateToCollelcted()}">
                                     </p:commandButton>
-                                    <p:commandButton 
-                                        class="w-100 my-1" 
-                                        id="btnToListSamples" 
+                                    <p:commandButton
+                                        class="w-100" 
                                         ajax="false" 
-                                        immediate="true"
-                                        action="#{patientSampleController.navigateToListPatientSamples()}" 
-                                        value="To List Samples"   >
+                                        value="Sent to Lab" 
+                                        icon="fa fa-flask"
+                                        action="#{patientInvestigationController.navigateToSentToLab()}">
                                     </p:commandButton>
-                                </div>
-
 
+                                    <!--                                    <p:commandButton
+                                                                            style="float: right;"
+                                                                            class="ui-button-warning w-100"
+                                                                            value="To Barcode Printing" 
+                                                                            ajax="false" 
+                                                                            action="#{patientInvestigationController.navigateToPrintBarcodeFromMenu}" >
+                                                                        </p:commandButton>
+                                                                        <p:commandButton 
+                                                                            class="w-100 my-1" 
+                                                                            id="btnToListSamples" 
+                                                                            ajax="false" 
+                                                                            immediate="true"
+                                                                            action="#{patientSampleController.navigateToListPatientSamples()}" 
+                                                                            value="To List Samples"   >
+                                                                        </p:commandButton>-->
+                                </div>
                             </h:form>
                         </div>
 
-
-
                         <div id="second-column" class="col-9"> 
                             <ui:insert name="subcontent" >
 
                             </ui:insert>
                         </div>
-
                     </div>
                 </p:panel>
-
-
-
             </ui:define>
-
-
         </ui:composition>
-
     </h:body>
 </html>
diff --git a/src/main/webapp/lab/sent_to_lab.xhtml b/src/main/webapp/lab/sent_to_lab.xhtml
new file mode 100644
index 0000000000..87e19b3d3c
--- /dev/null
+++ b/src/main/webapp/lab/sent_to_lab.xhtml
@@ -0,0 +1,13 @@
+<?xml version='1.0' encoding='UTF-8' ?>
+<!DOCTYPE composition PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+      xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:h="http://xmlns.jcp.org/jsf/html">
+    <ui:composition template="/lab/sample_index.xhtml">
+        <ui:define name="subcontent">
+            <h:panelGrid>                
+                    <h:outputLabel value="sent to lab"></h:outputLabel>
+                </h:panelGrid> 
+        </ui:define>
+    </ui:composition>
+</html>
\ No newline at end of file
diff --git a/src/main/webapp/resources/ezcomp/menu.xhtml b/src/main/webapp/resources/ezcomp/menu.xhtml
index 54dc7a7edc..05ea2b32f3 100644
--- a/src/main/webapp/resources/ezcomp/menu.xhtml
+++ b/src/main/webapp/resources/ezcomp/menu.xhtml
@@ -397,12 +397,15 @@
                         <p:menuitem ajax="false" action="/lab/inward_search_service?faces-redirect=true" value="Search In-patient Bills" actionListener="#{searchController.makeListNull}"  rendered="#{webUserController.hasPrivilege('LabInwardSearchServiceBill')}" ></p:menuitem>  
                     </p:submenu>
 
+                    <p:submenu label="Sampling">
+                        <p:menuitem 
+                            ajax="false"
+                            action="#{patientInvestigationController.navigateToPatientSampelIndex()}"
+                            value="Phlebotomy Room" 
+                            rendered="#{webUserController.hasPrivilege('LabSampleCollecting')}" ></p:menuitem>
+                        <p:menuitem ajax="false"  action="/lab/sample_at_lab_index?faces-redirect=true" value="Lab"></p:menuitem>
+                    </p:submenu>
 
-                    <p:menuitem 
-                        ajax="false"
-                        action="#{patientInvestigationController.navigateToPatientSampelIndex()}"
-                        value="Sampling" 
-                        rendered="#{webUserController.hasPrivilege('LabSampleCollecting')}" ></p:menuitem>
                     <p:menuitem ajax="false" action="/lab/receive?faces-redirect=true" actionListener="#{patientInvestigationController.toPrintWorksheets()}" value="Worksheets" rendered="#{webUserController.hasPrivilege('LabSampleReceiving')}" ></p:menuitem>
                     <p:menuitem ajax="false" action="#{searchController.navigateToLabReportSearch}"  value="Reports/Search" rendered="#{webUserController.hasPrivilege('LabReportSearch')}" ></p:menuitem>
                     <p:menuitem ajax="false" action="/lab/search_for_reporting_ondemand_institution?faces-redirect=true" value="Reports/Search By Logged Institution" rendered="#{false and webUserController.hasPrivilege('LabReportSearchByLoggedInstitution')}" ></p:menuitem>
@@ -629,7 +632,7 @@
                                     actionListener="#{searchController.makeListNull()}" 
                                     rendered="#{webUserController.hasPrivilege('PharmacyDisbursementRequest') and !configOptionApplicationController.getBooleanValueByKey('Pharmacy Transer Request With Approval')}" 
                                     icon="fas fa-hand-holding-medical"></p:menuitem>
-                        
+
                         <p:menuitem ajax="false" 
                                     action="#{searchController.navigateToCreateTransferRequest}"  
                                     value="Create Transer Request" 
@@ -977,41 +980,41 @@
                         value="Cash For Receive" 
                         rendered="#{webUserController.hasPrivilege('Payment')}" >
                     </p:menuitem>
-<!--                    <p:submenu label="Pay"
-                               rendered="#{webUserController.hasPrivilege('Payment')}">
-                        <p:submenu label="OPD">
-                            <p:menuitem  ajax="false"  action="/payment_staff_bill?faces-redirect=true" value="Pay Doctor/Staff" rendered="#{webUserController.hasPrivilege('PaymentBilling')}" ></p:menuitem>
-                            <p:menuitem  ajax="false"  action="/opd_search_professional_payment_due?faces-redirect=true" actionListener="#{searchController.makeListNull}"  value="Payments Due Search" rendered="#{webUserController.hasPrivilege('PaymentBillSearch')}" ></p:menuitem>
-                            <p:menuitem  ajax="false"  action="/opd_search_professional_payment_done?faces-redirect=true" actionListener="#{searchController.makeListNull}"
-                                         value="Payments Done Search"  rendered="#{webUserController.hasPrivilege('PaymentBillSearch')}" ></p:menuitem>                                                               
-                        </p:submenu>
-                        <p:submenu label="Inward">
-                            <p:menuitem  ajax="false" action="/inward/inward_bill_staff_payment?faces-redirect=true" value="Pay Doctor"  />
-                            <p:menuitem  ajax="false"   action="/inward/inward_search_professional_payment_due?faces-redirect=true"  value="Payment Due Search"
-                                         actionListener="#{searchController.makeListNull}" />
-                            <p:menuitem  ajax="false" action="/inward/inward_search_professional_payment_done?faces-redirect=true" value="Payment Done Search"  
-                                         actionListener="#{searchController.makeListNull}" />
-                        </p:submenu>
-
-                        <p:submenu label="Channel" rendered="#{webUserController.hasPrivilege('ChannellingPayment')}" >
-                            <p:submenu label="Doctor/Staff">
-                                <p:menuitem  ajax="false"  value="Pay Doctor"  action="/channel/channel_payment_staff_bill?faces-redirect=true" actionListener="#{channelStaffPaymentBillController.makenull()}" rendered="#{webUserController.hasPrivilege('ChannellingPaymentPayDoctor')}" ></p:menuitem>
-                                <p:menuitem  ajax="false"  value="Payment Due Search"  action="/channel/channel_payments_due_searc?faces-redirect=trueh" rendered="#{webUserController.hasPrivilege('ChannellingPaymentDueSearch')}"  ></p:menuitem>
-                                <p:menuitem  ajax="false"  value="Payment Done Search"  action="/channel/channel_payment_bill_search?faces-redirect=true" actionListener="#{billSearch.recreateModel}" rendered="#{webUserController.hasPrivilege('ChannellingPaymentDoneSearch')}" ></p:menuitem>                                            
-                            </p:submenu>
-
-                            <p:submenu label="Agency">
-                                <p:menuitem  ajax="false"  value="Pay Agent"  action="/channel/channel_payment_agent_bill?faces-redirect=true" rendered="#{webUserController.hasPrivilege('ChannellingPaymentPayDoctor')}" ></p:menuitem>
-                                <p:menuitem  ajax="false"  value="Payment Done Search"  action="/channel/channel_payment_agency_bill_search?faces-redirect=true" actionListener="#{billSearch.recreateModel}" rendered="#{webUserController.hasPrivilege('ChannellingPaymentDoneSearch')}" ></p:menuitem>
-                            </p:submenu>                                        
-                        </p:submenu> 
-
-                        <p:submenu label="Petty Cash">
-                            <p:menuitem  ajax="false"  action="/petty_cash_bill?faces-redirect=true" value="Petty Cash Payment" actionListener="#{pettyCashBillController.prepareNewBill()}"  ></p:menuitem>
-                            <p:menuitem  ajax="false"  action="/petty_cash_bill_search_own?faces-redirect=true" actionListener="#{searchController.makeListNull}"  value="Petty Cash Bill Search"  ></p:menuitem>
-                            <p:menuitem  ajax="false"  action="/iou_bill?faces-redirect=true" value="Petty Cash (IOU)"  ></p:menuitem>
-                        </p:submenu>
-                    </p:submenu>-->
+                    <!--                    <p:submenu label="Pay"
+                                                   rendered="#{webUserController.hasPrivilege('Payment')}">
+                                            <p:submenu label="OPD">
+                                                <p:menuitem  ajax="false"  action="/payment_staff_bill?faces-redirect=true" value="Pay Doctor/Staff" rendered="#{webUserController.hasPrivilege('PaymentBilling')}" ></p:menuitem>
+                                                <p:menuitem  ajax="false"  action="/opd_search_professional_payment_due?faces-redirect=true" actionListener="#{searchController.makeListNull}"  value="Payments Due Search" rendered="#{webUserController.hasPrivilege('PaymentBillSearch')}" ></p:menuitem>
+                                                <p:menuitem  ajax="false"  action="/opd_search_professional_payment_done?faces-redirect=true" actionListener="#{searchController.makeListNull}"
+                                                             value="Payments Done Search"  rendered="#{webUserController.hasPrivilege('PaymentBillSearch')}" ></p:menuitem>                                                               
+                                            </p:submenu>
+                                            <p:submenu label="Inward">
+                                                <p:menuitem  ajax="false" action="/inward/inward_bill_staff_payment?faces-redirect=true" value="Pay Doctor"  />
+                                                <p:menuitem  ajax="false"   action="/inward/inward_search_professional_payment_due?faces-redirect=true"  value="Payment Due Search"
+                                                             actionListener="#{searchController.makeListNull}" />
+                                                <p:menuitem  ajax="false" action="/inward/inward_search_professional_payment_done?faces-redirect=true" value="Payment Done Search"  
+                                                             actionListener="#{searchController.makeListNull}" />
+                                            </p:submenu>
+                    
+                                            <p:submenu label="Channel" rendered="#{webUserController.hasPrivilege('ChannellingPayment')}" >
+                                                <p:submenu label="Doctor/Staff">
+                                                    <p:menuitem  ajax="false"  value="Pay Doctor"  action="/channel/channel_payment_staff_bill?faces-redirect=true" actionListener="#{channelStaffPaymentBillController.makenull()}" rendered="#{webUserController.hasPrivilege('ChannellingPaymentPayDoctor')}" ></p:menuitem>
+                                                    <p:menuitem  ajax="false"  value="Payment Due Search"  action="/channel/channel_payments_due_searc?faces-redirect=trueh" rendered="#{webUserController.hasPrivilege('ChannellingPaymentDueSearch')}"  ></p:menuitem>
+                                                    <p:menuitem  ajax="false"  value="Payment Done Search"  action="/channel/channel_payment_bill_search?faces-redirect=true" actionListener="#{billSearch.recreateModel}" rendered="#{webUserController.hasPrivilege('ChannellingPaymentDoneSearch')}" ></p:menuitem>                                            
+                                                </p:submenu>
+                    
+                                                <p:submenu label="Agency">
+                                                    <p:menuitem  ajax="false"  value="Pay Agent"  action="/channel/channel_payment_agent_bill?faces-redirect=true" rendered="#{webUserController.hasPrivilege('ChannellingPaymentPayDoctor')}" ></p:menuitem>
+                                                    <p:menuitem  ajax="false"  value="Payment Done Search"  action="/channel/channel_payment_agency_bill_search?faces-redirect=true" actionListener="#{billSearch.recreateModel}" rendered="#{webUserController.hasPrivilege('ChannellingPaymentDoneSearch')}" ></p:menuitem>
+                                                </p:submenu>                                        
+                                            </p:submenu> 
+                    
+                                            <p:submenu label="Petty Cash">
+                                                <p:menuitem  ajax="false"  action="/petty_cash_bill?faces-redirect=true" value="Petty Cash Payment" actionListener="#{pettyCashBillController.prepareNewBill()}"  ></p:menuitem>
+                                                <p:menuitem  ajax="false"  action="/petty_cash_bill_search_own?faces-redirect=true" actionListener="#{searchController.makeListNull}"  value="Petty Cash Bill Search"  ></p:menuitem>
+                                                <p:menuitem  ajax="false"  action="/iou_bill?faces-redirect=true" value="Petty Cash (IOU)"  ></p:menuitem>
+                                            </p:submenu>
+                                        </p:submenu>-->
 
                     <p:submenu label="Recieve"  rendered="#{webUserController.hasPrivilege('Payment')}">  
                         <p:submenu label="Inward Deposit">
@@ -1282,9 +1285,9 @@
                         <h:panelGroup rendered="#{configOptionApplicationController.getBooleanValueByKey('Display Cashiers Cash Total on Menu')}">
                             <h:outputLabel class="mx-2" style="font-size: 1.2em; color: green; font-weight: 600" value="Cash in Hand : #{(financialTransactionController.financialReportByPayments.netCashTotal+(financialTransactionController.financialReportByPayments.floatReceived - financialTransactionController.financialReportByPayments.floatHandover)+ financialTransactionController.financialReportByPayments.shiftStartFunds)}" />
                             <p:commandButton class="ui-button-info"
-                                            icon="fas fa-refresh"
-                                            ajax="false"
-                                            action="#{financialTransactionController.refreshCashNetTotalForMenu()}" />
+                                             icon="fas fa-refresh"
+                                             ajax="false"
+                                             action="#{financialTransactionController.refreshCashNetTotalForMenu()}" />
                         </h:panelGroup>
                         <div class="mx-4">
                             <h:panelGroup>