ignoring test

.gitignore

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

.mvn/wrapper/MavenWrapperDownloader.java

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

.mvn/wrapper/maven-wrapper.properties

@@ -1,2 +0,0 @@
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.3/apache-maven-3.6.3-bin.zip
-wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar

mvnw

@@ -1,310 +0,0 @@
-#!/bin/sh
-# ----------------------------------------------------------------------------
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-# ----------------------------------------------------------------------------
-
-# ----------------------------------------------------------------------------
-# Maven Start Up Batch script
-#
-# Required ENV vars:
-# ------------------
-#   JAVA_HOME - location of a JDK home dir
-#
-# Optional ENV vars
-# -----------------
-#   M2_HOME - location of maven2's installed home dir
-#   MAVEN_OPTS - parameters passed to the Java VM when running Maven
-#     e.g. to debug Maven itself, use
-#       set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
-#   MAVEN_SKIP_RC - flag to disable loading of mavenrc files
-# ----------------------------------------------------------------------------
-
-if [ -z "$MAVEN_SKIP_RC" ] ; then
-
-  if [ -f /etc/mavenrc ] ; then
-    . /etc/mavenrc
-  fi
-
-  if [ -f "$HOME/.mavenrc" ] ; then
-    . "$HOME/.mavenrc"
-  fi
-
-fi
-
-# OS specific support.  $var _must_ be set to either true or false.
-cygwin=false;
-darwin=false;
-mingw=false
-case "`uname`" in
-  CYGWIN*) cygwin=true ;;
-  MINGW*) mingw=true;;
-  Darwin*) darwin=true
-    # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home
-    # See https://developer.apple.com/library/mac/qa/qa1170/_index.html
-    if [ -z "$JAVA_HOME" ]; then
-      if [ -x "/usr/libexec/java_home" ]; then
-        export JAVA_HOME="`/usr/libexec/java_home`"
-      else
-        export JAVA_HOME="/Library/Java/Home"
-      fi
-    fi
-    ;;
-esac
-
-if [ -z "$JAVA_HOME" ] ; then
-  if [ -r /etc/gentoo-release ] ; then
-    JAVA_HOME=`java-config --jre-home`
-  fi
-fi
-
-if [ -z "$M2_HOME" ] ; then
-  ## resolve links - $0 may be a link to maven's home
-  PRG="$0"
-
-  # need this for relative symlinks
-  while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-      PRG="$link"
-    else
-      PRG="`dirname "$PRG"`/$link"
-    fi
-  done
-
-  saveddir=`pwd`
-
-  M2_HOME=`dirname "$PRG"`/..
-
-  # make it fully qualified
-  M2_HOME=`cd "$M2_HOME" && pwd`
-
-  cd "$saveddir"
-  # echo Using m2 at $M2_HOME
-fi
-
-# For Cygwin, ensure paths are in UNIX format before anything is touched
-if $cygwin ; then
-  [ -n "$M2_HOME" ] &&
-    M2_HOME=`cygpath --unix "$M2_HOME"`
-  [ -n "$JAVA_HOME" ] &&
-    JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
-  [ -n "$CLASSPATH" ] &&
-    CLASSPATH=`cygpath --path --unix "$CLASSPATH"`
-fi
-
-# For Mingw, ensure paths are in UNIX format before anything is touched
-if $mingw ; then
-  [ -n "$M2_HOME" ] &&
-    M2_HOME="`(cd "$M2_HOME"; pwd)`"
-  [ -n "$JAVA_HOME" ] &&
-    JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`"
-fi
-
-if [ -z "$JAVA_HOME" ]; then
-  javaExecutable="`which javac`"
-  if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then
-    # readlink(1) is not available as standard on Solaris 10.
-    readLink=`which readlink`
-    if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then
-      if $darwin ; then
-        javaHome="`dirname \"$javaExecutable\"`"
-        javaExecutable="`cd \"$javaHome\" && pwd -P`/javac"
-      else
-        javaExecutable="`readlink -f \"$javaExecutable\"`"
-      fi
-      javaHome="`dirname \"$javaExecutable\"`"
-      javaHome=`expr "$javaHome" : '\(.*\)/bin'`
-      JAVA_HOME="$javaHome"
-      export JAVA_HOME
-    fi
-  fi
-fi
-
-if [ -z "$JAVACMD" ] ; then
-  if [ -n "$JAVA_HOME"  ] ; then
-    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
-      # IBM's JDK on AIX uses strange locations for the executables
-      JAVACMD="$JAVA_HOME/jre/sh/java"
-    else
-      JAVACMD="$JAVA_HOME/bin/java"
-    fi
-  else
-    JAVACMD="`which java`"
-  fi
-fi
-
-if [ ! -x "$JAVACMD" ] ; then
-  echo "Error: JAVA_HOME is not defined correctly." >&2
-  echo "  We cannot execute $JAVACMD" >&2
-  exit 1
-fi
-
-if [ -z "$JAVA_HOME" ] ; then
-  echo "Warning: JAVA_HOME environment variable is not set."
-fi
-
-CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher
-
-# traverses directory structure from process work directory to filesystem root
-# first directory with .mvn subdirectory is considered project base directory
-find_maven_basedir() {
-
-  if [ -z "$1" ]
-  then
-    echo "Path not specified to find_maven_basedir"
-    return 1
-  fi
-
-  basedir="$1"
-  wdir="$1"
-  while [ "$wdir" != '/' ] ; do
-    if [ -d "$wdir"/.mvn ] ; then
-      basedir=$wdir
-      break
-    fi
-    # workaround for JBEAP-8937 (on Solaris 10/Sparc)
-    if [ -d "${wdir}" ]; then
-      wdir=`cd "$wdir/.."; pwd`
-    fi
-    # end of workaround
-  done
-  echo "${basedir}"
-}
-
-# concatenates all lines of a file
-concat_lines() {
-  if [ -f "$1" ]; then
-    echo "$(tr -s '\n' ' ' < "$1")"
-  fi
-}
-
-BASE_DIR=`find_maven_basedir "$(pwd)"`
-if [ -z "$BASE_DIR" ]; then
-  exit 1;
-fi
-
-##########################################################################################
-# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
-# This allows using the maven wrapper in projects that prohibit checking in binary data.
-##########################################################################################
-if [ -r "$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" ]; then
-    if [ "$MVNW_VERBOSE" = true ]; then
-      echo "Found .mvn/wrapper/maven-wrapper.jar"
-    fi
-else
-    if [ "$MVNW_VERBOSE" = true ]; then
-      echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..."
-    fi
-    if [ -n "$MVNW_REPOURL" ]; then
-      jarUrl="$MVNW_REPOURL/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
-    else
-      jarUrl="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
-    fi
-    while IFS="=" read key value; do
-      case "$key" in (wrapperUrl) jarUrl="$value"; break ;;
-      esac
-    done < "$BASE_DIR/.mvn/wrapper/maven-wrapper.properties"
-    if [ "$MVNW_VERBOSE" = true ]; then
-      echo "Downloading from: $jarUrl"
-    fi
-    wrapperJarPath="$BASE_DIR/.mvn/wrapper/maven-wrapper.jar"
-    if $cygwin; then
-      wrapperJarPath=`cygpath --path --windows "$wrapperJarPath"`
-    fi
-
-    if command -v wget > /dev/null; then
-        if [ "$MVNW_VERBOSE" = true ]; then
-          echo "Found wget ... using wget"
-        fi
-        if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then
-            wget "$jarUrl" -O "$wrapperJarPath"
-        else
-            wget --http-user=$MVNW_USERNAME --http-password=$MVNW_PASSWORD "$jarUrl" -O "$wrapperJarPath"
-        fi
-    elif command -v curl > /dev/null; then
-        if [ "$MVNW_VERBOSE" = true ]; then
-          echo "Found curl ... using curl"
-        fi
-        if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then
-            curl -o "$wrapperJarPath" "$jarUrl" -f
-        else
-            curl --user $MVNW_USERNAME:$MVNW_PASSWORD -o "$wrapperJarPath" "$jarUrl" -f
-        fi
-
-    else
-        if [ "$MVNW_VERBOSE" = true ]; then
-          echo "Falling back to using Java to download"
-        fi
-        javaClass="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.java"
-        # For Cygwin, switch paths to Windows format before running javac
-        if $cygwin; then
-          javaClass=`cygpath --path --windows "$javaClass"`
-        fi
-        if [ -e "$javaClass" ]; then
-            if [ ! -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then
-                if [ "$MVNW_VERBOSE" = true ]; then
-                  echo " - Compiling MavenWrapperDownloader.java ..."
-                fi
-                # Compiling the Java class
-                ("$JAVA_HOME/bin/javac" "$javaClass")
-            fi
-            if [ -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then
-                # Running the downloader
-                if [ "$MVNW_VERBOSE" = true ]; then
-                  echo " - Running MavenWrapperDownloader.java ..."
-                fi
-                ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$MAVEN_PROJECTBASEDIR")
-            fi
-        fi
-    fi
-fi
-##########################################################################################
-# End of extension
-##########################################################################################
-
-export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"}
-if [ "$MVNW_VERBOSE" = true ]; then
-  echo $MAVEN_PROJECTBASEDIR
-fi
-MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS"
-
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin; then
-  [ -n "$M2_HOME" ] &&
-    M2_HOME=`cygpath --path --windows "$M2_HOME"`
-  [ -n "$JAVA_HOME" ] &&
-    JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
-  [ -n "$CLASSPATH" ] &&
-    CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
-  [ -n "$MAVEN_PROJECTBASEDIR" ] &&
-    MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"`
-fi
-
-# Provide a "standardized" way to retrieve the CLI args that will
-# work with both Windows and non-Windows executions.
-MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $@"
-export MAVEN_CMD_LINE_ARGS
-
-WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
-
-exec "$JAVACMD" \
-  $MAVEN_OPTS \
-  -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \
-  "-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \
-  ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@"

mvnw.cmd

@@ -1,182 +0,0 @@
-@REM ----------------------------------------------------------------------------
-@REM Licensed to the Apache Software Foundation (ASF) under one
-@REM or more contributor license agreements.  See the NOTICE file
-@REM distributed with this work for additional information
-@REM regarding copyright ownership.  The ASF licenses this file
-@REM to you under the Apache License, Version 2.0 (the
-@REM "License"); you may not use this file except in compliance
-@REM with the License.  You may obtain a copy of the License at
-@REM
-@REM    http://www.apache.org/licenses/LICENSE-2.0
-@REM
-@REM Unless required by applicable law or agreed to in writing,
-@REM software distributed under the License is distributed on an
-@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-@REM KIND, either express or implied.  See the License for the
-@REM specific language governing permissions and limitations
-@REM under the License.
-@REM ----------------------------------------------------------------------------
-
-@REM ----------------------------------------------------------------------------
-@REM Maven Start Up Batch script
-@REM
-@REM Required ENV vars:
-@REM JAVA_HOME - location of a JDK home dir
-@REM
-@REM Optional ENV vars
-@REM M2_HOME - location of maven2's installed home dir
-@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands
-@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a keystroke before ending
-@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven
-@REM     e.g. to debug Maven itself, use
-@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
-@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files
-@REM ----------------------------------------------------------------------------
-
-@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on'
-@echo off
-@REM set title of command window
-title %0
-@REM enable echoing by setting MAVEN_BATCH_ECHO to 'on'
-@if "%MAVEN_BATCH_ECHO%" == "on"  echo %MAVEN_BATCH_ECHO%
-
-@REM set %HOME% to equivalent of $HOME
-if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%")
-
-@REM Execute a user defined script before this one
-if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre
-@REM check for pre script, once with legacy .bat ending and once with .cmd ending
-if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat"
-if exist "%HOME%\mavenrc_pre.cmd" call "%HOME%\mavenrc_pre.cmd"
-:skipRcPre
-
-@setlocal
-
-set ERROR_CODE=0
-
-@REM To isolate internal variables from possible post scripts, we use another setlocal
-@setlocal
-
-@REM ==== START VALIDATION ====
-if not "%JAVA_HOME%" == "" goto OkJHome
-
-echo.
-echo Error: JAVA_HOME not found in your environment. >&2
-echo Please set the JAVA_HOME variable in your environment to match the >&2
-echo location of your Java installation. >&2
-echo.
-goto error
-
-:OkJHome
-if exist "%JAVA_HOME%\bin\java.exe" goto init
-
-echo.
-echo Error: JAVA_HOME is set to an invalid directory. >&2
-echo JAVA_HOME = "%JAVA_HOME%" >&2
-echo Please set the JAVA_HOME variable in your environment to match the >&2
-echo location of your Java installation. >&2
-echo.
-goto error
-
-@REM ==== END VALIDATION ====
-
-:init
-
-@REM Find the project base dir, i.e. the directory that contains the folder ".mvn".
-@REM Fallback to current working directory if not found.
-
-set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR%
-IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir
-
-set EXEC_DIR=%CD%
-set WDIR=%EXEC_DIR%
-:findBaseDir
-IF EXIST "%WDIR%"\.mvn goto baseDirFound
-cd ..
-IF "%WDIR%"=="%CD%" goto baseDirNotFound
-set WDIR=%CD%
-goto findBaseDir
-
-:baseDirFound
-set MAVEN_PROJECTBASEDIR=%WDIR%
-cd "%EXEC_DIR%"
-goto endDetectBaseDir
-
-:baseDirNotFound
-set MAVEN_PROJECTBASEDIR=%EXEC_DIR%
-cd "%EXEC_DIR%"
-
-:endDetectBaseDir
-
-IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig
-
-@setlocal EnableExtensions EnableDelayedExpansion
-for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a
-@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS%
-
-:endReadAdditionalConfig
-
-SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe"
-set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar"
-set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
-
-set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
-
-FOR /F "tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO (
-    IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B
-)
-
-@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
-@REM This allows using the maven wrapper in projects that prohibit checking in binary data.
-if exist %WRAPPER_JAR% (
-    if "%MVNW_VERBOSE%" == "true" (
-        echo Found %WRAPPER_JAR%
-    )
-) else (
-    if not "%MVNW_REPOURL%" == "" (
-        SET DOWNLOAD_URL="%MVNW_REPOURL%/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
-    )
-    if "%MVNW_VERBOSE%" == "true" (
-        echo Couldn't find %WRAPPER_JAR%, downloading it ...
-        echo Downloading from: %DOWNLOAD_URL%
-    )
-
-    powershell -Command "&{"^
-		"$webclient = new-object System.Net.WebClient;"^
-		"if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^
-		"$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^
-		"}"^
-		"[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%DOWNLOAD_URL%', '%WRAPPER_JAR%')"^
-		"}"
-    if "%MVNW_VERBOSE%" == "true" (
-        echo Finished downloading %WRAPPER_JAR%
-    )
-)
-@REM End of extension
-
-@REM Provide a "standardized" way to retrieve the CLI args that will
-@REM work with both Windows and non-Windows executions.
-set MAVEN_CMD_LINE_ARGS=%*
-
-%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %*
-if ERRORLEVEL 1 goto error
-goto end
-
-:error
-set ERROR_CODE=1
-
-:end
-@endlocal & set ERROR_CODE=%ERROR_CODE%
-
-if not "%MAVEN_SKIP_RC%" == "" goto skipRcPost
-@REM check for post script, once with legacy .bat ending and once with .cmd ending
-if exist "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat"
-if exist "%HOME%\mavenrc_post.cmd" call "%HOME%\mavenrc_post.cmd"
-:skipRcPost
-
-@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on'
-if "%MAVEN_BATCH_PAUSE%" == "on" pause
-
-if "%MAVEN_TERMINATE_CMD%" == "on" exit %ERROR_CODE%
-
-exit /B %ERROR_CODE%

pom.xml

@@ -4,13 +4,13 @@
 
   <groupId>com.unicenta</groupId>
   <artifactId>unicentaopos</artifactId>
-  <version>5.4.0</version>
+  <version>5.3.2</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>
+    <derby.version>10.15.2.0</derby.version>
   </properties>
   <dependencies>
     <dependency>
@@ -111,6 +111,24 @@
       <artifactId>itext</artifactId>
       <version>2.1.7</version>
     </dependency>
+
+    <dependency>
+      <groupId>net.sf.jasperreports</groupId>
+      <artifactId>jasperreports</artifactId>
+      <version>6.15.0</version>
+      <exclusions>
+        <exclusion>
+          <groupId>com.lowagie</groupId>
+          <artifactId>itext</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>net.sf.jasperreports</groupId>
+      <artifactId>jasperreports-fonts</artifactId>
+      <version>6.15.0</version>
+    </dependency>
+
     <dependency>
       <groupId>org.apache.poi</groupId>
       <artifactId>poi</artifactId>
@@ -122,6 +140,13 @@
       <artifactId>poi-ooxml</artifactId>
       <version>3.17</version>
     </dependency>
+
+    <dependency>
+      <groupId>org.apache.xmlbeans</groupId>
+      <artifactId>xmlbeans</artifactId>
+      <version>5.1.1</version>
+    </dependency>
+
     <dependency>
       <groupId>net.sf.barcode4j</groupId>
       <artifactId>barcode4j</artifactId>
@@ -255,11 +280,11 @@
       <artifactId>derbytools</artifactId>
       <version>${derby.version}</version>
     </dependency>
-<!--    <dependency>-->
-<!--      <groupId>org.apache.derby</groupId>-->
-<!--      <artifactId>derbyshared</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>
@@ -272,22 +297,7 @@
       <artifactId>fop</artifactId>
       <version>2.3</version>
     </dependency>
-    <dependency>
-      <groupId>net.sf.jasperreports</groupId>
-      <artifactId>jasperreports</artifactId>
-      <version>6.12.2</version>
-      <exclusions>
-        <exclusion>
-          <groupId>com.lowagie</groupId>
-          <artifactId>itext</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>net.sf.jasperreports</groupId>
-      <artifactId>jasperreports-fonts</artifactId>
-      <version>6.0.0</version>
-    </dependency>
+
     <dependency>
       <groupId>ar.com.fdvs</groupId>
       <artifactId>DynamicJasper-core-fonts</artifactId>
@@ -361,7 +371,7 @@
     <dependency>
       <groupId>com.unicenta</groupId>
       <artifactId>unicenta-plugins</artifactId>
-      <version>1.3.1</version>
+      <version>1.2.7</version>
     </dependency>
     <dependency>
       <groupId>com.gluonhq</groupId>

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

@@ -19,10 +19,93 @@
     <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="nameLabel">
+    <Component class="javax.swing.JLabel" name="jLabel1">
       <Properties>
         <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
           <Font name="Arial" size="14" style="0"/>
@@ -38,10 +121,10 @@
         </Property>
       </Properties>
       <Events>
-        <EventHandler event="mouseClicked" listener="java.awt.event.MouseListener" parameters="java.awt.event.MouseEvent" handler="nameLabelMouseClicked"/>
+        <EventHandler event="mouseClicked" listener="java.awt.event.MouseListener" parameters="java.awt.event.MouseEvent" handler="jLabel1MouseClicked"/>
       </Events>
     </Component>
-    <Component class="javax.swing.JTextField" name="nameTextField">
+    <Component class="javax.swing.JTextField" name="m_jName">
       <Properties>
         <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
           <Font name="Arial" size="14" style="0"/>
@@ -51,7 +134,7 @@
         </Property>
       </Properties>
     </Component>
-    <Component class="javax.swing.JCheckBox" name="isVisible">
+    <Component class="javax.swing.JCheckBox" name="m_jVisible">
       <Properties>
         <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
           <Font name="Arial" size="12" style="0"/>
@@ -61,7 +144,7 @@
         </Property>
       </Properties>
     </Component>
-    <Component class="javax.swing.JLabel" name="visiableLabel">
+    <Component class="javax.swing.JLabel" name="jLabel3">
       <Properties>
         <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
           <Font name="Arial" size="14" style="0"/>
@@ -74,7 +157,7 @@
         </Property>
       </Properties>
     </Component>
-    <Component class="javax.swing.JLabel" name="imageLabel">
+    <Component class="javax.swing.JLabel" name="jLabel4">
       <Properties>
         <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
           <Font name="Arial" size="14" style="0"/>
@@ -87,7 +170,7 @@
         </Property>
       </Properties>
     </Component>
-    <Component class="com.unicenta.data.gui.JImageEditor" name="imageEditor">
+    <Component class="com.unicenta.data.gui.JImageEditor" name="m_jImage">
       <Properties>
         <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
           <Font name="Arial" size="12" style="0"/>
@@ -127,7 +210,7 @@
         </Property>
       </Properties>
     </Component>
-    <Component class="javax.swing.JLabel" name="roleLabel">
+    <Component class="javax.swing.JLabel" name="jLabel2">
       <Properties>
         <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
           <Font name="Arial" size="14" style="0"/>
@@ -140,7 +223,7 @@
         </Property>
       </Properties>
     </Component>
-    <Component class="javax.swing.JTextField" name="cardIdTextField">
+    <Component class="javax.swing.JTextField" name="m_jcard">
       <Properties>
         <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
           <Font name="Arial" size="14" style="0"/>
@@ -150,7 +233,7 @@
         </Property>
       </Properties>
     </Component>
-    <Component class="javax.swing.JLabel" name="cardIdLabel">
+    <Component class="javax.swing.JLabel" name="jLblCardID">
       <Properties>
         <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
           <Font name="Arial" size="14" style="0"/>
@@ -163,7 +246,33 @@
         </Property>
       </Properties>
     </Component>
-    <Component class="javax.swing.JLabel" name="passwordLabel">
+    <Component class="com.alee.laf.combobox.WebComboBox" name="webCBSecurity">
+      <Properties>
+        <Property name="model" type="javax.swing.ComboBoxModel" editor="org.netbeans.modules.form.editors2.ComboBoxModelEditor">
+          <StringArray count="3">
+            <StringItem index="0" value="Generate new key"/>
+            <StringItem index="1" value="Delete exisitng key"/>
+            <StringItem index="2" value="Use iButton ID"/>
+          </StringArray>
+        </Property>
+        <Property name="selectedIndex" type="int" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
+          <Connection code="0" type="code"/>
+        </Property>
+        <Property name="toolTipText" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+          <ResourceString bundle="pos_messages.properties" key="tooltip.peoplesecurity" replaceFormat="AppLocal.getIntString(&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"/>
@@ -176,12 +285,5 @@
         </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,12 +52,9 @@ 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();
@@ -67,11 +64,11 @@ public class PeopleView extends JPanel implements EditorRecord {
         m_RoleModel = new ComboBoxValModel();
         
         m_Dirty = dirty;
-    nameTextField.getDocument().addDocumentListener(dirty);
+        m_jName.getDocument().addDocumentListener(dirty);
         m_jRole.addActionListener(dirty);
-    isVisible.addActionListener(dirty);
-    imageEditor.addPropertyChangeListener("image", dirty);
-    cardIdTextField.getDocument().addDocumentListener(dirty);
+        m_jVisible.addActionListener(dirty);
+        m_jImage.addPropertyChangeListener("image", dirty);
+        m_jcard.getDocument().addDocumentListener(dirty);
 
         m_ReasonModel = new ComboBoxValModel();
         m_ReasonModel.add(AppLocal.getIntString("cboption.generate"));
@@ -89,17 +86,17 @@ public class PeopleView extends JPanel implements EditorRecord {
     @Override
     public void writeValueEOF() {
         m_oId = null;
-    nameTextField.setText(null);
+        m_jName.setText(null);
         m_sPassword = null;
         m_RoleModel.setSelectedKey(null);
-    isVisible.setSelected(false);
-    cardIdTextField.setText(null);
-    imageEditor.setImage(null);
-    nameTextField.setEnabled(false);
+        m_jVisible.setSelected(false);
+        m_jcard.setText(null);
+        m_jImage.setImage(null);
+        m_jName.setEnabled(false);
         m_jRole.setEnabled(false);
-    isVisible.setEnabled(false);
-    cardIdTextField.setEnabled(false);
-    imageEditor.setEnabled(false);
+        m_jVisible.setEnabled(false);
+        m_jcard.setEnabled(false);
+        m_jImage.setEnabled(false);
         jButton1.setEnabled(false);
         webCBSecurity.setEnabled(false);
     }
@@ -110,17 +107,17 @@ public class PeopleView extends JPanel implements EditorRecord {
     @Override
     public void writeValueInsert() {
         m_oId = null;
-    nameTextField.setText(null);
+        m_jName.setText(null);
         m_sPassword = null;
         m_RoleModel.setSelectedKey(null);
-    isVisible.setSelected(true);
-    cardIdTextField.setText(null);
-    imageEditor.setImage(null);
-    nameTextField.setEnabled(true);
+        m_jVisible.setSelected(true);
+        m_jcard.setText(null);
+        m_jImage.setImage(null);
+        m_jName.setEnabled(true);
         m_jRole.setEnabled(true);
-    isVisible.setEnabled(true);
-    cardIdTextField.setEnabled(true);
-    imageEditor.setEnabled(true);
+        m_jVisible.setEnabled(true);
+        m_jcard.setEnabled(true);
+        m_jImage.setEnabled(true);
         jButton1.setEnabled(true);
         webCBSecurity.setEnabled(true);        
     }
@@ -133,18 +130,18 @@ public class PeopleView extends JPanel implements EditorRecord {
     public void writeValueDelete(Object value) {
         Object[] people = (Object[]) value;
         m_oId = people[0];
-    nameTextField.setText(Formats.STRING.formatValue(people[1]));
+        m_jName.setText(Formats.STRING.formatValue(people[1]));
         m_sPassword = Formats.STRING.formatValue(people[2]);
         m_RoleModel.setSelectedKey(people[3]);
-    isVisible.setSelected(((Boolean) people[4]).booleanValue());
-    cardIdTextField.setText(Formats.STRING.formatValue(people[5]));
-    imageEditor.setImage((BufferedImage) people[6]);
+        m_jVisible.setSelected(((Boolean) people[4]).booleanValue());
+        m_jcard.setText(Formats.STRING.formatValue(people[5]));
+        m_jImage.setImage((BufferedImage) people[6]);
         
-    nameTextField.setEnabled(false);
+        m_jName.setEnabled(false);
         m_jRole.setEnabled(false);
-    isVisible.setEnabled(false);
-    cardIdTextField.setEnabled(false);
-    imageEditor.setEnabled(false);
+        m_jVisible.setEnabled(false);
+        m_jcard.setEnabled(false);
+        m_jImage.setEnabled(false);        
         jButton1.setEnabled(false);
         webCBSecurity.setEnabled(false);        
     }
@@ -157,25 +154,25 @@ public class PeopleView extends JPanel implements EditorRecord {
     public void writeValueEdit(Object value) {
         Object[] people = (Object[]) value;
         m_oId = people[0];
-    nameTextField.setText(Formats.STRING.formatValue(people[1]));
+        m_jName.setText(Formats.STRING.formatValue(people[1]));
         m_sPassword = Formats.STRING.formatValue(people[2]);
         m_RoleModel.setSelectedKey(people[3]);
-    isVisible.setSelected(((Boolean) people[4]).booleanValue());
-    cardIdTextField.setText(Formats.STRING.formatValue(people[5]));
-    imageEditor.setImage((BufferedImage) people[6]);
+        m_jVisible.setSelected(((Boolean) people[4]).booleanValue());
+        m_jcard.setText(Formats.STRING.formatValue(people[5]));
+        m_jImage.setImage((BufferedImage) people[6]);
         
-    if (cardIdTextField.getText().length() == 16) {
-      cardIdLabel.setText(AppLocal.getIntString("label.ibutton"));
+        if (m_jcard.getText().length() == 16) {
+            jLblCardID.setText(AppLocal.getIntString("label.ibutton"));
         } else {
-      cardIdLabel.setText(AppLocal.getIntString("label.card"));
+            jLblCardID.setText(AppLocal.getIntString("label.card"));            
         }
-    System.out.println(cardIdTextField.getText().length());
+        System.out.println(m_jcard.getText().length());        
         
-    nameTextField.setEnabled(true);
+        m_jName.setEnabled(true);
         m_jRole.setEnabled(true);
-    isVisible.setEnabled(true);
-    cardIdTextField.setEnabled(true);
-    imageEditor.setEnabled(true);
+        m_jVisible.setEnabled(true);
+        m_jcard.setEnabled(true);
+        m_jImage.setEnabled(true);
         jButton1.setEnabled(true);
         webCBSecurity.setEnabled(true);        
     }
@@ -189,12 +186,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(nameTextField.getText());
+        people[1] = Formats.STRING.parseValue(m_jName.getText());
         people[2] = Formats.STRING.parseValue(m_sPassword);
         people[3] = m_RoleModel.getSelectedKey();
-    people[4] = isVisible.isSelected();
-    people[5] = Formats.STRING.parseValue(cardIdTextField.getText());
-    people[6] = imageEditor.getImage();
+        people[4] = m_jVisible.isSelected();
+        people[5] = Formats.STRING.parseValue(m_jcard.getText());
+        people[6] = m_jImage.getImage();
         return people;
     }
 
@@ -217,6 +214,7 @@ public class PeopleView extends JPanel implements EditorRecord {
         m_jRole.setModel(m_RoleModel);
     }
     
+   
     /**
      *
      */
@@ -224,66 +222,57 @@ 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() {
 
-    nameLabel = new javax.swing.JLabel();
-    nameTextField = new javax.swing.JTextField();
-    isVisible = new javax.swing.JCheckBox();
-    visiableLabel = new javax.swing.JLabel();
-    imageLabel = new javax.swing.JLabel();
-    imageEditor = new com.unicenta.data.gui.JImageEditor();
+        jLabel1 = new javax.swing.JLabel();
+        m_jName = new javax.swing.JTextField();
+        m_jVisible = new javax.swing.JCheckBox();
+        jLabel3 = new javax.swing.JLabel();
+        jLabel4 = new javax.swing.JLabel();
+        m_jImage = new com.unicenta.data.gui.JImageEditor();
         jButton1 = new javax.swing.JButton();
         m_jRole = new javax.swing.JComboBox();
-    roleLabel = new javax.swing.JLabel();
-    cardIdTextField = new javax.swing.JTextField();
-    cardIdLabel = new javax.swing.JLabel();
-    passwordLabel = new javax.swing.JLabel();
-    taxIdLabel = new javax.swing.JLabel();
-    taxIdTextField = new javax.swing.JTextField();
+        jLabel2 = new javax.swing.JLabel();
+        m_jcard = new javax.swing.JTextField();
+        jLblCardID = new javax.swing.JLabel();
+        webCBSecurity = new com.alee.laf.combobox.WebComboBox();
+        jLabel6 = new javax.swing.JLabel();
 
         setFont(new java.awt.Font("Arial", 0, 12)); // NOI18N
         setPreferredSize(new java.awt.Dimension(500, 500));
 
-    nameLabel.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
-    nameLabel.setIcon(new javax.swing.ImageIcon(getClass().getResource("/com/unicenta/images/info.png"))); // NOI18N
-    nameLabel.setText(AppLocal.getIntString("label.peoplenamem")); // NOI18N
-    nameLabel.setPreferredSize(new java.awt.Dimension(110, 30));
-    nameLabel.addMouseListener(new java.awt.event.MouseAdapter() {
+        jLabel1.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
+        jLabel1.setIcon(new javax.swing.ImageIcon(getClass().getResource("/com/unicenta/images/info.png"))); // NOI18N
+        jLabel1.setText(AppLocal.getIntString("label.peoplenamem")); // NOI18N
+        jLabel1.setPreferredSize(new java.awt.Dimension(110, 30));
+        jLabel1.addMouseListener(new java.awt.event.MouseAdapter() {
             public void mouseClicked(java.awt.event.MouseEvent evt) {
-        nameLabelMouseClicked(evt);
+                jLabel1MouseClicked(evt);
             }
         });
-    add(nameLabel);
 
-    nameTextField.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
-    nameTextField.setPreferredSize(new java.awt.Dimension(0, 30));
-    add(nameTextField);
+        m_jName.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
+        m_jName.setPreferredSize(new java.awt.Dimension(0, 30));
 
-    isVisible.setFont(new java.awt.Font("Arial", 0, 12)); // NOI18N
-    isVisible.setPreferredSize(new java.awt.Dimension(0, 30));
-    add(isVisible);
+        m_jVisible.setFont(new java.awt.Font("Arial", 0, 12)); // NOI18N
+        m_jVisible.setPreferredSize(new java.awt.Dimension(0, 30));
 
-    visiableLabel.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
-    visiableLabel.setText(AppLocal.getIntString("label.peoplevisible")); // NOI18N
-    visiableLabel.setPreferredSize(new java.awt.Dimension(110, 30));
-    add(visiableLabel);
+        jLabel3.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
+        jLabel3.setText(AppLocal.getIntString("label.peoplevisible")); // NOI18N
+        jLabel3.setPreferredSize(new java.awt.Dimension(110, 30));
 
-    imageLabel.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
-    imageLabel.setText(AppLocal.getIntString("label.peopleimage")); // NOI18N
-    imageLabel.setPreferredSize(new java.awt.Dimension(110, 30));
-    add(imageLabel);
+        jLabel4.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
+        jLabel4.setText(AppLocal.getIntString("label.peopleimage")); // NOI18N
+        jLabel4.setPreferredSize(new java.awt.Dimension(110, 30));
 
-    imageEditor.setFont(new java.awt.Font("Arial", 0, 12)); // NOI18N
-    imageEditor.setPreferredSize(new java.awt.Dimension(300, 250));
-    add(imageEditor);
+        m_jImage.setFont(new java.awt.Font("Arial", 0, 12)); // NOI18N
+        m_jImage.setPreferredSize(new java.awt.Dimension(300, 250));
 
         jButton1.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
         jButton1.setIcon(new javax.swing.ImageIcon(getClass().getResource("/com/unicenta/images/password.png"))); // NOI18N
@@ -295,34 +284,101 @@ 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);
 
-    roleLabel.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
-    roleLabel.setText(AppLocal.getIntString("label.rolem")); // NOI18N
-    roleLabel.setPreferredSize(new java.awt.Dimension(110, 30));
-    add(roleLabel);
+        jLabel2.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
+        jLabel2.setText(AppLocal.getIntString("label.rolem")); // NOI18N
+        jLabel2.setPreferredSize(new java.awt.Dimension(110, 30));
 
-    cardIdTextField.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
-    cardIdTextField.setPreferredSize(new java.awt.Dimension(0, 30));
-    add(cardIdTextField);
+        m_jcard.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
+        m_jcard.setPreferredSize(new java.awt.Dimension(0, 30));
 
-    cardIdLabel.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
-    cardIdLabel.setText(AppLocal.getIntString("label.card")); // NOI18N
-    cardIdLabel.setPreferredSize(new java.awt.Dimension(110, 30));
-    add(cardIdLabel);
+        jLblCardID.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
+        jLblCardID.setText(AppLocal.getIntString("label.card")); // NOI18N
+        jLblCardID.setPreferredSize(new java.awt.Dimension(110, 30));
 
-    passwordLabel.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
-    passwordLabel.setText(AppLocal.getIntString("label.Password")); // NOI18N
-    passwordLabel.setPreferredSize(new java.awt.Dimension(110, 30));
-    add(passwordLabel);
+        webCBSecurity.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "Generate new key", "Delete exisitng key", "Use iButton ID" }));
+        webCBSecurity.setSelectedIndex(0);
+        webCBSecurity.setToolTipText(AppLocal.getIntString("tooltip.peoplesecurity")); // NOI18N
+        webCBSecurity.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
+        webCBSecurity.setPreferredSize(new java.awt.Dimension(140, 45));
+        webCBSecurity.addActionListener(new java.awt.event.ActionListener() {
+            public void actionPerformed(java.awt.event.ActionEvent evt) {
+                webCBSecurityActionPerformed(evt);
+            }
+        });
 
-    taxIdLabel.setText("Tax ID");
-    add(taxIdLabel);
-    add(taxIdTextField);
+        jLabel6.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
+        jLabel6.setText(AppLocal.getIntString("label.Password")); // NOI18N
+        jLabel6.setPreferredSize(new java.awt.Dimension(110, 30));
+
+        javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
+        this.setLayout(layout);
+        layout.setHorizontalGroup(
+            layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+            .addGroup(layout.createSequentialGroup()
+                .addContainerGap()
+                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+                    .addGroup(layout.createSequentialGroup()
+                        .addComponent(jLabel3, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                        .addGap(18, 18, 18)
+                        .addComponent(m_jVisible, javax.swing.GroupLayout.PREFERRED_SIZE, 207, javax.swing.GroupLayout.PREFERRED_SIZE))
+                    .addGroup(layout.createSequentialGroup()
+                        .addComponent(jLabel2, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
+                        .addComponent(m_jRole, javax.swing.GroupLayout.PREFERRED_SIZE, 180, javax.swing.GroupLayout.PREFERRED_SIZE))
+                    .addGroup(layout.createSequentialGroup()
+                        .addComponent(jLabel4, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
+                        .addComponent(m_jImage, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+                    .addGroup(layout.createSequentialGroup()
+                        .addComponent(jLblCardID, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
+                        .addComponent(m_jcard, javax.swing.GroupLayout.PREFERRED_SIZE, 180, javax.swing.GroupLayout.PREFERRED_SIZE)
+                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                        .addComponent(webCBSecurity, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+                    .addGroup(layout.createSequentialGroup()
+                        .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+                            .addComponent(jLabel1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                            .addComponent(jLabel6, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
+                        .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+                            .addComponent(jButton1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                            .addComponent(m_jName, javax.swing.GroupLayout.PREFERRED_SIZE, 180, javax.swing.GroupLayout.PREFERRED_SIZE))))
+                .addContainerGap())
+        );
+        layout.setVerticalGroup(
+            layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+            .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup()
+                .addGap(18, 18, 18)
+                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+                    .addComponent(jLabel1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                    .addComponent(m_jName, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
+                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.CENTER)
+                    .addComponent(jLabel6, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                    .addComponent(jButton1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
+                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.CENTER)
+                    .addComponent(jLblCardID, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                    .addComponent(m_jcard, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                    .addComponent(webCBSecurity, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
+                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+                    .addComponent(jLabel2, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                    .addComponent(m_jRole, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
+                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+                    .addComponent(jLabel3, javax.swing.GroupLayout.PREFERRED_SIZE, 25, javax.swing.GroupLayout.PREFERRED_SIZE)
+                    .addComponent(m_jVisible, javax.swing.GroupLayout.PREFERRED_SIZE, 25, javax.swing.GroupLayout.PREFERRED_SIZE))
+                .addGap(15, 15, 15)
+                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+                    .addComponent(m_jImage, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                    .addComponent(jLabel4, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+                .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
+        );
     }// </editor-fold>//GEN-END:initComponents
 
     private void jButton1ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jButton1ActionPerformed
@@ -337,13 +393,15 @@ public class PeopleView extends JPanel implements EditorRecord {
 
     private void webCBSecurityActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_webCBSecurityActionPerformed
 
+
         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) {
-        cardIdTextField.setText("C" + StringUtils.getCardNumber());
+                JOptionPane.QUESTION_MESSAGE) == JOptionPane.YES_OPTION) 
+            {  
+                m_jcard.setText("C" + StringUtils.getCardNumber());
                 m_Dirty.setDirty(true);
             }        
         }         
@@ -353,8 +411,9 @@ public class PeopleView extends JPanel implements EditorRecord {
                 AppLocal.getIntString("message.cardremove"), 
                 AppLocal.getIntString("title.editor"), 
                 JOptionPane.YES_NO_OPTION, 
-          JOptionPane.QUESTION_MESSAGE) == JOptionPane.YES_OPTION) {
-        cardIdTextField.setText(null);
+                JOptionPane.QUESTION_MESSAGE) == JOptionPane.YES_OPTION) 
+            {  
+                m_jcard.setText(null);
                 m_Dirty.setDirty(true);
             }
         }
@@ -367,8 +426,8 @@ public class PeopleView extends JPanel implements EditorRecord {
                 JOptionPane.INFORMATION_MESSAGE) == JOptionPane.OK_OPTION) 
 
             {  
-        cardIdTextField.setText(uOWWatch.getibuttonid());
-        cardIdLabel.setText(AppLocal.getIntString("label.ibutton"));
+                m_jcard.setText( uOWWatch.getibuttonid() );
+                jLblCardID.setText(AppLocal.getIntString("label.ibutton"));
                 m_Dirty.setDirty(true);
             }
 
@@ -376,7 +435,7 @@ public class PeopleView extends JPanel implements EditorRecord {
                
     }//GEN-LAST:event_webCBSecurityActionPerformed
 
-  private void nameLabelMouseClicked(java.awt.event.MouseEvent evt) {// GEN-FIRST:event_nameLabelMouseClicked
+    private void jLabel1MouseClicked(java.awt.event.MouseEvent evt) {//GEN-FIRST:event_jLabel1MouseClicked
         if (evt.getClickCount() == 2) {
             String uuidString = m_oId.toString();
             StringSelection stringSelection = new StringSelection(uuidString);
@@ -386,23 +445,22 @@ public class PeopleView extends JPanel implements EditorRecord {
             JOptionPane.showMessageDialog(null, 
                 AppLocal.getIntString("message.uuidcopy"));
         }
-  }// GEN-LAST:event_nameLabelMouseClicked
+    }//GEN-LAST:event_jLabel1MouseClicked
+    
     
     // 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.JLabel nameLabel;
-  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 javax.swing.JCheckBox m_jVisible;
+    private javax.swing.JTextField m_jcard;
     private com.alee.laf.combobox.WebComboBox webCBSecurity;
     // End of variables declaration//GEN-END:variables
     

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

@@ -174,8 +174,7 @@ 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);
         
     }
 
@@ -258,14 +257,12 @@ public class CustomersPayment extends javax.swing.JPanel implements JPanelView,
         }
     }
 
-  /**
-   * 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;
 
@@ -513,111 +510,80 @@ 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(jLabel4, javax.swing.GroupLayout.PREFERRED_SIZE,
-                                        javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+                                    .addComponent(jLabel12, javax.swing.GroupLayout.PREFERRED_SIZE, 140, 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(txtNotes, javax.swing.GroupLayout.PREFERRED_SIZE, 250,
-                                        javax.swing.GroupLayout.PREFERRED_SIZE)))))
+                                    .addComponent(txtPrePay, 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(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)));
+                            .addComponent(jLabel6, 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))))
+                .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(txtTaxId, 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, 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(txtName, 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, 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(txtCard, 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, 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(txtNotes, javax.swing.GroupLayout.PREFERRED_SIZE,
-                        javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+                    .addComponent(jLabel12, 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(txtPrePay, 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)
+                    .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(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))
+                    .addComponent(jLabel1, 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(txtMaxdebt, 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))
-                .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)));
+                    .addComponent(txtCurdebt, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                    .addComponent(txtMaxdebt, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                    .addComponent(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
 
         readCustomer();
@@ -646,8 +612,7 @@ 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);
             }
         }  
@@ -677,7 +642,7 @@ public class CustomersPayment extends javax.swing.JPanel implements JPanelView,
 
             ticket.setPayments(payments);
 
-      ticket.setUserInfo(app.getAppUserView().getUser().getUserInfo());
+            ticket.setUser(app.getAppUserView().getUser().getUserInfo());
             ticket.setActiveCash(app.getActiveCashIndex());
             ticket.setDate(new Date());
             ticket.setCustomer(customerext);
@@ -689,6 +654,7 @@ public class CustomersPayment extends javax.swing.JPanel implements JPanelView,
                 msg.show(this);
             }
 
+
             // reload customer
             CustomerInfoExt c;
             try {
@@ -701,8 +667,7 @@ 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);
             }
 
@@ -755,7 +720,7 @@ public class CustomersPayment extends javax.swing.JPanel implements JPanelView,
 
                 ticket.setPayments(payments);
 
-        ticket.setUserInfo(app.getAppUserView().getUser().getUserInfo());
+                ticket.setUser(app.getAppUserView().getUser().getUserInfo());
                 ticket.setActiveCash(app.getActiveCashIndex());
                 ticket.setDate(new Date());
                 ticket.setCustomer(customerext);
@@ -771,16 +736,14 @@ 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);
                 }
 

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

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

@@ -82,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;
@@ -374,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++;
@@ -518,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 {
@@ -539,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)) {
-            badCategories.add(category.trim());                                 // Save a list of the bad categories
+        if (!badCategories.contains(Category)) {
+            badCategories.add(Category.trim());                                 // Save a list of the bad categories
         }
         return ((jComboDefaultCategory.getSelectedItem() 
                 == reject_bad_category) 
@@ -968,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/sales/DataLogicReceipts.java

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

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

@@ -74,6 +74,7 @@ import java.util.*;
 
 import static java.awt.Window.getWindows;
 
+
 /**
  * @author JG uniCenta
  */
@@ -154,6 +155,7 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
   private Integer oCount = 0;
   private Boolean pinOK;
 
+
   /**
    * Creates new form JTicketView
    */
@@ -180,8 +182,8 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
     dlCustomers = (DataLogicCustomers) m_App.getBean("com.unicenta.pos.customers.DataLogicCustomers");
     dlReceipts = (DataLogicReceipts) app.getBean("com.unicenta.pos.sales.DataLogicReceipts");
 
-    /*
-     * uniCenta Feb 2018
+
+    /* uniCenta Feb 2018
      * Changed for 4.3
      * Set up main toolbar area with two rows to add cater for additional scripts
      * else over-crowding and some dynamic buttons off screen/not visible
@@ -189,8 +191,7 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
      * Resources>Menu.Root
      */
 
-    // Set Configuration>General>Tickets toolbar simple : standard : restaurant
-    // option
+// Set Configuration>General>Tickets toolbar simple : standard : restaurant option
     m_ticketsbag = getJTicketsBag();
     m_jPanelBag.add(m_ticketsbag.getBagComponent(), BorderLayout.LINE_START);
     add(m_ticketsbag.getNullComponent(), "null");
@@ -326,6 +327,7 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
       }
     }
 
+
   }
 
   @Override
@@ -510,7 +512,7 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
     m_oTicketExt = oTicketExt;
 
     if (m_oTicket != null) {
-      m_oTicket.setUserInfo(m_App.getAppUserView().getUser().getUserInfo());
+      m_oTicket.setUser(m_App.getAppUserView().getUser().getUserInfo());
       m_oTicket.setActiveCash(m_App.getActiveCashIndex());
       m_oTicket.setDate(new Date());
 
@@ -816,8 +818,10 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
 
 //        if (m_App.getProperties().getProperty("override.check").equals("true")) {
     if (!m_oTicket.getLine(i).getUpdated()) {
-      JOptionPane.showMessageDialog(this, AppLocal.getIntString("message.deletelinesent"),
-          AppLocal.getIntString("label.deleteline"), JOptionPane.WARNING_MESSAGE);
+      JOptionPane.showMessageDialog(this
+              , AppLocal.getIntString("message.deletelinesent")
+              , AppLocal.getIntString("label.deleteline")
+              , JOptionPane.WARNING_MESSAGE);
     } else {
       if (executeEventAndRefresh("ticket.removeline", new ScriptArg("index", i)) == null) {
         String ticketID = Integer.toString(m_oTicket.getTicketId());
@@ -831,7 +835,8 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
                         m_oTicket.getLine(i).getProductID(),
                         m_oTicket.getLine(i).getProductName(),
                         m_oTicket.getLine(i).getMultiply()
-            });
+                }
+        );
 
         if (m_oTicket.getLine(i).isProductCom()) {
           m_oTicket.removeLine(i);
@@ -841,8 +846,8 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
 
             if (m_App.getAppUserView().getUser().hasPermission("sales.DeleteLines")) {
               int input = JOptionPane.showConfirmDialog(this,
-                  AppLocal.getIntString("message.deletelineyes"), AppLocal.getIntString("label.deleteline"),
-                  JOptionPane.YES_NO_OPTION);
+                      AppLocal.getIntString("message.deletelineyes")
+                      , AppLocal.getIntString("label.deleteline"), JOptionPane.YES_NO_OPTION);
 
               if (input == 0) {
                 m_oTicket.removeLine(i);
@@ -850,8 +855,8 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
               }
             } else {
               JOptionPane.showMessageDialog(this,
-                  AppLocal.getIntString("message.deletelineno"), AppLocal.getIntString("label.deleteline"),
-                  JOptionPane.WARNING_MESSAGE);
+                      AppLocal.getIntString("message.deletelineno")
+                      , AppLocal.getIntString("label.deleteline"), JOptionPane.WARNING_MESSAGE);
             }
           } else {
             m_oTicket.removeLine(i);
@@ -906,6 +911,7 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
     return dValue / (1.0 + dTaxRate);
   }
 
+
   private double getInputValue() {
     try {
       return Double.parseDouble(m_jPrice.getText());
@@ -1067,9 +1073,9 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
         } else if (sCode.startsWith(";")) {
           stateToZero();
 
+
           // START OF BARCODE PARSING
-          /*
-           * This block is deliberately verbose and is base for future scanner handling
+          /*  This block is deliberately verbose and is base for future scanner handling
            *  Some scanners inject a CR+LF... some don't...
            *  stateTransition() must allow for this as these add characters to .length()
            *  First 3 digits are GS1 CountryCode OR Retailer internal use
@@ -1163,8 +1169,8 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
               }
 
               TaxInfo tax = taxeslogic                                // get the TaxRate for the product
-                  .getTaxInfo(oProduct.getTaxCategoryID(), m_oTicket.getCustomer()); // calculate if ticket has a
-                                                                                     // Customer
+                      .getTaxInfo(oProduct.getTaxCategoryID()
+                              , m_oTicket.getCustomer());                         // calculate if ticket has a Customer
 
               switch (sVariableTypePrefix) {
 //  PRICE - Assign var's
@@ -1173,28 +1179,32 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
                           / (1.0 + tax.getRate());                    // selling price with tax
                   dUnits = (Double.parseDouble(sVariableNum)
                           / 100) / oProduct.getPriceSellTax(tax);     // Units as proportion of selling price
-                  oProduct.setProperty("product.price", Double.toString(oProduct.getPriceSell())); // push to screen
+                  oProduct.setProperty("product.price"
+                          , Double.toString(oProduct.getPriceSell())); // push to screen
                   break;
                 case "20":                                          // as above
                   dPriceSell = oProduct.getPriceSellTax(tax)
                           / (1.0 + tax.getRate());
                   dUnits = (Double.parseDouble(sVariableNum)
                           / 100) / oProduct.getPriceSellTax(tax);
-                  oProduct.setProperty("product.price", Double.toString(oProduct.getPriceSellTax(tax)));
+                  oProduct.setProperty("product.price"
+                          , Double.toString(oProduct.getPriceSellTax(tax)));
                   break;
                 case "21":
                   dPriceSell = oProduct.getPriceSellTax(tax)
                           / (1.0 + tax.getRate());
                   dUnits = (Double.parseDouble(sVariableNum)
                           / 10) / oProduct.getPriceSellTax(tax);
-                  oProduct.setProperty("product.price", Double.toString(oProduct.getPriceSell()));
+                  oProduct.setProperty("product.price"
+                          , Double.toString(oProduct.getPriceSell()));
                   break;
                 case "22":
                   dPriceSell = oProduct.getPriceSellTax(tax)
                           / (1.0 + tax.getRate());
                   dUnits = (Double.parseDouble(sVariableNum)
                           / 1) / oProduct.getPriceSellTax(tax);
-                  oProduct.setProperty("product.price", Double.toString(oProduct.getPriceSell()));
+                  oProduct.setProperty("product.price"
+                          , Double.toString(oProduct.getPriceSell()));
                   break;
 
 // WEIGHT - Assign variable to Unit
@@ -1202,22 +1212,28 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
                   weight = Double.parseDouble(sVariableNum)
                           / 1000;                                     // 3 decimals = 01.049 kg
                   dUnits = weight;                                // which represents 1gramme Units
-                  oProduct.setProperty("product.weight", Double.toString(weight));
-                  oProduct.setProperty("product.price", Double.toString(dPriceSell));
+                  oProduct.setProperty("product.weight"
+                          , Double.toString(weight));
+                  oProduct.setProperty("product.price"
+                          , Double.toString(dPriceSell));
                   break;
                 case "24":
                   weight = Double.parseDouble(sVariableNum)
                           / 100;                                      // 2 decimals = 010.49 kg
                   dUnits = weight;                                // which represents 10gramme Units
-                  oProduct.setProperty("product.weight", Double.toString(weight));
-                  oProduct.setProperty("product.price", Double.toString(dPriceSell));
+                  oProduct.setProperty("product.weight"
+                          , Double.toString(weight));
+                  oProduct.setProperty("product.price"
+                          , Double.toString(dPriceSell));
                   break;
                 case "25":
                   weight = Double.parseDouble(sVariableNum)
                           / 10;                                       // 1 decimal = 0104.9 kg
                   dUnits = weight;                                // which represents 100gramme Units
-                  oProduct.setProperty("product.weight", Double.toString(weight));
-                  oProduct.setProperty("product.price", Double.toString(dPriceSell));
+                  oProduct.setProperty("product.weight"
+                          , Double.toString(weight));
+                  oProduct.setProperty("product.price"
+                          , Double.toString(dPriceSell));
                   break;
 
 /*
@@ -1225,25 +1241,27 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
  *  Use this section to add more case statements but these are not mandatory
  *  If you have your own internal or other barcode schema then...
  *  Example:
-                 * case "28":
-                 * {
-                 * // price has tax. Remove it from sPriceSell
-                 * TaxInfo tax = taxeslogic.getTaxInfo(oProduct.getTaxCategoryID(),
-                 * m_oTicket.getCustomer());
-                 * dPriceSell /= (1.0 + tax.getRate());
-                 * oProduct.setProperty("product.price", Double.toString(dPriceSell));
-                 * weight = -1.0;
-                 * break;
+        case "28":
+        {
+        // price has tax. Remove it from sPriceSell
+            TaxInfo tax = taxeslogic.getTaxInfo(oProduct.getTaxCategoryID(), m_oTicket.getCustomer());
+            dPriceSell /= (1.0 + tax.getRate());
+            oProduct.setProperty("product.price", Double.toString(dPriceSell));
+            weight = -1.0;
+        break;
 */
                 default:
                   break;
               }
 
               if (m_jaddtax.isSelected()) {
-                addTicketLine(oProduct, dUnits // weight
+                addTicketLine(oProduct
+                        , dUnits //weight
                         , dPriceSell = oProduct.getPriceSellTax(tax));
               } else {
-                addTicketLine(oProduct, dUnits, dPriceSell);
+                addTicketLine(oProduct
+                        , dUnits
+                        , dPriceSell);
               }
             }
           } catch (BasicException eData) {
@@ -1252,15 +1270,14 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
           }
 
 // UPC-A
-          /*
-           * Note: if begins 02 then its a standard
-           * // UPC-A max value limitation is 4 digit price
-           * // UPC-A Extended uses State digit to give 5 digit price
-           * // uniCenta oPOS does not support UPC-A Extended at this time
-           * // Identifier Prod State Cost CheckCode
-           * // I PPPPP S CCCC K
-           * // 1 23456 7 8901 2
-           * 
+/* Note: if begins 02 then its a standard
+// UPC-A max value limitation is 4 digit price
+// UPC-A Extended uses State digit to give 5 digit price
+// uniCenta oPOS does not support UPC-A Extended at this time
+// Identifier   Prod    State   Cost    CheckCode
+// I            PPPPP   S       CCCC    K
+// 1            23456   7       8901    2
+
  *    0 = Standard UPC number (must have a zero to do zero-suppressed numbers)
  *    1 = Reserved
  *    2 = Random-weight items (fruits, vegetables, meats, etc.)
@@ -1278,7 +1295,8 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
                 && (sCode.length() == 12)) {
 
           try {
-            ProductInfoExt oProduct = dlSales.getProductInfoByUShortCode(sCode); // Return only UPC product
+            ProductInfoExt oProduct
+                    = dlSales.getProductInfoByUShortCode(sCode);            // Return only UPC product
 
             if (oProduct == null) {
               Toolkit.getDefaultToolkit().beep();
@@ -1295,7 +1313,8 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
               String sVariableNum = sCode.substring(7, 11);           // grab the value from the code only using 4 digit price
 
               TaxInfo tax = taxeslogic                                // get the TaxRate for the product
-                  .getTaxInfo(oProduct.getTaxCategoryID(), m_oTicket.getCustomer());
+                      .getTaxInfo(oProduct.getTaxCategoryID()
+                              , m_oTicket.getCustomer());
 
               if (oProduct.getPriceSell() != 0.0) {                       // we have a weight barcode
                 weight = Double.parseDouble(sVariableNum) / 100;        // 2 decimals (e.g. 10.49 kg)
@@ -1317,9 +1336,13 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
               }
 
               if (m_jaddtax.isSelected()) {
-                addTicketLine(oProduct, dUnits, dPriceSell);
+                addTicketLine(oProduct
+                        , dUnits
+                        , dPriceSell);
               } else {
-                addTicketLine(oProduct, dUnits, dPriceSell / (1.0 + tax.getRate()));
+                addTicketLine(oProduct
+                        , dUnits
+                        , dPriceSell / (1.0 + tax.getRate()));
               }
             }
           } catch (BasicException eData) {
@@ -1372,6 +1395,7 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
           m_jPrice.setText(setTempjPrice(m_jPrice.getText() + cTrans));
         }
 
+
       } else if (cTrans == '.'
               && m_iNumberStatus == NUMBER_INPUTZERO && !priceWith00) {
         m_jPrice.setText("0.");
@@ -1761,6 +1785,7 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
     }
   }
 
+
   private Window getActiveWindow() {
     for (Window window: getWindows()) {
       if (window instanceof JRootFrame) {
@@ -1809,7 +1834,7 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
 
             ticket.setPayments(paymentdialog.getSelectedPayments());
 
-            ticket.setUserInfo(m_App.getAppUserView().getUser().getUserInfo());
+            ticket.setUser(m_App.getAppUserView().getUser().getUserInfo());
             ticket.setActiveCash(m_App.getActiveCashIndex());
             ticket.setDate(new Date());
 
@@ -1824,22 +1849,17 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
                 m_config.setLastTicket(lastTicketNumber, lastTicketType);
 
               } catch (BasicException eData) {
-                MessageInf msg = new MessageInf(MessageInf.SGN_NOTICE, AppLocal.getIntString("message.nosaveticket"),
-                    eData);
+                MessageInf msg = new MessageInf(MessageInf.SGN_NOTICE, AppLocal.getIntString("message.nosaveticket"), eData);
                 msg.show(this);
               } catch (IOException ex) {
                 log.error(ex.getMessage());
               }
 
-              if (m_config.getProperty("till.digital-receipt") != null
-                  && m_config.getProperty("till.digital-receipt").equals("true")) {
+              if (m_config.getProperty("till.digital-receipt") != null && m_config.getProperty("till.digital-receipt").equals("true")){
                 log.debug("Send digital receipt");
                 String xml = dlSystem.getResourceAsXML("Printer.Ticket");
                 new Application().sendReceipt(ticket, xml, getActiveWindow());
               }
-              // this is where we trigger the efr integration
-              //
-              //
 
               executeEvent(ticket, ticketext, "ticket.close",
                       new ScriptArg("print", paymentdialog.isPrintSelected()));
@@ -1853,8 +1873,7 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
 
               if ("restaurant".equals(m_App.getProperties()
                       .getProperty("machine.ticketsbag")) && !ticket.getOldTicket()) {
-                /*
-                 * Deliberately Explicit to allow for reassignments - future
+                /* Deliberately Explicit to allow for reassignments - future
                  * even though we could do a single SQL statment sweep for reset
                  */
                 restDB.clearCustomerNameInTable(ticketext.toString());
@@ -1913,6 +1932,7 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
     return (tmpPickupId);
   }
 
+
   private void printTicket(String sresourcename, TicketInfo ticket, Object ticketext) {
 
     String sresource = dlSystem.getResourceAsXML(sresourcename);
@@ -2012,6 +2032,7 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
         }
       }
 
+
       Map reportparams = new HashMap();
 
       try {
@@ -2024,8 +2045,7 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
       reportfields.put("TICKET", ticket);
       reportfields.put("PLACE", ticketext);
 
-      JasperPrint jp = JasperFillManager.fillReport(jr, reportparams,
-          new JRMapArrayDataSource(new Object[] { reportfields }));
+      JasperPrint jp = JasperFillManager.fillReport(jr, reportparams, new JRMapArrayDataSource(new Object[]{reportfields}));
 
       PrintService service = ReportUtils.getPrintService(m_App.getProperties().getProperty("machine.printername"));
 
@@ -2104,6 +2124,7 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
     }
   }
 
+
   private Object executeEvent(TicketInfo ticket, Object ticketext, String eventkey, ScriptArg... args) {
 
     String resource = m_jbtnconfig.getEvent(eventkey);
@@ -2200,14 +2221,13 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
 
         if (checkProduct != null) {
 
-          if (checkProduct.getUnits() != null && checkProduct.getUnits() <= 0) {
+          if (checkProduct.getUnits() <= 0) {
             jCheckStock.setForeground(Color.magenta);
           } else {
             jCheckStock.setForeground(Color.darkGray);
           }
 
-          double dUnits = checkProduct.getUnits() == null ? 0.0 : checkProduct.getUnits();
-
+          double dUnits = checkProduct.getUnits();
           int iUnits;
           iUnits = (int) dUnits;
           jCheckStock.setText(Integer.toString(iUnits));
@@ -2242,6 +2262,7 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
               "<b>" + AppLocal.getIntString("label.vip") + " : " + "</b>" + vip + "<br>" +
               "<b>" + AppLocal.getIntString("label.discount") + " : " + "</b>" + discount + "<br>";
 
+
       JFrame frame = new JFrame();
       JOptionPane.showMessageDialog(frame,
               content,
@@ -2345,14 +2366,14 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
     }
   }
 
+
   /**
    * 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 FormEditor.
    */
-  // <editor-fold defaultstate="collapsed" desc="Generated
-  // Code">//GEN-BEGIN:initComponents
+  // <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents
   private void initComponents() {
 
     m_jPanContainer = new javax.swing.JPanel();
@@ -2379,8 +2400,7 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
     jCheckStock = new javax.swing.JButton();
     m_jPanelCentral = new javax.swing.JPanel();
     jPanel4 = new javax.swing.JPanel();
-    filler2 = new javax.swing.Box.Filler(new java.awt.Dimension(5, 0), new java.awt.Dimension(5, 0),
-        new java.awt.Dimension(5, 32767));
+    filler2 = new javax.swing.Box.Filler(new java.awt.Dimension(5, 0), new java.awt.Dimension(5, 0), new java.awt.Dimension(5, 32767));
     m_jTicketId = new javax.swing.JLabel();
     m_jPanTotals = new javax.swing.JPanel();
     m_jLblTotalEuros3 = new javax.swing.JLabel();
@@ -2525,32 +2545,26 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
             m_jButtonsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
                     .addGroup(m_jButtonsLayout.createSequentialGroup()
                             .addContainerGap()
-                .addComponent(jBtnCustomer, javax.swing.GroupLayout.PREFERRED_SIZE,
-                    javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                            .addComponent(jBtnCustomer, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
                             .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                .addComponent(btnSplit, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE,
-                    javax.swing.GroupLayout.PREFERRED_SIZE)
+                            .addComponent(btnSplit, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
                             .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                .addComponent(j_btnRemotePrt, javax.swing.GroupLayout.PREFERRED_SIZE,
-                    javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                            .addComponent(j_btnRemotePrt, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
                             .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                .addComponent(btnReprint1, 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(btnReprint1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                            .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
+    );
     m_jButtonsLayout.setVerticalGroup(
             m_jButtonsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
                     .addGroup(m_jButtonsLayout.createSequentialGroup()
                             .addGap(5, 5, 5)
                             .addGroup(m_jButtonsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false)
-                    .addComponent(j_btnRemotePrt, javax.swing.GroupLayout.DEFAULT_SIZE,
-                        javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
-                    .addComponent(btnSplit, javax.swing.GroupLayout.Alignment.TRAILING,
-                        javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
-                    .addComponent(btnReprint1, javax.swing.GroupLayout.Alignment.TRAILING,
-                        javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
-                    .addComponent(jBtnCustomer, javax.swing.GroupLayout.DEFAULT_SIZE,
-                        javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
-                .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)));
+                                    .addComponent(j_btnRemotePrt, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+                                    .addComponent(btnSplit, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+                                    .addComponent(btnReprint1, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+                                    .addComponent(jBtnCustomer, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
+                            .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
+    );
 
     m_jPanelBag.add(m_jButtons);
 
@@ -2793,9 +2807,7 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
     m_jPrice.setFont(new java.awt.Font("Arial", 1, 16)); // NOI18N
     m_jPrice.setForeground(new java.awt.Color(76, 197, 237));
     m_jPrice.setHorizontalAlignment(javax.swing.SwingConstants.LEFT);
-    m_jPrice.setBorder(javax.swing.BorderFactory.createCompoundBorder(
-        javax.swing.BorderFactory.createLineBorder(new java.awt.Color(76, 197, 237)),
-        javax.swing.BorderFactory.createEmptyBorder(1, 4, 1, 4)));
+    m_jPrice.setBorder(javax.swing.BorderFactory.createCompoundBorder(javax.swing.BorderFactory.createLineBorder(new java.awt.Color(76, 197, 237)), javax.swing.BorderFactory.createEmptyBorder(1, 4, 1, 4)));
     m_jPrice.setOpaque(true);
     m_jPrice.setPreferredSize(new java.awt.Dimension(100, 25));
     m_jPrice.setRequestFocusEnabled(false);
@@ -2845,46 +2857,36 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
                     .addGroup(jPanel9Layout.createSequentialGroup()
                             .addGroup(jPanel9Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false)
                                     .addComponent(m_jPor)
-                    .addComponent(m_jKeyFactory, javax.swing.GroupLayout.DEFAULT_SIZE,
-                        javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
+                                    .addComponent(m_jKeyFactory, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
                             .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 7, Short.MAX_VALUE)
                             .addGroup(jPanel9Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
                                     .addGroup(jPanel9Layout.createSequentialGroup()
-                        .addComponent(m_jaddtax, javax.swing.GroupLayout.DEFAULT_SIZE,
-                            javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+                                            .addComponent(m_jaddtax, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
                                             .addGap(7, 7, 7)
-                        .addComponent(m_jTax, javax.swing.GroupLayout.PREFERRED_SIZE, 128,
-                            javax.swing.GroupLayout.PREFERRED_SIZE)
+                                            .addComponent(m_jTax, javax.swing.GroupLayout.PREFERRED_SIZE, 128, javax.swing.GroupLayout.PREFERRED_SIZE)
                                             .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED))
                                     .addGroup(jPanel9Layout.createSequentialGroup()
-                        .addComponent(m_jPrice, javax.swing.GroupLayout.DEFAULT_SIZE,
-                            javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+                                            .addComponent(m_jPrice, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
                                             .addGap(5, 5, 5)))
-                .addComponent(m_jEnter, javax.swing.GroupLayout.PREFERRED_SIZE, 71,
-                    javax.swing.GroupLayout.PREFERRED_SIZE)
-                .addContainerGap()));
+                            .addComponent(m_jEnter, javax.swing.GroupLayout.PREFERRED_SIZE, 71, javax.swing.GroupLayout.PREFERRED_SIZE)
+                            .addContainerGap())
+    );
     jPanel9Layout.setVerticalGroup(
             jPanel9Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
                     .addGroup(jPanel9Layout.createSequentialGroup()
-                .addComponent(m_jEnter, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE,
-                    javax.swing.GroupLayout.PREFERRED_SIZE)
+                            .addComponent(m_jEnter, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
                             .addGap(0, 0, Short.MAX_VALUE))
                     .addGroup(jPanel9Layout.createSequentialGroup()
-                .addComponent(m_jPrice, javax.swing.GroupLayout.PREFERRED_SIZE, 44,
-                    javax.swing.GroupLayout.PREFERRED_SIZE)
+                            .addComponent(m_jPrice, javax.swing.GroupLayout.PREFERRED_SIZE, 44, javax.swing.GroupLayout.PREFERRED_SIZE)
                             .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 7, Short.MAX_VALUE)
                             .addGroup(jPanel9Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-                    .addComponent(m_jTax, javax.swing.GroupLayout.Alignment.TRAILING,
-                        javax.swing.GroupLayout.PREFERRED_SIZE, 30, javax.swing.GroupLayout.PREFERRED_SIZE)
-                    .addComponent(m_jaddtax, javax.swing.GroupLayout.Alignment.TRAILING,
-                        javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE,
-                        javax.swing.GroupLayout.PREFERRED_SIZE)))
+                                    .addComponent(m_jTax, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.PREFERRED_SIZE, 30, javax.swing.GroupLayout.PREFERRED_SIZE)
+                                    .addComponent(m_jaddtax, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)))
                     .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, jPanel9Layout.createSequentialGroup()
                             .addComponent(m_jPor)
-                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED,
-                    javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
-                .addComponent(m_jKeyFactory, javax.swing.GroupLayout.PREFERRED_SIZE, 1,
-                    javax.swing.GroupLayout.PREFERRED_SIZE)));
+                            .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+                            .addComponent(m_jKeyFactory, javax.swing.GroupLayout.PREFERRED_SIZE, 1, javax.swing.GroupLayout.PREFERRED_SIZE))
+    );
 
     m_jPanEntries.add(jPanel9);
 
@@ -3295,7 +3297,8 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
       CustomerInfoExt m_customerInfo = dialog.getSelectedCustomer();
       if (dialog.getSelectedCustomer() != null) {
         try {
-          m_oTicket.setCustomer(dlSales.loadCustomerExt(dialog.getSelectedCustomer().getId()));
+          m_oTicket.setCustomer(dlSales.loadCustomerExt
+                  (dialog.getSelectedCustomer().getId()));
         } catch (BasicException ex) {
           log.error(ex.getMessage());
         }
@@ -3313,10 +3316,11 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
 
         if (finder.getSelectedCustomer() != null) {
           try {
-            m_oTicket.setCustomer(dlSales.loadCustomerExt(finder.getSelectedCustomer().getId()));
+            m_oTicket.setCustomer(dlSales.loadCustomerExt
+                    (finder.getSelectedCustomer().getId()));
             if ("restaurant".equals(m_App.getProperties().getProperty("machine.ticketsbag"))) {
-              restDB.setCustomerNameInTableByTicketId(
-                  dlSales.loadCustomerExt(finder.getSelectedCustomer().getId()).toString(), m_oTicket.getId());
+              restDB.setCustomerNameInTableByTicketId(dlSales.loadCustomerExt
+                      (finder.getSelectedCustomer().getId()).toString(), m_oTicket.getId());
             }
 
             checkCustomer();
@@ -3347,10 +3351,11 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
 
           if (finder.getSelectedCustomer() != null) {
             try {
-              m_oTicket.setCustomer(dlSales.loadCustomerExt(finder.getSelectedCustomer().getId()));
+              m_oTicket.setCustomer(dlSales.loadCustomerExt
+                      (finder.getSelectedCustomer().getId()));
               if ("restaurant".equals(m_App.getProperties().getProperty("machine.ticketsbag"))) {
-                restDB.setCustomerNameInTableByTicketId(
-                    dlSales.loadCustomerExt(finder.getSelectedCustomer().getId()).toString(), m_oTicket.getId());
+                restDB.setCustomerNameInTableByTicketId(dlSales.loadCustomerExt
+                        (finder.getSelectedCustomer().getId()).toString(), m_oTicket.getId());
               }
 
               checkCustomer();
@@ -3426,10 +3431,9 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
   private javax.swing.JButton m_jbtnScale;
   // End of variables declaration//GEN-END:variables
 
-  /*
-   * Remote Orders Display
-   * We only know about uniCenta oPOS orders and won't try and handle any
-   * that are injected from an external source
+/* Remote Orders Display
+    We only know about uniCenta oPOS orders and won't try and handle any
+    that are injected from an external source
 */
 
   public void remoteOrderDisplay() {
@@ -3487,23 +3491,29 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
           }
         }
 
-        dlSystem.addOrder(getPickupString(m_oTicket), (int) m_oTicket.getLine(i).getMultiply(),
-            m_oTicket.getLine(i).getProductName(), m_oTicket.getLine(i).getProductAttSetInstDesc(),
-            m_oTicket.getLine(i).getProperty("notes"), id, null, display, null, null);
+        dlSystem.addOrder(getPickupString(m_oTicket)
+                , (int) m_oTicket.getLine(i).getMultiply()
+                , m_oTicket.getLine(i).getProductName()
+                , m_oTicket.getLine(i).getProductAttSetInstDesc()
+                , m_oTicket.getLine(i).getProperty("notes")
+                , id
+                , null
+                , display
+                , null
+                , null);
 
-        /*
-         * this block for future - right now we're deleting all ticketlines
-         * and resending for consistency with actual ticketlines
-         * dlSystem.updateOrder(getPickupString(m_oTicket)
-         * , (int) m_oTicket.getLine(i).getMultiply()
-         * , m_oTicket.getLine(i).getProductName()
-         * , m_oTicket.getLine(i).getProductAttSetInstDesc()
-         * , m_oTicket.getLine(i).getProperty("notes")
-         * , id
-         * , null
-         * , display
-         * , null
-         * , null);
+/* this block for future - right now we're deleting all ticketlines
+    and resending for consistency with actual ticketlines
+                dlSystem.updateOrder(getPickupString(m_oTicket)
+                        , (int) m_oTicket.getLine(i).getMultiply()
+                        , m_oTicket.getLine(i).getProductName()
+                        , m_oTicket.getLine(i).getProductAttSetInstDesc()
+                        , m_oTicket.getLine(i).getProperty("notes")
+                        , id
+                        , null
+                        , display
+                        , null
+                        , null);
 */
 
       } catch (BasicException ex) {

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

@@ -23,8 +23,6 @@ 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;
@@ -36,7 +34,6 @@ import javax.swing.event.ListSelectionListener;
  *
  * @author JG uniCenta
  */
-@Slf4j
 public class JPanelTicketSales extends JPanelTicket {
 
     private CatalogSelector m_cat;
@@ -98,7 +95,6 @@ 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,8 +74,7 @@ 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;
@@ -88,12 +87,10 @@ 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) {
         
@@ -220,7 +217,8 @@ public class JTicketsBagRestaurantMap extends JTicketsBag {
                         pl.setY(newY);
                     }
                 }
-      });
+            }
+            );
 
             pl.getButton().addActionListener(new MyActionListener(pl));
         }
@@ -420,8 +418,10 @@ public class JTicketsBagRestaurantMap extends JTicketsBag {
                     m_PlaceCurrent = null;                        
     
                 } else {
-          JOptionPane.showMessageDialog(null, AppLocal.getIntString("message.sharedticketlockoverriden"),
-              AppLocal.getIntString("title.editor"), JOptionPane.INFORMATION_MESSAGE);
+                    JOptionPane.showMessageDialog(null
+                        , AppLocal.getIntString("message.sharedticketlockoverriden")
+                        , AppLocal.getIntString("title.editor")
+                        , JOptionPane.INFORMATION_MESSAGE);                        
                 }
             } catch (BasicException ex) {
                 log.error(ex.getMessage());
@@ -598,8 +598,7 @@ public class JTicketsBagRestaurantMap extends JTicketsBag {
                                 place.getButton().setIcon((Boolean.parseBoolean(
                                         m_App.getProperties().getProperty("table.showwaiterdetails"))
                                         && (restDB.getCustomerNameInTable(place.getName()) !=null))
-                        ? ICO_WAITER
-                        : ICO_OCU_SM);
+                                        ? ICO_WAITER:ICO_OCU_SM);
                                 if (m_App.getProperties().getProperty("table.customercolour")== null){                
                                     customerDetails = (restDB.getCustomerNameInTable(place.getName()) ==null)? ""
                                     :"<style=font-size:9px;font-weight:bold;><font color = blue>"
@@ -647,9 +646,12 @@ public class JTicketsBagRestaurantMap extends JTicketsBag {
 // places here
 
             } else {
-        m_jText.setText(AppLocal.getIntString("label.restaurantcustomer", new Object[] {
+                m_jText.setText(AppLocal.getIntString("label.restaurantcustomer"
+                        , new Object[] {
                             customer.getName()
-        }));
+                        }
+                )
+                );
 
                 m_aplaces.stream()
                         .forEach((place) -> {
@@ -658,9 +660,11 @@ public class JTicketsBagRestaurantMap extends JTicketsBag {
                 m_jbtnReservations.setEnabled(false);
             }
         } else {
-      m_jText.setText(AppLocal.getIntString("label.restaurantmove", new Object[] {
+            m_jText.setText(AppLocal.getIntString("label.restaurantmove"
+                    , new Object[] {
                     m_PlaceClipboard.getName()
-      }));
+                }
+            ));
 
             m_aplaces.stream()
                 .forEach((place) -> {
@@ -705,11 +709,9 @@ public class JTicketsBagRestaurantMap extends JTicketsBag {
     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();    
@@ -721,7 +723,7 @@ public class JTicketsBagRestaurantMap extends JTicketsBag {
                     TicketInfo ticket = getTicketInfo(m_place);
                         if (ticket == null) {                                   // It's an empty table            
                             ticket = new TicketInfo();
-            ticket.setUserInfo(m_App.getAppUserView().getUser().getUserInfo());
+                            ticket.setUser(m_App.getAppUserView().getUser().getUserInfo());
                             try {
                                 dlReceipts.insertSharedTicket(m_place.getId(), ticket, ticket.getPickupId());               
                             } catch (BasicException e) {
@@ -740,9 +742,10 @@ public class JTicketsBagRestaurantMap extends JTicketsBag {
                                         AppLocal.getIntString("message.sharedticketlock")); 
 
                                     if (m_App.getAppUserView().getUser().hasPermission("sales.Override")) {       // Override it             
-                  int res = JOptionPane.showConfirmDialog(null,
-                      AppLocal.getIntString("message.sharedticketlockoverride"), AppLocal.getIntString("title.editor"),
-                      JOptionPane.YES_NO_OPTION, JOptionPane.WARNING_MESSAGE);
+                                        int res = JOptionPane.showConfirmDialog(null
+                                            , AppLocal.getIntString("message.sharedticketlockoverride")
+                                            , AppLocal.getIntString("title.editor")
+                                            , JOptionPane.YES_NO_OPTION, JOptionPane.WARNING_MESSAGE);
 
                                         if (res == JOptionPane.YES_OPTION) {                
                                             m_place.setPeople(true);                                             
@@ -763,8 +766,10 @@ public class JTicketsBagRestaurantMap extends JTicketsBag {
                                         m_lockState = "locked";
                                         setActivePlace(m_place, ticket);
                                     } else {
-                  JOptionPane.showMessageDialog(null, AppLocal.getIntString("message.sharedticket"),
-                      AppLocal.getIntString("title.editor"), JOptionPane.OK_OPTION);
+                                        JOptionPane.showMessageDialog(null
+                                            , AppLocal.getIntString("message.sharedticket")
+                                            , AppLocal.getIntString("title.editor")
+                                            , JOptionPane.OK_OPTION);
                                     }
                                 }
                             } catch (BasicException ex) {
@@ -886,14 +891,14 @@ public class JTicketsBagRestaurantMap extends JTicketsBag {
       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();
@@ -1064,6 +1069,7 @@ public class JTicketsBagRestaurantMap extends JTicketsBag {
         });
     }//GEN-LAST:event_m_jbtnSaveActionPerformed
     
+    
     // Variables declaration - do not modify//GEN-BEGIN:variables
     private javax.swing.JPanel jPanel1;
     private javax.swing.JPanel jPanel2;

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

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

@@ -53,7 +53,6 @@ public class JTicketsBagShared extends JTicketsBag {
     private DataLogicSales dlSales = null;  
     private final DataLogicSystem dlSystem;    
     private Boolean showList;
-    private int existingOrderCount;
    
     
     /** Creates new form JTicketsBagShared
@@ -82,7 +81,7 @@ public class JTicketsBagShared extends JTicketsBag {
         log.debug("Loading Sales screen! "+this.getClass());
 
         ExecutorService customExecutor = Executors.newCachedThreadPool();
-        SwingWorker<String, String> reloadLayaway = new SwingWorker() {
+        SwingWorker<String, String> reloadLayaway = new SwingWorker<>() {
             @Override
             protected String doInBackground() throws Exception {
                 while (true) {
@@ -141,26 +140,12 @@ 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("");
             }
@@ -442,10 +427,6 @@ 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/ticket/TicketInfo.java

@@ -55,27 +55,27 @@ public final class TicketInfo implements SerializableRead, Externalizable {
   
     private static final DateFormat m_dateformat = new SimpleDateFormat("hh:mm");
 
-  private String host;
-  private String id;
-  private int ticketType;
-  private int ticketId;
-  private int pickupId;
-  private java.util.Date date;
+    private String m_sHost;
+    private String m_sId;
+    private int tickettype;
+    private int m_iTicketId;
+    private int m_iPickupId;
+    private java.util.Date m_dDate;
     private Properties attributes;
-  private UserInfo userInfo;
+    private UserInfo m_User;
     private Double multiply;
-  private CustomerInfoExt cutomerInfoExt;
-  private String activeCash;
-  private List<TicketLineInfo> ticketLines;
+    private CustomerInfoExt m_Customer;
+    private String m_sActiveCash;
+    private List<TicketLineInfo> m_aLines;
     private List<PaymentInfo> payments;
     private List<TicketTaxInfo> taxes;
     private final String m_sResponse;
     private String loyaltyCardNumber;
     private Boolean oldTicket;
     private boolean tip;
-  private PaymentInfoTicket ticketPaymentInfo;
-  private boolean isProcessed;
-  private final String locked;
+    private PaymentInfoTicket m_paymentInfo;
+    private boolean m_isProcessed;
+    private final String m_locked;
     private Double nsum;
     private int ticketstatus;
 
@@ -91,15 +91,15 @@ public final class TicketInfo implements SerializableRead, Externalizable {
 
     /** Creates new TicketModel */
     public TicketInfo() {
-    id = UUID.randomUUID().toString();
-    ticketType = RECEIPT_NORMAL;
-    ticketId = 0; // incrementamos
-    date = new Date();
+        m_sId = UUID.randomUUID().toString();
+        tickettype = RECEIPT_NORMAL;
+        m_iTicketId = 0; // incrementamos
+        m_dDate = new Date();
         attributes = new Properties();
-    userInfo = null;
-    cutomerInfoExt = null;
-    activeCash = null;
-    ticketLines = new ArrayList<>();
+        m_User = null;
+        m_Customer = null;
+        m_sActiveCash = null;
+        m_aLines = new ArrayList<>();
         payments = new ArrayList<>();
         taxes = null;
         m_sResponse = null;
@@ -109,35 +109,35 @@ public final class TicketInfo implements SerializableRead, Externalizable {
             System.getProperty("user.home")), AppLocal.APP_ID + ".properties"));
         config.load();
         tip = Boolean.valueOf(config.getProperty("machine.showTip"));
-    isProcessed = false;
-    locked = null;
+        m_isProcessed = false;
+        m_locked = null;
         ticketstatus = 0;        
     }
 
     @Override
     public void writeExternal(ObjectOutput out) throws IOException {
-    out.writeObject(id);
-    out.writeInt(ticketType);
-    out.writeInt(ticketId);
-    out.writeObject(cutomerInfoExt);
-    out.writeObject(date);
+        out.writeObject(m_sId);
+        out.writeInt(tickettype);
+        out.writeInt(m_iTicketId);
+        out.writeObject(m_Customer);
+        out.writeObject(m_dDate);
         out.writeObject(attributes);
-    out.writeObject(ticketLines);
+        out.writeObject(m_aLines);
 
         out.writeInt(ticketstatus);
     }
 
     @Override
     public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
-    id = (String) in.readObject();
-    ticketType = in.readInt();
-    ticketId = in.readInt();
-    cutomerInfoExt = (CustomerInfoExt) in.readObject();
-    date = (Date) in.readObject();
+        m_sId = (String) in.readObject();
+        tickettype = in.readInt();
+        m_iTicketId = in.readInt();
+        m_Customer = (CustomerInfoExt) in.readObject();
+        m_dDate = (Date) in.readObject();
         attributes = (Properties) in.readObject();
-    ticketLines = (List<TicketLineInfo>) in.readObject();
-    userInfo = null;
-    activeCash = null;
+        m_aLines = (List<TicketLineInfo>) in.readObject();
+        m_User = null;
+        m_sActiveCash = 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 {
-    id = dr.getString(1);
-    ticketType = dr.getInt(2);
-    ticketId = dr.getInt(3);
-    date = dr.getTimestamp(4);
-    activeCash = dr.getString(5);
+        m_sId = dr.getString(1);
+        tickettype = dr.getInt(2);
+        m_iTicketId = dr.getInt(3);
+        m_dDate = dr.getTimestamp(4);
+        m_sActiveCash = 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) {
         }
-    userInfo = new UserInfo(dr.getString(7), dr.getString(8));
-    cutomerInfoExt = new CustomerInfoExt(dr.getString(9));
-    ticketLines = new ArrayList<>();
+        m_User = new UserInfo(dr.getString(7), dr.getString(8));
+        m_Customer = new CustomerInfoExt(dr.getString(9));
+        m_aLines = new ArrayList<>();
         payments = new ArrayList<>();
         taxes = null;
         
@@ -177,72 +177,69 @@ public final class TicketInfo implements SerializableRead, Externalizable {
      * @return
      */
     public TicketInfo copyTicket() {
-    TicketInfo ticketInfo = new TicketInfo();
+        TicketInfo t = new TicketInfo();
 
-    ticketInfo.ticketType = ticketType;
-    ticketInfo.ticketId = ticketId;
-    ticketInfo.date = date;
-    ticketInfo.activeCash = activeCash;
-    ticketInfo.attributes = (Properties) attributes.clone();
-    ticketInfo.userInfo = userInfo;
-    ticketInfo.cutomerInfoExt = cutomerInfoExt;
+        t.tickettype = tickettype;
+        t.m_iTicketId = m_iTicketId;
+        t.m_dDate = m_dDate;
+        t.m_sActiveCash = m_sActiveCash;
+        t.attributes = (Properties) attributes.clone();
+        t.m_User = m_User;
+        t.m_Customer = m_Customer;
 
-    ticketInfo.ticketLines = new ArrayList<>(); // JG June 2102 diamond inference
-    ticketLines.forEach((line) -> {
-      ticketInfo.ticketLines.add(line.copyTicketLine());
+        t.m_aLines = new ArrayList<>(); // JG June 2102 diamond inference
+        m_aLines.forEach((l) -> {
+            t.m_aLines.add(l.copyTicketLine());
         });
-    ticketInfo.refreshLines();
+        t.refreshLines();
 
-    ticketInfo.payments = new LinkedList<>(); // JG June 2102 diamond inference
+        t.payments = new LinkedList<>(); // JG June 2102 diamond inference
         payments.forEach((p) -> {
-      ticketInfo.payments.add(p.copyPayment());
+            t.payments.add(p.copyPayment());
         });
-    ticketInfo.oldTicket = oldTicket;
+        t.oldTicket=oldTicket;
         // taxes are not copied, must be calculated again.
 
-    ticketInfo.ticketstatus = ticketstatus;
+        t.ticketstatus = ticketstatus;
         
-    return ticketInfo;
+        return t;
     }
 
     public String getId() {
-    return id;
+        return m_sId;
     }
 
     public int getTicketType() {
-    return ticketType;
+        return tickettype;
     }
-
     public void setTicketType(int tickettype) {
-    this.ticketType = tickettype;
+        this.tickettype = tickettype;
     }
 
     public int getTicketId() {
-    return ticketId;
+        return m_iTicketId;
     }
-
     public void setTicketId(int iTicketId) {
-    ticketId = iTicketId;
+        m_iTicketId = iTicketId;
     }
 
     public int getTicketStatus() {
         return ticketstatus;
     }
-
     public void setTicketStatus(int ticketstatus) {
-    if (ticketId > 0) {
-      this.ticketstatus = ticketId;
+        if (m_iTicketId >0) {
+            this.ticketstatus = m_iTicketId;
         }else{
             this.ticketstatus = ticketstatus;
         }
     }
     
     public void setPickupId(int iTicketId) {
-    pickupId = iTicketId;
+        m_iPickupId = iTicketId;
     }
 
     public int getPickupId() {
-    return pickupId;
+        return m_iPickupId;
     }
     
     public String getName(Object info) {
@@ -254,23 +251,23 @@ public final class TicketInfo implements SerializableRead, Externalizable {
             name.add(nameprop);            
         }
         
-    if (userInfo != null) {
-      name.add(userInfo.getName());
+        if (m_User != null) {
+            name.add(m_User.getName());                        
         }
 
         if (info == null) {
-      if (ticketId == 0) {
-        name.add("(" + m_dateformat.format(date) + " "
-            + Long.toString(date.getTime() % 1000) + ")");
+            if (m_iTicketId == 0) {
+                name.add("(" + m_dateformat.format(m_dDate) + " " 
+                        + Long.toString(m_dDate.getTime() % 1000) + ")");                
             } else {
-        name.add(Integer.toString(ticketId));
+                name.add(Integer.toString(m_iTicketId));                
             }
         } else {
             name.add(info.toString());            
         }
 
-    if (cutomerInfoExt != null) {
-      name.add(cutomerInfoExt.getName());
+        if (m_Customer != null) {        
+            name.add(m_Customer.getName());            
         }
 
         return org.apache.commons.lang.StringUtils.join(name, " - ");        
@@ -281,11 +278,11 @@ public final class TicketInfo implements SerializableRead, Externalizable {
     }
 
     public java.util.Date getDate() {
-    return date;
+        return m_dDate;
     }
 
     public void setDate(java.util.Date dDate) {
-    date = dDate;
+        m_dDate = dDate;
     }
     
     public String getHost() {
@@ -297,27 +294,27 @@ public final class TicketInfo implements SerializableRead, Externalizable {
       return machineHostname;
     }
     
-  public UserInfo getUserInfo() {
-    return userInfo;
+    public UserInfo getUser() {
+        return m_User;
     }
 
-  public void setUserInfo(UserInfo value) {
-    userInfo = value;
+    public void setUser(UserInfo value) {
+        m_User = value;
     }
 
     public CustomerInfoExt getCustomer() {
-    return cutomerInfoExt;
+        return m_Customer;
     }
 
     public void setCustomer(CustomerInfoExt value) {
-    cutomerInfoExt = value;
+        m_Customer = value;
     }
 
     public String getCustomerId() {
-    if (cutomerInfoExt == null) {
+        if (m_Customer == null) {
             return null;
         } else {
-      return cutomerInfoExt.getId();
+            return m_Customer.getId();
         }
     }
     
@@ -334,11 +331,11 @@ public final class TicketInfo implements SerializableRead, Externalizable {
     }
 
     public void setActiveCash(String value) {
-    activeCash = value;
+        m_sActiveCash = value;
     }
 
     public String getActiveCash() {
-    return activeCash;
+        return m_sActiveCash;
     }
 
     public String getProperty(String key) {
@@ -358,45 +355,45 @@ public final class TicketInfo implements SerializableRead, Externalizable {
     }
 
     public TicketLineInfo getLine(int index) {
-    return ticketLines.get(index);
+        return m_aLines.get(index);
     }
 
     public void addLine(TicketLineInfo oLine) {
-    oLine.setTicket(id, ticketLines.size());
-    ticketLines.add(oLine);
+        oLine.setTicket(m_sId, m_aLines.size());
+        m_aLines.add(oLine);
     }
 
     public void insertLine(int index, TicketLineInfo oLine) {
-    ticketLines.add(index, oLine);
+        m_aLines.add(index, oLine);
         refreshLines();
     }
 
     public void setLine(int index, TicketLineInfo oLine) {
-    oLine.setTicket(id, index);
-    ticketLines.set(index, oLine);
+        oLine.setTicket(m_sId, index);
+        m_aLines.set(index, oLine);
     }
 
     public void removeLine(int index) {
-    ticketLines.remove(index);
+        m_aLines.remove(index);
         refreshLines();
        
     }
 
     public void refreshLines() {
-    for (int i = 0; i < ticketLines.size(); i++) {
-      getLine(i).setTicket(id, i);
+        for (int i = 0; i < m_aLines.size(); i++) {
+            getLine(i).setTicket(m_sId, i);
         }
     }
 
     public int getLinesCount() {
-    return ticketLines.size();
+        return m_aLines.size();
     }
     
     public double getArticlesCount() {
         double dArticles = 0.0;
         TicketLineInfo oLine;
 
-    for (Iterator<TicketLineInfo> i = ticketLines.iterator(); i.hasNext();) {
+        for (Iterator<TicketLineInfo> i = m_aLines.iterator(); i.hasNext();) {
             oLine = i.next();
             dArticles += oLine.getMultiply();
         }
@@ -406,8 +403,9 @@ public final class TicketInfo implements SerializableRead, Externalizable {
 
     public double getSubTotal() {
         double sum = 0.0;
-    sum = ticketLines.stream().map((line) -> line.getSubValue()).reduce(sum,
-        (accumulator, _item) -> accumulator + _item);
+        sum = m_aLines.stream().map((line) -> 
+                line.getSubValue()).reduce(sum, (accumulator, _item) -> 
+                        accumulator + _item);
         return sum;
     }
 
@@ -420,7 +418,9 @@ public final class TicketInfo implements SerializableRead, Externalizable {
                 nsum = sum;
             }
         } else {
-      sum = ticketLines.stream().map((line) -> line.getTax()).reduce(sum, (accumulator, _item) -> accumulator + _item);
+            sum = m_aLines.stream().map((line) -> 
+                    line.getTax()).reduce(sum, (accumulator, _item) -> 
+                            accumulator + _item);
             }
         return sum;
     }
@@ -437,8 +437,10 @@ public final class TicketInfo implements SerializableRead, Externalizable {
     
     public double getTotalPaid() {
         double sum = 0.0;
-    sum = payments.stream().filter((p) -> (!"debtpaid".equals(p.getName()))).map((p) -> p.getTotal()).reduce(sum,
-        (accumulator, _item) -> accumulator + _item);
+        sum = payments.stream().filter((p) -> 
+                (!"debtpaid".equals(p.getName()))).map((p) -> 
+                        p.getTotal()).reduce(sum, (accumulator, _item) -> 
+                                accumulator + _item);
         return sum;
           }
 
@@ -447,11 +449,11 @@ public final class TicketInfo implements SerializableRead, Externalizable {
     }    
 
     public List<TicketLineInfo> getLines() {
-    return ticketLines;
+        return m_aLines;
     }
 
     public void setLines(List<TicketLineInfo> l) {
-    ticketLines = l;
+        m_aLines = l;
     }
 
     public List<PaymentInfo> getPayments() {
@@ -491,7 +493,7 @@ public final class TicketInfo implements SerializableRead, Externalizable {
     }
 
     public void setIsProcessed(boolean isP) {
-    isProcessed = isP;
+        m_isProcessed = isP;
     }
 
     public TicketTaxInfo getTaxLine(TaxInfo tax) {
@@ -510,7 +512,7 @@ public final class TicketInfo implements SerializableRead, Externalizable {
         Map<String, TicketTaxInfo> m = new HashMap<>();
 
         TicketLineInfo oLine;
-    for (Iterator<TicketLineInfo> i = ticketLines.iterator(); i.hasNext();) {
+        for (Iterator<TicketLineInfo> i = m_aLines.iterator(); i.hasNext();) {
             oLine = i.next();
 
             TicketTaxInfo t = m.get(oLine.getTaxInfo().getId());
@@ -536,8 +538,8 @@ public final class TicketInfo implements SerializableRead, Externalizable {
      
       m_config =null;
 
-    if (ticketId > 0) {
-      String tmpTicketId = Integer.toString(ticketId);
+        if (m_iTicketId > 0) {
+            String tmpTicketId=Integer.toString(m_iTicketId);
             if (receiptSize == null || (Integer.parseInt(receiptSize) <= tmpTicketId.length())){
                 if (receiptPrefix != null){
                     tmpTicketId=receiptPrefix+tmpTicketId;
@@ -557,18 +559,19 @@ public final class TicketInfo implements SerializableRead, Externalizable {
     }
 
     public String printDate() {
-    return Formats.TIMESTAMP.formatValue(date);
+        return Formats.TIMESTAMP.formatValue(m_dDate);
     }
 
     public String printUser() {
-    return userInfo == null ? "" : userInfo.getName();
+        return m_User == null ? "" : m_User.getName();
         
     }
 
     public String printHost() {
-    return host;
+        return m_sHost;
        }
     
+    
 // Added JDL 28.05.13 for loyalty card functions
 
     /**
@@ -595,11 +598,11 @@ public final class TicketInfo implements SerializableRead, Externalizable {
     }
          
     public String printCustomer() {
-    return cutomerInfoExt == null ? "" : cutomerInfoExt.getName();
+        return m_Customer == null ? "" : m_Customer.getName();
     }
 
     public String printPhone1() {
-    return cutomerInfoExt == null ? "" : cutomerInfoExt.getPhone1();
+        return m_Customer == null ? "" : m_Customer.getPhone1();
     }    
 
     public String printArticlesCount() {
@@ -639,7 +642,8 @@ public final class TicketInfo implements SerializableRead, Externalizable {
     }
     
     public String getTicketHeaderFooterData(String data) {
-    AppConfig m_config = new AppConfig(new File((System.getProperty("user.home")), AppLocal.APP_ID + ".properties"));
+        AppConfig m_config = new AppConfig(new File((System.getProperty("user.home"))
+                , AppLocal.APP_ID + ".properties"));        
         m_config.load();
         String row =(m_config.getProperty("tkt."+data));
         

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

@@ -56,15 +56,12 @@ 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);
     }
@@ -82,7 +79,6 @@ public class TicketLineInfo implements SerializableWrite, SerializableRead, Seri
 
     /**
      * Example: Call from script.TotalDiscount event
-   * 
      * @param productid
      * @param productname
      * @param producttaxcategory
@@ -91,8 +87,7 @@ 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);
@@ -103,7 +98,6 @@ public class TicketLineInfo implements SerializableWrite, SerializableRead, Seri
 
     /**
      * Example: Call from script.LineDiscount event
-   * 
      * @param productname
      * @param producttaxcategory
      * @param productprinter    //added to props as may introduce printer redirect
@@ -111,8 +105,7 @@ 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);
@@ -215,8 +208,7 @@ 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;
@@ -314,40 +306,31 @@ public class TicketLineInfo implements SerializableWrite, SerializableRead, Seri
     public int getTicketLine() {
         return m_iLine;
     }
-
 // 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;
     }     
@@ -356,28 +339,22 @@ public class TicketLineInfo implements SerializableWrite, SerializableRead, Seri
     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");
     }    
@@ -390,11 +367,9 @@ 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);
     }
@@ -403,11 +378,9 @@ public class TicketLineInfo implements SerializableWrite, SerializableRead, Seri
     public double getTax() {
         return price * multiply * getTaxRate();
     }
-
     public double getValue() {
         return price * multiply * (1.0 + getTaxRate());
     }
-
     public double getSubValue() {
         return price * multiply;
     }    
@@ -416,27 +389,21 @@ public class TicketLineInfo implements SerializableWrite, SerializableRead, Seri
     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 setProductAttSetInstId(String value) {
         attsetinstid = value;
     }
-
     public void setProductAttSetInstDesc(String value) {
         if (value == null) {
             attributes.remove(value);
@@ -444,11 +411,9 @@ 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 setProductPrinter(String value) {
         if (value == null) {
             attributes.remove(value);
@@ -465,79 +430,60 @@ 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/resources/com/unicenta/pos/scripts/MySQL-upgrade_master.sql

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

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.4.0 Upgrade!</h2></br><h3>Your current database version is {0}</h3><br>For version 5.3 and above click <b>YES</b><br/><br/>For any other version click <b>NO</b> and get to 5.3 first<br><br/>
+message.eolupdate=<html><center><h2>Version 5.3.2 Upgrade!</h2></br><h3>Your current database version is {0}</h3><br>For version 5.3 click <b>YES</b><br/><br/>For any other version click <b>NO</b> and get to 5.3 first<br><br/>
 message.ibuttonassign=<html><center>Get the iButton ID<br>Place iButton onto the reader then click OK 
 message.ibuttonnotassign=<html><center>The iButton used is not yet assigned to anyone
 message.ibuttonnotfound=No iButton adapter found.  Key fobs will be disabled.

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

@@ -4,6 +4,7 @@ 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.Ignore;
 import org.junit.jupiter.api.Test;
 
 import javax.imageio.ImageIO;
@@ -13,9 +14,8 @@ import java.nio.charset.StandardCharsets;
 import java.util.Base64;
 
 import static org.junit.jupiter.api.Assertions.*;
-
+@Ignore
 class QRCodeTest {
-
     @Test
     void shouldPrintQRCode() throws Exception {
         // Name
@@ -66,8 +66,12 @@ class QRCodeTest {
 
         BufferedImage bufferedImage = MatrixToImageWriter.toBufferedImage(bitMatrix);
 
-        File outputfile = new File("test.jpg");
-        assert  ImageIO.write(bufferedImage, "jpg", outputfile);
+        String fileName = "output/test-output.jpg";
+        File outputFile = new File(fileName);
+
+        // Create the parent directories if they don't exist
+        outputFile.getParentFile().mkdirs();
+        assert  ImageIO.write(bufferedImage, "jpg", outputFile);
 
     }
 }