Merge pull request #6600 from hmislk/Issue#6573

Issue#6573 Closes #6573
hmislk · Jul 26, 2024 · b852be2 · b852be2
2 parents 05a668c + 056a335
commit b852be2
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 6 deletions.
diff --git a/src/main/java/com/divudi/bean/common/BillSearch.java b/src/main/java/com/divudi/bean/common/BillSearch.java
@@ -166,6 +166,9 @@ public class BillSearch implements Serializable {
     CommonFunctionsController commonFunctionsController;
     @Inject
     PharmacyBillSearch pharmacyBillSearch;
+
+    @Inject
+    ConfigOptionApplicationController configOptionApplicationController;
     /**
      * Class Variables
      */
@@ -238,6 +241,14 @@ public class BillSearch implements Serializable {
     public String navigateToBillPaymentOpdBill() {
         return "bill_payment_opd?faces-redirect=true";
     }
+
+    public void fillBillFees(){
+        for(BillItem bi : getRefundingBill().getBillItems()){
+            for(BillFee bfee : bi.getBillFees()){
+                bfee.setFeeValue(bfee.getReferenceBillFee().getFeeValue());
+            }
+        }
+    }
 
     public void editBillDetails() {
         Bill editedBill = bill;
@@ -2895,8 +2906,9 @@ public String navigateToRefundOpdBill() {
             JsfUtil.addErrorMessage(ex.getMessage());
             return "";
         }
-//        boolean flag = billController.checkBillValues(bill);
-//        bill.setTransError(flag);
+        if(configOptionApplicationController.getBooleanValueByKey("To Refunded the Full Value of the Bill")){
+            fillBillFees();
+        }
         printPreview = false;
         return "/opd/bill_refund?faces-redirect=true;";
     }

diff --git a/src/main/resources/META-INF/persistence.xml b/src/main/resources/META-INF/persistence.xml
@@ -2,7 +2,7 @@
 <persistence version="2.2" xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/persistence http://xmlns.jcp.org/xml/ns/persistence/persistence_2_2.xsd">
     <persistence-unit name="hmisPU" transaction-type="JTA">
 
-        <jta-data-source>jdbc/hims</jta-data-source>
+        <jta-data-source>jdbc/arogya</jta-data-source>
 
         <exclude-unlisted-classes>false</exclude-unlisted-classes>
         <properties>
@@ -13,7 +13,7 @@
     </persistence-unit>
     <persistence-unit name="hmisAuditPU" transaction-type="JTA">
 
-        <jta-data-source>jdbc/himsAduit</jta-data-source>
+        <jta-data-source>jdbc/arogyaAudit</jta-data-source>
 
         <exclude-unlisted-classes>false</exclude-unlisted-classes>
 

diff --git a/src/main/resources/VERSION.txt b/src/main/resources/VERSION.txt
@@ -1 +1 @@
-3.0.0.20240726.2
+3.0.0.20240720.4
diff --git a/src/main/webapp/opd/opd_bill.xhtml b/src/main/webapp/opd/opd_bill.xhtml
@@ -953,7 +953,7 @@
                                     </h:panelGrid>
                                 </p:panel>
 
-                                <p:panel id="panelWorkingStaff" class="m-1">
+                                <p:panel id="panelWorkingStaff" class="m-1" >
                                     <f:facet name="header" >
                                         <h:outputText styleClass="fa fa-money-bill-wave" /> <!-- FontAwesome Icon -->
                                         <h:outputText value="Doctor Details" class="mx-4"></h:outputText>