Merge branch 'master' into Issue#6551

.github/counter.txt

@@ -1 +1 @@
-6
+8

.github/last_date.txt

@@ -1 +1 @@
-20240725
+20240726

README.md

@@ -21,7 +21,7 @@ Developed using Java Enterprise Edition, the system offers both a web applicatio
 
 
 
-Current Version: 3.0.0.20240725.6 (This line will be automatically updated to reflect the latest version)
+Current Version: 3.0.0.20240726.8 (This line will be automatically updated to reflect the latest version)
 
 
 ## History

nb-configuration.xml

@@ -16,7 +16,5 @@ Any value defined here will override the pom.xml file value but is only applicab
 -->
         <org-netbeans-modules-maven-jaxws.rest_2e_config_2e_type>ide</org-netbeans-modules-maven-jaxws.rest_2e_config_2e_type>
         <org-netbeans-modules-maven-j2ee.netbeans_2e_hint_2e_deploy_2e_server>pfv5ee8</org-netbeans-modules-maven-j2ee.netbeans_2e_hint_2e_deploy_2e_server>
-        <netbeans.compile.on.save>none</netbeans.compile.on.save>
-        <org-netbeans-modules-maven-j2ee.netbeans_2e_deploy_2e_on_2e_save>false</org-netbeans-modules-maven-j2ee.netbeans_2e_deploy_2e_on_2e_save>
     </properties>
 </project-shared-configuration>

pom.xml

@@ -2,6 +2,7 @@
          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>vfs</artifactId>
     <version>3.0.0</version>

src/main/java/com/divudi/bean/channel/ChannelStaffPaymentBillController.java

@@ -342,7 +342,6 @@ public void debugDueFees() {
                 + " and b.fee.feeType=:ftp"
                 + " and b.bill.refunded=false "
                 + " and b.bill.cancelled=false "
-                //                + " and b.bill.singleBillSession.absent=false"
                 + " and (b.feeValue - b.paidValue) > 0 "
                 + " and b.bill.billType in :bt "
                 + " and b.staff=:stf ";
@@ -366,6 +365,7 @@ public void debugDueFees() {
 //                + " order by b.bill.singleBillSession.serviceSession.sessionDate,"
 //                + " b.bill.singleBillSession.serviceSession.sessionTime,"
 //                + " b.bill.singleBillSession.serialNo ";
+
         sql += " order by b.bill.singleBillSession.serviceSession.sessionDate,"
                 + " b.bill.singleBillSession.serviceSession.sessionTime,"
                 + " b.bill.singleBillSession.serialNo ";
@@ -447,7 +447,9 @@ public void calculateDueFees() {
                 + " and b.fee.feeType=:ftp"
                 + " and b.bill.refunded=false "
                 + " and b.bill.cancelled=false "
-                //                + " and b.bill.singleBillSession.absent=false"
+
+//                + " and b.bill.singleBillSession.absent=false"
+
                 + " and (b.feeValue - b.paidValue) > 0 "
                 + " and b.bill.billType in :bt "
                 + " and b.staff=:stf ";
@@ -542,7 +544,6 @@ public void calculateSessionDueFees() {
                 + " and b.fee.feeType=:ftp"
                 + " and b.bill.refunded=false "
                 + " and b.bill.cancelled=false "
-                //                + " and b.bill.singleBillSession.absent=false"
                 + " and (b.feeValue - b.paidValue) > 0 "
                 + " and b.bill.billType in :bt "
                 + " and b.bill.singleBillSession.sessionInstance=:si"
@@ -597,8 +598,8 @@ public void calculateSessionDoneFees() {
                 + " and b.fee.feeType=:ftp"
                 + " and b.bill.refunded=false "
                 + " and b.bill.cancelled=false "
-                //                + " and b.bill.singleBillSession.absent=false"
-                + " and (b.feeValue - b.paidValue) < 1 "
+                + " and b.bill.singleBillSession.absent=false"
+                + " and (b.feeValue - b.paidValue) > 0 "
                 + " and b.bill.billType in :bt "
                 + " and b.bill.singleBillSession.sessionInstance=:si"
                 + " and b.bill.singleBillSession.completed=:com";

src/main/java/com/divudi/bean/common/EnumController.java

@@ -72,6 +72,7 @@ public class EnumController implements Serializable {
     List<PaymentMethod> paymentMethodsForOpdBilling;
     List<PaymentMethod> paymentMethodsForChanneling;
     List<PaymentMethod> paymentMethodsForPharmacyBilling;
+    List<PaymentMethod> paymentMethodsForPatientDeposit;
     SessionNumberType[] sessionNumberTypes;
 
     @PostConstruct
@@ -89,6 +90,13 @@ public List<PaymentMethod> getPaymentMethodsForOpdBilling() {
         }
         return paymentMethodsForOpdBilling;
     }
+
+    public List<PaymentMethod> getPaymentMethodsForPatientDeposit() {
+        if (paymentMethodsForPatientDeposit == null) {
+              fillPaymentMethodsForPatientDeposit();
+        }
+        return paymentMethodsForPatientDeposit;
+    }
 
     public List<PaymentMethod> getPaymentMethodsForPackageBilling() {
         if (paymentMethodsForOpdBilling == null) {
@@ -102,6 +110,16 @@ public void resetPaymentMethods() {
         paymentMethodsForChanneling = null;
     }
 
+    public void fillPaymentMethodsForPatientDeposit(){
+        paymentMethodsForPatientDeposit = new ArrayList<>();
+        for(PaymentMethod pm : PaymentMethod.values()){
+           boolean include = configOptionApplicationController.getBooleanValueByKey(pm.getLabel() + " is available for Patient Deposit", true); 
+           if(include){
+               paymentMethodsForPatientDeposit.add(pm);
+           }
+        }
+    }
+
     public void fillPaymentMethodsForOpdBilling() {
         paymentMethodsForOpdBilling = new ArrayList<>();
         for (PaymentMethod pm : PaymentMethod.values()) {

src/main/resources/META-INF/persistence.xml

@@ -1,16 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<persistence version="2.0" xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd">
+<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/arogya</jta-data-source>
         <exclude-unlisted-classes>false</exclude-unlisted-classes>
         <properties>
+            <property name="eclipselink.logging.level.sql" value="SEVERE"/>
+            <property name="eclipselink.logging.parameters" value="false"/>
             <property name="javax.persistence.schema-generation.database.action" value="create-or-extend-tables"/>
         </properties>
     </persistence-unit>
     <persistence-unit name="hmisAuditPU" transaction-type="JTA">
         <jta-data-source>jdbc/arogyaAudit</jta-data-source>
         <exclude-unlisted-classes>false</exclude-unlisted-classes>
         <properties>
+            <property name="eclipselink.logging.level.sql" value="SEVERE"/>
+            <property name="eclipselink.logging.parameters" value="false"/>
+            <property name="javax.persistence.schema-generation.database.action" value="create-or-extend-tables"/>
         </properties>
     </persistence-unit>
 </persistence>
+

src/main/resources/VERSION.txt

@@ -1 +1 @@
-3.0.0.20240720.4
+3.0.0.20240726.8

src/main/webapp/WEB-INF/glassfish-web.xml

@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE glassfish-web-app PUBLIC "-//GlassFish.org//DTD GlassFish Application Server 3.1 Servlet 3.0//EN" "http://glassfish.org/dtds/glassfish-web-app_3_0-1.dtd">
 <glassfish-web-app error-url="">
+
   <context-root>/vfs</context-root>
+
   <class-loader delegate="true"/>
   <jsp-config>
     <property name="keepgenerated" value="true">