Merge branch 'master' into Issue#6477

.github/counter.txt

@@ -1 +1 @@
-4
+3

.github/last_date.txt

@@ -1 +1 @@
-20240720
+20240721

README.md

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

pom.xml

@@ -2,12 +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>sethma</artifactId>
     <version>3.0.0</version>
     <packaging>war</packaging>
     <name>sethma</name>
-
     <properties>
         <endorsed.dir>${project.build.directory}/endorsed</endorsed.dir>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

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

@@ -137,6 +137,11 @@ public class FinancialTransactionController implements Serializable {
 
     private ReportTemplateRowBundle paymentSummaryBundle;
 
+    private Date fromDate;
+    private Date toDate;
+
+    private ReportTemplateRowBundle paymentSummaryBundle;
+
     // </editor-fold>  
     // <editor-fold defaultstate="collapsed" desc="Constructors">
     public FinancialTransactionController() {
@@ -890,7 +895,6 @@ private void createPaymentSummery() {
         if (paymentsFromShiftSratToNow == null) {
             return;
         }
-
         paymentSummaryBundle = new ReportTemplateRowBundle();
         Map<String, Double> aggregatedPayments = new HashMap<>();
         Map<String, ReportTemplateRow> keyMap = new HashMap<>();
@@ -932,11 +936,12 @@ private void createPaymentSummery() {
                 keyMap.putIfAbsent(keyString, row);
                 aggregatedPayments.merge(keyString, p.getPaidValue(), Double::sum);
             }
+
         }
 
         List<ReportTemplateRow> rows = aggregatedPayments.entrySet().stream().map(entry -> {
             ReportTemplateRow row = keyMap.get(entry.getKey());
-
+          
             if (row != null) {
                 row.setRowValue(entry.getValue());
             }

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

@@ -6,6 +6,7 @@
 import com.divudi.data.channel.PatientPortalController;
 import com.divudi.entity.PaymentGatewayTransaction;
 import com.divudi.facade.PaymentGatewayTransactionFacade;
+import com.divudi.bean.common.ConfigOptionApplicationController;
 import java.io.IOException;
 import java.io.Serializable;
 import java.net.URLDecoder;
@@ -40,10 +41,12 @@ public class PaymentGatewayController implements Serializable {
     SessionController sessionController;
     @Inject
     PatientPortalController patientPortalController;
+    @Inject
+    ConfigOptionApplicationController configOptionApplicationController;
 
-    private String merchantId = "SETHMAHOSLKR"; // Actual Merchant ID
-    private String apiUsername = "merchant.SETHMAHOSLKR"; // Actual API Username
-    private String apiPassword = "ae02020ce9b3d999767d17d5f36a5c4f"; // Actual API Password
+    private String merchantId;
+    private String apiUsername; 
+    private String apiPassword; 
     private String paymentStatus;
     private String sessionId;
     private String paymentUrl;
@@ -83,6 +86,9 @@ public void generateTemplateForOrderDescription() {
     }
 
     public String createCheckoutSession() {
+        merchantId = configOptionApplicationController.getLongTextValueByKey("Payment Gateway Merchant ID","TESTSETHMAHOSLKR"); // Actual Merchant ID
+        apiUsername = configOptionApplicationController.getLongTextValueByKey("Payment Gateway Username", "merchant.TESTSETHMAHOSLKR"); // Actual API Username
+        apiPassword = configOptionApplicationController.getLongTextValueByKey("Payment Gateway API Password", "49de22fcd8ade9ecb3d81790f3ad152c"); // Actual API Password
         generateTemplateForOrderDescription();
         HttpClient client = HttpClients.createDefault();
         HttpPost post = new HttpPost(gatewayUrl);

src/main/resources/VERSION.txt

@@ -1 +1 @@
-3.0.0.20240720.3
+3.0.0.20240721.3