Merge pull request #6768 from hmislk/issue#6767

Issue#6767 Closes #6767
hmislk · Aug 7, 2024 · 104aa8e · 104aa8e
2 parents 85a3d3e + a487c0d
commit 104aa8e
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/src/main/java/com/divudi/bean/common/TokenController.java b/src/main/java/com/divudi/bean/common/TokenController.java
@@ -358,10 +358,10 @@ public String settlePharmacyToken() {
             JsfUtil.addErrorMessage("Wrong Token");
             return "";
         }
-        if (getPatient().getId() == null) {
-            JsfUtil.addErrorMessage("Please select a patient");
-            return "";
-        } else if (getPatient().getPerson().getName() == null) {
+//        if (getPatient().getId() == null) {
+//            JsfUtil.addErrorMessage("Please select a patient");
+//            return "";
+        if (getPatient().getPerson().getName() == null) {
             JsfUtil.addErrorMessage("Please select a patient");
             return "";
         } else if (getPatient().getPerson().getName().trim().equals("")) {

diff --git a/src/main/java/com/divudi/bean/pharmacy/PharmacySaleController.java b/src/main/java/com/divudi/bean/pharmacy/PharmacySaleController.java
@@ -1745,9 +1745,9 @@ public void settlePreBill() {
             }
 
         }
-        if (getToken() != null) {
-            getToken().setBill(getPreBill());
-            tokenFacade.edit(getToken());
+        if (getCurrentToken() != null) {
+            getCurrentToken().setBill(getPreBill());
+            tokenFacade.edit(getCurrentToken());
         }
 
         markToken();

diff --git a/src/main/webapp/token/pharmacy_tokens.xhtml b/src/main/webapp/token/pharmacy_tokens.xhtml
@@ -126,6 +126,7 @@
                                     rendered="#{token.bill eq null}"
                                     title="Pharmacy Bill for Cashier" 
                                     action="#{tokenController.navigateToNewPharmacyBillForCashier()}">
+                                    <f:setPropertyActionListener target="#{pharmacySaleController.currentToken}" value="#{token}" />
                                     <f:setPropertyActionListener target="#{tokenController.currentToken}" value="#{token}" />
                                 </p:commandButton>
                                 <p:tooltip value="Bill For Cashier" />