wip

* orders

* woocommerce support

* working with MariaDB + Derby

.gitignore

@@ -7,4 +7,7 @@ nbactions.xml
 *.log
 docker.sock
 .DS_Store
-
+.settings/
+.classpath
+.factorypath
+.project

.mvn/wrapper/MavenWrapperDownloader.java

@@ -0,0 +1,117 @@
+/*
+ * Copyright 2007-present the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import java.net.*;
+import java.io.*;
+import java.nio.channels.*;
+import java.util.Properties;
+
+public class MavenWrapperDownloader {
+
+    private static final String WRAPPER_VERSION = "0.5.6";
+    /**
+     * Default URL to download the maven-wrapper.jar from, if no 'downloadUrl' is provided.
+     */
+    private static final String DEFAULT_DOWNLOAD_URL = "https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/"
+        + WRAPPER_VERSION + "/maven-wrapper-" + WRAPPER_VERSION + ".jar";
+
+    /**
+     * Path to the maven-wrapper.properties file, which might contain a downloadUrl property to
+     * use instead of the default one.
+     */
+    private static final String MAVEN_WRAPPER_PROPERTIES_PATH =
+            ".mvn/wrapper/maven-wrapper.properties";
+
+    /**
+     * Path where the maven-wrapper.jar will be saved to.
+     */
+    private static final String MAVEN_WRAPPER_JAR_PATH =
+            ".mvn/wrapper/maven-wrapper.jar";
+
+    /**
+     * Name of the property which should be used to override the default download url for the wrapper.
+     */
+    private static final String PROPERTY_NAME_WRAPPER_URL = "wrapperUrl";
+
+    public static void main(String args[]) {
+        System.out.println("- Downloader started");
+        File baseDirectory = new File(args[0]);
+        System.out.println("- Using base directory: " + baseDirectory.getAbsolutePath());
+
+        // If the maven-wrapper.properties exists, read it and check if it contains a custom
+        // wrapperUrl parameter.
+        File mavenWrapperPropertyFile = new File(baseDirectory, MAVEN_WRAPPER_PROPERTIES_PATH);
+        String url = DEFAULT_DOWNLOAD_URL;
+        if(mavenWrapperPropertyFile.exists()) {
+            FileInputStream mavenWrapperPropertyFileInputStream = null;
+            try {
+                mavenWrapperPropertyFileInputStream = new FileInputStream(mavenWrapperPropertyFile);
+                Properties mavenWrapperProperties = new Properties();
+                mavenWrapperProperties.load(mavenWrapperPropertyFileInputStream);
+                url = mavenWrapperProperties.getProperty(PROPERTY_NAME_WRAPPER_URL, url);
+            } catch (IOException e) {
+                System.out.println("- ERROR loading '" + MAVEN_WRAPPER_PROPERTIES_PATH + "'");
+            } finally {
+                try {
+                    if(mavenWrapperPropertyFileInputStream != null) {
+                        mavenWrapperPropertyFileInputStream.close();
+                    }
+                } catch (IOException e) {
+                    // Ignore ...
+                }
+            }
+        }
+        System.out.println("- Downloading from: " + url);
+
+        File outputFile = new File(baseDirectory.getAbsolutePath(), MAVEN_WRAPPER_JAR_PATH);
+        if(!outputFile.getParentFile().exists()) {
+            if(!outputFile.getParentFile().mkdirs()) {
+                System.out.println(
+                        "- ERROR creating output directory '" + outputFile.getParentFile().getAbsolutePath() + "'");
+            }
+        }
+        System.out.println("- Downloading to: " + outputFile.getAbsolutePath());
+        try {
+            downloadFileFromURL(url, outputFile);
+            System.out.println("Done");
+            System.exit(0);
+        } catch (Throwable e) {
+            System.out.println("- Error downloading");
+            e.printStackTrace();
+            System.exit(1);
+        }
+    }
+
+    private static void downloadFileFromURL(String urlString, File destination) throws Exception {
+        if (System.getenv("MVNW_USERNAME") != null && System.getenv("MVNW_PASSWORD") != null) {
+            String username = System.getenv("MVNW_USERNAME");
+            char[] password = System.getenv("MVNW_PASSWORD").toCharArray();
+            Authenticator.setDefault(new Authenticator() {
+                @Override
+                protected PasswordAuthentication getPasswordAuthentication() {
+                    return new PasswordAuthentication(username, password);
+                }
+            });
+        }
+        URL website = new URL(urlString);
+        ReadableByteChannel rbc;
+        rbc = Channels.newChannel(website.openStream());
+        FileOutputStream fos = new FileOutputStream(destination);
+        fos.getChannel().transferFrom(rbc, 0, Long.MAX_VALUE);
+        fos.close();
+        rbc.close();
+    }
+
+}

.mvn/wrapper/maven-wrapper.properties

@@ -0,0 +1,2 @@
+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

mvnw

@@ -0,0 +1,310 @@
+#!/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 "$@"

mvnw.cmd

@@ -0,0 +1,182 @@
+@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%

pom.xml

@@ -4,14 +4,25 @@
 
   <groupId>com.unicenta</groupId>
   <artifactId>unicentaopos</artifactId>
-  <version>5.3</version>
+  <version>5.4.0</version>
   <packaging>jar</packaging>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <maven.compiler.source>11</maven.compiler.source>
     <maven.compiler.target>11</maven.compiler.target>
+    <derby.version>10.14.2.0</derby.version>
   </properties>
   <dependencies>
+    <dependency>
+      <groupId>com.google.zxing</groupId>
+      <artifactId>core</artifactId>
+      <version>3.3.0</version>
+    </dependency>
+    <dependency>
+      <groupId>com.google.zxing</groupId>
+      <artifactId>javase</artifactId>
+      <version>3.3.0</version>
+    </dependency>
     <!-- sqlite-jdbc -->
     <dependency>
       <groupId>org.xerial</groupId>
@@ -103,7 +114,13 @@
     <dependency>
       <groupId>org.apache.poi</groupId>
       <artifactId>poi</artifactId>
-      <version>3.10.1</version>
+      <version>3.17</version>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.poi</groupId>
+      <artifactId>poi-ooxml</artifactId>
+      <version>3.17</version>
     </dependency>
     <dependency>
       <groupId>net.sf.barcode4j</groupId>
@@ -231,8 +248,18 @@
     <dependency>
       <groupId>org.apache.derby</groupId>
       <artifactId>derby</artifactId>
-      <version>10.14.2.0</version>
+      <version>${derby.version}</version>
     </dependency>
+    <dependency>
+      <groupId>org.apache.derby</groupId>
+      <artifactId>derbytools</artifactId>
+      <version>${derby.version}</version>
+    </dependency>
+<!--    <dependency>-->
+<!--      <groupId>org.apache.derby</groupId>-->
+<!--      <artifactId>derbyshared</artifactId>-->
+<!--      <version>${derby.version}</version>-->
+<!--    </dependency>-->
     <dependency>
       <groupId>xml-apis</groupId>
       <artifactId>xml-apis</artifactId>
@@ -243,12 +270,12 @@
     <dependency>
       <groupId>org.apache.xmlgraphics</groupId>
       <artifactId>fop</artifactId>
-      <version>2.1</version>
+      <version>2.3</version>
     </dependency>
     <dependency>
       <groupId>net.sf.jasperreports</groupId>
       <artifactId>jasperreports</artifactId>
-      <version>6.4.0</version>
+      <version>6.12.2</version>
       <exclusions>
         <exclusion>
           <groupId>com.lowagie</groupId>
@@ -320,12 +347,21 @@
           <groupId>org.slf4j</groupId>
           <artifactId>slf4j-simple</artifactId>
         </exclusion>
+        <exclusion>
+          <groupId>com.thoughtworks.xstream</groupId>
+          <artifactId>xstream</artifactId>
+        </exclusion>
       </exclusions>
     </dependency>
+    <dependency>
+      <groupId>com.thoughtworks.xstream</groupId>
+      <artifactId>xstream</artifactId>
+      <version>1.4.11</version>
+    </dependency>
     <dependency>
       <groupId>com.unicenta</groupId>
       <artifactId>unicenta-plugins</artifactId>
-      <version>1.2.6</version>
+      <version>1.3.1</version>
     </dependency>
     <dependency>
       <groupId>com.gluonhq</groupId>
@@ -383,7 +419,7 @@
     <dependency>
       <groupId>org.postgresql</groupId>
       <artifactId>postgresql</artifactId>
-      <version>9.4.1208</version>
+      <version>42.2.28</version>
     </dependency>
     <dependency>
       <groupId>de.sciss</groupId>

src/main/java/com/unicenta/pos/admin/PeopleView.form

@@ -19,93 +19,10 @@
     <AuxValue name="FormSettings_listenerGenerationStyle" type="java.lang.Integer" value="0"/>
     <AuxValue name="FormSettings_variablesLocal" type="java.lang.Boolean" value="false"/>
     <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>
-
-  <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>
-    <Component class="javax.swing.JLabel" name="jLabel1">
+    <Component class="javax.swing.JLabel" name="nameLabel">
       <Properties>
         <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
           <Font name="Arial" size="14" style="0"/>
@@ -121,10 +38,10 @@
         </Property>
       </Properties>
       <Events>
-        <EventHandler event="mouseClicked" listener="java.awt.event.MouseListener" parameters="java.awt.event.MouseEvent" handler="jLabel1MouseClicked"/>
+        <EventHandler event="mouseClicked" listener="java.awt.event.MouseListener" parameters="java.awt.event.MouseEvent" handler="nameLabelMouseClicked"/>
       </Events>
     </Component>
-    <Component class="javax.swing.JTextField" name="m_jName">
+    <Component class="javax.swing.JTextField" name="nameTextField">
       <Properties>
         <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
           <Font name="Arial" size="14" style="0"/>
@@ -134,7 +51,7 @@
         </Property>
       </Properties>
     </Component>
-    <Component class="javax.swing.JCheckBox" name="m_jVisible">
+    <Component class="javax.swing.JCheckBox" name="isVisible">
       <Properties>
         <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
           <Font name="Arial" size="12" style="0"/>
@@ -144,7 +61,7 @@
         </Property>
       </Properties>
     </Component>
-    <Component class="javax.swing.JLabel" name="jLabel3">
+    <Component class="javax.swing.JLabel" name="visiableLabel">
       <Properties>
         <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
           <Font name="Arial" size="14" style="0"/>
@@ -157,7 +74,7 @@
         </Property>
       </Properties>
     </Component>
-    <Component class="javax.swing.JLabel" name="jLabel4">
+    <Component class="javax.swing.JLabel" name="imageLabel">
       <Properties>
         <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
           <Font name="Arial" size="14" style="0"/>
@@ -170,7 +87,7 @@
         </Property>
       </Properties>
     </Component>
-    <Component class="com.unicenta.data.gui.JImageEditor" name="m_jImage">
+    <Component class="com.unicenta.data.gui.JImageEditor" name="imageEditor">
       <Properties>
         <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
           <Font name="Arial" size="12" style="0"/>
@@ -210,7 +127,7 @@
         </Property>
       </Properties>
     </Component>
-    <Component class="javax.swing.JLabel" name="jLabel2">
+    <Component class="javax.swing.JLabel" name="roleLabel">
       <Properties>
         <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
           <Font name="Arial" size="14" style="0"/>
@@ -223,7 +140,7 @@
         </Property>
       </Properties>
     </Component>
-    <Component class="javax.swing.JTextField" name="m_jcard">
+    <Component class="javax.swing.JTextField" name="cardIdTextField">
       <Properties>
         <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
           <Font name="Arial" size="14" style="0"/>
@@ -233,7 +150,7 @@
         </Property>
       </Properties>
     </Component>
-    <Component class="javax.swing.JLabel" name="jLblCardID">
+    <Component class="javax.swing.JLabel" name="cardIdLabel">
       <Properties>
         <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
           <Font name="Arial" size="14" style="0"/>
@@ -246,33 +163,7 @@
         </Property>
       </Properties>
     </Component>
-    <Component class="com.alee.laf.combobox.WebComboBox" name="webCBSecurity">
+    <Component class="javax.swing.JLabel" name="passwordLabel">
-      <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(&quot;tooltip.peoplesecurity&quot;)"/>
-        </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>
         <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
           <Font name="Arial" size="14" style="0"/>
@@ -285,5 +176,12 @@
         </Property>
       </Properties>
     </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>
 </Form>

src/main/java/com/unicenta/pos/admin/PeopleView.java

@@ -52,9 +52,12 @@ public class PeopleView extends JPanel implements EditorRecord {
 
   private final ComboBoxValModel m_ReasonModel;
 
-    /** Creates new form PeopleEditor
+  /**
+   * Creates new form PeopleEditor
+   * 
    * @param dlAdmin
-     * @param dirty */
+   * @param dirty
+   */
   public PeopleView(DataLogicAdmin dlAdmin, DirtyManager dirty) {
 
     initComponents();
@@ -64,11 +67,11 @@ public class PeopleView extends JPanel implements EditorRecord {
     m_RoleModel = new ComboBoxValModel();
 
     m_Dirty = dirty;
-        m_jName.getDocument().addDocumentListener(dirty);
+    nameTextField.getDocument().addDocumentListener(dirty);
     m_jRole.addActionListener(dirty);
-        m_jVisible.addActionListener(dirty);
+    isVisible.addActionListener(dirty);
-        m_jImage.addPropertyChangeListener("image", dirty);
+    imageEditor.addPropertyChangeListener("image", dirty);
-        m_jcard.getDocument().addDocumentListener(dirty);
+    cardIdTextField.getDocument().addDocumentListener(dirty);
 
     m_ReasonModel = new ComboBoxValModel();
     m_ReasonModel.add(AppLocal.getIntString("cboption.generate"));
@@ -86,17 +89,17 @@ public class PeopleView extends JPanel implements EditorRecord {
   @Override
   public void writeValueEOF() {
     m_oId = null;
-        m_jName.setText(null);
+    nameTextField.setText(null);
     m_sPassword = null;
     m_RoleModel.setSelectedKey(null);
-        m_jVisible.setSelected(false);
+    isVisible.setSelected(false);
-        m_jcard.setText(null);
+    cardIdTextField.setText(null);
-        m_jImage.setImage(null);
+    imageEditor.setImage(null);
-        m_jName.setEnabled(false);
+    nameTextField.setEnabled(false);
     m_jRole.setEnabled(false);
-        m_jVisible.setEnabled(false);
+    isVisible.setEnabled(false);
-        m_jcard.setEnabled(false);
+    cardIdTextField.setEnabled(false);
-        m_jImage.setEnabled(false);
+    imageEditor.setEnabled(false);
     jButton1.setEnabled(false);
     webCBSecurity.setEnabled(false);
   }
@@ -107,17 +110,17 @@ public class PeopleView extends JPanel implements EditorRecord {
   @Override
   public void writeValueInsert() {
     m_oId = null;
-        m_jName.setText(null);
+    nameTextField.setText(null);
     m_sPassword = null;
     m_RoleModel.setSelectedKey(null);
-        m_jVisible.setSelected(true);
+    isVisible.setSelected(true);
-        m_jcard.setText(null);
+    cardIdTextField.setText(null);
-        m_jImage.setImage(null);
+    imageEditor.setImage(null);
-        m_jName.setEnabled(true);
+    nameTextField.setEnabled(true);
     m_jRole.setEnabled(true);
-        m_jVisible.setEnabled(true);
+    isVisible.setEnabled(true);
-        m_jcard.setEnabled(true);
+    cardIdTextField.setEnabled(true);
-        m_jImage.setEnabled(true);
+    imageEditor.setEnabled(true);
     jButton1.setEnabled(true);
     webCBSecurity.setEnabled(true);
   }
@@ -130,18 +133,18 @@ public class PeopleView extends JPanel implements EditorRecord {
   public void writeValueDelete(Object value) {
     Object[] people = (Object[]) value;
     m_oId = people[0];
-        m_jName.setText(Formats.STRING.formatValue(people[1]));
+    nameTextField.setText(Formats.STRING.formatValue(people[1]));
     m_sPassword = Formats.STRING.formatValue(people[2]);
     m_RoleModel.setSelectedKey(people[3]);
-        m_jVisible.setSelected(((Boolean) people[4]).booleanValue());
+    isVisible.setSelected(((Boolean) people[4]).booleanValue());
-        m_jcard.setText(Formats.STRING.formatValue(people[5]));
+    cardIdTextField.setText(Formats.STRING.formatValue(people[5]));
-        m_jImage.setImage((BufferedImage) people[6]);
+    imageEditor.setImage((BufferedImage) people[6]);
 
-        m_jName.setEnabled(false);
+    nameTextField.setEnabled(false);
     m_jRole.setEnabled(false);
-        m_jVisible.setEnabled(false);
+    isVisible.setEnabled(false);
-        m_jcard.setEnabled(false);
+    cardIdTextField.setEnabled(false);
-        m_jImage.setEnabled(false);        
+    imageEditor.setEnabled(false);
     jButton1.setEnabled(false);
     webCBSecurity.setEnabled(false);
   }
@@ -154,25 +157,25 @@ public class PeopleView extends JPanel implements EditorRecord {
   public void writeValueEdit(Object value) {
     Object[] people = (Object[]) value;
     m_oId = people[0];
-        m_jName.setText(Formats.STRING.formatValue(people[1]));
+    nameTextField.setText(Formats.STRING.formatValue(people[1]));
     m_sPassword = Formats.STRING.formatValue(people[2]);
     m_RoleModel.setSelectedKey(people[3]);
-        m_jVisible.setSelected(((Boolean) people[4]).booleanValue());
+    isVisible.setSelected(((Boolean) people[4]).booleanValue());
-        m_jcard.setText(Formats.STRING.formatValue(people[5]));
+    cardIdTextField.setText(Formats.STRING.formatValue(people[5]));
-        m_jImage.setImage((BufferedImage) people[6]);
+    imageEditor.setImage((BufferedImage) people[6]);
 
-        if (m_jcard.getText().length() == 16) {
+    if (cardIdTextField.getText().length() == 16) {
-            jLblCardID.setText(AppLocal.getIntString("label.ibutton"));
+      cardIdLabel.setText(AppLocal.getIntString("label.ibutton"));
     } else {
-            jLblCardID.setText(AppLocal.getIntString("label.card"));            
+      cardIdLabel.setText(AppLocal.getIntString("label.card"));
     }
-        System.out.println(m_jcard.getText().length());        
+    System.out.println(cardIdTextField.getText().length());
 
-        m_jName.setEnabled(true);
+    nameTextField.setEnabled(true);
     m_jRole.setEnabled(true);
-        m_jVisible.setEnabled(true);
+    isVisible.setEnabled(true);
-        m_jcard.setEnabled(true);
+    cardIdTextField.setEnabled(true);
-        m_jImage.setEnabled(true);
+    imageEditor.setEnabled(true);
     jButton1.setEnabled(true);
     webCBSecurity.setEnabled(true);
   }
@@ -186,12 +189,12 @@ public class PeopleView extends JPanel implements EditorRecord {
   public Object createValue() throws BasicException {
     Object[] people = new Object[7];
     people[0] = m_oId == null ? UUID.randomUUID().toString() : m_oId;
-        people[1] = Formats.STRING.parseValue(m_jName.getText());
+    people[1] = Formats.STRING.parseValue(nameTextField.getText());
     people[2] = Formats.STRING.parseValue(m_sPassword);
     people[3] = m_RoleModel.getSelectedKey();
-        people[4] = m_jVisible.isSelected();
+    people[4] = isVisible.isSelected();
-        people[5] = Formats.STRING.parseValue(m_jcard.getText());
+    people[5] = Formats.STRING.parseValue(cardIdTextField.getText());
-        people[6] = m_jImage.getImage();
+    people[6] = imageEditor.getImage();
     return people;
   }
 
@@ -214,7 +217,6 @@ public class PeopleView extends JPanel implements EditorRecord {
     m_jRole.setModel(m_RoleModel);
   }
 
-   
   /**
    *
    */
@@ -222,57 +224,66 @@ public class PeopleView extends JPanel implements EditorRecord {
   public void refresh() {
   }
 
-    /** This method is called from within the constructor to
+  /**
+   * This method is called from within the constructor to
    * initialize the form.
    * WARNING: Do NOT modify this code. The content of this method is
    * always regenerated by the Form Editor.
    */
-    // <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents
+  // <editor-fold defaultstate="collapsed" desc="Generated
+  // Code">//GEN-BEGIN:initComponents
   private void initComponents() {
 
-        jLabel1 = new javax.swing.JLabel();
+    nameLabel = new javax.swing.JLabel();
-        m_jName = new javax.swing.JTextField();
+    nameTextField = new javax.swing.JTextField();
-        m_jVisible = new javax.swing.JCheckBox();
+    isVisible = new javax.swing.JCheckBox();
-        jLabel3 = new javax.swing.JLabel();
+    visiableLabel = new javax.swing.JLabel();
-        jLabel4 = new javax.swing.JLabel();
+    imageLabel = new javax.swing.JLabel();
-        m_jImage = new com.unicenta.data.gui.JImageEditor();
+    imageEditor = new com.unicenta.data.gui.JImageEditor();
     jButton1 = new javax.swing.JButton();
     m_jRole = new javax.swing.JComboBox();
-        jLabel2 = new javax.swing.JLabel();
+    roleLabel = new javax.swing.JLabel();
-        m_jcard = new javax.swing.JTextField();
+    cardIdTextField = new javax.swing.JTextField();
-        jLblCardID = new javax.swing.JLabel();
+    cardIdLabel = new javax.swing.JLabel();
-        webCBSecurity = new com.alee.laf.combobox.WebComboBox();
+    passwordLabel = new javax.swing.JLabel();
-        jLabel6 = new javax.swing.JLabel();
+    taxIdLabel = new javax.swing.JLabel();
+    taxIdTextField = new javax.swing.JTextField();
 
     setFont(new java.awt.Font("Arial", 0, 12)); // NOI18N
     setPreferredSize(new java.awt.Dimension(500, 500));
 
-        jLabel1.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
+    nameLabel.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
-        jLabel1.setIcon(new javax.swing.ImageIcon(getClass().getResource("/com/unicenta/images/info.png"))); // NOI18N
+    nameLabel.setIcon(new javax.swing.ImageIcon(getClass().getResource("/com/unicenta/images/info.png"))); // NOI18N
-        jLabel1.setText(AppLocal.getIntString("label.peoplenamem")); // NOI18N
+    nameLabel.setText(AppLocal.getIntString("label.peoplenamem")); // NOI18N
-        jLabel1.setPreferredSize(new java.awt.Dimension(110, 30));
+    nameLabel.setPreferredSize(new java.awt.Dimension(110, 30));
-        jLabel1.addMouseListener(new java.awt.event.MouseAdapter() {
+    nameLabel.addMouseListener(new java.awt.event.MouseAdapter() {
       public void mouseClicked(java.awt.event.MouseEvent evt) {
-                jLabel1MouseClicked(evt);
+        nameLabelMouseClicked(evt);
       }
     });
+    add(nameLabel);
 
-        m_jName.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
+    nameTextField.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
-        m_jName.setPreferredSize(new java.awt.Dimension(0, 30));
+    nameTextField.setPreferredSize(new java.awt.Dimension(0, 30));
+    add(nameTextField);
 
-        m_jVisible.setFont(new java.awt.Font("Arial", 0, 12)); // NOI18N
+    isVisible.setFont(new java.awt.Font("Arial", 0, 12)); // NOI18N
-        m_jVisible.setPreferredSize(new java.awt.Dimension(0, 30));
+    isVisible.setPreferredSize(new java.awt.Dimension(0, 30));
+    add(isVisible);
 
-        jLabel3.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
+    visiableLabel.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
-        jLabel3.setText(AppLocal.getIntString("label.peoplevisible")); // NOI18N
+    visiableLabel.setText(AppLocal.getIntString("label.peoplevisible")); // NOI18N
-        jLabel3.setPreferredSize(new java.awt.Dimension(110, 30));
+    visiableLabel.setPreferredSize(new java.awt.Dimension(110, 30));
+    add(visiableLabel);
 
-        jLabel4.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
+    imageLabel.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
-        jLabel4.setText(AppLocal.getIntString("label.peopleimage")); // NOI18N
+    imageLabel.setText(AppLocal.getIntString("label.peopleimage")); // NOI18N
-        jLabel4.setPreferredSize(new java.awt.Dimension(110, 30));
+    imageLabel.setPreferredSize(new java.awt.Dimension(110, 30));
+    add(imageLabel);
 
-        m_jImage.setFont(new java.awt.Font("Arial", 0, 12)); // NOI18N
+    imageEditor.setFont(new java.awt.Font("Arial", 0, 12)); // NOI18N
-        m_jImage.setPreferredSize(new java.awt.Dimension(300, 250));
+    imageEditor.setPreferredSize(new java.awt.Dimension(300, 250));
+    add(imageEditor);
 
     jButton1.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
     jButton1.setIcon(new javax.swing.ImageIcon(getClass().getResource("/com/unicenta/images/password.png"))); // NOI18N
@@ -284,104 +295,37 @@ public class PeopleView extends JPanel implements EditorRecord {
         jButton1ActionPerformed(evt);
       }
     });
+    add(jButton1);
 
     m_jRole.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
     m_jRole.setPreferredSize(new java.awt.Dimension(0, 30));
+    add(m_jRole);
 
-        jLabel2.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
+    roleLabel.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
-        jLabel2.setText(AppLocal.getIntString("label.rolem")); // NOI18N
+    roleLabel.setText(AppLocal.getIntString("label.rolem")); // NOI18N
-        jLabel2.setPreferredSize(new java.awt.Dimension(110, 30));
+    roleLabel.setPreferredSize(new java.awt.Dimension(110, 30));
+    add(roleLabel);
 
-        m_jcard.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
+    cardIdTextField.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
-        m_jcard.setPreferredSize(new java.awt.Dimension(0, 30));
+    cardIdTextField.setPreferredSize(new java.awt.Dimension(0, 30));
+    add(cardIdTextField);
 
-        jLblCardID.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
+    cardIdLabel.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
-        jLblCardID.setText(AppLocal.getIntString("label.card")); // NOI18N
+    cardIdLabel.setText(AppLocal.getIntString("label.card")); // NOI18N
-        jLblCardID.setPreferredSize(new java.awt.Dimension(110, 30));
+    cardIdLabel.setPreferredSize(new java.awt.Dimension(110, 30));
+    add(cardIdLabel);
 
-        webCBSecurity.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "Generate new key", "Delete exisitng key", "Use iButton ID" }));
+    passwordLabel.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
-        webCBSecurity.setSelectedIndex(0);
+    passwordLabel.setText(AppLocal.getIntString("label.Password")); // NOI18N
-        webCBSecurity.setToolTipText(AppLocal.getIntString("tooltip.peoplesecurity")); // NOI18N
+    passwordLabel.setPreferredSize(new java.awt.Dimension(110, 30));
-        webCBSecurity.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
+    add(passwordLabel);
-        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);
-            }
-        });
 
-        jLabel6.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
+    taxIdLabel.setText("Tax ID");
-        jLabel6.setText(AppLocal.getIntString("label.Password")); // NOI18N
+    add(taxIdLabel);
-        jLabel6.setPreferredSize(new java.awt.Dimension(110, 30));
+    add(taxIdTextField);
-
-        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
 
-    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);
     if (sNewPassword != null) {
@@ -389,36 +333,33 @@ public class PeopleView extends JPanel implements EditorRecord {
       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,
           AppLocal.getIntString("message.cardnew"),
           AppLocal.getIntString("title.editor"),
           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);
       }
     }
 
-        if(webCBSecurity.getSelectedIndex() == 1){
+    if (webCBSecurity.getSelectedIndex() == 1) {
       if (JOptionPane.showConfirmDialog(this,
           AppLocal.getIntString("message.cardremove"),
           AppLocal.getIntString("title.editor"),
           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);
       }
     }
 
-        if(webCBSecurity.getSelectedIndex() == 2){
+    if (webCBSecurity.getSelectedIndex() == 2) {
       if (JOptionPane.showConfirmDialog(this,
           AppLocal.getIntString("message.ibuttonassign"),
           AppLocal.getIntString("title.editor"),
@@ -426,16 +367,16 @@ public class PeopleView extends JPanel implements EditorRecord {
           JOptionPane.INFORMATION_MESSAGE) == JOptionPane.OK_OPTION)
 
       {
-                m_jcard.setText( uOWWatch.getibuttonid() );
+        cardIdTextField.setText(uOWWatch.getibuttonid());
-                jLblCardID.setText(AppLocal.getIntString("label.ibutton"));
+        cardIdLabel.setText(AppLocal.getIntString("label.ibutton"));
         m_Dirty.setDirty(true);
       }
 
     }
 
-    }//GEN-LAST:event_webCBSecurityActionPerformed
+  }// GEN-LAST:event_webCBSecurityActionPerformed
 
-    private void jLabel1MouseClicked(java.awt.event.MouseEvent evt) {//GEN-FIRST:event_jLabel1MouseClicked
+  private void nameLabelMouseClicked(java.awt.event.MouseEvent evt) {// GEN-FIRST:event_nameLabelMouseClicked
     if (evt.getClickCount() == 2) {
       String uuidString = m_oId.toString();
       StringSelection stringSelection = new StringSelection(uuidString);
@@ -445,22 +386,23 @@ public class PeopleView extends JPanel implements EditorRecord {
       JOptionPane.showMessageDialog(null,
           AppLocal.getIntString("message.uuidcopy"));
     }
-    }//GEN-LAST:event_jLabel1MouseClicked
+  }// GEN-LAST:event_nameLabelMouseClicked
-    
 
   // 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.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.JCheckBox m_jVisible;
+  private javax.swing.JLabel nameLabel;
-    private javax.swing.JTextField m_jcard;
+  private javax.swing.JTextField nameTextField;
+  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;
   // End of variables declaration//GEN-END:variables
 

src/main/java/com/unicenta/pos/customers/CustomersPayment.java

@@ -174,7 +174,8 @@ public class CustomersPayment extends javax.swing.JPanel implements JPanelView,
     btnPay.setEnabled(true);
     btnPrePay.setEnabled(true);
 
-//        btnPay.setEnabled(customer.getCurdebt() != null && customer.getCurdebt().doubleValue() > 0.0);
+    // btnPay.setEnabled(customer.getCurdebt() != null &&
+    // customer.getCurdebt().doubleValue() > 0.0);
 
   }
 
@@ -249,20 +250,22 @@ public class CustomersPayment extends javax.swing.JPanel implements JPanelView,
         script.put("ticket", ticket);
         script.put("customer", customer);
         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);
         msg.show(this);
       }
     }
   }
 
-    /** This method is called from within the constructor to
+  /**
+   * This method is called from within the constructor to
    * initialize the form.
    * WARNING: Do NOT modify this code. The content of this method is
    * always regenerated by the Form Editor.
    */
-    // <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents
+  // <editor-fold defaultstate="collapsed" desc="Generated
+  // Code">//GEN-BEGIN:initComponents
   private void initComponents() {
     java.awt.GridBagConstraints gridBagConstraints;
 
@@ -510,93 +513,124 @@ public class CustomersPayment extends javax.swing.JPanel implements JPanelView,
                         .addContainerGap()
                         .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
                             .addGroup(jPanel1Layout.createSequentialGroup()
-                                .addComponent(jLabel3, javax.swing.GroupLayout.PREFERRED_SIZE, 140, javax.swing.GroupLayout.PREFERRED_SIZE)
+                                .addComponent(jLabel3, javax.swing.GroupLayout.PREFERRED_SIZE, 140,
+                                    javax.swing.GroupLayout.PREFERRED_SIZE)
                                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
-                                .addComponent(txtName, javax.swing.GroupLayout.PREFERRED_SIZE, 240, javax.swing.GroupLayout.PREFERRED_SIZE))
+                                .addComponent(txtName, javax.swing.GroupLayout.PREFERRED_SIZE, 240,
+                                    javax.swing.GroupLayout.PREFERRED_SIZE))
                             .addGroup(jPanel1Layout.createSequentialGroup()
-                                .addComponent(jLabel5, javax.swing.GroupLayout.PREFERRED_SIZE, 140, javax.swing.GroupLayout.PREFERRED_SIZE)
+                                .addComponent(jLabel5, javax.swing.GroupLayout.PREFERRED_SIZE, 140,
+                                    javax.swing.GroupLayout.PREFERRED_SIZE)
                                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
-                                .addComponent(txtCard, javax.swing.GroupLayout.PREFERRED_SIZE, 240, javax.swing.GroupLayout.PREFERRED_SIZE))
+                                .addComponent(txtCard, javax.swing.GroupLayout.PREFERRED_SIZE, 240,
+                                    javax.swing.GroupLayout.PREFERRED_SIZE))
                             .addGroup(jPanel1Layout.createSequentialGroup()
-                                .addComponent(jLabel7, javax.swing.GroupLayout.PREFERRED_SIZE, 140, javax.swing.GroupLayout.PREFERRED_SIZE)
+                                .addComponent(jLabel7, javax.swing.GroupLayout.PREFERRED_SIZE, 140,
+                                    javax.swing.GroupLayout.PREFERRED_SIZE)
                                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
-                                .addComponent(txtTaxId, javax.swing.GroupLayout.PREFERRED_SIZE, 240, javax.swing.GroupLayout.PREFERRED_SIZE))
+                                .addComponent(txtTaxId, javax.swing.GroupLayout.PREFERRED_SIZE, 240,
+                                    javax.swing.GroupLayout.PREFERRED_SIZE))
                             .addGroup(jPanel1Layout.createSequentialGroup()
                                 .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-                                    .addComponent(jLabel12, javax.swing.GroupLayout.PREFERRED_SIZE, 140, javax.swing.GroupLayout.PREFERRED_SIZE)
+                                    .addComponent(jLabel12, javax.swing.GroupLayout.PREFERRED_SIZE, 140,
-                                    .addComponent(jLabel4, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, 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))
                                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
                                 .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-                                    .addComponent(txtPrePay, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                                    .addComponent(txtPrePay, javax.swing.GroupLayout.PREFERRED_SIZE,
-                                    .addComponent(txtNotes, javax.swing.GroupLayout.PREFERRED_SIZE, 250, 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)))))
                     .addGroup(jPanel1Layout.createSequentialGroup()
                         .addGap(18, 18, 18)
                         .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
                             .addGroup(jPanel1Layout.createSequentialGroup()
-                                .addComponent(txtMaxdebt, 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)
                                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                                .addComponent(txtCurdebt, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+                                .addComponent(txtCurdebt, javax.swing.GroupLayout.PREFERRED_SIZE,
+                                    javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
                             .addGroup(jPanel1Layout.createSequentialGroup()
-                                .addComponent(jLabel1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                                .addComponent(jLabel1, javax.swing.GroupLayout.PREFERRED_SIZE,
+                                    javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
                                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                                .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, javax.swing.GroupLayout.PREFERRED_SIZE)))
                         .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                         .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-                            .addComponent(jLabel6, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                            .addComponent(jLabel6, 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)));
     jPanel1Layout.setVerticalGroup(
         jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
             .addGroup(jPanel1Layout.createSequentialGroup()
                 .addContainerGap()
                 .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
-                    .addComponent(jLabel7, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                    .addComponent(jLabel7, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE,
-                    .addComponent(txtTaxId, 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))
                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                 .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
-                    .addComponent(jLabel3, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                    .addComponent(jLabel3, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE,
-                    .addComponent(txtName, 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))
                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                 .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
-                    .addComponent(jLabel5, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                    .addComponent(jLabel5, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE,
-                    .addComponent(txtCard, 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))
                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                 .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-                    .addComponent(jLabel12, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                    .addComponent(jLabel12, javax.swing.GroupLayout.PREFERRED_SIZE,
-                    .addComponent(txtNotes, 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))
                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                 .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING)
-                    .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,
-                    .addComponent(txtPrePay, 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))
                 .addGap(30, 30, 30)
                 .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
-                    .addComponent(jLabel1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                    .addComponent(jLabel1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE,
-                    .addComponent(jLabel2, 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))
+                    .addComponent(jLabel2, 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.RELATED)
                 .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
-                    .addComponent(txtCurdebt, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                    .addComponent(txtCurdebt, 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)
-                    .addComponent(txtCurdate, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+                    .addComponent(txtMaxdebt, javax.swing.GroupLayout.PREFERRED_SIZE,
-                .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
+                        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))
+                .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)));
 
     add(jPanel1, java.awt.BorderLayout.CENTER);
   }// </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();
 
-    }//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();
 
-    }//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);
     finder.search(null);
@@ -612,16 +646,17 @@ public class CustomersPayment extends javax.swing.JPanel implements JPanelView,
           editCustomer(c);
         }
       } catch (BasicException ex) {
-                MessageInf msg = new MessageInf(MessageInf.SGN_WARNING, AppLocal.getIntString("message.cannotfindcustomer"), ex);
+        MessageInf msg = new MessageInf(MessageInf.SGN_WARNING, AppLocal.getIntString("message.cannotfindcustomer"),
+            ex);
         msg.show(this);
       }
     }
     editorcard.reset();
     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);
 
@@ -642,7 +677,7 @@ public class CustomersPayment extends javax.swing.JPanel implements JPanelView,
 
       ticket.setPayments(payments);
 
-            ticket.setUser(app.getAppUserView().getUser().getUserInfo());
+      ticket.setUserInfo(app.getAppUserView().getUser().getUserInfo());
       ticket.setActiveCash(app.getActiveCashIndex());
       ticket.setDate(new Date());
       ticket.setCustomer(customerext);
@@ -654,7 +689,6 @@ public class CustomersPayment extends javax.swing.JPanel implements JPanelView,
         msg.show(this);
       }
 
-
       // reload customer
       CustomerInfoExt c;
       try {
@@ -667,7 +701,8 @@ public class CustomersPayment extends javax.swing.JPanel implements JPanelView,
         }
       } catch (BasicException ex) {
         c = null;
-                MessageInf msg = new MessageInf(MessageInf.SGN_WARNING, AppLocal.getIntString("message.cannotfindcustomer"), ex);
+        MessageInf msg = new MessageInf(MessageInf.SGN_WARNING, AppLocal.getIntString("message.cannotfindcustomer"),
+            ex);
         msg.show(this);
       }
 
@@ -680,9 +715,9 @@ public class CustomersPayment extends javax.swing.JPanel implements JPanelView,
     editorcard.reset();
     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()) {
       save();
@@ -691,9 +726,9 @@ public class CustomersPayment extends javax.swing.JPanel implements JPanelView,
       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.requestFocusInWindow();
@@ -720,7 +755,7 @@ public class CustomersPayment extends javax.swing.JPanel implements JPanelView,
 
         ticket.setPayments(payments);
 
-                ticket.setUser(app.getAppUserView().getUser().getUserInfo());
+        ticket.setUserInfo(app.getAppUserView().getUser().getUserInfo());
         ticket.setActiveCash(app.getActiveCashIndex());
         ticket.setDate(new Date());
         ticket.setCustomer(customerext);
@@ -736,14 +771,16 @@ public class CustomersPayment extends javax.swing.JPanel implements JPanelView,
         try {
           c = dlsales.loadCustomerExt(customerext.getId());
           if (c == null) {
-                        MessageInf msg = new MessageInf(MessageInf.SGN_WARNING, AppLocal.getIntString("message.cannotfindcustomer"));
+            MessageInf msg = new MessageInf(MessageInf.SGN_WARNING,
+                AppLocal.getIntString("message.cannotfindcustomer"));
             msg.show(this);
           } else {
             editCustomer(c);
           }
         } catch (BasicException ex) {
           c = null;
-                    MessageInf msg = new MessageInf(MessageInf.SGN_WARNING, AppLocal.getIntString("message.cannotfindcustomer"), ex);
+          MessageInf msg = new MessageInf(MessageInf.SGN_WARNING, AppLocal.getIntString("message.cannotfindcustomer"),
+              ex);
           msg.show(this);
         }
 
@@ -756,7 +793,7 @@ public class CustomersPayment extends javax.swing.JPanel implements JPanelView,
       editorcard.reset();
       editorcard.activate();
     }
-    }//GEN-LAST:event_btnPrePayActionPerformed
+  }// GEN-LAST:event_btnPrePayActionPerformed
 
   // Variables declaration - do not modify//GEN-BEGIN:variables
   private javax.swing.JButton btnCustomer;

src/main/java/com/unicenta/pos/forms/AppConfig.java

@@ -228,7 +228,7 @@ public class AppConfig implements AppProperties {
 
   }
 
-  private void refreshProperties() {
+  private void pullLatestProperties() {
     try {
       InputStream in = new FileInputStream(configfile);
       if (in != null) {
@@ -252,9 +252,11 @@ public class AppConfig implements AppProperties {
     }
   }
 
-  public void saveWithExistingProperties() throws IOException {
+  public void setLastTicket(String lastTicketNumber, String lastTicketType) throws IOException {
 
-    refreshProperties();
+    pullLatestProperties();
+    properties.setProperty("lastticket.number", lastTicketNumber);
+    properties.setProperty("lastticket.type", lastTicketType);
 
     OutputStream out = new FileOutputStream(configfile);
     if (out != null) {

src/main/java/com/unicenta/pos/forms/AppLocal.java

@@ -30,7 +30,7 @@ public class AppLocal {
 
     public static final String APP_NAME = "uniCenta oPOS";
     public static final String APP_ID = "unicentaopos";
-    public static final String APP_VERSION = "5.3";
+    public static final String APP_VERSION = "5.4.0";
 
     private static final LocaleResources m_resources;
 

src/main/java/com/unicenta/pos/forms/JPrincipalApp.form

@@ -21,7 +21,7 @@
 
   <Layout class="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout"/>
   <SubComponents>
-    <Container class="javax.swing.JPanel" name="jPanel1">
+    <Container class="javax.swing.JPanel" name="mainMenuJPanel">
       <Constraints>
         <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout" value="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout$BorderConstraintsDescription">
           <BorderConstraints direction="Before"/>
@@ -73,7 +73,7 @@
               <Group type="103" groupAlignment="0" attributes="0">
                   <Group type="102" alignment="1" attributes="0">
                       <EmptySpace min="0" pref="0" max="-2" attributes="0"/>
-                      <Component id="jButton1" min="-2" max="-2" attributes="0"/>
+                      <Component id="showMainMenuButton" min="-2" max="-2" attributes="0"/>
                       <EmptySpace max="-2" attributes="0"/>
                   </Group>
               </Group>
@@ -81,15 +81,15 @@
             <DimensionLayout dim="1">
               <Group type="103" groupAlignment="0" attributes="0">
                   <Group type="102" attributes="0">
-                      <EmptySpace pref="88" max="32767" attributes="0"/>
+                      <EmptySpace max="32767" attributes="0"/>
-                      <Component id="jButton1" pref="33" max="32767" attributes="0"/>
+                      <Component id="showMainMenuButton" pref="120" max="32767" attributes="0"/>
-                      <EmptySpace pref="188" max="32767" attributes="0"/>
+                      <EmptySpace pref="95" max="32767" attributes="0"/>
                   </Group>
               </Group>
             </DimensionLayout>
           </Layout>
           <SubComponents>
-            <Component class="javax.swing.JButton" name="jButton1">
+            <Component class="javax.swing.JButton" name="showMainMenuButton">
               <Properties>
                 <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(&quot;tooltip.menu&quot;)"/>
@@ -112,14 +112,14 @@
                 <Property name="requestFocusEnabled" type="boolean" value="false"/>
               </Properties>
               <Events>
-                <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="jButton1ActionPerformed"/>
+                <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="showMainMenuButtonActionPerformed"/>
               </Events>
             </Component>
           </SubComponents>
         </Container>
       </SubComponents>
     </Container>
-    <Container class="javax.swing.JPanel" name="m_jPanelRight">
+    <Container class="javax.swing.JPanel" name="salesScreenJPanel">
       <Properties>
         <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
           <Dimension value="[200, 40]"/>
@@ -133,7 +133,7 @@
 
       <Layout class="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout"/>
       <SubComponents>
-        <Container class="javax.swing.JPanel" name="m_jPanelTitle">
+        <Container class="javax.swing.JPanel" name="salesScreenTitlePanel">
           <Constraints>
             <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout" value="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout$BorderConstraintsDescription">
               <BorderConstraints direction="North"/>
@@ -142,7 +142,7 @@
 
           <Layout class="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout"/>
           <SubComponents>
-            <Component class="javax.swing.JLabel" name="m_jTitle">
+            <Component class="javax.swing.JLabel" name="salesScreenTitleLabel">
               <Properties>
                 <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
                   <Font name="Arial" size="14" style="1"/>

src/main/java/com/unicenta/pos/forms/JPrincipalApp.java

@@ -101,20 +101,16 @@ public class JPrincipalApp extends javax.swing.JPanel implements AppUserView {
     m_principalnotificator.setText(m_appuser.getName());
     m_principalnotificator.setIcon(m_appuser.getIcon());
 
-    if (jButton1.getComponentOrientation().isLeftToRight()) {
+    if (showMainMenuButton.getComponentOrientation().isLeftToRight()) {
-      menu_open = new javax.swing.ImageIcon(getClass().getResource(
+      menu_open = new javax.swing.ImageIcon(getClass().getResource("/com/unicenta/images/menu-right.png"));
-              "/com/unicenta/images/menu-right.png"));
+      menu_close = new javax.swing.ImageIcon(getClass().getResource("/com/unicenta/images/menu-left.png"));
-      menu_close = new javax.swing.ImageIcon(getClass().getResource(
-              "/com/unicenta/images/menu-left.png"));
     } else {
-      menu_open = new javax.swing.ImageIcon(getClass().getResource(
+      menu_open = new javax.swing.ImageIcon(getClass().getResource("/com/unicenta/images/menu-left.png"));
-              "/com/unicenta/images/menu-left.png"));
+      menu_close = new javax.swing.ImageIcon(getClass().getResource("/com/unicenta/images/menu-right.png"));
-      menu_close = new javax.swing.ImageIcon(getClass().getResource(
-              "/com/unicenta/images/menu-right.png"));
     }
     assignMenuButtonIcon();
 
-    m_jPanelTitle.setVisible(false);
+    salesScreenTitlePanel.setVisible(false);
     m_jPanelContainer.add(new JPanel(), "<NULL>");
 
     showView("<NULL>");
@@ -146,9 +142,7 @@ public class JPrincipalApp extends javax.swing.JPanel implements AppUserView {
   }
 
   private void assignMenuButtonIcon() {
-    jButton1.setIcon(m_jPanelLeft.isVisible()
+    showMainMenuButton.setIcon(m_jPanelLeft.isVisible() ? menu_close : menu_open);
-            ? menu_close
-            : menu_open);
   }
 
   /**
@@ -490,12 +484,13 @@ public class JPrincipalApp extends javax.swing.JPanel implements AppUserView {
         m_jLastView = m_jMyView;
 
         setMenuVisible(getBounds().width > 800);
+        setMenuVisible(getBounds().height > 600);
         setMenuVisible(false);
 
         showView(sTaskClass);
         String sTitle = m_jMyView.getTitle();
-        m_jPanelTitle.setVisible(sTitle != null);
+        salesScreenTitlePanel.setVisible(sTitle != null);
-        m_jTitle.setText(sTitle);
+        salesScreenTitleLabel.setText(sTitle);
       }
     } else {
 
@@ -548,41 +543,41 @@ public class JPrincipalApp extends javax.swing.JPanel implements AppUserView {
     // <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents
     private void initComponents() {
 
-    jPanel1 = new javax.swing.JPanel();
+        mainMenuJPanel = new javax.swing.JPanel();
         m_jPanelLeft = new javax.swing.JScrollPane();
         jPanel2 = new javax.swing.JPanel();
-    jButton1 = new javax.swing.JButton();
+        showMainMenuButton = new javax.swing.JButton();
-    m_jPanelRight = new javax.swing.JPanel();
+        salesScreenJPanel = new javax.swing.JPanel();
-    m_jPanelTitle = new javax.swing.JPanel();
+        salesScreenTitlePanel = new javax.swing.JPanel();
-    m_jTitle = new javax.swing.JLabel();
+        salesScreenTitleLabel = new javax.swing.JLabel();
         m_jPanelContainer = new javax.swing.JPanel();
 
         setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
         setLayout(new java.awt.BorderLayout());
 
-    jPanel1.setLayout(new java.awt.BorderLayout());
+        mainMenuJPanel.setLayout(new java.awt.BorderLayout());
 
         m_jPanelLeft.setBackground(new java.awt.Color(102, 102, 102));
         m_jPanelLeft.setBorder(null);
         m_jPanelLeft.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
         m_jPanelLeft.setPreferredSize(new java.awt.Dimension(250, 2));
-    jPanel1.add(m_jPanelLeft, java.awt.BorderLayout.LINE_START);
+        mainMenuJPanel.add(m_jPanelLeft, java.awt.BorderLayout.LINE_START);
 
         jPanel2.setFont(new java.awt.Font("Arial", 0, 12)); // NOI18N
         jPanel2.setPreferredSize(new java.awt.Dimension(45, 45));
 
-    jButton1.setToolTipText(AppLocal.getIntString("tooltip.menu")); // NOI18N
+        showMainMenuButton.setToolTipText(AppLocal.getIntString("tooltip.menu")); // NOI18N
-    jButton1.setFocusPainted(false);
+        showMainMenuButton.setFocusPainted(false);
-    jButton1.setFocusable(false);
+        showMainMenuButton.setFocusable(false);
-    jButton1.setIconTextGap(0);
+        showMainMenuButton.setIconTextGap(0);
-    jButton1.setMargin(new java.awt.Insets(10, 2, 10, 2));
+        showMainMenuButton.setMargin(new java.awt.Insets(10, 2, 10, 2));
-    jButton1.setMaximumSize(new java.awt.Dimension(45, 32224661));
+        showMainMenuButton.setMaximumSize(new java.awt.Dimension(45, 32224661));
-    jButton1.setMinimumSize(new java.awt.Dimension(32, 32));
+        showMainMenuButton.setMinimumSize(new java.awt.Dimension(32, 32));
-    jButton1.setPreferredSize(new java.awt.Dimension(36, 45));
+        showMainMenuButton.setPreferredSize(new java.awt.Dimension(36, 45));
-    jButton1.setRequestFocusEnabled(false);
+        showMainMenuButton.setRequestFocusEnabled(false);
-    jButton1.addActionListener(new java.awt.event.ActionListener() {
+        showMainMenuButton.addActionListener(new java.awt.event.ActionListener() {
             public void actionPerformed(java.awt.event.ActionEvent evt) {
-        jButton1ActionPerformed(evt);
+                showMainMenuButtonActionPerformed(evt);
             }
         });
 
@@ -592,59 +587,59 @@ public class JPrincipalApp extends javax.swing.JPanel implements AppUserView {
             jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
             .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, jPanel2Layout.createSequentialGroup()
                 .addGap(0, 0, 0)
-                            .addComponent(jButton1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                .addComponent(showMainMenuButton, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
                 .addContainerGap())
         );
         jPanel2Layout.setVerticalGroup(
             jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
             .addGroup(jPanel2Layout.createSequentialGroup()
-                            .addContainerGap(88, Short.MAX_VALUE)
+                .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
-                            .addComponent(jButton1, javax.swing.GroupLayout.DEFAULT_SIZE, 33, Short.MAX_VALUE)
+                .addComponent(showMainMenuButton, javax.swing.GroupLayout.DEFAULT_SIZE, 120, Short.MAX_VALUE)
-                            .addContainerGap(188, Short.MAX_VALUE))
+                .addContainerGap(95, Short.MAX_VALUE))
         );
 
-    jPanel1.add(jPanel2, java.awt.BorderLayout.LINE_END);
+        mainMenuJPanel.add(jPanel2, java.awt.BorderLayout.LINE_END);
 
-    add(jPanel1, java.awt.BorderLayout.LINE_START);
+        add(mainMenuJPanel, java.awt.BorderLayout.LINE_START);
 
-    m_jPanelRight.setPreferredSize(new java.awt.Dimension(200, 40));
+        salesScreenJPanel.setPreferredSize(new java.awt.Dimension(200, 40));
-    m_jPanelRight.setLayout(new java.awt.BorderLayout());
+        salesScreenJPanel.setLayout(new java.awt.BorderLayout());
 
-    m_jPanelTitle.setLayout(new java.awt.BorderLayout());
+        salesScreenTitlePanel.setLayout(new java.awt.BorderLayout());
 
-    m_jTitle.setFont(new java.awt.Font("Arial", 1, 14)); // NOI18N
+        salesScreenTitleLabel.setFont(new java.awt.Font("Arial", 1, 14)); // NOI18N
-    m_jTitle.setForeground(new java.awt.Color(0, 168, 223));
+        salesScreenTitleLabel.setForeground(new java.awt.Color(0, 168, 223));
-    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.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.setMaximumSize(new java.awt.Dimension(100, 35));
+        salesScreenTitleLabel.setMaximumSize(new java.awt.Dimension(100, 35));
-    m_jTitle.setMinimumSize(new java.awt.Dimension(30, 25));
+        salesScreenTitleLabel.setMinimumSize(new java.awt.Dimension(30, 25));
-    m_jTitle.setPreferredSize(new java.awt.Dimension(100, 35));
+        salesScreenTitleLabel.setPreferredSize(new java.awt.Dimension(100, 35));
-    m_jPanelTitle.add(m_jTitle, java.awt.BorderLayout.NORTH);
+        salesScreenTitlePanel.add(salesScreenTitleLabel, java.awt.BorderLayout.NORTH);
 
-    m_jPanelRight.add(m_jPanelTitle, java.awt.BorderLayout.NORTH);
+        salesScreenJPanel.add(salesScreenTitlePanel, java.awt.BorderLayout.NORTH);
 
         m_jPanelContainer.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
         m_jPanelContainer.setLayout(new java.awt.CardLayout());
-    m_jPanelRight.add(m_jPanelContainer, java.awt.BorderLayout.CENTER);
+        salesScreenJPanel.add(m_jPanelContainer, BorderLayout.CENTER);
 
-    add(m_jPanelRight, java.awt.BorderLayout.CENTER);
+        add(salesScreenJPanel, java.awt.BorderLayout.CENTER);
     }// </editor-fold>//GEN-END:initComponents
 
-  private void jButton1ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jButton1ActionPerformed
+  private void showMainMenuButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_showMainMenuButtonActionPerformed
 
     setMenuVisible(!m_jPanelLeft.isVisible());
 
-  }//GEN-LAST:event_jButton1ActionPerformed
+  }//GEN-LAST:event_showMainMenuButtonActionPerformed
 
 
     // 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 m_jPanelContainer;
     private javax.swing.JScrollPane m_jPanelLeft;
-  private javax.swing.JPanel m_jPanelRight;
+    private javax.swing.JPanel mainMenuJPanel;
-  private javax.swing.JPanel m_jPanelTitle;
+    private javax.swing.JPanel salesScreenJPanel;
-  private javax.swing.JLabel m_jTitle;
+    private javax.swing.JLabel salesScreenTitleLabel;
+    private javax.swing.JPanel salesScreenTitlePanel;
+    private javax.swing.JButton showMainMenuButton;
     // End of variables declaration//GEN-END:variables
 
 }

src/main/java/com/unicenta/pos/forms/JRootApp.java

@@ -1021,7 +1021,7 @@ public class JRootApp extends JPanel implements AppView, DeviceMonitorEventListe
     jLabel2.setPreferredSize(new java.awt.Dimension(180, 34));
     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());
 

src/main/java/com/unicenta/pos/forms/StartPOS.java

@@ -129,7 +129,7 @@ public class StartPOS {
         metrics.setUniCentaVersion(AppLocal.APP_VERSION);
         Application application = new Application();
         application.postMetrics(metrics);
-        application.startEventListener(host, jRootApp);
+        application.startEventListener(host, jRootApp, null);
       } catch (Exception e) {
         log.error("Problem with starting the uniCenta plugin application:${}", e.getMessage());
       }

src/main/java/com/unicenta/pos/imports/CustomerCSVImport.java

@@ -41,6 +41,8 @@ import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.UUID;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 
 
 /**
@@ -276,6 +278,7 @@ public class CustomerCSVImport extends JPanel implements JPanelView {
    * the UI responsiveness.
    */
   private void setWorker() {
+    ExecutorService customExecutor = Executors.newCachedThreadPool();
     progress = 0;
     webPBar.setStringPainted(true);
 
@@ -304,7 +307,8 @@ public class CustomerCSVImport extends JPanel implements JPanelView {
         }
       }
     };
-    pbWorker.execute();
+    // pbWorker.execute();
+    customExecutor.submit(pbWorker);
   }
 
   /**

src/main/java/com/unicenta/pos/imports/JPanelCSVImport.java

@@ -44,6 +44,8 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.UUID;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 
 
 /**
@@ -80,7 +82,7 @@ public class JPanelCSVImport extends JPanel implements JPanelView {
 
     protected SaveProvider spr;
  
-    private String Category;
+    private String category;
     private String categoryName;
     private String categoryParentid;
     private Integer categoryCatorder;
@@ -292,6 +294,7 @@ public class JPanelCSVImport extends JPanel implements JPanelView {
      * the UI responsiveness.
     */
     private void setWorker() {
+        ExecutorService customExecutor = Executors.newCachedThreadPool();
         progress = 0;
         webPBar.setStringPainted(true);
 
@@ -320,7 +323,8 @@ public class JPanelCSVImport extends JPanel implements JPanelView {
                 }    
             }
         };
-        pbWorker.execute();
+        //pbWorker.execute();
+        customExecutor.submit(pbWorker);
     }
 
     /**
@@ -370,7 +374,7 @@ public class JPanelCSVImport extends JPanel implements JPanelView {
                 String SellPrice = products.get((String) jComboSell.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());                
                 
                 currentRecord++;
@@ -514,17 +518,17 @@ public class JPanelCSVImport extends JPanel implements JPanelView {
     private String getCategory() {
 
         if (jComboCategory.getSelectedItem() != category_default) {
-            String cat = (String) cat_list.get(Category);
+            String cat = (String) cat_list.get(category);
 
             if (cat != null) {
                 return (cat);
             }
         }
 
-        if (!Category.equals("")) {
+        if (!category.equals("")) {
             Object[] newcat = new Object[3];
             newcat[0] = UUID.randomUUID().toString();
-            newcat[1] = Category;
+            newcat[1] = category;
             newcat[2] = true;
 
             try {
@@ -535,15 +539,15 @@ public class JPanelCSVImport extends JPanel implements JPanelView {
                     m_CategoryModel.setSelectedItem(category);
                     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);
                 } catch (BasicException ex) {
                 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() 
                 == reject_bad_category) 
@@ -964,7 +968,7 @@ public class JPanelCSVImport extends JPanel implements JPanelView {
         myprod[7] = productSellPrice;                                           // Sell price
         myprod[8] = previousBuy;                                                // Previous Buy price double
         myprod[9] = previousSell;                                               // Previous Sell price double
-        myprod[10] = Category;                                                  // Category
+        myprod[10] = category;                                                  // Category
         myprod[11] = productTax;                                                // Tax
         myprod[12] = Supplier;                                                  // Supplier
         try {

src/main/java/com/unicenta/pos/imports/StockQtyImport.java

@@ -43,6 +43,8 @@ import java.sql.SQLException;
 import java.util.List;
 import java.util.Properties;
 import java.util.UUID;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 
 
 /**
@@ -511,6 +513,7 @@ public class StockQtyImport extends JPanel implements JPanelView {
    * the UI responsiveness.
    */
   private void setWorker() {
+    ExecutorService customExecutor = Executors.newCachedThreadPool();
     progress = 0;
     webPBar.setStringPainted(true);
 
@@ -539,7 +542,8 @@ public class StockQtyImport extends JPanel implements JPanelView {
         }
       }
     };
-    pbWorker.execute();
+    //pbWorker.execute();
+    customExecutor.submit(pbWorker);
   }
 
   /**

src/main/java/com/unicenta/pos/payment/JPaymentSelect.java

@@ -19,6 +19,7 @@
 
 package com.unicenta.pos.payment;
 
+import com.unicenta.basic.BasicException;
 import com.unicenta.format.Formats;
 import com.unicenta.pos.customers.CustomerInfoExt;
 import com.unicenta.pos.customers.DataLogicCustomers;
@@ -26,19 +27,22 @@ import com.unicenta.pos.forms.AppLocal;
 import com.unicenta.pos.forms.AppView;
 import com.unicenta.pos.forms.DataLogicSales;
 import com.unicenta.pos.forms.DataLogicSystem;
+import lombok.extern.slf4j.Slf4j;
 
 import java.awt.*;
 import java.awt.event.KeyEvent;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import javax.swing.JFrame;
+import java.util.concurrent.ExecutorService;
-import javax.swing.SwingWorker;
+import java.util.concurrent.Executors;
+import javax.swing.*;
 
 /**
  *
  * @author adrianromero
  */
+@Slf4j
 public abstract class JPaymentSelect extends javax.swing.JDialog
         implements JPaymentNotifier {
 
@@ -720,9 +724,13 @@ public abstract class JPaymentSelect extends javax.swing.JDialog
 
     private void m_jButtonOKActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_m_jButtonOKActionPerformed
 
+        ExecutorService customExecutor = Executors.newCachedThreadPool();
+
+        try {
             SwingWorker worker = new SwingWorker() {
+
                 @Override
-            protected Object doInBackground() throws Exception {
+                protected Object doInBackground() {
                     m_jButtonOK.setEnabled(false);
                     setReturnPayment(((JPaymentInterface) m_jTabPayment.getSelectedComponent()).executePayment());
                     return null;
@@ -740,7 +748,13 @@ public abstract class JPaymentSelect extends javax.swing.JDialog
                 }
             };
 
-        worker.execute();
+            //worker.execute();
+            customExecutor.submit(worker);
+        }
+        catch (Exception ex) {
+            System.out.println(ex.getMessage());
+        }
+
     }//GEN-LAST:event_m_jButtonOKActionPerformed
 
     private void m_jButtonCancelActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_m_jButtonCancelActionPerformed

src/main/java/com/unicenta/pos/printer/TicketParser.java

@@ -39,6 +39,8 @@ import javax.imageio.ImageIO;
 import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.parsers.SAXParser;
 import javax.xml.parsers.SAXParserFactory;
+
+import com.unicenta.pos.util.QRCode;
 import org.xml.sax.Attributes;
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
@@ -237,6 +239,9 @@ public class TicketParser extends DefaultHandler {
                         bctype = attributes.getValue("type");
                         bcposition = attributes.getValue("position");
                         break;
+                    case "qr-code":
+                        text = new StringBuilder();
+                        break;
                     case "line":
                         m_oOutputPrinter.beginLine(parseInt(attributes.getValue("size"), DevicePrinter.SIZE_0));
                         break;
@@ -346,7 +351,8 @@ public class TicketParser extends DefaultHandler {
                 if ("logo".equals(qName)){
                     m_oOutputPrinter.printLogo();
                     // }
-            }else if ("image".equals(qName)){
+                }
+                if ("image".equals(qName)){
                     try {
 //                    BufferedImage image = ImageIO.read(getClass().getClassLoader().getResourceAsStream(text.toString()));
                         BufferedImage image = m_system.getResourceAsImage(text.toString());
@@ -362,7 +368,10 @@ public class TicketParser extends DefaultHandler {
                         //throw new ResourceNotFoundException( fnfe.getMessage() );
                     }
                     text = null;
-            } else if ("barcode".equals(qName)) {
+                } else if ("qr-code".equals(qName)) {
+                    m_oOutputPrinter.printImage(QRCode.printQRCode(text.toString()));
+                }
+                else if ("barcode".equals(qName)) {
                     m_oOutputPrinter.printBarCode(bctype, bcposition, text.toString());
                     text = null;
                 } else if ("text".equals(qName)) {

src/main/java/com/unicenta/pos/reports/PanelReportBean.java

@@ -22,6 +22,7 @@ package com.unicenta.pos.reports;
 import com.unicenta.basic.BasicException;
 import com.unicenta.data.loader.*;
 import com.unicenta.data.user.EditorCreator;
+import com.unicenta.pos.forms.AppConfig;
 import com.unicenta.pos.forms.AppLocal;
 import com.unicenta.pos.forms.AppView;
 import com.unicenta.pos.forms.BeanFactoryException;
@@ -198,4 +199,11 @@ public class PanelReportBean extends JPanelReport {
     public void addQBFFilter(ReportEditorCreator qbff) {
         qbffilter.addEditor(qbff);
     }
+    public String getDBType() {
+        String url = AppConfig.getInstance().getProperty("db.URL");
+        if (url.contains("derby")) {
+            return "derby";
+        }
+        return "mysql";
+    }
 }

src/main/java/com/unicenta/pos/sales/DataLogicReceipts.java

@@ -49,7 +49,7 @@ public class DataLogicReceipts extends BeanFactoryDataSingle {
    * @param s
    */
   @Override
-    public void init(Session s){
+  public void init(Session s) {
     this.s = s;
   }
 
@@ -64,11 +64,10 @@ public class DataLogicReceipts extends BeanFactoryDataSingle {
     if (Id == null) {
       return null;
     } else {
-            Object[]record = (Object[]) new StaticSentence(s
+      Object[] record = (Object[]) new StaticSentence(s, "SELECT CONTENT, LOCKED FROM sharedtickets WHERE ID = ?",
-                    , "SELECT CONTENT, LOCKED FROM sharedtickets WHERE ID = ?"
+          SerializerWriteString.INSTANCE, new SerializerReadBasic(new Datas[] {
-                    , SerializerWriteString.INSTANCE
+              Datas.SERIALIZABLE }))
-                    , new SerializerReadBasic(new Datas[] {
+          .find(Id);
-                        Datas.SERIALIZABLE})).find(Id);
       return record == null ? null : (TicketInfo) record[0];
     }
   }
@@ -84,32 +83,34 @@ public class DataLogicReceipts extends BeanFactoryDataSingle {
     if (pickupId == null) {
       return null;
     } else {
-            Object[]record = (Object[]) new StaticSentence(s
+      Object[] record = (Object[]) new StaticSentence(s, "SELECT CONTENT, LOCKED FROM sharedtickets WHERE PICKUPID = ?",
-                    , "SELECT CONTENT, LOCKED FROM sharedtickets WHERE PICKUPID = ?"
+          SerializerWriteString.INSTANCE, new SerializerReadBasic(new Datas[] {
-                    , SerializerWriteString.INSTANCE
+              Datas.SERIALIZABLE }))
-                    , new SerializerReadBasic(new Datas[] {
+          .find(pickupId);
-                        Datas.SERIALIZABLE})).find(pickupId);
       return record == null ? null : (TicketInfo) record[0];
     }
   }
 
   /**
-     * JG Dec 14 Administrator and Manager Roles always have access to ALL SHAREDtickets
+   * JG Dec 14 Administrator and Manager Roles always have access to ALL
+   * SHAREDtickets
+   * 
    * @return
    * @throws BasicException
    */
   public final List<SharedTicketInfo> getSharedTicketList() throws BasicException {
 
     return (List<SharedTicketInfo>) new StaticSentence(s
-//                , "SELECT ID, NAME, CONTENT, APPUSER, PICKUPID, LOCKED FROM sharedtickets ORDER BY ID"
+    // , "SELECT ID, NAME, CONTENT, APPUSER, PICKUPID, LOCKED FROM sharedtickets
+    // ORDER BY ID"
         , "SELECT ID, NAME, CONTENT, APPUSER, PICKUPID, LOCKED "
-                        + "FROM sharedtickets ORDER BY PICKUPID" 
+            + "FROM sharedtickets ORDER BY PICKUPID",
-                , null
+        null, new SerializerReadClass(SharedTicketInfo.class)).list();
-                , new SerializerReadClass(SharedTicketInfo.class)).list();
   }
 
   /**
    * Return only current APPUSER SHAREDtickets
+   * 
    * @param appuser
    * @return
    * @throws BasicException
@@ -117,16 +118,15 @@ public class DataLogicReceipts extends BeanFactoryDataSingle {
   public final List<SharedTicketInfo> getUserSharedTicketList(String appuser) throws BasicException {
     String sql = "SELECT ID, NAME, CONTENT, APPUSER, PICKUPID, LOCKED "
         + "FROM sharedtickets "
-                + "WHERE APPUSER =\""+ appuser +"\" ORDER BY PICKUPID";
+        + "WHERE APPUSER =\"" + appuser + "\" ORDER BY PICKUPID";
 
-            return (List<SharedTicketInfo>) new StaticSentence(s
+    return (List<SharedTicketInfo>) new StaticSentence(s, sql, null, new SerializerReadClass(SharedTicketInfo.class))
-            , sql
+        .list();
-            , null
-            , new SerializerReadClass(SharedTicketInfo.class)).list();
   }
 
   /**
    * For Standard View
+   * 
    * @param id
    * @param ticket
    * @param pickupid
@@ -138,7 +138,7 @@ public class DataLogicReceipts extends BeanFactoryDataSingle {
         id,
         ticket.getName(),
         ticket,
-            ticket.getUser().getId(),
+        ticket.getUserInfo().getId(),
         pickupid
 
     };
@@ -151,15 +151,13 @@ public class DataLogicReceipts extends BeanFactoryDataSingle {
         Datas.INT
 
     };
-        new PreparedSentence(s
+    new PreparedSentence(s, "INSERT INTO sharedtickets ("
-            , "INSERT INTO sharedtickets ("
         + "ID, "
         + "NAME, "
         + "CONTENT, "
         + "APPUSER, "
         + "PICKUPID) "
-                + "VALUES (?, ?, ?, ?, ?)"                
+        + "VALUES (?, ?, ?, ?, ?)", new SerializerWriteBasicExt(datas, new int[] { 0, 1, 2, 3, 4 })).exec(values);
-            , new SerializerWriteBasicExt(datas, new int[] {0, 1, 2, 3, 4})).exec(values);                
   }
 
   /**
@@ -175,7 +173,7 @@ public class DataLogicReceipts extends BeanFactoryDataSingle {
         id,
         ticket.getName(),
         ticket,
-            ticket.getUser().getId(),
+        ticket.getUserInfo().getId(),
         pickupid
     };
     Datas[] datas = new Datas[] {
@@ -185,16 +183,16 @@ public class DataLogicReceipts extends BeanFactoryDataSingle {
         Datas.STRING,
         Datas.INT
     };
-        new PreparedSentence(s
+    new PreparedSentence(s, "UPDATE sharedtickets SET "
-                , "UPDATE sharedtickets SET "
         + "NAME = ?, "
         + "CONTENT = ?, "
         + "APPUSER = ?, "
         + "PICKUPID = ? "
-                + "WHERE ID = ?"
+        + "WHERE ID = ?",
-                , new SerializerWriteBasicExt(datas, 
+        new SerializerWriteBasicExt(datas,
             new int[] {
-                            1, 2, 3, 4, 0})).exec(values);
+                1, 2, 3, 4, 0 }))
+        .exec(values);
   }
 
   /**
@@ -221,18 +219,17 @@ public class DataLogicReceipts extends BeanFactoryDataSingle {
         Datas.SERIALIZABLE,
         Datas.INT
     };
-        new PreparedSentence(s
+    new PreparedSentence(s, "UPDATE sharedtickets SET "
-                , "UPDATE sharedtickets SET "
         + "NAME = ?, "
         + "CONTENT = ?, "
         + "PICKUPID = ? "
-                + "WHERE ID = ?"
+        + "WHERE ID = ?", new SerializerWriteBasicExt(datas, new int[] { 1, 2, 3, 0 })).exec(values);
-                , new SerializerWriteBasicExt(datas, new int[] {1, 2, 3, 0})).exec(values);                
   }
 
   /**
    * In place for multi-purposing like containing data from elsewhere and/or
    * using Place and User for Notifications
+   * 
    * @param id
    * @param locked
    * @throws BasicException
@@ -247,16 +244,15 @@ public class DataLogicReceipts extends BeanFactoryDataSingle {
         Datas.STRING,
         Datas.STRING
     };
-        new PreparedSentence(s
+    new PreparedSentence(s, "UPDATE sharedtickets SET "
-                , "UPDATE sharedtickets SET "
         + "LOCKED = ? "
-                + "WHERE ID = ?"
+        + "WHERE ID = ?", new SerializerWriteBasicExt(datas, new int[] { 1, 0 })).exec(values);
-                , new SerializerWriteBasicExt(datas, new int[] {1, 0})).exec(values);
   }
 
   /**
    * In place for multi-purposing like flushing locks from elsewhere and/or
    * using Place and User for Notifications
+   * 
    * @param id
    * @param unlocked
    * @throws BasicException
@@ -271,15 +267,14 @@ public class DataLogicReceipts extends BeanFactoryDataSingle {
         Datas.STRING,
         Datas.STRING
     };
-        new PreparedSentence(s
+    new PreparedSentence(s, "UPDATE sharedtickets SET "
-                , "UPDATE sharedtickets SET "
         + "LOCKED = ? "
-                + "WHERE ID = ?"
+        + "WHERE ID = ?", new SerializerWriteBasicExt(datas, new int[] { 1, 0 })).exec(values);
-                , new SerializerWriteBasicExt(datas, new int[] {1, 0})).exec(values);
   }
 
   /**
    * For Restaurant View
+   * 
    * @param id
    * @param ticket
    * @param pickupid
@@ -294,7 +289,7 @@ public class DataLogicReceipts extends BeanFactoryDataSingle {
         id,
         ticket.getName(),
         ticket,
-            ticket.getUser(),
+        ticket.getUserInfo(),
         ticket.getPickupId(),
         ticket.getHost()
     };
@@ -307,15 +302,13 @@ public class DataLogicReceipts extends BeanFactoryDataSingle {
         Datas.INT
 
     };
-        new PreparedSentence(s
+    new PreparedSentence(s, "INSERT INTO sharedtickets ("
-            , "INSERT INTO sharedtickets ("
         + "ID, "
         + "NAME, "
         + "CONTENT, "
         + "APPUSER, "
         + "PICKUPID) "
-                + "VALUES (?, ?, ?, ?, ?)"                
+        + "VALUES (?, ?, ?, ?, ?)", new SerializerWriteBasicExt(datas, new int[] { 0, 1, 2, 3, 4 })).exec(values);
-            , new SerializerWriteBasicExt(datas, new int[] {0, 1, 2, 3, 4})).exec(values);                
   }
 
   /**
@@ -325,9 +318,7 @@ public class DataLogicReceipts extends BeanFactoryDataSingle {
    */
   public final void deleteSharedTicket(final String id) throws BasicException {
 
-        new StaticSentence(s
+    new StaticSentence(s, "DELETE FROM sharedtickets WHERE ID = ?", SerializerWriteString.INSTANCE).exec(id);
-            , "DELETE FROM sharedtickets WHERE ID = ?"
-            , SerializerWriteString.INSTANCE).exec(id);      
   }
 
   /**
@@ -341,21 +332,16 @@ public class DataLogicReceipts extends BeanFactoryDataSingle {
     if (Id == null) {
       return null;
     } else {
-            Object[]record = (Object[]) new StaticSentence(s
+      Object[] record = (Object[]) new StaticSentence(s, "SELECT PICKUPID FROM sharedtickets WHERE ID = ?",
-                    , "SELECT PICKUPID FROM sharedtickets WHERE ID = ?"
+          SerializerWriteString.INSTANCE, new SerializerReadBasic(new Datas[] { Datas.INT })).find(Id);
-                    , SerializerWriteString.INSTANCE
+      return record == null ? 0 : (Integer) record[0];
-                    , new SerializerReadBasic(new Datas[] {Datas.INT})).find(Id);
-            return record == null ? 0 : (Integer)record[0];
     }
   }
 
-
   public final String getUserId(final String id) throws BasicException {
-        Object[] userID = (Object []) new StaticSentence(s
+    Object[] userID = (Object[]) new StaticSentence(s, "SELECT APPUSER FROM sharedtickets WHERE ID = ?",
-            , "SELECT APPUSER FROM sharedtickets WHERE ID = ?"
+        SerializerWriteString.INSTANCE, new SerializerReadBasic(new Datas[] { Datas.STRING })).find(id);
-            , SerializerWriteString.INSTANCE
+    if (userID == null) {
-            , new SerializerReadBasic(new Datas[] {Datas.STRING})).find(id);
-            if( userID == null ) {
       return null;
     } else {
       return (String) userID[0];
@@ -363,20 +349,16 @@ public class DataLogicReceipts extends BeanFactoryDataSingle {
   }
 
   public final String getLockState(final String id, String lockState) throws BasicException {
-        Object[] state = (Object[]) new StaticSentence(s
+    Object[] state = (Object[]) new StaticSentence(s, "SELECT LOCKED FROM sharedtickets WHERE ID = ?",
-            , "SELECT LOCKED FROM sharedtickets WHERE ID = ?"
+        SerializerWriteString.INSTANCE, new SerializerReadBasic(new Datas[] {
-            , SerializerWriteString.INSTANCE
-            , new SerializerReadBasic(new Datas[] {
             Datas.STRING
         })).find(id);
     return (String) state[0];
   }
 
   public final String getServer(final String id, String user) throws BasicException {
-        Object[] server = (Object[]) new StaticSentence(s
+    Object[] server = (Object[]) new StaticSentence(s, "SELECT appuser FROM sharedtickets WHERE ID = ?",
-            , "SELECT appuser FROM sharedtickets WHERE ID = ?"
+        SerializerWriteString.INSTANCE, new SerializerReadBasic(new Datas[] {
-            , SerializerWriteString.INSTANCE
-            , new SerializerReadBasic(new Datas[] {
             Datas.STRING
         })).find(id);
     return (String) server[0];

src/main/java/com/unicenta/pos/sales/JPanelTicketSales.java

@@ -23,6 +23,8 @@ import com.unicenta.pos.catalog.CatalogSelector;
 import com.unicenta.pos.catalog.JCatalog;
 import com.unicenta.pos.forms.AppView;
 import com.unicenta.pos.ticket.ProductInfoExt;
+import lombok.extern.slf4j.Slf4j;
+
 import java.awt.Component;
 import java.awt.Dimension;
 import java.awt.event.ActionEvent;
@@ -34,6 +36,7 @@ import javax.swing.event.ListSelectionListener;
  *
  * @author JG uniCenta
  */
+@Slf4j
 public class JPanelTicketSales extends JPanelTicket {
 
     private CatalogSelector m_cat;
@@ -95,6 +98,7 @@ public class JPanelTicketSales extends JPanelTicket {
      */
     @Override
     protected JTicketsBag getJTicketsBag() {
+        log.debug("Get JTickets Bag");
         return JTicketsBag.createTicketsBag(m_App.getProperties().getProperty("machine.ticketsbag"), m_App, this);
     }
     

src/main/java/com/unicenta/pos/sales/restaurant/JTicketsBagRestaurantMap.java

@@ -74,7 +74,8 @@ public class JTicketsBagRestaurantMap extends JTicketsBag {
   private DataLogicSales dlSales = null;
   private DataLogicSystem dlSystem = null;
   private final RestaurantDBUtils restDB;
-    private static final Icon ICO_OCU_SM = new ImageIcon(Place.class.getResource("/com/unicenta/images/edit_group_sm.png"));
+  private static final Icon ICO_OCU_SM = new ImageIcon(
+      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_FRE = new NullIcon(22, 22);
   private String waiterDetails;
@@ -87,10 +88,12 @@ public class JTicketsBagRestaurantMap extends JTicketsBag {
   private AppView m_app;
   private Boolean showLayout = false;
 
-        
+  /**
-    /** Creates new form JTicketsBagRestaurant
+   * Creates new form JTicketsBagRestaurant
+   * 
    * @param app
-     * @param panelticket */
+   * @param panelticket
+   */
 
   public JTicketsBagRestaurantMap(AppView app, TicketsEditor panelticket) {
 
@@ -217,8 +220,7 @@ public class JTicketsBagRestaurantMap extends JTicketsBag {
             pl.setY(newY);
           }
         }
-            }
+      });
-            );
 
       pl.getButton().addActionListener(new MyActionListener(pl));
     }
@@ -240,7 +242,7 @@ public class JTicketsBagRestaurantMap extends JTicketsBag {
           .getString("label.autoRefreshTableMapTimerON"));
 
       Timer autoRefreshTimer = new Timer(Integer.parseInt(m_App.getProperties()
-                .getProperty("till.autoRefreshTimer"))*1000, new tableMapRefresh());
+          .getProperty("till.autoRefreshTimer")) * 1000, new tableMapRefresh());
 
       autoRefreshTimer.start();
       try {
@@ -253,7 +255,7 @@ public class JTicketsBagRestaurantMap extends JTicketsBag {
           .getString("label.autoRefreshTableMapTimerOFF"));
     }
 
-}
+  }
 
   class tableMapRefresh implements ActionListener {
 
@@ -307,7 +309,7 @@ public class JTicketsBagRestaurantMap extends JTicketsBag {
           dlReceipts.updateSharedTicket(m_PlaceCurrent.getId(),
               m_panelticket.getActiveTicket(),
               m_panelticket.getActiveTicket().getPickupId());
-                    dlReceipts.unlockSharedTicket(m_PlaceCurrent.getId(),null);
+          dlReceipts.unlockSharedTicket(m_PlaceCurrent.getId(), null);
         } catch (BasicException e) {
           new MessageInf(e).show(this);
         }
@@ -357,7 +359,7 @@ public class JTicketsBagRestaurantMap extends JTicketsBag {
     if (m_PlaceCurrent != null) {
       try {
         dlReceipts.updateRSharedTicket(m_PlaceCurrent.getId(),
-                    m_panelticket.getActiveTicket(),m_panelticket.getActiveTicket().getPickupId());
+            m_panelticket.getActiveTicket(), m_panelticket.getActiveTicket().getPickupId());
       } catch (BasicException e) {
         new MessageInf(e).show(this);
       }
@@ -365,7 +367,7 @@ public class JTicketsBagRestaurantMap extends JTicketsBag {
       m_PlaceClipboard = m_PlaceCurrent; // put FROM table to TO table
 
       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();
@@ -418,10 +420,8 @@ public class JTicketsBagRestaurantMap extends JTicketsBag {
           m_PlaceCurrent = null;
 
         } else {
-                    JOptionPane.showMessageDialog(null
+          JOptionPane.showMessageDialog(null, AppLocal.getIntString("message.sharedticketlockoverriden"),
-                        , AppLocal.getIntString("message.sharedticketlockoverriden")
+              AppLocal.getIntString("title.editor"), JOptionPane.INFORMATION_MESSAGE);
-                        , AppLocal.getIntString("title.editor")
-                        , JOptionPane.INFORMATION_MESSAGE);                        
         }
       } catch (BasicException ex) {
         log.error(ex.getMessage());
@@ -441,7 +441,7 @@ public class JTicketsBagRestaurantMap extends JTicketsBag {
     if (m_PlaceCurrent != null) {
       id = m_PlaceCurrent.getId();
     }
-        return(id);
+    return (id);
   }
 
   /**
@@ -453,7 +453,7 @@ public class JTicketsBagRestaurantMap extends JTicketsBag {
     if (m_PlaceCurrent != null) {
       stableName = m_PlaceCurrent.getName();
     }
-        return(stableName);
+    return (stableName);
   }
 
   /**
@@ -516,9 +516,9 @@ public class JTicketsBagRestaurantMap extends JTicketsBag {
     });
   }
 
-/*
+  /*
    * Populate the floor plans and tables
-*/
+   */
   private void printState() {
     String sDB;
     sDB = m_App.getProperties().getProperty("db.engine");
@@ -538,10 +538,10 @@ public class JTicketsBagRestaurantMap extends JTicketsBag {
             })
 
             .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) {
                   Date date = new java.util.Date();
                   Timestamp t1 = new Timestamp(date.getTime());
@@ -552,20 +552,20 @@ public class JTicketsBagRestaurantMap extends JTicketsBag {
                   int hours = seconds / 3600;
                   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>"
-//                                        + AppLocal.getIntString("button.guest") + place.getGuests() + "<br>"
+                  // + AppLocal.getIntString("button.guest") + place.getGuests() + "<br>"
                       + AppLocal.getIntString("button.guest") + count + "<br>"
                       + AppLocal.getIntString("button.occupied")
                       + hours + "h" + ":" + minutes + "m"
                       + "<br>"
                       + "</font></style>";
                 } 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>"
                       + "</font></style>";
                 }
@@ -574,16 +574,16 @@ Integer count = restDB.getGuestsInTable(place.getId());
             })
 
             .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);
               } else {
@@ -594,20 +594,21 @@ Integer count = restDB.getGuestsInTable(place.getId());
 
             .map((place) -> {
               if (Boolean.parseBoolean(
-                                    m_App.getProperties().getProperty("table.showcustomerdetails"))){
+                  m_App.getProperties().getProperty("table.showcustomerdetails"))) {
                 place.getButton().setIcon((Boolean.parseBoolean(
                     m_App.getProperties().getProperty("table.showwaiterdetails"))
-                                        && (restDB.getCustomerNameInTable(place.getName()) !=null))
+                    && (restDB.getCustomerNameInTable(place.getName()) != null))
-                                        ? ICO_WAITER:ICO_OCU_SM);
+                        ? ICO_WAITER
-                                if (m_App.getProperties().getProperty("table.customercolour")== null){                
+                        : ICO_OCU_SM);
-                                    customerDetails = (restDB.getCustomerNameInTable(place.getName()) ==null)? ""
+                if (m_App.getProperties().getProperty("table.customercolour") == null) {
-                                    :"<style=font-size:9px;font-weight:bold;><font color = blue>"
+                  customerDetails = (restDB.getCustomerNameInTable(place.getName()) == null) ? ""
-                                    + restDB.getCustomerNameInTableById(place.getId())+"</font></style><br>";
+                      : "<style=font-size:9px;font-weight:bold;><font color = blue>"
-                                }else{
+                          + restDB.getCustomerNameInTableById(place.getId()) + "</font></style><br>";
-                                    customerDetails = (restDB.getCustomerNameInTable(place.getName()) ==null)? ""
+                } else {
-                                            :"<style=font-size:9px;font-weight:bold;><font color ="
+                  customerDetails = (restDB.getCustomerNameInTable(place.getName()) == null) ? ""
-                                        + m_App.getProperties().getProperty("table.customercolour")+ ">"
+                      : "<style=font-size:9px;font-weight:bold;><font color ="
-                                        + restDB.getCustomerNameInTableById(place.getId())+"</font></style><br>";
+                          + m_App.getProperties().getProperty("table.customercolour") + ">"
+                          + restDB.getCustomerNameInTableById(place.getId()) + "</font></style><br>";
                 }
               } else {
                 customerDetails = "";
@@ -621,17 +622,17 @@ Integer count = restDB.getGuestsInTable(place.getId());
                   || (Boolean.parseBoolean(
                       m_App.getProperties().getProperty("table.showcustomerdetails")))) {
                 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;
             })
@@ -643,15 +644,12 @@ Integer count = restDB.getGuestsInTable(place.getId());
             });
 
         m_jbtnReservations.setEnabled(true);
-// places here
+        // places here
 
       } else {
-                m_jText.setText(AppLocal.getIntString("label.restaurantcustomer"
+        m_jText.setText(AppLocal.getIntString("label.restaurantcustomer", new Object[] {
-                        , new Object[] {
             customer.getName()
-                        }
+        }));
-                )
-                );
 
         m_aplaces.stream()
             .forEach((place) -> {
@@ -660,11 +658,9 @@ Integer count = restDB.getGuestsInTable(place.getId());
         m_jbtnReservations.setEnabled(false);
       }
     } else {
-            m_jText.setText(AppLocal.getIntString("label.restaurantmove"
+      m_jText.setText(AppLocal.getIntString("label.restaurantmove", new Object[] {
-                    , new Object[] {
           m_PlaceClipboard.getName()
-                }
+      }));
-            ));
 
       m_aplaces.stream()
           .forEach((place) -> {
@@ -695,23 +691,25 @@ Integer count = restDB.getGuestsInTable(place.getId());
     m_restaurantmap.updateGuestCount();
 
     try {
-            dlReceipts.lockSharedTicket(m_PlaceCurrent.getId(),"locked");
+      dlReceipts.lockSharedTicket(m_PlaceCurrent.getId(), "locked");
     } catch (BasicException ex) {
       log.error(ex.getMessage());
     }
   }
 
   private void showView(String view) {
-        CardLayout cl = (CardLayout)(getLayout());
+    CardLayout cl = (CardLayout) (getLayout());
     cl.show(this, view);
   }
 
   private class MyActionListener implements ActionListener {
 
     private final Place m_place;
+
     public MyActionListener(Place place) {
       m_place = place;
     }
+
     @Override
     public void actionPerformed(ActionEvent evt) {
       m_App.getAppUserView().getUser();
@@ -723,7 +721,7 @@ Integer count = restDB.getGuestsInTable(place.getId());
           TicketInfo ticket = getTicketInfo(m_place);
           if (ticket == null) { // It's an empty table
             ticket = new TicketInfo();
-                            ticket.setUser(m_App.getAppUserView().getUser().getUserInfo());
+            ticket.setUserInfo(m_App.getAppUserView().getUser().getUserInfo());
             try {
               dlReceipts.insertSharedTicket(m_place.getId(), ticket, ticket.getPickupId());
             } catch (BasicException e) {
@@ -735,30 +733,29 @@ Integer count = restDB.getGuestsInTable(place.getId());
           } else { // Table not empty
             String m_lockState = null;
             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
                 JOptionPane.showMessageDialog(null,
                     AppLocal.getIntString("message.sharedticketlock"));
 
                 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("message.sharedticketlockoverride"), AppLocal.getIntString("title.editor"),
-                                            , AppLocal.getIntString("title.editor")
+                      JOptionPane.YES_NO_OPTION, JOptionPane.WARNING_MESSAGE);
-                                            , JOptionPane.YES_NO_OPTION, JOptionPane.WARNING_MESSAGE);
 
                   if (res == JOptionPane.YES_OPTION) {
                     m_place.setPeople(true);
                     m_PlaceClipboard = null;
                     setActivePlace(m_place, ticket);
-                                            dlReceipts.lockSharedTicket(m_PlaceCurrent.getId(),"locked");                                        
+                    dlReceipts.lockSharedTicket(m_PlaceCurrent.getId(), "locked");
                   }
                 }
               } else { // It's not locked
                 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_place.setPeople(true);
 
@@ -766,21 +763,19 @@ Integer count = restDB.getGuestsInTable(place.getId());
                   m_lockState = "locked";
                   setActivePlace(m_place, ticket);
                 } else {
-                                        JOptionPane.showMessageDialog(null
+                  JOptionPane.showMessageDialog(null, AppLocal.getIntString("message.sharedticket"),
-                                            , AppLocal.getIntString("message.sharedticket")
+                      AppLocal.getIntString("title.editor"), JOptionPane.OK_OPTION);
-                                            , AppLocal.getIntString("title.editor")
-                                            , JOptionPane.OK_OPTION);
                 }
               }
             } catch (BasicException ex) {
               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?
           TicketInfo ticketclip = getTicketInfo(m_PlaceClipboard); // add ticket object from clipboard
@@ -887,18 +882,18 @@ Integer count = restDB.getGuestsInTable(place.getId());
    *
    * @param btnText
    */
-    public void setButtonTextBags(String btnText){
+  public void setButtonTextBags(String 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.
    * WARNING: Do NOT modify this code. The content of this method is
    * always regenerated by the Form Editor.
    */
-    // <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents
+  // <editor-fold defaultstate="collapsed" desc="Generated
+  // Code">//GEN-BEGIN:initComponents
   private void initComponents() {
 
     m_jPanelMap = new javax.swing.JPanel();
@@ -1013,18 +1008,18 @@ Integer count = restDB.getGuestsInTable(place.getId());
     add(m_jPanelMap, "map");
   }// </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();
     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");
     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")
         .getString("button.layout").equals(m_jbtnLayout.getText())) {
       actionEnabled = false;
@@ -1057,9 +1052,9 @@ Integer count = restDB.getGuestsInTable(place.getId());
         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) -> {
       try {
         dlSystem.updatePlaces(pl.getX(), pl.getY(), pl.getId());
@@ -1067,8 +1062,7 @@ Integer count = restDB.getGuestsInTable(place.getId());
         log.error(ex.getMessage());
       }
     });
-    }//GEN-LAST:event_m_jbtnSaveActionPerformed
+  }// GEN-LAST:event_m_jbtnSaveActionPerformed
-    
 
   // Variables declaration - do not modify//GEN-BEGIN:variables
   private javax.swing.JPanel jPanel1;

src/main/java/com/unicenta/pos/sales/restaurant/RestaurantDBUtils.java

@@ -7,6 +7,8 @@ package com.unicenta.pos.sales.restaurant;
 import com.unicenta.data.loader.Session;
 import com.unicenta.pos.forms.AppView;
 import com.unicenta.pos.forms.DataLogicSystem;
+import lombok.extern.slf4j.Slf4j;
+
 import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
@@ -18,7 +20,7 @@ import java.sql.Timestamp;
  *
  * @author JDL
  */
-
+@Slf4j
 public class RestaurantDBUtils {
     private Session s;
     private Connection con;  
@@ -304,10 +306,10 @@ public class RestaurantDBUtils {
             rs = stmt.executeQuery(SQL);
         
             if (rs.next()){
-                String customer =rs.getString("TICKETID");
+              return(rs.getString("TICKETID"));
-                return(customer);
             }    
         }catch(SQLException e){
+          log.error("Error running SQL: {}{}", SQL, e.getMessage());
         }
 
         return "";
@@ -553,6 +555,21 @@ public class RestaurantDBUtils {
         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

src/main/java/com/unicenta/pos/sales/shared/JTicketsBagShared.java

@@ -37,6 +37,8 @@ import lombok.extern.slf4j.Slf4j;
 
 import java.util.List;
 import java.util.UUID;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 import javax.swing.*;
 
 /**
@@ -51,6 +53,7 @@ public class JTicketsBagShared extends JTicketsBag {
     private DataLogicSales dlSales = null;  
     private final DataLogicSystem dlSystem;    
     private Boolean showList;
+    private int existingOrderCount;
    
     
     /** Creates new form JTicketsBagShared
@@ -78,7 +81,8 @@ public class JTicketsBagShared extends JTicketsBag {
 
         log.debug("Loading Sales screen! "+this.getClass());
 
-        SwingWorker<String, String> reloadLayaway = new SwingWorker<>() {
+        ExecutorService customExecutor = Executors.newCachedThreadPool();
+        SwingWorker<String, String> reloadLayaway = new SwingWorker() {
             @Override
             protected String doInBackground() throws Exception {
                 while (true) {
@@ -91,7 +95,8 @@ public class JTicketsBagShared extends JTicketsBag {
             }
         };
 
-        reloadLayaway.execute();
+        //reloadLayaway.execute();
+        customExecutor.submit(reloadLayaway);
 
         
         m_sCurrentTicket = null;
@@ -136,12 +141,26 @@ public class JTicketsBagShared extends JTicketsBag {
     }
 
     public void updateCount() {
+
+        /*
+        1. Need to get / set  the existing count
+        2. When count increases show dialog
+         */
         try {
             List<SharedTicketInfo> l = dlReceipts.getSharedTicketList();
             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) {
                 m_jListTickets.setText(Integer.toString(count));
+                existingOrderCount = count;
             } else {
                 m_jListTickets.setText("");
             }
@@ -423,6 +442,10 @@ public class JTicketsBagShared extends JTicketsBag {
         ((JRootApp)m_App).closeAppView();
     }//GEN-LAST:event_m_jHoldActionPerformed
 
+    private void showOrderWindow() {
+
+    }
+
     private void m_jReprintTicketsActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_m_jReprintTicketsActionPerformed
         SwingUtilities.invokeLater(new Runnable() {
             @Override

src/main/java/com/unicenta/pos/sales/shared/JTicketsReprintList.java

@@ -96,7 +96,7 @@ public class JTicketsReprintList extends javax.swing.JDialog {
         m_ticket = null;
         m_ticketCopy = null;        
 
-ReprintTicketInfo m_Ticket = null;
+        ReprintTicketInfo m_Ticket = null;
         
         for (ReprintTicketInfo aticket : atickets) {
             m_jtickets.add(new JButtonTicket(aticket, dlSales));

src/main/java/com/unicenta/pos/ticket/TicketInfo.java

@@ -48,41 +48,41 @@ public final class TicketInfo implements SerializableRead, Externalizable {
   public static final int RECEIPT_PAYMENT = 2;
   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_PARTIAL = 1;
   public static final int REFUND_ALL = 2;
 
   private static final DateFormat m_dateformat = new SimpleDateFormat("hh:mm");
 
-    private String m_sHost;
+  private String host;
-    private String m_sId;
+  private String id;
-    private int tickettype;
+  private int ticketType;
-    private int m_iTicketId;
+  private int ticketId;
-    private int m_iPickupId;
+  private int pickupId;
-    private java.util.Date m_dDate;
+  private java.util.Date date;
   private Properties attributes;
-    private UserInfo m_User;
+  private UserInfo userInfo;
   private Double multiply;
-    private CustomerInfoExt m_Customer;
+  private CustomerInfoExt cutomerInfoExt;
-    private String m_sActiveCash;
+  private String activeCash;
-    private List<TicketLineInfo> m_aLines;
+  private List<TicketLineInfo> ticketLines;
   private List<PaymentInfo> payments;
   private List<TicketTaxInfo> taxes;
   private final String m_sResponse;
   private String loyaltyCardNumber;
   private Boolean oldTicket;
   private boolean tip;
-    private PaymentInfoTicket m_paymentInfo;
+  private PaymentInfoTicket ticketPaymentInfo;
-    private boolean m_isProcessed;
+  private boolean isProcessed;
-    private final String m_locked;
+  private final String locked;
   private Double nsum;
   private int ticketstatus;
 
   private static String hostname;
 
   public static void setHostname(String name) {
-        hostname =name;
+    hostname = name;
   }
 
   public static String getHostname() {
@@ -91,53 +91,53 @@ public final class TicketInfo implements SerializableRead, Externalizable {
 
   /** Creates new TicketModel */
   public TicketInfo() {
-        m_sId = UUID.randomUUID().toString();
+    id = UUID.randomUUID().toString();
-        tickettype = RECEIPT_NORMAL;
+    ticketType = RECEIPT_NORMAL;
-        m_iTicketId = 0; // incrementamos
+    ticketId = 0; // incrementamos
-        m_dDate = new Date();
+    date = new Date();
     attributes = new Properties();
-        m_User = null;
+    userInfo = null;
-        m_Customer = null;
+    cutomerInfoExt = null;
-        m_sActiveCash = null;
+    activeCash = null;
-        m_aLines = new ArrayList<>();
+    ticketLines = new ArrayList<>();
     payments = new ArrayList<>();
     taxes = null;
     m_sResponse = null;
-        oldTicket=false;
+    oldTicket = false;
 
     AppConfig config = new AppConfig(new File(new File(
         System.getProperty("user.home")), AppLocal.APP_ID + ".properties"));
     config.load();
     tip = Boolean.valueOf(config.getProperty("machine.showTip"));
-        m_isProcessed = false;
+    isProcessed = false;
-        m_locked = null;
+    locked = null;
     ticketstatus = 0;
   }
 
   @Override
   public void writeExternal(ObjectOutput out) throws IOException {
-        out.writeObject(m_sId);
+    out.writeObject(id);
-        out.writeInt(tickettype);
+    out.writeInt(ticketType);
-        out.writeInt(m_iTicketId);
+    out.writeInt(ticketId);
-        out.writeObject(m_Customer);
+    out.writeObject(cutomerInfoExt);
-        out.writeObject(m_dDate);
+    out.writeObject(date);
     out.writeObject(attributes);
-        out.writeObject(m_aLines);
+    out.writeObject(ticketLines);
 
     out.writeInt(ticketstatus);
   }
 
   @Override
   public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
-        m_sId = (String) in.readObject();
+    id = (String) in.readObject();
-        tickettype = in.readInt();
+    ticketType = in.readInt();
-        m_iTicketId = in.readInt();
+    ticketId = in.readInt();
-        m_Customer = (CustomerInfoExt) in.readObject();
+    cutomerInfoExt = (CustomerInfoExt) in.readObject();
-        m_dDate = (Date) in.readObject();
+    date = (Date) in.readObject();
     attributes = (Properties) in.readObject();
-        m_aLines = (List<TicketLineInfo>) in.readObject();
+    ticketLines = (List<TicketLineInfo>) in.readObject();
-        m_User = null;
+    userInfo = null;
-        m_sActiveCash = null;
+    activeCash = null;
     payments = new ArrayList<>(); // JG June 2102 diamond inference
     taxes = null;
 
@@ -151,11 +151,11 @@ public final class TicketInfo implements SerializableRead, Externalizable {
    */
   @Override
   public void readValues(DataRead dr) throws BasicException {
-        m_sId = dr.getString(1);
+    id = dr.getString(1);
-        tickettype = dr.getInt(2);
+    ticketType = dr.getInt(2);
-        m_iTicketId = dr.getInt(3);
+    ticketId = dr.getInt(3);
-        m_dDate = dr.getTimestamp(4);
+    date = dr.getTimestamp(4);
-        m_sActiveCash = dr.getString(5);
+    activeCash = dr.getString(5);
     try {
       byte[] img = dr.getBytes(6);
       if (img != null) {
@@ -163,9 +163,9 @@ public final class TicketInfo implements SerializableRead, Externalizable {
       }
     } catch (IOException e) {
     }
-        m_User = new UserInfo(dr.getString(7), dr.getString(8));
+    userInfo = new UserInfo(dr.getString(7), dr.getString(8));
-        m_Customer = new CustomerInfoExt(dr.getString(9));
+    cutomerInfoExt = new CustomerInfoExt(dr.getString(9));
-        m_aLines = new ArrayList<>();
+    ticketLines = new ArrayList<>();
     payments = new ArrayList<>();
     taxes = null;
 
@@ -177,73 +177,76 @@ public final class TicketInfo implements SerializableRead, Externalizable {
    * @return
    */
   public TicketInfo copyTicket() {
-        TicketInfo t = new TicketInfo();
+    TicketInfo ticketInfo = new TicketInfo();
 
-        t.tickettype = tickettype;
+    ticketInfo.ticketType = ticketType;
-        t.m_iTicketId = m_iTicketId;
+    ticketInfo.ticketId = ticketId;
-        t.m_dDate = m_dDate;
+    ticketInfo.date = date;
-        t.m_sActiveCash = m_sActiveCash;
+    ticketInfo.activeCash = activeCash;
-        t.attributes = (Properties) attributes.clone();
+    ticketInfo.attributes = (Properties) attributes.clone();
-        t.m_User = m_User;
+    ticketInfo.userInfo = userInfo;
-        t.m_Customer = m_Customer;
+    ticketInfo.cutomerInfoExt = cutomerInfoExt;
 
-        t.m_aLines = new ArrayList<>(); // JG June 2102 diamond inference
+    ticketInfo.ticketLines = new ArrayList<>(); // JG June 2102 diamond inference
-        m_aLines.forEach((l) -> {
+    ticketLines.forEach((line) -> {
-            t.m_aLines.add(l.copyTicketLine());
+      ticketInfo.ticketLines.add(line.copyTicketLine());
     });
-        t.refreshLines();
+    ticketInfo.refreshLines();
 
-        t.payments = new LinkedList<>(); // JG June 2102 diamond inference
+    ticketInfo.payments = new LinkedList<>(); // JG June 2102 diamond inference
     payments.forEach((p) -> {
-            t.payments.add(p.copyPayment());
+      ticketInfo.payments.add(p.copyPayment());
     });
-        t.oldTicket=oldTicket;
+    ticketInfo.oldTicket = oldTicket;
     // taxes are not copied, must be calculated again.
 
-        t.ticketstatus = ticketstatus;
+    ticketInfo.ticketstatus = ticketstatus;
 
-        return t;
+    return ticketInfo;
   }
 
   public String getId() {
-        return m_sId;
+    return id;
   }
 
   public int getTicketType() {
-        return tickettype;
+    return ticketType;
   }
+
   public void setTicketType(int tickettype) {
-        this.tickettype = tickettype;
+    this.ticketType = tickettype;
   }
 
   public int getTicketId() {
-        return m_iTicketId;
+    return ticketId;
   }
+
   public void setTicketId(int iTicketId) {
-        m_iTicketId = iTicketId;
+    ticketId = iTicketId;
   }
 
   public int getTicketStatus() {
     return ticketstatus;
   }
+
   public void setTicketStatus(int ticketstatus) {
-        if (m_iTicketId >0) {
+    if (ticketId > 0) {
-            this.ticketstatus = m_iTicketId;
+      this.ticketstatus = ticketId;
-        }else{
+    } else {
       this.ticketstatus = ticketstatus;
     }
   }
 
   public void setPickupId(int iTicketId) {
-        m_iPickupId = iTicketId;
+    pickupId = iTicketId;
   }
 
   public int getPickupId() {
-        return m_iPickupId;
+    return pickupId;
   }
 
   public String getName(Object info) {
-// JG Aug 2014 - Add User info
+    // JG Aug 2014 - Add User info
     List<String> name = new ArrayList<>();
 
     String nameprop = getProperty("name");
@@ -251,23 +254,23 @@ public final class TicketInfo implements SerializableRead, Externalizable {
       name.add(nameprop);
     }
 
-        if (m_User != null) {
+    if (userInfo != null) {
-            name.add(m_User.getName());                        
+      name.add(userInfo.getName());
     }
 
     if (info == null) {
-            if (m_iTicketId == 0) {
+      if (ticketId == 0) {
-                name.add("(" + m_dateformat.format(m_dDate) + " " 
+        name.add("(" + m_dateformat.format(date) + " "
-                        + Long.toString(m_dDate.getTime() % 1000) + ")");                
+            + Long.toString(date.getTime() % 1000) + ")");
       } else {
-                name.add(Integer.toString(m_iTicketId));                
+        name.add(Integer.toString(ticketId));
       }
     } else {
       name.add(info.toString());
     }
 
-        if (m_Customer != null) {        
+    if (cutomerInfoExt != null) {
-            name.add(m_Customer.getName());            
+      name.add(cutomerInfoExt.getName());
     }
 
     return org.apache.commons.lang.StringUtils.join(name, " - ");
@@ -278,64 +281,64 @@ public final class TicketInfo implements SerializableRead, Externalizable {
   }
 
   public java.util.Date getDate() {
-        return m_dDate;
+    return date;
   }
 
   public void setDate(java.util.Date dDate) {
-        m_dDate = dDate;
+    date = dDate;
   }
 
   public String getHost() {
     AppConfig m_config_host = new AppConfig(new File((System.getProperty("user.home")),
         AppLocal.APP_ID + ".properties"));
     m_config_host.load();
-      String machineHostname =(m_config_host.getProperty("machine.hostname"));
+    String machineHostname = (m_config_host.getProperty("machine.hostname"));
     m_config_host = null;
     return machineHostname;
   }
 
-    public UserInfo getUser() {
+  public UserInfo getUserInfo() {
-        return m_User;
+    return userInfo;
   }
 
-    public void setUser(UserInfo value) {
+  public void setUserInfo(UserInfo value) {
-        m_User = value;
+    userInfo = value;
   }
 
   public CustomerInfoExt getCustomer() {
-        return m_Customer;
+    return cutomerInfoExt;
   }
 
   public void setCustomer(CustomerInfoExt value) {
-        m_Customer = value;
+    cutomerInfoExt = value;
   }
 
   public String getCustomerId() {
-        if (m_Customer == null) {
+    if (cutomerInfoExt == null) {
       return null;
     } else {
-            return m_Customer.getId();
+      return cutomerInfoExt.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");
   }
 
   public void setActiveCash(String value) {
-        m_sActiveCash = value;
+    activeCash = value;
   }
 
   public String getActiveCash() {
-        return m_sActiveCash;
+    return activeCash;
   }
 
   public String getProperty(String key) {
@@ -355,45 +358,45 @@ public final class TicketInfo implements SerializableRead, Externalizable {
   }
 
   public TicketLineInfo getLine(int index) {
-        return m_aLines.get(index);
+    return ticketLines.get(index);
   }
 
   public void addLine(TicketLineInfo oLine) {
-        oLine.setTicket(m_sId, m_aLines.size());
+    oLine.setTicket(id, ticketLines.size());
-        m_aLines.add(oLine);
+    ticketLines.add(oLine);
   }
 
   public void insertLine(int index, TicketLineInfo oLine) {
-        m_aLines.add(index, oLine);
+    ticketLines.add(index, oLine);
     refreshLines();
   }
 
   public void setLine(int index, TicketLineInfo oLine) {
-        oLine.setTicket(m_sId, index);
+    oLine.setTicket(id, index);
-        m_aLines.set(index, oLine);
+    ticketLines.set(index, oLine);
   }
 
   public void removeLine(int index) {
-        m_aLines.remove(index);
+    ticketLines.remove(index);
     refreshLines();
 
   }
 
   public void refreshLines() {
-        for (int i = 0; i < m_aLines.size(); i++) {
+    for (int i = 0; i < ticketLines.size(); i++) {
-            getLine(i).setTicket(m_sId, i);
+      getLine(i).setTicket(id, i);
     }
   }
 
   public int getLinesCount() {
-        return m_aLines.size();
+    return ticketLines.size();
   }
 
   public double getArticlesCount() {
     double dArticles = 0.0;
     TicketLineInfo oLine;
 
-        for (Iterator<TicketLineInfo> i = m_aLines.iterator(); i.hasNext();) {
+    for (Iterator<TicketLineInfo> i = ticketLines.iterator(); i.hasNext();) {
       oLine = i.next();
       dArticles += oLine.getMultiply();
     }
@@ -403,9 +406,8 @@ public final class TicketInfo implements SerializableRead, Externalizable {
 
   public double getSubTotal() {
     double sum = 0.0;
-        sum = m_aLines.stream().map((line) -> 
+    sum = ticketLines.stream().map((line) -> line.getSubValue()).reduce(sum,
-                line.getSubValue()).reduce(sum, (accumulator, _item) -> 
+        (accumulator, _item) -> accumulator + _item);
-                        accumulator + _item);
     return sum;
   }
 
@@ -418,9 +420,7 @@ public final class TicketInfo implements SerializableRead, Externalizable {
         nsum = sum;
       }
     } else {
-            sum = m_aLines.stream().map((line) -> 
+      sum = ticketLines.stream().map((line) -> line.getTax()).reduce(sum, (accumulator, _item) -> accumulator + _item);
-                    line.getTax()).reduce(sum, (accumulator, _item) -> 
-                            accumulator + _item);
     }
     return sum;
   }
@@ -437,10 +437,8 @@ public final class TicketInfo implements SerializableRead, Externalizable {
 
   public double getTotalPaid() {
     double sum = 0.0;
-        sum = payments.stream().filter((p) -> 
+    sum = payments.stream().filter((p) -> (!"debtpaid".equals(p.getName()))).map((p) -> p.getTotal()).reduce(sum,
-                (!"debtpaid".equals(p.getName()))).map((p) -> 
+        (accumulator, _item) -> accumulator + _item);
-                        p.getTotal()).reduce(sum, (accumulator, _item) -> 
-                                accumulator + _item);
     return sum;
   }
 
@@ -449,11 +447,11 @@ public final class TicketInfo implements SerializableRead, Externalizable {
   }
 
   public List<TicketLineInfo> getLines() {
-        return m_aLines;
+    return ticketLines;
   }
 
   public void setLines(List<TicketLineInfo> l) {
-        m_aLines = l;
+    ticketLines = l;
   }
 
   public List<PaymentInfo> getPayments() {
@@ -493,7 +491,7 @@ public final class TicketInfo implements SerializableRead, Externalizable {
   }
 
   public void setIsProcessed(boolean isP) {
-        m_isProcessed = isP;
+    isProcessed = isP;
   }
 
   public TicketTaxInfo getTaxLine(TaxInfo tax) {
@@ -512,7 +510,7 @@ public final class TicketInfo implements SerializableRead, Externalizable {
     Map<String, TicketTaxInfo> m = new HashMap<>();
 
     TicketLineInfo oLine;
-        for (Iterator<TicketLineInfo> i = m_aLines.iterator(); i.hasNext();) {
+    for (Iterator<TicketLineInfo> i = ticketLines.iterator(); i.hasNext();) {
       oLine = i.next();
 
       TicketTaxInfo t = m.get(oLine.getTaxInfo().getId());
@@ -533,24 +531,24 @@ public final class TicketInfo implements SerializableRead, Externalizable {
     AppConfig m_config = new AppConfig(new File(
         (System.getProperty("user.home")), AppLocal.APP_ID + ".properties"));
     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 (m_iTicketId > 0) {
+    if (ticketId > 0) {
-            String tmpTicketId=Integer.toString(m_iTicketId);
+      String tmpTicketId = Integer.toString(ticketId);
-            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;
       }
-            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;
     } else {
@@ -559,50 +557,49 @@ public final class TicketInfo implements SerializableRead, Externalizable {
   }
 
   public String printDate() {
-        return Formats.TIMESTAMP.formatValue(m_dDate);
+    return Formats.TIMESTAMP.formatValue(date);
   }
 
   public String printUser() {
-        return m_User == null ? "" : m_User.getName();
+    return userInfo == null ? "" : userInfo.getName();
 
   }
 
   public String printHost() {
-        return m_sHost;
+    return host;
   }
 
-    
+  // 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
    */
-    public void setLoyaltyCardNumber(String cardNumber){
+  public void setLoyaltyCardNumber(String cardNumber) {
-        loyaltyCardNumber=cardNumber;
+    loyaltyCardNumber = cardNumber;
   }
 
   /**
    *
    * @return
    */
-    public String getLoyaltyCardNumber(){
+  public String getLoyaltyCardNumber() {
     return (loyaltyCardNumber);
   }
 
   public String printCustomer() {
-        return m_Customer == null ? "" : m_Customer.getName();
+    return cutomerInfoExt == null ? "" : cutomerInfoExt.getName();
   }
 
   public String printPhone1() {
-        return m_Customer == null ? "" : m_Customer.getPhone1();
+    return cutomerInfoExt == null ? "" : cutomerInfoExt.getPhone1();
   }
 
   public String printArticlesCount() {
@@ -629,8 +626,8 @@ public final class TicketInfo implements SerializableRead, Externalizable {
     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() {
@@ -642,18 +639,27 @@ public final class TicketInfo implements SerializableRead, Externalizable {
   }
 
   public String getTicketHeaderFooterData(String data) {
-        AppConfig m_config = new AppConfig(new File((System.getProperty("user.home"))
+    AppConfig m_config = new AppConfig(new File((System.getProperty("user.home")), AppLocal.APP_ID + ".properties"));
-                , AppLocal.APP_ID + ".properties"));        
     m_config.load();
-        String row =(m_config.getProperty("tkt."+data));
+    String row = (m_config.getProperty("tkt." + data));
 
     return row;
   }
 
+  public String printQRCode(String nameHeader, String vatHeader, String vatLabel) {
+    String name = getTicketHeaderFooterData(nameHeader);
+    String vatNumberHeader = getTicketHeaderFooterData(vatHeader);
+    String vatNumber = vatNumberHeader.split(vatLabel)[1];
+    String date = new SimpleDateFormat("yyyy-mm-dd hh:mm:ss").format(getDate());
+    String total = String.valueOf(getTotal());
+    String vatValue = String.valueOf(getTax());
+    return name + "," + vatNumber + "," + date + "," + total + "," + vatValue;
+  }
+
   public String printTicketHeaderLine1() {
     String lineData = getTicketHeaderFooterData("header1");
 
-        if(lineData != null) {
+    if (lineData != null) {
       return lineData;
     } else {
       return "";
@@ -663,7 +669,7 @@ public final class TicketInfo implements SerializableRead, Externalizable {
   public String printTicketHeaderLine2() {
     String lineData = getTicketHeaderFooterData("header2");
 
-        if(lineData != null) {
+    if (lineData != null) {
       return lineData;
     } else {
       return "";
@@ -673,7 +679,7 @@ public final class TicketInfo implements SerializableRead, Externalizable {
   public String printTicketHeaderLine3() {
     String lineData = getTicketHeaderFooterData("header3");
 
-        if(lineData != null) {
+    if (lineData != null) {
       return lineData;
     } else {
       return "";
@@ -683,7 +689,7 @@ public final class TicketInfo implements SerializableRead, Externalizable {
   public String printTicketHeaderLine4() {
     String lineData = getTicketHeaderFooterData("header4");
 
-        if(lineData != null) {
+    if (lineData != null) {
       return lineData;
     } else {
       return "";
@@ -693,7 +699,7 @@ public final class TicketInfo implements SerializableRead, Externalizable {
   public String printTicketHeaderLine5() {
     String lineData = getTicketHeaderFooterData("header5");
 
-        if(lineData != null) {
+    if (lineData != null) {
       return lineData;
     } else {
       return "";
@@ -703,7 +709,7 @@ public final class TicketInfo implements SerializableRead, Externalizable {
   public String printTicketHeaderLine6() {
     String lineData = getTicketHeaderFooterData("header6");
 
-        if(lineData != null) {
+    if (lineData != null) {
       return lineData;
     } else {
       return "";
@@ -713,7 +719,7 @@ public final class TicketInfo implements SerializableRead, Externalizable {
   public String printTicketFooterLine1() {
     String lineData = getTicketHeaderFooterData("footer1");
 
-        if(lineData != null) {
+    if (lineData != null) {
       return lineData;
     } else {
       return "";
@@ -723,7 +729,7 @@ public final class TicketInfo implements SerializableRead, Externalizable {
   public String printTicketFooterLine2() {
     String lineData = getTicketHeaderFooterData("footer2");
 
-        if(lineData != null) {
+    if (lineData != null) {
       return lineData;
     } else {
       return "";
@@ -733,7 +739,7 @@ public final class TicketInfo implements SerializableRead, Externalizable {
   public String printTicketFooterLine3() {
     String lineData = getTicketHeaderFooterData("footer3");
 
-        if(lineData != null) {
+    if (lineData != null) {
       return lineData;
     } else {
       return "";
@@ -743,7 +749,7 @@ public final class TicketInfo implements SerializableRead, Externalizable {
   public String printTicketFooterLine4() {
     String lineData = getTicketHeaderFooterData("footer4");
 
-        if(lineData != null) {
+    if (lineData != null) {
       return lineData;
     } else {
       return "";
@@ -753,7 +759,7 @@ public final class TicketInfo implements SerializableRead, Externalizable {
   public String printTicketFooterLine5() {
     String lineData = getTicketHeaderFooterData("footer5");
 
-        if(lineData != null) {
+    if (lineData != null) {
       return lineData;
     } else {
       return "";
@@ -763,7 +769,7 @@ public final class TicketInfo implements SerializableRead, Externalizable {
   public String printTicketFooterLine6() {
     String lineData = getTicketHeaderFooterData("footer6");
 
-        if(lineData != null) {
+    if (lineData != null) {
       return lineData;
     } else {
       return "";

src/main/java/com/unicenta/pos/ticket/TicketLineInfo.java

@@ -56,12 +56,15 @@ public class TicketLineInfo implements SerializableWrite, SerializableRead, Seri
 
   private double newprice = 0.0;
 
-    /** Creates new TicketLineInfo
+  /**
+   * Creates new TicketLineInfo
+   * 
    * @param productid
    * @param dMultiply
    * @param dPrice
    * @param tax
-     * @param props */
+   * @param props
+   */
   public TicketLineInfo(String productid, double dMultiply, double dPrice, TaxInfo tax, Properties props) {
     init(productid, null, dMultiply, dPrice, tax, props);
   }
@@ -79,6 +82,7 @@ public class TicketLineInfo implements SerializableWrite, SerializableRead, Seri
 
   /**
    * Example: Call from script.TotalDiscount event
+   * 
    * @param productid
    * @param productname
    * @param producttaxcategory
@@ -87,17 +91,19 @@ public class TicketLineInfo implements SerializableWrite, SerializableRead, Seri
    * @param dPrice
    * @param tax
    */
-    public TicketLineInfo(String productid, String productname, String producttaxcategory, String productprinter, double dMultiply, double dPrice, TaxInfo tax) {
+  public TicketLineInfo(String productid, String productname, String producttaxcategory, String productprinter,
+      double dMultiply, double dPrice, TaxInfo tax) {
     Properties props = new Properties();
     props.setProperty("product.name", productname);
     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);
   }
 
   /**
    * Example: Call from script.LineDiscount event
+   * 
    * @param productname
    * @param producttaxcategory
    * @param productprinter     //added to props as may introduce printer redirect
@@ -105,7 +111,8 @@ public class TicketLineInfo implements SerializableWrite, SerializableRead, Seri
    * @param dPrice
    * @param tax
    */
-    public TicketLineInfo(String productname, String producttaxcategory, String productprinter, double dMultiply, double dPrice, TaxInfo tax) {
+  public TicketLineInfo(String productname, String producttaxcategory, String productprinter, double dMultiply,
+      double dPrice, TaxInfo tax) {
 
     Properties props = new Properties();
     props.setProperty("product.name", productname);
@@ -166,7 +173,7 @@ public class TicketLineInfo implements SerializableWrite, SerializableRead, Seri
         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) {
         attributes.setProperty("product.attsetid", product.getAttributeSetID());
@@ -208,7 +215,8 @@ public class TicketLineInfo implements SerializableWrite, SerializableRead, Seri
         line.tax, (Properties) line.attributes.clone());
   }
 
-    private void init(String productid, String attsetinstid, double dMultiply, double dPrice, TaxInfo tax, Properties attributes) {
+  private void init(String productid, String attsetinstid, double dMultiply, double dPrice, TaxInfo tax,
+      Properties attributes) {
 
     this.productid = productid;
     this.attsetinstid = attsetinstid;
@@ -306,60 +314,75 @@ public class TicketLineInfo implements SerializableWrite, SerializableRead, Seri
   public int getTicketLine() {
     return m_iLine;
   }
-// These are the Lookups   
+
+  // These are the Lookups
   public String getProductID() {
     return productid;
   }
+
   public String getProductCategoryID() {
     return (attributes.getProperty("product.categoryid"));
   }
+
   public String getProductAttSetId() {
     return attributes.getProperty("product.attsetid");
   }
+
   public String getProductAttSetInstId() {
     return attsetinstid;
   }
+
   public String getProductAttSetInstDesc() {
     return attributes.getProperty("product.attsetdesc", "");
   }
+
   public String getProductTaxCategoryID() {
     return (attributes.getProperty("product.taxcategoryid"));
   }
+
   public String getTicketUpdated() {
     return (attributes.getProperty("ticket.updated"));
   }
+
   public TaxInfo getTaxInfo() {
     return tax;
   }
+
   public void setTaxInfo(TaxInfo oTaxInfo) {
     tax = oTaxInfo;
   }
 
-// These appear on Printed TicketLine
+  // These appear on Printed TicketLine
   public String getProductName() {
     return attributes.getProperty("product.name");
   }
+
   public String getProductMemoDate() {
     return attributes.getProperty("product.memodate");
   }
+
   public double getPrice() {
     return price;
   }
+
   public double getMultiply() {
     return multiply;
   }
+
   public double getTaxRate() {
     return tax == null ? 0.0 : tax.getRate();
   }
+
   public double getNewPrice() {
     newprice = price * (1.0 + getTaxRate());
     return price;
   }
+
   public String getProductPrinter() {
     return attributes.getProperty("product.printer");
   }
 
-// These are the Summaries    
+  // These are the Summaries
   public double getPriceTax() {
     return price * (1.0 + getTaxRate());
   }
@@ -367,43 +390,53 @@ public class TicketLineInfo implements SerializableWrite, SerializableRead, Seri
   public Properties getProperties() {
     return attributes;
   }
+
   public String getProperty(String key) {
     return attributes.getProperty(key);
   }
+
   public String getProperty(String key, String defaultvalue) {
     return attributes.getProperty(key, defaultvalue);
   }
 
-// These are Ticket Totals    
+  // These are Ticket Totals
   public double getTax() {
     return price * multiply * getTaxRate();
   }
+
   public double getValue() {
     return price * multiply * (1.0 + getTaxRate());
   }
+
   public double getSubValue() {
     return price * multiply;
   }
 
-// SETTERS
+  // SETTERS
   public void setPrice(double dValue) {
     price = dValue;
   }
+
   public void setPriceTax(double dValue) {
     price = dValue / (1.0 + getTaxRate());
   }
+
   public void setMultiply(double dValue) {
     multiply = dValue;
   }
+
   public void setProperty(String key, String value) {
     attributes.setProperty(key, value);
   }
-    public void setProductTaxCategoryID(String taxID){
+
-        attributes.setProperty("product.taxcategoryid",taxID);
+  public void setProductTaxCategoryID(String taxID) {
+    attributes.setProperty("product.taxcategoryid", taxID);
   }
+
   public void setProductAttSetInstId(String value) {
     attsetinstid = value;
   }
+
   public void setProductAttSetInstDesc(String value) {
     if (value == null) {
       attributes.remove(value);
@@ -411,9 +444,11 @@ public class TicketLineInfo implements SerializableWrite, SerializableRead, Seri
       attributes.setProperty("product.attsetdesc", value);
     }
   }
-    public void setTicketUpdated(String key, String value){
+
-        attributes.setProperty("ticket.updated",value);
+  public void setTicketUpdated(String key, String value) {
+    attributes.setProperty("ticket.updated", value);
   }
+
   public void setProductPrinter(String value) {
     if (value == null) {
       attributes.remove(value);
@@ -430,60 +465,79 @@ public class TicketLineInfo implements SerializableWrite, SerializableRead, Seri
   public String printReference() {
     return StringUtils.encodeXML(attributes.getProperty("product.reference"));
   }
+
   public String printCode() {
     return StringUtils.encodeXML(attributes.getProperty("product.code"));
   }
+
   public String printName() {
     return StringUtils.encodeXML(attributes.getProperty("product.name"));
   }
+
   public String printProductMemoDate() {
     return StringUtils.encodeXML(attributes.getProperty("product.memodate"));
   }
+
   public String printPrice() {
     return Formats.CURRENCY.formatValue(getPrice());
   }
+
   public String printPriceTax() {
     return Formats.CURRENCY.formatValue(getPriceTax());
   }
+
   public String printMultiply() {
     return Formats.DOUBLE.formatValue(multiply);
   }
+
   public String printValue() {
     return Formats.CURRENCY.formatValue(getValue());
   }
+
   public String printTaxRate() {
     return Formats.PERCENT.formatValue(getTaxRate());
   }
+
   public String printSubValue() {
     return Formats.CURRENCY.formatValue(getSubValue());
   }
+
   public String printTax() {
     return Formats.CURRENCY.formatValue(getTax());
   }
+
   public String printTextTip() {
     return attributes.getProperty("product.texttip");
   }
+
   public String printPrinter() {
     return StringUtils.encodeXML(attributes.getProperty("product.printer"));
   }
+
   public boolean isProductCom() {
     return "true".equals(attributes.getProperty("product.com"));
   }
+
   public boolean isProductService() {
     return "true".equals(attributes.getProperty("product.service"));
   }
+
   public boolean isProductVprice() {
     return "true".equals(attributes.getProperty("product.vprice"));
   }
+
   public boolean isProductVerpatrib() {
     return "true".equals(attributes.getProperty("product.verpatrib"));
   }
+
   public boolean isProductWarranty() {
     return "true".equals(attributes.getProperty("product.warranty"));
   }
+
   public boolean getUpdated() {
     return "true".equals(attributes.getProperty("ticket.updated"));
   }
+
   public void setUpdated(Boolean value) {
     updated = value;
   }

src/main/java/com/unicenta/pos/transfer/Transfer.java

@@ -43,6 +43,8 @@ import java.sql.*;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Properties;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 import java.util.regex.Matcher;
 
 /**
@@ -2721,6 +2723,7 @@ public final class Transfer extends JPanel implements JPanelView {
             JOptionPane.YES_NO_OPTION,
             JOptionPane.QUESTION_MESSAGE) == JOptionPane.YES_OPTION) {
 
+      ExecutorService customExecutor = Executors.newCachedThreadPool();
       SwingWorker<Void, Void> worker = new SwingWorker<Void, Void>() {
 
         @Override
@@ -2731,7 +2734,8 @@ public final class Transfer extends JPanel implements JPanelView {
         }
       };
 
-      worker.execute();
+      //worker.execute();
+      customExecutor.submit(worker);
 
     }
     System.gc();

src/main/java/com/unicenta/pos/util/QRCode.java

@@ -0,0 +1,75 @@
+package com.unicenta.pos.util;
+
+import com.google.zxing.BarcodeFormat;
+import com.google.zxing.WriterException;
+import com.google.zxing.client.j2se.MatrixToImageWriter;
+import com.google.zxing.common.BitMatrix;
+import com.google.zxing.qrcode.QRCodeWriter;
+
+import javax.imageio.ImageIO;
+import java.awt.image.BufferedImage;
+import java.io.File;
+import java.nio.charset.StandardCharsets;
+import java.util.Base64;
+
+public class QRCode {
+
+    public static BufferedImage printQRCode(String data) {
+
+        String[] values = data.split(",");
+
+        try {
+            // Name
+            QRObject name = new QRObject(1,  values[0] );
+            byte nameTagByte = (byte) name.getTag();
+            byte nameLengthByte = (byte) name.getLength();
+            byte[] nameBytes = {nameTagByte, nameLengthByte};
+            String nameString = new String(nameBytes, StandardCharsets.UTF_8)+name.getValue();
+
+            //vat number
+            QRObject vat = new QRObject(2, values[1]);
+            byte vatTagByte = (byte) vat.getTag();
+            byte vatLengthByte = (byte) vat.getLength();
+            byte[] vatBytes = {vatTagByte, vatLengthByte};
+            String vatString = new String(vatBytes, StandardCharsets.UTF_8)+vat.getValue();
+
+            // date
+            QRObject date = new QRObject(3, values[2]);
+            byte dateTagByte = (byte) date.getTag();
+            byte dateLengthByte = (byte) date.getLength();
+            byte[] dateBytes = {dateTagByte, dateLengthByte};
+            String dateString = new String(dateBytes, StandardCharsets.UTF_8)+date.getValue();
+
+            // amount
+            QRObject amount = new QRObject(4, values[3]);
+            byte amountTagByte = (byte) amount.getTag();
+            byte amountLengthByte = (byte) amount.getLength();
+            byte[] amountBytes = {amountTagByte, amountLengthByte};
+            String amountString = new String(amountBytes, StandardCharsets.UTF_8)+amount.getValue();
+
+
+            // Vat amount
+            QRObject vatAmount = new QRObject(5, values[4]);
+            byte vatAmountTag = (byte) vatAmount.getTag();
+            byte vatAmountLengthByte = (byte) vatAmount.getLength();
+            byte[] vatAmountBytes = {vatAmountTag, vatAmountLengthByte};
+            String vatAmountString = new String(vatAmountBytes, StandardCharsets.UTF_8)+vatAmount.getValue();
+
+
+            //barcode
+            String barCodeString = nameString+vatString+dateString+amountString+vatAmountString;
+            String encodedBarcode = Base64.getEncoder().encodeToString(barCodeString.getBytes(StandardCharsets.UTF_8));
+
+            System.out.println(encodedBarcode);
+
+            QRCodeWriter barcodeWriter = new QRCodeWriter();
+            BitMatrix bitMatrix = barcodeWriter.encode(encodedBarcode, BarcodeFormat.QR_CODE, 200, 200);
+
+            BufferedImage bufferedImage = MatrixToImageWriter.toBufferedImage(bitMatrix);
+            return MatrixToImageWriter.toBufferedImage(bitMatrix);
+        } catch (WriterException e) {
+            e.printStackTrace();
+            return null;
+        }
+    }
+}

src/main/java/com/unicenta/pos/util/QRObject.java

@@ -0,0 +1,40 @@
+package com.unicenta.pos.util;
+
+import java.nio.charset.StandardCharsets;
+
+public class QRObject {
+
+    private int tag;
+    private int length;
+    private String value;
+
+    public QRObject(int tag, String value) {
+        this.tag = tag;
+        this.length = setLength(value);
+        this.value = value;
+    }
+
+    public int getTag() {
+        return tag;
+    }
+
+    public void setTag(int tag) {
+        this.tag = tag;
+    }
+
+    public String getValue() {
+        return value;
+    }
+
+    public void setValue(String value) {
+        this.value = value;
+    }
+
+    public int getLength() {
+        return length;
+    }
+
+    private static int setLength(String value) {
+        return value.getBytes(StandardCharsets.UTF_8).length;
+    }
+}

src/main/resources/com/unicenta/pos/scripts/MySQL-upgrade_master.sql

@@ -1,2 +1,62 @@
-UPDATE applications SET version = $APP_VERSION{} WHERE id = $APP_ID{};
+-- CLEAR THE DECKS
+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;

src/main/resources/com/unicenta/pos/templates/Printer.Ticket.xml

@@ -254,7 +254,7 @@
         <line></line>
         #end
         #end
-
+        <!-- ZACAT please see release notes -->
     </ticket>
 
     #foreach ($paymentline in $ticket.payments)

src/main/resources/com/unicenta/pos/templates/Ticket.Buttons.xml

@@ -100,6 +100,7 @@
     <!-- ADDITIONAL FEATURES ************************************************* -->
     <!-- SET Show Change in Cash Sale (Default=ENABLED -->
         <event key="ticket.close" code="Ticket.Close"/>
+        <event key="ticket.total" code="Ticket.Total"/>
 	<event key="cash.close" code="Cash.Close"/>
 
 <!-- Execute your own scripts by EVENTS triggered by Sales Screen -->

src/main/resources/com/unicenta/reports/sales_chart_top10.bs

@@ -24,26 +24,65 @@ report.setTitleKey("Menu.Top10Sales");
 report.setReport("/com/unicenta/reports/sales_chart_top10");
 report.setResourceBundle("com/unicenta/reports/sales_messages");
 
-report.setSentence(
+String maria = "SELECT \n" +
-            "SELECT " +
+    "    products.NAME,\n" +
-			"products.NAME,SUM(ticketlines.UNITS) AS UNITS, " +
+    "    SUM(ticketlines.UNITS) AS UNITS, \n" +
-			"products.PRICEBUY,products.PRICESELL, " +
+    "    products.PRICEBUY,\n" +
-                        "SUM(ticketlines.PRICE * ticketlines.UNITS))AS SUBTOTAL, " +
+    "    products.PRICESELL, \n" +
-                        "SUM((ticketlines.PRICE * ticketlines.UNITS) * taxes.RATE) AS TAXES, " +
+    "    SUM(ticketlines.PRICE * ticketlines.UNITS) AS SUBTOTAL, \n" +
-                        "SUM(ticketlines.PRICE * ticketlines.UNITS) + SUM((ticketlines.PRICE * ticketlines.UNITS) * taxes.RATE) AS GROSSTOTAL " +
+    "    SUM((ticketlines.PRICE * ticketlines.UNITS) * taxes.RATE) AS TAXES,\n" +
-			"FROM ticketlines " +
+    "    SUM(ticketlines.PRICE * ticketlines.UNITS) + SUM((ticketlines.PRICE * ticketlines.UNITS) * taxes.RATE) AS GROSSTOTAL\n" +
-			"LEFT OUTER JOIN products ON ticketlines.PRODUCT = products.ID " +
+    "FROM \n" +
-			"LEFT OUTER JOIN tickets ON tickets.ID = ticketlines.TICKET " +
+    "    ticketlines\n" +
-                        "LEFT OUTER JOIN receipts ON receipts.ID = tickets.ID, taxes " +
+    "    LEFT JOIN products ON ticketlines.PRODUCT = products.ID \n" +
-			"WHERE receipts.ID = tickets.ID " +
+    "    LEFT JOIN tickets ON tickets.ID = ticketlines.TICKET\n" +
-                        "AND tickets.ID = ticketlines.TICKET " +
+    "    LEFT JOIN receipts ON receipts.ID = tickets.ID\n" +
-                        "AND ticketlines.PRODUCT = products.ID " +
+    "    LEFT JOIN taxes ON ticketlines.TAXID = taxes.ID\n" +
-                        "AND ticketlines.TAXID = taxes.ID " +
+    "WHERE \n" +
-                        "AND ?(QBF_FILTER) " +
+    "    tickets.ID = ticketlines.TICKET\n" +
-			"GROUP BY products.NAME,products.PRICEBUY,products.PRICESELL " +
+    "    AND ticketlines.PRODUCT = products.ID \n" +
-			"ORDER BY GROSSTOTAL DESC " +
+    "    AND ticketlines.TAXID = taxes.ID\n" +
-			"LIMIT 10");
+    "    AND ?(QBF_FILTER) " +
+    "GROUP BY \n" +
+    "    products.NAME,\n" +
+    "    products.PRICEBUY,\n" +
+    "    products.PRICESELL\n" +
+    "ORDER BY \n" +
+    "    GROSSTOTAL DESC \n" +
+    "LIMIT 10";
 
+String derby = "SELECT \n" +
+    "    products.NAME,\n" +
+    "    SUM(ticketlines.UNITS) AS UNITS, \n" +
+    "    products.PRICEBUY,\n" +
+    "    products.PRICESELL, \n" +
+    "    SUM(ticketlines.PRICE * ticketlines.UNITS) AS SUBTOTAL, \n" +
+    "    SUM((ticketlines.PRICE * ticketlines.UNITS) * taxes.RATE) AS TAXES,\n" +
+    "    SUM(ticketlines.PRICE * ticketlines.UNITS) + SUM((ticketlines.PRICE * ticketlines.UNITS) * taxes.RATE) AS GROSSTOTAL\n" +
+    "FROM \n" +
+    "    ticketlines\n" +
+    "    LEFT JOIN products ON ticketlines.PRODUCT = products.ID \n" +
+    "    LEFT JOIN tickets ON tickets.ID = ticketlines.TICKET\n" +
+    "    LEFT JOIN receipts ON receipts.ID = tickets.ID\n" +
+    "    LEFT JOIN taxes ON ticketlines.TAXID = taxes.ID\n" +
+    "WHERE \n" +
+    "    tickets.ID = ticketlines.TICKET\n" +
+    "    AND ticketlines.PRODUCT = products.ID \n" +
+    "    AND ticketlines.TAXID = taxes.ID\n" +
+    "    AND ?(QBF_FILTER) " +
+    "GROUP BY \n" +
+    "    products.NAME,\n" +
+    "    products.PRICEBUY,\n" +
+    "    products.PRICESELL\n" +
+    "ORDER BY \n" +
+    "    GROSSTOTAL DESC \n" +
+    "FETCH FIRST 10 ROWS ONLY";
+
+if (report.getDBType() == "derby") {
+report.setSentence(derby);
+} else {
+report.setSentence(maria);
+}
 report.addParameter("receipts.DATENEW");
 report.addParameter("receipts.DATENEW");
 

src/main/resources/pos_messages.properties

@@ -881,7 +881,7 @@ message.email=Desktop email app' not found
 message.emptycustomer=Customer cannot be empty
 message.emptynumber=Number cannot be empty
 message.enterbuyprice=Enter new Buy Price
-message.eolupdate=<html><center><h2>Version 5.3 Upgrade!</h2></br><h3>Your current database version is {0}</h3><br>For version 5.2 click <b>YES</b><br/><br/>For any other version click <b>NO</b> and get to 5.2 first<br><br/>
+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.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.ibuttonnotfound=No iButton adapter found.  Key fobs will be disabled.

src/main/resources/pos_messages_es.properties

@@ -18,7 +18,8 @@
 #    along with uniCenta oPOS.  If not, see <http://www.gnu.org/licenses/>.
 
 button.backup=Copia seguridad realizada
-Button.Cancel=\ 
+button.Cancel=Cancelar
+Button.Cancel=Cancelar
 button.cancel=Cancelar
 button.catalogadd=A\u00f1adir al cat\u00e1logo
 button.catalogdel=Borrar del cat\u00e1logo
@@ -27,7 +28,7 @@ button.close=Cerrar
 Button.Close=Cerrar
 button.closecash=Cerrar caja
 button.closecashpreview=Cerrar Vista previa
-button.deleteticket=Borar Tiquet
+button.deleteticket=Borar tiquet
 button.discount=Descuento
 button.edit=Editar
 button.email=email
@@ -44,8 +45,6 @@ button.listtickets=Lista
 button.memberdiscount=Desc Miembro
 button.moorings=Moorings
 button.movetable=Mover
-button.newcustomer=Nuevo
-Button.newcustomer=Nuevo
 button.newcustomer=Nuevo Cliente
 Button.newcustomer=Nuevo cliente
 button.newticket=Nuevo
@@ -87,7 +86,7 @@ button.totaldiscount=Total Desc'
 button.transfer=Transferancia Base de Datos
 
 caption.split=Dividir recibo
-caption.tickets=Recibos
+caption.tickets=Tiquets
 caption.upload=Subir lista de productos
 
 cboption.clear=Borrar clave existente
@@ -119,7 +118,7 @@ filter.imgfile=Imagen (*.jpg,*.png)
 form.customertitle=Lista de clientes
 form.productslist=Lista de productos
 form.selectprintertitle=Seleccionar impresora
-form.tickettitle=Lista de recibos
+form.tickettitle=Lista de tiquets
 
 label.address=Direcci\u00f3n l\u00ednea 1
 label.address2=Direcci\u00f3n l\u00ednea 2
@@ -208,7 +207,6 @@ label.curdebt=Deuda actual
 label.currency=Moneda
 label.currencybutton=Ocultar Superposici\u00f3n texto Pagos
 label.currentstock=Disponible
-label.currentstock=Esta, existe
 label.customer=Cliente
 label.customerdate=Fecha Memorizada
 label.customerupdated=Clientes actualizados\t
@@ -216,8 +214,6 @@ label.custtaxcategory=Categor\u00eda de impuesto por cliente
 label.cvsinvalid=Productos Inv\u00e1lidos
 label.cvsnotchanged=Sin Cambios
 label.Database=Base de datos
-Label.Database=Base de datos
-Label.Database=Base de datos
 label.date=Fecha
 label.datestitle=Fechas de cierre
 label.datetime=Fecha y hora
@@ -266,7 +262,6 @@ label.inputamount=Campo de entrada por encima del teclado
 label.InputCash=Entregado
 label.integer=Entero
 label.invalidcustomers=Clientes no validos
-label.invalidcustomers=Clientes no validos
 label.invlinetotal=Linea total
 label.IP1=IP 2
 label.item=Art\u00edculo
@@ -275,7 +270,7 @@ label.javapos.drawer=Nombre del caj\u00f3n
 label.javapos.printer=Nombre de la impresora
 label.lastname=Apellidos
 label.lindediscount=Desc' %
-label.linevoids=Boletos vac\u00edos
+label.linevoids=L\u00edneas borradas y tiquets vac\u00edos
 Label.LoadError=Error de Carga
 label.LoadError=Se ha producido un error al mostrar esta funcionalidad.
 label.locale=Localizaci\u00f3n
@@ -308,10 +303,10 @@ label.maximum=M\u00e1ximo
 label.merchantcode=C\u00f3digo de comercio
 label.minimum=M\u00ednimo
 label.money=Total
-label.mooringcreatebtn=Crear Ticket
+label.mooringcreatebtn=Crear Tiquet
-label.mooringscreatefor=Crear ticket para
+label.mooringscreatefor=Crear tiquet para
 label.name=Nombre
-label.nocashsales=Sin Venta-Abrir Caj\u00f3n
+label.nocashsales=Aperturas de caj\u00f3n sin venta
 label.notes=Notas
 label.noticketstoclose=No hay tiquets por cerrar
 label.nullcategory=(Sin categor\u00eda)
@@ -343,9 +338,8 @@ label.placename=Sitio
 label.placeposition=Posici\u00f3n
 label.postal=C\u00f3digo postal
 label.prepay=Cantidad de prepago
-label.prepay=Cantidad Prepago
+label.price=Base
-label.price=PVP
+label.pricetax=Base+IVA
-label.pricetax=PVP+IVA
 label.priceupdate=Actualizaciones de precios
 label.csvnewcustomers=Nuevos Clientes
 label.priceupdate=Permitir actualizaciones de precios
@@ -369,8 +363,8 @@ label.prodname=Nombre
 label.prodnamem=<html> Nombre <font color = FB00FF> *
 label.prodorder=Orden
 label.prodpricebuy=Precio compra
-label.prodpricesell=PVP
+label.prodpricesell=Base
-label.prodpriceselltax=PVP+IVA
+label.prodpriceselltax=Base+IVA
 label.prodproperties=Propiedades
 label.prodref=Referencia
 label.prodscale=Balanza
@@ -383,13 +377,13 @@ label.prodsupplier=Proveedores
 label.prodtaxcode=Impuesto
 label.product=C\u00f3digo de barras
 label.producthtmlguide=<html>\n<div></p>Puedes personalizar la pantalla de venta de Productos aqu\u00ed. \nSi tienes algunos conocimientos de HTML puedes completar lo que aparece aqu\u00ed</p><br><br></div>\n<div>Pasa el cursor sobre el texto de la derecha para ver el c\u00f3digo HTML asociado al efecto que quieres en el Bot\u00f3n<br><br></div>\n
-label.productreceipt=Se requiere Ticket para la garant\u00eda
+label.productreceipt=Se requiere tiquet para la garant\u00eda
 label.produnits=Unidades
 label.prodvaluebuy=Valor de compra
 label.prodvaluesell=Valor de venta
 label.prodvolume=Volumen
 label.properties=Propiedades
-label.receiptprint=Desactivar Impresi\u00f3n Ticket
+label.receiptprint=Desactivar Impresi\u00f3n de tiquet
 label.receiptprinter=Impresora de recibos
 label.recorddeleted=(Registro borrado)
 label.recordeof=(No hay registros)
@@ -436,7 +430,7 @@ label.stocktaker=Entrado por
 label.storename=Nombre de tienda
 label.StripeLivePublishableKey=Clave publicable en vivo
 label.subcategorytitle=Nombre en panel
-label.subtotalcash=Subtotal
+label.subtotalcash=Total sin IVA
 label.supplierdocment=Documento
 label.suppliertaxid=La Cuenta
 label.SupplierTransactions=Actas
@@ -453,12 +447,12 @@ label.tableshowwaiterdetails=Mostrar Camarero
 label.tabletransbutton=Boton de la mesa transparente
 label.tabletransbutton=Boton de la mesa transparente
 label.tabletransbutton=Boton de la mesa transparente
-label.tax=Impuesto
+label.tax=IVA
-label.taxcash=Impuestos
+label.taxcash=IVA
 label.taxcategory=Cat. de impuesto
-label.taxes=Impuestos
+label.taxes=IVA
 label.taxid=CIF/NIF
-label.taxincluded=Impuestos Incluidos al inicio
+label.taxincluded=IVA Incluido al inicio
 label.taxparent=Impuesto padre
 label.tblProdHeaderCol1=Almac\u00e9n
 label.tblProdHeaderCol2=cantidad
@@ -471,14 +465,14 @@ label.textclourtablename=Color nombre Mesa
 label.textcolourcustomer=Color texto Cliente
 label.textcolourwaiter=Color texto Camarero
 label.texttip=Mensaje texto
-label.ticketid=Ticket #
+label.ticketid=Tiquet #
 label.Tickets=Pagos
-label.Ticketsbag=Recibos
+label.Ticketsbag=Tiquets
 Label.Ticketsbag=Tiquets
 label.ticketsetupexample=Ejemplo
-label.ticketsetupnumber=Long. m\u00edn N\u00fam Ticket
+label.ticketsetupnumber=Long. m\u00edn N\u00fam Tiquet
 label.ticketsetupprefix=Prefijo N\u00fam. Recibo
-label.tickettype=Tipo de boleto
+label.tickettype=Tipo de tiquet
 label.time=Hora
 label.tktfooter1=Pie de p\u00e1gina 1
 label.tktfooter2=Pie de p\u00e1gina 2
@@ -486,7 +480,7 @@ label.tktfooter3=Pie de p\u00e1gina 3
 label.tktfooter4=Pie de p\u00e1gina 4
 label.tktfooter5=Pie de p\u00e1gina 5
 label.tktfooter6=Pie de p\u00e1gina 6
-label.totalcash=Total
+label.totalcash=Total PVP
 label.totaldiscount=Total Desc'
 label.Transactions=Transacciones
 label.type=Tipo
@@ -496,8 +490,8 @@ label.uploadingproducts=Subiendo productos... Por favor, espere
 label.URL=URL
 label.user=Usuario
 label.ValidFrom=Validez desde
-label.value=Importe
+label.value=PVP
-label.value2=Precio
+label.value2=PVP
 label.variableprice=Precio Variable
 label.visible=Visible
 label.voucherValue=Valor
@@ -672,9 +666,9 @@ Menu.Taxes=Impuestos
 Menu.ThirdParties=Proveedores
 Menu.ThirdPartiesManagement=Gesti\u00f3n de proveedores
 
-Menu.Ticket=Ventas
+Menu.Ticket=Vender
-Menu.TicketEdit=Editar ventas
+Menu.TicketEdit=Buscar tiquets
-Menu.TicketRefund=Devoluciones
+Menu.TicketRefund=Reembolsos
 Menu.TimeSeriesProduct=Series de<br><b>tiempo
 
 Menu.Tools.Resets=Resetear Aplicaciones
@@ -687,7 +681,7 @@ Menu.Update= Actulizaci\u00f3n Manual Base de Datos
 Menu.Tools.UpdatedPrices=Cambio de Precios
 
 Menu.Users=Usuarios
-Menu.UserNoSales=Boleto vac\u00edo
+Menu.UserNoSales=Tiquet vac\u00edo
 Menu.UserSells=<html>Caja por<br><b>vendedor
 Menu.UsersReport=Usuarios
 Menu.UserTip=Consejos por usuario
@@ -718,7 +712,7 @@ message.cannotloadlists=No se han podido cargar las listas de datos.
 message.cannotloadreport=No se ha podido cargar la definici\u00f3n del informe.
 message.cannotloadreportdata=No se han podido cargar los datos del informe.
 message.cannotloadresourcedata=No se han podido cargar los recursos del informe.
-message.cannotloadticket=No se ha podido cargar el recibo.
+message.cannotloadticket=No se ha podido cargar el tiquet.
 message.CannotMove=No se puede mover a otro registro.
 message.cannotprint=No se puede imprimir el recibo.
 message.cannotprintline=No se ha podido imprimir la l\u00ednea.
@@ -763,17 +757,17 @@ message.nocustomernodebt=Este recibo no est\u00e1 asignado.\nNo puede ser pagado
 message.nopaymentgateway=Pasarela de pago sin definir.
 message.noprinters=No hay impresoras instaladas en el sistema.
 message.noproduct=No existe un producto con el c\u00f3digo introducido
-message.nosaveticket=No se ha podido guardar el recibo.
+message.nosaveticket=No se ha podido guardar el tiquet.
 message.noshift=No tienes un turno anterior
 message.nosupptranx=No hay transacciones para este proveedor
 message.notactive=Ha sucedido un error al mostrar el panel.
-message.notexiststicket=El recibo no existe.
+message.notexiststicket=El tiquet no existe.
-message.noticket=El recibo ya no existe
+message.noticket=El tiquet ya no existe
 message.notpermissions=No se le permite ejecutar esta tarea
 message.noupdatescript=<html>Se ha detectado un versi\u00f3n anterior de la base de datos pero no es posible actualizar la base de datos autom\u00e1ticamente. Openbravo POS se cerrar\u00e1 ahora.
 message.novprice=<html><center><h4>Producto de precio variable!</h2><br> Introducir precio y luego seleccionar producto
 message.noweight=No se ha podido realizar la pesada
-message.nullticket=<html>No puedes crear un ticket vac\u00edo!<br>Por favor a\u00f1ade alg\u00fan art\u00edculo a esta venta
+message.nullticket=<html>No puedes crear un tiquet vac\u00edo!<br>Por favor a\u00f1ade alg\u00fan art\u00edculo a esta venta
 message.numericamount = La cantidad debe ser un numero.
 message.paymentcashneg=Haga la devoluci\u00f3n y pulse Aceptar.
 message.paymenterror=Error de transaccion de pago!
@@ -799,11 +793,11 @@ message.restartchanges=La configuraci\u00f3n se ha guardado correctamente. Los c
 message.scannerfail=Se ha producido un error al subir la lista de productos.
 message.scannerfail2=Se ha producido un error al descargar la lista de productos.
 message.scannerok=Se ha subido con \u00e9xito la lista de productos.
-message.sharedticket=<html><center><h3>Hay entradas en la pila</h3><br>Desafortunadamente no puedes verlos.
+message.sharedticket=<html><center><h3>Hay tiquets aparcados</h3><br>Desafortunadamente no puedes verlos.
-message.sharedticketlock=El billete esta bloqueado! En uso en otro terminal
+message.sharedticketlock=El tiquet esta bloqueado! En uso en otro terminal
-message.sharedticketlockoverriden=<html><center><h4>Su Vale fue excedido por alguien con permisos de usuario mas altos.<br>Cualquier cambio que haya hecho en su Vale actual puede ser reemplazado
+message.sharedticketlockoverriden=<html><center><h4>Su tiquet fue emitido por alguien con permisos de usuario mas altos.<br>Cualquier cambio que haya hecho en su tiquet actual puede ser reemplazado
-message.sharedtickets=<html><center><h3>Hay entradas en la pila!</h3>Completar o enviar a la papelera
+message.sharedtickets=<html><center><h3>Hay tiquets aparcados!</h3>Completar o enviar a la papelera
-message.sharedtickettitle=Lista de Vales compartidos
+message.sharedtickettitle=Lista de tiquets aparcados
 message.startupText=<html>Cambiar el contenido del texto de inicio predeterminado y no declarar que se trata de un software libre infringe la GNU General Public License de Free Software Foundation GPL.
 message.supplierinvalid=Proveedor no valido
 message.systemclosecas=Producto no valido
@@ -811,12 +805,12 @@ message.systemclosecash=Mover botones Cerrar Caja
 message.tableempty=<html>El Vale de esta tabla esta siendo editado por otro usuario<br>Vuelva luego.
 message.tableempty=La mesa est\u00e1 ahora vac\u00eda.
 message.tablefull=La mesa est\u00e1 ahora vac\u00eda.
-message.ticketrefunded=<html>Este Vale ya ha sido Reembolsado<br>Solo se permite un reembolso por Vale
+message.ticketrefunded=<html>Este tiquet ya ha sido Reembolsado<br>Solo se permite un reembolso por tiquet
-message.ticketrefundedtitle=Cheque de reembolso de Vales
+message.ticketrefundedtitle=Recibo de reembolso de tiquet
 message.title.checkstock= Control de inventario
 message.title.nostocklocation=Localizaciones
 message.title=Mensaje de caja registradora
-message.transfer=<html>La transferencia puede tardar mucho tiempo dependiendo del tama\u00c3\u00b1o de su base de datos<br> Estas seguro de que quieres seguir adelante?
+message.transfer=<html>La transferencia puede tardar mucho tiempo dependiendo del tama\u00f1o de su base de datos<br> Estas seguro de que quieres seguir adelante?
 message.transfercomplete=<html>La transferencia de datos esta completa<br>Los datos se indexaran ahora
 message.transfernotsupported=Tipo de Migraci\u00f3n de Base de Datos no soportada
 message.transfertitle=Transferencia de base de datos
@@ -831,12 +825,12 @@ message.wannasave=\u00bfDesea guardar los cambios antes de salir?
 messsage.title.supplierinvalid=Proveedor no valido
 
 notify.added='Agregado'
-notify.customeradd='Cliente a\u00c3\u00b1adido a este ticket'
+notify.customeradd='Cliente a\u00c3\u00b1adido a este tiquet'
-notify.customerchange='El cliente ha cambiado por este ticket'
+notify.customerchange='El cliente se ha cambiado para este tiquet'
-notify.customerremove='El cliente ha borrado por este ticket'
+notify.customerremove='El cliente se ha eliminado para este tiquet'
 notify.deleted='Borrado'
-notify.printed='Imprimido'
+notify.printed='Impreso'
-notify.printing='Imprimendo...'
+notify.printing='Imprimiendo...'
 notify.removed='Borrado'
 notify.saved='Guardado'
 
@@ -855,24 +849,24 @@ rest.label.chairs=Personas
 rest.label.customer=Cliente
 rest.label.date=Fecha
 rest.label.notes=Notas
-rest.label.selectcustomer=Selecionar Persona
+rest.label.selectcustomer=Selecionar cliente
 rest.label.showcalendar=Ver/quitar Calendario
 
 scale.invalidvalue=La balanza devolvi\u00f3 un valor err\u00f3neo.
 scale.notdefined=La balanza no est\u00e1 definida.
 
 stock.in.movement=(entrada) Traspaso
-stock.in.purchase=(entrada) compra
+stock.in.purchase=(entrada) Compra
-stock.in.refund=(entrada) devoluci\u00f3n
+stock.in.refund=(entrada) Devuelto
-stock.out.break=(salida) rotura
+stock.out.break=(salida) Rotura
-stock.out.crossing=Traspaso
+stock.out.crossing=(entrada) Otros motivos
-stock.out.free=Gratis
+stock.out.free=(salida) Regalo
-stock.out.movement=(salida) Traspaso
+stock.out.movement=No se usa
-stock.out.refund=Retornar - Suprimir
+stock.out.refund=(salida) Retornado
-stock.out.sale=(salida) venta
+stock.out.sale=(salida) Venta
-stock.out.sample=Ejemplo - Salida
+stock.out.sample=(salida) Empleados
-stock.out.subtract=Sustraer
+stock.out.subtract=(salida) Robado
-stock.out.used=Usado
+stock.out.used=(salida) Traspaso
 
 tab.bank=Banco
 tab.cash=Caja
@@ -884,9 +878,9 @@ tab.debt=A cuenta
 tab.debt=D\u00e9bito
 tab.free=Escaso
 tab.magcard=Tarjeta
-tab.paper=Boleto
+tab.paper=Tiquet
-tab.paper=Slip
+tab.paper=A cuenta
-tab.slip=Slip
+tab.slip=A cuenta
 tab.ticket=Tiquet
 tab.voucher=Vale
 
@@ -911,7 +905,7 @@ tkt.tktheader6=Cabezal 6
 
 tooltip.=Reembolsar todo
 tooltip.addnew=<html><center><h4>Adquirir Nuevo
-tooltip.addnewticket=<html><center><h4>Nuevo Tiquet
+tooltip.addnewticket=<html><center><h4>Aparcar tiquet
 tooltip.attributes=<html><center><h4>Atributos
 tooltip.barcodetype=El valor predeterminado es EAN Barcodes. Comprobar para cambiar a codigos de barras de formato UPC
 tooltip.btn.closecash=<html><center><h4>Cerrar efectivo (tambien conocido como lectura Z)<br>Cerrar transacciones hasta este momento
@@ -946,7 +940,7 @@ tooltip.fontsize=<font size=-2>peque\u00f1o</font>
 tooltip.fontsizelarge=<html><center><h4><font size=+2>Grande</font>
 tooltip.fontsizesmall=<font size=-2>peque\u00f1o</font>
 tooltip.fontsizesmall=<html><center><h4><font size=-2>Menor</font>
-tooltip.layaway=<html><center><h4>Entradas a la espera de finalizacion
+tooltip.layaway=<html><center><h4>Tiquets aparcados
 tooltip.menu=Ver/Suprimir Menu y todo el programa
 tooltip.openfile=<html><center><h4>Seleccione el archivo necesario para este control\n
 tooltip.openfile=<html><center><h4>Seleccione el archivo necesario para este control\n
@@ -955,7 +949,7 @@ tooltip.prepay=Prepago a cuenta
 tooltip.priceupdate=Permitir actualizaciones de precios en la pantalla Ventas
 
 tooltip.printto=<html><center><h4>Seleccione esta impresora predeterminada de productos
-tooltip.printtoremote=<html><center><h4>Imprimir el ticket a la impresora remota
+tooltip.printtoremote=<html><center><h4>Imprimir el tiquet a la impresora remota
 tooltip.proddate=Utilice este campo de fecha para algo como la fecha de caducidad de un producto
 tooltip.prodhtmldisplayBold=<html><center><h4>Establezca el texto del boton en Negrita
 tooltip.prodhtmldisplayBreak=<html><center><h4>Inserta un salto de linea y se borra todo<br>(una nueva linea) para el texto del boton
@@ -970,37 +964,37 @@ tooltip.product.button.tab=<html> La pesta\u00f1a Bot\u00f3n permite mejorar el
 tooltip.product.general.tab=<html>La pesta\u00f1a General contiene la informaci\u00f3n principal de los productos. Los campos que tienen un * (asterisco) DEBEN completarse y no pueden estar vac\u00edos
 tooltip.quicklogoff=<html><center><h4>Salida rapida
 tooltip.refunditem=<html><center><h4>Reembolsar un solo articulo
-tooltip.refundline=<html><center><h4>Reembolsar una linea de billetes
+tooltip.refundline=<html><center><h4>Reembolsar una linea de tiquet
 tooltip.refundticket=<html><center><h4>Reembolsar todo
-tooltip.reprint=<html><center><h4>TIQUET Reimpreso
+tooltip.reprint=<html><center><h4>TIQUET REIMPRESO
-tooltip.reprintLastTicket=<html><center><h4>Imprimir el ultimo Ticket
+tooltip.reprintLastTicket=<html><center><h4>Imprimir el \u00faltimo tiquet
-tooltip.saleattributes=<html><center><h4>Elegir atributos del productobr>Para la linea de transaccion actual
+tooltip.saleattributes=<html><center><h4>Elegir atributos del producto<br>Para la linea de transaccion actual
 tooltip.salebarcode=<html><center><h4>Haga clic para obtener coincidencia de productos<br> Codigo de barras introducido manualmente
 tooltip.salechangetax=<html><center><h4>Cambiar impuesto para la linea de transaccion actual
-tooltip.salecheckstock=<html><center><h4>Comprobar existencias para la linea de transaccion actual<br>Doble toque para obtener mas informacion
+tooltip.salecheckstock=<html><center><h4>Comprobar existencias para la linea de transaccion actual<br>Doble toque para obtener m\u00e1s informaci\u00f3n
-tooltip.saleeditline=<html><center><h4>Editar el ultimo Tiquet
+tooltip.saleeditline=<html><center><h4>Editar el ultimo tiquet
 tooltip.saleproductfind=<html><center><h4>Buscar por producto
-tooltip.saleremoveline=<html><center><h4>Borrar el actual tiquet
+tooltip.saleremoveline=<html><center><h4>Borrar l\u00ednea seleccionada
 tooltip.salesattributes=<html><center><h4>Atributos
-tooltip.salescustomer=<html><center><h4>Buscar o crear<br>Tiquet para este cliente
+tooltip.salescustomer=<html><center><h4>Seleccionar cliente<br>para este tiquet
-tooltip.salesplit=<html><center><h4>Venta de Split
+tooltip.salesplit=<html><center><h4>Repartir venta
 tooltip.salestaxswitch=<html><center><h4>Impuesto para aplicar a<br> a la linea de transaccion actual
-tooltip.salesubtotal=<html><center><h4>Total de lineas de billetes sin IVA
+tooltip.salesubtotal=<html><center><h4>Total de l\u00edneas de tiquets sin IVA
-tooltip.saletax=<html><center><h4>Impuestos totales de lineas de billetes<br>El impuesto se calcula linea por linea
+tooltip.saletax=<html><center><h4>Impuestos totales de las l\u00edneas de tiquets<br>El impuesto se calcula l\u00ednea por l\u00ednea
-tooltip.saletotal=<html><center><h4>Vale total incluyendo impuestos
+tooltip.saletotal=<html><center><h4>Total impuestos incluidos
 tooltip.save=<html><center><h4>Guardar
 tooltip.scale=<html><center><h4>Abrir en pantalla<br>como Bascula virtual
 tooltip.supplierdocument=<html><center><h4>Introduzca la entrega de un proveedor<br>Nota o factura
 tooltip.switchtax=<html><center><h4>Impuesto de cambio de un precio introducido manualmente
 tooltip.ticketedit=<html><center><h4>Editar tiquet
 tooltip.ticketrefund=<html><center><h4>Tiquet de reembolso
-tooltip.ticketreprint=<html><center><h4>Reimprimir Tiquet
+tooltip.ticketreprint=<html><center><h4>Reimprimir tiquet
-tooltip.ticketsearch=<html><center><h4>Buscar Tiquets
+tooltip.ticketsearch=<html><center><h4>Buscar tiquets
 tooltip.transferdb=<html><center><h4>Iniciar la base de datos Proceso de transferencia
 tooltip.transferdbversion=<html><center><h4>La version uniCenta oPOS de la base de datos de transferencias
 tooltip.transferfromdb=<html><center><h4>Seleccione el tipo de base de datos a transferir desde
 tooltip.transfertxtout=<html><center><h4>Lista actualizada dinamicamente de cada proceso cuando sucede<br>\nEnumera las tablas de la base de datos de transferencia
-tooltip.vouchercustomer=<html><center><h4>Buscar o Crear nuevo<br>el Cliente de este tiquet
+tooltip.vouchercustomer=<html><center><h4>Buscar o Crear nuevo<br>Cliente para este tiquet
 tooltip.xmlheader=Utilicelo para insertar el encabezado XML correcto para su uso en los scripts de extension
 tootltip.transferclass=<html><center><h4>Dejar como predeterminado a menos que<br>Se selecciona una biblioteca de controladores diferente
 tootltip.transferdbname=<html><center><h4>Esta es la URL completa de la<br>Servidor que aloja la base de datos <br>\nEl valor predeterminado es localhost. Cambie aqui si su base de datos esta alojada en un servidor remoto
@@ -1024,7 +1018,7 @@ transpayment.debtpaid=A cuenta pagados
 transpayment.free=Sin cargo
 transpayment.ccard=Tarjeta de credito
 transpayment.ccardrefund=Devoluci\u00f3n con tarjeta
-transpayment.slip=Vales
+transpayment.slip=A cuenta
 transpayment.ticket=Tiquet
 transpayment.voucher=Vale
 transpayment.voucherin=Cupon - Redimido
@@ -1037,7 +1031,7 @@ label.DbName1=DB 2 Nombre
 label.DbPort=Port
 label.DbPort1=Port 2
 label.DbURL1=DB 2 URL
-label.discount=Reembolso
+label.discount=Descuento
 label.display=Pantalla
 label.from=De
 label.ibutton=iButton
@@ -1045,7 +1039,7 @@ label.ibuttonresponsespeed=Sensibilidad
 label.imagesize=Tama\u00f1o de la imagen 250x250 p\u00edxeles o inferior para un mejor rendimiento
 label.instance=\u00fanica instancia
 label.invline=Cambiar Precio Comprar
-label.invlinestotal=L\u00edneas Total
+label.invlinestotal=Total l\u00edneas
 label.locationplace=Almac\u00e9n
 label.customer_list=Lista
 label.customer_export=Lista de exportaci\u00f3n
@@ -1064,7 +1058,7 @@ label.prodbarcodetype=Tipo de c\u00f3digo de barras
 label.prodcategorym=<html>Categor\u00eda<font color=FB00FF> *
 label.proddefaultcategory=Predeterminado Cat'
 label.prodpricebuym=<html>Precio de compra<font color=FB00FF> *
-label.prodpriceselltaxm=<html>Precio de venta inc'<font color=FB00FF> *
+label.prodpriceselltaxm=<html>PVP<font color=FB00FF> *
 label.prodrefm=<html>Referencia<font color=FB00FF> *
 label.prodtax=Impuesto
 label.rolem=<html>Role<font color=FB00FF> *
@@ -1116,8 +1110,8 @@ form.usertitle=Lista de usuarios
 migration.warning=Advertencia
 label.warranty=Garant\u00eda
 message.deletelineno=No tienes permitido hacer esto
-message.nosharedtickets=No tienes pedidos compartidas en la pila
+message.nosharedtickets=No hay tiquets aparcados
-tooltip.customerpay.prepay=Seleccione un cliente y luego ingrese el importe de pago aqu\u00ed y luego haga clic en bot\u00f3n Prepago
+tooltip.customerpay.prepay=Seleccione un cliente, ingrese el importe de pago aqu\u00ed y luego haga clic en bot\u00f3n Prepago
 tootltip.save=Guardar
 label.configOptionRestaurant=Restaurante
 button.closecashreprint=Reimprimir
@@ -1150,13 +1144,13 @@ label.autoRefreshTableMapTimerOFF=<html> La Actualizaci\u00f3n Autom\u00e1tica e
 label.autoRefreshTableMapTimerON=<html> La Actualizaci\u00f3n Autom\u00e1tica es: <b> ON </ b>
 Menu.Closing1=<html>Caja cerrado <br /> <b> Exportaci\u00f3n
 Menu.Closing2=<html>Caja cerrado <br /> <b> Exportaci\u00f3n
-message.customernotfound=<html> Cliente no encontrado. <br> \u00bfDesea crear un nuevo registro de cliente?
+message.customernotfound=<html> Cliente no encontrado. <br> \u00bfDesea crear un nuevo cliente?
 Menu.InventoryBundles=<html>Inventario <br /><b>Paquetes
 tooltip.product.properties.tab=<html> La ficha Propiedades se utiliza junto con los scripts de recursos <br>Se utiliza para agregar m\u00e1s atributos a un producto
 tooltip.product.stock.tab=<html> La pesta\u00f1a Almac\u00e9n contiene los atributos opcionales Productos
 message.customercheck=Se requiere una clave de b\u00fasqueda y un nombre.
-message.customeradd=\u00bfA\u00f1adir al cliente a este boleto?
+message.customeradd=\u00bfA\u00f1adir cliente a este tiquet?
-message.customerchangeyn=\u00bfEst\u00e1 seguro de que desea cambiar el cliente por el recibo actual?
+message.customerchangeyn=\u00bfEst\u00e1 seguro de que desea cambiar el cliente para el tiquet actual?
 message.deletelineyes=\u00bfEstas seguro que quieres borrarlo?
 message.sharedticketlockoverride=\u00bfEst\u00e1s seguro de que quieres Over-ride?
 message.customerclear=\u00bfEst\u00e1s seguro? Cancelar borrar\u00e1 al Cliente.
@@ -1183,11 +1177,14 @@ database.ScriptWarning=Error de script de base de datos
 exception.unavailabledataset=El conjunto de datos no est\u00e1 disponible
 message.email=No se ha encontrado la aplicaci\u00f3n de correo electr\u00f3nico de escritorio
 message.enterbuyprice=Introduzca el nuevo Precio de Compra
-tooltip.edit.findticket=Introduzca Recibo y toque para Buscar por n\u00famero
+tooltip.edit.findticket=Introduzca n\u00ba de tiquet y valide para Buscar por n\u00famero
 exception.unavailablefield=Campo no definido: {0}
 exception.unavailablefields=Campos no disponibles
 cboption.find=Buscar
 button.prodhtmldisplayFont=Tipo de fuente
 button.prodhtmldisplayImage=Imagen
 label.csvclear=Diario de importaci\u00f3n
-message.eolupdate=<html><center><h3>uniCenta oPOS Versi\u00f3n {0} detectada!</h3><h4>\u00a1Las actualizaciones de la versi\u00f3n est\u00e1n cambiando!</h4> Si su versi\u00f3n es 5.2 o posterior, elija <b>S\u00cd</b> para continuar.<br/><br/> Para versiones anteriores, haga clic en <b>NO</b> para abrir Opciones de configuraci\u00f3n ahora.<br/></br>Lea la Gu\u00eda de transferencia de datos de uniCenta oPOS
+message.eolupdate=<html><center><h3>uniCenta oPOS Versi\u00f3n {0} detectada!</h3><h4>\u00a1Las actualizaciones de la versi\u00f3n est\u00e1n cambiando!</h4> Si su versi\u00f3n es 4.5 o posterior, elija <b>S\u00cd</b> para continuar.<br/><br/> Para versiones anteriores, haga clic en <b>NO</b> para abrir Opciones de configuraci\u00f3n ahora.<br/></br>Lea la Gu\u00eda de transferencia de datos de uniCenta oPOS
+label.find=Buscar
+label.create=Crear
+label.cancel=Cancelar

src/main/resources/pos_messages_es_MX.properties

@@ -468,4 +468,4 @@ transpayment.ticket=Ticket
 transpayment.voucherin=Vales cobrados
 transpayment.voucherout=Vales emitidos
 Visor.Title=uniCenta oPOS
-message.eolupdate=<html><center><h3>uniCenta oPOS Versi\u00f3n {0} detectada!</h3><h4>\u00a1Las actualizaciones de la versi\u00f3n est\u00e1n cambiando!</h4> Si su versi\u00f3n es 5.2 o posterior, elija <b>S\u00cd</b> para continuar.<br/><br/> Para versiones anteriores, haga clic en <b>NO</b> para abrir Opciones de configuraci\u00f3n ahora.<br/></br>Lea la Gu\u00eda de transferencia de datos de uniCenta oPOS
+message.eolupdate=<html><center><h3>uniCenta oPOS Versi\u00f3n {0} detectada!</h3><h4>\u00a1Las actualizaciones de la versi\u00f3n est\u00e1n cambiando!</h4> Si su versi\u00f3n es 5.3 o posterior, elija <b>S\u00cd</b> para continuar.<br/><br/> Para versiones anteriores, haga clic en <b>NO</b> para abrir Opciones de configuraci\u00f3n ahora.<br/></br>Lea la Gu\u00eda de transferencia de datos de uniCenta oPOS

src/main/resources/pos_messages_nl.properties

@@ -911,7 +911,7 @@ message.transfermessage=Database overdracht
 message.transfernotsupported=Database overdrachtstype wordt niet ondersteund
 message.transfertitle=Database overdracht
 message.updatedatabase=<html><center><h3>uniCenta oPOS Version {0} database gedetecteerd!</h3> De database wordt automatisch geüpgraded.<br>GEGEVENS KUNNEN VERLOREN GAAN. MAAK EERST EEN BACKUP.<br><br>Wilt u doorgaan?
-message.eolupdate=<html><center><h3>uniCenta oPOS Version {0} gedetecteerd!</h3><h4>Versie-upgrades veranderen!</h4>Als je versie 5.2 of hoger is kies<b>YES</b>om door te gaan<br/><br/>Voor oudere versies kies<b>NO</b> Om nu de configuratie opties te openen!<br>Lees alstublieft de uniCenta oPOS Data Transfer Guide<br/><br/>
+message.eolupdate=<html><center><h3>uniCenta oPOS Version {0} gedetecteerd!</h3><h4>Versie-upgrades veranderen!</h4>Als je versie 5.3 of hoger is kies<b>YES</b>om door te gaan<br/><br/>Voor oudere versies kies<b>NO</b> Om nu de configuratie opties te openen!<br>Lees alstublieft de uniCenta oPOS Data Transfer Guide<br/><br/>
 message.URL=<html>Een webpagina laten zien in het hoofdscherm . vereist de volledige URL<br />Voor een lokaal bestand begin met - <b>file://</b><br/>Voor een extern bestand gebruik <b>http://</b><br/> 
 message.uuidcopy=<html><center><h4>UUID is gekopieerd naar het klembord
 message.vipno=Klant is geen VIP

src/test/java/com/unicenta/pos/util/QRCodeTest.java

@@ -0,0 +1,73 @@
+package com.unicenta.pos.util;
+
+import com.google.zxing.BarcodeFormat;
+import com.google.zxing.client.j2se.MatrixToImageWriter;
+import com.google.zxing.common.BitMatrix;
+import com.google.zxing.qrcode.QRCodeWriter;
+import org.junit.jupiter.api.Test;
+
+import javax.imageio.ImageIO;
+import java.awt.image.BufferedImage;
+import java.io.File;
+import java.nio.charset.StandardCharsets;
+import java.util.Base64;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+class QRCodeTest {
+
+    @Test
+    void shouldPrintQRCode() throws Exception {
+        // Name
+        QRObject name = new QRObject(1,  "Hugh Stevenson");
+        byte nameTagByte = (byte) name.getTag();
+        byte nameLengthByte = (byte) name.getLength();
+        byte[] nameBytes = {nameTagByte, nameLengthByte};
+        String nameString = new String(nameBytes, StandardCharsets.UTF_8)+name.getValue();
+
+        //vat number
+        QRObject vat = new QRObject(2, "1234567890");
+        byte vatTagByte = (byte) vat.getTag();
+        byte vatLengthByte = (byte) vat.getLength();
+        byte[] vatBytes = {vatTagByte, vatLengthByte};
+        String vatString = new String(vatBytes, StandardCharsets.UTF_8)+vat.getValue();
+
+        // date
+        QRObject date = new QRObject(3, "2021-11-28 09:30:00");
+        byte dateTagByte = (byte) date.getTag();
+        byte dateLengthByte = (byte) date.getLength();
+        byte[] dateBytes = {dateTagByte, dateLengthByte};
+        String dateString = new String(dateBytes, StandardCharsets.UTF_8)+date.getValue();
+
+        // amount
+        QRObject amount = new QRObject(4, "1000.00");
+        byte amountTagByte = (byte) amount.getTag();
+        byte amountLengthByte = (byte) amount.getLength();
+        byte[] amountBytes = {amountTagByte, amountLengthByte};
+        String amountString = new String(amountBytes, StandardCharsets.UTF_8)+amount.getValue();
+
+
+        // Vat amount
+        QRObject vatAmount = new QRObject(5, "150.00");
+        byte vatAmountTag = (byte) vatAmount.getTag();
+        byte vatAmountLengthByte = (byte) vatAmount.getLength();
+        byte[] vatAmountBytes = {vatAmountTag, vatAmountLengthByte};
+        String vatAmountString = new String(vatAmountBytes, StandardCharsets.UTF_8)+vatAmount.getValue();
+
+
+        //barcode
+        String barCodeString = nameString+vatString+dateString+amountString+vatAmountString;
+        String encodedBarcode = Base64.getEncoder().encodeToString(barCodeString.getBytes(StandardCharsets.UTF_8));
+
+        assert encodedBarcode != null;
+
+        QRCodeWriter barcodeWriter = new QRCodeWriter();
+        BitMatrix bitMatrix = barcodeWriter.encode(encodedBarcode, BarcodeFormat.QR_CODE, 200, 200);
+
+        BufferedImage bufferedImage = MatrixToImageWriter.toBufferedImage(bitMatrix);
+
+        File outputfile = new File("test.jpg");
+        assert  ImageIO.write(bufferedImage, "jpg", outputfile);
+
+    }
+}