From 50e6b8813e82fcfd0b82689b763c75e5613aeac3 Mon Sep 17 00:00:00 2001
From: kanimozhi <136799210+KaNi-04@users.noreply.github.com>
Date: Mon, 17 Mar 2025 17:48:40 +0530
Subject: [PATCH] Server Date, Amount mismatch and Unique Id duplicate entry
refund, unpkg source moved to local
---
pom.xml | 4 -
.../configuration/WebSocketConfig.java | 2 +
.../controller/CounterController.java | 1 +
.../controller/UserAPIController.java | 4 +-
.../controller/UserController.java | 6 +
.../communityHall/entity/BookingCalendar.java | 26 +-
.../controller/PaymentController.java | 191 +-
.../scheduler/ERPScheduler.java | 18 +-
.../service/Impl/BookingServiceImpl.java | 55 +-
.../service/PaymentsService.java | 1 +
.../assets/css/MarkerCluster.Default.css | 68 +
.../static/files/assets/css/MarkerCluster.css | 14 +
.../static/files/assets/css/leaflet.css | 772 ++++
.../files/assets/css/swiper-bundle.min.css | 735 ++++
.../static/files/assets/css/viewer.min.css | 435 ++
.../static/files/assets/js/leaflet.js | 3618 +++++++++++++++++
.../files/assets/js/leaflet.markercluster.js | 589 +++
.../static/files/assets/js/viewer.min.js | 911 +++++
.../resources/templates/admin/adminpage.html | 2 +-
.../resources/templates/fragments/head.html | 11 +-
.../templates/fragments/loginhead.html | 5 +-
.../templates/fragments/loginscript.html | 5 +-
.../resources/templates/fragments/script.html | 13 +-
.../templates/user/communityHallList.html | 10 +-
.../resources/templates/user/dashboard.html | 76 +-
.../templates/user/hallbookingform.html | 37 +-
.../templates/user/viewhallform.html | 30 +-
.../resources/templates/user/viewhistory.html | 31 +-
28 files changed, 7511 insertions(+), 159 deletions(-)
create mode 100644 src/main/resources/static/files/assets/css/MarkerCluster.Default.css
create mode 100644 src/main/resources/static/files/assets/css/MarkerCluster.css
create mode 100644 src/main/resources/static/files/assets/css/leaflet.css
create mode 100644 src/main/resources/static/files/assets/css/swiper-bundle.min.css
create mode 100644 src/main/resources/static/files/assets/css/viewer.min.css
create mode 100644 src/main/resources/static/files/assets/js/leaflet.js
create mode 100644 src/main/resources/static/files/assets/js/leaflet.markercluster.js
create mode 100644 src/main/resources/static/files/assets/js/viewer.min.js
diff --git a/pom.xml b/pom.xml
index 7a671e7c..157dff15 100644
--- a/pom.xml
+++ b/pom.xml
@@ -97,10 +97,6 @@
runtime
true
-
- org.springframework.boot
- spring-boot-starter-websocket
-
diff --git a/src/main/java/com/gcc/communityHall/configuration/WebSocketConfig.java b/src/main/java/com/gcc/communityHall/configuration/WebSocketConfig.java
index b469346d..d1f3d63b 100644
--- a/src/main/java/com/gcc/communityHall/configuration/WebSocketConfig.java
+++ b/src/main/java/com/gcc/communityHall/configuration/WebSocketConfig.java
@@ -1,3 +1,4 @@
+/*
package com.gcc.communityHall.configuration;
import org.springframework.context.annotation.Configuration;
@@ -24,3 +25,4 @@ public class WebSocketConfig implements WebSocketMessageBrokerConfigurer {
}
}
+*/
diff --git a/src/main/java/com/gcc/communityHall/controller/CounterController.java b/src/main/java/com/gcc/communityHall/controller/CounterController.java
index a74ca161..6e6311e6 100644
--- a/src/main/java/com/gcc/communityHall/controller/CounterController.java
+++ b/src/main/java/com/gcc/communityHall/controller/CounterController.java
@@ -58,6 +58,7 @@ public class CounterController {
@GetMapping(value = {"","/","/counterbooking"})
public String viewcounter(Model model,HttpSession session) {
+ System.out.println("viewcounter");
String countername=(String) session.getAttribute("usertype");
model.addAttribute("countername", countername);
return "counter/counter-booking";
diff --git a/src/main/java/com/gcc/communityHall/controller/UserAPIController.java b/src/main/java/com/gcc/communityHall/controller/UserAPIController.java
index fcff6671..9cc89dbc 100644
--- a/src/main/java/com/gcc/communityHall/controller/UserAPIController.java
+++ b/src/main/java/com/gcc/communityHall/controller/UserAPIController.java
@@ -248,8 +248,8 @@ public class UserAPIController {
String generatedToken = "Welcome to GCC! Your OTP for GCC Community Centre is "+otp;
String urlString = "https://tmegov.onex-aura.com/api/sms?key=pfTEYN6H&to="+mobileNo+"&from=GCCCRP&body=Welcome to GCC! Your OTP for GCC Community Centre booking is "+otp+"&entityid=1401572690000011081&templateid=1407172346444550398";
System.out.println(urlString);
- System.out.print("\n urlString---: "+urlString);
- String bodyMessage = "";
+ System.out.println("\n urlString---: "+urlString);
+ String bodyMessage = ""+otp;
/*try {
RestTemplate restTemplate = new RestTemplate();
String Response = restTemplate.getForObject(urlString, String.class);
diff --git a/src/main/java/com/gcc/communityHall/controller/UserController.java b/src/main/java/com/gcc/communityHall/controller/UserController.java
index f69d5947..31d90dcc 100644
--- a/src/main/java/com/gcc/communityHall/controller/UserController.java
+++ b/src/main/java/com/gcc/communityHall/controller/UserController.java
@@ -1,6 +1,7 @@
package com.gcc.communityHall.controller;
+import java.time.LocalDate;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
@@ -84,6 +85,7 @@ public class UserController {
model.addAttribute("userName", userSession.getDispayName());
model.addAttribute("halls", halls);
model.addAttribute("hallnames", hallnames);
+ model.addAttribute("serverDate", LocalDate.now().toString()); //for server date
return "user/dashboard";
}
@@ -236,6 +238,8 @@ public class UserController {
@GetMapping("/hallbookingform")
public String viewform(Model model) {
String username = userSession.getDispayName();
+ System.out.println("serverDate....."+LocalDate.now().toString());
+ model.addAttribute("serverDate", LocalDate.now().toString()); //for server date
model.addAttribute("userName", username);
return "user/hallbookingform";
}
@@ -270,6 +274,7 @@ public class UserController {
List