Merge pull request #8791 from hmislk/Issue#8768

Issue#8768 Closes #8768
hmislk · Nov 17, 2024 · 957d5ac · 957d5ac
2 parents 110c326 + 2492122
commit 957d5ac
Show file tree

Hide file tree

Showing 5 changed files with 150 additions and 78 deletions.
diff --git a/pom.xml b/pom.xml
@@ -2,10 +2,10 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.divudi</groupId>
-    <artifactId>ruhunu</artifactId>
+    <artifactId>rh</artifactId>
     <version>3.0.0</version>
     <packaging>war</packaging>
-    <name>ruhunu</name>
+    <name>rh</name>
 
     <properties>
         <endorsed.dir>${project.build.directory}/endorsed</endorsed.dir>

diff --git a/src/main/java/com/divudi/bean/opd/OpdBillController.java b/src/main/java/com/divudi/bean/opd/OpdBillController.java
@@ -3428,17 +3428,20 @@ public List<Payment> createPayment(Bill bill, PaymentMethod pm) {
                     case Credit:
                         p.setReferenceNo(cd.getPaymentMethodData().getCredit().getReferralNo());
                         p.setComments(cd.getPaymentMethodData().getCredit().getComment());
+                        break;
                     case PatientDeposit:
                         if (getPatient().getRunningBalance() != null) {
                             getPatient().setRunningBalance(getPatient().getRunningBalance() - cd.getPaymentMethodData().getPatient_deposit().getTotalValue());
                         } else {
                             getPatient().setRunningBalance(0.0 - cd.getPaymentMethodData().getPatient_deposit().getTotalValue());
                         }
                         getPatientFacade().edit(getPatient());
+                        break;
                     case Slip:
                         p.setPaidValue(cd.getPaymentMethodData().getSlip().getTotalValue());
                         p.setBank(cd.getPaymentMethodData().getSlip().getInstitution());
                         p.setRealizedAt(cd.getPaymentMethodData().getSlip().getDate());
+                        break;
                     case OnCall:
                     case OnlineSettlement:
                     case Staff:
@@ -3447,6 +3450,7 @@ public List<Payment> createPayment(Bill bill, PaymentMethod pm) {
                             staffBean.updateStaffCredit(cd.getPaymentMethodData().getStaffCredit().getToStaff(), cd.getPaymentMethodData().getStaffCredit().getTotalValue());
                             JsfUtil.addSuccessMessage("Staff Welfare Balance Updated");
                         }
+                        break;
                     case YouOweMe:
                     case MultiplePaymentMethods:
                 }
@@ -3485,11 +3489,13 @@ public List<Payment> createPayment(Bill bill, PaymentMethod pm) {
                 case Credit:
                     p.setReferenceNo(paymentMethodData.getCredit().getReferralNo());
                     p.setComments(paymentMethodData.getCredit().getComment());
+                    break;
                 case PatientDeposit:
                 case Slip:
                     p.setBank(paymentMethodData.getSlip().getInstitution());
                     p.setPaidValue(paymentMethodData.getSlip().getTotalValue());
                     p.setRealizedAt(paymentMethodData.getSlip().getDate());
+                    break;
                 case OnCall:
                 case OnlineSettlement:
                 case Staff:

diff --git a/src/main/resources/META-INF/.LCKpersistence.xml~ b/src/main/resources/META-INF/.LCKpersistence.xml~
diff --git a/src/main/webapp/opd/opd_bill_ac.xhtml b/src/main/webapp/opd/opd_bill_ac.xhtml
@@ -1058,8 +1058,6 @@
                                                     class="ui-button-success mx-2 w-100">
                                                 </p:commandButton>
 
-
-
                                                 <p:commandButton 
                                                     style="float: right;"
                                                     value="Lookup"