diff --git a/.classpath b/.classpath index 2265957c..c6d54598 100644 --- a/.classpath +++ b/.classpath @@ -19,13 +19,6 @@ - - - - - - - @@ -36,19 +29,25 @@ - + - + + - - + - + + + + + + + diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..b83d2226 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +/target/ diff --git a/.mvn/wrapper/MavenWrapperDownloader.java b/.mvn/wrapper/MavenWrapperDownloader.java new file mode 100644 index 00000000..b901097f --- /dev/null +++ b/.mvn/wrapper/MavenWrapperDownloader.java @@ -0,0 +1,117 @@ +/* + * Copyright 2007-present the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +import java.net.*; +import java.io.*; +import java.nio.channels.*; +import java.util.Properties; + +public class MavenWrapperDownloader { + + private static final String WRAPPER_VERSION = "0.5.6"; + /** + * Default URL to download the maven-wrapper.jar from, if no 'downloadUrl' is provided. + */ + private static final String DEFAULT_DOWNLOAD_URL = "https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/" + + WRAPPER_VERSION + "/maven-wrapper-" + WRAPPER_VERSION + ".jar"; + + /** + * Path to the maven-wrapper.properties file, which might contain a downloadUrl property to + * use instead of the default one. + */ + private static final String MAVEN_WRAPPER_PROPERTIES_PATH = + ".mvn/wrapper/maven-wrapper.properties"; + + /** + * Path where the maven-wrapper.jar will be saved to. + */ + private static final String MAVEN_WRAPPER_JAR_PATH = + ".mvn/wrapper/maven-wrapper.jar"; + + /** + * Name of the property which should be used to override the default download url for the wrapper. + */ + private static final String PROPERTY_NAME_WRAPPER_URL = "wrapperUrl"; + + public static void main(String args[]) { + System.out.println("- Downloader started"); + File baseDirectory = new File(args[0]); + System.out.println("- Using base directory: " + baseDirectory.getAbsolutePath()); + + // If the maven-wrapper.properties exists, read it and check if it contains a custom + // wrapperUrl parameter. + File mavenWrapperPropertyFile = new File(baseDirectory, MAVEN_WRAPPER_PROPERTIES_PATH); + String url = DEFAULT_DOWNLOAD_URL; + if(mavenWrapperPropertyFile.exists()) { + FileInputStream mavenWrapperPropertyFileInputStream = null; + try { + mavenWrapperPropertyFileInputStream = new FileInputStream(mavenWrapperPropertyFile); + Properties mavenWrapperProperties = new Properties(); + mavenWrapperProperties.load(mavenWrapperPropertyFileInputStream); + url = mavenWrapperProperties.getProperty(PROPERTY_NAME_WRAPPER_URL, url); + } catch (IOException e) { + System.out.println("- ERROR loading '" + MAVEN_WRAPPER_PROPERTIES_PATH + "'"); + } finally { + try { + if(mavenWrapperPropertyFileInputStream != null) { + mavenWrapperPropertyFileInputStream.close(); + } + } catch (IOException e) { + // Ignore ... + } + } + } + System.out.println("- Downloading from: " + url); + + File outputFile = new File(baseDirectory.getAbsolutePath(), MAVEN_WRAPPER_JAR_PATH); + if(!outputFile.getParentFile().exists()) { + if(!outputFile.getParentFile().mkdirs()) { + System.out.println( + "- ERROR creating output directory '" + outputFile.getParentFile().getAbsolutePath() + "'"); + } + } + System.out.println("- Downloading to: " + outputFile.getAbsolutePath()); + try { + downloadFileFromURL(url, outputFile); + System.out.println("Done"); + System.exit(0); + } catch (Throwable e) { + System.out.println("- Error downloading"); + e.printStackTrace(); + System.exit(1); + } + } + + private static void downloadFileFromURL(String urlString, File destination) throws Exception { + if (System.getenv("MVNW_USERNAME") != null && System.getenv("MVNW_PASSWORD") != null) { + String username = System.getenv("MVNW_USERNAME"); + char[] password = System.getenv("MVNW_PASSWORD").toCharArray(); + Authenticator.setDefault(new Authenticator() { + @Override + protected PasswordAuthentication getPasswordAuthentication() { + return new PasswordAuthentication(username, password); + } + }); + } + URL website = new URL(urlString); + ReadableByteChannel rbc; + rbc = Channels.newChannel(website.openStream()); + FileOutputStream fos = new FileOutputStream(destination); + fos.getChannel().transferFrom(rbc, 0, Long.MAX_VALUE); + fos.close(); + rbc.close(); + } + +} diff --git a/.mvn/wrapper/maven-wrapper.jar b/.mvn/wrapper/maven-wrapper.jar index cb28b0e3..2cc7d4a5 100644 Binary files a/.mvn/wrapper/maven-wrapper.jar and b/.mvn/wrapper/maven-wrapper.jar differ diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties index 5f0536eb..642d572c 100644 --- a/.mvn/wrapper/maven-wrapper.properties +++ b/.mvn/wrapper/maven-wrapper.properties @@ -1,2 +1,2 @@ -distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.5/apache-maven-3.9.5-bin.zip -wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.3/apache-maven-3.6.3-bin.zip +wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar diff --git a/.project b/.project new file mode 100644 index 00000000..9c043704 --- /dev/null +++ b/.project @@ -0,0 +1,34 @@ + + + communityHall + + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.m2e.core.maven2Builder + + + + + + org.eclipse.jdt.core.javanature + org.eclipse.m2e.core.maven2Nature + + + + 1757581688263 + + 30 + + org.eclipse.core.resources.regexFilterMatcher + node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__ + + + + diff --git a/communityHallDocuments/Marriage/565_Work Module SCREEN -5.jpg b/communityHallDocuments/Marriage/565_Work Module SCREEN -5.jpg new file mode 100644 index 00000000..6617b05f Binary files /dev/null and b/communityHallDocuments/Marriage/565_Work Module SCREEN -5.jpg differ diff --git a/mvnw b/mvnw index 66df2854..41c0f0c2 100755 --- a/mvnw +++ b/mvnw @@ -8,7 +8,7 @@ # "License"); you may not use this file except in compliance # with the License. You may obtain a copy of the License at # -# https://www.apache.org/licenses/LICENSE-2.0 +# http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, # software distributed under the License is distributed on an @@ -19,7 +19,7 @@ # ---------------------------------------------------------------------------- # ---------------------------------------------------------------------------- -# Apache Maven Wrapper startup batch script, version 3.2.0 +# Maven Start Up Batch script # # Required ENV vars: # ------------------ @@ -27,6 +27,7 @@ # # Optional ENV vars # ----------------- +# M2_HOME - location of maven2's installed home dir # MAVEN_OPTS - parameters passed to the Java VM when running Maven # e.g. to debug Maven itself, use # set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 @@ -35,10 +36,6 @@ if [ -z "$MAVEN_SKIP_RC" ] ; then - if [ -f /usr/local/etc/mavenrc ] ; then - . /usr/local/etc/mavenrc - fi - if [ -f /etc/mavenrc ] ; then . /etc/mavenrc fi @@ -53,7 +50,7 @@ fi cygwin=false; darwin=false; mingw=false -case "$(uname)" in +case "`uname`" in CYGWIN*) cygwin=true ;; MINGW*) mingw=true;; Darwin*) darwin=true @@ -61,9 +58,9 @@ case "$(uname)" in # See https://developer.apple.com/library/mac/qa/qa1170/_index.html if [ -z "$JAVA_HOME" ]; then if [ -x "/usr/libexec/java_home" ]; then - JAVA_HOME="$(/usr/libexec/java_home)"; export JAVA_HOME + export JAVA_HOME="`/usr/libexec/java_home`" else - JAVA_HOME="/Library/Java/Home"; export JAVA_HOME + export JAVA_HOME="/Library/Java/Home" fi fi ;; @@ -71,38 +68,68 @@ esac if [ -z "$JAVA_HOME" ] ; then if [ -r /etc/gentoo-release ] ; then - JAVA_HOME=$(java-config --jre-home) + JAVA_HOME=`java-config --jre-home` fi fi +if [ -z "$M2_HOME" ] ; then + ## resolve links - $0 may be a link to maven's home + PRG="$0" + + # need this for relative symlinks + while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG="`dirname "$PRG"`/$link" + fi + done + + saveddir=`pwd` + + M2_HOME=`dirname "$PRG"`/.. + + # make it fully qualified + M2_HOME=`cd "$M2_HOME" && pwd` + + cd "$saveddir" + # echo Using m2 at $M2_HOME +fi + # For Cygwin, ensure paths are in UNIX format before anything is touched if $cygwin ; then + [ -n "$M2_HOME" ] && + M2_HOME=`cygpath --unix "$M2_HOME"` [ -n "$JAVA_HOME" ] && - JAVA_HOME=$(cygpath --unix "$JAVA_HOME") + JAVA_HOME=`cygpath --unix "$JAVA_HOME"` [ -n "$CLASSPATH" ] && - CLASSPATH=$(cygpath --path --unix "$CLASSPATH") + CLASSPATH=`cygpath --path --unix "$CLASSPATH"` fi # For Mingw, ensure paths are in UNIX format before anything is touched if $mingw ; then - [ -n "$JAVA_HOME" ] && [ -d "$JAVA_HOME" ] && - JAVA_HOME="$(cd "$JAVA_HOME" || (echo "cannot cd into $JAVA_HOME."; exit 1); pwd)" + [ -n "$M2_HOME" ] && + M2_HOME="`(cd "$M2_HOME"; pwd)`" + [ -n "$JAVA_HOME" ] && + JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`" fi if [ -z "$JAVA_HOME" ]; then - javaExecutable="$(which javac)" - if [ -n "$javaExecutable" ] && ! [ "$(expr "\"$javaExecutable\"" : '\([^ ]*\)')" = "no" ]; then + javaExecutable="`which javac`" + if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then # readlink(1) is not available as standard on Solaris 10. - readLink=$(which readlink) - if [ ! "$(expr "$readLink" : '\([^ ]*\)')" = "no" ]; then + readLink=`which readlink` + if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then if $darwin ; then - javaHome="$(dirname "\"$javaExecutable\"")" - javaExecutable="$(cd "\"$javaHome\"" && pwd -P)/javac" + javaHome="`dirname \"$javaExecutable\"`" + javaExecutable="`cd \"$javaHome\" && pwd -P`/javac" else - javaExecutable="$(readlink -f "\"$javaExecutable\"")" + javaExecutable="`readlink -f \"$javaExecutable\"`" fi - javaHome="$(dirname "\"$javaExecutable\"")" - javaHome=$(expr "$javaHome" : '\(.*\)/bin') + javaHome="`dirname \"$javaExecutable\"`" + javaHome=`expr "$javaHome" : '\(.*\)/bin'` JAVA_HOME="$javaHome" export JAVA_HOME fi @@ -118,7 +145,7 @@ if [ -z "$JAVACMD" ] ; then JAVACMD="$JAVA_HOME/bin/java" fi else - JAVACMD="$(\unset -f command 2>/dev/null; \command -v java)" + JAVACMD="`which java`" fi fi @@ -132,9 +159,12 @@ if [ -z "$JAVA_HOME" ] ; then echo "Warning: JAVA_HOME environment variable is not set." fi +CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher + # traverses directory structure from process work directory to filesystem root # first directory with .mvn subdirectory is considered project base directory find_maven_basedir() { + if [ -z "$1" ] then echo "Path not specified to find_maven_basedir" @@ -150,99 +180,96 @@ find_maven_basedir() { fi # workaround for JBEAP-8937 (on Solaris 10/Sparc) if [ -d "${wdir}" ]; then - wdir=$(cd "$wdir/.." || exit 1; pwd) + wdir=`cd "$wdir/.."; pwd` fi # end of workaround done - printf '%s' "$(cd "$basedir" || exit 1; pwd)" + echo "${basedir}" } # concatenates all lines of a file concat_lines() { if [ -f "$1" ]; then - # Remove \r in case we run on Windows within Git Bash - # and check out the repository with auto CRLF management - # enabled. Otherwise, we may read lines that are delimited with - # \r\n and produce $'-Xarg\r' rather than -Xarg due to word - # splitting rules. - tr -s '\r\n' ' ' < "$1" - fi -} - -log() { - if [ "$MVNW_VERBOSE" = true ]; then - printf '%s\n' "$1" + echo "$(tr -s '\n' ' ' < "$1")" fi } -BASE_DIR=$(find_maven_basedir "$(dirname "$0")") +BASE_DIR=`find_maven_basedir "$(pwd)"` if [ -z "$BASE_DIR" ]; then exit 1; fi -MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"}; export MAVEN_PROJECTBASEDIR -log "$MAVEN_PROJECTBASEDIR" - ########################################################################################## # Extension to allow automatically downloading the maven-wrapper.jar from Maven-central # This allows using the maven wrapper in projects that prohibit checking in binary data. ########################################################################################## -wrapperJarPath="$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" -if [ -r "$wrapperJarPath" ]; then - log "Found $wrapperJarPath" +if [ -r "$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" ]; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found .mvn/wrapper/maven-wrapper.jar" + fi else - log "Couldn't find $wrapperJarPath, downloading it ..." - + if [ "$MVNW_VERBOSE" = true ]; then + echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..." + fi if [ -n "$MVNW_REPOURL" ]; then - wrapperUrl="$MVNW_REPOURL/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar" + jarUrl="$MVNW_REPOURL/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar" else - wrapperUrl="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar" + jarUrl="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar" fi - while IFS="=" read -r key value; do - # Remove '\r' from value to allow usage on windows as IFS does not consider '\r' as a separator ( considers space, tab, new line ('\n'), and custom '=' ) - safeValue=$(echo "$value" | tr -d '\r') - case "$key" in (wrapperUrl) wrapperUrl="$safeValue"; break ;; + while IFS="=" read key value; do + case "$key" in (wrapperUrl) jarUrl="$value"; break ;; esac - done < "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.properties" - log "Downloading from: $wrapperUrl" - + done < "$BASE_DIR/.mvn/wrapper/maven-wrapper.properties" + if [ "$MVNW_VERBOSE" = true ]; then + echo "Downloading from: $jarUrl" + fi + wrapperJarPath="$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" if $cygwin; then - wrapperJarPath=$(cygpath --path --windows "$wrapperJarPath") + wrapperJarPath=`cygpath --path --windows "$wrapperJarPath"` fi if command -v wget > /dev/null; then - log "Found wget ... using wget" - [ "$MVNW_VERBOSE" = true ] && QUIET="" || QUIET="--quiet" + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found wget ... using wget" + fi if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then - wget $QUIET "$wrapperUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath" + wget "$jarUrl" -O "$wrapperJarPath" else - wget $QUIET --http-user="$MVNW_USERNAME" --http-password="$MVNW_PASSWORD" "$wrapperUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath" + wget --http-user=$MVNW_USERNAME --http-password=$MVNW_PASSWORD "$jarUrl" -O "$wrapperJarPath" fi elif command -v curl > /dev/null; then - log "Found curl ... using curl" - [ "$MVNW_VERBOSE" = true ] && QUIET="" || QUIET="--silent" + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found curl ... using curl" + fi if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then - curl $QUIET -o "$wrapperJarPath" "$wrapperUrl" -f -L || rm -f "$wrapperJarPath" + curl -o "$wrapperJarPath" "$jarUrl" -f else - curl $QUIET --user "$MVNW_USERNAME:$MVNW_PASSWORD" -o "$wrapperJarPath" "$wrapperUrl" -f -L || rm -f "$wrapperJarPath" + curl --user $MVNW_USERNAME:$MVNW_PASSWORD -o "$wrapperJarPath" "$jarUrl" -f fi + else - log "Falling back to using Java to download" - javaSource="$MAVEN_PROJECTBASEDIR/.mvn/wrapper/MavenWrapperDownloader.java" - javaClass="$MAVEN_PROJECTBASEDIR/.mvn/wrapper/MavenWrapperDownloader.class" + if [ "$MVNW_VERBOSE" = true ]; then + echo "Falling back to using Java to download" + fi + javaClass="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.java" # For Cygwin, switch paths to Windows format before running javac if $cygwin; then - javaSource=$(cygpath --path --windows "$javaSource") - javaClass=$(cygpath --path --windows "$javaClass") + javaClass=`cygpath --path --windows "$javaClass"` fi - if [ -e "$javaSource" ]; then - if [ ! -e "$javaClass" ]; then - log " - Compiling MavenWrapperDownloader.java ..." - ("$JAVA_HOME/bin/javac" "$javaSource") + if [ -e "$javaClass" ]; then + if [ ! -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then + if [ "$MVNW_VERBOSE" = true ]; then + echo " - Compiling MavenWrapperDownloader.java ..." + fi + # Compiling the Java class + ("$JAVA_HOME/bin/javac" "$javaClass") fi - if [ -e "$javaClass" ]; then - log " - Running MavenWrapperDownloader.java ..." - ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$wrapperUrl" "$wrapperJarPath") || rm -f "$wrapperJarPath" + if [ -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then + # Running the downloader + if [ "$MVNW_VERBOSE" = true ]; then + echo " - Running MavenWrapperDownloader.java ..." + fi + ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$MAVEN_PROJECTBASEDIR") fi fi fi @@ -251,58 +278,33 @@ fi # End of extension ########################################################################################## -# If specified, validate the SHA-256 sum of the Maven wrapper jar file -wrapperSha256Sum="" -while IFS="=" read -r key value; do - case "$key" in (wrapperSha256Sum) wrapperSha256Sum=$value; break ;; - esac -done < "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.properties" -if [ -n "$wrapperSha256Sum" ]; then - wrapperSha256Result=false - if command -v sha256sum > /dev/null; then - if echo "$wrapperSha256Sum $wrapperJarPath" | sha256sum -c > /dev/null 2>&1; then - wrapperSha256Result=true - fi - elif command -v shasum > /dev/null; then - if echo "$wrapperSha256Sum $wrapperJarPath" | shasum -a 256 -c > /dev/null 2>&1; then - wrapperSha256Result=true - fi - else - echo "Checksum validation was requested but neither 'sha256sum' or 'shasum' are available." - echo "Please install either command, or disable validation by removing 'wrapperSha256Sum' from your maven-wrapper.properties." - exit 1 - fi - if [ $wrapperSha256Result = false ]; then - echo "Error: Failed to validate Maven wrapper SHA-256, your Maven wrapper might be compromised." >&2 - echo "Investigate or delete $wrapperJarPath to attempt a clean download." >&2 - echo "If you updated your Maven version, you need to update the specified wrapperSha256Sum property." >&2 - exit 1 - fi +export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"} +if [ "$MVNW_VERBOSE" = true ]; then + echo $MAVEN_PROJECTBASEDIR fi - MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS" # For Cygwin, switch paths to Windows format before running java if $cygwin; then + [ -n "$M2_HOME" ] && + M2_HOME=`cygpath --path --windows "$M2_HOME"` [ -n "$JAVA_HOME" ] && - JAVA_HOME=$(cygpath --path --windows "$JAVA_HOME") + JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"` [ -n "$CLASSPATH" ] && - CLASSPATH=$(cygpath --path --windows "$CLASSPATH") + CLASSPATH=`cygpath --path --windows "$CLASSPATH"` [ -n "$MAVEN_PROJECTBASEDIR" ] && - MAVEN_PROJECTBASEDIR=$(cygpath --path --windows "$MAVEN_PROJECTBASEDIR") + MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"` fi # Provide a "standardized" way to retrieve the CLI args that will # work with both Windows and non-Windows executions. -MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $*" +MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $@" export MAVEN_CMD_LINE_ARGS WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain -# shellcheck disable=SC2086 # safe args exec "$JAVACMD" \ $MAVEN_OPTS \ - $MAVEN_DEBUG_OPTS \ -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \ - "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \ + "-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \ ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@" diff --git a/mvnw.cmd b/mvnw.cmd index 95ba6f54..86115719 100644 --- a/mvnw.cmd +++ b/mvnw.cmd @@ -7,7 +7,7 @@ @REM "License"); you may not use this file except in compliance @REM with the License. You may obtain a copy of the License at @REM -@REM https://www.apache.org/licenses/LICENSE-2.0 +@REM http://www.apache.org/licenses/LICENSE-2.0 @REM @REM Unless required by applicable law or agreed to in writing, @REM software distributed under the License is distributed on an @@ -18,12 +18,13 @@ @REM ---------------------------------------------------------------------------- @REM ---------------------------------------------------------------------------- -@REM Apache Maven Wrapper startup batch script, version 3.2.0 +@REM Maven Start Up Batch script @REM @REM Required ENV vars: @REM JAVA_HOME - location of a JDK home dir @REM @REM Optional ENV vars +@REM M2_HOME - location of maven2's installed home dir @REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands @REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a keystroke before ending @REM MAVEN_OPTS - parameters passed to the Java VM when running Maven @@ -45,8 +46,8 @@ if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%") @REM Execute a user defined script before this one if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre @REM check for pre script, once with legacy .bat ending and once with .cmd ending -if exist "%USERPROFILE%\mavenrc_pre.bat" call "%USERPROFILE%\mavenrc_pre.bat" %* -if exist "%USERPROFILE%\mavenrc_pre.cmd" call "%USERPROFILE%\mavenrc_pre.cmd" %* +if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat" +if exist "%HOME%\mavenrc_pre.cmd" call "%HOME%\mavenrc_pre.cmd" :skipRcPre @setlocal @@ -119,10 +120,10 @@ SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe" set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar" set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain -set WRAPPER_URL="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar" +set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar" -FOR /F "usebackq tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO ( - IF "%%A"=="wrapperUrl" SET WRAPPER_URL=%%B +FOR /F "tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO ( + IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B ) @REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central @@ -133,11 +134,11 @@ if exist %WRAPPER_JAR% ( ) ) else ( if not "%MVNW_REPOURL%" == "" ( - SET WRAPPER_URL="%MVNW_REPOURL%/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar" + SET DOWNLOAD_URL="%MVNW_REPOURL%/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar" ) if "%MVNW_VERBOSE%" == "true" ( echo Couldn't find %WRAPPER_JAR%, downloading it ... - echo Downloading from: %WRAPPER_URL% + echo Downloading from: %DOWNLOAD_URL% ) powershell -Command "&{"^ @@ -145,7 +146,7 @@ if exist %WRAPPER_JAR% ( "if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^ "$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^ "}"^ - "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%WRAPPER_URL%', '%WRAPPER_JAR%')"^ + "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%DOWNLOAD_URL%', '%WRAPPER_JAR%')"^ "}" if "%MVNW_VERBOSE%" == "true" ( echo Finished downloading %WRAPPER_JAR% @@ -153,35 +154,11 @@ if exist %WRAPPER_JAR% ( ) @REM End of extension -@REM If specified, validate the SHA-256 sum of the Maven wrapper jar file -SET WRAPPER_SHA_256_SUM="" -FOR /F "usebackq tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO ( - IF "%%A"=="wrapperSha256Sum" SET WRAPPER_SHA_256_SUM=%%B -) -IF NOT %WRAPPER_SHA_256_SUM%=="" ( - powershell -Command "&{"^ - "$hash = (Get-FileHash \"%WRAPPER_JAR%\" -Algorithm SHA256).Hash.ToLower();"^ - "If('%WRAPPER_SHA_256_SUM%' -ne $hash){"^ - " Write-Output 'Error: Failed to validate Maven wrapper SHA-256, your Maven wrapper might be compromised.';"^ - " Write-Output 'Investigate or delete %WRAPPER_JAR% to attempt a clean download.';"^ - " Write-Output 'If you updated your Maven version, you need to update the specified wrapperSha256Sum property.';"^ - " exit 1;"^ - "}"^ - "}" - if ERRORLEVEL 1 goto error -) - @REM Provide a "standardized" way to retrieve the CLI args that will @REM work with both Windows and non-Windows executions. set MAVEN_CMD_LINE_ARGS=%* -%MAVEN_JAVA_EXE% ^ - %JVM_CONFIG_MAVEN_PROPS% ^ - %MAVEN_OPTS% ^ - %MAVEN_DEBUG_OPTS% ^ - -classpath %WRAPPER_JAR% ^ - "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" ^ - %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %* +%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %* if ERRORLEVEL 1 goto error goto end @@ -191,15 +168,15 @@ set ERROR_CODE=1 :end @endlocal & set ERROR_CODE=%ERROR_CODE% -if not "%MAVEN_SKIP_RC%"=="" goto skipRcPost +if not "%MAVEN_SKIP_RC%" == "" goto skipRcPost @REM check for post script, once with legacy .bat ending and once with .cmd ending -if exist "%USERPROFILE%\mavenrc_post.bat" call "%USERPROFILE%\mavenrc_post.bat" -if exist "%USERPROFILE%\mavenrc_post.cmd" call "%USERPROFILE%\mavenrc_post.cmd" +if exist "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat" +if exist "%HOME%\mavenrc_post.cmd" call "%HOME%\mavenrc_post.cmd" :skipRcPost @REM pause the script if MAVEN_BATCH_PAUSE is set to 'on' -if "%MAVEN_BATCH_PAUSE%"=="on" pause +if "%MAVEN_BATCH_PAUSE%" == "on" pause -if "%MAVEN_TERMINATE_CMD%"=="on" exit %ERROR_CODE% +if "%MAVEN_TERMINATE_CMD%" == "on" exit %ERROR_CODE% -cmd /C exit /B %ERROR_CODE% +exit /B %ERROR_CODE% diff --git a/src/main/resources/application-dev.properties b/src/main/resources/application-dev.properties index c70f2810..27a9a421 100644 --- a/src/main/resources/application-dev.properties +++ b/src/main/resources/application-dev.properties @@ -1,9 +1,9 @@ spring.application.name=communityHall -spring.datasource.url=jdbc:mysql://127.0.0.1:3306/communityhall_live_29072025_0630PM +spring.datasource.url=jdbc:mysql://127.0.0.1:3306/testcommunityhall #spring.datasource.url=jdbc:mysql://127.0.0.1:3306/communityhall_13032025 // testcommunityhall spring.datasource.username=root -spring.datasource.password=12345678 +spring.datasource.password=root spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver spring.jpa.hibernate.ddl-auto=update diff --git a/src/main/resources/paymentConfig.properties b/src/main/resources/paymentConfig.properties index c066969b..a1a4e5b1 100644 --- a/src/main/resources/paymentConfig.properties +++ b/src/main/resources/paymentConfig.properties @@ -6,7 +6,7 @@ #payment.worldline.transactionSuccessCode=0300 #payment.worldline.refundSuccessCode=0400 -payment.worldline.merchantId=L1037717 +payment.worldline.merchantId=T1037717 payment.worldline.encryptionKey=6207149300MFLGNY payment.worldline.encryptionIV=3422107798TKQCNG payment.worldline.schemeCode=FIRST diff --git a/target/classes/.DS_Store b/target/classes/.DS_Store deleted file mode 100644 index 346bc4fc..00000000 Binary files a/target/classes/.DS_Store and /dev/null differ diff --git a/target/classes/application-dev.properties b/target/classes/application-dev.properties index c70f2810..27a9a421 100644 --- a/target/classes/application-dev.properties +++ b/target/classes/application-dev.properties @@ -1,9 +1,9 @@ spring.application.name=communityHall -spring.datasource.url=jdbc:mysql://127.0.0.1:3306/communityhall_live_29072025_0630PM +spring.datasource.url=jdbc:mysql://127.0.0.1:3306/testcommunityhall #spring.datasource.url=jdbc:mysql://127.0.0.1:3306/communityhall_13032025 // testcommunityhall spring.datasource.username=root -spring.datasource.password=12345678 +spring.datasource.password=root spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver spring.jpa.hibernate.ddl-auto=update diff --git a/target/classes/com/.DS_Store b/target/classes/com/.DS_Store deleted file mode 100644 index edbe4236..00000000 Binary files a/target/classes/com/.DS_Store and /dev/null differ diff --git a/target/classes/com/gcc/.DS_Store b/target/classes/com/gcc/.DS_Store deleted file mode 100644 index da986705..00000000 Binary files a/target/classes/com/gcc/.DS_Store and /dev/null differ diff --git a/target/classes/com/gcc/communityHall/.DS_Store b/target/classes/com/gcc/communityHall/.DS_Store deleted file mode 100644 index 3f3b259e..00000000 Binary files a/target/classes/com/gcc/communityHall/.DS_Store and /dev/null differ diff --git a/target/classes/com/gcc/communityHall/AuditAwareImpl.class b/target/classes/com/gcc/communityHall/AuditAwareImpl.class index d805bbb2..26a0d1e9 100644 Binary files a/target/classes/com/gcc/communityHall/AuditAwareImpl.class and b/target/classes/com/gcc/communityHall/AuditAwareImpl.class differ diff --git a/target/classes/com/gcc/communityHall/CommunityHallApplication.class b/target/classes/com/gcc/communityHall/CommunityHallApplication.class index 6bb93739..39bbf5a4 100644 Binary files a/target/classes/com/gcc/communityHall/CommunityHallApplication.class and b/target/classes/com/gcc/communityHall/CommunityHallApplication.class differ diff --git a/target/classes/com/gcc/communityHall/component/JwtUtil.class b/target/classes/com/gcc/communityHall/component/JwtUtil.class index 7e122761..328d6be0 100644 Binary files a/target/classes/com/gcc/communityHall/component/JwtUtil.class and b/target/classes/com/gcc/communityHall/component/JwtUtil.class differ diff --git a/target/classes/com/gcc/communityHall/component/UserSessionInterceptor.class b/target/classes/com/gcc/communityHall/component/UserSessionInterceptor.class index 2a73f519..1844ad92 100644 Binary files a/target/classes/com/gcc/communityHall/component/UserSessionInterceptor.class and b/target/classes/com/gcc/communityHall/component/UserSessionInterceptor.class differ diff --git a/target/classes/com/gcc/communityHall/configuration/QRCodeGenerator.class b/target/classes/com/gcc/communityHall/configuration/QRCodeGenerator.class index 044f9a28..2a4a6be6 100644 Binary files a/target/classes/com/gcc/communityHall/configuration/QRCodeGenerator.class and b/target/classes/com/gcc/communityHall/configuration/QRCodeGenerator.class differ diff --git a/target/classes/com/gcc/communityHall/configuration/WebConfig.class b/target/classes/com/gcc/communityHall/configuration/WebConfig.class index e0c7f40e..1dc8c4db 100644 Binary files a/target/classes/com/gcc/communityHall/configuration/WebConfig.class and b/target/classes/com/gcc/communityHall/configuration/WebConfig.class differ diff --git a/target/classes/com/gcc/communityHall/controller/AdminAPIController.class b/target/classes/com/gcc/communityHall/controller/AdminAPIController.class index eb8a68e0..25ce54c5 100644 Binary files a/target/classes/com/gcc/communityHall/controller/AdminAPIController.class and b/target/classes/com/gcc/communityHall/controller/AdminAPIController.class differ diff --git a/target/classes/com/gcc/communityHall/controller/Admincontroller.class b/target/classes/com/gcc/communityHall/controller/Admincontroller.class index a817cd65..f93c2c24 100644 Binary files a/target/classes/com/gcc/communityHall/controller/Admincontroller.class and b/target/classes/com/gcc/communityHall/controller/Admincontroller.class differ diff --git a/target/classes/com/gcc/communityHall/controller/CareTakerAPIController.class b/target/classes/com/gcc/communityHall/controller/CareTakerAPIController.class index 1348a50f..96367782 100644 Binary files a/target/classes/com/gcc/communityHall/controller/CareTakerAPIController.class and b/target/classes/com/gcc/communityHall/controller/CareTakerAPIController.class differ diff --git a/target/classes/com/gcc/communityHall/controller/CareTakerController.class b/target/classes/com/gcc/communityHall/controller/CareTakerController.class index d83a1bad..00dfa2da 100644 Binary files a/target/classes/com/gcc/communityHall/controller/CareTakerController.class and b/target/classes/com/gcc/communityHall/controller/CareTakerController.class differ diff --git a/target/classes/com/gcc/communityHall/controller/CounterController.class b/target/classes/com/gcc/communityHall/controller/CounterController.class index 5b6b40c7..f61e50b3 100644 Binary files a/target/classes/com/gcc/communityHall/controller/CounterController.class and b/target/classes/com/gcc/communityHall/controller/CounterController.class differ diff --git a/target/classes/com/gcc/communityHall/controller/DepartmentController.class b/target/classes/com/gcc/communityHall/controller/DepartmentController.class index c73eda5e..c0324410 100644 Binary files a/target/classes/com/gcc/communityHall/controller/DepartmentController.class and b/target/classes/com/gcc/communityHall/controller/DepartmentController.class differ diff --git a/target/classes/com/gcc/communityHall/controller/HeadquartersController.class b/target/classes/com/gcc/communityHall/controller/HeadquartersController.class index 2aad0332..93a2193b 100644 Binary files a/target/classes/com/gcc/communityHall/controller/HeadquartersController.class and b/target/classes/com/gcc/communityHall/controller/HeadquartersController.class differ diff --git a/target/classes/com/gcc/communityHall/controller/Maincontroller.class b/target/classes/com/gcc/communityHall/controller/Maincontroller.class index 2347e0f1..6775bbf8 100644 Binary files a/target/classes/com/gcc/communityHall/controller/Maincontroller.class and b/target/classes/com/gcc/communityHall/controller/Maincontroller.class differ diff --git a/target/classes/com/gcc/communityHall/controller/OfficerAPIController.class b/target/classes/com/gcc/communityHall/controller/OfficerAPIController.class index dacc5f08..985049ec 100644 Binary files a/target/classes/com/gcc/communityHall/controller/OfficerAPIController.class and b/target/classes/com/gcc/communityHall/controller/OfficerAPIController.class differ diff --git a/target/classes/com/gcc/communityHall/controller/OfficerController.class b/target/classes/com/gcc/communityHall/controller/OfficerController.class index fe7297ec..746e4acb 100644 Binary files a/target/classes/com/gcc/communityHall/controller/OfficerController.class and b/target/classes/com/gcc/communityHall/controller/OfficerController.class differ diff --git a/target/classes/com/gcc/communityHall/controller/UserAPIController.class b/target/classes/com/gcc/communityHall/controller/UserAPIController.class index 86ec915b..c7485207 100644 Binary files a/target/classes/com/gcc/communityHall/controller/UserAPIController.class and b/target/classes/com/gcc/communityHall/controller/UserAPIController.class differ diff --git a/target/classes/com/gcc/communityHall/controller/UserController.class b/target/classes/com/gcc/communityHall/controller/UserController.class index 46fd85e8..79ab3b8b 100644 Binary files a/target/classes/com/gcc/communityHall/controller/UserController.class and b/target/classes/com/gcc/communityHall/controller/UserController.class differ diff --git a/target/classes/com/gcc/communityHall/controller/apicontroller.class b/target/classes/com/gcc/communityHall/controller/apicontroller.class index 52322ca7..23e0982d 100644 Binary files a/target/classes/com/gcc/communityHall/controller/apicontroller.class and b/target/classes/com/gcc/communityHall/controller/apicontroller.class differ diff --git a/target/classes/com/gcc/communityHall/dto/BookingDetailsDTO.class b/target/classes/com/gcc/communityHall/dto/BookingDetailsDTO.class index e1d72585..b974363a 100644 Binary files a/target/classes/com/gcc/communityHall/dto/BookingDetailsDTO.class and b/target/classes/com/gcc/communityHall/dto/BookingDetailsDTO.class differ diff --git a/target/classes/com/gcc/communityHall/dto/BookingResponseDTO.class b/target/classes/com/gcc/communityHall/dto/BookingResponseDTO.class index ad89daa7..643094d1 100644 Binary files a/target/classes/com/gcc/communityHall/dto/BookingResponseDTO.class and b/target/classes/com/gcc/communityHall/dto/BookingResponseDTO.class differ diff --git a/target/classes/com/gcc/communityHall/dto/DamageDTO.class b/target/classes/com/gcc/communityHall/dto/DamageDTO.class index 4562a953..fa38f782 100644 Binary files a/target/classes/com/gcc/communityHall/dto/DamageDTO.class and b/target/classes/com/gcc/communityHall/dto/DamageDTO.class differ diff --git a/target/classes/com/gcc/communityHall/dto/EmployeeDetails.class b/target/classes/com/gcc/communityHall/dto/EmployeeDetails.class index 41ef50a4..ddfb32e7 100644 Binary files a/target/classes/com/gcc/communityHall/dto/EmployeeDetails.class and b/target/classes/com/gcc/communityHall/dto/EmployeeDetails.class differ diff --git a/target/classes/com/gcc/communityHall/dto/EmployeeDetailsResponse.class b/target/classes/com/gcc/communityHall/dto/EmployeeDetailsResponse.class index eeaec028..d76c967e 100644 Binary files a/target/classes/com/gcc/communityHall/dto/EmployeeDetailsResponse.class and b/target/classes/com/gcc/communityHall/dto/EmployeeDetailsResponse.class differ diff --git a/target/classes/com/gcc/communityHall/dto/ErrorResponseDto.class b/target/classes/com/gcc/communityHall/dto/ErrorResponseDto.class index bd6189d6..978973c4 100644 Binary files a/target/classes/com/gcc/communityHall/dto/ErrorResponseDto.class and b/target/classes/com/gcc/communityHall/dto/ErrorResponseDto.class differ diff --git a/target/classes/com/gcc/communityHall/dto/FamilyPensionerDetails.class b/target/classes/com/gcc/communityHall/dto/FamilyPensionerDetails.class index 1f1818c9..adb4b652 100644 Binary files a/target/classes/com/gcc/communityHall/dto/FamilyPensionerDetails.class and b/target/classes/com/gcc/communityHall/dto/FamilyPensionerDetails.class differ diff --git a/target/classes/com/gcc/communityHall/dto/FamilyPensionerDetailsResponse.class b/target/classes/com/gcc/communityHall/dto/FamilyPensionerDetailsResponse.class index c66fbb59..8ca9c9dd 100644 Binary files a/target/classes/com/gcc/communityHall/dto/FamilyPensionerDetailsResponse.class and b/target/classes/com/gcc/communityHall/dto/FamilyPensionerDetailsResponse.class differ diff --git a/target/classes/com/gcc/communityHall/dto/PaymentsDTO.class b/target/classes/com/gcc/communityHall/dto/PaymentsDTO.class index 45e42ff0..18af9a42 100644 Binary files a/target/classes/com/gcc/communityHall/dto/PaymentsDTO.class and b/target/classes/com/gcc/communityHall/dto/PaymentsDTO.class differ diff --git a/target/classes/com/gcc/communityHall/dto/PensionerDetails.class b/target/classes/com/gcc/communityHall/dto/PensionerDetails.class index f16bc9ce..162ffd2c 100644 Binary files a/target/classes/com/gcc/communityHall/dto/PensionerDetails.class and b/target/classes/com/gcc/communityHall/dto/PensionerDetails.class differ diff --git a/target/classes/com/gcc/communityHall/dto/PensionerDetailsResponse.class b/target/classes/com/gcc/communityHall/dto/PensionerDetailsResponse.class index 0b690cb8..fbe226ae 100644 Binary files a/target/classes/com/gcc/communityHall/dto/PensionerDetailsResponse.class and b/target/classes/com/gcc/communityHall/dto/PensionerDetailsResponse.class differ diff --git a/target/classes/com/gcc/communityHall/dto/SaveBooking.class b/target/classes/com/gcc/communityHall/dto/SaveBooking.class index e49ee145..56685597 100644 Binary files a/target/classes/com/gcc/communityHall/dto/SaveBooking.class and b/target/classes/com/gcc/communityHall/dto/SaveBooking.class differ diff --git a/target/classes/com/gcc/communityHall/dto/UsersDTO.class b/target/classes/com/gcc/communityHall/dto/UsersDTO.class index 4cbbaaf6..7f6ff79d 100644 Binary files a/target/classes/com/gcc/communityHall/dto/UsersDTO.class and b/target/classes/com/gcc/communityHall/dto/UsersDTO.class differ diff --git a/target/classes/com/gcc/communityHall/dto/saveEbDetailsAndDamage.class b/target/classes/com/gcc/communityHall/dto/saveEbDetailsAndDamage.class index d37c7664..7ddadce9 100644 Binary files a/target/classes/com/gcc/communityHall/dto/saveEbDetailsAndDamage.class and b/target/classes/com/gcc/communityHall/dto/saveEbDetailsAndDamage.class differ diff --git a/target/classes/com/gcc/communityHall/entity/ApplicationLogs$logsOfMsg.class b/target/classes/com/gcc/communityHall/entity/ApplicationLogs$logsOfMsg.class index 1592ddae..7173aa8b 100644 Binary files a/target/classes/com/gcc/communityHall/entity/ApplicationLogs$logsOfMsg.class and b/target/classes/com/gcc/communityHall/entity/ApplicationLogs$logsOfMsg.class differ diff --git a/target/classes/com/gcc/communityHall/entity/ApplicationLogs.class b/target/classes/com/gcc/communityHall/entity/ApplicationLogs.class index 7b893732..2e3a9a21 100644 Binary files a/target/classes/com/gcc/communityHall/entity/ApplicationLogs.class and b/target/classes/com/gcc/communityHall/entity/ApplicationLogs.class differ diff --git a/target/classes/com/gcc/communityHall/entity/BookingCalendar.class b/target/classes/com/gcc/communityHall/entity/BookingCalendar.class index 1f63719f..aadb6f6b 100644 Binary files a/target/classes/com/gcc/communityHall/entity/BookingCalendar.class and b/target/classes/com/gcc/communityHall/entity/BookingCalendar.class differ diff --git a/target/classes/com/gcc/communityHall/entity/BookingDetails$BookingStatus.class b/target/classes/com/gcc/communityHall/entity/BookingDetails$BookingStatus.class index 48bd885b..b34f88fe 100644 Binary files a/target/classes/com/gcc/communityHall/entity/BookingDetails$BookingStatus.class and b/target/classes/com/gcc/communityHall/entity/BookingDetails$BookingStatus.class differ diff --git a/target/classes/com/gcc/communityHall/entity/BookingDetails$BookingType.class b/target/classes/com/gcc/communityHall/entity/BookingDetails$BookingType.class index 4162b0ab..c97265af 100644 Binary files a/target/classes/com/gcc/communityHall/entity/BookingDetails$BookingType.class and b/target/classes/com/gcc/communityHall/entity/BookingDetails$BookingType.class differ diff --git a/target/classes/com/gcc/communityHall/entity/BookingDetails$RefundStatus.class b/target/classes/com/gcc/communityHall/entity/BookingDetails$RefundStatus.class index c47bd285..c83c96bf 100644 Binary files a/target/classes/com/gcc/communityHall/entity/BookingDetails$RefundStatus.class and b/target/classes/com/gcc/communityHall/entity/BookingDetails$RefundStatus.class differ diff --git a/target/classes/com/gcc/communityHall/entity/BookingDetails.class b/target/classes/com/gcc/communityHall/entity/BookingDetails.class index 1c3ed96f..445d24e2 100644 Binary files a/target/classes/com/gcc/communityHall/entity/BookingDetails.class and b/target/classes/com/gcc/communityHall/entity/BookingDetails.class differ diff --git a/target/classes/com/gcc/communityHall/entity/BookingDocuments.class b/target/classes/com/gcc/communityHall/entity/BookingDocuments.class index 04f4c6d0..bd64593f 100644 Binary files a/target/classes/com/gcc/communityHall/entity/BookingDocuments.class and b/target/classes/com/gcc/communityHall/entity/BookingDocuments.class differ diff --git a/target/classes/com/gcc/communityHall/entity/BookingHistory$BookingStatus.class b/target/classes/com/gcc/communityHall/entity/BookingHistory$BookingStatus.class index 2cbde65d..09d92e70 100644 Binary files a/target/classes/com/gcc/communityHall/entity/BookingHistory$BookingStatus.class and b/target/classes/com/gcc/communityHall/entity/BookingHistory$BookingStatus.class differ diff --git a/target/classes/com/gcc/communityHall/entity/BookingHistory$RefundStatus.class b/target/classes/com/gcc/communityHall/entity/BookingHistory$RefundStatus.class index 25f88ea9..c66fc169 100644 Binary files a/target/classes/com/gcc/communityHall/entity/BookingHistory$RefundStatus.class and b/target/classes/com/gcc/communityHall/entity/BookingHistory$RefundStatus.class differ diff --git a/target/classes/com/gcc/communityHall/entity/BookingHistory.class b/target/classes/com/gcc/communityHall/entity/BookingHistory.class index dcf47cfe..0cb5c6c8 100644 Binary files a/target/classes/com/gcc/communityHall/entity/BookingHistory.class and b/target/classes/com/gcc/communityHall/entity/BookingHistory.class differ diff --git a/target/classes/com/gcc/communityHall/entity/Counsellordetails.class b/target/classes/com/gcc/communityHall/entity/Counsellordetails.class index 101b434b..b1cb1c3b 100644 Binary files a/target/classes/com/gcc/communityHall/entity/Counsellordetails.class and b/target/classes/com/gcc/communityHall/entity/Counsellordetails.class differ diff --git a/target/classes/com/gcc/communityHall/entity/CounterDetails.class b/target/classes/com/gcc/communityHall/entity/CounterDetails.class index 778232f6..04a8ef5b 100644 Binary files a/target/classes/com/gcc/communityHall/entity/CounterDetails.class and b/target/classes/com/gcc/communityHall/entity/CounterDetails.class differ diff --git a/target/classes/com/gcc/communityHall/entity/CounterRefundList$InitialisationStatus.class b/target/classes/com/gcc/communityHall/entity/CounterRefundList$InitialisationStatus.class index acd63088..1919f1c4 100644 Binary files a/target/classes/com/gcc/communityHall/entity/CounterRefundList$InitialisationStatus.class and b/target/classes/com/gcc/communityHall/entity/CounterRefundList$InitialisationStatus.class differ diff --git a/target/classes/com/gcc/communityHall/entity/CounterRefundList.class b/target/classes/com/gcc/communityHall/entity/CounterRefundList.class index 1364cd2d..b2655ef2 100644 Binary files a/target/classes/com/gcc/communityHall/entity/CounterRefundList.class and b/target/classes/com/gcc/communityHall/entity/CounterRefundList.class differ diff --git a/target/classes/com/gcc/communityHall/entity/Damage.class b/target/classes/com/gcc/communityHall/entity/Damage.class index 98274b3a..290ee78a 100644 Binary files a/target/classes/com/gcc/communityHall/entity/Damage.class and b/target/classes/com/gcc/communityHall/entity/Damage.class differ diff --git a/target/classes/com/gcc/communityHall/entity/DiscountRange.class b/target/classes/com/gcc/communityHall/entity/DiscountRange.class index f5d4420d..b53b7886 100644 Binary files a/target/classes/com/gcc/communityHall/entity/DiscountRange.class and b/target/classes/com/gcc/communityHall/entity/DiscountRange.class differ diff --git a/target/classes/com/gcc/communityHall/entity/EbDetails.class b/target/classes/com/gcc/communityHall/entity/EbDetails.class index 7a6a00f0..00bb4817 100644 Binary files a/target/classes/com/gcc/communityHall/entity/EbDetails.class and b/target/classes/com/gcc/communityHall/entity/EbDetails.class differ diff --git a/target/classes/com/gcc/communityHall/entity/ExtraPayments.class b/target/classes/com/gcc/communityHall/entity/ExtraPayments.class index b5bd5ede..cd3811da 100644 Binary files a/target/classes/com/gcc/communityHall/entity/ExtraPayments.class and b/target/classes/com/gcc/communityHall/entity/ExtraPayments.class differ diff --git a/target/classes/com/gcc/communityHall/entity/FloorDetails.class b/target/classes/com/gcc/communityHall/entity/FloorDetails.class index d1ecfd78..b00ac79e 100644 Binary files a/target/classes/com/gcc/communityHall/entity/FloorDetails.class and b/target/classes/com/gcc/communityHall/entity/FloorDetails.class differ diff --git a/target/classes/com/gcc/communityHall/entity/GccBlockingDate$BlockedStatus.class b/target/classes/com/gcc/communityHall/entity/GccBlockingDate$BlockedStatus.class index 67bfbd19..ddd2a730 100644 Binary files a/target/classes/com/gcc/communityHall/entity/GccBlockingDate$BlockedStatus.class and b/target/classes/com/gcc/communityHall/entity/GccBlockingDate$BlockedStatus.class differ diff --git a/target/classes/com/gcc/communityHall/entity/GccBlockingDate.class b/target/classes/com/gcc/communityHall/entity/GccBlockingDate.class index da47f43c..d2dd7019 100644 Binary files a/target/classes/com/gcc/communityHall/entity/GccBlockingDate.class and b/target/classes/com/gcc/communityHall/entity/GccBlockingDate.class differ diff --git a/target/classes/com/gcc/communityHall/entity/GccBlockingHistory$BlockedStatus.class b/target/classes/com/gcc/communityHall/entity/GccBlockingHistory$BlockedStatus.class index c1c725db..e8ee61a7 100644 Binary files a/target/classes/com/gcc/communityHall/entity/GccBlockingHistory$BlockedStatus.class and b/target/classes/com/gcc/communityHall/entity/GccBlockingHistory$BlockedStatus.class differ diff --git a/target/classes/com/gcc/communityHall/entity/GccBlockingHistory.class b/target/classes/com/gcc/communityHall/entity/GccBlockingHistory.class index 0d6afdec..39338fba 100644 Binary files a/target/classes/com/gcc/communityHall/entity/GccBlockingHistory.class and b/target/classes/com/gcc/communityHall/entity/GccBlockingHistory.class differ diff --git a/target/classes/com/gcc/communityHall/entity/GccblockingDocuments.class b/target/classes/com/gcc/communityHall/entity/GccblockingDocuments.class index f9fd792c..fe5c3ddc 100644 Binary files a/target/classes/com/gcc/communityHall/entity/GccblockingDocuments.class and b/target/classes/com/gcc/communityHall/entity/GccblockingDocuments.class differ diff --git a/target/classes/com/gcc/communityHall/entity/HallDetails.class b/target/classes/com/gcc/communityHall/entity/HallDetails.class index daa19191..744e2536 100644 Binary files a/target/classes/com/gcc/communityHall/entity/HallDetails.class and b/target/classes/com/gcc/communityHall/entity/HallDetails.class differ diff --git a/target/classes/com/gcc/communityHall/entity/HallDetailsConcession.class b/target/classes/com/gcc/communityHall/entity/HallDetailsConcession.class index f358fbd4..3347fdbf 100644 Binary files a/target/classes/com/gcc/communityHall/entity/HallDetailsConcession.class and b/target/classes/com/gcc/communityHall/entity/HallDetailsConcession.class differ diff --git a/target/classes/com/gcc/communityHall/entity/HallImages.class b/target/classes/com/gcc/communityHall/entity/HallImages.class index 92c9e551..8250df21 100644 Binary files a/target/classes/com/gcc/communityHall/entity/HallImages.class and b/target/classes/com/gcc/communityHall/entity/HallImages.class differ diff --git a/target/classes/com/gcc/communityHall/entity/Login.class b/target/classes/com/gcc/communityHall/entity/Login.class index c21e8e7c..59fc92b9 100644 Binary files a/target/classes/com/gcc/communityHall/entity/Login.class and b/target/classes/com/gcc/communityHall/entity/Login.class differ diff --git a/target/classes/com/gcc/communityHall/entity/Notification.class b/target/classes/com/gcc/communityHall/entity/Notification.class index e48b70cf..c0f63bf1 100644 Binary files a/target/classes/com/gcc/communityHall/entity/Notification.class and b/target/classes/com/gcc/communityHall/entity/Notification.class differ diff --git a/target/classes/com/gcc/communityHall/entity/Payments.class b/target/classes/com/gcc/communityHall/entity/Payments.class index 82924b1e..af61dd30 100644 Binary files a/target/classes/com/gcc/communityHall/entity/Payments.class and b/target/classes/com/gcc/communityHall/entity/Payments.class differ diff --git a/target/classes/com/gcc/communityHall/entity/QueueLog.class b/target/classes/com/gcc/communityHall/entity/QueueLog.class index 6976be01..1351bdc7 100644 Binary files a/target/classes/com/gcc/communityHall/entity/QueueLog.class and b/target/classes/com/gcc/communityHall/entity/QueueLog.class differ diff --git a/target/classes/com/gcc/communityHall/entity/ReasonDocumentMaster.class b/target/classes/com/gcc/communityHall/entity/ReasonDocumentMaster.class index ddf1f5d5..ec023d2e 100644 Binary files a/target/classes/com/gcc/communityHall/entity/ReasonDocumentMaster.class and b/target/classes/com/gcc/communityHall/entity/ReasonDocumentMaster.class differ diff --git a/target/classes/com/gcc/communityHall/entity/ReasonMaster.class b/target/classes/com/gcc/communityHall/entity/ReasonMaster.class index 70a840bc..19513813 100644 Binary files a/target/classes/com/gcc/communityHall/entity/ReasonMaster.class and b/target/classes/com/gcc/communityHall/entity/ReasonMaster.class differ diff --git a/target/classes/com/gcc/communityHall/entity/RefundTransaction.class b/target/classes/com/gcc/communityHall/entity/RefundTransaction.class index 23191cb4..d923eed2 100644 Binary files a/target/classes/com/gcc/communityHall/entity/RefundTransaction.class and b/target/classes/com/gcc/communityHall/entity/RefundTransaction.class differ diff --git a/target/classes/com/gcc/communityHall/entity/Settlement.class b/target/classes/com/gcc/communityHall/entity/Settlement.class index 45b089b2..56cd492f 100644 Binary files a/target/classes/com/gcc/communityHall/entity/Settlement.class and b/target/classes/com/gcc/communityHall/entity/Settlement.class differ diff --git a/target/classes/com/gcc/communityHall/entity/SmsSender.class b/target/classes/com/gcc/communityHall/entity/SmsSender.class index 833530a6..cc05c623 100644 Binary files a/target/classes/com/gcc/communityHall/entity/SmsSender.class and b/target/classes/com/gcc/communityHall/entity/SmsSender.class differ diff --git a/target/classes/com/gcc/communityHall/entity/UserHistory.class b/target/classes/com/gcc/communityHall/entity/UserHistory.class index c4186d95..21eb95ac 100644 Binary files a/target/classes/com/gcc/communityHall/entity/UserHistory.class and b/target/classes/com/gcc/communityHall/entity/UserHistory.class differ diff --git a/target/classes/com/gcc/communityHall/entity/Users$userStatus.class b/target/classes/com/gcc/communityHall/entity/Users$userStatus.class index db5f4f39..a4ee6a12 100644 Binary files a/target/classes/com/gcc/communityHall/entity/Users$userStatus.class and b/target/classes/com/gcc/communityHall/entity/Users$userStatus.class differ diff --git a/target/classes/com/gcc/communityHall/entity/Users$userType.class b/target/classes/com/gcc/communityHall/entity/Users$userType.class index 7f637147..a8a34925 100644 Binary files a/target/classes/com/gcc/communityHall/entity/Users$userType.class and b/target/classes/com/gcc/communityHall/entity/Users$userType.class differ diff --git a/target/classes/com/gcc/communityHall/entity/Users.class b/target/classes/com/gcc/communityHall/entity/Users.class index 3685269b..05211656 100644 Binary files a/target/classes/com/gcc/communityHall/entity/Users.class and b/target/classes/com/gcc/communityHall/entity/Users.class differ diff --git a/target/classes/com/gcc/communityHall/entity/erpPostData.class b/target/classes/com/gcc/communityHall/entity/erpPostData.class index cc77eb2f..8b87b529 100644 Binary files a/target/classes/com/gcc/communityHall/entity/erpPostData.class and b/target/classes/com/gcc/communityHall/entity/erpPostData.class differ diff --git a/target/classes/com/gcc/communityHall/exception/GlobalExceptionHandler.class b/target/classes/com/gcc/communityHall/exception/GlobalExceptionHandler.class index fb339c07..09e44719 100644 Binary files a/target/classes/com/gcc/communityHall/exception/GlobalExceptionHandler.class and b/target/classes/com/gcc/communityHall/exception/GlobalExceptionHandler.class differ diff --git a/target/classes/com/gcc/communityHall/exception/PaymentRefundSlotOccupiedException.class b/target/classes/com/gcc/communityHall/exception/PaymentRefundSlotOccupiedException.class index fc21b3df..e629bdff 100644 Binary files a/target/classes/com/gcc/communityHall/exception/PaymentRefundSlotOccupiedException.class and b/target/classes/com/gcc/communityHall/exception/PaymentRefundSlotOccupiedException.class differ diff --git a/target/classes/com/gcc/communityHall/exception/ResourceNotFoundException.class b/target/classes/com/gcc/communityHall/exception/ResourceNotFoundException.class index 31f1dbee..b82788a2 100644 Binary files a/target/classes/com/gcc/communityHall/exception/ResourceNotFoundException.class and b/target/classes/com/gcc/communityHall/exception/ResourceNotFoundException.class differ diff --git a/target/classes/com/gcc/communityHall/exception/SlotOccupiedException.class b/target/classes/com/gcc/communityHall/exception/SlotOccupiedException.class index f28f7835..3f80f540 100644 Binary files a/target/classes/com/gcc/communityHall/exception/SlotOccupiedException.class and b/target/classes/com/gcc/communityHall/exception/SlotOccupiedException.class differ diff --git a/target/classes/com/gcc/communityHall/others/AppConfig.class b/target/classes/com/gcc/communityHall/others/AppConfig.class index 44e559c5..0bdd8afe 100644 Binary files a/target/classes/com/gcc/communityHall/others/AppConfig.class and b/target/classes/com/gcc/communityHall/others/AppConfig.class differ diff --git a/target/classes/com/gcc/communityHall/others/SlotOccupiedException.class b/target/classes/com/gcc/communityHall/others/SlotOccupiedException.class index 5931d242..02298a08 100644 Binary files a/target/classes/com/gcc/communityHall/others/SlotOccupiedException.class and b/target/classes/com/gcc/communityHall/others/SlotOccupiedException.class differ diff --git a/target/classes/com/gcc/communityHall/others/UserSession.class b/target/classes/com/gcc/communityHall/others/UserSession.class index 302677f0..2901aa99 100644 Binary files a/target/classes/com/gcc/communityHall/others/UserSession.class and b/target/classes/com/gcc/communityHall/others/UserSession.class differ diff --git a/target/classes/com/gcc/communityHall/paymentService/DTO/Merchant.class b/target/classes/com/gcc/communityHall/paymentService/DTO/Merchant.class index 069fd7f0..cb4b6d8e 100644 Binary files a/target/classes/com/gcc/communityHall/paymentService/DTO/Merchant.class and b/target/classes/com/gcc/communityHall/paymentService/DTO/Merchant.class differ diff --git a/target/classes/com/gcc/communityHall/paymentService/DTO/RefundRequest.class b/target/classes/com/gcc/communityHall/paymentService/DTO/RefundRequest.class index 2b79232b..e4c6e4e2 100644 Binary files a/target/classes/com/gcc/communityHall/paymentService/DTO/RefundRequest.class and b/target/classes/com/gcc/communityHall/paymentService/DTO/RefundRequest.class differ diff --git a/target/classes/com/gcc/communityHall/paymentService/DTO/Transaction.class b/target/classes/com/gcc/communityHall/paymentService/DTO/Transaction.class index a93c6fcb..b4d1f573 100644 Binary files a/target/classes/com/gcc/communityHall/paymentService/DTO/Transaction.class and b/target/classes/com/gcc/communityHall/paymentService/DTO/Transaction.class differ diff --git a/target/classes/com/gcc/communityHall/paymentService/DTO/TransactionData.class b/target/classes/com/gcc/communityHall/paymentService/DTO/TransactionData.class index b8563131..292a6f35 100644 Binary files a/target/classes/com/gcc/communityHall/paymentService/DTO/TransactionData.class and b/target/classes/com/gcc/communityHall/paymentService/DTO/TransactionData.class differ diff --git a/target/classes/com/gcc/communityHall/paymentService/config/PaymentConfig.class b/target/classes/com/gcc/communityHall/paymentService/config/PaymentConfig.class index 87cf9c16..ea8cd954 100644 Binary files a/target/classes/com/gcc/communityHall/paymentService/config/PaymentConfig.class and b/target/classes/com/gcc/communityHall/paymentService/config/PaymentConfig.class differ diff --git a/target/classes/com/gcc/communityHall/paymentService/controller/PaymentAPIController.class b/target/classes/com/gcc/communityHall/paymentService/controller/PaymentAPIController.class index 7daff009..a5158980 100644 Binary files a/target/classes/com/gcc/communityHall/paymentService/controller/PaymentAPIController.class and b/target/classes/com/gcc/communityHall/paymentService/controller/PaymentAPIController.class differ diff --git a/target/classes/com/gcc/communityHall/paymentService/controller/PaymentController.class b/target/classes/com/gcc/communityHall/paymentService/controller/PaymentController.class index 14b2675c..14218e99 100644 Binary files a/target/classes/com/gcc/communityHall/paymentService/controller/PaymentController.class and b/target/classes/com/gcc/communityHall/paymentService/controller/PaymentController.class differ diff --git a/target/classes/com/gcc/communityHall/paymentService/controller/RefundController.class b/target/classes/com/gcc/communityHall/paymentService/controller/RefundController.class index aabf5609..0d7388f8 100644 Binary files a/target/classes/com/gcc/communityHall/paymentService/controller/RefundController.class and b/target/classes/com/gcc/communityHall/paymentService/controller/RefundController.class differ diff --git a/target/classes/com/gcc/communityHall/paymentService/entity/RefundClientInfo.class b/target/classes/com/gcc/communityHall/paymentService/entity/RefundClientInfo.class index 84efdbdd..8d5aeed9 100644 Binary files a/target/classes/com/gcc/communityHall/paymentService/entity/RefundClientInfo.class and b/target/classes/com/gcc/communityHall/paymentService/entity/RefundClientInfo.class differ diff --git a/target/classes/com/gcc/communityHall/paymentService/entity/RefundResponse.class b/target/classes/com/gcc/communityHall/paymentService/entity/RefundResponse.class index 3b9a082e..7420fa60 100644 Binary files a/target/classes/com/gcc/communityHall/paymentService/entity/RefundResponse.class and b/target/classes/com/gcc/communityHall/paymentService/entity/RefundResponse.class differ diff --git a/target/classes/com/gcc/communityHall/paymentService/entity/TransactionResponse.class b/target/classes/com/gcc/communityHall/paymentService/entity/TransactionResponse.class index 2ddf0389..6e35a33d 100644 Binary files a/target/classes/com/gcc/communityHall/paymentService/entity/TransactionResponse.class and b/target/classes/com/gcc/communityHall/paymentService/entity/TransactionResponse.class differ diff --git a/target/classes/com/gcc/communityHall/paymentService/entity/TransactionStatusLog.class b/target/classes/com/gcc/communityHall/paymentService/entity/TransactionStatusLog.class index 553b6a07..ae8f0b78 100644 Binary files a/target/classes/com/gcc/communityHall/paymentService/entity/TransactionStatusLog.class and b/target/classes/com/gcc/communityHall/paymentService/entity/TransactionStatusLog.class differ diff --git a/target/classes/com/gcc/communityHall/paymentService/refund/DTO/ErrorDetails.class b/target/classes/com/gcc/communityHall/paymentService/refund/DTO/ErrorDetails.class index 9cf1e3e3..5d3ee7af 100644 Binary files a/target/classes/com/gcc/communityHall/paymentService/refund/DTO/ErrorDetails.class and b/target/classes/com/gcc/communityHall/paymentService/refund/DTO/ErrorDetails.class differ diff --git a/target/classes/com/gcc/communityHall/paymentService/refund/DTO/PaymentMethod.class b/target/classes/com/gcc/communityHall/paymentService/refund/DTO/PaymentMethod.class index 3fd75641..a5b138c8 100644 Binary files a/target/classes/com/gcc/communityHall/paymentService/refund/DTO/PaymentMethod.class and b/target/classes/com/gcc/communityHall/paymentService/refund/DTO/PaymentMethod.class differ diff --git a/target/classes/com/gcc/communityHall/paymentService/refund/DTO/PaymentTransaction.class b/target/classes/com/gcc/communityHall/paymentService/refund/DTO/PaymentTransaction.class index 68f574c5..562f664e 100644 Binary files a/target/classes/com/gcc/communityHall/paymentService/refund/DTO/PaymentTransaction.class and b/target/classes/com/gcc/communityHall/paymentService/refund/DTO/PaymentTransaction.class differ diff --git a/target/classes/com/gcc/communityHall/paymentService/refund/DTO/TransactionRefundResponse.class b/target/classes/com/gcc/communityHall/paymentService/refund/DTO/TransactionRefundResponse.class index 1cd9e880..4fa7af3e 100644 Binary files a/target/classes/com/gcc/communityHall/paymentService/refund/DTO/TransactionRefundResponse.class and b/target/classes/com/gcc/communityHall/paymentService/refund/DTO/TransactionRefundResponse.class differ diff --git a/target/classes/com/gcc/communityHall/paymentService/repository/RefundClientInfoRepository.class b/target/classes/com/gcc/communityHall/paymentService/repository/RefundClientInfoRepository.class index d762eb28..47db90ad 100644 Binary files a/target/classes/com/gcc/communityHall/paymentService/repository/RefundClientInfoRepository.class and b/target/classes/com/gcc/communityHall/paymentService/repository/RefundClientInfoRepository.class differ diff --git a/target/classes/com/gcc/communityHall/paymentService/repository/TransRefundResRepository.class b/target/classes/com/gcc/communityHall/paymentService/repository/TransRefundResRepository.class index 6fe2252d..fe26d2ea 100644 Binary files a/target/classes/com/gcc/communityHall/paymentService/repository/TransRefundResRepository.class and b/target/classes/com/gcc/communityHall/paymentService/repository/TransRefundResRepository.class differ diff --git a/target/classes/com/gcc/communityHall/paymentService/repository/TransactionResponseRepository.class b/target/classes/com/gcc/communityHall/paymentService/repository/TransactionResponseRepository.class index 559d90ac..0f34257a 100644 Binary files a/target/classes/com/gcc/communityHall/paymentService/repository/TransactionResponseRepository.class and b/target/classes/com/gcc/communityHall/paymentService/repository/TransactionResponseRepository.class differ diff --git a/target/classes/com/gcc/communityHall/paymentService/repository/TransactionStatusLogRepository.class b/target/classes/com/gcc/communityHall/paymentService/repository/TransactionStatusLogRepository.class index 9a6d2b4e..e3d8b8fc 100644 Binary files a/target/classes/com/gcc/communityHall/paymentService/repository/TransactionStatusLogRepository.class and b/target/classes/com/gcc/communityHall/paymentService/repository/TransactionStatusLogRepository.class differ diff --git a/target/classes/com/gcc/communityHall/paymentService/scheduler/PaymentStatusScheduler.class b/target/classes/com/gcc/communityHall/paymentService/scheduler/PaymentStatusScheduler.class index a38c851d..f23bee55 100644 Binary files a/target/classes/com/gcc/communityHall/paymentService/scheduler/PaymentStatusScheduler.class and b/target/classes/com/gcc/communityHall/paymentService/scheduler/PaymentStatusScheduler.class differ diff --git a/target/classes/com/gcc/communityHall/paymentService/service/PaymentGatewayService.class b/target/classes/com/gcc/communityHall/paymentService/service/PaymentGatewayService.class index 5617738d..97f503f1 100644 Binary files a/target/classes/com/gcc/communityHall/paymentService/service/PaymentGatewayService.class and b/target/classes/com/gcc/communityHall/paymentService/service/PaymentGatewayService.class differ diff --git a/target/classes/com/gcc/communityHall/paymentService/service/PaymentGatewayServiceImpl.class b/target/classes/com/gcc/communityHall/paymentService/service/PaymentGatewayServiceImpl.class index efda29be..492c13b0 100644 Binary files a/target/classes/com/gcc/communityHall/paymentService/service/PaymentGatewayServiceImpl.class and b/target/classes/com/gcc/communityHall/paymentService/service/PaymentGatewayServiceImpl.class differ diff --git a/target/classes/com/gcc/communityHall/paymentService/service/TransactionNumberGenerator.class b/target/classes/com/gcc/communityHall/paymentService/service/TransactionNumberGenerator.class index c186773d..f32c41ff 100644 Binary files a/target/classes/com/gcc/communityHall/paymentService/service/TransactionNumberGenerator.class and b/target/classes/com/gcc/communityHall/paymentService/service/TransactionNumberGenerator.class differ diff --git a/target/classes/com/gcc/communityHall/repository/ApplicationLogsRepository.class b/target/classes/com/gcc/communityHall/repository/ApplicationLogsRepository.class index 12b55b8e..889af34f 100644 Binary files a/target/classes/com/gcc/communityHall/repository/ApplicationLogsRepository.class and b/target/classes/com/gcc/communityHall/repository/ApplicationLogsRepository.class differ diff --git a/target/classes/com/gcc/communityHall/repository/BookingCalendarRepository.class b/target/classes/com/gcc/communityHall/repository/BookingCalendarRepository.class index a9fe1056..38cbadca 100644 Binary files a/target/classes/com/gcc/communityHall/repository/BookingCalendarRepository.class and b/target/classes/com/gcc/communityHall/repository/BookingCalendarRepository.class differ diff --git a/target/classes/com/gcc/communityHall/repository/BookingDetailsRepository.class b/target/classes/com/gcc/communityHall/repository/BookingDetailsRepository.class index f4a78f9d..40606d3d 100644 Binary files a/target/classes/com/gcc/communityHall/repository/BookingDetailsRepository.class and b/target/classes/com/gcc/communityHall/repository/BookingDetailsRepository.class differ diff --git a/target/classes/com/gcc/communityHall/repository/BookingDocumentsRepository.class b/target/classes/com/gcc/communityHall/repository/BookingDocumentsRepository.class index 30566c66..6718f4e5 100644 Binary files a/target/classes/com/gcc/communityHall/repository/BookingDocumentsRepository.class and b/target/classes/com/gcc/communityHall/repository/BookingDocumentsRepository.class differ diff --git a/target/classes/com/gcc/communityHall/repository/BookingHistoryRepository.class b/target/classes/com/gcc/communityHall/repository/BookingHistoryRepository.class index 87a1cb3e..71beaf3f 100644 Binary files a/target/classes/com/gcc/communityHall/repository/BookingHistoryRepository.class and b/target/classes/com/gcc/communityHall/repository/BookingHistoryRepository.class differ diff --git a/target/classes/com/gcc/communityHall/repository/CounsellorDetailsRepository.class b/target/classes/com/gcc/communityHall/repository/CounsellorDetailsRepository.class index 0ee153cc..99ea9a4b 100644 Binary files a/target/classes/com/gcc/communityHall/repository/CounsellorDetailsRepository.class and b/target/classes/com/gcc/communityHall/repository/CounsellorDetailsRepository.class differ diff --git a/target/classes/com/gcc/communityHall/repository/CounterDetailsRepository.class b/target/classes/com/gcc/communityHall/repository/CounterDetailsRepository.class index db05a54d..e0fa0c5a 100644 Binary files a/target/classes/com/gcc/communityHall/repository/CounterDetailsRepository.class and b/target/classes/com/gcc/communityHall/repository/CounterDetailsRepository.class differ diff --git a/target/classes/com/gcc/communityHall/repository/CounterRefundListRepository.class b/target/classes/com/gcc/communityHall/repository/CounterRefundListRepository.class index 6e62506f..d46b3eae 100644 Binary files a/target/classes/com/gcc/communityHall/repository/CounterRefundListRepository.class and b/target/classes/com/gcc/communityHall/repository/CounterRefundListRepository.class differ diff --git a/target/classes/com/gcc/communityHall/repository/DamageRepository.class b/target/classes/com/gcc/communityHall/repository/DamageRepository.class index a5c02dd4..63795185 100644 Binary files a/target/classes/com/gcc/communityHall/repository/DamageRepository.class and b/target/classes/com/gcc/communityHall/repository/DamageRepository.class differ diff --git a/target/classes/com/gcc/communityHall/repository/DiscountRangeRepository.class b/target/classes/com/gcc/communityHall/repository/DiscountRangeRepository.class index 7587ad02..61433c98 100644 Binary files a/target/classes/com/gcc/communityHall/repository/DiscountRangeRepository.class and b/target/classes/com/gcc/communityHall/repository/DiscountRangeRepository.class differ diff --git a/target/classes/com/gcc/communityHall/repository/EbDetailsRepository.class b/target/classes/com/gcc/communityHall/repository/EbDetailsRepository.class index 49a227aa..092e5e6e 100644 Binary files a/target/classes/com/gcc/communityHall/repository/EbDetailsRepository.class and b/target/classes/com/gcc/communityHall/repository/EbDetailsRepository.class differ diff --git a/target/classes/com/gcc/communityHall/repository/ErpPostDataRepository.class b/target/classes/com/gcc/communityHall/repository/ErpPostDataRepository.class index febd54fe..92de62d7 100644 Binary files a/target/classes/com/gcc/communityHall/repository/ErpPostDataRepository.class and b/target/classes/com/gcc/communityHall/repository/ErpPostDataRepository.class differ diff --git a/target/classes/com/gcc/communityHall/repository/ExtraPaymentsRepository.class b/target/classes/com/gcc/communityHall/repository/ExtraPaymentsRepository.class index 27abc6fc..7845993f 100644 Binary files a/target/classes/com/gcc/communityHall/repository/ExtraPaymentsRepository.class and b/target/classes/com/gcc/communityHall/repository/ExtraPaymentsRepository.class differ diff --git a/target/classes/com/gcc/communityHall/repository/FloorDetailsRepository.class b/target/classes/com/gcc/communityHall/repository/FloorDetailsRepository.class index af3363e2..3192e35e 100644 Binary files a/target/classes/com/gcc/communityHall/repository/FloorDetailsRepository.class and b/target/classes/com/gcc/communityHall/repository/FloorDetailsRepository.class differ diff --git a/target/classes/com/gcc/communityHall/repository/GccBlockingDateRepository.class b/target/classes/com/gcc/communityHall/repository/GccBlockingDateRepository.class index 524ecbac..b464161e 100644 Binary files a/target/classes/com/gcc/communityHall/repository/GccBlockingDateRepository.class and b/target/classes/com/gcc/communityHall/repository/GccBlockingDateRepository.class differ diff --git a/target/classes/com/gcc/communityHall/repository/GccBlockingHistoryRepository.class b/target/classes/com/gcc/communityHall/repository/GccBlockingHistoryRepository.class index 9e613c65..c6ba1b11 100644 Binary files a/target/classes/com/gcc/communityHall/repository/GccBlockingHistoryRepository.class and b/target/classes/com/gcc/communityHall/repository/GccBlockingHistoryRepository.class differ diff --git a/target/classes/com/gcc/communityHall/repository/GccblockingDocumentsRepo.class b/target/classes/com/gcc/communityHall/repository/GccblockingDocumentsRepo.class index 0c03dbd6..83177be1 100644 Binary files a/target/classes/com/gcc/communityHall/repository/GccblockingDocumentsRepo.class and b/target/classes/com/gcc/communityHall/repository/GccblockingDocumentsRepo.class differ diff --git a/target/classes/com/gcc/communityHall/repository/HallDetailsConcessionRepo.class b/target/classes/com/gcc/communityHall/repository/HallDetailsConcessionRepo.class index 9c711a5c..a7178c70 100644 Binary files a/target/classes/com/gcc/communityHall/repository/HallDetailsConcessionRepo.class and b/target/classes/com/gcc/communityHall/repository/HallDetailsConcessionRepo.class differ diff --git a/target/classes/com/gcc/communityHall/repository/HallDetailsRepository.class b/target/classes/com/gcc/communityHall/repository/HallDetailsRepository.class index c97be8d6..e3c6e52b 100644 Binary files a/target/classes/com/gcc/communityHall/repository/HallDetailsRepository.class and b/target/classes/com/gcc/communityHall/repository/HallDetailsRepository.class differ diff --git a/target/classes/com/gcc/communityHall/repository/HallImagesRepository.class b/target/classes/com/gcc/communityHall/repository/HallImagesRepository.class index 6ba0f30f..66445b50 100644 Binary files a/target/classes/com/gcc/communityHall/repository/HallImagesRepository.class and b/target/classes/com/gcc/communityHall/repository/HallImagesRepository.class differ diff --git a/target/classes/com/gcc/communityHall/repository/LoginRepository.class b/target/classes/com/gcc/communityHall/repository/LoginRepository.class index c5be42f6..036bca73 100644 Binary files a/target/classes/com/gcc/communityHall/repository/LoginRepository.class and b/target/classes/com/gcc/communityHall/repository/LoginRepository.class differ diff --git a/target/classes/com/gcc/communityHall/repository/NotificationRepository.class b/target/classes/com/gcc/communityHall/repository/NotificationRepository.class index 8ee135e9..1e810b3d 100644 Binary files a/target/classes/com/gcc/communityHall/repository/NotificationRepository.class and b/target/classes/com/gcc/communityHall/repository/NotificationRepository.class differ diff --git a/target/classes/com/gcc/communityHall/repository/PaymentsRepository.class b/target/classes/com/gcc/communityHall/repository/PaymentsRepository.class index c538fb3c..e0604758 100644 Binary files a/target/classes/com/gcc/communityHall/repository/PaymentsRepository.class and b/target/classes/com/gcc/communityHall/repository/PaymentsRepository.class differ diff --git a/target/classes/com/gcc/communityHall/repository/QueueLogRepository.class b/target/classes/com/gcc/communityHall/repository/QueueLogRepository.class index d25a1d01..7098278a 100644 Binary files a/target/classes/com/gcc/communityHall/repository/QueueLogRepository.class and b/target/classes/com/gcc/communityHall/repository/QueueLogRepository.class differ diff --git a/target/classes/com/gcc/communityHall/repository/ReasonDocMasterRepository.class b/target/classes/com/gcc/communityHall/repository/ReasonDocMasterRepository.class index 3e1fa6d8..d54b37cc 100644 Binary files a/target/classes/com/gcc/communityHall/repository/ReasonDocMasterRepository.class and b/target/classes/com/gcc/communityHall/repository/ReasonDocMasterRepository.class differ diff --git a/target/classes/com/gcc/communityHall/repository/ReasonMasterRepository.class b/target/classes/com/gcc/communityHall/repository/ReasonMasterRepository.class index 34c01717..57c7d73b 100644 Binary files a/target/classes/com/gcc/communityHall/repository/ReasonMasterRepository.class and b/target/classes/com/gcc/communityHall/repository/ReasonMasterRepository.class differ diff --git a/target/classes/com/gcc/communityHall/repository/RefundTransactionRepository.class b/target/classes/com/gcc/communityHall/repository/RefundTransactionRepository.class index 3adfe403..6fb0f964 100644 Binary files a/target/classes/com/gcc/communityHall/repository/RefundTransactionRepository.class and b/target/classes/com/gcc/communityHall/repository/RefundTransactionRepository.class differ diff --git a/target/classes/com/gcc/communityHall/repository/SettlementRepository.class b/target/classes/com/gcc/communityHall/repository/SettlementRepository.class index 52bf9a40..fad1410f 100644 Binary files a/target/classes/com/gcc/communityHall/repository/SettlementRepository.class and b/target/classes/com/gcc/communityHall/repository/SettlementRepository.class differ diff --git a/target/classes/com/gcc/communityHall/repository/SmsSenderRepository.class b/target/classes/com/gcc/communityHall/repository/SmsSenderRepository.class index 99bfa591..49a557d7 100644 Binary files a/target/classes/com/gcc/communityHall/repository/SmsSenderRepository.class and b/target/classes/com/gcc/communityHall/repository/SmsSenderRepository.class differ diff --git a/target/classes/com/gcc/communityHall/repository/UserHistoryRepository.class b/target/classes/com/gcc/communityHall/repository/UserHistoryRepository.class index e1d1c0b4..22a91fa9 100644 Binary files a/target/classes/com/gcc/communityHall/repository/UserHistoryRepository.class and b/target/classes/com/gcc/communityHall/repository/UserHistoryRepository.class differ diff --git a/target/classes/com/gcc/communityHall/repository/UsersRepository.class b/target/classes/com/gcc/communityHall/repository/UsersRepository.class index 70e92f32..6813ea8a 100644 Binary files a/target/classes/com/gcc/communityHall/repository/UsersRepository.class and b/target/classes/com/gcc/communityHall/repository/UsersRepository.class differ diff --git a/target/classes/com/gcc/communityHall/service/ApplicationLogService.class b/target/classes/com/gcc/communityHall/service/ApplicationLogService.class index 6fc12d3a..0ada05b5 100644 Binary files a/target/classes/com/gcc/communityHall/service/ApplicationLogService.class and b/target/classes/com/gcc/communityHall/service/ApplicationLogService.class differ diff --git a/target/classes/com/gcc/communityHall/service/BookingService.class b/target/classes/com/gcc/communityHall/service/BookingService.class index 9960c699..8f5aee04 100644 Binary files a/target/classes/com/gcc/communityHall/service/BookingService.class and b/target/classes/com/gcc/communityHall/service/BookingService.class differ diff --git a/target/classes/com/gcc/communityHall/service/CalendarService.class b/target/classes/com/gcc/communityHall/service/CalendarService.class index d93b9f9a..42e6db9a 100644 Binary files a/target/classes/com/gcc/communityHall/service/CalendarService.class and b/target/classes/com/gcc/communityHall/service/CalendarService.class differ diff --git a/target/classes/com/gcc/communityHall/service/CounterService.class b/target/classes/com/gcc/communityHall/service/CounterService.class index 68fd67a8..251eca6b 100644 Binary files a/target/classes/com/gcc/communityHall/service/CounterService.class and b/target/classes/com/gcc/communityHall/service/CounterService.class differ diff --git a/target/classes/com/gcc/communityHall/service/DiscountRangeService.class b/target/classes/com/gcc/communityHall/service/DiscountRangeService.class index 3462e86b..bcab5859 100644 Binary files a/target/classes/com/gcc/communityHall/service/DiscountRangeService.class and b/target/classes/com/gcc/communityHall/service/DiscountRangeService.class differ diff --git a/target/classes/com/gcc/communityHall/service/HallDetailService.class b/target/classes/com/gcc/communityHall/service/HallDetailService.class index e33c2f94..e0ee932c 100644 Binary files a/target/classes/com/gcc/communityHall/service/HallDetailService.class and b/target/classes/com/gcc/communityHall/service/HallDetailService.class differ diff --git a/target/classes/com/gcc/communityHall/service/Impl/ApplicationLogServiceImpl.class b/target/classes/com/gcc/communityHall/service/Impl/ApplicationLogServiceImpl.class index f49ee600..5280c13f 100644 Binary files a/target/classes/com/gcc/communityHall/service/Impl/ApplicationLogServiceImpl.class and b/target/classes/com/gcc/communityHall/service/Impl/ApplicationLogServiceImpl.class differ diff --git a/target/classes/com/gcc/communityHall/service/Impl/BookingServiceImpl.class b/target/classes/com/gcc/communityHall/service/Impl/BookingServiceImpl.class index 20ed3e23..17d2a9d2 100644 Binary files a/target/classes/com/gcc/communityHall/service/Impl/BookingServiceImpl.class and b/target/classes/com/gcc/communityHall/service/Impl/BookingServiceImpl.class differ diff --git a/target/classes/com/gcc/communityHall/service/Impl/CalendarServiceImpl.class b/target/classes/com/gcc/communityHall/service/Impl/CalendarServiceImpl.class index df90fdb9..76118080 100644 Binary files a/target/classes/com/gcc/communityHall/service/Impl/CalendarServiceImpl.class and b/target/classes/com/gcc/communityHall/service/Impl/CalendarServiceImpl.class differ diff --git a/target/classes/com/gcc/communityHall/service/Impl/CounterServiceImpl.class b/target/classes/com/gcc/communityHall/service/Impl/CounterServiceImpl.class index 36652397..d3458fd2 100644 Binary files a/target/classes/com/gcc/communityHall/service/Impl/CounterServiceImpl.class and b/target/classes/com/gcc/communityHall/service/Impl/CounterServiceImpl.class differ diff --git a/target/classes/com/gcc/communityHall/service/Impl/DiscountRangeServiceImpl.class b/target/classes/com/gcc/communityHall/service/Impl/DiscountRangeServiceImpl.class index a4bce080..a4978370 100644 Binary files a/target/classes/com/gcc/communityHall/service/Impl/DiscountRangeServiceImpl.class and b/target/classes/com/gcc/communityHall/service/Impl/DiscountRangeServiceImpl.class differ diff --git a/target/classes/com/gcc/communityHall/service/Impl/EbDamageService.class b/target/classes/com/gcc/communityHall/service/Impl/EbDamageService.class index 269ed70c..9c885a75 100644 Binary files a/target/classes/com/gcc/communityHall/service/Impl/EbDamageService.class and b/target/classes/com/gcc/communityHall/service/Impl/EbDamageService.class differ diff --git a/target/classes/com/gcc/communityHall/service/Impl/HallDetailServiceImpl.class b/target/classes/com/gcc/communityHall/service/Impl/HallDetailServiceImpl.class index 791b114a..0d2426c4 100644 Binary files a/target/classes/com/gcc/communityHall/service/Impl/HallDetailServiceImpl.class and b/target/classes/com/gcc/communityHall/service/Impl/HallDetailServiceImpl.class differ diff --git a/target/classes/com/gcc/communityHall/service/Impl/PaymentsServiceImpl.class b/target/classes/com/gcc/communityHall/service/Impl/PaymentsServiceImpl.class index 2294fc27..c1bb2653 100644 Binary files a/target/classes/com/gcc/communityHall/service/Impl/PaymentsServiceImpl.class and b/target/classes/com/gcc/communityHall/service/Impl/PaymentsServiceImpl.class differ diff --git a/target/classes/com/gcc/communityHall/service/Impl/ReasonMasterImpl.class b/target/classes/com/gcc/communityHall/service/Impl/ReasonMasterImpl.class index 15c3ef66..31740264 100644 Binary files a/target/classes/com/gcc/communityHall/service/Impl/ReasonMasterImpl.class and b/target/classes/com/gcc/communityHall/service/Impl/ReasonMasterImpl.class differ diff --git a/target/classes/com/gcc/communityHall/service/Impl/SettlementServiceImpl.class b/target/classes/com/gcc/communityHall/service/Impl/SettlementServiceImpl.class index f0842ef0..bbea99f6 100644 Binary files a/target/classes/com/gcc/communityHall/service/Impl/SettlementServiceImpl.class and b/target/classes/com/gcc/communityHall/service/Impl/SettlementServiceImpl.class differ diff --git a/target/classes/com/gcc/communityHall/service/Impl/TransactionServiceImpl.class b/target/classes/com/gcc/communityHall/service/Impl/TransactionServiceImpl.class index 9d6308b1..772f107a 100644 Binary files a/target/classes/com/gcc/communityHall/service/Impl/TransactionServiceImpl.class and b/target/classes/com/gcc/communityHall/service/Impl/TransactionServiceImpl.class differ diff --git a/target/classes/com/gcc/communityHall/service/Impl/UserServiceImpl.class b/target/classes/com/gcc/communityHall/service/Impl/UserServiceImpl.class index 64dedbf4..9e56696f 100644 Binary files a/target/classes/com/gcc/communityHall/service/Impl/UserServiceImpl.class and b/target/classes/com/gcc/communityHall/service/Impl/UserServiceImpl.class differ diff --git a/target/classes/com/gcc/communityHall/service/Impl/WhatsappMsgServiceImpl.class b/target/classes/com/gcc/communityHall/service/Impl/WhatsappMsgServiceImpl.class index 5646c22b..9bf2f89b 100644 Binary files a/target/classes/com/gcc/communityHall/service/Impl/WhatsappMsgServiceImpl.class and b/target/classes/com/gcc/communityHall/service/Impl/WhatsappMsgServiceImpl.class differ diff --git a/target/classes/com/gcc/communityHall/service/PaymentsService.class b/target/classes/com/gcc/communityHall/service/PaymentsService.class index 4a3601aa..881e24e9 100644 Binary files a/target/classes/com/gcc/communityHall/service/PaymentsService.class and b/target/classes/com/gcc/communityHall/service/PaymentsService.class differ diff --git a/target/classes/com/gcc/communityHall/service/ReasonMasterService.class b/target/classes/com/gcc/communityHall/service/ReasonMasterService.class index 1d9a5d2b..de8ee789 100644 Binary files a/target/classes/com/gcc/communityHall/service/ReasonMasterService.class and b/target/classes/com/gcc/communityHall/service/ReasonMasterService.class differ diff --git a/target/classes/com/gcc/communityHall/service/TransactionService.class b/target/classes/com/gcc/communityHall/service/TransactionService.class index 5aa824e5..7e058cc8 100644 Binary files a/target/classes/com/gcc/communityHall/service/TransactionService.class and b/target/classes/com/gcc/communityHall/service/TransactionService.class differ diff --git a/target/classes/com/gcc/communityHall/service/UserService.class b/target/classes/com/gcc/communityHall/service/UserService.class index e67e30af..878f7da0 100644 Binary files a/target/classes/com/gcc/communityHall/service/UserService.class and b/target/classes/com/gcc/communityHall/service/UserService.class differ diff --git a/target/classes/com/gcc/communityHall/service/WhatsappMsgService.class b/target/classes/com/gcc/communityHall/service/WhatsappMsgService.class index b6b887d8..72f64cec 100644 Binary files a/target/classes/com/gcc/communityHall/service/WhatsappMsgService.class and b/target/classes/com/gcc/communityHall/service/WhatsappMsgService.class differ diff --git a/target/classes/paymentConfig.properties b/target/classes/paymentConfig.properties index c066969b..a1a4e5b1 100644 --- a/target/classes/paymentConfig.properties +++ b/target/classes/paymentConfig.properties @@ -6,7 +6,7 @@ #payment.worldline.transactionSuccessCode=0300 #payment.worldline.refundSuccessCode=0400 -payment.worldline.merchantId=L1037717 +payment.worldline.merchantId=T1037717 payment.worldline.encryptionKey=6207149300MFLGNY payment.worldline.encryptionIV=3422107798TKQCNG payment.worldline.schemeCode=FIRST diff --git a/target/classes/templates/user/hallbookingform.html b/target/classes/templates/user/hallbookingform.html index 1e6cbd69..216bd9cd 100644 --- a/target/classes/templates/user/hallbookingform.html +++ b/target/classes/templates/user/hallbookingform.html @@ -930,6 +930,7 @@ bottom: 0; opacity: 0; } + to { bottom: 30px; opacity: 1; @@ -941,6 +942,7 @@ bottom: 30px; opacity: 1; } + to { bottom: 0; opacity: 0; @@ -957,309 +959,356 @@ color: white; } + + /* css fror toast */ + /* Toast styling */ + #toast { + visibility: hidden; + min-width: 200px; + margin-left: -100px; + background: #333; + color: #fff; + text-align: center; + border-radius: 6px; + padding: 10px; + position: fixed; + z-index: 9999; + left: 50%; + bottom: 30px; + font-size: 14px; + } + + #toast.show { + visibility: visible; + animation: fadein 0.5s, fadeout 0.5s 2s; + } + + @keyframes fadein { + from { + bottom: 10px; + opacity: 0; + } + + to { + bottom: 30px; + opacity: 1; + } + } + + @keyframes fadeout { + from { + bottom: 30px; + opacity: 1; + } + + to { + bottom: 10px; + opacity: 0; + } + } - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - - - 1 - 2 - 3 - 4 - - - - - Step:1 - - - - - Select Hall: - - + 1 + 2 + 3 + 4 + + + + + Step:1 + + + + + Select Hall: + + - Select a hall - + Select a hall + + - - - - - - - - - Hall Images: - - - - - + + + + + + + + Hall Images: + + + + + + + + + Previous + + + + Next + - - - Previous - - - - Next - - - - - - - + + + + - Day - (Available) - - - Day + (Available) + + + - Morning - - (Available) - - - Morning + + (Available) + + + - Evening - (Available) - - - + + + - Not - Available - - - Not + Available + + + - Gcc - Blocked + Gcc + Blocked + - - - - - - - Hall Details: - Zone: - Address: - Landmark: - Total Area: - Seating Capacity: - Parking Capacity: - + + + + + + Hall Details: + Zone: + Address: + Landmark: + Total Area: + Seating Capacity: + Parking Capacity: + + - - - - - - - Amount Details: - Security Deposit: Rs - Full Day Rent: Rs - Half Day Security Deposit: Rs - Half Day Rent: Rs - GST: % - EB for 1 Unit:* Rs - CareTaker Number: - - + + + + + + Amount Details: + Security Deposit: Rs + Full Day Rent: Rs + Half Day Security Deposit: Rs + Half Day Rent: Rs + GST: % + EB for 1 Unit:* Rs + CareTaker Number: + + + - - + - - + - Book - & Continue - + Book + & Continue + + - - - - Step 2 - - - - - - + + Step 2 + + + + + + - - - Hall - Name: - - - Zone: - - - - - Division: - - - - - - - - - + + + Zone: + + + + + Division: + + + + + + + + + - Day(Available) - - - Day(Available) + + + + - - Morning(Available) - - - + Morning(Available) + + + - - Evening(Available) - - - + Evening(Available) + + + - - Not(Available) - + + Not(Available) + - - + - Gcc - Blocked - + Gcc + Blocked + - - - - - - Relationship of the Functionary:* - + + + + Relationship of the Functionary:* + - Select - Self - Son - Daughter - GrandDaughter - - GrandSon - Sister - Brother - - - - - - Reason for - Booking:* - Select + Self + Son + Daughter + GrandDaughter + + GrandSon + Sister + Brother + + + + + + Reason for + Booking:* + - - - - - - + + + + + + - - - Start Date:* - - - - - End Date:* - + + Start Date:* + + + + + End Date:* + - Select - - - - - - - - - + Select + + + + + + + + + - Start - Period:* + Start + Period:* - - Select - Morning (6:00 - AM) - - Afternoon (2:00 - PM) - - - - - End - Period:* - Select + Morning (6:00 + AM) + + Afternoon (2:00 + PM) + + + + + End + Period:* + - Select - Afternoon (2:00 - PM) - - Evening (10:00 - PM) - - - - - - - + Select + Afternoon (2:00 + PM) + + Evening (10:00 + PM) + + + + + + + - - Selected - Slots: - - - - Booking Summary: - - + + Selected + Slots: + + + + Booking Summary: + + - - - - + + + - - + - Previous - - + - Reset - - + - Next - + Next + + - - - - Step 3 - - - - - + + Step 3 + + + + + - - - Hall - Name: - - Zone: - - - - Division: - - - - - - - - - Upload Document for - Booking:* - - + + + + + - - - - - - - - - + + + - Previous - - + - Reset - - + Next - + + - - - - Step 4 - - - - - Payment Details for Confirmation - - - Payment Closes in 15:00 - - - - - - - - - Full Name: - - - - Mobile Number: - - User Type: - - - - - - - - + + + Step 4 + + + + + Payment Details for Confirmation + + + + Payment Closes in 15:00 + + + + + + class="table table-bordered center-table table-align"> - - Hall - Name: - - - - - - No. of - Days: - - - - - - Start - Date: - - - - - - End - Date: - - - - - Starting Slot & - Ending Slot: - - - - - - Uploaded - Documents: - - - - - - - - - - - - - - - + + Full Name: + + + + Mobile Number: + + User Type: + + + - - + + - - - Reason for - Booking: - - - - - - Hall - Amount: - - Rs - - - - - Discount: - - 0% - - - - - Rent Amount: - - 0 - - - - Additional charges (Cleaning + P.A. - System + E.B): - - 0 - - - - - Net - Amount: - - Rs - - - - GST - Amount: - Rs - - - Deposit - Amount: - Rs - - - - Total - Amount: - - Rs - - - - + + + Hall + Name: + + + + + + No. of + Days: + + + + + + Start + Date: + + + + + + End + Date: + + + + + Starting Slot & + Ending Slot: + + + + + + Uploaded + Documents: + + + + + + + + + + + + + + + + + + + + + + + Reason for + Booking: + + + + + + Hall + Amount: + + Rs + + + + + Discount: + + 0% + + + + + Rent Amount: + + 0 + + + + Additional charges (Cleaning + + P.A. + System + E.B): + + 0 + + + + + Net + Amount: + + Rs + + + + GST + Amount: + Rs + + + Deposit + Amount: + Rs + + + + Total + Amount: + + Rs + + + + + - - - - - + + + - Previous - + Previous + + - - - - - I agree to the Terms and - Conditions - - + + + I agree to the Terms and + Conditions + + Confirm Payment - - + + + + - + - - - - - - - - Terms and Conditions - - - - + + + + + Terms and Conditions + + + + - - + - - - - - - - - - + + + + + + + +
Zone:
Address:
Landmark:
Total Area:
Seating Capacity:
Parking Capacity:
Security Deposit: Rs
Full Day Rent: Rs
Half Day Security Deposit: Rs
Half Day Rent: Rs
GST: %
EB for 1 Unit:* Rs
CareTaker Number:
Day(Available)
- Morning(Available)
- Evening(Available)
- Not(Available)
+ Not(Available)
Gcc - Blocked
Gcc + Blocked