Merge pull request #11253 from hmislk/credit_reciept

Author: GSMgeeth

src/main/java/com/divudi/bean/report/CashierReportController.java

@@ -130,6 +130,14 @@ public void recreteModal2() {
         recreteModal();
     }
 
+
+  
+    public void init() {
+        // Set the current cashier to the logged-in user
+        currentCashier = sessionController.getLoggedUser();
+        // ... rest of initialization code ...
+    }
+
     public String navigateToDepartmentAllCashierReport() {
         FacesContext context = FacesContext.getCurrentInstance();
         HttpServletRequest request = (HttpServletRequest) context.getExternalContext().getRequest();

src/main/webapp/credit/credit_compnay_bill_opd_all.xhtml

@@ -147,19 +147,23 @@
                                     <p:commandButton 
                                         ajax="false" 
                                         action="#{cashRecieveBillController.removeAll()}" 
-                                        value="Remove Selected"                                   
+                                        value="Remove Selected"
+                                        icon="fa fa-trash"
                                         class="ui-button-danger mx-2"/>
-
-                                    <h:outputLabel value="Paying Institution : "/>
+                                    <br />
+                                    <h:outputLabel style="margin-left: 10px" value="Paying Institution : "/>
                                     <p:outputLabel value="#{cashRecieveBillController.institution.name}" id="ins"/>
+                                    <br />
+                                    <h:outputLabel style="margin-left: 10px" value="Cashier: "/>
+                                    <p:outputLabel value="#{cashierReportController.currentCashier.name}" id="cash"/>
 
-
-                                </f:facet>       
+                                </f:facet>
 
                                 <p:dataTable value="#{cashRecieveBillController.billItems}" 
                                              rowIndexVar="rowIndex"   var="b" id="items"
                                              rowKey="#{b.searialNo}" selection="#{cashRecieveBillController.selectedBillItems}"
                                              selectionMode="multiple"
+
                                              >