Merge branch 'master' into Issue#6361

.github/counter.txt

@@ -1 +1 @@
-6
+9

.github/last_date.txt

@@ -1 +1 @@
-20240804
+20240807

README.md

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

nb-configuration.xml

@@ -1,22 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project-shared-configuration>
-    <!--
-This file contains additional configuration written by modules in the NetBeans IDE.
-The configuration is intended to be shared among all the users of project and
-therefore it is assumed to be part of version control checkout.
-Without this configuration present, some functionality in the IDE may be limited or fail altogether.
--->
     <libraries xmlns="http://www.netbeans.org/ns/cdnjs-libraries/1"/>
+    <configuration>
+        <deployment>
+            <deployOnSave>false</deployOnSave>
+        </deployment>
+    </configuration>
     <properties xmlns="http://www.netbeans.org/ns/maven-properties-data/1">
-        <!--
-Properties that influence various parts of the IDE, especially code formatting and the like. 
-You can copy and paste the single properties, into the pom.xml file and the IDE will pick them up.
-That way multiple projects can share the same settings (useful for formatting rules for example).
-Any value defined here will override the pom.xml file value but is only applicable to the current project.
--->
         <org-netbeans-modules-maven-jaxws.rest_2e_config_2e_type>ide</org-netbeans-modules-maven-jaxws.rest_2e_config_2e_type>
         <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>
-        <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>
+        <org-netbeans-modules-projectapi.jsf_2e_language>Facelets</org-netbeans-modules-projectapi.jsf_2e_language>
     </properties>
 </project-shared-configuration>

pom.xml

@@ -2,7 +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>ruhunuDemo</artifactId>
+    <artifactId>ruhunu</artifactId>
     <version>3.0.0</version>
     <packaging>war</packaging>
     <name>ruhunu</name>

src/main/java/com/divudi/bean/cashTransaction/PaymentController.java

@@ -10,14 +10,10 @@
 
 import com.divudi.bean.common.*;
 import com.divudi.entity.Payment;
-import com.divudi.entity.Institution;
 import com.divudi.facade.PaymentFacade;
 import java.io.Serializable;
-import java.util.ArrayList;
 import java.util.Date;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 import javax.ejb.EJB;
 import javax.enterprise.context.SessionScoped;
 import javax.faces.component.UIComponent;

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

@@ -10,19 +10,14 @@
 
 import com.divudi.bean.common.*;
 import com.divudi.bean.common.util.JsfUtil;
-import com.divudi.data.FeeType;
-import com.divudi.data.PaymentMethod;
-import com.divudi.data.channel.ChannelScheduleEvent;
 import com.divudi.ejb.ChannelBean;
-import com.divudi.entity.ServiceSession;
 import com.divudi.entity.Staff;
 import com.divudi.entity.channel.AppointmentActivity;
 import com.divudi.entity.channel.SessionInstance;
 import com.divudi.facade.AppointmentActivityFacade;
 import com.divudi.facade.ServiceSessionFacade;
 import com.divudi.facade.SessionInstanceFacade;
 import com.divudi.facade.StaffFacade;
-import com.divudi.java.CommonFunctions;
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Date;
@@ -37,7 +32,6 @@
 import javax.faces.convert.FacesConverter;
 import javax.inject.Inject;
 import javax.inject.Named;
-import org.primefaces.model.DefaultScheduleModel;
 import org.primefaces.model.ScheduleModel;
 
 /**

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

@@ -10,9 +10,7 @@
 
 import com.divudi.bean.common.*;
 import com.divudi.entity.BillSession;
-import com.divudi.entity.channel.SessionInstance;
 import com.divudi.facade.BillSessionFacade;
-import com.divudi.facade.SessionInstanceFacade;
 import java.io.Serializable;
 import java.util.List;
 import javax.ejb.EJB;

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

@@ -72,13 +72,11 @@
 import com.divudi.data.BillFinanceType;
 import com.divudi.data.BillTypeAtomic;
 import com.divudi.data.OptionScope;
-import com.divudi.data.SmsSentResponse;
 import com.divudi.data.dataStructure.ComponentDetail;
 import com.divudi.entity.Fee;
 import com.divudi.entity.Payment;
 import com.divudi.entity.channel.AppointmentActivity;
 import com.divudi.entity.channel.SessionInstanceActivity;
-import com.divudi.entity.lab.ItemForItem;
 import com.divudi.facade.PaymentFacade;
 import com.divudi.facade.SessionInstanceFacade;
 import com.divudi.java.CommonFunctions;