Compare commits
8 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 hugh
|
85ae3cbe97 | ||
|
hugh
|
c7d321e50f | ||
|
hugh
|
97fd943168 | ||
|
hugh
|
b26c2d18e4 | ||
|
hugh
|
7d1507f94b | ||
|
hugh
|
7d1a85a1ee | ||
|
hugh
|
ac480df2a7 | ||
|
hugh
|
ec9a49ade3 |
+1
-4
@@ -7,7 +7,4 @@ nbactions.xml
|
|||||||
*.log
|
*.log
|
||||||
docker.sock
|
docker.sock
|
||||||
.DS_Store
|
.DS_Store
|
||||||
.settings/
|
|
||||||
.classpath
|
|
||||||
.factorypath
|
|
||||||
.project
|
|
||||||
|
|||||||
-117
@@ -1,117 +0,0 @@
|
|||||||
/*
|
|
||||||
* 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();
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
Vendored
BIN
Binary file not shown.
-2
@@ -1,2 +0,0 @@
|
|||||||
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
|
|
||||||
@@ -1,310 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
# ----------------------------------------------------------------------------
|
|
||||||
# Licensed to the Apache Software Foundation (ASF) under one
|
|
||||||
# or more contributor license agreements. See the NOTICE file
|
|
||||||
# distributed with this work for additional information
|
|
||||||
# regarding copyright ownership. The ASF licenses this file
|
|
||||||
# to you 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.
|
|
||||||
# ----------------------------------------------------------------------------
|
|
||||||
|
|
||||||
# ----------------------------------------------------------------------------
|
|
||||||
# Maven Start Up Batch script
|
|
||||||
#
|
|
||||||
# Required ENV vars:
|
|
||||||
# ------------------
|
|
||||||
# JAVA_HOME - location of a JDK home dir
|
|
||||||
#
|
|
||||||
# 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
|
|
||||||
# MAVEN_SKIP_RC - flag to disable loading of mavenrc files
|
|
||||||
# ----------------------------------------------------------------------------
|
|
||||||
|
|
||||||
if [ -z "$MAVEN_SKIP_RC" ] ; then
|
|
||||||
|
|
||||||
if [ -f /etc/mavenrc ] ; then
|
|
||||||
. /etc/mavenrc
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ -f "$HOME/.mavenrc" ] ; then
|
|
||||||
. "$HOME/.mavenrc"
|
|
||||||
fi
|
|
||||||
|
|
||||||
fi
|
|
||||||
|
|
||||||
# OS specific support. $var _must_ be set to either true or false.
|
|
||||||
cygwin=false;
|
|
||||||
darwin=false;
|
|
||||||
mingw=false
|
|
||||||
case "`uname`" in
|
|
||||||
CYGWIN*) cygwin=true ;;
|
|
||||||
MINGW*) mingw=true;;
|
|
||||||
Darwin*) darwin=true
|
|
||||||
# Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home
|
|
||||||
# See https://developer.apple.com/library/mac/qa/qa1170/_index.html
|
|
||||||
if [ -z "$JAVA_HOME" ]; then
|
|
||||||
if [ -x "/usr/libexec/java_home" ]; then
|
|
||||||
export JAVA_HOME="`/usr/libexec/java_home`"
|
|
||||||
else
|
|
||||||
export JAVA_HOME="/Library/Java/Home"
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
if [ -z "$JAVA_HOME" ] ; then
|
|
||||||
if [ -r /etc/gentoo-release ] ; then
|
|
||||||
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"`
|
|
||||||
[ -n "$CLASSPATH" ] &&
|
|
||||||
CLASSPATH=`cygpath --path --unix "$CLASSPATH"`
|
|
||||||
fi
|
|
||||||
|
|
||||||
# For Mingw, ensure paths are in UNIX format before anything is touched
|
|
||||||
if $mingw ; then
|
|
||||||
[ -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
|
|
||||||
# readlink(1) is not available as standard on Solaris 10.
|
|
||||||
readLink=`which readlink`
|
|
||||||
if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then
|
|
||||||
if $darwin ; then
|
|
||||||
javaHome="`dirname \"$javaExecutable\"`"
|
|
||||||
javaExecutable="`cd \"$javaHome\" && pwd -P`/javac"
|
|
||||||
else
|
|
||||||
javaExecutable="`readlink -f \"$javaExecutable\"`"
|
|
||||||
fi
|
|
||||||
javaHome="`dirname \"$javaExecutable\"`"
|
|
||||||
javaHome=`expr "$javaHome" : '\(.*\)/bin'`
|
|
||||||
JAVA_HOME="$javaHome"
|
|
||||||
export JAVA_HOME
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ -z "$JAVACMD" ] ; then
|
|
||||||
if [ -n "$JAVA_HOME" ] ; then
|
|
||||||
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
|
|
||||||
# IBM's JDK on AIX uses strange locations for the executables
|
|
||||||
JAVACMD="$JAVA_HOME/jre/sh/java"
|
|
||||||
else
|
|
||||||
JAVACMD="$JAVA_HOME/bin/java"
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
JAVACMD="`which java`"
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ ! -x "$JAVACMD" ] ; then
|
|
||||||
echo "Error: JAVA_HOME is not defined correctly." >&2
|
|
||||||
echo " We cannot execute $JAVACMD" >&2
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
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"
|
|
||||||
return 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
basedir="$1"
|
|
||||||
wdir="$1"
|
|
||||||
while [ "$wdir" != '/' ] ; do
|
|
||||||
if [ -d "$wdir"/.mvn ] ; then
|
|
||||||
basedir=$wdir
|
|
||||||
break
|
|
||||||
fi
|
|
||||||
# workaround for JBEAP-8937 (on Solaris 10/Sparc)
|
|
||||||
if [ -d "${wdir}" ]; then
|
|
||||||
wdir=`cd "$wdir/.."; pwd`
|
|
||||||
fi
|
|
||||||
# end of workaround
|
|
||||||
done
|
|
||||||
echo "${basedir}"
|
|
||||||
}
|
|
||||||
|
|
||||||
# concatenates all lines of a file
|
|
||||||
concat_lines() {
|
|
||||||
if [ -f "$1" ]; then
|
|
||||||
echo "$(tr -s '\n' ' ' < "$1")"
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
BASE_DIR=`find_maven_basedir "$(pwd)"`
|
|
||||||
if [ -z "$BASE_DIR" ]; then
|
|
||||||
exit 1;
|
|
||||||
fi
|
|
||||||
|
|
||||||
##########################################################################################
|
|
||||||
# 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.
|
|
||||||
##########################################################################################
|
|
||||||
if [ -r "$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" ]; then
|
|
||||||
if [ "$MVNW_VERBOSE" = true ]; then
|
|
||||||
echo "Found .mvn/wrapper/maven-wrapper.jar"
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
if [ "$MVNW_VERBOSE" = true ]; then
|
|
||||||
echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..."
|
|
||||||
fi
|
|
||||||
if [ -n "$MVNW_REPOURL" ]; then
|
|
||||||
jarUrl="$MVNW_REPOURL/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
|
|
||||||
else
|
|
||||||
jarUrl="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
|
|
||||||
fi
|
|
||||||
while IFS="=" read key value; do
|
|
||||||
case "$key" in (wrapperUrl) jarUrl="$value"; break ;;
|
|
||||||
esac
|
|
||||||
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"`
|
|
||||||
fi
|
|
||||||
|
|
||||||
if command -v wget > /dev/null; then
|
|
||||||
if [ "$MVNW_VERBOSE" = true ]; then
|
|
||||||
echo "Found wget ... using wget"
|
|
||||||
fi
|
|
||||||
if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then
|
|
||||||
wget "$jarUrl" -O "$wrapperJarPath"
|
|
||||||
else
|
|
||||||
wget --http-user=$MVNW_USERNAME --http-password=$MVNW_PASSWORD "$jarUrl" -O "$wrapperJarPath"
|
|
||||||
fi
|
|
||||||
elif command -v curl > /dev/null; then
|
|
||||||
if [ "$MVNW_VERBOSE" = true ]; then
|
|
||||||
echo "Found curl ... using curl"
|
|
||||||
fi
|
|
||||||
if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then
|
|
||||||
curl -o "$wrapperJarPath" "$jarUrl" -f
|
|
||||||
else
|
|
||||||
curl --user $MVNW_USERNAME:$MVNW_PASSWORD -o "$wrapperJarPath" "$jarUrl" -f
|
|
||||||
fi
|
|
||||||
|
|
||||||
else
|
|
||||||
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
|
|
||||||
javaClass=`cygpath --path --windows "$javaClass"`
|
|
||||||
fi
|
|
||||||
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 "$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
|
|
||||||
fi
|
|
||||||
##########################################################################################
|
|
||||||
# End of extension
|
|
||||||
##########################################################################################
|
|
||||||
|
|
||||||
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"`
|
|
||||||
[ -n "$CLASSPATH" ] &&
|
|
||||||
CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
|
|
||||||
[ -n "$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 $@"
|
|
||||||
export MAVEN_CMD_LINE_ARGS
|
|
||||||
|
|
||||||
WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
|
|
||||||
|
|
||||||
exec "$JAVACMD" \
|
|
||||||
$MAVEN_OPTS \
|
|
||||||
-classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \
|
|
||||||
"-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \
|
|
||||||
${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@"
|
|
||||||
@@ -1,182 +0,0 @@
|
|||||||
@REM ----------------------------------------------------------------------------
|
|
||||||
@REM Licensed to the Apache Software Foundation (ASF) under one
|
|
||||||
@REM or more contributor license agreements. See the NOTICE file
|
|
||||||
@REM distributed with this work for additional information
|
|
||||||
@REM regarding copyright ownership. The ASF licenses this file
|
|
||||||
@REM to you under the Apache License, Version 2.0 (the
|
|
||||||
@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 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
|
|
||||||
@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
|
||||||
@REM KIND, either express or implied. See the License for the
|
|
||||||
@REM specific language governing permissions and limitations
|
|
||||||
@REM under the License.
|
|
||||||
@REM ----------------------------------------------------------------------------
|
|
||||||
|
|
||||||
@REM ----------------------------------------------------------------------------
|
|
||||||
@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
|
|
||||||
@REM e.g. to debug Maven itself, use
|
|
||||||
@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
|
|
||||||
@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files
|
|
||||||
@REM ----------------------------------------------------------------------------
|
|
||||||
|
|
||||||
@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on'
|
|
||||||
@echo off
|
|
||||||
@REM set title of command window
|
|
||||||
title %0
|
|
||||||
@REM enable echoing by setting MAVEN_BATCH_ECHO to 'on'
|
|
||||||
@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO%
|
|
||||||
|
|
||||||
@REM set %HOME% to equivalent of $HOME
|
|
||||||
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 "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat"
|
|
||||||
if exist "%HOME%\mavenrc_pre.cmd" call "%HOME%\mavenrc_pre.cmd"
|
|
||||||
:skipRcPre
|
|
||||||
|
|
||||||
@setlocal
|
|
||||||
|
|
||||||
set ERROR_CODE=0
|
|
||||||
|
|
||||||
@REM To isolate internal variables from possible post scripts, we use another setlocal
|
|
||||||
@setlocal
|
|
||||||
|
|
||||||
@REM ==== START VALIDATION ====
|
|
||||||
if not "%JAVA_HOME%" == "" goto OkJHome
|
|
||||||
|
|
||||||
echo.
|
|
||||||
echo Error: JAVA_HOME not found in your environment. >&2
|
|
||||||
echo Please set the JAVA_HOME variable in your environment to match the >&2
|
|
||||||
echo location of your Java installation. >&2
|
|
||||||
echo.
|
|
||||||
goto error
|
|
||||||
|
|
||||||
:OkJHome
|
|
||||||
if exist "%JAVA_HOME%\bin\java.exe" goto init
|
|
||||||
|
|
||||||
echo.
|
|
||||||
echo Error: JAVA_HOME is set to an invalid directory. >&2
|
|
||||||
echo JAVA_HOME = "%JAVA_HOME%" >&2
|
|
||||||
echo Please set the JAVA_HOME variable in your environment to match the >&2
|
|
||||||
echo location of your Java installation. >&2
|
|
||||||
echo.
|
|
||||||
goto error
|
|
||||||
|
|
||||||
@REM ==== END VALIDATION ====
|
|
||||||
|
|
||||||
:init
|
|
||||||
|
|
||||||
@REM Find the project base dir, i.e. the directory that contains the folder ".mvn".
|
|
||||||
@REM Fallback to current working directory if not found.
|
|
||||||
|
|
||||||
set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR%
|
|
||||||
IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir
|
|
||||||
|
|
||||||
set EXEC_DIR=%CD%
|
|
||||||
set WDIR=%EXEC_DIR%
|
|
||||||
:findBaseDir
|
|
||||||
IF EXIST "%WDIR%"\.mvn goto baseDirFound
|
|
||||||
cd ..
|
|
||||||
IF "%WDIR%"=="%CD%" goto baseDirNotFound
|
|
||||||
set WDIR=%CD%
|
|
||||||
goto findBaseDir
|
|
||||||
|
|
||||||
:baseDirFound
|
|
||||||
set MAVEN_PROJECTBASEDIR=%WDIR%
|
|
||||||
cd "%EXEC_DIR%"
|
|
||||||
goto endDetectBaseDir
|
|
||||||
|
|
||||||
:baseDirNotFound
|
|
||||||
set MAVEN_PROJECTBASEDIR=%EXEC_DIR%
|
|
||||||
cd "%EXEC_DIR%"
|
|
||||||
|
|
||||||
:endDetectBaseDir
|
|
||||||
|
|
||||||
IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig
|
|
||||||
|
|
||||||
@setlocal EnableExtensions EnableDelayedExpansion
|
|
||||||
for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a
|
|
||||||
@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS%
|
|
||||||
|
|
||||||
:endReadAdditionalConfig
|
|
||||||
|
|
||||||
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 DOWNLOAD_URL="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
|
|
||||||
|
|
||||||
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
|
|
||||||
@REM This allows using the maven wrapper in projects that prohibit checking in binary data.
|
|
||||||
if exist %WRAPPER_JAR% (
|
|
||||||
if "%MVNW_VERBOSE%" == "true" (
|
|
||||||
echo Found %WRAPPER_JAR%
|
|
||||||
)
|
|
||||||
) else (
|
|
||||||
if not "%MVNW_REPOURL%" == "" (
|
|
||||||
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: %DOWNLOAD_URL%
|
|
||||||
)
|
|
||||||
|
|
||||||
powershell -Command "&{"^
|
|
||||||
"$webclient = new-object System.Net.WebClient;"^
|
|
||||||
"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('%DOWNLOAD_URL%', '%WRAPPER_JAR%')"^
|
|
||||||
"}"
|
|
||||||
if "%MVNW_VERBOSE%" == "true" (
|
|
||||||
echo Finished downloading %WRAPPER_JAR%
|
|
||||||
)
|
|
||||||
)
|
|
||||||
@REM End of extension
|
|
||||||
|
|
||||||
@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% %*
|
|
||||||
if ERRORLEVEL 1 goto error
|
|
||||||
goto end
|
|
||||||
|
|
||||||
:error
|
|
||||||
set ERROR_CODE=1
|
|
||||||
|
|
||||||
:end
|
|
||||||
@endlocal & set ERROR_CODE=%ERROR_CODE%
|
|
||||||
|
|
||||||
if not "%MAVEN_SKIP_RC%" == "" goto skipRcPost
|
|
||||||
@REM check for post script, once with legacy .bat ending and once with .cmd ending
|
|
||||||
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_TERMINATE_CMD%" == "on" exit %ERROR_CODE%
|
|
||||||
|
|
||||||
exit /B %ERROR_CODE%
|
|
||||||
@@ -4,13 +4,13 @@
|
|||||||
|
|
||||||
<groupId>com.unicenta</groupId>
|
<groupId>com.unicenta</groupId>
|
||||||
<artifactId>unicentaopos</artifactId>
|
<artifactId>unicentaopos</artifactId>
|
||||||
<version>5.4.0</version>
|
<version>5.3.2</version>
|
||||||
<packaging>jar</packaging>
|
<packaging>jar</packaging>
|
||||||
<properties>
|
<properties>
|
||||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||||
<maven.compiler.source>11</maven.compiler.source>
|
<maven.compiler.source>11</maven.compiler.source>
|
||||||
<maven.compiler.target>11</maven.compiler.target>
|
<maven.compiler.target>11</maven.compiler.target>
|
||||||
<derby.version>10.14.2.0</derby.version>
|
<derby.version>10.15.2.0</derby.version>
|
||||||
</properties>
|
</properties>
|
||||||
<dependencies>
|
<dependencies>
|
||||||
<dependency>
|
<dependency>
|
||||||
@@ -111,6 +111,24 @@
|
|||||||
<artifactId>itext</artifactId>
|
<artifactId>itext</artifactId>
|
||||||
<version>2.1.7</version>
|
<version>2.1.7</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
|
<dependency>
|
||||||
|
<groupId>net.sf.jasperreports</groupId>
|
||||||
|
<artifactId>jasperreports</artifactId>
|
||||||
|
<version>6.15.0</version>
|
||||||
|
<exclusions>
|
||||||
|
<exclusion>
|
||||||
|
<groupId>com.lowagie</groupId>
|
||||||
|
<artifactId>itext</artifactId>
|
||||||
|
</exclusion>
|
||||||
|
</exclusions>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>net.sf.jasperreports</groupId>
|
||||||
|
<artifactId>jasperreports-fonts</artifactId>
|
||||||
|
<version>6.15.0</version>
|
||||||
|
</dependency>
|
||||||
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.apache.poi</groupId>
|
<groupId>org.apache.poi</groupId>
|
||||||
<artifactId>poi</artifactId>
|
<artifactId>poi</artifactId>
|
||||||
@@ -122,6 +140,13 @@
|
|||||||
<artifactId>poi-ooxml</artifactId>
|
<artifactId>poi-ooxml</artifactId>
|
||||||
<version>3.17</version>
|
<version>3.17</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.apache.xmlbeans</groupId>
|
||||||
|
<artifactId>xmlbeans</artifactId>
|
||||||
|
<version>5.1.1</version>
|
||||||
|
</dependency>
|
||||||
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>net.sf.barcode4j</groupId>
|
<groupId>net.sf.barcode4j</groupId>
|
||||||
<artifactId>barcode4j</artifactId>
|
<artifactId>barcode4j</artifactId>
|
||||||
@@ -255,11 +280,11 @@
|
|||||||
<artifactId>derbytools</artifactId>
|
<artifactId>derbytools</artifactId>
|
||||||
<version>${derby.version}</version>
|
<version>${derby.version}</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
<!-- <dependency>-->
|
<dependency>
|
||||||
<!-- <groupId>org.apache.derby</groupId>-->
|
<groupId>org.apache.derby</groupId>
|
||||||
<!-- <artifactId>derbyshared</artifactId>-->
|
<artifactId>derbyshared</artifactId>
|
||||||
<!-- <version>${derby.version}</version>-->
|
<version>${derby.version}</version>
|
||||||
<!-- </dependency>-->
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>xml-apis</groupId>
|
<groupId>xml-apis</groupId>
|
||||||
<artifactId>xml-apis</artifactId>
|
<artifactId>xml-apis</artifactId>
|
||||||
@@ -272,22 +297,7 @@
|
|||||||
<artifactId>fop</artifactId>
|
<artifactId>fop</artifactId>
|
||||||
<version>2.3</version>
|
<version>2.3</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
|
||||||
<groupId>net.sf.jasperreports</groupId>
|
|
||||||
<artifactId>jasperreports</artifactId>
|
|
||||||
<version>6.12.2</version>
|
|
||||||
<exclusions>
|
|
||||||
<exclusion>
|
|
||||||
<groupId>com.lowagie</groupId>
|
|
||||||
<artifactId>itext</artifactId>
|
|
||||||
</exclusion>
|
|
||||||
</exclusions>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>net.sf.jasperreports</groupId>
|
|
||||||
<artifactId>jasperreports-fonts</artifactId>
|
|
||||||
<version>6.0.0</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>ar.com.fdvs</groupId>
|
<groupId>ar.com.fdvs</groupId>
|
||||||
<artifactId>DynamicJasper-core-fonts</artifactId>
|
<artifactId>DynamicJasper-core-fonts</artifactId>
|
||||||
@@ -361,7 +371,7 @@
|
|||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.unicenta</groupId>
|
<groupId>com.unicenta</groupId>
|
||||||
<artifactId>unicenta-plugins</artifactId>
|
<artifactId>unicenta-plugins</artifactId>
|
||||||
<version>1.3.1</version>
|
<version>1.2.7</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.gluonhq</groupId>
|
<groupId>com.gluonhq</groupId>
|
||||||
|
|||||||
@@ -19,10 +19,93 @@
|
|||||||
<AuxValue name="FormSettings_listenerGenerationStyle" type="java.lang.Integer" value="0"/>
|
<AuxValue name="FormSettings_listenerGenerationStyle" type="java.lang.Integer" value="0"/>
|
||||||
<AuxValue name="FormSettings_variablesLocal" type="java.lang.Boolean" value="false"/>
|
<AuxValue name="FormSettings_variablesLocal" type="java.lang.Boolean" value="false"/>
|
||||||
<AuxValue name="FormSettings_variablesModifier" type="java.lang.Integer" value="2"/>
|
<AuxValue name="FormSettings_variablesModifier" type="java.lang.Integer" value="2"/>
|
||||||
<AuxValue name="designerSize" type="java.awt.Dimension" value="-84,-19,0,5,115,114,0,18,106,97,118,97,46,97,119,116,46,68,105,109,101,110,115,105,111,110,65,-114,-39,-41,-84,95,68,20,2,0,2,73,0,6,104,101,105,103,104,116,73,0,5,119,105,100,116,104,120,112,0,0,1,-128,0,0,1,-51"/>
|
|
||||||
</AuxValues>
|
</AuxValues>
|
||||||
|
|
||||||
|
<Layout>
|
||||||
|
<DimensionLayout dim="0">
|
||||||
|
<Group type="103" groupAlignment="0" attributes="0">
|
||||||
|
<Group type="102" attributes="0">
|
||||||
|
<EmptySpace max="-2" attributes="0"/>
|
||||||
|
<Group type="103" groupAlignment="0" attributes="0">
|
||||||
|
<Group type="102" attributes="0">
|
||||||
|
<Component id="jLabel3" min="-2" max="-2" attributes="0"/>
|
||||||
|
<EmptySpace type="separate" max="-2" attributes="0"/>
|
||||||
|
<Component id="m_jVisible" min="-2" pref="207" max="-2" attributes="0"/>
|
||||||
|
</Group>
|
||||||
|
<Group type="102" alignment="0" attributes="0">
|
||||||
|
<Component id="jLabel2" min="-2" max="-2" attributes="0"/>
|
||||||
|
<EmptySpace type="unrelated" max="-2" attributes="0"/>
|
||||||
|
<Component id="m_jRole" min="-2" pref="180" max="-2" attributes="0"/>
|
||||||
|
</Group>
|
||||||
|
<Group type="102" alignment="0" attributes="0">
|
||||||
|
<Component id="jLabel4" min="-2" max="-2" attributes="0"/>
|
||||||
|
<EmptySpace type="unrelated" max="-2" attributes="0"/>
|
||||||
|
<Component id="m_jImage" min="-2" max="-2" attributes="0"/>
|
||||||
|
</Group>
|
||||||
|
<Group type="102" alignment="0" attributes="0">
|
||||||
|
<Component id="jLblCardID" min="-2" max="-2" attributes="0"/>
|
||||||
|
<EmptySpace type="unrelated" max="-2" attributes="0"/>
|
||||||
|
<Component id="m_jcard" min="-2" pref="180" max="-2" attributes="0"/>
|
||||||
|
<EmptySpace max="-2" attributes="0"/>
|
||||||
|
<Component id="webCBSecurity" max="-2" attributes="0"/>
|
||||||
|
</Group>
|
||||||
|
<Group type="102" alignment="0" attributes="0">
|
||||||
|
<Group type="103" groupAlignment="0" attributes="0">
|
||||||
|
<Component id="jLabel1" min="-2" max="-2" attributes="0"/>
|
||||||
|
<Component id="jLabel6" alignment="0" min="-2" max="-2" attributes="0"/>
|
||||||
|
</Group>
|
||||||
|
<EmptySpace type="unrelated" max="-2" attributes="0"/>
|
||||||
|
<Group type="103" groupAlignment="0" attributes="0">
|
||||||
|
<Component id="jButton1" min="-2" max="-2" attributes="0"/>
|
||||||
|
<Component id="m_jName" min="-2" pref="180" max="-2" attributes="0"/>
|
||||||
|
</Group>
|
||||||
|
</Group>
|
||||||
|
</Group>
|
||||||
|
<EmptySpace max="-2" attributes="0"/>
|
||||||
|
</Group>
|
||||||
|
</Group>
|
||||||
|
</DimensionLayout>
|
||||||
|
<DimensionLayout dim="1">
|
||||||
|
<Group type="103" groupAlignment="0" attributes="0">
|
||||||
|
<Group type="102" alignment="1" attributes="0">
|
||||||
|
<EmptySpace type="separate" max="-2" attributes="0"/>
|
||||||
|
<Group type="103" groupAlignment="3" attributes="0">
|
||||||
|
<Component id="jLabel1" alignment="3" min="-2" max="-2" attributes="0"/>
|
||||||
|
<Component id="m_jName" alignment="3" min="-2" max="-2" attributes="0"/>
|
||||||
|
</Group>
|
||||||
|
<EmptySpace type="unrelated" max="-2" attributes="0"/>
|
||||||
|
<Group type="103" groupAlignment="2" attributes="0">
|
||||||
|
<Component id="jLabel6" alignment="2" min="-2" max="-2" attributes="0"/>
|
||||||
|
<Component id="jButton1" alignment="2" min="-2" max="-2" attributes="0"/>
|
||||||
|
</Group>
|
||||||
|
<EmptySpace type="unrelated" max="-2" attributes="0"/>
|
||||||
|
<Group type="103" groupAlignment="2" attributes="0">
|
||||||
|
<Component id="jLblCardID" alignment="2" min="-2" max="-2" attributes="0"/>
|
||||||
|
<Component id="m_jcard" alignment="2" min="-2" max="-2" attributes="0"/>
|
||||||
|
<Component id="webCBSecurity" alignment="2" min="-2" max="-2" attributes="0"/>
|
||||||
|
</Group>
|
||||||
|
<EmptySpace type="unrelated" max="-2" attributes="0"/>
|
||||||
|
<Group type="103" groupAlignment="3" attributes="0">
|
||||||
|
<Component id="jLabel2" alignment="3" min="-2" max="-2" attributes="0"/>
|
||||||
|
<Component id="m_jRole" alignment="3" min="-2" max="-2" attributes="0"/>
|
||||||
|
</Group>
|
||||||
|
<EmptySpace type="unrelated" max="-2" attributes="0"/>
|
||||||
|
<Group type="103" groupAlignment="0" attributes="0">
|
||||||
|
<Component id="jLabel3" min="-2" pref="25" max="-2" attributes="0"/>
|
||||||
|
<Component id="m_jVisible" min="-2" pref="25" max="-2" attributes="0"/>
|
||||||
|
</Group>
|
||||||
|
<EmptySpace min="-2" pref="15" max="-2" attributes="0"/>
|
||||||
|
<Group type="103" groupAlignment="0" attributes="0">
|
||||||
|
<Component id="m_jImage" min="-2" max="-2" attributes="0"/>
|
||||||
|
<Component id="jLabel4" min="-2" max="-2" attributes="0"/>
|
||||||
|
</Group>
|
||||||
|
<EmptySpace max="32767" attributes="0"/>
|
||||||
|
</Group>
|
||||||
|
</Group>
|
||||||
|
</DimensionLayout>
|
||||||
|
</Layout>
|
||||||
<SubComponents>
|
<SubComponents>
|
||||||
<Component class="javax.swing.JLabel" name="nameLabel">
|
<Component class="javax.swing.JLabel" name="jLabel1">
|
||||||
<Properties>
|
<Properties>
|
||||||
<Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
|
<Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
|
||||||
<Font name="Arial" size="14" style="0"/>
|
<Font name="Arial" size="14" style="0"/>
|
||||||
@@ -38,10 +121,10 @@
|
|||||||
</Property>
|
</Property>
|
||||||
</Properties>
|
</Properties>
|
||||||
<Events>
|
<Events>
|
||||||
<EventHandler event="mouseClicked" listener="java.awt.event.MouseListener" parameters="java.awt.event.MouseEvent" handler="nameLabelMouseClicked"/>
|
<EventHandler event="mouseClicked" listener="java.awt.event.MouseListener" parameters="java.awt.event.MouseEvent" handler="jLabel1MouseClicked"/>
|
||||||
</Events>
|
</Events>
|
||||||
</Component>
|
</Component>
|
||||||
<Component class="javax.swing.JTextField" name="nameTextField">
|
<Component class="javax.swing.JTextField" name="m_jName">
|
||||||
<Properties>
|
<Properties>
|
||||||
<Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
|
<Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
|
||||||
<Font name="Arial" size="14" style="0"/>
|
<Font name="Arial" size="14" style="0"/>
|
||||||
@@ -51,7 +134,7 @@
|
|||||||
</Property>
|
</Property>
|
||||||
</Properties>
|
</Properties>
|
||||||
</Component>
|
</Component>
|
||||||
<Component class="javax.swing.JCheckBox" name="isVisible">
|
<Component class="javax.swing.JCheckBox" name="m_jVisible">
|
||||||
<Properties>
|
<Properties>
|
||||||
<Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
|
<Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
|
||||||
<Font name="Arial" size="12" style="0"/>
|
<Font name="Arial" size="12" style="0"/>
|
||||||
@@ -61,7 +144,7 @@
|
|||||||
</Property>
|
</Property>
|
||||||
</Properties>
|
</Properties>
|
||||||
</Component>
|
</Component>
|
||||||
<Component class="javax.swing.JLabel" name="visiableLabel">
|
<Component class="javax.swing.JLabel" name="jLabel3">
|
||||||
<Properties>
|
<Properties>
|
||||||
<Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
|
<Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
|
||||||
<Font name="Arial" size="14" style="0"/>
|
<Font name="Arial" size="14" style="0"/>
|
||||||
@@ -74,7 +157,7 @@
|
|||||||
</Property>
|
</Property>
|
||||||
</Properties>
|
</Properties>
|
||||||
</Component>
|
</Component>
|
||||||
<Component class="javax.swing.JLabel" name="imageLabel">
|
<Component class="javax.swing.JLabel" name="jLabel4">
|
||||||
<Properties>
|
<Properties>
|
||||||
<Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
|
<Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
|
||||||
<Font name="Arial" size="14" style="0"/>
|
<Font name="Arial" size="14" style="0"/>
|
||||||
@@ -87,7 +170,7 @@
|
|||||||
</Property>
|
</Property>
|
||||||
</Properties>
|
</Properties>
|
||||||
</Component>
|
</Component>
|
||||||
<Component class="com.unicenta.data.gui.JImageEditor" name="imageEditor">
|
<Component class="com.unicenta.data.gui.JImageEditor" name="m_jImage">
|
||||||
<Properties>
|
<Properties>
|
||||||
<Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
|
<Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
|
||||||
<Font name="Arial" size="12" style="0"/>
|
<Font name="Arial" size="12" style="0"/>
|
||||||
@@ -127,7 +210,7 @@
|
|||||||
</Property>
|
</Property>
|
||||||
</Properties>
|
</Properties>
|
||||||
</Component>
|
</Component>
|
||||||
<Component class="javax.swing.JLabel" name="roleLabel">
|
<Component class="javax.swing.JLabel" name="jLabel2">
|
||||||
<Properties>
|
<Properties>
|
||||||
<Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
|
<Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
|
||||||
<Font name="Arial" size="14" style="0"/>
|
<Font name="Arial" size="14" style="0"/>
|
||||||
@@ -140,7 +223,7 @@
|
|||||||
</Property>
|
</Property>
|
||||||
</Properties>
|
</Properties>
|
||||||
</Component>
|
</Component>
|
||||||
<Component class="javax.swing.JTextField" name="cardIdTextField">
|
<Component class="javax.swing.JTextField" name="m_jcard">
|
||||||
<Properties>
|
<Properties>
|
||||||
<Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
|
<Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
|
||||||
<Font name="Arial" size="14" style="0"/>
|
<Font name="Arial" size="14" style="0"/>
|
||||||
@@ -150,7 +233,7 @@
|
|||||||
</Property>
|
</Property>
|
||||||
</Properties>
|
</Properties>
|
||||||
</Component>
|
</Component>
|
||||||
<Component class="javax.swing.JLabel" name="cardIdLabel">
|
<Component class="javax.swing.JLabel" name="jLblCardID">
|
||||||
<Properties>
|
<Properties>
|
||||||
<Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
|
<Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
|
||||||
<Font name="Arial" size="14" style="0"/>
|
<Font name="Arial" size="14" style="0"/>
|
||||||
@@ -163,7 +246,33 @@
|
|||||||
</Property>
|
</Property>
|
||||||
</Properties>
|
</Properties>
|
||||||
</Component>
|
</Component>
|
||||||
<Component class="javax.swing.JLabel" name="passwordLabel">
|
<Component class="com.alee.laf.combobox.WebComboBox" name="webCBSecurity">
|
||||||
|
<Properties>
|
||||||
|
<Property name="model" type="javax.swing.ComboBoxModel" editor="org.netbeans.modules.form.editors2.ComboBoxModelEditor">
|
||||||
|
<StringArray count="3">
|
||||||
|
<StringItem index="0" value="Generate new key"/>
|
||||||
|
<StringItem index="1" value="Delete exisitng key"/>
|
||||||
|
<StringItem index="2" value="Use iButton ID"/>
|
||||||
|
</StringArray>
|
||||||
|
</Property>
|
||||||
|
<Property name="selectedIndex" type="int" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
|
||||||
|
<Connection code="0" type="code"/>
|
||||||
|
</Property>
|
||||||
|
<Property name="toolTipText" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
|
||||||
|
<ResourceString bundle="pos_messages.properties" key="tooltip.peoplesecurity" replaceFormat="AppLocal.getIntString("tooltip.peoplesecurity")"/>
|
||||||
|
</Property>
|
||||||
|
<Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
|
||||||
|
<Font name="Arial" size="14" style="0"/>
|
||||||
|
</Property>
|
||||||
|
<Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
|
||||||
|
<Dimension value="[140, 45]"/>
|
||||||
|
</Property>
|
||||||
|
</Properties>
|
||||||
|
<Events>
|
||||||
|
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="webCBSecurityActionPerformed"/>
|
||||||
|
</Events>
|
||||||
|
</Component>
|
||||||
|
<Component class="javax.swing.JLabel" name="jLabel6">
|
||||||
<Properties>
|
<Properties>
|
||||||
<Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
|
<Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
|
||||||
<Font name="Arial" size="14" style="0"/>
|
<Font name="Arial" size="14" style="0"/>
|
||||||
@@ -176,12 +285,5 @@
|
|||||||
</Property>
|
</Property>
|
||||||
</Properties>
|
</Properties>
|
||||||
</Component>
|
</Component>
|
||||||
<Component class="javax.swing.JLabel" name="taxIdLabel">
|
|
||||||
<Properties>
|
|
||||||
<Property name="text" type="java.lang.String" value="Tax ID"/>
|
|
||||||
</Properties>
|
|
||||||
</Component>
|
|
||||||
<Component class="javax.swing.JTextField" name="taxIdTextField">
|
|
||||||
</Component>
|
|
||||||
</SubComponents>
|
</SubComponents>
|
||||||
</Form>
|
</Form>
|
||||||
|
|||||||
@@ -52,12 +52,9 @@ public class PeopleView extends JPanel implements EditorRecord {
|
|||||||
|
|
||||||
private final ComboBoxValModel m_ReasonModel;
|
private final ComboBoxValModel m_ReasonModel;
|
||||||
|
|
||||||
/**
|
/** Creates new form PeopleEditor
|
||||||
* Creates new form PeopleEditor
|
|
||||||
*
|
|
||||||
* @param dlAdmin
|
* @param dlAdmin
|
||||||
* @param dirty
|
* @param dirty */
|
||||||
*/
|
|
||||||
public PeopleView(DataLogicAdmin dlAdmin, DirtyManager dirty) {
|
public PeopleView(DataLogicAdmin dlAdmin, DirtyManager dirty) {
|
||||||
|
|
||||||
initComponents();
|
initComponents();
|
||||||
@@ -67,11 +64,11 @@ public class PeopleView extends JPanel implements EditorRecord {
|
|||||||
m_RoleModel = new ComboBoxValModel();
|
m_RoleModel = new ComboBoxValModel();
|
||||||
|
|
||||||
m_Dirty = dirty;
|
m_Dirty = dirty;
|
||||||
nameTextField.getDocument().addDocumentListener(dirty);
|
m_jName.getDocument().addDocumentListener(dirty);
|
||||||
m_jRole.addActionListener(dirty);
|
m_jRole.addActionListener(dirty);
|
||||||
isVisible.addActionListener(dirty);
|
m_jVisible.addActionListener(dirty);
|
||||||
imageEditor.addPropertyChangeListener("image", dirty);
|
m_jImage.addPropertyChangeListener("image", dirty);
|
||||||
cardIdTextField.getDocument().addDocumentListener(dirty);
|
m_jcard.getDocument().addDocumentListener(dirty);
|
||||||
|
|
||||||
m_ReasonModel = new ComboBoxValModel();
|
m_ReasonModel = new ComboBoxValModel();
|
||||||
m_ReasonModel.add(AppLocal.getIntString("cboption.generate"));
|
m_ReasonModel.add(AppLocal.getIntString("cboption.generate"));
|
||||||
@@ -89,17 +86,17 @@ public class PeopleView extends JPanel implements EditorRecord {
|
|||||||
@Override
|
@Override
|
||||||
public void writeValueEOF() {
|
public void writeValueEOF() {
|
||||||
m_oId = null;
|
m_oId = null;
|
||||||
nameTextField.setText(null);
|
m_jName.setText(null);
|
||||||
m_sPassword = null;
|
m_sPassword = null;
|
||||||
m_RoleModel.setSelectedKey(null);
|
m_RoleModel.setSelectedKey(null);
|
||||||
isVisible.setSelected(false);
|
m_jVisible.setSelected(false);
|
||||||
cardIdTextField.setText(null);
|
m_jcard.setText(null);
|
||||||
imageEditor.setImage(null);
|
m_jImage.setImage(null);
|
||||||
nameTextField.setEnabled(false);
|
m_jName.setEnabled(false);
|
||||||
m_jRole.setEnabled(false);
|
m_jRole.setEnabled(false);
|
||||||
isVisible.setEnabled(false);
|
m_jVisible.setEnabled(false);
|
||||||
cardIdTextField.setEnabled(false);
|
m_jcard.setEnabled(false);
|
||||||
imageEditor.setEnabled(false);
|
m_jImage.setEnabled(false);
|
||||||
jButton1.setEnabled(false);
|
jButton1.setEnabled(false);
|
||||||
webCBSecurity.setEnabled(false);
|
webCBSecurity.setEnabled(false);
|
||||||
}
|
}
|
||||||
@@ -110,17 +107,17 @@ public class PeopleView extends JPanel implements EditorRecord {
|
|||||||
@Override
|
@Override
|
||||||
public void writeValueInsert() {
|
public void writeValueInsert() {
|
||||||
m_oId = null;
|
m_oId = null;
|
||||||
nameTextField.setText(null);
|
m_jName.setText(null);
|
||||||
m_sPassword = null;
|
m_sPassword = null;
|
||||||
m_RoleModel.setSelectedKey(null);
|
m_RoleModel.setSelectedKey(null);
|
||||||
isVisible.setSelected(true);
|
m_jVisible.setSelected(true);
|
||||||
cardIdTextField.setText(null);
|
m_jcard.setText(null);
|
||||||
imageEditor.setImage(null);
|
m_jImage.setImage(null);
|
||||||
nameTextField.setEnabled(true);
|
m_jName.setEnabled(true);
|
||||||
m_jRole.setEnabled(true);
|
m_jRole.setEnabled(true);
|
||||||
isVisible.setEnabled(true);
|
m_jVisible.setEnabled(true);
|
||||||
cardIdTextField.setEnabled(true);
|
m_jcard.setEnabled(true);
|
||||||
imageEditor.setEnabled(true);
|
m_jImage.setEnabled(true);
|
||||||
jButton1.setEnabled(true);
|
jButton1.setEnabled(true);
|
||||||
webCBSecurity.setEnabled(true);
|
webCBSecurity.setEnabled(true);
|
||||||
}
|
}
|
||||||
@@ -133,18 +130,18 @@ public class PeopleView extends JPanel implements EditorRecord {
|
|||||||
public void writeValueDelete(Object value) {
|
public void writeValueDelete(Object value) {
|
||||||
Object[] people = (Object[]) value;
|
Object[] people = (Object[]) value;
|
||||||
m_oId = people[0];
|
m_oId = people[0];
|
||||||
nameTextField.setText(Formats.STRING.formatValue(people[1]));
|
m_jName.setText(Formats.STRING.formatValue(people[1]));
|
||||||
m_sPassword = Formats.STRING.formatValue(people[2]);
|
m_sPassword = Formats.STRING.formatValue(people[2]);
|
||||||
m_RoleModel.setSelectedKey(people[3]);
|
m_RoleModel.setSelectedKey(people[3]);
|
||||||
isVisible.setSelected(((Boolean) people[4]).booleanValue());
|
m_jVisible.setSelected(((Boolean) people[4]).booleanValue());
|
||||||
cardIdTextField.setText(Formats.STRING.formatValue(people[5]));
|
m_jcard.setText(Formats.STRING.formatValue(people[5]));
|
||||||
imageEditor.setImage((BufferedImage) people[6]);
|
m_jImage.setImage((BufferedImage) people[6]);
|
||||||
|
|
||||||
nameTextField.setEnabled(false);
|
m_jName.setEnabled(false);
|
||||||
m_jRole.setEnabled(false);
|
m_jRole.setEnabled(false);
|
||||||
isVisible.setEnabled(false);
|
m_jVisible.setEnabled(false);
|
||||||
cardIdTextField.setEnabled(false);
|
m_jcard.setEnabled(false);
|
||||||
imageEditor.setEnabled(false);
|
m_jImage.setEnabled(false);
|
||||||
jButton1.setEnabled(false);
|
jButton1.setEnabled(false);
|
||||||
webCBSecurity.setEnabled(false);
|
webCBSecurity.setEnabled(false);
|
||||||
}
|
}
|
||||||
@@ -157,25 +154,25 @@ public class PeopleView extends JPanel implements EditorRecord {
|
|||||||
public void writeValueEdit(Object value) {
|
public void writeValueEdit(Object value) {
|
||||||
Object[] people = (Object[]) value;
|
Object[] people = (Object[]) value;
|
||||||
m_oId = people[0];
|
m_oId = people[0];
|
||||||
nameTextField.setText(Formats.STRING.formatValue(people[1]));
|
m_jName.setText(Formats.STRING.formatValue(people[1]));
|
||||||
m_sPassword = Formats.STRING.formatValue(people[2]);
|
m_sPassword = Formats.STRING.formatValue(people[2]);
|
||||||
m_RoleModel.setSelectedKey(people[3]);
|
m_RoleModel.setSelectedKey(people[3]);
|
||||||
isVisible.setSelected(((Boolean) people[4]).booleanValue());
|
m_jVisible.setSelected(((Boolean) people[4]).booleanValue());
|
||||||
cardIdTextField.setText(Formats.STRING.formatValue(people[5]));
|
m_jcard.setText(Formats.STRING.formatValue(people[5]));
|
||||||
imageEditor.setImage((BufferedImage) people[6]);
|
m_jImage.setImage((BufferedImage) people[6]);
|
||||||
|
|
||||||
if (cardIdTextField.getText().length() == 16) {
|
if (m_jcard.getText().length() == 16) {
|
||||||
cardIdLabel.setText(AppLocal.getIntString("label.ibutton"));
|
jLblCardID.setText(AppLocal.getIntString("label.ibutton"));
|
||||||
} else {
|
} else {
|
||||||
cardIdLabel.setText(AppLocal.getIntString("label.card"));
|
jLblCardID.setText(AppLocal.getIntString("label.card"));
|
||||||
}
|
}
|
||||||
System.out.println(cardIdTextField.getText().length());
|
System.out.println(m_jcard.getText().length());
|
||||||
|
|
||||||
nameTextField.setEnabled(true);
|
m_jName.setEnabled(true);
|
||||||
m_jRole.setEnabled(true);
|
m_jRole.setEnabled(true);
|
||||||
isVisible.setEnabled(true);
|
m_jVisible.setEnabled(true);
|
||||||
cardIdTextField.setEnabled(true);
|
m_jcard.setEnabled(true);
|
||||||
imageEditor.setEnabled(true);
|
m_jImage.setEnabled(true);
|
||||||
jButton1.setEnabled(true);
|
jButton1.setEnabled(true);
|
||||||
webCBSecurity.setEnabled(true);
|
webCBSecurity.setEnabled(true);
|
||||||
}
|
}
|
||||||
@@ -189,12 +186,12 @@ public class PeopleView extends JPanel implements EditorRecord {
|
|||||||
public Object createValue() throws BasicException {
|
public Object createValue() throws BasicException {
|
||||||
Object[] people = new Object[7];
|
Object[] people = new Object[7];
|
||||||
people[0] = m_oId == null ? UUID.randomUUID().toString() : m_oId;
|
people[0] = m_oId == null ? UUID.randomUUID().toString() : m_oId;
|
||||||
people[1] = Formats.STRING.parseValue(nameTextField.getText());
|
people[1] = Formats.STRING.parseValue(m_jName.getText());
|
||||||
people[2] = Formats.STRING.parseValue(m_sPassword);
|
people[2] = Formats.STRING.parseValue(m_sPassword);
|
||||||
people[3] = m_RoleModel.getSelectedKey();
|
people[3] = m_RoleModel.getSelectedKey();
|
||||||
people[4] = isVisible.isSelected();
|
people[4] = m_jVisible.isSelected();
|
||||||
people[5] = Formats.STRING.parseValue(cardIdTextField.getText());
|
people[5] = Formats.STRING.parseValue(m_jcard.getText());
|
||||||
people[6] = imageEditor.getImage();
|
people[6] = m_jImage.getImage();
|
||||||
return people;
|
return people;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -217,6 +214,7 @@ public class PeopleView extends JPanel implements EditorRecord {
|
|||||||
m_jRole.setModel(m_RoleModel);
|
m_jRole.setModel(m_RoleModel);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
@@ -224,66 +222,57 @@ public class PeopleView extends JPanel implements EditorRecord {
|
|||||||
public void refresh() {
|
public void refresh() {
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/** This method is called from within the constructor to
|
||||||
* This method is called from within the constructor to
|
|
||||||
* initialize the form.
|
* initialize the form.
|
||||||
* WARNING: Do NOT modify this code. The content of this method is
|
* WARNING: Do NOT modify this code. The content of this method is
|
||||||
* always regenerated by the Form Editor.
|
* always regenerated by the Form Editor.
|
||||||
*/
|
*/
|
||||||
// <editor-fold defaultstate="collapsed" desc="Generated
|
// <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents
|
||||||
// Code">//GEN-BEGIN:initComponents
|
|
||||||
private void initComponents() {
|
private void initComponents() {
|
||||||
|
|
||||||
nameLabel = new javax.swing.JLabel();
|
jLabel1 = new javax.swing.JLabel();
|
||||||
nameTextField = new javax.swing.JTextField();
|
m_jName = new javax.swing.JTextField();
|
||||||
isVisible = new javax.swing.JCheckBox();
|
m_jVisible = new javax.swing.JCheckBox();
|
||||||
visiableLabel = new javax.swing.JLabel();
|
jLabel3 = new javax.swing.JLabel();
|
||||||
imageLabel = new javax.swing.JLabel();
|
jLabel4 = new javax.swing.JLabel();
|
||||||
imageEditor = new com.unicenta.data.gui.JImageEditor();
|
m_jImage = new com.unicenta.data.gui.JImageEditor();
|
||||||
jButton1 = new javax.swing.JButton();
|
jButton1 = new javax.swing.JButton();
|
||||||
m_jRole = new javax.swing.JComboBox();
|
m_jRole = new javax.swing.JComboBox();
|
||||||
roleLabel = new javax.swing.JLabel();
|
jLabel2 = new javax.swing.JLabel();
|
||||||
cardIdTextField = new javax.swing.JTextField();
|
m_jcard = new javax.swing.JTextField();
|
||||||
cardIdLabel = new javax.swing.JLabel();
|
jLblCardID = new javax.swing.JLabel();
|
||||||
passwordLabel = new javax.swing.JLabel();
|
webCBSecurity = new com.alee.laf.combobox.WebComboBox();
|
||||||
taxIdLabel = new javax.swing.JLabel();
|
jLabel6 = new javax.swing.JLabel();
|
||||||
taxIdTextField = new javax.swing.JTextField();
|
|
||||||
|
|
||||||
setFont(new java.awt.Font("Arial", 0, 12)); // NOI18N
|
setFont(new java.awt.Font("Arial", 0, 12)); // NOI18N
|
||||||
setPreferredSize(new java.awt.Dimension(500, 500));
|
setPreferredSize(new java.awt.Dimension(500, 500));
|
||||||
|
|
||||||
nameLabel.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
|
jLabel1.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
|
||||||
nameLabel.setIcon(new javax.swing.ImageIcon(getClass().getResource("/com/unicenta/images/info.png"))); // NOI18N
|
jLabel1.setIcon(new javax.swing.ImageIcon(getClass().getResource("/com/unicenta/images/info.png"))); // NOI18N
|
||||||
nameLabel.setText(AppLocal.getIntString("label.peoplenamem")); // NOI18N
|
jLabel1.setText(AppLocal.getIntString("label.peoplenamem")); // NOI18N
|
||||||
nameLabel.setPreferredSize(new java.awt.Dimension(110, 30));
|
jLabel1.setPreferredSize(new java.awt.Dimension(110, 30));
|
||||||
nameLabel.addMouseListener(new java.awt.event.MouseAdapter() {
|
jLabel1.addMouseListener(new java.awt.event.MouseAdapter() {
|
||||||
public void mouseClicked(java.awt.event.MouseEvent evt) {
|
public void mouseClicked(java.awt.event.MouseEvent evt) {
|
||||||
nameLabelMouseClicked(evt);
|
jLabel1MouseClicked(evt);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
add(nameLabel);
|
|
||||||
|
|
||||||
nameTextField.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
|
m_jName.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
|
||||||
nameTextField.setPreferredSize(new java.awt.Dimension(0, 30));
|
m_jName.setPreferredSize(new java.awt.Dimension(0, 30));
|
||||||
add(nameTextField);
|
|
||||||
|
|
||||||
isVisible.setFont(new java.awt.Font("Arial", 0, 12)); // NOI18N
|
m_jVisible.setFont(new java.awt.Font("Arial", 0, 12)); // NOI18N
|
||||||
isVisible.setPreferredSize(new java.awt.Dimension(0, 30));
|
m_jVisible.setPreferredSize(new java.awt.Dimension(0, 30));
|
||||||
add(isVisible);
|
|
||||||
|
|
||||||
visiableLabel.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
|
jLabel3.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
|
||||||
visiableLabel.setText(AppLocal.getIntString("label.peoplevisible")); // NOI18N
|
jLabel3.setText(AppLocal.getIntString("label.peoplevisible")); // NOI18N
|
||||||
visiableLabel.setPreferredSize(new java.awt.Dimension(110, 30));
|
jLabel3.setPreferredSize(new java.awt.Dimension(110, 30));
|
||||||
add(visiableLabel);
|
|
||||||
|
|
||||||
imageLabel.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
|
jLabel4.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
|
||||||
imageLabel.setText(AppLocal.getIntString("label.peopleimage")); // NOI18N
|
jLabel4.setText(AppLocal.getIntString("label.peopleimage")); // NOI18N
|
||||||
imageLabel.setPreferredSize(new java.awt.Dimension(110, 30));
|
jLabel4.setPreferredSize(new java.awt.Dimension(110, 30));
|
||||||
add(imageLabel);
|
|
||||||
|
|
||||||
imageEditor.setFont(new java.awt.Font("Arial", 0, 12)); // NOI18N
|
m_jImage.setFont(new java.awt.Font("Arial", 0, 12)); // NOI18N
|
||||||
imageEditor.setPreferredSize(new java.awt.Dimension(300, 250));
|
m_jImage.setPreferredSize(new java.awt.Dimension(300, 250));
|
||||||
add(imageEditor);
|
|
||||||
|
|
||||||
jButton1.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
|
jButton1.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
|
||||||
jButton1.setIcon(new javax.swing.ImageIcon(getClass().getResource("/com/unicenta/images/password.png"))); // NOI18N
|
jButton1.setIcon(new javax.swing.ImageIcon(getClass().getResource("/com/unicenta/images/password.png"))); // NOI18N
|
||||||
@@ -295,37 +284,104 @@ public class PeopleView extends JPanel implements EditorRecord {
|
|||||||
jButton1ActionPerformed(evt);
|
jButton1ActionPerformed(evt);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
add(jButton1);
|
|
||||||
|
|
||||||
m_jRole.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
|
m_jRole.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
|
||||||
m_jRole.setPreferredSize(new java.awt.Dimension(0, 30));
|
m_jRole.setPreferredSize(new java.awt.Dimension(0, 30));
|
||||||
add(m_jRole);
|
|
||||||
|
|
||||||
roleLabel.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
|
jLabel2.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
|
||||||
roleLabel.setText(AppLocal.getIntString("label.rolem")); // NOI18N
|
jLabel2.setText(AppLocal.getIntString("label.rolem")); // NOI18N
|
||||||
roleLabel.setPreferredSize(new java.awt.Dimension(110, 30));
|
jLabel2.setPreferredSize(new java.awt.Dimension(110, 30));
|
||||||
add(roleLabel);
|
|
||||||
|
|
||||||
cardIdTextField.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
|
m_jcard.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
|
||||||
cardIdTextField.setPreferredSize(new java.awt.Dimension(0, 30));
|
m_jcard.setPreferredSize(new java.awt.Dimension(0, 30));
|
||||||
add(cardIdTextField);
|
|
||||||
|
|
||||||
cardIdLabel.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
|
jLblCardID.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
|
||||||
cardIdLabel.setText(AppLocal.getIntString("label.card")); // NOI18N
|
jLblCardID.setText(AppLocal.getIntString("label.card")); // NOI18N
|
||||||
cardIdLabel.setPreferredSize(new java.awt.Dimension(110, 30));
|
jLblCardID.setPreferredSize(new java.awt.Dimension(110, 30));
|
||||||
add(cardIdLabel);
|
|
||||||
|
|
||||||
passwordLabel.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
|
webCBSecurity.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "Generate new key", "Delete exisitng key", "Use iButton ID" }));
|
||||||
passwordLabel.setText(AppLocal.getIntString("label.Password")); // NOI18N
|
webCBSecurity.setSelectedIndex(0);
|
||||||
passwordLabel.setPreferredSize(new java.awt.Dimension(110, 30));
|
webCBSecurity.setToolTipText(AppLocal.getIntString("tooltip.peoplesecurity")); // NOI18N
|
||||||
add(passwordLabel);
|
webCBSecurity.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
|
||||||
|
webCBSecurity.setPreferredSize(new java.awt.Dimension(140, 45));
|
||||||
|
webCBSecurity.addActionListener(new java.awt.event.ActionListener() {
|
||||||
|
public void actionPerformed(java.awt.event.ActionEvent evt) {
|
||||||
|
webCBSecurityActionPerformed(evt);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
taxIdLabel.setText("Tax ID");
|
jLabel6.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
|
||||||
add(taxIdLabel);
|
jLabel6.setText(AppLocal.getIntString("label.Password")); // NOI18N
|
||||||
add(taxIdTextField);
|
jLabel6.setPreferredSize(new java.awt.Dimension(110, 30));
|
||||||
|
|
||||||
|
javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
|
||||||
|
this.setLayout(layout);
|
||||||
|
layout.setHorizontalGroup(
|
||||||
|
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
|
||||||
|
.addGroup(layout.createSequentialGroup()
|
||||||
|
.addContainerGap()
|
||||||
|
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
|
||||||
|
.addGroup(layout.createSequentialGroup()
|
||||||
|
.addComponent(jLabel3, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
|
||||||
|
.addGap(18, 18, 18)
|
||||||
|
.addComponent(m_jVisible, javax.swing.GroupLayout.PREFERRED_SIZE, 207, javax.swing.GroupLayout.PREFERRED_SIZE))
|
||||||
|
.addGroup(layout.createSequentialGroup()
|
||||||
|
.addComponent(jLabel2, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
|
||||||
|
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
|
||||||
|
.addComponent(m_jRole, javax.swing.GroupLayout.PREFERRED_SIZE, 180, javax.swing.GroupLayout.PREFERRED_SIZE))
|
||||||
|
.addGroup(layout.createSequentialGroup()
|
||||||
|
.addComponent(jLabel4, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
|
||||||
|
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
|
||||||
|
.addComponent(m_jImage, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
|
||||||
|
.addGroup(layout.createSequentialGroup()
|
||||||
|
.addComponent(jLblCardID, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
|
||||||
|
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
|
||||||
|
.addComponent(m_jcard, javax.swing.GroupLayout.PREFERRED_SIZE, 180, javax.swing.GroupLayout.PREFERRED_SIZE)
|
||||||
|
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
|
||||||
|
.addComponent(webCBSecurity, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
|
||||||
|
.addGroup(layout.createSequentialGroup()
|
||||||
|
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
|
||||||
|
.addComponent(jLabel1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
|
||||||
|
.addComponent(jLabel6, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
|
||||||
|
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
|
||||||
|
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
|
||||||
|
.addComponent(jButton1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
|
||||||
|
.addComponent(m_jName, javax.swing.GroupLayout.PREFERRED_SIZE, 180, javax.swing.GroupLayout.PREFERRED_SIZE))))
|
||||||
|
.addContainerGap())
|
||||||
|
);
|
||||||
|
layout.setVerticalGroup(
|
||||||
|
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
|
||||||
|
.addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup()
|
||||||
|
.addGap(18, 18, 18)
|
||||||
|
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
|
||||||
|
.addComponent(jLabel1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
|
||||||
|
.addComponent(m_jName, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
|
||||||
|
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
|
||||||
|
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.CENTER)
|
||||||
|
.addComponent(jLabel6, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
|
||||||
|
.addComponent(jButton1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
|
||||||
|
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
|
||||||
|
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.CENTER)
|
||||||
|
.addComponent(jLblCardID, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
|
||||||
|
.addComponent(m_jcard, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
|
||||||
|
.addComponent(webCBSecurity, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
|
||||||
|
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
|
||||||
|
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
|
||||||
|
.addComponent(jLabel2, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
|
||||||
|
.addComponent(m_jRole, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
|
||||||
|
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
|
||||||
|
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
|
||||||
|
.addComponent(jLabel3, javax.swing.GroupLayout.PREFERRED_SIZE, 25, javax.swing.GroupLayout.PREFERRED_SIZE)
|
||||||
|
.addComponent(m_jVisible, javax.swing.GroupLayout.PREFERRED_SIZE, 25, javax.swing.GroupLayout.PREFERRED_SIZE))
|
||||||
|
.addGap(15, 15, 15)
|
||||||
|
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
|
||||||
|
.addComponent(m_jImage, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
|
||||||
|
.addComponent(jLabel4, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
|
||||||
|
.addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
|
||||||
|
);
|
||||||
}// </editor-fold>//GEN-END:initComponents
|
}// </editor-fold>//GEN-END:initComponents
|
||||||
|
|
||||||
private void jButton1ActionPerformed(java.awt.event.ActionEvent evt) {// GEN-FIRST:event_jButton1ActionPerformed
|
private void jButton1ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jButton1ActionPerformed
|
||||||
|
|
||||||
String sNewPassword = Hashcypher.changePassword(this);
|
String sNewPassword = Hashcypher.changePassword(this);
|
||||||
if (sNewPassword != null) {
|
if (sNewPassword != null) {
|
||||||
@@ -333,33 +389,36 @@ public class PeopleView extends JPanel implements EditorRecord {
|
|||||||
m_Dirty.setDirty(true);
|
m_Dirty.setDirty(true);
|
||||||
}
|
}
|
||||||
|
|
||||||
}// GEN-LAST:event_jButton1ActionPerformed
|
}//GEN-LAST:event_jButton1ActionPerformed
|
||||||
|
|
||||||
private void webCBSecurityActionPerformed(java.awt.event.ActionEvent evt) {// GEN-FIRST:event_webCBSecurityActionPerformed
|
private void webCBSecurityActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_webCBSecurityActionPerformed
|
||||||
|
|
||||||
if (webCBSecurity.getSelectedIndex() == 0) {
|
|
||||||
|
if(webCBSecurity.getSelectedIndex() == 0){
|
||||||
if (JOptionPane.showConfirmDialog(this,
|
if (JOptionPane.showConfirmDialog(this,
|
||||||
AppLocal.getIntString("message.cardnew"),
|
AppLocal.getIntString("message.cardnew"),
|
||||||
AppLocal.getIntString("title.editor"),
|
AppLocal.getIntString("title.editor"),
|
||||||
JOptionPane.YES_NO_OPTION,
|
JOptionPane.YES_NO_OPTION,
|
||||||
JOptionPane.QUESTION_MESSAGE) == JOptionPane.YES_OPTION) {
|
JOptionPane.QUESTION_MESSAGE) == JOptionPane.YES_OPTION)
|
||||||
cardIdTextField.setText("C" + StringUtils.getCardNumber());
|
{
|
||||||
|
m_jcard.setText("C" + StringUtils.getCardNumber());
|
||||||
m_Dirty.setDirty(true);
|
m_Dirty.setDirty(true);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (webCBSecurity.getSelectedIndex() == 1) {
|
if(webCBSecurity.getSelectedIndex() == 1){
|
||||||
if (JOptionPane.showConfirmDialog(this,
|
if (JOptionPane.showConfirmDialog(this,
|
||||||
AppLocal.getIntString("message.cardremove"),
|
AppLocal.getIntString("message.cardremove"),
|
||||||
AppLocal.getIntString("title.editor"),
|
AppLocal.getIntString("title.editor"),
|
||||||
JOptionPane.YES_NO_OPTION,
|
JOptionPane.YES_NO_OPTION,
|
||||||
JOptionPane.QUESTION_MESSAGE) == JOptionPane.YES_OPTION) {
|
JOptionPane.QUESTION_MESSAGE) == JOptionPane.YES_OPTION)
|
||||||
cardIdTextField.setText(null);
|
{
|
||||||
|
m_jcard.setText(null);
|
||||||
m_Dirty.setDirty(true);
|
m_Dirty.setDirty(true);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (webCBSecurity.getSelectedIndex() == 2) {
|
if(webCBSecurity.getSelectedIndex() == 2){
|
||||||
if (JOptionPane.showConfirmDialog(this,
|
if (JOptionPane.showConfirmDialog(this,
|
||||||
AppLocal.getIntString("message.ibuttonassign"),
|
AppLocal.getIntString("message.ibuttonassign"),
|
||||||
AppLocal.getIntString("title.editor"),
|
AppLocal.getIntString("title.editor"),
|
||||||
@@ -367,16 +426,16 @@ public class PeopleView extends JPanel implements EditorRecord {
|
|||||||
JOptionPane.INFORMATION_MESSAGE) == JOptionPane.OK_OPTION)
|
JOptionPane.INFORMATION_MESSAGE) == JOptionPane.OK_OPTION)
|
||||||
|
|
||||||
{
|
{
|
||||||
cardIdTextField.setText(uOWWatch.getibuttonid());
|
m_jcard.setText( uOWWatch.getibuttonid() );
|
||||||
cardIdLabel.setText(AppLocal.getIntString("label.ibutton"));
|
jLblCardID.setText(AppLocal.getIntString("label.ibutton"));
|
||||||
m_Dirty.setDirty(true);
|
m_Dirty.setDirty(true);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}// GEN-LAST:event_webCBSecurityActionPerformed
|
}//GEN-LAST:event_webCBSecurityActionPerformed
|
||||||
|
|
||||||
private void nameLabelMouseClicked(java.awt.event.MouseEvent evt) {// GEN-FIRST:event_nameLabelMouseClicked
|
private void jLabel1MouseClicked(java.awt.event.MouseEvent evt) {//GEN-FIRST:event_jLabel1MouseClicked
|
||||||
if (evt.getClickCount() == 2) {
|
if (evt.getClickCount() == 2) {
|
||||||
String uuidString = m_oId.toString();
|
String uuidString = m_oId.toString();
|
||||||
StringSelection stringSelection = new StringSelection(uuidString);
|
StringSelection stringSelection = new StringSelection(uuidString);
|
||||||
@@ -386,23 +445,22 @@ public class PeopleView extends JPanel implements EditorRecord {
|
|||||||
JOptionPane.showMessageDialog(null,
|
JOptionPane.showMessageDialog(null,
|
||||||
AppLocal.getIntString("message.uuidcopy"));
|
AppLocal.getIntString("message.uuidcopy"));
|
||||||
}
|
}
|
||||||
}// GEN-LAST:event_nameLabelMouseClicked
|
}//GEN-LAST:event_jLabel1MouseClicked
|
||||||
|
|
||||||
|
|
||||||
// Variables declaration - do not modify//GEN-BEGIN:variables
|
// Variables declaration - do not modify//GEN-BEGIN:variables
|
||||||
private javax.swing.JLabel cardIdLabel;
|
|
||||||
private javax.swing.JTextField cardIdTextField;
|
|
||||||
private com.unicenta.data.gui.JImageEditor imageEditor;
|
|
||||||
private javax.swing.JLabel imageLabel;
|
|
||||||
private javax.swing.JCheckBox isVisible;
|
|
||||||
private javax.swing.JButton jButton1;
|
private javax.swing.JButton jButton1;
|
||||||
|
private javax.swing.JLabel jLabel1;
|
||||||
|
private javax.swing.JLabel jLabel2;
|
||||||
|
private javax.swing.JLabel jLabel3;
|
||||||
|
private javax.swing.JLabel jLabel4;
|
||||||
|
private javax.swing.JLabel jLabel6;
|
||||||
|
private javax.swing.JLabel jLblCardID;
|
||||||
|
private com.unicenta.data.gui.JImageEditor m_jImage;
|
||||||
|
private javax.swing.JTextField m_jName;
|
||||||
private javax.swing.JComboBox m_jRole;
|
private javax.swing.JComboBox m_jRole;
|
||||||
private javax.swing.JLabel nameLabel;
|
private javax.swing.JCheckBox m_jVisible;
|
||||||
private javax.swing.JTextField nameTextField;
|
private javax.swing.JTextField m_jcard;
|
||||||
private javax.swing.JLabel passwordLabel;
|
|
||||||
private javax.swing.JLabel roleLabel;
|
|
||||||
private javax.swing.JLabel taxIdLabel;
|
|
||||||
private javax.swing.JTextField taxIdTextField;
|
|
||||||
private javax.swing.JLabel visiableLabel;
|
|
||||||
private com.alee.laf.combobox.WebComboBox webCBSecurity;
|
private com.alee.laf.combobox.WebComboBox webCBSecurity;
|
||||||
// End of variables declaration//GEN-END:variables
|
// End of variables declaration//GEN-END:variables
|
||||||
|
|
||||||
|
|||||||
@@ -174,8 +174,7 @@ public class CustomersPayment extends javax.swing.JPanel implements JPanelView,
|
|||||||
btnPay.setEnabled(true);
|
btnPay.setEnabled(true);
|
||||||
btnPrePay.setEnabled(true);
|
btnPrePay.setEnabled(true);
|
||||||
|
|
||||||
// btnPay.setEnabled(customer.getCurdebt() != null &&
|
// btnPay.setEnabled(customer.getCurdebt() != null && customer.getCurdebt().doubleValue() > 0.0);
|
||||||
// customer.getCurdebt().doubleValue() > 0.0);
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -250,22 +249,20 @@ public class CustomersPayment extends javax.swing.JPanel implements JPanelView,
|
|||||||
script.put("ticket", ticket);
|
script.put("ticket", ticket);
|
||||||
script.put("customer", customer);
|
script.put("customer", customer);
|
||||||
ttp.printTicket(script.eval(resource).toString());
|
ttp.printTicket(script.eval(resource).toString());
|
||||||
// JG 6 May use multicatch
|
// JG 6 May use multicatch
|
||||||
} catch (ScriptException | TicketPrinterException e) {
|
} catch ( ScriptException | TicketPrinterException e) {
|
||||||
MessageInf msg = new MessageInf(MessageInf.SGN_WARNING, AppLocal.getIntString("message.cannotprintticket"), e);
|
MessageInf msg = new MessageInf(MessageInf.SGN_WARNING, AppLocal.getIntString("message.cannotprintticket"), e);
|
||||||
msg.show(this);
|
msg.show(this);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/** This method is called from within the constructor to
|
||||||
* This method is called from within the constructor to
|
|
||||||
* initialize the form.
|
* initialize the form.
|
||||||
* WARNING: Do NOT modify this code. The content of this method is
|
* WARNING: Do NOT modify this code. The content of this method is
|
||||||
* always regenerated by the Form Editor.
|
* always regenerated by the Form Editor.
|
||||||
*/
|
*/
|
||||||
// <editor-fold defaultstate="collapsed" desc="Generated
|
// <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents
|
||||||
// Code">//GEN-BEGIN:initComponents
|
|
||||||
private void initComponents() {
|
private void initComponents() {
|
||||||
java.awt.GridBagConstraints gridBagConstraints;
|
java.awt.GridBagConstraints gridBagConstraints;
|
||||||
|
|
||||||
@@ -513,124 +510,93 @@ public class CustomersPayment extends javax.swing.JPanel implements JPanelView,
|
|||||||
.addContainerGap()
|
.addContainerGap()
|
||||||
.addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
|
.addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
|
||||||
.addGroup(jPanel1Layout.createSequentialGroup()
|
.addGroup(jPanel1Layout.createSequentialGroup()
|
||||||
.addComponent(jLabel3, javax.swing.GroupLayout.PREFERRED_SIZE, 140,
|
.addComponent(jLabel3, javax.swing.GroupLayout.PREFERRED_SIZE, 140, javax.swing.GroupLayout.PREFERRED_SIZE)
|
||||||
javax.swing.GroupLayout.PREFERRED_SIZE)
|
|
||||||
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
|
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
|
||||||
.addComponent(txtName, javax.swing.GroupLayout.PREFERRED_SIZE, 240,
|
.addComponent(txtName, javax.swing.GroupLayout.PREFERRED_SIZE, 240, javax.swing.GroupLayout.PREFERRED_SIZE))
|
||||||
javax.swing.GroupLayout.PREFERRED_SIZE))
|
|
||||||
.addGroup(jPanel1Layout.createSequentialGroup()
|
.addGroup(jPanel1Layout.createSequentialGroup()
|
||||||
.addComponent(jLabel5, javax.swing.GroupLayout.PREFERRED_SIZE, 140,
|
.addComponent(jLabel5, javax.swing.GroupLayout.PREFERRED_SIZE, 140, javax.swing.GroupLayout.PREFERRED_SIZE)
|
||||||
javax.swing.GroupLayout.PREFERRED_SIZE)
|
|
||||||
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
|
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
|
||||||
.addComponent(txtCard, javax.swing.GroupLayout.PREFERRED_SIZE, 240,
|
.addComponent(txtCard, javax.swing.GroupLayout.PREFERRED_SIZE, 240, javax.swing.GroupLayout.PREFERRED_SIZE))
|
||||||
javax.swing.GroupLayout.PREFERRED_SIZE))
|
|
||||||
.addGroup(jPanel1Layout.createSequentialGroup()
|
.addGroup(jPanel1Layout.createSequentialGroup()
|
||||||
.addComponent(jLabel7, javax.swing.GroupLayout.PREFERRED_SIZE, 140,
|
.addComponent(jLabel7, javax.swing.GroupLayout.PREFERRED_SIZE, 140, javax.swing.GroupLayout.PREFERRED_SIZE)
|
||||||
javax.swing.GroupLayout.PREFERRED_SIZE)
|
|
||||||
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
|
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
|
||||||
.addComponent(txtTaxId, javax.swing.GroupLayout.PREFERRED_SIZE, 240,
|
.addComponent(txtTaxId, javax.swing.GroupLayout.PREFERRED_SIZE, 240, javax.swing.GroupLayout.PREFERRED_SIZE))
|
||||||
javax.swing.GroupLayout.PREFERRED_SIZE))
|
|
||||||
.addGroup(jPanel1Layout.createSequentialGroup()
|
.addGroup(jPanel1Layout.createSequentialGroup()
|
||||||
.addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
|
.addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
|
||||||
.addComponent(jLabel12, javax.swing.GroupLayout.PREFERRED_SIZE, 140,
|
.addComponent(jLabel12, javax.swing.GroupLayout.PREFERRED_SIZE, 140, javax.swing.GroupLayout.PREFERRED_SIZE)
|
||||||
javax.swing.GroupLayout.PREFERRED_SIZE)
|
.addComponent(jLabel4, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
|
||||||
.addComponent(jLabel4, javax.swing.GroupLayout.PREFERRED_SIZE,
|
|
||||||
javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
|
|
||||||
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
|
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
|
||||||
.addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
|
.addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
|
||||||
.addComponent(txtPrePay, javax.swing.GroupLayout.PREFERRED_SIZE,
|
.addComponent(txtPrePay, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
|
||||||
javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
|
.addComponent(txtNotes, javax.swing.GroupLayout.PREFERRED_SIZE, 250, javax.swing.GroupLayout.PREFERRED_SIZE)))))
|
||||||
.addComponent(txtNotes, javax.swing.GroupLayout.PREFERRED_SIZE, 250,
|
|
||||||
javax.swing.GroupLayout.PREFERRED_SIZE)))))
|
|
||||||
.addGroup(jPanel1Layout.createSequentialGroup()
|
.addGroup(jPanel1Layout.createSequentialGroup()
|
||||||
.addGap(18, 18, 18)
|
.addGap(18, 18, 18)
|
||||||
.addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
|
.addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
|
||||||
.addGroup(jPanel1Layout.createSequentialGroup()
|
.addGroup(jPanel1Layout.createSequentialGroup()
|
||||||
.addComponent(txtMaxdebt, javax.swing.GroupLayout.PREFERRED_SIZE,
|
.addComponent(txtMaxdebt, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
|
||||||
javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
|
|
||||||
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
|
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
|
||||||
.addComponent(txtCurdebt, javax.swing.GroupLayout.PREFERRED_SIZE,
|
.addComponent(txtCurdebt, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
|
||||||
javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
|
|
||||||
.addGroup(jPanel1Layout.createSequentialGroup()
|
.addGroup(jPanel1Layout.createSequentialGroup()
|
||||||
.addComponent(jLabel1, javax.swing.GroupLayout.PREFERRED_SIZE,
|
.addComponent(jLabel1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
|
||||||
javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
|
|
||||||
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
|
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
|
||||||
.addComponent(jLabel2, javax.swing.GroupLayout.PREFERRED_SIZE,
|
.addComponent(jLabel2, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)))
|
||||||
javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)))
|
|
||||||
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
|
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
|
||||||
.addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
|
.addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
|
||||||
.addComponent(jLabel6, javax.swing.GroupLayout.PREFERRED_SIZE,
|
.addComponent(jLabel6, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
|
||||||
javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
|
.addComponent(txtCurdate, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))))
|
||||||
.addComponent(txtCurdate, javax.swing.GroupLayout.PREFERRED_SIZE,
|
.addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
|
||||||
javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))))
|
);
|
||||||
.addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)));
|
|
||||||
jPanel1Layout.setVerticalGroup(
|
jPanel1Layout.setVerticalGroup(
|
||||||
jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
|
jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
|
||||||
.addGroup(jPanel1Layout.createSequentialGroup()
|
.addGroup(jPanel1Layout.createSequentialGroup()
|
||||||
.addContainerGap()
|
.addContainerGap()
|
||||||
.addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
|
.addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
|
||||||
.addComponent(jLabel7, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE,
|
.addComponent(jLabel7, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
|
||||||
javax.swing.GroupLayout.PREFERRED_SIZE)
|
.addComponent(txtTaxId, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
|
||||||
.addComponent(txtTaxId, javax.swing.GroupLayout.PREFERRED_SIZE,
|
|
||||||
javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
|
|
||||||
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
|
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
|
||||||
.addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
|
.addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
|
||||||
.addComponent(jLabel3, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE,
|
.addComponent(jLabel3, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
|
||||||
javax.swing.GroupLayout.PREFERRED_SIZE)
|
.addComponent(txtName, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
|
||||||
.addComponent(txtName, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE,
|
|
||||||
javax.swing.GroupLayout.PREFERRED_SIZE))
|
|
||||||
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
|
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
|
||||||
.addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
|
.addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
|
||||||
.addComponent(jLabel5, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE,
|
.addComponent(jLabel5, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
|
||||||
javax.swing.GroupLayout.PREFERRED_SIZE)
|
.addComponent(txtCard, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
|
||||||
.addComponent(txtCard, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE,
|
|
||||||
javax.swing.GroupLayout.PREFERRED_SIZE))
|
|
||||||
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
|
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
|
||||||
.addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
|
.addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
|
||||||
.addComponent(jLabel12, javax.swing.GroupLayout.PREFERRED_SIZE,
|
.addComponent(jLabel12, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
|
||||||
javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
|
.addComponent(txtNotes, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
|
||||||
.addComponent(txtNotes, javax.swing.GroupLayout.PREFERRED_SIZE,
|
|
||||||
javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
|
|
||||||
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
|
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
|
||||||
.addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING)
|
.addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING)
|
||||||
.addComponent(jLabel4, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE,
|
.addComponent(jLabel4, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
|
||||||
javax.swing.GroupLayout.PREFERRED_SIZE)
|
.addComponent(txtPrePay, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
|
||||||
.addComponent(txtPrePay, javax.swing.GroupLayout.PREFERRED_SIZE,
|
|
||||||
javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
|
|
||||||
.addGap(30, 30, 30)
|
.addGap(30, 30, 30)
|
||||||
.addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
|
.addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
|
||||||
.addComponent(jLabel1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE,
|
.addComponent(jLabel1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
|
||||||
javax.swing.GroupLayout.PREFERRED_SIZE)
|
.addComponent(jLabel2, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
|
||||||
.addComponent(jLabel2, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE,
|
.addComponent(jLabel6, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
|
||||||
javax.swing.GroupLayout.PREFERRED_SIZE)
|
|
||||||
.addComponent(jLabel6, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE,
|
|
||||||
javax.swing.GroupLayout.PREFERRED_SIZE))
|
|
||||||
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
|
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
|
||||||
.addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
|
.addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
|
||||||
.addComponent(txtCurdebt, javax.swing.GroupLayout.PREFERRED_SIZE,
|
.addComponent(txtCurdebt, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
|
||||||
javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
|
.addComponent(txtMaxdebt, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
|
||||||
.addComponent(txtMaxdebt, javax.swing.GroupLayout.PREFERRED_SIZE,
|
.addComponent(txtCurdate, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
|
||||||
javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
|
.addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
|
||||||
.addComponent(txtCurdate, javax.swing.GroupLayout.PREFERRED_SIZE,
|
);
|
||||||
javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
|
|
||||||
.addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)));
|
|
||||||
|
|
||||||
add(jPanel1, java.awt.BorderLayout.CENTER);
|
add(jPanel1, java.awt.BorderLayout.CENTER);
|
||||||
}// </editor-fold>//GEN-END:initComponents
|
}// </editor-fold>//GEN-END:initComponents
|
||||||
|
private void jButton1ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jButton1ActionPerformed
|
||||||
private void jButton1ActionPerformed(java.awt.event.ActionEvent evt) {// GEN-FIRST:event_jButton1ActionPerformed
|
|
||||||
|
|
||||||
readCustomer();
|
readCustomer();
|
||||||
|
|
||||||
}// GEN-LAST:event_jButton1ActionPerformed
|
}//GEN-LAST:event_jButton1ActionPerformed
|
||||||
|
|
||||||
private void m_jKeysActionPerformed(java.awt.event.ActionEvent evt) {// GEN-FIRST:event_m_jKeysActionPerformed
|
private void m_jKeysActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_m_jKeysActionPerformed
|
||||||
|
|
||||||
readCustomer();
|
readCustomer();
|
||||||
|
|
||||||
}// GEN-LAST:event_m_jKeysActionPerformed
|
}//GEN-LAST:event_m_jKeysActionPerformed
|
||||||
|
|
||||||
private void btnCustomerActionPerformed(java.awt.event.ActionEvent evt) {// GEN-FIRST:event_btnCustomerActionPerformed
|
private void btnCustomerActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnCustomerActionPerformed
|
||||||
|
|
||||||
JCustomerFinder finder = JCustomerFinder.getCustomerFinder(this, dlcustomers);
|
JCustomerFinder finder = JCustomerFinder.getCustomerFinder(this, dlcustomers);
|
||||||
finder.search(null);
|
finder.search(null);
|
||||||
@@ -646,17 +612,16 @@ public class CustomersPayment extends javax.swing.JPanel implements JPanelView,
|
|||||||
editCustomer(c);
|
editCustomer(c);
|
||||||
}
|
}
|
||||||
} catch (BasicException ex) {
|
} catch (BasicException ex) {
|
||||||
MessageInf msg = new MessageInf(MessageInf.SGN_WARNING, AppLocal.getIntString("message.cannotfindcustomer"),
|
MessageInf msg = new MessageInf(MessageInf.SGN_WARNING, AppLocal.getIntString("message.cannotfindcustomer"), ex);
|
||||||
ex);
|
|
||||||
msg.show(this);
|
msg.show(this);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
editorcard.reset();
|
editorcard.reset();
|
||||||
editorcard.activate();
|
editorcard.activate();
|
||||||
|
|
||||||
}// GEN-LAST:event_btnCustomerActionPerformed
|
}//GEN-LAST:event_btnCustomerActionPerformed
|
||||||
|
|
||||||
private void btnPayActionPerformed(java.awt.event.ActionEvent evt) {// GEN-FIRST:event_btnPayActionPerformed
|
private void btnPayActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnPayActionPerformed
|
||||||
|
|
||||||
paymentdialog.setPrintSelected(true);
|
paymentdialog.setPrintSelected(true);
|
||||||
|
|
||||||
@@ -677,7 +642,7 @@ public class CustomersPayment extends javax.swing.JPanel implements JPanelView,
|
|||||||
|
|
||||||
ticket.setPayments(payments);
|
ticket.setPayments(payments);
|
||||||
|
|
||||||
ticket.setUserInfo(app.getAppUserView().getUser().getUserInfo());
|
ticket.setUser(app.getAppUserView().getUser().getUserInfo());
|
||||||
ticket.setActiveCash(app.getActiveCashIndex());
|
ticket.setActiveCash(app.getActiveCashIndex());
|
||||||
ticket.setDate(new Date());
|
ticket.setDate(new Date());
|
||||||
ticket.setCustomer(customerext);
|
ticket.setCustomer(customerext);
|
||||||
@@ -689,6 +654,7 @@ public class CustomersPayment extends javax.swing.JPanel implements JPanelView,
|
|||||||
msg.show(this);
|
msg.show(this);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// reload customer
|
// reload customer
|
||||||
CustomerInfoExt c;
|
CustomerInfoExt c;
|
||||||
try {
|
try {
|
||||||
@@ -701,8 +667,7 @@ public class CustomersPayment extends javax.swing.JPanel implements JPanelView,
|
|||||||
}
|
}
|
||||||
} catch (BasicException ex) {
|
} catch (BasicException ex) {
|
||||||
c = null;
|
c = null;
|
||||||
MessageInf msg = new MessageInf(MessageInf.SGN_WARNING, AppLocal.getIntString("message.cannotfindcustomer"),
|
MessageInf msg = new MessageInf(MessageInf.SGN_WARNING, AppLocal.getIntString("message.cannotfindcustomer"), ex);
|
||||||
ex);
|
|
||||||
msg.show(this);
|
msg.show(this);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -715,9 +680,9 @@ public class CustomersPayment extends javax.swing.JPanel implements JPanelView,
|
|||||||
editorcard.reset();
|
editorcard.reset();
|
||||||
editorcard.activate();
|
editorcard.activate();
|
||||||
|
|
||||||
}// GEN-LAST:event_btnPayActionPerformed
|
}//GEN-LAST:event_btnPayActionPerformed
|
||||||
|
|
||||||
private void btnSaveActionPerformed(java.awt.event.ActionEvent evt) {// GEN-FIRST:event_btnSaveActionPerformed
|
private void btnSaveActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnSaveActionPerformed
|
||||||
|
|
||||||
if (dirty.isDirty()) {
|
if (dirty.isDirty()) {
|
||||||
save();
|
save();
|
||||||
@@ -726,9 +691,9 @@ public class CustomersPayment extends javax.swing.JPanel implements JPanelView,
|
|||||||
editorcard.activate();
|
editorcard.activate();
|
||||||
}
|
}
|
||||||
|
|
||||||
}// GEN-LAST:event_btnSaveActionPerformed
|
}//GEN-LAST:event_btnSaveActionPerformed
|
||||||
|
|
||||||
private void btnPrePayActionPerformed(java.awt.event.ActionEvent evt) {// GEN-FIRST:event_btnPrePayActionPerformed
|
private void btnPrePayActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnPrePayActionPerformed
|
||||||
|
|
||||||
txtPrePay.setFocusable(true);
|
txtPrePay.setFocusable(true);
|
||||||
txtPrePay.requestFocusInWindow();
|
txtPrePay.requestFocusInWindow();
|
||||||
@@ -755,7 +720,7 @@ public class CustomersPayment extends javax.swing.JPanel implements JPanelView,
|
|||||||
|
|
||||||
ticket.setPayments(payments);
|
ticket.setPayments(payments);
|
||||||
|
|
||||||
ticket.setUserInfo(app.getAppUserView().getUser().getUserInfo());
|
ticket.setUser(app.getAppUserView().getUser().getUserInfo());
|
||||||
ticket.setActiveCash(app.getActiveCashIndex());
|
ticket.setActiveCash(app.getActiveCashIndex());
|
||||||
ticket.setDate(new Date());
|
ticket.setDate(new Date());
|
||||||
ticket.setCustomer(customerext);
|
ticket.setCustomer(customerext);
|
||||||
@@ -771,16 +736,14 @@ public class CustomersPayment extends javax.swing.JPanel implements JPanelView,
|
|||||||
try {
|
try {
|
||||||
c = dlsales.loadCustomerExt(customerext.getId());
|
c = dlsales.loadCustomerExt(customerext.getId());
|
||||||
if (c == null) {
|
if (c == null) {
|
||||||
MessageInf msg = new MessageInf(MessageInf.SGN_WARNING,
|
MessageInf msg = new MessageInf(MessageInf.SGN_WARNING, AppLocal.getIntString("message.cannotfindcustomer"));
|
||||||
AppLocal.getIntString("message.cannotfindcustomer"));
|
|
||||||
msg.show(this);
|
msg.show(this);
|
||||||
} else {
|
} else {
|
||||||
editCustomer(c);
|
editCustomer(c);
|
||||||
}
|
}
|
||||||
} catch (BasicException ex) {
|
} catch (BasicException ex) {
|
||||||
c = null;
|
c = null;
|
||||||
MessageInf msg = new MessageInf(MessageInf.SGN_WARNING, AppLocal.getIntString("message.cannotfindcustomer"),
|
MessageInf msg = new MessageInf(MessageInf.SGN_WARNING, AppLocal.getIntString("message.cannotfindcustomer"), ex);
|
||||||
ex);
|
|
||||||
msg.show(this);
|
msg.show(this);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -793,7 +756,7 @@ public class CustomersPayment extends javax.swing.JPanel implements JPanelView,
|
|||||||
editorcard.reset();
|
editorcard.reset();
|
||||||
editorcard.activate();
|
editorcard.activate();
|
||||||
}
|
}
|
||||||
}// GEN-LAST:event_btnPrePayActionPerformed
|
}//GEN-LAST:event_btnPrePayActionPerformed
|
||||||
|
|
||||||
// Variables declaration - do not modify//GEN-BEGIN:variables
|
// Variables declaration - do not modify//GEN-BEGIN:variables
|
||||||
private javax.swing.JButton btnCustomer;
|
private javax.swing.JButton btnCustomer;
|
||||||
|
|||||||
@@ -30,7 +30,7 @@ public class AppLocal {
|
|||||||
|
|
||||||
public static final String APP_NAME = "uniCenta oPOS";
|
public static final String APP_NAME = "uniCenta oPOS";
|
||||||
public static final String APP_ID = "unicentaopos";
|
public static final String APP_ID = "unicentaopos";
|
||||||
public static final String APP_VERSION = "5.4.0";
|
public static final String APP_VERSION = "5.3.2";
|
||||||
|
|
||||||
private static final LocaleResources m_resources;
|
private static final LocaleResources m_resources;
|
||||||
|
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@@ -21,7 +21,7 @@
|
|||||||
|
|
||||||
<Layout class="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout"/>
|
<Layout class="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout"/>
|
||||||
<SubComponents>
|
<SubComponents>
|
||||||
<Container class="javax.swing.JPanel" name="mainMenuJPanel">
|
<Container class="javax.swing.JPanel" name="jPanel1">
|
||||||
<Constraints>
|
<Constraints>
|
||||||
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout" value="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout$BorderConstraintsDescription">
|
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout" value="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout$BorderConstraintsDescription">
|
||||||
<BorderConstraints direction="Before"/>
|
<BorderConstraints direction="Before"/>
|
||||||
@@ -73,7 +73,7 @@
|
|||||||
<Group type="103" groupAlignment="0" attributes="0">
|
<Group type="103" groupAlignment="0" attributes="0">
|
||||||
<Group type="102" alignment="1" attributes="0">
|
<Group type="102" alignment="1" attributes="0">
|
||||||
<EmptySpace min="0" pref="0" max="-2" attributes="0"/>
|
<EmptySpace min="0" pref="0" max="-2" attributes="0"/>
|
||||||
<Component id="showMainMenuButton" min="-2" max="-2" attributes="0"/>
|
<Component id="jButton1" min="-2" max="-2" attributes="0"/>
|
||||||
<EmptySpace max="-2" attributes="0"/>
|
<EmptySpace max="-2" attributes="0"/>
|
||||||
</Group>
|
</Group>
|
||||||
</Group>
|
</Group>
|
||||||
@@ -81,15 +81,15 @@
|
|||||||
<DimensionLayout dim="1">
|
<DimensionLayout dim="1">
|
||||||
<Group type="103" groupAlignment="0" attributes="0">
|
<Group type="103" groupAlignment="0" attributes="0">
|
||||||
<Group type="102" attributes="0">
|
<Group type="102" attributes="0">
|
||||||
<EmptySpace max="32767" attributes="0"/>
|
<EmptySpace pref="88" max="32767" attributes="0"/>
|
||||||
<Component id="showMainMenuButton" pref="120" max="32767" attributes="0"/>
|
<Component id="jButton1" pref="33" max="32767" attributes="0"/>
|
||||||
<EmptySpace pref="95" max="32767" attributes="0"/>
|
<EmptySpace pref="188" max="32767" attributes="0"/>
|
||||||
</Group>
|
</Group>
|
||||||
</Group>
|
</Group>
|
||||||
</DimensionLayout>
|
</DimensionLayout>
|
||||||
</Layout>
|
</Layout>
|
||||||
<SubComponents>
|
<SubComponents>
|
||||||
<Component class="javax.swing.JButton" name="showMainMenuButton">
|
<Component class="javax.swing.JButton" name="jButton1">
|
||||||
<Properties>
|
<Properties>
|
||||||
<Property name="toolTipText" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
|
<Property name="toolTipText" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
|
||||||
<ResourceString bundle="pos_messages.properties" key="tooltip.menu" replaceFormat="AppLocal.getIntString("tooltip.menu")"/>
|
<ResourceString bundle="pos_messages.properties" key="tooltip.menu" replaceFormat="AppLocal.getIntString("tooltip.menu")"/>
|
||||||
@@ -112,14 +112,14 @@
|
|||||||
<Property name="requestFocusEnabled" type="boolean" value="false"/>
|
<Property name="requestFocusEnabled" type="boolean" value="false"/>
|
||||||
</Properties>
|
</Properties>
|
||||||
<Events>
|
<Events>
|
||||||
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="showMainMenuButtonActionPerformed"/>
|
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="jButton1ActionPerformed"/>
|
||||||
</Events>
|
</Events>
|
||||||
</Component>
|
</Component>
|
||||||
</SubComponents>
|
</SubComponents>
|
||||||
</Container>
|
</Container>
|
||||||
</SubComponents>
|
</SubComponents>
|
||||||
</Container>
|
</Container>
|
||||||
<Container class="javax.swing.JPanel" name="salesScreenJPanel">
|
<Container class="javax.swing.JPanel" name="m_jPanelRight">
|
||||||
<Properties>
|
<Properties>
|
||||||
<Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
|
<Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
|
||||||
<Dimension value="[200, 40]"/>
|
<Dimension value="[200, 40]"/>
|
||||||
@@ -133,7 +133,7 @@
|
|||||||
|
|
||||||
<Layout class="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout"/>
|
<Layout class="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout"/>
|
||||||
<SubComponents>
|
<SubComponents>
|
||||||
<Container class="javax.swing.JPanel" name="salesScreenTitlePanel">
|
<Container class="javax.swing.JPanel" name="m_jPanelTitle">
|
||||||
<Constraints>
|
<Constraints>
|
||||||
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout" value="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout$BorderConstraintsDescription">
|
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout" value="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout$BorderConstraintsDescription">
|
||||||
<BorderConstraints direction="North"/>
|
<BorderConstraints direction="North"/>
|
||||||
@@ -142,7 +142,7 @@
|
|||||||
|
|
||||||
<Layout class="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout"/>
|
<Layout class="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout"/>
|
||||||
<SubComponents>
|
<SubComponents>
|
||||||
<Component class="javax.swing.JLabel" name="salesScreenTitleLabel">
|
<Component class="javax.swing.JLabel" name="m_jTitle">
|
||||||
<Properties>
|
<Properties>
|
||||||
<Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
|
<Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
|
||||||
<Font name="Arial" size="14" style="1"/>
|
<Font name="Arial" size="14" style="1"/>
|
||||||
|
|||||||
@@ -101,16 +101,20 @@ public class JPrincipalApp extends javax.swing.JPanel implements AppUserView {
|
|||||||
m_principalnotificator.setText(m_appuser.getName());
|
m_principalnotificator.setText(m_appuser.getName());
|
||||||
m_principalnotificator.setIcon(m_appuser.getIcon());
|
m_principalnotificator.setIcon(m_appuser.getIcon());
|
||||||
|
|
||||||
if (showMainMenuButton.getComponentOrientation().isLeftToRight()) {
|
if (jButton1.getComponentOrientation().isLeftToRight()) {
|
||||||
menu_open = new javax.swing.ImageIcon(getClass().getResource("/com/unicenta/images/menu-right.png"));
|
menu_open = new javax.swing.ImageIcon(getClass().getResource(
|
||||||
menu_close = new javax.swing.ImageIcon(getClass().getResource("/com/unicenta/images/menu-left.png"));
|
"/com/unicenta/images/menu-right.png"));
|
||||||
|
menu_close = new javax.swing.ImageIcon(getClass().getResource(
|
||||||
|
"/com/unicenta/images/menu-left.png"));
|
||||||
} else {
|
} else {
|
||||||
menu_open = new javax.swing.ImageIcon(getClass().getResource("/com/unicenta/images/menu-left.png"));
|
menu_open = new javax.swing.ImageIcon(getClass().getResource(
|
||||||
menu_close = new javax.swing.ImageIcon(getClass().getResource("/com/unicenta/images/menu-right.png"));
|
"/com/unicenta/images/menu-left.png"));
|
||||||
|
menu_close = new javax.swing.ImageIcon(getClass().getResource(
|
||||||
|
"/com/unicenta/images/menu-right.png"));
|
||||||
}
|
}
|
||||||
assignMenuButtonIcon();
|
assignMenuButtonIcon();
|
||||||
|
|
||||||
salesScreenTitlePanel.setVisible(false);
|
m_jPanelTitle.setVisible(false);
|
||||||
m_jPanelContainer.add(new JPanel(), "<NULL>");
|
m_jPanelContainer.add(new JPanel(), "<NULL>");
|
||||||
|
|
||||||
showView("<NULL>");
|
showView("<NULL>");
|
||||||
@@ -142,7 +146,9 @@ public class JPrincipalApp extends javax.swing.JPanel implements AppUserView {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private void assignMenuButtonIcon() {
|
private void assignMenuButtonIcon() {
|
||||||
showMainMenuButton.setIcon(m_jPanelLeft.isVisible() ? menu_close : menu_open);
|
jButton1.setIcon(m_jPanelLeft.isVisible()
|
||||||
|
? menu_close
|
||||||
|
: menu_open);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -484,13 +490,12 @@ public class JPrincipalApp extends javax.swing.JPanel implements AppUserView {
|
|||||||
m_jLastView = m_jMyView;
|
m_jLastView = m_jMyView;
|
||||||
|
|
||||||
setMenuVisible(getBounds().width > 800);
|
setMenuVisible(getBounds().width > 800);
|
||||||
setMenuVisible(getBounds().height > 600);
|
|
||||||
setMenuVisible(false);
|
setMenuVisible(false);
|
||||||
|
|
||||||
showView(sTaskClass);
|
showView(sTaskClass);
|
||||||
String sTitle = m_jMyView.getTitle();
|
String sTitle = m_jMyView.getTitle();
|
||||||
salesScreenTitlePanel.setVisible(sTitle != null);
|
m_jPanelTitle.setVisible(sTitle != null);
|
||||||
salesScreenTitleLabel.setText(sTitle);
|
m_jTitle.setText(sTitle);
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
|
|
||||||
@@ -543,41 +548,41 @@ public class JPrincipalApp extends javax.swing.JPanel implements AppUserView {
|
|||||||
// <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents
|
// <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents
|
||||||
private void initComponents() {
|
private void initComponents() {
|
||||||
|
|
||||||
mainMenuJPanel = new javax.swing.JPanel();
|
jPanel1 = new javax.swing.JPanel();
|
||||||
m_jPanelLeft = new javax.swing.JScrollPane();
|
m_jPanelLeft = new javax.swing.JScrollPane();
|
||||||
jPanel2 = new javax.swing.JPanel();
|
jPanel2 = new javax.swing.JPanel();
|
||||||
showMainMenuButton = new javax.swing.JButton();
|
jButton1 = new javax.swing.JButton();
|
||||||
salesScreenJPanel = new javax.swing.JPanel();
|
m_jPanelRight = new javax.swing.JPanel();
|
||||||
salesScreenTitlePanel = new javax.swing.JPanel();
|
m_jPanelTitle = new javax.swing.JPanel();
|
||||||
salesScreenTitleLabel = new javax.swing.JLabel();
|
m_jTitle = new javax.swing.JLabel();
|
||||||
m_jPanelContainer = new javax.swing.JPanel();
|
m_jPanelContainer = new javax.swing.JPanel();
|
||||||
|
|
||||||
setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
|
setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
|
||||||
setLayout(new java.awt.BorderLayout());
|
setLayout(new java.awt.BorderLayout());
|
||||||
|
|
||||||
mainMenuJPanel.setLayout(new java.awt.BorderLayout());
|
jPanel1.setLayout(new java.awt.BorderLayout());
|
||||||
|
|
||||||
m_jPanelLeft.setBackground(new java.awt.Color(102, 102, 102));
|
m_jPanelLeft.setBackground(new java.awt.Color(102, 102, 102));
|
||||||
m_jPanelLeft.setBorder(null);
|
m_jPanelLeft.setBorder(null);
|
||||||
m_jPanelLeft.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
|
m_jPanelLeft.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
|
||||||
m_jPanelLeft.setPreferredSize(new java.awt.Dimension(250, 2));
|
m_jPanelLeft.setPreferredSize(new java.awt.Dimension(250, 2));
|
||||||
mainMenuJPanel.add(m_jPanelLeft, java.awt.BorderLayout.LINE_START);
|
jPanel1.add(m_jPanelLeft, java.awt.BorderLayout.LINE_START);
|
||||||
|
|
||||||
jPanel2.setFont(new java.awt.Font("Arial", 0, 12)); // NOI18N
|
jPanel2.setFont(new java.awt.Font("Arial", 0, 12)); // NOI18N
|
||||||
jPanel2.setPreferredSize(new java.awt.Dimension(45, 45));
|
jPanel2.setPreferredSize(new java.awt.Dimension(45, 45));
|
||||||
|
|
||||||
showMainMenuButton.setToolTipText(AppLocal.getIntString("tooltip.menu")); // NOI18N
|
jButton1.setToolTipText(AppLocal.getIntString("tooltip.menu")); // NOI18N
|
||||||
showMainMenuButton.setFocusPainted(false);
|
jButton1.setFocusPainted(false);
|
||||||
showMainMenuButton.setFocusable(false);
|
jButton1.setFocusable(false);
|
||||||
showMainMenuButton.setIconTextGap(0);
|
jButton1.setIconTextGap(0);
|
||||||
showMainMenuButton.setMargin(new java.awt.Insets(10, 2, 10, 2));
|
jButton1.setMargin(new java.awt.Insets(10, 2, 10, 2));
|
||||||
showMainMenuButton.setMaximumSize(new java.awt.Dimension(45, 32224661));
|
jButton1.setMaximumSize(new java.awt.Dimension(45, 32224661));
|
||||||
showMainMenuButton.setMinimumSize(new java.awt.Dimension(32, 32));
|
jButton1.setMinimumSize(new java.awt.Dimension(32, 32));
|
||||||
showMainMenuButton.setPreferredSize(new java.awt.Dimension(36, 45));
|
jButton1.setPreferredSize(new java.awt.Dimension(36, 45));
|
||||||
showMainMenuButton.setRequestFocusEnabled(false);
|
jButton1.setRequestFocusEnabled(false);
|
||||||
showMainMenuButton.addActionListener(new java.awt.event.ActionListener() {
|
jButton1.addActionListener(new java.awt.event.ActionListener() {
|
||||||
public void actionPerformed(java.awt.event.ActionEvent evt) {
|
public void actionPerformed(java.awt.event.ActionEvent evt) {
|
||||||
showMainMenuButtonActionPerformed(evt);
|
jButton1ActionPerformed(evt);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -587,59 +592,59 @@ public class JPrincipalApp extends javax.swing.JPanel implements AppUserView {
|
|||||||
jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
|
jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
|
||||||
.addGroup(javax.swing.GroupLayout.Alignment.TRAILING, jPanel2Layout.createSequentialGroup()
|
.addGroup(javax.swing.GroupLayout.Alignment.TRAILING, jPanel2Layout.createSequentialGroup()
|
||||||
.addGap(0, 0, 0)
|
.addGap(0, 0, 0)
|
||||||
.addComponent(showMainMenuButton, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
|
.addComponent(jButton1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
|
||||||
.addContainerGap())
|
.addContainerGap())
|
||||||
);
|
);
|
||||||
jPanel2Layout.setVerticalGroup(
|
jPanel2Layout.setVerticalGroup(
|
||||||
jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
|
jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
|
||||||
.addGroup(jPanel2Layout.createSequentialGroup()
|
.addGroup(jPanel2Layout.createSequentialGroup()
|
||||||
.addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
|
.addContainerGap(88, Short.MAX_VALUE)
|
||||||
.addComponent(showMainMenuButton, javax.swing.GroupLayout.DEFAULT_SIZE, 120, Short.MAX_VALUE)
|
.addComponent(jButton1, javax.swing.GroupLayout.DEFAULT_SIZE, 33, Short.MAX_VALUE)
|
||||||
.addContainerGap(95, Short.MAX_VALUE))
|
.addContainerGap(188, Short.MAX_VALUE))
|
||||||
);
|
);
|
||||||
|
|
||||||
mainMenuJPanel.add(jPanel2, java.awt.BorderLayout.LINE_END);
|
jPanel1.add(jPanel2, java.awt.BorderLayout.LINE_END);
|
||||||
|
|
||||||
add(mainMenuJPanel, java.awt.BorderLayout.LINE_START);
|
add(jPanel1, java.awt.BorderLayout.LINE_START);
|
||||||
|
|
||||||
salesScreenJPanel.setPreferredSize(new java.awt.Dimension(200, 40));
|
m_jPanelRight.setPreferredSize(new java.awt.Dimension(200, 40));
|
||||||
salesScreenJPanel.setLayout(new java.awt.BorderLayout());
|
m_jPanelRight.setLayout(new java.awt.BorderLayout());
|
||||||
|
|
||||||
salesScreenTitlePanel.setLayout(new java.awt.BorderLayout());
|
m_jPanelTitle.setLayout(new java.awt.BorderLayout());
|
||||||
|
|
||||||
salesScreenTitleLabel.setFont(new java.awt.Font("Arial", 1, 14)); // NOI18N
|
m_jTitle.setFont(new java.awt.Font("Arial", 1, 14)); // NOI18N
|
||||||
salesScreenTitleLabel.setForeground(new java.awt.Color(0, 168, 223));
|
m_jTitle.setForeground(new java.awt.Color(0, 168, 223));
|
||||||
salesScreenTitleLabel.setBorder(javax.swing.BorderFactory.createCompoundBorder(javax.swing.BorderFactory.createMatteBorder(0, 0, 1, 0, java.awt.Color.darkGray), javax.swing.BorderFactory.createEmptyBorder(10, 10, 10, 10)));
|
m_jTitle.setBorder(javax.swing.BorderFactory.createCompoundBorder(javax.swing.BorderFactory.createMatteBorder(0, 0, 1, 0, java.awt.Color.darkGray), javax.swing.BorderFactory.createEmptyBorder(10, 10, 10, 10)));
|
||||||
salesScreenTitleLabel.setMaximumSize(new java.awt.Dimension(100, 35));
|
m_jTitle.setMaximumSize(new java.awt.Dimension(100, 35));
|
||||||
salesScreenTitleLabel.setMinimumSize(new java.awt.Dimension(30, 25));
|
m_jTitle.setMinimumSize(new java.awt.Dimension(30, 25));
|
||||||
salesScreenTitleLabel.setPreferredSize(new java.awt.Dimension(100, 35));
|
m_jTitle.setPreferredSize(new java.awt.Dimension(100, 35));
|
||||||
salesScreenTitlePanel.add(salesScreenTitleLabel, java.awt.BorderLayout.NORTH);
|
m_jPanelTitle.add(m_jTitle, java.awt.BorderLayout.NORTH);
|
||||||
|
|
||||||
salesScreenJPanel.add(salesScreenTitlePanel, java.awt.BorderLayout.NORTH);
|
m_jPanelRight.add(m_jPanelTitle, java.awt.BorderLayout.NORTH);
|
||||||
|
|
||||||
m_jPanelContainer.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
|
m_jPanelContainer.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
|
||||||
m_jPanelContainer.setLayout(new java.awt.CardLayout());
|
m_jPanelContainer.setLayout(new java.awt.CardLayout());
|
||||||
salesScreenJPanel.add(m_jPanelContainer, BorderLayout.CENTER);
|
m_jPanelRight.add(m_jPanelContainer, java.awt.BorderLayout.CENTER);
|
||||||
|
|
||||||
add(salesScreenJPanel, java.awt.BorderLayout.CENTER);
|
add(m_jPanelRight, java.awt.BorderLayout.CENTER);
|
||||||
}// </editor-fold>//GEN-END:initComponents
|
}// </editor-fold>//GEN-END:initComponents
|
||||||
|
|
||||||
private void showMainMenuButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_showMainMenuButtonActionPerformed
|
private void jButton1ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jButton1ActionPerformed
|
||||||
|
|
||||||
setMenuVisible(!m_jPanelLeft.isVisible());
|
setMenuVisible(!m_jPanelLeft.isVisible());
|
||||||
|
|
||||||
}//GEN-LAST:event_showMainMenuButtonActionPerformed
|
}//GEN-LAST:event_jButton1ActionPerformed
|
||||||
|
|
||||||
|
|
||||||
// Variables declaration - do not modify//GEN-BEGIN:variables
|
// Variables declaration - do not modify//GEN-BEGIN:variables
|
||||||
|
private javax.swing.JButton jButton1;
|
||||||
|
private javax.swing.JPanel jPanel1;
|
||||||
private javax.swing.JPanel jPanel2;
|
private javax.swing.JPanel jPanel2;
|
||||||
private javax.swing.JPanel m_jPanelContainer;
|
private javax.swing.JPanel m_jPanelContainer;
|
||||||
private javax.swing.JScrollPane m_jPanelLeft;
|
private javax.swing.JScrollPane m_jPanelLeft;
|
||||||
private javax.swing.JPanel mainMenuJPanel;
|
private javax.swing.JPanel m_jPanelRight;
|
||||||
private javax.swing.JPanel salesScreenJPanel;
|
private javax.swing.JPanel m_jPanelTitle;
|
||||||
private javax.swing.JLabel salesScreenTitleLabel;
|
private javax.swing.JLabel m_jTitle;
|
||||||
private javax.swing.JPanel salesScreenTitlePanel;
|
|
||||||
private javax.swing.JButton showMainMenuButton;
|
|
||||||
// End of variables declaration//GEN-END:variables
|
// End of variables declaration//GEN-END:variables
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -1021,7 +1021,7 @@ public class JRootApp extends JPanel implements AppView, DeviceMonitorEventListe
|
|||||||
jLabel2.setPreferredSize(new java.awt.Dimension(180, 34));
|
jLabel2.setPreferredSize(new java.awt.Dimension(180, 34));
|
||||||
m_jPanelTitle.add(jLabel2, java.awt.BorderLayout.LINE_START);
|
m_jPanelTitle.add(jLabel2, java.awt.BorderLayout.LINE_START);
|
||||||
|
|
||||||
//add(m_jPanelTitle, java.awt.BorderLayout.NORTH);
|
add(m_jPanelTitle, java.awt.BorderLayout.NORTH);
|
||||||
|
|
||||||
m_jPanelContainer.setLayout(new java.awt.CardLayout());
|
m_jPanelContainer.setLayout(new java.awt.CardLayout());
|
||||||
|
|
||||||
|
|||||||
@@ -129,7 +129,7 @@ public class StartPOS {
|
|||||||
metrics.setUniCentaVersion(AppLocal.APP_VERSION);
|
metrics.setUniCentaVersion(AppLocal.APP_VERSION);
|
||||||
Application application = new Application();
|
Application application = new Application();
|
||||||
application.postMetrics(metrics);
|
application.postMetrics(metrics);
|
||||||
application.startEventListener(host, jRootApp, null);
|
application.startEventListener(host, jRootApp);
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
log.error("Problem with starting the uniCenta plugin application:${}", e.getMessage());
|
log.error("Problem with starting the uniCenta plugin application:${}", e.getMessage());
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -82,7 +82,7 @@ public class JPanelCSVImport extends JPanel implements JPanelView {
|
|||||||
|
|
||||||
protected SaveProvider spr;
|
protected SaveProvider spr;
|
||||||
|
|
||||||
private String category;
|
private String Category;
|
||||||
private String categoryName;
|
private String categoryName;
|
||||||
private String categoryParentid;
|
private String categoryParentid;
|
||||||
private Integer categoryCatorder;
|
private Integer categoryCatorder;
|
||||||
@@ -374,7 +374,7 @@ public class JPanelCSVImport extends JPanel implements JPanelView {
|
|||||||
String SellPrice = products.get((String) jComboSell.getSelectedItem());
|
String SellPrice = products.get((String) jComboSell.getSelectedItem());
|
||||||
productTax = products.get((String) jComboTax.getSelectedItem());
|
productTax = products.get((String) jComboTax.getSelectedItem());
|
||||||
|
|
||||||
category = products.get((String) jComboCategory.getSelectedItem());
|
Category = products.get((String) jComboCategory.getSelectedItem());
|
||||||
Supplier = products.get((String) jComboSupplier.getSelectedItem());
|
Supplier = products.get((String) jComboSupplier.getSelectedItem());
|
||||||
|
|
||||||
currentRecord++;
|
currentRecord++;
|
||||||
@@ -518,17 +518,17 @@ public class JPanelCSVImport extends JPanel implements JPanelView {
|
|||||||
private String getCategory() {
|
private String getCategory() {
|
||||||
|
|
||||||
if (jComboCategory.getSelectedItem() != category_default) {
|
if (jComboCategory.getSelectedItem() != category_default) {
|
||||||
String cat = (String) cat_list.get(category);
|
String cat = (String) cat_list.get(Category);
|
||||||
|
|
||||||
if (cat != null) {
|
if (cat != null) {
|
||||||
return (cat);
|
return (cat);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!category.equals("")) {
|
if (!Category.equals("")) {
|
||||||
Object[] newcat = new Object[3];
|
Object[] newcat = new Object[3];
|
||||||
newcat[0] = UUID.randomUUID().toString();
|
newcat[0] = UUID.randomUUID().toString();
|
||||||
newcat[1] = category;
|
newcat[1] = Category;
|
||||||
newcat[2] = true;
|
newcat[2] = true;
|
||||||
|
|
||||||
try {
|
try {
|
||||||
@@ -539,15 +539,15 @@ public class JPanelCSVImport extends JPanel implements JPanelView {
|
|||||||
m_CategoryModel.setSelectedItem(category);
|
m_CategoryModel.setSelectedItem(category);
|
||||||
cat_list.put(category.toString(), m_CategoryModel.getSelectedKey().toString());
|
cat_list.put(category.toString(), m_CategoryModel.getSelectedKey().toString());
|
||||||
}
|
}
|
||||||
String cat = (String) cat_list.get(category);
|
String cat = (String) cat_list.get(Category);
|
||||||
return (cat);
|
return (cat);
|
||||||
} catch (BasicException ex) {
|
} catch (BasicException ex) {
|
||||||
log.error(ex.getMessage());
|
log.error(ex.getMessage());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!badCategories.contains(category)) {
|
if (!badCategories.contains(Category)) {
|
||||||
badCategories.add(category.trim()); // Save a list of the bad categories
|
badCategories.add(Category.trim()); // Save a list of the bad categories
|
||||||
}
|
}
|
||||||
return ((jComboDefaultCategory.getSelectedItem()
|
return ((jComboDefaultCategory.getSelectedItem()
|
||||||
== reject_bad_category)
|
== reject_bad_category)
|
||||||
@@ -968,7 +968,7 @@ public class JPanelCSVImport extends JPanel implements JPanelView {
|
|||||||
myprod[7] = productSellPrice; // Sell price
|
myprod[7] = productSellPrice; // Sell price
|
||||||
myprod[8] = previousBuy; // Previous Buy price double
|
myprod[8] = previousBuy; // Previous Buy price double
|
||||||
myprod[9] = previousSell; // Previous Sell price double
|
myprod[9] = previousSell; // Previous Sell price double
|
||||||
myprod[10] = category; // Category
|
myprod[10] = Category; // Category
|
||||||
myprod[11] = productTax; // Tax
|
myprod[11] = productTax; // Tax
|
||||||
myprod[12] = Supplier; // Supplier
|
myprod[12] = Supplier; // Supplier
|
||||||
try {
|
try {
|
||||||
|
|||||||
@@ -49,7 +49,7 @@ public class DataLogicReceipts extends BeanFactoryDataSingle {
|
|||||||
* @param s
|
* @param s
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public void init(Session s) {
|
public void init(Session s){
|
||||||
this.s = s;
|
this.s = s;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -64,10 +64,11 @@ public class DataLogicReceipts extends BeanFactoryDataSingle {
|
|||||||
if (Id == null) {
|
if (Id == null) {
|
||||||
return null;
|
return null;
|
||||||
} else {
|
} else {
|
||||||
Object[] record = (Object[]) new StaticSentence(s, "SELECT CONTENT, LOCKED FROM sharedtickets WHERE ID = ?",
|
Object[]record = (Object[]) new StaticSentence(s
|
||||||
SerializerWriteString.INSTANCE, new SerializerReadBasic(new Datas[] {
|
, "SELECT CONTENT, LOCKED FROM sharedtickets WHERE ID = ?"
|
||||||
Datas.SERIALIZABLE }))
|
, SerializerWriteString.INSTANCE
|
||||||
.find(Id);
|
, new SerializerReadBasic(new Datas[] {
|
||||||
|
Datas.SERIALIZABLE})).find(Id);
|
||||||
return record == null ? null : (TicketInfo) record[0];
|
return record == null ? null : (TicketInfo) record[0];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -83,34 +84,32 @@ public class DataLogicReceipts extends BeanFactoryDataSingle {
|
|||||||
if (pickupId == null) {
|
if (pickupId == null) {
|
||||||
return null;
|
return null;
|
||||||
} else {
|
} else {
|
||||||
Object[] record = (Object[]) new StaticSentence(s, "SELECT CONTENT, LOCKED FROM sharedtickets WHERE PICKUPID = ?",
|
Object[]record = (Object[]) new StaticSentence(s
|
||||||
SerializerWriteString.INSTANCE, new SerializerReadBasic(new Datas[] {
|
, "SELECT CONTENT, LOCKED FROM sharedtickets WHERE PICKUPID = ?"
|
||||||
Datas.SERIALIZABLE }))
|
, SerializerWriteString.INSTANCE
|
||||||
.find(pickupId);
|
, new SerializerReadBasic(new Datas[] {
|
||||||
|
Datas.SERIALIZABLE})).find(pickupId);
|
||||||
return record == null ? null : (TicketInfo) record[0];
|
return record == null ? null : (TicketInfo) record[0];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* JG Dec 14 Administrator and Manager Roles always have access to ALL
|
* JG Dec 14 Administrator and Manager Roles always have access to ALL SHAREDtickets
|
||||||
* SHAREDtickets
|
|
||||||
*
|
|
||||||
* @return
|
* @return
|
||||||
* @throws BasicException
|
* @throws BasicException
|
||||||
*/
|
*/
|
||||||
public final List<SharedTicketInfo> getSharedTicketList() throws BasicException {
|
public final List<SharedTicketInfo> getSharedTicketList() throws BasicException {
|
||||||
|
|
||||||
return (List<SharedTicketInfo>) new StaticSentence(s
|
return (List<SharedTicketInfo>) new StaticSentence(s
|
||||||
// , "SELECT ID, NAME, CONTENT, APPUSER, PICKUPID, LOCKED FROM sharedtickets
|
// , "SELECT ID, NAME, CONTENT, APPUSER, PICKUPID, LOCKED FROM sharedtickets ORDER BY ID"
|
||||||
// ORDER BY ID"
|
|
||||||
, "SELECT ID, NAME, CONTENT, APPUSER, PICKUPID, LOCKED "
|
, "SELECT ID, NAME, CONTENT, APPUSER, PICKUPID, LOCKED "
|
||||||
+ "FROM sharedtickets ORDER BY PICKUPID",
|
+ "FROM sharedtickets ORDER BY PICKUPID"
|
||||||
null, new SerializerReadClass(SharedTicketInfo.class)).list();
|
, null
|
||||||
|
, new SerializerReadClass(SharedTicketInfo.class)).list();
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Return only current APPUSER SHAREDtickets
|
* Return only current APPUSER SHAREDtickets
|
||||||
*
|
|
||||||
* @param appuser
|
* @param appuser
|
||||||
* @return
|
* @return
|
||||||
* @throws BasicException
|
* @throws BasicException
|
||||||
@@ -118,15 +117,16 @@ public class DataLogicReceipts extends BeanFactoryDataSingle {
|
|||||||
public final List<SharedTicketInfo> getUserSharedTicketList(String appuser) throws BasicException {
|
public final List<SharedTicketInfo> getUserSharedTicketList(String appuser) throws BasicException {
|
||||||
String sql = "SELECT ID, NAME, CONTENT, APPUSER, PICKUPID, LOCKED "
|
String sql = "SELECT ID, NAME, CONTENT, APPUSER, PICKUPID, LOCKED "
|
||||||
+ "FROM sharedtickets "
|
+ "FROM sharedtickets "
|
||||||
+ "WHERE APPUSER =\"" + appuser + "\" ORDER BY PICKUPID";
|
+ "WHERE APPUSER =\""+ appuser +"\" ORDER BY PICKUPID";
|
||||||
|
|
||||||
return (List<SharedTicketInfo>) new StaticSentence(s, sql, null, new SerializerReadClass(SharedTicketInfo.class))
|
return (List<SharedTicketInfo>) new StaticSentence(s
|
||||||
.list();
|
, sql
|
||||||
|
, null
|
||||||
|
, new SerializerReadClass(SharedTicketInfo.class)).list();
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* For Standard View
|
* For Standard View
|
||||||
*
|
|
||||||
* @param id
|
* @param id
|
||||||
* @param ticket
|
* @param ticket
|
||||||
* @param pickupid
|
* @param pickupid
|
||||||
@@ -138,7 +138,7 @@ public class DataLogicReceipts extends BeanFactoryDataSingle {
|
|||||||
id,
|
id,
|
||||||
ticket.getName(),
|
ticket.getName(),
|
||||||
ticket,
|
ticket,
|
||||||
ticket.getUserInfo().getId(),
|
ticket.getUser().getId(),
|
||||||
pickupid
|
pickupid
|
||||||
|
|
||||||
};
|
};
|
||||||
@@ -151,13 +151,15 @@ public class DataLogicReceipts extends BeanFactoryDataSingle {
|
|||||||
Datas.INT
|
Datas.INT
|
||||||
|
|
||||||
};
|
};
|
||||||
new PreparedSentence(s, "INSERT INTO sharedtickets ("
|
new PreparedSentence(s
|
||||||
|
, "INSERT INTO sharedtickets ("
|
||||||
+ "ID, "
|
+ "ID, "
|
||||||
+ "NAME, "
|
+ "NAME, "
|
||||||
+ "CONTENT, "
|
+ "CONTENT, "
|
||||||
+ "APPUSER, "
|
+ "APPUSER, "
|
||||||
+ "PICKUPID) "
|
+ "PICKUPID) "
|
||||||
+ "VALUES (?, ?, ?, ?, ?)", new SerializerWriteBasicExt(datas, new int[] { 0, 1, 2, 3, 4 })).exec(values);
|
+ "VALUES (?, ?, ?, ?, ?)"
|
||||||
|
, new SerializerWriteBasicExt(datas, new int[] {0, 1, 2, 3, 4})).exec(values);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -173,7 +175,7 @@ public class DataLogicReceipts extends BeanFactoryDataSingle {
|
|||||||
id,
|
id,
|
||||||
ticket.getName(),
|
ticket.getName(),
|
||||||
ticket,
|
ticket,
|
||||||
ticket.getUserInfo().getId(),
|
ticket.getUser().getId(),
|
||||||
pickupid
|
pickupid
|
||||||
};
|
};
|
||||||
Datas[] datas = new Datas[] {
|
Datas[] datas = new Datas[] {
|
||||||
@@ -183,16 +185,16 @@ public class DataLogicReceipts extends BeanFactoryDataSingle {
|
|||||||
Datas.STRING,
|
Datas.STRING,
|
||||||
Datas.INT
|
Datas.INT
|
||||||
};
|
};
|
||||||
new PreparedSentence(s, "UPDATE sharedtickets SET "
|
new PreparedSentence(s
|
||||||
|
, "UPDATE sharedtickets SET "
|
||||||
+ "NAME = ?, "
|
+ "NAME = ?, "
|
||||||
+ "CONTENT = ?, "
|
+ "CONTENT = ?, "
|
||||||
+ "APPUSER = ?, "
|
+ "APPUSER = ?, "
|
||||||
+ "PICKUPID = ? "
|
+ "PICKUPID = ? "
|
||||||
+ "WHERE ID = ?",
|
+ "WHERE ID = ?"
|
||||||
new SerializerWriteBasicExt(datas,
|
, new SerializerWriteBasicExt(datas,
|
||||||
new int[] {
|
new int[] {
|
||||||
1, 2, 3, 4, 0 }))
|
1, 2, 3, 4, 0})).exec(values);
|
||||||
.exec(values);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -219,17 +221,18 @@ public class DataLogicReceipts extends BeanFactoryDataSingle {
|
|||||||
Datas.SERIALIZABLE,
|
Datas.SERIALIZABLE,
|
||||||
Datas.INT
|
Datas.INT
|
||||||
};
|
};
|
||||||
new PreparedSentence(s, "UPDATE sharedtickets SET "
|
new PreparedSentence(s
|
||||||
|
, "UPDATE sharedtickets SET "
|
||||||
+ "NAME = ?, "
|
+ "NAME = ?, "
|
||||||
+ "CONTENT = ?, "
|
+ "CONTENT = ?, "
|
||||||
+ "PICKUPID = ? "
|
+ "PICKUPID = ? "
|
||||||
+ "WHERE ID = ?", new SerializerWriteBasicExt(datas, new int[] { 1, 2, 3, 0 })).exec(values);
|
+ "WHERE ID = ?"
|
||||||
|
, new SerializerWriteBasicExt(datas, new int[] {1, 2, 3, 0})).exec(values);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* In place for multi-purposing like containing data from elsewhere and/or
|
* In place for multi-purposing like containing data from elsewhere and/or
|
||||||
* using Place and User for Notifications
|
* using Place and User for Notifications
|
||||||
*
|
|
||||||
* @param id
|
* @param id
|
||||||
* @param locked
|
* @param locked
|
||||||
* @throws BasicException
|
* @throws BasicException
|
||||||
@@ -244,15 +247,16 @@ public class DataLogicReceipts extends BeanFactoryDataSingle {
|
|||||||
Datas.STRING,
|
Datas.STRING,
|
||||||
Datas.STRING
|
Datas.STRING
|
||||||
};
|
};
|
||||||
new PreparedSentence(s, "UPDATE sharedtickets SET "
|
new PreparedSentence(s
|
||||||
|
, "UPDATE sharedtickets SET "
|
||||||
+ "LOCKED = ? "
|
+ "LOCKED = ? "
|
||||||
+ "WHERE ID = ?", new SerializerWriteBasicExt(datas, new int[] { 1, 0 })).exec(values);
|
+ "WHERE ID = ?"
|
||||||
|
, new SerializerWriteBasicExt(datas, new int[] {1, 0})).exec(values);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* In place for multi-purposing like flushing locks from elsewhere and/or
|
* In place for multi-purposing like flushing locks from elsewhere and/or
|
||||||
* using Place and User for Notifications
|
* using Place and User for Notifications
|
||||||
*
|
|
||||||
* @param id
|
* @param id
|
||||||
* @param unlocked
|
* @param unlocked
|
||||||
* @throws BasicException
|
* @throws BasicException
|
||||||
@@ -267,14 +271,15 @@ public class DataLogicReceipts extends BeanFactoryDataSingle {
|
|||||||
Datas.STRING,
|
Datas.STRING,
|
||||||
Datas.STRING
|
Datas.STRING
|
||||||
};
|
};
|
||||||
new PreparedSentence(s, "UPDATE sharedtickets SET "
|
new PreparedSentence(s
|
||||||
|
, "UPDATE sharedtickets SET "
|
||||||
+ "LOCKED = ? "
|
+ "LOCKED = ? "
|
||||||
+ "WHERE ID = ?", new SerializerWriteBasicExt(datas, new int[] { 1, 0 })).exec(values);
|
+ "WHERE ID = ?"
|
||||||
|
, new SerializerWriteBasicExt(datas, new int[] {1, 0})).exec(values);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* For Restaurant View
|
* For Restaurant View
|
||||||
*
|
|
||||||
* @param id
|
* @param id
|
||||||
* @param ticket
|
* @param ticket
|
||||||
* @param pickupid
|
* @param pickupid
|
||||||
@@ -289,7 +294,7 @@ public class DataLogicReceipts extends BeanFactoryDataSingle {
|
|||||||
id,
|
id,
|
||||||
ticket.getName(),
|
ticket.getName(),
|
||||||
ticket,
|
ticket,
|
||||||
ticket.getUserInfo(),
|
ticket.getUser(),
|
||||||
ticket.getPickupId(),
|
ticket.getPickupId(),
|
||||||
ticket.getHost()
|
ticket.getHost()
|
||||||
};
|
};
|
||||||
@@ -302,13 +307,15 @@ public class DataLogicReceipts extends BeanFactoryDataSingle {
|
|||||||
Datas.INT
|
Datas.INT
|
||||||
|
|
||||||
};
|
};
|
||||||
new PreparedSentence(s, "INSERT INTO sharedtickets ("
|
new PreparedSentence(s
|
||||||
|
, "INSERT INTO sharedtickets ("
|
||||||
+ "ID, "
|
+ "ID, "
|
||||||
+ "NAME, "
|
+ "NAME, "
|
||||||
+ "CONTENT, "
|
+ "CONTENT, "
|
||||||
+ "APPUSER, "
|
+ "APPUSER, "
|
||||||
+ "PICKUPID) "
|
+ "PICKUPID) "
|
||||||
+ "VALUES (?, ?, ?, ?, ?)", new SerializerWriteBasicExt(datas, new int[] { 0, 1, 2, 3, 4 })).exec(values);
|
+ "VALUES (?, ?, ?, ?, ?)"
|
||||||
|
, new SerializerWriteBasicExt(datas, new int[] {0, 1, 2, 3, 4})).exec(values);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -318,7 +325,9 @@ public class DataLogicReceipts extends BeanFactoryDataSingle {
|
|||||||
*/
|
*/
|
||||||
public final void deleteSharedTicket(final String id) throws BasicException {
|
public final void deleteSharedTicket(final String id) throws BasicException {
|
||||||
|
|
||||||
new StaticSentence(s, "DELETE FROM sharedtickets WHERE ID = ?", SerializerWriteString.INSTANCE).exec(id);
|
new StaticSentence(s
|
||||||
|
, "DELETE FROM sharedtickets WHERE ID = ?"
|
||||||
|
, SerializerWriteString.INSTANCE).exec(id);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -332,16 +341,21 @@ public class DataLogicReceipts extends BeanFactoryDataSingle {
|
|||||||
if (Id == null) {
|
if (Id == null) {
|
||||||
return null;
|
return null;
|
||||||
} else {
|
} else {
|
||||||
Object[] record = (Object[]) new StaticSentence(s, "SELECT PICKUPID FROM sharedtickets WHERE ID = ?",
|
Object[]record = (Object[]) new StaticSentence(s
|
||||||
SerializerWriteString.INSTANCE, new SerializerReadBasic(new Datas[] { Datas.INT })).find(Id);
|
, "SELECT PICKUPID FROM sharedtickets WHERE ID = ?"
|
||||||
return record == null ? 0 : (Integer) record[0];
|
, SerializerWriteString.INSTANCE
|
||||||
|
, new SerializerReadBasic(new Datas[] {Datas.INT})).find(Id);
|
||||||
|
return record == null ? 0 : (Integer)record[0];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
public final String getUserId(final String id) throws BasicException {
|
public final String getUserId(final String id) throws BasicException {
|
||||||
Object[] userID = (Object[]) new StaticSentence(s, "SELECT APPUSER FROM sharedtickets WHERE ID = ?",
|
Object[] userID = (Object []) new StaticSentence(s
|
||||||
SerializerWriteString.INSTANCE, new SerializerReadBasic(new Datas[] { Datas.STRING })).find(id);
|
, "SELECT APPUSER FROM sharedtickets WHERE ID = ?"
|
||||||
if (userID == null) {
|
, SerializerWriteString.INSTANCE
|
||||||
|
, new SerializerReadBasic(new Datas[] {Datas.STRING})).find(id);
|
||||||
|
if( userID == null ) {
|
||||||
return null;
|
return null;
|
||||||
} else {
|
} else {
|
||||||
return (String) userID[0];
|
return (String) userID[0];
|
||||||
@@ -349,16 +363,20 @@ public class DataLogicReceipts extends BeanFactoryDataSingle {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public final String getLockState(final String id, String lockState) throws BasicException {
|
public final String getLockState(final String id, String lockState) throws BasicException {
|
||||||
Object[] state = (Object[]) new StaticSentence(s, "SELECT LOCKED FROM sharedtickets WHERE ID = ?",
|
Object[] state = (Object[]) new StaticSentence(s
|
||||||
SerializerWriteString.INSTANCE, new SerializerReadBasic(new Datas[] {
|
, "SELECT LOCKED FROM sharedtickets WHERE ID = ?"
|
||||||
|
, SerializerWriteString.INSTANCE
|
||||||
|
, new SerializerReadBasic(new Datas[] {
|
||||||
Datas.STRING
|
Datas.STRING
|
||||||
})).find(id);
|
})).find(id);
|
||||||
return (String) state[0];
|
return (String) state[0];
|
||||||
}
|
}
|
||||||
|
|
||||||
public final String getServer(final String id, String user) throws BasicException {
|
public final String getServer(final String id, String user) throws BasicException {
|
||||||
Object[] server = (Object[]) new StaticSentence(s, "SELECT appuser FROM sharedtickets WHERE ID = ?",
|
Object[] server = (Object[]) new StaticSentence(s
|
||||||
SerializerWriteString.INSTANCE, new SerializerReadBasic(new Datas[] {
|
, "SELECT appuser FROM sharedtickets WHERE ID = ?"
|
||||||
|
, SerializerWriteString.INSTANCE
|
||||||
|
, new SerializerReadBasic(new Datas[] {
|
||||||
Datas.STRING
|
Datas.STRING
|
||||||
})).find(id);
|
})).find(id);
|
||||||
return (String) server[0];
|
return (String) server[0];
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@@ -23,8 +23,6 @@ import com.unicenta.pos.catalog.CatalogSelector;
|
|||||||
import com.unicenta.pos.catalog.JCatalog;
|
import com.unicenta.pos.catalog.JCatalog;
|
||||||
import com.unicenta.pos.forms.AppView;
|
import com.unicenta.pos.forms.AppView;
|
||||||
import com.unicenta.pos.ticket.ProductInfoExt;
|
import com.unicenta.pos.ticket.ProductInfoExt;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
|
||||||
|
|
||||||
import java.awt.Component;
|
import java.awt.Component;
|
||||||
import java.awt.Dimension;
|
import java.awt.Dimension;
|
||||||
import java.awt.event.ActionEvent;
|
import java.awt.event.ActionEvent;
|
||||||
@@ -36,7 +34,6 @@ import javax.swing.event.ListSelectionListener;
|
|||||||
*
|
*
|
||||||
* @author JG uniCenta
|
* @author JG uniCenta
|
||||||
*/
|
*/
|
||||||
@Slf4j
|
|
||||||
public class JPanelTicketSales extends JPanelTicket {
|
public class JPanelTicketSales extends JPanelTicket {
|
||||||
|
|
||||||
private CatalogSelector m_cat;
|
private CatalogSelector m_cat;
|
||||||
@@ -98,7 +95,6 @@ public class JPanelTicketSales extends JPanelTicket {
|
|||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
protected JTicketsBag getJTicketsBag() {
|
protected JTicketsBag getJTicketsBag() {
|
||||||
log.debug("Get JTickets Bag");
|
|
||||||
return JTicketsBag.createTicketsBag(m_App.getProperties().getProperty("machine.ticketsbag"), m_App, this);
|
return JTicketsBag.createTicketsBag(m_App.getProperties().getProperty("machine.ticketsbag"), m_App, this);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -74,8 +74,7 @@ public class JTicketsBagRestaurantMap extends JTicketsBag {
|
|||||||
private DataLogicSales dlSales = null;
|
private DataLogicSales dlSales = null;
|
||||||
private DataLogicSystem dlSystem = null;
|
private DataLogicSystem dlSystem = null;
|
||||||
private final RestaurantDBUtils restDB;
|
private final RestaurantDBUtils restDB;
|
||||||
private static final Icon ICO_OCU_SM = new ImageIcon(
|
private static final Icon ICO_OCU_SM = new ImageIcon(Place.class.getResource("/com/unicenta/images/edit_group_sm.png"));
|
||||||
Place.class.getResource("/com/unicenta/images/edit_group_sm.png"));
|
|
||||||
private static final Icon ICO_WAITER = new NullIcon(1, 1);
|
private static final Icon ICO_WAITER = new NullIcon(1, 1);
|
||||||
private static final Icon ICO_FRE = new NullIcon(22, 22);
|
private static final Icon ICO_FRE = new NullIcon(22, 22);
|
||||||
private String waiterDetails;
|
private String waiterDetails;
|
||||||
@@ -88,12 +87,10 @@ public class JTicketsBagRestaurantMap extends JTicketsBag {
|
|||||||
private AppView m_app;
|
private AppView m_app;
|
||||||
private Boolean showLayout = false;
|
private Boolean showLayout = false;
|
||||||
|
|
||||||
/**
|
|
||||||
* Creates new form JTicketsBagRestaurant
|
/** Creates new form JTicketsBagRestaurant
|
||||||
*
|
|
||||||
* @param app
|
* @param app
|
||||||
* @param panelticket
|
* @param panelticket */
|
||||||
*/
|
|
||||||
|
|
||||||
public JTicketsBagRestaurantMap(AppView app, TicketsEditor panelticket) {
|
public JTicketsBagRestaurantMap(AppView app, TicketsEditor panelticket) {
|
||||||
|
|
||||||
@@ -220,7 +217,8 @@ public class JTicketsBagRestaurantMap extends JTicketsBag {
|
|||||||
pl.setY(newY);
|
pl.setY(newY);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
});
|
}
|
||||||
|
);
|
||||||
|
|
||||||
pl.getButton().addActionListener(new MyActionListener(pl));
|
pl.getButton().addActionListener(new MyActionListener(pl));
|
||||||
}
|
}
|
||||||
@@ -242,7 +240,7 @@ public class JTicketsBagRestaurantMap extends JTicketsBag {
|
|||||||
.getString("label.autoRefreshTableMapTimerON"));
|
.getString("label.autoRefreshTableMapTimerON"));
|
||||||
|
|
||||||
Timer autoRefreshTimer = new Timer(Integer.parseInt(m_App.getProperties()
|
Timer autoRefreshTimer = new Timer(Integer.parseInt(m_App.getProperties()
|
||||||
.getProperty("till.autoRefreshTimer")) * 1000, new tableMapRefresh());
|
.getProperty("till.autoRefreshTimer"))*1000, new tableMapRefresh());
|
||||||
|
|
||||||
autoRefreshTimer.start();
|
autoRefreshTimer.start();
|
||||||
try {
|
try {
|
||||||
@@ -255,7 +253,7 @@ public class JTicketsBagRestaurantMap extends JTicketsBag {
|
|||||||
.getString("label.autoRefreshTableMapTimerOFF"));
|
.getString("label.autoRefreshTableMapTimerOFF"));
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
class tableMapRefresh implements ActionListener {
|
class tableMapRefresh implements ActionListener {
|
||||||
|
|
||||||
@@ -309,7 +307,7 @@ public class JTicketsBagRestaurantMap extends JTicketsBag {
|
|||||||
dlReceipts.updateSharedTicket(m_PlaceCurrent.getId(),
|
dlReceipts.updateSharedTicket(m_PlaceCurrent.getId(),
|
||||||
m_panelticket.getActiveTicket(),
|
m_panelticket.getActiveTicket(),
|
||||||
m_panelticket.getActiveTicket().getPickupId());
|
m_panelticket.getActiveTicket().getPickupId());
|
||||||
dlReceipts.unlockSharedTicket(m_PlaceCurrent.getId(), null);
|
dlReceipts.unlockSharedTicket(m_PlaceCurrent.getId(),null);
|
||||||
} catch (BasicException e) {
|
} catch (BasicException e) {
|
||||||
new MessageInf(e).show(this);
|
new MessageInf(e).show(this);
|
||||||
}
|
}
|
||||||
@@ -359,7 +357,7 @@ public class JTicketsBagRestaurantMap extends JTicketsBag {
|
|||||||
if (m_PlaceCurrent != null) {
|
if (m_PlaceCurrent != null) {
|
||||||
try {
|
try {
|
||||||
dlReceipts.updateRSharedTicket(m_PlaceCurrent.getId(),
|
dlReceipts.updateRSharedTicket(m_PlaceCurrent.getId(),
|
||||||
m_panelticket.getActiveTicket(), m_panelticket.getActiveTicket().getPickupId());
|
m_panelticket.getActiveTicket(),m_panelticket.getActiveTicket().getPickupId());
|
||||||
} catch (BasicException e) {
|
} catch (BasicException e) {
|
||||||
new MessageInf(e).show(this);
|
new MessageInf(e).show(this);
|
||||||
}
|
}
|
||||||
@@ -367,7 +365,7 @@ public class JTicketsBagRestaurantMap extends JTicketsBag {
|
|||||||
m_PlaceClipboard = m_PlaceCurrent; // put FROM table to TO table
|
m_PlaceClipboard = m_PlaceCurrent; // put FROM table to TO table
|
||||||
|
|
||||||
customer = null;
|
customer = null;
|
||||||
// m_PlaceCurrent = null; // Hang on we'll clear later after we're done
|
// m_PlaceCurrent = null; // Hang on we'll clear later after we're done
|
||||||
}
|
}
|
||||||
|
|
||||||
printState();
|
printState();
|
||||||
@@ -420,8 +418,10 @@ public class JTicketsBagRestaurantMap extends JTicketsBag {
|
|||||||
m_PlaceCurrent = null;
|
m_PlaceCurrent = null;
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
JOptionPane.showMessageDialog(null, AppLocal.getIntString("message.sharedticketlockoverriden"),
|
JOptionPane.showMessageDialog(null
|
||||||
AppLocal.getIntString("title.editor"), JOptionPane.INFORMATION_MESSAGE);
|
, AppLocal.getIntString("message.sharedticketlockoverriden")
|
||||||
|
, AppLocal.getIntString("title.editor")
|
||||||
|
, JOptionPane.INFORMATION_MESSAGE);
|
||||||
}
|
}
|
||||||
} catch (BasicException ex) {
|
} catch (BasicException ex) {
|
||||||
log.error(ex.getMessage());
|
log.error(ex.getMessage());
|
||||||
@@ -441,7 +441,7 @@ public class JTicketsBagRestaurantMap extends JTicketsBag {
|
|||||||
if (m_PlaceCurrent != null) {
|
if (m_PlaceCurrent != null) {
|
||||||
id = m_PlaceCurrent.getId();
|
id = m_PlaceCurrent.getId();
|
||||||
}
|
}
|
||||||
return (id);
|
return(id);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -453,7 +453,7 @@ public class JTicketsBagRestaurantMap extends JTicketsBag {
|
|||||||
if (m_PlaceCurrent != null) {
|
if (m_PlaceCurrent != null) {
|
||||||
stableName = m_PlaceCurrent.getName();
|
stableName = m_PlaceCurrent.getName();
|
||||||
}
|
}
|
||||||
return (stableName);
|
return(stableName);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -516,9 +516,9 @@ public class JTicketsBagRestaurantMap extends JTicketsBag {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Populate the floor plans and tables
|
* Populate the floor plans and tables
|
||||||
*/
|
*/
|
||||||
private void printState() {
|
private void printState() {
|
||||||
String sDB;
|
String sDB;
|
||||||
sDB = m_App.getProperties().getProperty("db.engine");
|
sDB = m_App.getProperties().getProperty("db.engine");
|
||||||
@@ -538,10 +538,10 @@ public class JTicketsBagRestaurantMap extends JTicketsBag {
|
|||||||
})
|
})
|
||||||
|
|
||||||
.map((place) -> {
|
.map((place) -> {
|
||||||
if (m_App.getProperties().getProperty("table.tablecolour") == null) {
|
if (m_App.getProperties().getProperty("table.tablecolour")== null){
|
||||||
tableName = "<style=font-size:9px;font-weight:bold;><font color = black>"
|
tableName="<style=font-size:9px;font-weight:bold;><font color = black>"
|
||||||
+ place.getName() + "</font></style>";
|
+ place.getName()+"</font></style>";
|
||||||
} else {
|
}else{
|
||||||
if (place.getOccupied() != null) {
|
if (place.getOccupied() != null) {
|
||||||
Date date = new java.util.Date();
|
Date date = new java.util.Date();
|
||||||
Timestamp t1 = new Timestamp(date.getTime());
|
Timestamp t1 = new Timestamp(date.getTime());
|
||||||
@@ -552,20 +552,20 @@ public class JTicketsBagRestaurantMap extends JTicketsBag {
|
|||||||
int hours = seconds / 3600;
|
int hours = seconds / 3600;
|
||||||
int minutes = (seconds % 3600) / 60;
|
int minutes = (seconds % 3600) / 60;
|
||||||
|
|
||||||
Integer count = restDB.getGuestsInTable(place.getId());
|
Integer count = restDB.getGuestsInTable(place.getId());
|
||||||
|
|
||||||
tableName = "<style=font-size:9px;font-weight:bold;><font color ="
|
tableName="<style=font-size:9px;font-weight:bold;><font color ="
|
||||||
+ m_App.getProperties().getProperty("table.tablecolour") + ">"
|
+ m_App.getProperties().getProperty("table.tablecolour")+ ">"
|
||||||
+ place.getName() + " / " + place.getSeats() + "<br>"
|
+ place.getName() + " / " + place.getSeats() + "<br>"
|
||||||
// + AppLocal.getIntString("button.guest") + place.getGuests() + "<br>"
|
// + AppLocal.getIntString("button.guest") + place.getGuests() + "<br>"
|
||||||
+ AppLocal.getIntString("button.guest") + count + "<br>"
|
+ AppLocal.getIntString("button.guest") + count + "<br>"
|
||||||
+ AppLocal.getIntString("button.occupied")
|
+ AppLocal.getIntString("button.occupied")
|
||||||
+ hours + "h" + ":" + minutes + "m"
|
+ hours + "h" + ":" + minutes + "m"
|
||||||
+ "<br>"
|
+ "<br>"
|
||||||
+ "</font></style>";
|
+ "</font></style>";
|
||||||
} else {
|
} else {
|
||||||
tableName = "<style=font-size:9px;font-weight:bold;><font color ="
|
tableName="<style=font-size:9px;font-weight:bold;><font color ="
|
||||||
+ m_App.getProperties().getProperty("table.tablecolour") + ">"
|
+ m_App.getProperties().getProperty("table.tablecolour")+ ">"
|
||||||
+ place.getName() + " / " + place.getSeats() + "<br>"
|
+ place.getName() + " / " + place.getSeats() + "<br>"
|
||||||
+ "</font></style>";
|
+ "</font></style>";
|
||||||
}
|
}
|
||||||
@@ -574,16 +574,16 @@ public class JTicketsBagRestaurantMap extends JTicketsBag {
|
|||||||
})
|
})
|
||||||
|
|
||||||
.map((place) -> {
|
.map((place) -> {
|
||||||
if (Boolean.parseBoolean(m_App.getProperties().getProperty("table.showwaiterdetails"))) {
|
if (Boolean.parseBoolean(m_App.getProperties().getProperty("table.showwaiterdetails"))){
|
||||||
if (m_App.getProperties().getProperty("table.waitercolour") == null) {
|
if (m_App.getProperties().getProperty("table.waitercolour")== null){
|
||||||
waiterDetails = (restDB.getWaiterNameInTable(place.getName()) == null) ? ""
|
waiterDetails = (restDB.getWaiterNameInTable(place.getName()) ==null)? ""
|
||||||
: "<style=font-size:9px;font-weight:bold;><font color = red>"
|
:"<style=font-size:9px;font-weight:bold;><font color = red>"
|
||||||
+ restDB.getWaiterNameInTableById(place.getId()) + "</font></style><br>";
|
+ restDB.getWaiterNameInTableById(place.getId())+"</font></style><br>";
|
||||||
} else {
|
}else{
|
||||||
waiterDetails = (restDB.getWaiterNameInTable(place.getName()) == null) ? ""
|
waiterDetails = (restDB.getWaiterNameInTable(place.getName()) ==null)? ""
|
||||||
: "<style=font-size:9px;font-weight:bold;><font color ="
|
:"<style=font-size:9px;font-weight:bold;><font color ="
|
||||||
+ m_App.getProperties().getProperty("table.waitercolour") + ">"
|
+ m_App.getProperties().getProperty("table.waitercolour")+ ">"
|
||||||
+ restDB.getWaiterNameInTableById(place.getId()) + "</font></style><br>";
|
+ restDB.getWaiterNameInTableById(place.getId())+"</font></style><br>";
|
||||||
}
|
}
|
||||||
place.getButton().setIcon(ICO_OCU_SM);
|
place.getButton().setIcon(ICO_OCU_SM);
|
||||||
} else {
|
} else {
|
||||||
@@ -594,21 +594,20 @@ public class JTicketsBagRestaurantMap extends JTicketsBag {
|
|||||||
|
|
||||||
.map((place) -> {
|
.map((place) -> {
|
||||||
if (Boolean.parseBoolean(
|
if (Boolean.parseBoolean(
|
||||||
m_App.getProperties().getProperty("table.showcustomerdetails"))) {
|
m_App.getProperties().getProperty("table.showcustomerdetails"))){
|
||||||
place.getButton().setIcon((Boolean.parseBoolean(
|
place.getButton().setIcon((Boolean.parseBoolean(
|
||||||
m_App.getProperties().getProperty("table.showwaiterdetails"))
|
m_App.getProperties().getProperty("table.showwaiterdetails"))
|
||||||
&& (restDB.getCustomerNameInTable(place.getName()) != null))
|
&& (restDB.getCustomerNameInTable(place.getName()) !=null))
|
||||||
? ICO_WAITER
|
? ICO_WAITER:ICO_OCU_SM);
|
||||||
: ICO_OCU_SM);
|
if (m_App.getProperties().getProperty("table.customercolour")== null){
|
||||||
if (m_App.getProperties().getProperty("table.customercolour") == null) {
|
customerDetails = (restDB.getCustomerNameInTable(place.getName()) ==null)? ""
|
||||||
customerDetails = (restDB.getCustomerNameInTable(place.getName()) == null) ? ""
|
:"<style=font-size:9px;font-weight:bold;><font color = blue>"
|
||||||
: "<style=font-size:9px;font-weight:bold;><font color = blue>"
|
+ restDB.getCustomerNameInTableById(place.getId())+"</font></style><br>";
|
||||||
+ restDB.getCustomerNameInTableById(place.getId()) + "</font></style><br>";
|
}else{
|
||||||
} else {
|
customerDetails = (restDB.getCustomerNameInTable(place.getName()) ==null)? ""
|
||||||
customerDetails = (restDB.getCustomerNameInTable(place.getName()) == null) ? ""
|
:"<style=font-size:9px;font-weight:bold;><font color ="
|
||||||
: "<style=font-size:9px;font-weight:bold;><font color ="
|
+ m_App.getProperties().getProperty("table.customercolour")+ ">"
|
||||||
+ m_App.getProperties().getProperty("table.customercolour") + ">"
|
+ restDB.getCustomerNameInTableById(place.getId())+"</font></style><br>";
|
||||||
+ restDB.getCustomerNameInTableById(place.getId()) + "</font></style><br>";
|
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
customerDetails = "";
|
customerDetails = "";
|
||||||
@@ -622,17 +621,17 @@ public class JTicketsBagRestaurantMap extends JTicketsBag {
|
|||||||
|| (Boolean.parseBoolean(
|
|| (Boolean.parseBoolean(
|
||||||
m_App.getProperties().getProperty("table.showcustomerdetails")))) {
|
m_App.getProperties().getProperty("table.showcustomerdetails")))) {
|
||||||
place.getButton().setText("<html><center>"
|
place.getButton().setText("<html><center>"
|
||||||
+ customerDetails + waiterDetails + tableName + "</html>");
|
+ customerDetails + waiterDetails +tableName+"</html>" );
|
||||||
} else {
|
}else{
|
||||||
if (m_App.getProperties().getProperty("table.tablecolour") == null) {
|
if (m_App.getProperties().getProperty("table.tablecolour")== null){
|
||||||
tableName = "<style=font-size:10px;font-weight:bold;><font color = black>"
|
tableName="<style=font-size:10px;font-weight:bold;><font color = black>"
|
||||||
+ place.getName() + "</font></style>";
|
+ place.getName()+"</font></style>";
|
||||||
} else {
|
}else{
|
||||||
tableName = "<style=font-size:10px;font-weight:bold;><font color ="
|
tableName="<style=font-size:10px;font-weight:bold;><font color ="
|
||||||
+ m_App.getProperties().getProperty("table.tablecolour") + ">"
|
+ m_App.getProperties().getProperty("table.tablecolour")+ ">"
|
||||||
+ place.getName() + "</font></style>";
|
+ place.getName()+"</font></style>";
|
||||||
}
|
}
|
||||||
place.getButton().setText("<html><center>" + tableName + "</html>");
|
place.getButton().setText("<html><center>"+tableName+"</html>");
|
||||||
}
|
}
|
||||||
return place;
|
return place;
|
||||||
})
|
})
|
||||||
@@ -644,12 +643,15 @@ public class JTicketsBagRestaurantMap extends JTicketsBag {
|
|||||||
});
|
});
|
||||||
|
|
||||||
m_jbtnReservations.setEnabled(true);
|
m_jbtnReservations.setEnabled(true);
|
||||||
// places here
|
// places here
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
m_jText.setText(AppLocal.getIntString("label.restaurantcustomer", new Object[] {
|
m_jText.setText(AppLocal.getIntString("label.restaurantcustomer"
|
||||||
|
, new Object[] {
|
||||||
customer.getName()
|
customer.getName()
|
||||||
}));
|
}
|
||||||
|
)
|
||||||
|
);
|
||||||
|
|
||||||
m_aplaces.stream()
|
m_aplaces.stream()
|
||||||
.forEach((place) -> {
|
.forEach((place) -> {
|
||||||
@@ -658,9 +660,11 @@ public class JTicketsBagRestaurantMap extends JTicketsBag {
|
|||||||
m_jbtnReservations.setEnabled(false);
|
m_jbtnReservations.setEnabled(false);
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
m_jText.setText(AppLocal.getIntString("label.restaurantmove", new Object[] {
|
m_jText.setText(AppLocal.getIntString("label.restaurantmove"
|
||||||
|
, new Object[] {
|
||||||
m_PlaceClipboard.getName()
|
m_PlaceClipboard.getName()
|
||||||
}));
|
}
|
||||||
|
));
|
||||||
|
|
||||||
m_aplaces.stream()
|
m_aplaces.stream()
|
||||||
.forEach((place) -> {
|
.forEach((place) -> {
|
||||||
@@ -691,25 +695,23 @@ public class JTicketsBagRestaurantMap extends JTicketsBag {
|
|||||||
m_restaurantmap.updateGuestCount();
|
m_restaurantmap.updateGuestCount();
|
||||||
|
|
||||||
try {
|
try {
|
||||||
dlReceipts.lockSharedTicket(m_PlaceCurrent.getId(), "locked");
|
dlReceipts.lockSharedTicket(m_PlaceCurrent.getId(),"locked");
|
||||||
} catch (BasicException ex) {
|
} catch (BasicException ex) {
|
||||||
log.error(ex.getMessage());
|
log.error(ex.getMessage());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void showView(String view) {
|
private void showView(String view) {
|
||||||
CardLayout cl = (CardLayout) (getLayout());
|
CardLayout cl = (CardLayout)(getLayout());
|
||||||
cl.show(this, view);
|
cl.show(this, view);
|
||||||
}
|
}
|
||||||
|
|
||||||
private class MyActionListener implements ActionListener {
|
private class MyActionListener implements ActionListener {
|
||||||
|
|
||||||
private final Place m_place;
|
private final Place m_place;
|
||||||
|
|
||||||
public MyActionListener(Place place) {
|
public MyActionListener(Place place) {
|
||||||
m_place = place;
|
m_place = place;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void actionPerformed(ActionEvent evt) {
|
public void actionPerformed(ActionEvent evt) {
|
||||||
m_App.getAppUserView().getUser();
|
m_App.getAppUserView().getUser();
|
||||||
@@ -721,7 +723,7 @@ public class JTicketsBagRestaurantMap extends JTicketsBag {
|
|||||||
TicketInfo ticket = getTicketInfo(m_place);
|
TicketInfo ticket = getTicketInfo(m_place);
|
||||||
if (ticket == null) { // It's an empty table
|
if (ticket == null) { // It's an empty table
|
||||||
ticket = new TicketInfo();
|
ticket = new TicketInfo();
|
||||||
ticket.setUserInfo(m_App.getAppUserView().getUser().getUserInfo());
|
ticket.setUser(m_App.getAppUserView().getUser().getUserInfo());
|
||||||
try {
|
try {
|
||||||
dlReceipts.insertSharedTicket(m_place.getId(), ticket, ticket.getPickupId());
|
dlReceipts.insertSharedTicket(m_place.getId(), ticket, ticket.getPickupId());
|
||||||
} catch (BasicException e) {
|
} catch (BasicException e) {
|
||||||
@@ -733,29 +735,30 @@ public class JTicketsBagRestaurantMap extends JTicketsBag {
|
|||||||
} else { // Table not empty
|
} else { // Table not empty
|
||||||
String m_lockState = null;
|
String m_lockState = null;
|
||||||
try {
|
try {
|
||||||
m_lockState = dlReceipts.getLockState(m_place.getId(), m_lockState); // check lockstate
|
m_lockState = dlReceipts.getLockState(m_place.getId(), m_lockState); //check lockstate
|
||||||
|
|
||||||
if ("locked".equals(m_lockState)) { // It's locked
|
if ("locked".equals(m_lockState)) { // It's locked
|
||||||
JOptionPane.showMessageDialog(null,
|
JOptionPane.showMessageDialog(null,
|
||||||
AppLocal.getIntString("message.sharedticketlock"));
|
AppLocal.getIntString("message.sharedticketlock"));
|
||||||
|
|
||||||
if (m_App.getAppUserView().getUser().hasPermission("sales.Override")) { // Override it
|
if (m_App.getAppUserView().getUser().hasPermission("sales.Override")) { // Override it
|
||||||
int res = JOptionPane.showConfirmDialog(null,
|
int res = JOptionPane.showConfirmDialog(null
|
||||||
AppLocal.getIntString("message.sharedticketlockoverride"), AppLocal.getIntString("title.editor"),
|
, AppLocal.getIntString("message.sharedticketlockoverride")
|
||||||
JOptionPane.YES_NO_OPTION, JOptionPane.WARNING_MESSAGE);
|
, AppLocal.getIntString("title.editor")
|
||||||
|
, JOptionPane.YES_NO_OPTION, JOptionPane.WARNING_MESSAGE);
|
||||||
|
|
||||||
if (res == JOptionPane.YES_OPTION) {
|
if (res == JOptionPane.YES_OPTION) {
|
||||||
m_place.setPeople(true);
|
m_place.setPeople(true);
|
||||||
m_PlaceClipboard = null;
|
m_PlaceClipboard = null;
|
||||||
setActivePlace(m_place, ticket);
|
setActivePlace(m_place, ticket);
|
||||||
dlReceipts.lockSharedTicket(m_PlaceCurrent.getId(), "locked");
|
dlReceipts.lockSharedTicket(m_PlaceCurrent.getId(),"locked");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else { // It's not locked
|
} else { // It's not locked
|
||||||
String m_user = m_App.getAppUserView().getUser().getId();
|
String m_user = m_App.getAppUserView().getUser().getId();
|
||||||
String ticketuser = dlReceipts.getServer(m_place.getId(), m_user);
|
String ticketuser = dlReceipts.getServer(m_place.getId(),m_user);
|
||||||
|
|
||||||
if (m_App.getAppUserView().getUser().hasPermission("sales.Override") // Check User permission
|
if (m_App.getAppUserView().getUser().hasPermission("sales.Override") //Check User permission
|
||||||
|| m_user.equals(ticketuser)) {
|
|| m_user.equals(ticketuser)) {
|
||||||
m_place.setPeople(true);
|
m_place.setPeople(true);
|
||||||
|
|
||||||
@@ -763,19 +766,21 @@ public class JTicketsBagRestaurantMap extends JTicketsBag {
|
|||||||
m_lockState = "locked";
|
m_lockState = "locked";
|
||||||
setActivePlace(m_place, ticket);
|
setActivePlace(m_place, ticket);
|
||||||
} else {
|
} else {
|
||||||
JOptionPane.showMessageDialog(null, AppLocal.getIntString("message.sharedticket"),
|
JOptionPane.showMessageDialog(null
|
||||||
AppLocal.getIntString("title.editor"), JOptionPane.OK_OPTION);
|
, AppLocal.getIntString("message.sharedticket")
|
||||||
|
, AppLocal.getIntString("title.editor")
|
||||||
|
, JOptionPane.OK_OPTION);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} catch (BasicException ex) {
|
} catch (BasicException ex) {
|
||||||
log.error(ex.getMessage());
|
log.error(ex.getMessage());
|
||||||
}
|
}
|
||||||
// printState(); // show table map. Why here?
|
// printState(); // show table map. Why here?
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// This block handles Merge
|
// This block handles Merge
|
||||||
// at this stage m_PlaceClipboard is FROM table
|
// at this stage m_PlaceClipboard is FROM table
|
||||||
// at this point m_place is TO table
|
// at this point m_place is TO table
|
||||||
|
|
||||||
if (m_PlaceClipboard != null) { // Anything in the Clipboard?
|
if (m_PlaceClipboard != null) { // Anything in the Clipboard?
|
||||||
TicketInfo ticketclip = getTicketInfo(m_PlaceClipboard); // add ticket object from clipboard
|
TicketInfo ticketclip = getTicketInfo(m_PlaceClipboard); // add ticket object from clipboard
|
||||||
@@ -882,18 +887,18 @@ public class JTicketsBagRestaurantMap extends JTicketsBag {
|
|||||||
*
|
*
|
||||||
* @param btnText
|
* @param btnText
|
||||||
*/
|
*/
|
||||||
public void setButtonTextBags(String btnText) {
|
public void setButtonTextBags(String btnText){
|
||||||
m_PlaceClipboard.setButtonText(btnText);
|
m_PlaceClipboard.setButtonText(btnText);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* This method is called from within the constructor to
|
|
||||||
|
/** This method is called from within the constructor to
|
||||||
* initialize the form.
|
* initialize the form.
|
||||||
* WARNING: Do NOT modify this code. The content of this method is
|
* WARNING: Do NOT modify this code. The content of this method is
|
||||||
* always regenerated by the Form Editor.
|
* always regenerated by the Form Editor.
|
||||||
*/
|
*/
|
||||||
// <editor-fold defaultstate="collapsed" desc="Generated
|
// <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents
|
||||||
// Code">//GEN-BEGIN:initComponents
|
|
||||||
private void initComponents() {
|
private void initComponents() {
|
||||||
|
|
||||||
m_jPanelMap = new javax.swing.JPanel();
|
m_jPanelMap = new javax.swing.JPanel();
|
||||||
@@ -1008,18 +1013,18 @@ public class JTicketsBagRestaurantMap extends JTicketsBag {
|
|||||||
add(m_jPanelMap, "map");
|
add(m_jPanelMap, "map");
|
||||||
}// </editor-fold>//GEN-END:initComponents
|
}// </editor-fold>//GEN-END:initComponents
|
||||||
|
|
||||||
private void m_jbtnRefreshActionPerformed(java.awt.event.ActionEvent evt) {// GEN-FIRST:event_m_jbtnRefreshActionPerformed
|
private void m_jbtnRefreshActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_m_jbtnRefreshActionPerformed
|
||||||
|
|
||||||
loadTickets();
|
loadTickets();
|
||||||
printState();
|
printState();
|
||||||
}// GEN-LAST:event_m_jbtnRefreshActionPerformed
|
}//GEN-LAST:event_m_jbtnRefreshActionPerformed
|
||||||
|
|
||||||
private void m_jbtnReservationsActionPerformed(java.awt.event.ActionEvent evt) {// GEN-FIRST:event_m_jbtnReservationsActionPerformed
|
private void m_jbtnReservationsActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_m_jbtnReservationsActionPerformed
|
||||||
showView("res");
|
showView("res");
|
||||||
m_jreservations.activate();
|
m_jreservations.activate();
|
||||||
}// GEN-LAST:event_m_jbtnReservationsActionPerformed
|
}//GEN-LAST:event_m_jbtnReservationsActionPerformed
|
||||||
|
|
||||||
private void m_jbtnLayoutActionPerformed(java.awt.event.ActionEvent evt) {// GEN-FIRST:event_m_jbtnLayoutActionPerformed
|
private void m_jbtnLayoutActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_m_jbtnLayoutActionPerformed
|
||||||
if (java.util.ResourceBundle.getBundle("pos_messages")
|
if (java.util.ResourceBundle.getBundle("pos_messages")
|
||||||
.getString("button.layout").equals(m_jbtnLayout.getText())) {
|
.getString("button.layout").equals(m_jbtnLayout.getText())) {
|
||||||
actionEnabled = false;
|
actionEnabled = false;
|
||||||
@@ -1052,9 +1057,9 @@ public class JTicketsBagRestaurantMap extends JTicketsBag {
|
|||||||
pl.getButton().setBorderPainted(false);
|
pl.getButton().setBorderPainted(false);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
}// GEN-LAST:event_m_jbtnLayoutActionPerformed
|
}//GEN-LAST:event_m_jbtnLayoutActionPerformed
|
||||||
|
|
||||||
private void m_jbtnSaveActionPerformed(java.awt.event.ActionEvent evt) {// GEN-FIRST:event_m_jbtnSaveActionPerformed
|
private void m_jbtnSaveActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_m_jbtnSaveActionPerformed
|
||||||
m_aplaces.forEach((pl) -> {
|
m_aplaces.forEach((pl) -> {
|
||||||
try {
|
try {
|
||||||
dlSystem.updatePlaces(pl.getX(), pl.getY(), pl.getId());
|
dlSystem.updatePlaces(pl.getX(), pl.getY(), pl.getId());
|
||||||
@@ -1062,7 +1067,8 @@ public class JTicketsBagRestaurantMap extends JTicketsBag {
|
|||||||
log.error(ex.getMessage());
|
log.error(ex.getMessage());
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}// GEN-LAST:event_m_jbtnSaveActionPerformed
|
}//GEN-LAST:event_m_jbtnSaveActionPerformed
|
||||||
|
|
||||||
|
|
||||||
// Variables declaration - do not modify//GEN-BEGIN:variables
|
// Variables declaration - do not modify//GEN-BEGIN:variables
|
||||||
private javax.swing.JPanel jPanel1;
|
private javax.swing.JPanel jPanel1;
|
||||||
|
|||||||
@@ -7,8 +7,6 @@ package com.unicenta.pos.sales.restaurant;
|
|||||||
import com.unicenta.data.loader.Session;
|
import com.unicenta.data.loader.Session;
|
||||||
import com.unicenta.pos.forms.AppView;
|
import com.unicenta.pos.forms.AppView;
|
||||||
import com.unicenta.pos.forms.DataLogicSystem;
|
import com.unicenta.pos.forms.DataLogicSystem;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
|
||||||
|
|
||||||
import java.sql.Connection;
|
import java.sql.Connection;
|
||||||
import java.sql.PreparedStatement;
|
import java.sql.PreparedStatement;
|
||||||
import java.sql.ResultSet;
|
import java.sql.ResultSet;
|
||||||
@@ -20,7 +18,7 @@ import java.sql.Timestamp;
|
|||||||
*
|
*
|
||||||
* @author JDL
|
* @author JDL
|
||||||
*/
|
*/
|
||||||
@Slf4j
|
|
||||||
public class RestaurantDBUtils {
|
public class RestaurantDBUtils {
|
||||||
private Session s;
|
private Session s;
|
||||||
private Connection con;
|
private Connection con;
|
||||||
@@ -306,10 +304,10 @@ public class RestaurantDBUtils {
|
|||||||
rs = stmt.executeQuery(SQL);
|
rs = stmt.executeQuery(SQL);
|
||||||
|
|
||||||
if (rs.next()){
|
if (rs.next()){
|
||||||
return(rs.getString("TICKETID"));
|
String customer =rs.getString("TICKETID");
|
||||||
|
return(customer);
|
||||||
}
|
}
|
||||||
}catch(SQLException e){
|
}catch(SQLException e){
|
||||||
log.error("Error running SQL: {}{}", SQL, e.getMessage());
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return "";
|
return "";
|
||||||
@@ -555,21 +553,6 @@ public class RestaurantDBUtils {
|
|||||||
return "";
|
return "";
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getTableId (String nameOfTable){
|
|
||||||
try{
|
|
||||||
SQL = "SELECT ID FROM places WHERE NAME='"+ nameOfTable + "'";
|
|
||||||
stmt = con.createStatement();
|
|
||||||
rs = stmt.executeQuery(SQL);
|
|
||||||
|
|
||||||
if (rs.next()){
|
|
||||||
return(rs.getString("ID"));
|
|
||||||
}
|
|
||||||
}catch(SQLException e){
|
|
||||||
log.error("Error running SQL: {}{}", SQL, e.getMessage());
|
|
||||||
}
|
|
||||||
return "";
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*
|
*
|
||||||
* @param tableID
|
* @param tableID
|
||||||
|
|||||||
@@ -53,7 +53,6 @@ public class JTicketsBagShared extends JTicketsBag {
|
|||||||
private DataLogicSales dlSales = null;
|
private DataLogicSales dlSales = null;
|
||||||
private final DataLogicSystem dlSystem;
|
private final DataLogicSystem dlSystem;
|
||||||
private Boolean showList;
|
private Boolean showList;
|
||||||
private int existingOrderCount;
|
|
||||||
|
|
||||||
|
|
||||||
/** Creates new form JTicketsBagShared
|
/** Creates new form JTicketsBagShared
|
||||||
@@ -82,7 +81,7 @@ public class JTicketsBagShared extends JTicketsBag {
|
|||||||
log.debug("Loading Sales screen! "+this.getClass());
|
log.debug("Loading Sales screen! "+this.getClass());
|
||||||
|
|
||||||
ExecutorService customExecutor = Executors.newCachedThreadPool();
|
ExecutorService customExecutor = Executors.newCachedThreadPool();
|
||||||
SwingWorker<String, String> reloadLayaway = new SwingWorker() {
|
SwingWorker<String, String> reloadLayaway = new SwingWorker<>() {
|
||||||
@Override
|
@Override
|
||||||
protected String doInBackground() throws Exception {
|
protected String doInBackground() throws Exception {
|
||||||
while (true) {
|
while (true) {
|
||||||
@@ -141,26 +140,12 @@ public class JTicketsBagShared extends JTicketsBag {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public void updateCount() {
|
public void updateCount() {
|
||||||
|
|
||||||
/*
|
|
||||||
1. Need to get / set the existing count
|
|
||||||
2. When count increases show dialog
|
|
||||||
*/
|
|
||||||
try {
|
try {
|
||||||
List<SharedTicketInfo> l = dlReceipts.getSharedTicketList();
|
List<SharedTicketInfo> l = dlReceipts.getSharedTicketList();
|
||||||
int count = l.size();
|
int count = l.size();
|
||||||
|
|
||||||
if (count > existingOrderCount) {
|
|
||||||
log.info("New Order Received from the API!");
|
|
||||||
// show Order Window
|
|
||||||
// List<ReprintTicketInfo> ticketInfoList= dlSales.getReprintTicketList();
|
|
||||||
// JTicketsReprintList listDialog = JTicketsReprintList.newJDialog(JTicketsBagShared.this);
|
|
||||||
// String id = listDialog.showTicketsList(ticketInfoList, dlSales);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (count > 0) {
|
if (count > 0) {
|
||||||
m_jListTickets.setText(Integer.toString(count));
|
m_jListTickets.setText(Integer.toString(count));
|
||||||
existingOrderCount = count;
|
|
||||||
} else {
|
} else {
|
||||||
m_jListTickets.setText("");
|
m_jListTickets.setText("");
|
||||||
}
|
}
|
||||||
@@ -442,10 +427,6 @@ public class JTicketsBagShared extends JTicketsBag {
|
|||||||
((JRootApp)m_App).closeAppView();
|
((JRootApp)m_App).closeAppView();
|
||||||
}//GEN-LAST:event_m_jHoldActionPerformed
|
}//GEN-LAST:event_m_jHoldActionPerformed
|
||||||
|
|
||||||
private void showOrderWindow() {
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
private void m_jReprintTicketsActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_m_jReprintTicketsActionPerformed
|
private void m_jReprintTicketsActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_m_jReprintTicketsActionPerformed
|
||||||
SwingUtilities.invokeLater(new Runnable() {
|
SwingUtilities.invokeLater(new Runnable() {
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
@@ -96,7 +96,7 @@ public class JTicketsReprintList extends javax.swing.JDialog {
|
|||||||
m_ticket = null;
|
m_ticket = null;
|
||||||
m_ticketCopy = null;
|
m_ticketCopy = null;
|
||||||
|
|
||||||
ReprintTicketInfo m_Ticket = null;
|
ReprintTicketInfo m_Ticket = null;
|
||||||
|
|
||||||
for (ReprintTicketInfo aticket : atickets) {
|
for (ReprintTicketInfo aticket : atickets) {
|
||||||
m_jtickets.add(new JButtonTicket(aticket, dlSales));
|
m_jtickets.add(new JButtonTicket(aticket, dlSales));
|
||||||
|
|||||||
@@ -48,41 +48,41 @@ public final class TicketInfo implements SerializableRead, Externalizable {
|
|||||||
public static final int RECEIPT_PAYMENT = 2;
|
public static final int RECEIPT_PAYMENT = 2;
|
||||||
public static final int RECEIPT_NOSALE = 3;
|
public static final int RECEIPT_NOSALE = 3;
|
||||||
|
|
||||||
// JG Jun 2017 - contain partial/full refunds
|
// JG Jun 2017 - contain partial/full refunds
|
||||||
public static final int REFUND_NOT = 0; // is a non-refunded ticket
|
public static final int REFUND_NOT = 0; // is a non-refunded ticket
|
||||||
public static final int REFUND_PARTIAL = 1;
|
public static final int REFUND_PARTIAL = 1;
|
||||||
public static final int REFUND_ALL = 2;
|
public static final int REFUND_ALL = 2;
|
||||||
|
|
||||||
private static final DateFormat m_dateformat = new SimpleDateFormat("hh:mm");
|
private static final DateFormat m_dateformat = new SimpleDateFormat("hh:mm");
|
||||||
|
|
||||||
private String host;
|
private String m_sHost;
|
||||||
private String id;
|
private String m_sId;
|
||||||
private int ticketType;
|
private int tickettype;
|
||||||
private int ticketId;
|
private int m_iTicketId;
|
||||||
private int pickupId;
|
private int m_iPickupId;
|
||||||
private java.util.Date date;
|
private java.util.Date m_dDate;
|
||||||
private Properties attributes;
|
private Properties attributes;
|
||||||
private UserInfo userInfo;
|
private UserInfo m_User;
|
||||||
private Double multiply;
|
private Double multiply;
|
||||||
private CustomerInfoExt cutomerInfoExt;
|
private CustomerInfoExt m_Customer;
|
||||||
private String activeCash;
|
private String m_sActiveCash;
|
||||||
private List<TicketLineInfo> ticketLines;
|
private List<TicketLineInfo> m_aLines;
|
||||||
private List<PaymentInfo> payments;
|
private List<PaymentInfo> payments;
|
||||||
private List<TicketTaxInfo> taxes;
|
private List<TicketTaxInfo> taxes;
|
||||||
private final String m_sResponse;
|
private final String m_sResponse;
|
||||||
private String loyaltyCardNumber;
|
private String loyaltyCardNumber;
|
||||||
private Boolean oldTicket;
|
private Boolean oldTicket;
|
||||||
private boolean tip;
|
private boolean tip;
|
||||||
private PaymentInfoTicket ticketPaymentInfo;
|
private PaymentInfoTicket m_paymentInfo;
|
||||||
private boolean isProcessed;
|
private boolean m_isProcessed;
|
||||||
private final String locked;
|
private final String m_locked;
|
||||||
private Double nsum;
|
private Double nsum;
|
||||||
private int ticketstatus;
|
private int ticketstatus;
|
||||||
|
|
||||||
private static String hostname;
|
private static String hostname;
|
||||||
|
|
||||||
public static void setHostname(String name) {
|
public static void setHostname(String name) {
|
||||||
hostname = name;
|
hostname =name;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static String getHostname() {
|
public static String getHostname() {
|
||||||
@@ -91,53 +91,53 @@ public final class TicketInfo implements SerializableRead, Externalizable {
|
|||||||
|
|
||||||
/** Creates new TicketModel */
|
/** Creates new TicketModel */
|
||||||
public TicketInfo() {
|
public TicketInfo() {
|
||||||
id = UUID.randomUUID().toString();
|
m_sId = UUID.randomUUID().toString();
|
||||||
ticketType = RECEIPT_NORMAL;
|
tickettype = RECEIPT_NORMAL;
|
||||||
ticketId = 0; // incrementamos
|
m_iTicketId = 0; // incrementamos
|
||||||
date = new Date();
|
m_dDate = new Date();
|
||||||
attributes = new Properties();
|
attributes = new Properties();
|
||||||
userInfo = null;
|
m_User = null;
|
||||||
cutomerInfoExt = null;
|
m_Customer = null;
|
||||||
activeCash = null;
|
m_sActiveCash = null;
|
||||||
ticketLines = new ArrayList<>();
|
m_aLines = new ArrayList<>();
|
||||||
payments = new ArrayList<>();
|
payments = new ArrayList<>();
|
||||||
taxes = null;
|
taxes = null;
|
||||||
m_sResponse = null;
|
m_sResponse = null;
|
||||||
oldTicket = false;
|
oldTicket=false;
|
||||||
|
|
||||||
AppConfig config = new AppConfig(new File(new File(
|
AppConfig config = new AppConfig(new File(new File(
|
||||||
System.getProperty("user.home")), AppLocal.APP_ID + ".properties"));
|
System.getProperty("user.home")), AppLocal.APP_ID + ".properties"));
|
||||||
config.load();
|
config.load();
|
||||||
tip = Boolean.valueOf(config.getProperty("machine.showTip"));
|
tip = Boolean.valueOf(config.getProperty("machine.showTip"));
|
||||||
isProcessed = false;
|
m_isProcessed = false;
|
||||||
locked = null;
|
m_locked = null;
|
||||||
ticketstatus = 0;
|
ticketstatus = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void writeExternal(ObjectOutput out) throws IOException {
|
public void writeExternal(ObjectOutput out) throws IOException {
|
||||||
out.writeObject(id);
|
out.writeObject(m_sId);
|
||||||
out.writeInt(ticketType);
|
out.writeInt(tickettype);
|
||||||
out.writeInt(ticketId);
|
out.writeInt(m_iTicketId);
|
||||||
out.writeObject(cutomerInfoExt);
|
out.writeObject(m_Customer);
|
||||||
out.writeObject(date);
|
out.writeObject(m_dDate);
|
||||||
out.writeObject(attributes);
|
out.writeObject(attributes);
|
||||||
out.writeObject(ticketLines);
|
out.writeObject(m_aLines);
|
||||||
|
|
||||||
out.writeInt(ticketstatus);
|
out.writeInt(ticketstatus);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
|
public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
|
||||||
id = (String) in.readObject();
|
m_sId = (String) in.readObject();
|
||||||
ticketType = in.readInt();
|
tickettype = in.readInt();
|
||||||
ticketId = in.readInt();
|
m_iTicketId = in.readInt();
|
||||||
cutomerInfoExt = (CustomerInfoExt) in.readObject();
|
m_Customer = (CustomerInfoExt) in.readObject();
|
||||||
date = (Date) in.readObject();
|
m_dDate = (Date) in.readObject();
|
||||||
attributes = (Properties) in.readObject();
|
attributes = (Properties) in.readObject();
|
||||||
ticketLines = (List<TicketLineInfo>) in.readObject();
|
m_aLines = (List<TicketLineInfo>) in.readObject();
|
||||||
userInfo = null;
|
m_User = null;
|
||||||
activeCash = null;
|
m_sActiveCash = null;
|
||||||
payments = new ArrayList<>(); // JG June 2102 diamond inference
|
payments = new ArrayList<>(); // JG June 2102 diamond inference
|
||||||
taxes = null;
|
taxes = null;
|
||||||
|
|
||||||
@@ -151,11 +151,11 @@ public final class TicketInfo implements SerializableRead, Externalizable {
|
|||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public void readValues(DataRead dr) throws BasicException {
|
public void readValues(DataRead dr) throws BasicException {
|
||||||
id = dr.getString(1);
|
m_sId = dr.getString(1);
|
||||||
ticketType = dr.getInt(2);
|
tickettype = dr.getInt(2);
|
||||||
ticketId = dr.getInt(3);
|
m_iTicketId = dr.getInt(3);
|
||||||
date = dr.getTimestamp(4);
|
m_dDate = dr.getTimestamp(4);
|
||||||
activeCash = dr.getString(5);
|
m_sActiveCash = dr.getString(5);
|
||||||
try {
|
try {
|
||||||
byte[] img = dr.getBytes(6);
|
byte[] img = dr.getBytes(6);
|
||||||
if (img != null) {
|
if (img != null) {
|
||||||
@@ -163,9 +163,9 @@ public final class TicketInfo implements SerializableRead, Externalizable {
|
|||||||
}
|
}
|
||||||
} catch (IOException e) {
|
} catch (IOException e) {
|
||||||
}
|
}
|
||||||
userInfo = new UserInfo(dr.getString(7), dr.getString(8));
|
m_User = new UserInfo(dr.getString(7), dr.getString(8));
|
||||||
cutomerInfoExt = new CustomerInfoExt(dr.getString(9));
|
m_Customer = new CustomerInfoExt(dr.getString(9));
|
||||||
ticketLines = new ArrayList<>();
|
m_aLines = new ArrayList<>();
|
||||||
payments = new ArrayList<>();
|
payments = new ArrayList<>();
|
||||||
taxes = null;
|
taxes = null;
|
||||||
|
|
||||||
@@ -177,76 +177,73 @@ public final class TicketInfo implements SerializableRead, Externalizable {
|
|||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
public TicketInfo copyTicket() {
|
public TicketInfo copyTicket() {
|
||||||
TicketInfo ticketInfo = new TicketInfo();
|
TicketInfo t = new TicketInfo();
|
||||||
|
|
||||||
ticketInfo.ticketType = ticketType;
|
t.tickettype = tickettype;
|
||||||
ticketInfo.ticketId = ticketId;
|
t.m_iTicketId = m_iTicketId;
|
||||||
ticketInfo.date = date;
|
t.m_dDate = m_dDate;
|
||||||
ticketInfo.activeCash = activeCash;
|
t.m_sActiveCash = m_sActiveCash;
|
||||||
ticketInfo.attributes = (Properties) attributes.clone();
|
t.attributes = (Properties) attributes.clone();
|
||||||
ticketInfo.userInfo = userInfo;
|
t.m_User = m_User;
|
||||||
ticketInfo.cutomerInfoExt = cutomerInfoExt;
|
t.m_Customer = m_Customer;
|
||||||
|
|
||||||
ticketInfo.ticketLines = new ArrayList<>(); // JG June 2102 diamond inference
|
t.m_aLines = new ArrayList<>(); // JG June 2102 diamond inference
|
||||||
ticketLines.forEach((line) -> {
|
m_aLines.forEach((l) -> {
|
||||||
ticketInfo.ticketLines.add(line.copyTicketLine());
|
t.m_aLines.add(l.copyTicketLine());
|
||||||
});
|
});
|
||||||
ticketInfo.refreshLines();
|
t.refreshLines();
|
||||||
|
|
||||||
ticketInfo.payments = new LinkedList<>(); // JG June 2102 diamond inference
|
t.payments = new LinkedList<>(); // JG June 2102 diamond inference
|
||||||
payments.forEach((p) -> {
|
payments.forEach((p) -> {
|
||||||
ticketInfo.payments.add(p.copyPayment());
|
t.payments.add(p.copyPayment());
|
||||||
});
|
});
|
||||||
ticketInfo.oldTicket = oldTicket;
|
t.oldTicket=oldTicket;
|
||||||
// taxes are not copied, must be calculated again.
|
// taxes are not copied, must be calculated again.
|
||||||
|
|
||||||
ticketInfo.ticketstatus = ticketstatus;
|
t.ticketstatus = ticketstatus;
|
||||||
|
|
||||||
return ticketInfo;
|
return t;
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getId() {
|
public String getId() {
|
||||||
return id;
|
return m_sId;
|
||||||
}
|
}
|
||||||
|
|
||||||
public int getTicketType() {
|
public int getTicketType() {
|
||||||
return ticketType;
|
return tickettype;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setTicketType(int tickettype) {
|
public void setTicketType(int tickettype) {
|
||||||
this.ticketType = tickettype;
|
this.tickettype = tickettype;
|
||||||
}
|
}
|
||||||
|
|
||||||
public int getTicketId() {
|
public int getTicketId() {
|
||||||
return ticketId;
|
return m_iTicketId;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setTicketId(int iTicketId) {
|
public void setTicketId(int iTicketId) {
|
||||||
ticketId = iTicketId;
|
m_iTicketId = iTicketId;
|
||||||
}
|
}
|
||||||
|
|
||||||
public int getTicketStatus() {
|
public int getTicketStatus() {
|
||||||
return ticketstatus;
|
return ticketstatus;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setTicketStatus(int ticketstatus) {
|
public void setTicketStatus(int ticketstatus) {
|
||||||
if (ticketId > 0) {
|
if (m_iTicketId >0) {
|
||||||
this.ticketstatus = ticketId;
|
this.ticketstatus = m_iTicketId;
|
||||||
} else {
|
}else{
|
||||||
this.ticketstatus = ticketstatus;
|
this.ticketstatus = ticketstatus;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setPickupId(int iTicketId) {
|
public void setPickupId(int iTicketId) {
|
||||||
pickupId = iTicketId;
|
m_iPickupId = iTicketId;
|
||||||
}
|
}
|
||||||
|
|
||||||
public int getPickupId() {
|
public int getPickupId() {
|
||||||
return pickupId;
|
return m_iPickupId;
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getName(Object info) {
|
public String getName(Object info) {
|
||||||
// JG Aug 2014 - Add User info
|
// JG Aug 2014 - Add User info
|
||||||
List<String> name = new ArrayList<>();
|
List<String> name = new ArrayList<>();
|
||||||
|
|
||||||
String nameprop = getProperty("name");
|
String nameprop = getProperty("name");
|
||||||
@@ -254,23 +251,23 @@ public final class TicketInfo implements SerializableRead, Externalizable {
|
|||||||
name.add(nameprop);
|
name.add(nameprop);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (userInfo != null) {
|
if (m_User != null) {
|
||||||
name.add(userInfo.getName());
|
name.add(m_User.getName());
|
||||||
}
|
}
|
||||||
|
|
||||||
if (info == null) {
|
if (info == null) {
|
||||||
if (ticketId == 0) {
|
if (m_iTicketId == 0) {
|
||||||
name.add("(" + m_dateformat.format(date) + " "
|
name.add("(" + m_dateformat.format(m_dDate) + " "
|
||||||
+ Long.toString(date.getTime() % 1000) + ")");
|
+ Long.toString(m_dDate.getTime() % 1000) + ")");
|
||||||
} else {
|
} else {
|
||||||
name.add(Integer.toString(ticketId));
|
name.add(Integer.toString(m_iTicketId));
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
name.add(info.toString());
|
name.add(info.toString());
|
||||||
}
|
}
|
||||||
|
|
||||||
if (cutomerInfoExt != null) {
|
if (m_Customer != null) {
|
||||||
name.add(cutomerInfoExt.getName());
|
name.add(m_Customer.getName());
|
||||||
}
|
}
|
||||||
|
|
||||||
return org.apache.commons.lang.StringUtils.join(name, " - ");
|
return org.apache.commons.lang.StringUtils.join(name, " - ");
|
||||||
@@ -281,64 +278,64 @@ public final class TicketInfo implements SerializableRead, Externalizable {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public java.util.Date getDate() {
|
public java.util.Date getDate() {
|
||||||
return date;
|
return m_dDate;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setDate(java.util.Date dDate) {
|
public void setDate(java.util.Date dDate) {
|
||||||
date = dDate;
|
m_dDate = dDate;
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getHost() {
|
public String getHost() {
|
||||||
AppConfig m_config_host = new AppConfig(new File((System.getProperty("user.home")),
|
AppConfig m_config_host = new AppConfig(new File((System.getProperty("user.home")),
|
||||||
AppLocal.APP_ID + ".properties"));
|
AppLocal.APP_ID + ".properties"));
|
||||||
m_config_host.load();
|
m_config_host.load();
|
||||||
String machineHostname = (m_config_host.getProperty("machine.hostname"));
|
String machineHostname =(m_config_host.getProperty("machine.hostname"));
|
||||||
m_config_host = null;
|
m_config_host = null;
|
||||||
return machineHostname;
|
return machineHostname;
|
||||||
}
|
}
|
||||||
|
|
||||||
public UserInfo getUserInfo() {
|
public UserInfo getUser() {
|
||||||
return userInfo;
|
return m_User;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setUserInfo(UserInfo value) {
|
public void setUser(UserInfo value) {
|
||||||
userInfo = value;
|
m_User = value;
|
||||||
}
|
}
|
||||||
|
|
||||||
public CustomerInfoExt getCustomer() {
|
public CustomerInfoExt getCustomer() {
|
||||||
return cutomerInfoExt;
|
return m_Customer;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setCustomer(CustomerInfoExt value) {
|
public void setCustomer(CustomerInfoExt value) {
|
||||||
cutomerInfoExt = value;
|
m_Customer = value;
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getCustomerId() {
|
public String getCustomerId() {
|
||||||
if (cutomerInfoExt == null) {
|
if (m_Customer == null) {
|
||||||
return null;
|
return null;
|
||||||
} else {
|
} else {
|
||||||
return cutomerInfoExt.getId();
|
return m_Customer.getId();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getTransactionID() {
|
public String getTransactionID(){
|
||||||
return (getPayments().size() > 0)
|
return (getPayments().size()>0)
|
||||||
? (getPayments().get(getPayments().size() - 1)).getTransactionID()
|
? ( getPayments().get(getPayments().size()-1) ).getTransactionID()
|
||||||
: StringUtils.getCardNumber(); // random transaction ID
|
: StringUtils.getCardNumber(); //random transaction ID
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getReturnMessage() {
|
public String getReturnMessage(){
|
||||||
return ((getPayments().get(getPayments().size() - 1)) instanceof PaymentInfoMagcard)
|
return ( (getPayments().get(getPayments().size()-1)) instanceof PaymentInfoMagcard )
|
||||||
? ((PaymentInfoMagcard) (getPayments().get(getPayments().size() - 1))).getReturnMessage()
|
? ((PaymentInfoMagcard)(getPayments().get(getPayments().size()-1))).getReturnMessage()
|
||||||
: LocalRes.getIntString("button.OK");
|
: LocalRes.getIntString("button.OK");
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setActiveCash(String value) {
|
public void setActiveCash(String value) {
|
||||||
activeCash = value;
|
m_sActiveCash = value;
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getActiveCash() {
|
public String getActiveCash() {
|
||||||
return activeCash;
|
return m_sActiveCash;
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getProperty(String key) {
|
public String getProperty(String key) {
|
||||||
@@ -358,45 +355,45 @@ public final class TicketInfo implements SerializableRead, Externalizable {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public TicketLineInfo getLine(int index) {
|
public TicketLineInfo getLine(int index) {
|
||||||
return ticketLines.get(index);
|
return m_aLines.get(index);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void addLine(TicketLineInfo oLine) {
|
public void addLine(TicketLineInfo oLine) {
|
||||||
oLine.setTicket(id, ticketLines.size());
|
oLine.setTicket(m_sId, m_aLines.size());
|
||||||
ticketLines.add(oLine);
|
m_aLines.add(oLine);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void insertLine(int index, TicketLineInfo oLine) {
|
public void insertLine(int index, TicketLineInfo oLine) {
|
||||||
ticketLines.add(index, oLine);
|
m_aLines.add(index, oLine);
|
||||||
refreshLines();
|
refreshLines();
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setLine(int index, TicketLineInfo oLine) {
|
public void setLine(int index, TicketLineInfo oLine) {
|
||||||
oLine.setTicket(id, index);
|
oLine.setTicket(m_sId, index);
|
||||||
ticketLines.set(index, oLine);
|
m_aLines.set(index, oLine);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void removeLine(int index) {
|
public void removeLine(int index) {
|
||||||
ticketLines.remove(index);
|
m_aLines.remove(index);
|
||||||
refreshLines();
|
refreshLines();
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public void refreshLines() {
|
public void refreshLines() {
|
||||||
for (int i = 0; i < ticketLines.size(); i++) {
|
for (int i = 0; i < m_aLines.size(); i++) {
|
||||||
getLine(i).setTicket(id, i);
|
getLine(i).setTicket(m_sId, i);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public int getLinesCount() {
|
public int getLinesCount() {
|
||||||
return ticketLines.size();
|
return m_aLines.size();
|
||||||
}
|
}
|
||||||
|
|
||||||
public double getArticlesCount() {
|
public double getArticlesCount() {
|
||||||
double dArticles = 0.0;
|
double dArticles = 0.0;
|
||||||
TicketLineInfo oLine;
|
TicketLineInfo oLine;
|
||||||
|
|
||||||
for (Iterator<TicketLineInfo> i = ticketLines.iterator(); i.hasNext();) {
|
for (Iterator<TicketLineInfo> i = m_aLines.iterator(); i.hasNext();) {
|
||||||
oLine = i.next();
|
oLine = i.next();
|
||||||
dArticles += oLine.getMultiply();
|
dArticles += oLine.getMultiply();
|
||||||
}
|
}
|
||||||
@@ -406,8 +403,9 @@ public final class TicketInfo implements SerializableRead, Externalizable {
|
|||||||
|
|
||||||
public double getSubTotal() {
|
public double getSubTotal() {
|
||||||
double sum = 0.0;
|
double sum = 0.0;
|
||||||
sum = ticketLines.stream().map((line) -> line.getSubValue()).reduce(sum,
|
sum = m_aLines.stream().map((line) ->
|
||||||
(accumulator, _item) -> accumulator + _item);
|
line.getSubValue()).reduce(sum, (accumulator, _item) ->
|
||||||
|
accumulator + _item);
|
||||||
return sum;
|
return sum;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -420,7 +418,9 @@ public final class TicketInfo implements SerializableRead, Externalizable {
|
|||||||
nsum = sum;
|
nsum = sum;
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
sum = ticketLines.stream().map((line) -> line.getTax()).reduce(sum, (accumulator, _item) -> accumulator + _item);
|
sum = m_aLines.stream().map((line) ->
|
||||||
|
line.getTax()).reduce(sum, (accumulator, _item) ->
|
||||||
|
accumulator + _item);
|
||||||
}
|
}
|
||||||
return sum;
|
return sum;
|
||||||
}
|
}
|
||||||
@@ -437,8 +437,10 @@ public final class TicketInfo implements SerializableRead, Externalizable {
|
|||||||
|
|
||||||
public double getTotalPaid() {
|
public double getTotalPaid() {
|
||||||
double sum = 0.0;
|
double sum = 0.0;
|
||||||
sum = payments.stream().filter((p) -> (!"debtpaid".equals(p.getName()))).map((p) -> p.getTotal()).reduce(sum,
|
sum = payments.stream().filter((p) ->
|
||||||
(accumulator, _item) -> accumulator + _item);
|
(!"debtpaid".equals(p.getName()))).map((p) ->
|
||||||
|
p.getTotal()).reduce(sum, (accumulator, _item) ->
|
||||||
|
accumulator + _item);
|
||||||
return sum;
|
return sum;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -447,11 +449,11 @@ public final class TicketInfo implements SerializableRead, Externalizable {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public List<TicketLineInfo> getLines() {
|
public List<TicketLineInfo> getLines() {
|
||||||
return ticketLines;
|
return m_aLines;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setLines(List<TicketLineInfo> l) {
|
public void setLines(List<TicketLineInfo> l) {
|
||||||
ticketLines = l;
|
m_aLines = l;
|
||||||
}
|
}
|
||||||
|
|
||||||
public List<PaymentInfo> getPayments() {
|
public List<PaymentInfo> getPayments() {
|
||||||
@@ -491,7 +493,7 @@ public final class TicketInfo implements SerializableRead, Externalizable {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public void setIsProcessed(boolean isP) {
|
public void setIsProcessed(boolean isP) {
|
||||||
isProcessed = isP;
|
m_isProcessed = isP;
|
||||||
}
|
}
|
||||||
|
|
||||||
public TicketTaxInfo getTaxLine(TaxInfo tax) {
|
public TicketTaxInfo getTaxLine(TaxInfo tax) {
|
||||||
@@ -510,7 +512,7 @@ public final class TicketInfo implements SerializableRead, Externalizable {
|
|||||||
Map<String, TicketTaxInfo> m = new HashMap<>();
|
Map<String, TicketTaxInfo> m = new HashMap<>();
|
||||||
|
|
||||||
TicketLineInfo oLine;
|
TicketLineInfo oLine;
|
||||||
for (Iterator<TicketLineInfo> i = ticketLines.iterator(); i.hasNext();) {
|
for (Iterator<TicketLineInfo> i = m_aLines.iterator(); i.hasNext();) {
|
||||||
oLine = i.next();
|
oLine = i.next();
|
||||||
|
|
||||||
TicketTaxInfo t = m.get(oLine.getTaxInfo().getId());
|
TicketTaxInfo t = m.get(oLine.getTaxInfo().getId());
|
||||||
@@ -531,24 +533,24 @@ public final class TicketInfo implements SerializableRead, Externalizable {
|
|||||||
AppConfig m_config = new AppConfig(new File(
|
AppConfig m_config = new AppConfig(new File(
|
||||||
(System.getProperty("user.home")), AppLocal.APP_ID + ".properties"));
|
(System.getProperty("user.home")), AppLocal.APP_ID + ".properties"));
|
||||||
m_config.load();
|
m_config.load();
|
||||||
String receiptSize = (m_config.getProperty("till.receiptsize"));
|
String receiptSize =(m_config.getProperty("till.receiptsize"));
|
||||||
String receiptPrefix = (m_config.getProperty("till.receiptprefix"));
|
String receiptPrefix =(m_config.getProperty("till.receiptprefix"));
|
||||||
|
|
||||||
m_config = null;
|
m_config =null;
|
||||||
|
|
||||||
if (ticketId > 0) {
|
if (m_iTicketId > 0) {
|
||||||
String tmpTicketId = Integer.toString(ticketId);
|
String tmpTicketId=Integer.toString(m_iTicketId);
|
||||||
if (receiptSize == null || (Integer.parseInt(receiptSize) <= tmpTicketId.length())) {
|
if (receiptSize == null || (Integer.parseInt(receiptSize) <= tmpTicketId.length())){
|
||||||
if (receiptPrefix != null) {
|
if (receiptPrefix != null){
|
||||||
tmpTicketId = receiptPrefix + tmpTicketId;
|
tmpTicketId=receiptPrefix+tmpTicketId;
|
||||||
}
|
}
|
||||||
return tmpTicketId;
|
return tmpTicketId;
|
||||||
}
|
}
|
||||||
while (tmpTicketId.length() < Integer.parseInt(receiptSize)) {
|
while (tmpTicketId.length()<Integer.parseInt(receiptSize)){
|
||||||
tmpTicketId = "0" + tmpTicketId;
|
tmpTicketId="0"+tmpTicketId;
|
||||||
}
|
}
|
||||||
if (receiptPrefix != null) {
|
if (receiptPrefix != null){
|
||||||
tmpTicketId = receiptPrefix + tmpTicketId;
|
tmpTicketId=receiptPrefix+tmpTicketId;
|
||||||
}
|
}
|
||||||
return tmpTicketId;
|
return tmpTicketId;
|
||||||
} else {
|
} else {
|
||||||
@@ -557,49 +559,50 @@ public final class TicketInfo implements SerializableRead, Externalizable {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public String printDate() {
|
public String printDate() {
|
||||||
return Formats.TIMESTAMP.formatValue(date);
|
return Formats.TIMESTAMP.formatValue(m_dDate);
|
||||||
}
|
}
|
||||||
|
|
||||||
public String printUser() {
|
public String printUser() {
|
||||||
return userInfo == null ? "" : userInfo.getName();
|
return m_User == null ? "" : m_User.getName();
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public String printHost() {
|
public String printHost() {
|
||||||
return host;
|
return m_sHost;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Added JDL 28.05.13 for loyalty card functions
|
|
||||||
|
// Added JDL 28.05.13 for loyalty card functions
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
public void clearCardNumber() {
|
public void clearCardNumber(){
|
||||||
loyaltyCardNumber = null;
|
loyaltyCardNumber=null;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*
|
*
|
||||||
* @param cardNumber
|
* @param cardNumber
|
||||||
*/
|
*/
|
||||||
public void setLoyaltyCardNumber(String cardNumber) {
|
public void setLoyaltyCardNumber(String cardNumber){
|
||||||
loyaltyCardNumber = cardNumber;
|
loyaltyCardNumber=cardNumber;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
public String getLoyaltyCardNumber() {
|
public String getLoyaltyCardNumber(){
|
||||||
return (loyaltyCardNumber);
|
return (loyaltyCardNumber);
|
||||||
}
|
}
|
||||||
|
|
||||||
public String printCustomer() {
|
public String printCustomer() {
|
||||||
return cutomerInfoExt == null ? "" : cutomerInfoExt.getName();
|
return m_Customer == null ? "" : m_Customer.getName();
|
||||||
}
|
}
|
||||||
|
|
||||||
public String printPhone1() {
|
public String printPhone1() {
|
||||||
return cutomerInfoExt == null ? "" : cutomerInfoExt.getPhone1();
|
return m_Customer == null ? "" : m_Customer.getPhone1();
|
||||||
}
|
}
|
||||||
|
|
||||||
public String printArticlesCount() {
|
public String printArticlesCount() {
|
||||||
@@ -626,8 +629,8 @@ public final class TicketInfo implements SerializableRead, Externalizable {
|
|||||||
return Formats.CURRENCY.formatValue(getTendered());
|
return Formats.CURRENCY.formatValue(getTendered());
|
||||||
}
|
}
|
||||||
|
|
||||||
public String VoucherReturned() {
|
public String VoucherReturned(){
|
||||||
return Formats.CURRENCY.formatValue(getTotalPaid() - getTotal());
|
return Formats.CURRENCY.formatValue(getTotalPaid()- getTotal());
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean getOldTicket() {
|
public boolean getOldTicket() {
|
||||||
@@ -639,27 +642,28 @@ public final class TicketInfo implements SerializableRead, Externalizable {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public String getTicketHeaderFooterData(String data) {
|
public String getTicketHeaderFooterData(String data) {
|
||||||
AppConfig m_config = new AppConfig(new File((System.getProperty("user.home")), AppLocal.APP_ID + ".properties"));
|
AppConfig m_config = new AppConfig(new File((System.getProperty("user.home"))
|
||||||
|
, AppLocal.APP_ID + ".properties"));
|
||||||
m_config.load();
|
m_config.load();
|
||||||
String row = (m_config.getProperty("tkt." + data));
|
String row =(m_config.getProperty("tkt."+data));
|
||||||
|
|
||||||
return row;
|
return row;
|
||||||
}
|
}
|
||||||
|
|
||||||
public String printQRCode(String nameHeader, String vatHeader, String vatLabel) {
|
public String printQRCode(String nameHeader, String vatHeader, String vatLabel){
|
||||||
String name = getTicketHeaderFooterData(nameHeader);
|
String name = getTicketHeaderFooterData(nameHeader);
|
||||||
String vatNumberHeader = getTicketHeaderFooterData(vatHeader);
|
String vatNumberHeader = getTicketHeaderFooterData(vatHeader);
|
||||||
String vatNumber = vatNumberHeader.split(vatLabel)[1];
|
String vatNumber = vatNumberHeader.split(vatLabel)[1];
|
||||||
String date = new SimpleDateFormat("yyyy-mm-dd hh:mm:ss").format(getDate());
|
String date = new SimpleDateFormat("yyyy-mm-dd hh:mm:ss").format(getDate());
|
||||||
String total = String.valueOf(getTotal());
|
String total = String.valueOf(getTotal());
|
||||||
String vatValue = String.valueOf(getTax());
|
String vatValue = String.valueOf(getTax());
|
||||||
return name + "," + vatNumber + "," + date + "," + total + "," + vatValue;
|
return name+","+vatNumber+","+date+","+total+","+vatValue;
|
||||||
}
|
}
|
||||||
|
|
||||||
public String printTicketHeaderLine1() {
|
public String printTicketHeaderLine1() {
|
||||||
String lineData = getTicketHeaderFooterData("header1");
|
String lineData = getTicketHeaderFooterData("header1");
|
||||||
|
|
||||||
if (lineData != null) {
|
if(lineData != null) {
|
||||||
return lineData;
|
return lineData;
|
||||||
} else {
|
} else {
|
||||||
return "";
|
return "";
|
||||||
@@ -669,7 +673,7 @@ public final class TicketInfo implements SerializableRead, Externalizable {
|
|||||||
public String printTicketHeaderLine2() {
|
public String printTicketHeaderLine2() {
|
||||||
String lineData = getTicketHeaderFooterData("header2");
|
String lineData = getTicketHeaderFooterData("header2");
|
||||||
|
|
||||||
if (lineData != null) {
|
if(lineData != null) {
|
||||||
return lineData;
|
return lineData;
|
||||||
} else {
|
} else {
|
||||||
return "";
|
return "";
|
||||||
@@ -679,7 +683,7 @@ public final class TicketInfo implements SerializableRead, Externalizable {
|
|||||||
public String printTicketHeaderLine3() {
|
public String printTicketHeaderLine3() {
|
||||||
String lineData = getTicketHeaderFooterData("header3");
|
String lineData = getTicketHeaderFooterData("header3");
|
||||||
|
|
||||||
if (lineData != null) {
|
if(lineData != null) {
|
||||||
return lineData;
|
return lineData;
|
||||||
} else {
|
} else {
|
||||||
return "";
|
return "";
|
||||||
@@ -689,7 +693,7 @@ public final class TicketInfo implements SerializableRead, Externalizable {
|
|||||||
public String printTicketHeaderLine4() {
|
public String printTicketHeaderLine4() {
|
||||||
String lineData = getTicketHeaderFooterData("header4");
|
String lineData = getTicketHeaderFooterData("header4");
|
||||||
|
|
||||||
if (lineData != null) {
|
if(lineData != null) {
|
||||||
return lineData;
|
return lineData;
|
||||||
} else {
|
} else {
|
||||||
return "";
|
return "";
|
||||||
@@ -699,7 +703,7 @@ public final class TicketInfo implements SerializableRead, Externalizable {
|
|||||||
public String printTicketHeaderLine5() {
|
public String printTicketHeaderLine5() {
|
||||||
String lineData = getTicketHeaderFooterData("header5");
|
String lineData = getTicketHeaderFooterData("header5");
|
||||||
|
|
||||||
if (lineData != null) {
|
if(lineData != null) {
|
||||||
return lineData;
|
return lineData;
|
||||||
} else {
|
} else {
|
||||||
return "";
|
return "";
|
||||||
@@ -709,7 +713,7 @@ public final class TicketInfo implements SerializableRead, Externalizable {
|
|||||||
public String printTicketHeaderLine6() {
|
public String printTicketHeaderLine6() {
|
||||||
String lineData = getTicketHeaderFooterData("header6");
|
String lineData = getTicketHeaderFooterData("header6");
|
||||||
|
|
||||||
if (lineData != null) {
|
if(lineData != null) {
|
||||||
return lineData;
|
return lineData;
|
||||||
} else {
|
} else {
|
||||||
return "";
|
return "";
|
||||||
@@ -719,7 +723,7 @@ public final class TicketInfo implements SerializableRead, Externalizable {
|
|||||||
public String printTicketFooterLine1() {
|
public String printTicketFooterLine1() {
|
||||||
String lineData = getTicketHeaderFooterData("footer1");
|
String lineData = getTicketHeaderFooterData("footer1");
|
||||||
|
|
||||||
if (lineData != null) {
|
if(lineData != null) {
|
||||||
return lineData;
|
return lineData;
|
||||||
} else {
|
} else {
|
||||||
return "";
|
return "";
|
||||||
@@ -729,7 +733,7 @@ public final class TicketInfo implements SerializableRead, Externalizable {
|
|||||||
public String printTicketFooterLine2() {
|
public String printTicketFooterLine2() {
|
||||||
String lineData = getTicketHeaderFooterData("footer2");
|
String lineData = getTicketHeaderFooterData("footer2");
|
||||||
|
|
||||||
if (lineData != null) {
|
if(lineData != null) {
|
||||||
return lineData;
|
return lineData;
|
||||||
} else {
|
} else {
|
||||||
return "";
|
return "";
|
||||||
@@ -739,7 +743,7 @@ public final class TicketInfo implements SerializableRead, Externalizable {
|
|||||||
public String printTicketFooterLine3() {
|
public String printTicketFooterLine3() {
|
||||||
String lineData = getTicketHeaderFooterData("footer3");
|
String lineData = getTicketHeaderFooterData("footer3");
|
||||||
|
|
||||||
if (lineData != null) {
|
if(lineData != null) {
|
||||||
return lineData;
|
return lineData;
|
||||||
} else {
|
} else {
|
||||||
return "";
|
return "";
|
||||||
@@ -749,7 +753,7 @@ public final class TicketInfo implements SerializableRead, Externalizable {
|
|||||||
public String printTicketFooterLine4() {
|
public String printTicketFooterLine4() {
|
||||||
String lineData = getTicketHeaderFooterData("footer4");
|
String lineData = getTicketHeaderFooterData("footer4");
|
||||||
|
|
||||||
if (lineData != null) {
|
if(lineData != null) {
|
||||||
return lineData;
|
return lineData;
|
||||||
} else {
|
} else {
|
||||||
return "";
|
return "";
|
||||||
@@ -759,7 +763,7 @@ public final class TicketInfo implements SerializableRead, Externalizable {
|
|||||||
public String printTicketFooterLine5() {
|
public String printTicketFooterLine5() {
|
||||||
String lineData = getTicketHeaderFooterData("footer5");
|
String lineData = getTicketHeaderFooterData("footer5");
|
||||||
|
|
||||||
if (lineData != null) {
|
if(lineData != null) {
|
||||||
return lineData;
|
return lineData;
|
||||||
} else {
|
} else {
|
||||||
return "";
|
return "";
|
||||||
@@ -769,7 +773,7 @@ public final class TicketInfo implements SerializableRead, Externalizable {
|
|||||||
public String printTicketFooterLine6() {
|
public String printTicketFooterLine6() {
|
||||||
String lineData = getTicketHeaderFooterData("footer6");
|
String lineData = getTicketHeaderFooterData("footer6");
|
||||||
|
|
||||||
if (lineData != null) {
|
if(lineData != null) {
|
||||||
return lineData;
|
return lineData;
|
||||||
} else {
|
} else {
|
||||||
return "";
|
return "";
|
||||||
|
|||||||
@@ -56,15 +56,12 @@ public class TicketLineInfo implements SerializableWrite, SerializableRead, Seri
|
|||||||
|
|
||||||
private double newprice = 0.0;
|
private double newprice = 0.0;
|
||||||
|
|
||||||
/**
|
/** Creates new TicketLineInfo
|
||||||
* Creates new TicketLineInfo
|
|
||||||
*
|
|
||||||
* @param productid
|
* @param productid
|
||||||
* @param dMultiply
|
* @param dMultiply
|
||||||
* @param dPrice
|
* @param dPrice
|
||||||
* @param tax
|
* @param tax
|
||||||
* @param props
|
* @param props */
|
||||||
*/
|
|
||||||
public TicketLineInfo(String productid, double dMultiply, double dPrice, TaxInfo tax, Properties props) {
|
public TicketLineInfo(String productid, double dMultiply, double dPrice, TaxInfo tax, Properties props) {
|
||||||
init(productid, null, dMultiply, dPrice, tax, props);
|
init(productid, null, dMultiply, dPrice, tax, props);
|
||||||
}
|
}
|
||||||
@@ -82,7 +79,6 @@ public class TicketLineInfo implements SerializableWrite, SerializableRead, Seri
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Example: Call from script.TotalDiscount event
|
* Example: Call from script.TotalDiscount event
|
||||||
*
|
|
||||||
* @param productid
|
* @param productid
|
||||||
* @param productname
|
* @param productname
|
||||||
* @param producttaxcategory
|
* @param producttaxcategory
|
||||||
@@ -91,19 +87,17 @@ public class TicketLineInfo implements SerializableWrite, SerializableRead, Seri
|
|||||||
* @param dPrice
|
* @param dPrice
|
||||||
* @param tax
|
* @param tax
|
||||||
*/
|
*/
|
||||||
public TicketLineInfo(String productid, String productname, String producttaxcategory, String productprinter,
|
public TicketLineInfo(String productid, String productname, String producttaxcategory, String productprinter, double dMultiply, double dPrice, TaxInfo tax) {
|
||||||
double dMultiply, double dPrice, TaxInfo tax) {
|
|
||||||
Properties props = new Properties();
|
Properties props = new Properties();
|
||||||
props.setProperty("product.name", productname);
|
props.setProperty("product.name", productname);
|
||||||
props.setProperty("product.taxcategoryid", producttaxcategory);
|
props.setProperty("product.taxcategoryid", producttaxcategory);
|
||||||
props.setProperty("product.printer", productprinter); // added to props as may introduce printer redirect
|
props.setProperty("product.printer", productprinter); //added to props as may introduce printer redirect
|
||||||
|
|
||||||
init(productid, null, dMultiply, dPrice, tax, props);
|
init(productid, null, dMultiply, dPrice, tax, props);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Example: Call from script.LineDiscount event
|
* Example: Call from script.LineDiscount event
|
||||||
*
|
|
||||||
* @param productname
|
* @param productname
|
||||||
* @param producttaxcategory
|
* @param producttaxcategory
|
||||||
* @param productprinter //added to props as may introduce printer redirect
|
* @param productprinter //added to props as may introduce printer redirect
|
||||||
@@ -111,8 +105,7 @@ public class TicketLineInfo implements SerializableWrite, SerializableRead, Seri
|
|||||||
* @param dPrice
|
* @param dPrice
|
||||||
* @param tax
|
* @param tax
|
||||||
*/
|
*/
|
||||||
public TicketLineInfo(String productname, String producttaxcategory, String productprinter, double dMultiply,
|
public TicketLineInfo(String productname, String producttaxcategory, String productprinter, double dMultiply, double dPrice, TaxInfo tax) {
|
||||||
double dPrice, TaxInfo tax) {
|
|
||||||
|
|
||||||
Properties props = new Properties();
|
Properties props = new Properties();
|
||||||
props.setProperty("product.name", productname);
|
props.setProperty("product.name", productname);
|
||||||
@@ -173,7 +166,7 @@ public class TicketLineInfo implements SerializableWrite, SerializableRead, Seri
|
|||||||
attributes.setProperty("product.texttip", product.getTextTip());
|
attributes.setProperty("product.texttip", product.getTextTip());
|
||||||
}
|
}
|
||||||
|
|
||||||
attributes.setProperty("product.warranty", product.getWarranty() ? "true" : "false");
|
attributes.setProperty("product.warranty", product.getWarranty()? "true" : "false");
|
||||||
|
|
||||||
if (product.getAttributeSetID() != null) {
|
if (product.getAttributeSetID() != null) {
|
||||||
attributes.setProperty("product.attsetid", product.getAttributeSetID());
|
attributes.setProperty("product.attsetid", product.getAttributeSetID());
|
||||||
@@ -215,8 +208,7 @@ public class TicketLineInfo implements SerializableWrite, SerializableRead, Seri
|
|||||||
line.tax, (Properties) line.attributes.clone());
|
line.tax, (Properties) line.attributes.clone());
|
||||||
}
|
}
|
||||||
|
|
||||||
private void init(String productid, String attsetinstid, double dMultiply, double dPrice, TaxInfo tax,
|
private void init(String productid, String attsetinstid, double dMultiply, double dPrice, TaxInfo tax, Properties attributes) {
|
||||||
Properties attributes) {
|
|
||||||
|
|
||||||
this.productid = productid;
|
this.productid = productid;
|
||||||
this.attsetinstid = attsetinstid;
|
this.attsetinstid = attsetinstid;
|
||||||
@@ -314,75 +306,60 @@ public class TicketLineInfo implements SerializableWrite, SerializableRead, Seri
|
|||||||
public int getTicketLine() {
|
public int getTicketLine() {
|
||||||
return m_iLine;
|
return m_iLine;
|
||||||
}
|
}
|
||||||
|
// These are the Lookups
|
||||||
// These are the Lookups
|
|
||||||
public String getProductID() {
|
public String getProductID() {
|
||||||
return productid;
|
return productid;
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getProductCategoryID() {
|
public String getProductCategoryID() {
|
||||||
return (attributes.getProperty("product.categoryid"));
|
return (attributes.getProperty("product.categoryid"));
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getProductAttSetId() {
|
public String getProductAttSetId() {
|
||||||
return attributes.getProperty("product.attsetid");
|
return attributes.getProperty("product.attsetid");
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getProductAttSetInstId() {
|
public String getProductAttSetInstId() {
|
||||||
return attsetinstid;
|
return attsetinstid;
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getProductAttSetInstDesc() {
|
public String getProductAttSetInstDesc() {
|
||||||
return attributes.getProperty("product.attsetdesc", "");
|
return attributes.getProperty("product.attsetdesc", "");
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getProductTaxCategoryID() {
|
public String getProductTaxCategoryID() {
|
||||||
return (attributes.getProperty("product.taxcategoryid"));
|
return (attributes.getProperty("product.taxcategoryid"));
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getTicketUpdated() {
|
public String getTicketUpdated() {
|
||||||
return (attributes.getProperty("ticket.updated"));
|
return (attributes.getProperty("ticket.updated"));
|
||||||
}
|
}
|
||||||
|
|
||||||
public TaxInfo getTaxInfo() {
|
public TaxInfo getTaxInfo() {
|
||||||
return tax;
|
return tax;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setTaxInfo(TaxInfo oTaxInfo) {
|
public void setTaxInfo(TaxInfo oTaxInfo) {
|
||||||
tax = oTaxInfo;
|
tax = oTaxInfo;
|
||||||
}
|
}
|
||||||
|
|
||||||
// These appear on Printed TicketLine
|
// These appear on Printed TicketLine
|
||||||
public String getProductName() {
|
public String getProductName() {
|
||||||
return attributes.getProperty("product.name");
|
return attributes.getProperty("product.name");
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getProductMemoDate() {
|
public String getProductMemoDate() {
|
||||||
return attributes.getProperty("product.memodate");
|
return attributes.getProperty("product.memodate");
|
||||||
}
|
}
|
||||||
|
|
||||||
public double getPrice() {
|
public double getPrice() {
|
||||||
return price;
|
return price;
|
||||||
}
|
}
|
||||||
|
|
||||||
public double getMultiply() {
|
public double getMultiply() {
|
||||||
return multiply;
|
return multiply;
|
||||||
}
|
}
|
||||||
|
|
||||||
public double getTaxRate() {
|
public double getTaxRate() {
|
||||||
return tax == null ? 0.0 : tax.getRate();
|
return tax == null ? 0.0 : tax.getRate();
|
||||||
}
|
}
|
||||||
|
|
||||||
public double getNewPrice() {
|
public double getNewPrice() {
|
||||||
newprice = price * (1.0 + getTaxRate());
|
newprice = price * (1.0 + getTaxRate());
|
||||||
return price;
|
return price;
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getProductPrinter() {
|
public String getProductPrinter() {
|
||||||
return attributes.getProperty("product.printer");
|
return attributes.getProperty("product.printer");
|
||||||
}
|
}
|
||||||
|
|
||||||
// These are the Summaries
|
// These are the Summaries
|
||||||
public double getPriceTax() {
|
public double getPriceTax() {
|
||||||
return price * (1.0 + getTaxRate());
|
return price * (1.0 + getTaxRate());
|
||||||
}
|
}
|
||||||
@@ -390,53 +367,43 @@ public class TicketLineInfo implements SerializableWrite, SerializableRead, Seri
|
|||||||
public Properties getProperties() {
|
public Properties getProperties() {
|
||||||
return attributes;
|
return attributes;
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getProperty(String key) {
|
public String getProperty(String key) {
|
||||||
return attributes.getProperty(key);
|
return attributes.getProperty(key);
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getProperty(String key, String defaultvalue) {
|
public String getProperty(String key, String defaultvalue) {
|
||||||
return attributes.getProperty(key, defaultvalue);
|
return attributes.getProperty(key, defaultvalue);
|
||||||
}
|
}
|
||||||
|
|
||||||
// These are Ticket Totals
|
// These are Ticket Totals
|
||||||
public double getTax() {
|
public double getTax() {
|
||||||
return price * multiply * getTaxRate();
|
return price * multiply * getTaxRate();
|
||||||
}
|
}
|
||||||
|
|
||||||
public double getValue() {
|
public double getValue() {
|
||||||
return price * multiply * (1.0 + getTaxRate());
|
return price * multiply * (1.0 + getTaxRate());
|
||||||
}
|
}
|
||||||
|
|
||||||
public double getSubValue() {
|
public double getSubValue() {
|
||||||
return price * multiply;
|
return price * multiply;
|
||||||
}
|
}
|
||||||
|
|
||||||
// SETTERS
|
// SETTERS
|
||||||
public void setPrice(double dValue) {
|
public void setPrice(double dValue) {
|
||||||
price = dValue;
|
price = dValue;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setPriceTax(double dValue) {
|
public void setPriceTax(double dValue) {
|
||||||
price = dValue / (1.0 + getTaxRate());
|
price = dValue / (1.0 + getTaxRate());
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setMultiply(double dValue) {
|
public void setMultiply(double dValue) {
|
||||||
multiply = dValue;
|
multiply = dValue;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setProperty(String key, String value) {
|
public void setProperty(String key, String value) {
|
||||||
attributes.setProperty(key, value);
|
attributes.setProperty(key, value);
|
||||||
}
|
}
|
||||||
|
public void setProductTaxCategoryID(String taxID){
|
||||||
public void setProductTaxCategoryID(String taxID) {
|
attributes.setProperty("product.taxcategoryid",taxID);
|
||||||
attributes.setProperty("product.taxcategoryid", taxID);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setProductAttSetInstId(String value) {
|
public void setProductAttSetInstId(String value) {
|
||||||
attsetinstid = value;
|
attsetinstid = value;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setProductAttSetInstDesc(String value) {
|
public void setProductAttSetInstDesc(String value) {
|
||||||
if (value == null) {
|
if (value == null) {
|
||||||
attributes.remove(value);
|
attributes.remove(value);
|
||||||
@@ -444,11 +411,9 @@ public class TicketLineInfo implements SerializableWrite, SerializableRead, Seri
|
|||||||
attributes.setProperty("product.attsetdesc", value);
|
attributes.setProperty("product.attsetdesc", value);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
public void setTicketUpdated(String key, String value){
|
||||||
public void setTicketUpdated(String key, String value) {
|
attributes.setProperty("ticket.updated",value);
|
||||||
attributes.setProperty("ticket.updated", value);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setProductPrinter(String value) {
|
public void setProductPrinter(String value) {
|
||||||
if (value == null) {
|
if (value == null) {
|
||||||
attributes.remove(value);
|
attributes.remove(value);
|
||||||
@@ -465,79 +430,60 @@ public class TicketLineInfo implements SerializableWrite, SerializableRead, Seri
|
|||||||
public String printReference() {
|
public String printReference() {
|
||||||
return StringUtils.encodeXML(attributes.getProperty("product.reference"));
|
return StringUtils.encodeXML(attributes.getProperty("product.reference"));
|
||||||
}
|
}
|
||||||
|
|
||||||
public String printCode() {
|
public String printCode() {
|
||||||
return StringUtils.encodeXML(attributes.getProperty("product.code"));
|
return StringUtils.encodeXML(attributes.getProperty("product.code"));
|
||||||
}
|
}
|
||||||
|
|
||||||
public String printName() {
|
public String printName() {
|
||||||
return StringUtils.encodeXML(attributes.getProperty("product.name"));
|
return StringUtils.encodeXML(attributes.getProperty("product.name"));
|
||||||
}
|
}
|
||||||
|
|
||||||
public String printProductMemoDate() {
|
public String printProductMemoDate() {
|
||||||
return StringUtils.encodeXML(attributes.getProperty("product.memodate"));
|
return StringUtils.encodeXML(attributes.getProperty("product.memodate"));
|
||||||
}
|
}
|
||||||
|
|
||||||
public String printPrice() {
|
public String printPrice() {
|
||||||
return Formats.CURRENCY.formatValue(getPrice());
|
return Formats.CURRENCY.formatValue(getPrice());
|
||||||
}
|
}
|
||||||
|
|
||||||
public String printPriceTax() {
|
public String printPriceTax() {
|
||||||
return Formats.CURRENCY.formatValue(getPriceTax());
|
return Formats.CURRENCY.formatValue(getPriceTax());
|
||||||
}
|
}
|
||||||
|
|
||||||
public String printMultiply() {
|
public String printMultiply() {
|
||||||
return Formats.DOUBLE.formatValue(multiply);
|
return Formats.DOUBLE.formatValue(multiply);
|
||||||
}
|
}
|
||||||
|
|
||||||
public String printValue() {
|
public String printValue() {
|
||||||
return Formats.CURRENCY.formatValue(getValue());
|
return Formats.CURRENCY.formatValue(getValue());
|
||||||
}
|
}
|
||||||
|
|
||||||
public String printTaxRate() {
|
public String printTaxRate() {
|
||||||
return Formats.PERCENT.formatValue(getTaxRate());
|
return Formats.PERCENT.formatValue(getTaxRate());
|
||||||
}
|
}
|
||||||
|
|
||||||
public String printSubValue() {
|
public String printSubValue() {
|
||||||
return Formats.CURRENCY.formatValue(getSubValue());
|
return Formats.CURRENCY.formatValue(getSubValue());
|
||||||
}
|
}
|
||||||
|
|
||||||
public String printTax() {
|
public String printTax() {
|
||||||
return Formats.CURRENCY.formatValue(getTax());
|
return Formats.CURRENCY.formatValue(getTax());
|
||||||
}
|
}
|
||||||
|
|
||||||
public String printTextTip() {
|
public String printTextTip() {
|
||||||
return attributes.getProperty("product.texttip");
|
return attributes.getProperty("product.texttip");
|
||||||
}
|
}
|
||||||
|
|
||||||
public String printPrinter() {
|
public String printPrinter() {
|
||||||
return StringUtils.encodeXML(attributes.getProperty("product.printer"));
|
return StringUtils.encodeXML(attributes.getProperty("product.printer"));
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean isProductCom() {
|
public boolean isProductCom() {
|
||||||
return "true".equals(attributes.getProperty("product.com"));
|
return "true".equals(attributes.getProperty("product.com"));
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean isProductService() {
|
public boolean isProductService() {
|
||||||
return "true".equals(attributes.getProperty("product.service"));
|
return "true".equals(attributes.getProperty("product.service"));
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean isProductVprice() {
|
public boolean isProductVprice() {
|
||||||
return "true".equals(attributes.getProperty("product.vprice"));
|
return "true".equals(attributes.getProperty("product.vprice"));
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean isProductVerpatrib() {
|
public boolean isProductVerpatrib() {
|
||||||
return "true".equals(attributes.getProperty("product.verpatrib"));
|
return "true".equals(attributes.getProperty("product.verpatrib"));
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean isProductWarranty() {
|
public boolean isProductWarranty() {
|
||||||
return "true".equals(attributes.getProperty("product.warranty"));
|
return "true".equals(attributes.getProperty("product.warranty"));
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean getUpdated() {
|
public boolean getUpdated() {
|
||||||
return "true".equals(attributes.getProperty("ticket.updated"));
|
return "true".equals(attributes.getProperty("ticket.updated"));
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setUpdated(Boolean value) {
|
public void setUpdated(Boolean value) {
|
||||||
updated = value;
|
updated = value;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,62 +1,2 @@
|
|||||||
-- CLEAR THE DECKS
|
UPDATE applications SET version = $APP_VERSION{} WHERE id = $APP_ID{};
|
||||||
DELETE FROM sharedtickets;
|
|
||||||
|
|
||||||
-- Switch OFF table foreign key relationships
|
|
||||||
set foreign_key_checks = 0;
|
|
||||||
|
|
||||||
-- RECREATE applications table
|
|
||||||
DROP TABLE `applications`;
|
|
||||||
CREATE TABLE IF NOT EXISTS `applications` (
|
|
||||||
`id` varchar(255) NOT NULL,
|
|
||||||
`name` varchar(255) NOT NULL,
|
|
||||||
`version` varchar(255) NOT NULL,
|
|
||||||
`instdate` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
|
|
||||||
PRIMARY KEY ( `id` )
|
|
||||||
) ENGINE = InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT = Compact;
|
|
||||||
|
|
||||||
|
|
||||||
-- SYSTEM
|
|
||||||
DELETE FROM resources WHERE name = 'script.posapps';
|
|
||||||
|
|
||||||
|
|
||||||
DELETE FROM resources WHERE id = '0';
|
|
||||||
DELETE FROM resources WHERE id = '00';
|
|
||||||
INSERT INTO resources(id, name, restype, content) VALUES('00', 'Menu.Root', 0, $FILE{/com/unicenta/pos/templates/Menu.Root.txt});
|
|
||||||
|
|
||||||
UPDATE resources SET content = $FILE{/com/unicenta/pos/templates/Ticket.Buttons.xml} WHERE name = 'Ticket.Buttons';
|
|
||||||
COMMIT;
|
|
||||||
|
|
||||||
UPDATE resources SET content = $FILE{/com/unicenta/pos/templates/Printer.Ticket.xml} WHERE name = 'Printer.Ticket';
|
|
||||||
COMMIT;
|
|
||||||
|
|
||||||
UPDATE resources SET content = $FILE{/com/unicenta/pos/templates/Ticket.Close.xml} WHERE name = 'Ticket.Close';
|
|
||||||
COMMIT;
|
|
||||||
|
|
||||||
UPDATE resources SET content = $FILE{/com/unicenta/pos/templates/Cash.Close.xml} WHERE name = 'Cash.Close';
|
|
||||||
COMMIT;
|
|
||||||
|
|
||||||
UPDATE resources SET content = $FILE{/com/unicenta/pos/templates/customer.created.xml} WHERE name = 'Customer.Created';
|
|
||||||
COMMIT;
|
|
||||||
|
|
||||||
UPDATE resources SET content = $FILE{/com/unicenta/pos/templates/customer.deleted.xml} WHERE name = 'Customer.Deleted';
|
|
||||||
COMMIT;
|
|
||||||
|
|
||||||
UPDATE resources SET content = $FILE{/com/unicenta/pos/templates/customer.updated.xml} WHERE name = 'Customer.Updated';
|
|
||||||
COMMIT;
|
|
||||||
|
|
||||||
|
|
||||||
-- ROLES
|
|
||||||
DELETE FROM roles WHERE id = '0';
|
|
||||||
INSERT INTO roles(id, name, permissions) VALUES('0', 'Administrator role', $FILE{/com/unicenta/pos/templates/Role.Administrator.xml} );
|
|
||||||
DELETE FROM roles WHERE id = '1';
|
|
||||||
INSERT INTO roles(id, name, permissions) VALUES('1', 'Manager role', $FILE{/com/unicenta/pos/templates/Role.Manager.xml} );
|
|
||||||
DELETE FROM roles WHERE id = '2';
|
|
||||||
INSERT INTO roles(id, name, permissions) VALUES('2', 'Employee role', $FILE{/com/unicenta/pos/templates/Role.Employee.xml} );
|
|
||||||
|
|
||||||
|
|
||||||
-- Switch ON table foreign key relationships
|
|
||||||
set foreign_key_checks = 1;
|
|
||||||
|
|
||||||
INSERT INTO applications(id, name, version) VALUES($APP_ID{}, $APP_NAME{}, '5.3.1');
|
|
||||||
|
|
||||||
COMMIT;
|
COMMIT;
|
||||||
@@ -881,7 +881,7 @@ message.email=Desktop email app' not found
|
|||||||
message.emptycustomer=Customer cannot be empty
|
message.emptycustomer=Customer cannot be empty
|
||||||
message.emptynumber=Number cannot be empty
|
message.emptynumber=Number cannot be empty
|
||||||
message.enterbuyprice=Enter new Buy Price
|
message.enterbuyprice=Enter new Buy Price
|
||||||
message.eolupdate=<html><center><h2>Version 5.4.0 Upgrade!</h2></br><h3>Your current database version is {0}</h3><br>For version 5.3 and above click <b>YES</b><br/><br/>For any other version click <b>NO</b> and get to 5.3 first<br><br/>
|
message.eolupdate=<html><center><h2>Version 5.3.2 Upgrade!</h2></br><h3>Your current database version is {0}</h3><br>For version 5.3 click <b>YES</b><br/><br/>For any other version click <b>NO</b> and get to 5.3 first<br><br/>
|
||||||
message.ibuttonassign=<html><center>Get the iButton ID<br>Place iButton onto the reader then click OK
|
message.ibuttonassign=<html><center>Get the iButton ID<br>Place iButton onto the reader then click OK
|
||||||
message.ibuttonnotassign=<html><center>The iButton used is not yet assigned to anyone
|
message.ibuttonnotassign=<html><center>The iButton used is not yet assigned to anyone
|
||||||
message.ibuttonnotfound=No iButton adapter found. Key fobs will be disabled.
|
message.ibuttonnotfound=No iButton adapter found. Key fobs will be disabled.
|
||||||
|
|||||||
@@ -4,6 +4,7 @@ import com.google.zxing.BarcodeFormat;
|
|||||||
import com.google.zxing.client.j2se.MatrixToImageWriter;
|
import com.google.zxing.client.j2se.MatrixToImageWriter;
|
||||||
import com.google.zxing.common.BitMatrix;
|
import com.google.zxing.common.BitMatrix;
|
||||||
import com.google.zxing.qrcode.QRCodeWriter;
|
import com.google.zxing.qrcode.QRCodeWriter;
|
||||||
|
import org.junit.Ignore;
|
||||||
import org.junit.jupiter.api.Test;
|
import org.junit.jupiter.api.Test;
|
||||||
|
|
||||||
import javax.imageio.ImageIO;
|
import javax.imageio.ImageIO;
|
||||||
@@ -13,9 +14,8 @@ import java.nio.charset.StandardCharsets;
|
|||||||
import java.util.Base64;
|
import java.util.Base64;
|
||||||
|
|
||||||
import static org.junit.jupiter.api.Assertions.*;
|
import static org.junit.jupiter.api.Assertions.*;
|
||||||
|
@Ignore
|
||||||
class QRCodeTest {
|
class QRCodeTest {
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
void shouldPrintQRCode() throws Exception {
|
void shouldPrintQRCode() throws Exception {
|
||||||
// Name
|
// Name
|
||||||
@@ -66,8 +66,12 @@ class QRCodeTest {
|
|||||||
|
|
||||||
BufferedImage bufferedImage = MatrixToImageWriter.toBufferedImage(bitMatrix);
|
BufferedImage bufferedImage = MatrixToImageWriter.toBufferedImage(bitMatrix);
|
||||||
|
|
||||||
File outputfile = new File("test.jpg");
|
String fileName = "output/test-output.jpg";
|
||||||
assert ImageIO.write(bufferedImage, "jpg", outputfile);
|
File outputFile = new File(fileName);
|
||||||
|
|
||||||
|
// Create the parent directories if they don't exist
|
||||||
|
outputFile.getParentFile().mkdirs();
|
||||||
|
assert ImageIO.write(bufferedImage, "jpg", outputFile);
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Reference in New Issue
Block a user