Merge pull request #6705 from hmislk/Issue#6530

Issue#6530 Closes #6530
hmislk · Aug 3, 2024 · 8be5fe2 · 8be5fe2
2 parents 4d6fd12 + eb53a95
commit 8be5fe2
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/src/main/java/com/divudi/bean/store/StoreTransferReceiveController.java b/src/main/java/com/divudi/bean/store/StoreTransferReceiveController.java
@@ -139,7 +139,10 @@ public void generateBillComponent() {
     public void settle() {
 
         saveBill();
-
+        if(getReceivedBill().getComments() == null || getReceivedBill().getComments().trim().equals("")) {
+            JsfUtil.addErrorMessage("Please enter a comment");
+            return;
+        }
         for (BillItem i : getBillItems()) {
 
 //            i.getPharmaceuticalBillItem().setQtyInUnit(i.getQty());

diff --git a/src/main/webapp/resources/store/transferReceive.xhtml b/src/main/webapp/resources/store/transferReceive.xhtml
@@ -36,7 +36,8 @@
             </div>
 
             <div class="headingBill">
-                <h:outputLabel value="Transfer Recieve Note" style="text-decoration: underline;"/>                           
+                <h:outputLabel value="Transfer Recieve Note" style="text-decoration: underline;"/>    
+
             </div>
 
 

diff --git a/src/main/webapp/store/store_transfer_receive.xhtml b/src/main/webapp/store/store_transfer_receive.xhtml
@@ -14,13 +14,15 @@
                 <p:panel>
                     <f:facet name="header" >                                  
 
-                        <p:outputLabel value="Staff : &nbsp;#{storeTransferReceiveController.issuedBill.toStaff.person.nameWithTitle}" />
+                        <p:outputLabel value="Staff : &nbsp;#{storeTransferReceiveController.issuedBill.toStaff.person.nameWithTitle}" class="col-md-4"/>
+
+                        <p:inputText placeholder="Enter Comments to Receive Bill" value="#{storeTransferReceiveController.receivedBill.comments}" class="p-2 w-25 col-md-4"/>
 
                         <p:commandButton  
                             value="Recieve" 
                             icon="fas fa-check"
                             style="float: right;"
-                            class="ui-button-success mx-2"
+                            class="ui-button-success w-10 mx-2 col-md-2 "
                             action="#{storeTransferReceiveController.settle}" 
                             ajax="false" >
                         </p:commandButton>