Merge pull request #6454 from hmislk/Issue#6449

Issue#6449 Closes #6449

.github/last_date.txt

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

pom.xml

@@ -2,12 +2,11 @@
          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

@@ -135,6 +135,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() {
@@ -595,7 +600,6 @@ private void createPaymentSummery() {
         if (paymentsFromShiftSratToNow == null) {
             return;
         }
-
         paymentSummaryBundle = new ReportTemplateRowBundle();
         Map<String, Double> aggregatedPayments = new HashMap<>();
         Map<String, ReportTemplateRow> keyMap = new HashMap<>();
@@ -637,11 +641,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());
             }
@@ -652,6 +657,7 @@ private void createPaymentSummery() {
         if (paymentSummaryBundle != null) {
             paymentSummaryBundle.getReportTemplateRows().addAll(rows);
         }
+    }
 
     public String navigateToViewEndOfSelectedShiftStartSummaryBill(Bill startBill) {
         resetClassVariables();
@@ -679,7 +685,6 @@ public String navigateToViewStartToEndOfSelectedShiftStartSummaryBill(Bill start
         nonClosedShiftStartFundBill = startBill;
         fillPaymentsFromShiftStartToEnd(startBill, endBill, startBill.getCreater());
         return "/cashier/shift_end_summery_bill_of_selected_user_not_closed?faces-redirect=true";
-
     }
 
     public String navigateToCreateShiftEndSummaryBillByBills() {
@@ -1609,14 +1614,13 @@ public ReportTemplateRowBundle getPaymentSummaryBundle() {
 
     public void setPaymentSummaryBundle(ReportTemplateRowBundle paymentSummaryBundle) {
         this.paymentSummaryBundle = paymentSummaryBundle;
-
+    }
     public List<Bill> getShiaftStartBills() {
         return shiaftStartBills;
     }
 
     public void setShiaftStartBills(List<Bill> shiaftStartBills) {
         this.shiaftStartBills = shiaftStartBills;
-
     }
 
 }

src/main/resources/VERSION.txt

@@ -1 +1 @@
-3.0.0.20240721.1
+3.0.0.20240721.1

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>/demo</context-root>
+
+  <context-root>/sethma</context-root>
+
   <class-loader delegate="true"/>
   <jsp-config>
     <property name="keepgenerated" value="true">