5.4.0 web release java 8 requirements

merge main
5.4.0 release for web / don't need derbyshared
2025-08-06 18:10:42 +01:00 · 2025-08-06 17:39:16 +01:00 · 2025-08-04 17:07:49 +01:00 · 2025-08-04 16:57:31 +01:00 · 2025-07-31 19:13:42 +01:00 · 2025-07-31 16:03:08 +01:00
47 changed files with 1763 additions and 690 deletions
@@ -0,0 +1,18 @@
+name: Java CI with Maven
+
+on: [workflow_dispatch]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4
+      - name: Set up JDK 11
+        uses: actions/setup-java@v3
+        with:
+          java-version: '11'
+          distribution: 'adopt'
+          cache: maven
+      - name: Build with Maven
+        run: mvn -B package --file pom.xml
@@ -0,0 +1,117 @@
+/*
+ * Copyright 2007-present the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import java.net.*;
+import java.io.*;
+import java.nio.channels.*;
+import java.util.Properties;
+
+public class MavenWrapperDownloader {
+
+    private static final String WRAPPER_VERSION = "0.5.6";
+    /**
+     * Default URL to download the maven-wrapper.jar from, if no 'downloadUrl' is provided.
+     */
+    private static final String DEFAULT_DOWNLOAD_URL = "https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/"
+        + WRAPPER_VERSION + "/maven-wrapper-" + WRAPPER_VERSION + ".jar";
+
+    /**
+     * Path to the maven-wrapper.properties file, which might contain a downloadUrl property to
+     * use instead of the default one.
+     */
+    private static final String MAVEN_WRAPPER_PROPERTIES_PATH =
+            ".mvn/wrapper/maven-wrapper.properties";
+
+    /**
+     * Path where the maven-wrapper.jar will be saved to.
+     */
+    private static final String MAVEN_WRAPPER_JAR_PATH =
+            ".mvn/wrapper/maven-wrapper.jar";
+
+    /**
+     * Name of the property which should be used to override the default download url for the wrapper.
+     */
+    private static final String PROPERTY_NAME_WRAPPER_URL = "wrapperUrl";
+
+    public static void main(String args[]) {
+        System.out.println("- Downloader started");
+        File baseDirectory = new File(args[0]);
+        System.out.println("- Using base directory: " + baseDirectory.getAbsolutePath());
+
+        // If the maven-wrapper.properties exists, read it and check if it contains a custom
+        // wrapperUrl parameter.
+        File mavenWrapperPropertyFile = new File(baseDirectory, MAVEN_WRAPPER_PROPERTIES_PATH);
+        String url = DEFAULT_DOWNLOAD_URL;
+        if(mavenWrapperPropertyFile.exists()) {
+            FileInputStream mavenWrapperPropertyFileInputStream = null;
+            try {
+                mavenWrapperPropertyFileInputStream = new FileInputStream(mavenWrapperPropertyFile);
+                Properties mavenWrapperProperties = new Properties();
+                mavenWrapperProperties.load(mavenWrapperPropertyFileInputStream);
+                url = mavenWrapperProperties.getProperty(PROPERTY_NAME_WRAPPER_URL, url);
+            } catch (IOException e) {
+                System.out.println("- ERROR loading '" + MAVEN_WRAPPER_PROPERTIES_PATH + "'");
+            } finally {
+                try {
+                    if(mavenWrapperPropertyFileInputStream != null) {
+                        mavenWrapperPropertyFileInputStream.close();
+                    }
+                } catch (IOException e) {
+                    // Ignore ...
+                }
+            }
+        }
+        System.out.println("- Downloading from: " + url);
+
+        File outputFile = new File(baseDirectory.getAbsolutePath(), MAVEN_WRAPPER_JAR_PATH);
+        if(!outputFile.getParentFile().exists()) {
+            if(!outputFile.getParentFile().mkdirs()) {
+                System.out.println(
+                        "- ERROR creating output directory '" + outputFile.getParentFile().getAbsolutePath() + "'");
+            }
+        }
+        System.out.println("- Downloading to: " + outputFile.getAbsolutePath());
+        try {
+            downloadFileFromURL(url, outputFile);
+            System.out.println("Done");
+            System.exit(0);
+        } catch (Throwable e) {
+            System.out.println("- Error downloading");
+            e.printStackTrace();
+            System.exit(1);
+        }
+    }
+
+    private static void downloadFileFromURL(String urlString, File destination) throws Exception {
+        if (System.getenv("MVNW_USERNAME") != null && System.getenv("MVNW_PASSWORD") != null) {
+            String username = System.getenv("MVNW_USERNAME");
+            char[] password = System.getenv("MVNW_PASSWORD").toCharArray();
+            Authenticator.setDefault(new Authenticator() {
+                @Override
+                protected PasswordAuthentication getPasswordAuthentication() {
+                    return new PasswordAuthentication(username, password);
+                }
+            });
+        }
+        URL website = new URL(urlString);
+        ReadableByteChannel rbc;
+        rbc = Channels.newChannel(website.openStream());
+        FileOutputStream fos = new FileOutputStream(destination);
+        fos.getChannel().transferFrom(rbc, 0, Long.MAX_VALUE);
+        fos.close();
+        rbc.close();
+    }
+
+}
@@ -0,0 +1,2 @@
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.3/apache-maven-3.6.3-bin.zip
+wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar
@@ -0,0 +1,310 @@
+#!/bin/sh
+# ----------------------------------------------------------------------------
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+# ----------------------------------------------------------------------------
+
+# ----------------------------------------------------------------------------
+# Maven Start Up Batch script
+#
+# Required ENV vars:
+# ------------------
+#   JAVA_HOME - location of a JDK home dir
+#
+# Optional ENV vars
+# -----------------
+#   M2_HOME - location of maven2's installed home dir
+#   MAVEN_OPTS - parameters passed to the Java VM when running Maven
+#     e.g. to debug Maven itself, use
+#       set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
+#   MAVEN_SKIP_RC - flag to disable loading of mavenrc files
+# ----------------------------------------------------------------------------
+
+if [ -z "$MAVEN_SKIP_RC" ] ; then
+
+  if [ -f /etc/mavenrc ] ; then
+    . /etc/mavenrc
+  fi
+
+  if [ -f "$HOME/.mavenrc" ] ; then
+    . "$HOME/.mavenrc"
+  fi
+
+fi
+
+# OS specific support.  $var _must_ be set to either true or false.
+cygwin=false;
+darwin=false;
+mingw=false
+case "`uname`" in
+  CYGWIN*) cygwin=true ;;
+  MINGW*) mingw=true;;
+  Darwin*) darwin=true
+    # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home
+    # See https://developer.apple.com/library/mac/qa/qa1170/_index.html
+    if [ -z "$JAVA_HOME" ]; then
+      if [ -x "/usr/libexec/java_home" ]; then
+        export JAVA_HOME="`/usr/libexec/java_home`"
+      else
+        export JAVA_HOME="/Library/Java/Home"
+      fi
+    fi
+    ;;
+esac
+
+if [ -z "$JAVA_HOME" ] ; then
+  if [ -r /etc/gentoo-release ] ; then
+    JAVA_HOME=`java-config --jre-home`
+  fi
+fi
+
+if [ -z "$M2_HOME" ] ; then
+  ## resolve links - $0 may be a link to maven's home
+  PRG="$0"
+
+  # need this for relative symlinks
+  while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+      PRG="$link"
+    else
+      PRG="`dirname "$PRG"`/$link"
+    fi
+  done
+
+  saveddir=`pwd`
+
+  M2_HOME=`dirname "$PRG"`/..
+
+  # make it fully qualified
+  M2_HOME=`cd "$M2_HOME" && pwd`
+
+  cd "$saveddir"
+  # echo Using m2 at $M2_HOME
+fi
+
+# For Cygwin, ensure paths are in UNIX format before anything is touched
+if $cygwin ; then
+  [ -n "$M2_HOME" ] &&
+    M2_HOME=`cygpath --unix "$M2_HOME"`
+  [ -n "$JAVA_HOME" ] &&
+    JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
+  [ -n "$CLASSPATH" ] &&
+    CLASSPATH=`cygpath --path --unix "$CLASSPATH"`
+fi
+
+# For Mingw, ensure paths are in UNIX format before anything is touched
+if $mingw ; then
+  [ -n "$M2_HOME" ] &&
+    M2_HOME="`(cd "$M2_HOME"; pwd)`"
+  [ -n "$JAVA_HOME" ] &&
+    JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`"
+fi
+
+if [ -z "$JAVA_HOME" ]; then
+  javaExecutable="`which javac`"
+  if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then
+    # readlink(1) is not available as standard on Solaris 10.
+    readLink=`which readlink`
+    if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then
+      if $darwin ; then
+        javaHome="`dirname \"$javaExecutable\"`"
+        javaExecutable="`cd \"$javaHome\" && pwd -P`/javac"
+      else
+        javaExecutable="`readlink -f \"$javaExecutable\"`"
+      fi
+      javaHome="`dirname \"$javaExecutable\"`"
+      javaHome=`expr "$javaHome" : '\(.*\)/bin'`
+      JAVA_HOME="$javaHome"
+      export JAVA_HOME
+    fi
+  fi
+fi
+
+if [ -z "$JAVACMD" ] ; then
+  if [ -n "$JAVA_HOME"  ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+      # IBM's JDK on AIX uses strange locations for the executables
+      JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+      JAVACMD="$JAVA_HOME/bin/java"
+    fi
+  else
+    JAVACMD="`which java`"
+  fi
+fi
+
+if [ ! -x "$JAVACMD" ] ; then
+  echo "Error: JAVA_HOME is not defined correctly." >&2
+  echo "  We cannot execute $JAVACMD" >&2
+  exit 1
+fi
+
+if [ -z "$JAVA_HOME" ] ; then
+  echo "Warning: JAVA_HOME environment variable is not set."
+fi
+
+CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher
+
+# traverses directory structure from process work directory to filesystem root
+# first directory with .mvn subdirectory is considered project base directory
+find_maven_basedir() {
+
+  if [ -z "$1" ]
+  then
+    echo "Path not specified to find_maven_basedir"
+    return 1
+  fi
+
+  basedir="$1"
+  wdir="$1"
+  while [ "$wdir" != '/' ] ; do
+    if [ -d "$wdir"/.mvn ] ; then
+      basedir=$wdir
+      break
+    fi
+    # workaround for JBEAP-8937 (on Solaris 10/Sparc)
+    if [ -d "${wdir}" ]; then
+      wdir=`cd "$wdir/.."; pwd`
+    fi
+    # end of workaround
+  done
+  echo "${basedir}"
+}
+
+# concatenates all lines of a file
+concat_lines() {
+  if [ -f "$1" ]; then
+    echo "$(tr -s '\n' ' ' < "$1")"
+  fi
+}
+
+BASE_DIR=`find_maven_basedir "$(pwd)"`
+if [ -z "$BASE_DIR" ]; then
+  exit 1;
+fi
+
+##########################################################################################
+# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
+# This allows using the maven wrapper in projects that prohibit checking in binary data.
+##########################################################################################
+if [ -r "$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" ]; then
+    if [ "$MVNW_VERBOSE" = true ]; then
+      echo "Found .mvn/wrapper/maven-wrapper.jar"
+    fi
+else
+    if [ "$MVNW_VERBOSE" = true ]; then
+      echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..."
+    fi
+    if [ -n "$MVNW_REPOURL" ]; then
+      jarUrl="$MVNW_REPOURL/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
+    else
+      jarUrl="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
+    fi
+    while IFS="=" read key value; do
+      case "$key" in (wrapperUrl) jarUrl="$value"; break ;;
+      esac
+    done < "$BASE_DIR/.mvn/wrapper/maven-wrapper.properties"
+    if [ "$MVNW_VERBOSE" = true ]; then
+      echo "Downloading from: $jarUrl"
+    fi
+    wrapperJarPath="$BASE_DIR/.mvn/wrapper/maven-wrapper.jar"
+    if $cygwin; then
+      wrapperJarPath=`cygpath --path --windows "$wrapperJarPath"`
+    fi
+
+    if command -v wget > /dev/null; then
+        if [ "$MVNW_VERBOSE" = true ]; then
+          echo "Found wget ... using wget"
+        fi
+        if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then
+            wget "$jarUrl" -O "$wrapperJarPath"
+        else
+            wget --http-user=$MVNW_USERNAME --http-password=$MVNW_PASSWORD "$jarUrl" -O "$wrapperJarPath"
+        fi
+    elif command -v curl > /dev/null; then
+        if [ "$MVNW_VERBOSE" = true ]; then
+          echo "Found curl ... using curl"
+        fi
+        if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then
+            curl -o "$wrapperJarPath" "$jarUrl" -f
+        else
+            curl --user $MVNW_USERNAME:$MVNW_PASSWORD -o "$wrapperJarPath" "$jarUrl" -f
+        fi
+
+    else
+        if [ "$MVNW_VERBOSE" = true ]; then
+          echo "Falling back to using Java to download"
+        fi
+        javaClass="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.java"
+        # For Cygwin, switch paths to Windows format before running javac
+        if $cygwin; then
+          javaClass=`cygpath --path --windows "$javaClass"`
+        fi
+        if [ -e "$javaClass" ]; then
+            if [ ! -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then
+                if [ "$MVNW_VERBOSE" = true ]; then
+                  echo " - Compiling MavenWrapperDownloader.java ..."
+                fi
+                # Compiling the Java class
+                ("$JAVA_HOME/bin/javac" "$javaClass")
+            fi
+            if [ -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then
+                # Running the downloader
+                if [ "$MVNW_VERBOSE" = true ]; then
+                  echo " - Running MavenWrapperDownloader.java ..."
+                fi
+                ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$MAVEN_PROJECTBASEDIR")
+            fi
+        fi
+    fi
+fi
+##########################################################################################
+# End of extension
+##########################################################################################
+
+export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"}
+if [ "$MVNW_VERBOSE" = true ]; then
+  echo $MAVEN_PROJECTBASEDIR
+fi
+MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS"
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin; then
+  [ -n "$M2_HOME" ] &&
+    M2_HOME=`cygpath --path --windows "$M2_HOME"`
+  [ -n "$JAVA_HOME" ] &&
+    JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
+  [ -n "$CLASSPATH" ] &&
+    CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
+  [ -n "$MAVEN_PROJECTBASEDIR" ] &&
+    MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"`
+fi
+
+# Provide a "standardized" way to retrieve the CLI args that will
+# work with both Windows and non-Windows executions.
+MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $@"
+export MAVEN_CMD_LINE_ARGS
+
+WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
+
+exec "$JAVACMD" \
+  $MAVEN_OPTS \
+  -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \
+  "-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \
+  ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@"
@@ -0,0 +1,182 @@
+@REM ----------------------------------------------------------------------------
+@REM Licensed to the Apache Software Foundation (ASF) under one
+@REM or more contributor license agreements.  See the NOTICE file
+@REM distributed with this work for additional information
+@REM regarding copyright ownership.  The ASF licenses this file
+@REM to you under the Apache License, Version 2.0 (the
+@REM "License"); you may not use this file except in compliance
+@REM with the License.  You may obtain a copy of the License at
+@REM
+@REM    http://www.apache.org/licenses/LICENSE-2.0
+@REM
+@REM Unless required by applicable law or agreed to in writing,
+@REM software distributed under the License is distributed on an
+@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+@REM KIND, either express or implied.  See the License for the
+@REM specific language governing permissions and limitations
+@REM under the License.
+@REM ----------------------------------------------------------------------------
+
+@REM ----------------------------------------------------------------------------
+@REM Maven Start Up Batch script
+@REM
+@REM Required ENV vars:
+@REM JAVA_HOME - location of a JDK home dir
+@REM
+@REM Optional ENV vars
+@REM M2_HOME - location of maven2's installed home dir
+@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands
+@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a keystroke before ending
+@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven
+@REM     e.g. to debug Maven itself, use
+@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
+@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files
+@REM ----------------------------------------------------------------------------
+
+@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on'
+@echo off
+@REM set title of command window
+title %0
+@REM enable echoing by setting MAVEN_BATCH_ECHO to 'on'
+@if "%MAVEN_BATCH_ECHO%" == "on"  echo %MAVEN_BATCH_ECHO%
+
+@REM set %HOME% to equivalent of $HOME
+if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%")
+
+@REM Execute a user defined script before this one
+if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre
+@REM check for pre script, once with legacy .bat ending and once with .cmd ending
+if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat"
+if exist "%HOME%\mavenrc_pre.cmd" call "%HOME%\mavenrc_pre.cmd"
+:skipRcPre
+
+@setlocal
+
+set ERROR_CODE=0
+
+@REM To isolate internal variables from possible post scripts, we use another setlocal
+@setlocal
+
+@REM ==== START VALIDATION ====
+if not "%JAVA_HOME%" == "" goto OkJHome
+
+echo.
+echo Error: JAVA_HOME not found in your environment. >&2
+echo Please set the JAVA_HOME variable in your environment to match the >&2
+echo location of your Java installation. >&2
+echo.
+goto error
+
+:OkJHome
+if exist "%JAVA_HOME%\bin\java.exe" goto init
+
+echo.
+echo Error: JAVA_HOME is set to an invalid directory. >&2
+echo JAVA_HOME = "%JAVA_HOME%" >&2
+echo Please set the JAVA_HOME variable in your environment to match the >&2
+echo location of your Java installation. >&2
+echo.
+goto error
+
+@REM ==== END VALIDATION ====
+
+:init
+
+@REM Find the project base dir, i.e. the directory that contains the folder ".mvn".
+@REM Fallback to current working directory if not found.
+
+set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR%
+IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir
+
+set EXEC_DIR=%CD%
+set WDIR=%EXEC_DIR%
+:findBaseDir
+IF EXIST "%WDIR%"\.mvn goto baseDirFound
+cd ..
+IF "%WDIR%"=="%CD%" goto baseDirNotFound
+set WDIR=%CD%
+goto findBaseDir
+
+:baseDirFound
+set MAVEN_PROJECTBASEDIR=%WDIR%
+cd "%EXEC_DIR%"
+goto endDetectBaseDir
+
+:baseDirNotFound
+set MAVEN_PROJECTBASEDIR=%EXEC_DIR%
+cd "%EXEC_DIR%"
+
+:endDetectBaseDir
+
+IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig
+
+@setlocal EnableExtensions EnableDelayedExpansion
+for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a
+@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS%
+
+:endReadAdditionalConfig
+
+SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe"
+set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar"
+set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
+
+set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
+
+FOR /F "tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO (
+    IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B
+)
+
+@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
+@REM This allows using the maven wrapper in projects that prohibit checking in binary data.
+if exist %WRAPPER_JAR% (
+    if "%MVNW_VERBOSE%" == "true" (
+        echo Found %WRAPPER_JAR%
+    )
+) else (
+    if not "%MVNW_REPOURL%" == "" (
+        SET DOWNLOAD_URL="%MVNW_REPOURL%/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
+    )
+    if "%MVNW_VERBOSE%" == "true" (
+        echo Couldn't find %WRAPPER_JAR%, downloading it ...
+        echo Downloading from: %DOWNLOAD_URL%
+    )
+
+    powershell -Command "&{"^
+		"$webclient = new-object System.Net.WebClient;"^
+		"if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^
+		"$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^
+		"}"^
+		"[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%DOWNLOAD_URL%', '%WRAPPER_JAR%')"^
+		"}"
+    if "%MVNW_VERBOSE%" == "true" (
+        echo Finished downloading %WRAPPER_JAR%
+    )
+)
+@REM End of extension
+
+@REM Provide a "standardized" way to retrieve the CLI args that will
+@REM work with both Windows and non-Windows executions.
+set MAVEN_CMD_LINE_ARGS=%*
+
+%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %*
+if ERRORLEVEL 1 goto error
+goto end
+
+:error
+set ERROR_CODE=1
+
+:end
+@endlocal & set ERROR_CODE=%ERROR_CODE%
+
+if not "%MAVEN_SKIP_RC%" == "" goto skipRcPost
+@REM check for post script, once with legacy .bat ending and once with .cmd ending
+if exist "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat"
+if exist "%HOME%\mavenrc_post.cmd" call "%HOME%\mavenrc_post.cmd"
+:skipRcPost
+
+@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on'
+if "%MAVEN_BATCH_PAUSE%" == "on" pause
+
+if "%MAVEN_TERMINATE_CMD%" == "on" exit %ERROR_CODE%
+
+exit /B %ERROR_CODE%
@@ -4,14 +4,25 @@

  <groupId>com.unicenta</groupId>
  <artifactId>unicentaopos</artifactId>
-  <version>5.0.2-SNAPSHOT</version>
+  <version>5.4.0</version>
  <packaging>jar</packaging>
  <properties>
    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <maven.compiler.source>11</maven.compiler.source>
-    <maven.compiler.target>11</maven.compiler.target>
+    <maven.compiler.source>1.8</maven.compiler.source>
+    <maven.compiler.target>1.8</maven.compiler.target>
+    <derby.version>10.14.2.0</derby.version>
  </properties>
  <dependencies>
+    <dependency>
+      <groupId>com.google.zxing</groupId>
+      <artifactId>core</artifactId>
+      <version>3.3.0</version>
+    </dependency>
+    <dependency>
+      <groupId>com.google.zxing</groupId>
+      <artifactId>javase</artifactId>
+      <version>3.3.0</version>
+    </dependency>
    <!-- sqlite-jdbc -->
    <dependency>
      <groupId>org.xerial</groupId>
@@ -103,7 +114,13 @@
    <dependency>
      <groupId>org.apache.poi</groupId>
      <artifactId>poi</artifactId>
-      <version>3.10.1</version>
+      <version>3.17</version>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.poi</groupId>
+      <artifactId>poi-ooxml</artifactId>
+      <version>3.17</version>
    </dependency>
    <dependency>
      <groupId>net.sf.barcode4j</groupId>
@@ -153,7 +170,7 @@
    <dependency>
      <groupId>org.jpos</groupId>
      <artifactId>jpos</artifactId>
-      <version>2.0.10</version>
+      <version>2.1.9</version>
      <exclusions>
        <exclusion>
          <groupId>org.slf4j</groupId>
@@ -231,8 +248,18 @@
    <dependency>
      <groupId>org.apache.derby</groupId>
      <artifactId>derby</artifactId>
-      <version>10.14.2.0</version>
+      <version>${derby.version}</version>
    </dependency>
+    <dependency>
+      <groupId>org.apache.derby</groupId>
+      <artifactId>derbytools</artifactId>
+      <version>${derby.version}</version>
+    </dependency>
+<!--    <dependency>-->
+<!--      <groupId>org.apache.derby</groupId>-->
+<!--      <artifactId>derbyshared</artifactId>-->
+<!--      <version>${derby.version}</version>-->
+<!--    </dependency>-->
    <dependency>
      <groupId>xml-apis</groupId>
      <artifactId>xml-apis</artifactId>
@@ -243,12 +270,12 @@
    <dependency>
      <groupId>org.apache.xmlgraphics</groupId>
      <artifactId>fop</artifactId>
-      <version>2.1</version>
+      <version>2.3</version>
    </dependency>
    <dependency>
      <groupId>net.sf.jasperreports</groupId>
      <artifactId>jasperreports</artifactId>
-      <version>6.4.0</version>
+      <version>6.12.2</version>
      <exclusions>
        <exclusion>
          <groupId>com.lowagie</groupId>
@@ -320,12 +347,21 @@
          <groupId>org.slf4j</groupId>
          <artifactId>slf4j-simple</artifactId>
        </exclusion>
+        <exclusion>
+          <groupId>com.thoughtworks.xstream</groupId>
+          <artifactId>xstream</artifactId>
+        </exclusion>
      </exclusions>
    </dependency>
+    <dependency>
+      <groupId>com.thoughtworks.xstream</groupId>
+      <artifactId>xstream</artifactId>
+      <version>1.4.11</version>
+    </dependency>
    <dependency>
      <groupId>com.unicenta</groupId>
      <artifactId>unicenta-plugins</artifactId>
-      <version>1.2</version>
+      <version>1.3.1</version>
    </dependency>
    <dependency>
      <groupId>com.gluonhq</groupId>
@@ -383,7 +419,7 @@
    <dependency>
      <groupId>org.postgresql</groupId>
      <artifactId>postgresql</artifactId>
-      <version>9.4.1208</version>
+      <version>42.2.28</version>
    </dependency>
    <dependency>
      <groupId>de.sciss</groupId>
@@ -391,6 +427,11 @@
      <version>2.1.3</version>
      <type>jar</type>
    </dependency>
+    <dependency>
+      <groupId>com.google.code.gson</groupId>
+      <artifactId>gson</artifactId>
+      <version>2.8.9</version>
+    </dependency>
    <!-- https://mvnrepository.com/artifact/junit/junit -->
    <dependency>
      <groupId>junit</groupId>
@@ -549,34 +590,27 @@
    <finalName>unicentaopos</finalName>
  </build>
  <repositories>
+    <repository>
+      <id>central</id>
+      <url>https://repo1.maven.org/maven2/</url>
+      <layout>default</layout>
+    </repository>
    <repository>
      <id>charm-glisten</id>
      <name>charm-glisten Repository</name>
      <url>https://nexus.gluonhq.com/nexus/content/repositories/releases/</url>
      <layout>default</layout>
    </repository>
-    <repository>
-      <id>unicenta-repo</id>
-      <url>https://repo.unicenta.org/maven2/</url>
-      <layout>default</layout>
-    </repository>
-    <repository>
-      <id>central</id>
-      <url>https://repo1.maven.org/maven2/</url>
-      <layout>default</layout>
-    </repository>
-    <!--These are needed for Swing/Netbeans
-    <repository>
-      <id>netbeans</id>
-      <name>NetBeans</name>
-      <url>https://netbeans.apidesign.org/maven2/</url>
-    </repository>-->
-    <!--These are needed for Swing/Netbeans -->
    <repository>
      <id>flatlaf</id>
      <name>flatlaf</name>
      <url>https://dev.webswing.org/public/nexus/repository/webswing-3rd-parties//</url>
    </repository>
+    <repository>
+      <id>unicenta-repo</id>
+      <url>https://repo.unicenta.org/maven2/</url>
+      <layout>default</layout>
+    </repository>
  </repositories>
  <distributionManagement>
    <repository>
@@ -52,6 +52,7 @@ public class JPanelConfigPayment extends javax.swing.JPanel implements PanelConf
        initPayments("Not defined", new ConfigPaymentPanelEmpty());
        initPayments("external", new ConfigPaymentPanelEmpty());
        initPayments("PaymentSense",  new ConfigPaymentPanelEmpty());
+        initPayments("Teya",  new ConfigPaymentPanelEmpty());

        // Lector de tarjetas.
        jcboCardReader.addItem("Not defined");
@@ -277,6 +278,12 @@ public class JPanelConfigPayment extends javax.swing.JPanel implements PanelConf
            emvConfigPanel.setVisible(Boolean.TRUE);
            jcboCardReader.setSelectedItem("EMV");
            jcboCardReader.setEnabled(Boolean.FALSE);
+
+        }
+        else if (comboValue(jcboPaymentGateway.getSelectedItem()).equals("Teya")) {
+            emvConfigPanel.setVisible(Boolean.FALSE);
+            jcboCardReader.setSelectedItem("EMV");
+            jcboCardReader.setEnabled(Boolean.FALSE);
        }
        else {
            emvConfigPanel.setVisible(Boolean.FALSE);
@@ -228,7 +228,7 @@ public class AppConfig implements AppProperties {

  }

-  private void refreshProperties() {
+  private void pullLatestProperties() {
    try {
      InputStream in = new FileInputStream(configfile);
      if (in != null) {
@@ -252,9 +252,11 @@ public class AppConfig implements AppProperties {
    }
  }

-  public void saveWithExistingProperties() throws IOException {
+  public void setLastTicket(String lastTicketNumber, String lastTicketType) throws IOException {

-    refreshProperties();
+    pullLatestProperties();
+    properties.setProperty("lastticket.number", lastTicketNumber);
+    properties.setProperty("lastticket.type", lastTicketType);

    OutputStream out = new FileOutputStream(configfile);
    if (out != null) {
@@ -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.0.1";
+    public static final String APP_VERSION = "5.4.0";

    private static final LocaleResources m_resources;

@@ -197,7 +197,7 @@ public class DataLogicSales extends BeanFactoryDataSingle {
                , new SerializerWriteBasic(new Datas[]{
                Datas.STRING,
                Datas.STRING,
-                Datas.BOOLEAN})
+                Datas.INT})
        );

        m_createSupp = new StaticSentence(s,
@@ -635,6 +635,22 @@ public class DataLogicSales extends BeanFactoryDataSingle {

    }

+    public final CategoryInfo getCategoryInfoByName(String name) throws BasicException {
+        return (CategoryInfo) new PreparedSentence(s
+          , "SELECT "
+          + "ID, "
+          + "NAME, "
+          + "IMAGE, "
+          + "TEXTTIP, "
+          + "CATSHOWNAME, "
+          + "CATORDER "
+          + "FROM categories "
+          + "WHERE NAME = ? "
+          + "ORDER BY CATORDER, NAME"
+          , SerializerWriteString.INSTANCE
+          , CategoryInfo.getSerializerRead()).find(name);
+    }
+
    /**
     *
     * @param id
@@ -21,7 +21,7 @@

  <Layout class="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout"/>
  <SubComponents>
-    <Container class="javax.swing.JPanel" name="jPanel1">
+    <Container class="javax.swing.JPanel" name="mainMenuJPanel">
      <Constraints>
        <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout" value="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout$BorderConstraintsDescription">
          <BorderConstraints direction="Before"/>
@@ -73,7 +73,7 @@
              <Group type="103" groupAlignment="0" attributes="0">
                  <Group type="102" alignment="1" attributes="0">
                      <EmptySpace min="0" pref="0" max="-2" attributes="0"/>
-                      <Component id="jButton1" min="-2" max="-2" attributes="0"/>
+                      <Component id="showMainMenuButton" min="-2" max="-2" attributes="0"/>
                      <EmptySpace max="-2" attributes="0"/>
                  </Group>
              </Group>
@@ -81,15 +81,15 @@
            <DimensionLayout dim="1">
              <Group type="103" groupAlignment="0" attributes="0">
                  <Group type="102" attributes="0">
-                      <EmptySpace pref="88" max="32767" attributes="0"/>
-                      <Component id="jButton1" pref="33" max="32767" attributes="0"/>
-                      <EmptySpace pref="188" max="32767" attributes="0"/>
+                      <EmptySpace max="32767" attributes="0"/>
+                      <Component id="showMainMenuButton" pref="120" max="32767" attributes="0"/>
+                      <EmptySpace pref="95" max="32767" attributes="0"/>
                  </Group>
              </Group>
            </DimensionLayout>
          </Layout>
          <SubComponents>
-            <Component class="javax.swing.JButton" name="jButton1">
+            <Component class="javax.swing.JButton" name="showMainMenuButton">
              <Properties>
                <Property name="toolTipText" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
                  <ResourceString bundle="pos_messages.properties" key="tooltip.menu" replaceFormat="AppLocal.getIntString(&quot;tooltip.menu&quot;)"/>
@@ -112,14 +112,14 @@
                <Property name="requestFocusEnabled" type="boolean" value="false"/>
              </Properties>
              <Events>
-                <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="jButton1ActionPerformed"/>
+                <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="showMainMenuButtonActionPerformed"/>
              </Events>
            </Component>
          </SubComponents>
        </Container>
      </SubComponents>
    </Container>
-    <Container class="javax.swing.JPanel" name="m_jPanelRight">
+    <Container class="javax.swing.JPanel" name="salesScreenJPanel">
      <Properties>
        <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
          <Dimension value="[200, 40]"/>
@@ -133,7 +133,7 @@

      <Layout class="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout"/>
      <SubComponents>
-        <Container class="javax.swing.JPanel" name="m_jPanelTitle">
+        <Container class="javax.swing.JPanel" name="salesScreenTitlePanel">
          <Constraints>
            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout" value="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout$BorderConstraintsDescription">
              <BorderConstraints direction="North"/>
@@ -142,7 +142,7 @@

          <Layout class="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout"/>
          <SubComponents>
-            <Component class="javax.swing.JLabel" name="m_jTitle">
+            <Component class="javax.swing.JLabel" name="salesScreenTitleLabel">
              <Properties>
                <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
                  <Font name="Arial" size="14" style="1"/>
@@ -101,20 +101,16 @@ public class JPrincipalApp extends javax.swing.JPanel implements AppUserView {
    m_principalnotificator.setText(m_appuser.getName());
    m_principalnotificator.setIcon(m_appuser.getIcon());

-    if (jButton1.getComponentOrientation().isLeftToRight()) {
-      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 (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"));
    } 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();

-    m_jPanelTitle.setVisible(false);
+    salesScreenTitlePanel.setVisible(false);
    m_jPanelContainer.add(new JPanel(), "<NULL>");

    showView("<NULL>");
@@ -146,9 +142,7 @@ public class JPrincipalApp extends javax.swing.JPanel implements AppUserView {
  }

  private void assignMenuButtonIcon() {
-    jButton1.setIcon(m_jPanelLeft.isVisible()
-            ? menu_close
-            : menu_open);
+    showMainMenuButton.setIcon(m_jPanelLeft.isVisible() ? menu_close : menu_open);
  }

  /**
@@ -490,12 +484,13 @@ public class JPrincipalApp extends javax.swing.JPanel implements AppUserView {
        m_jLastView = m_jMyView;

        setMenuVisible(getBounds().width > 800);
+        setMenuVisible(getBounds().height > 600);
        setMenuVisible(false);

        showView(sTaskClass);
        String sTitle = m_jMyView.getTitle();
-        m_jPanelTitle.setVisible(sTitle != null);
-        m_jTitle.setText(sTitle);
+        salesScreenTitlePanel.setVisible(sTitle != null);
+        salesScreenTitleLabel.setText(sTitle);
      }
    } else {

@@ -545,106 +540,106 @@ public class JPrincipalApp extends javax.swing.JPanel implements AppUserView {
   * 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
-  private void initComponents() {
+    // <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents
+    private void initComponents() {

-    jPanel1 = new javax.swing.JPanel();
-    m_jPanelLeft = new javax.swing.JScrollPane();
-    jPanel2 = new javax.swing.JPanel();
-    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();
+        mainMenuJPanel = 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();
+        m_jPanelContainer = new javax.swing.JPanel();

-    setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
-    setLayout(new java.awt.BorderLayout());
+        setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
+        setLayout(new java.awt.BorderLayout());

-    jPanel1.setLayout(new java.awt.BorderLayout());
+        mainMenuJPanel.setLayout(new java.awt.BorderLayout());

-    m_jPanelLeft.setBackground(new java.awt.Color(102, 102, 102));
-    m_jPanelLeft.setBorder(null);
-    m_jPanelLeft.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
-    m_jPanelLeft.setPreferredSize(new java.awt.Dimension(250, 2));
-    jPanel1.add(m_jPanelLeft, java.awt.BorderLayout.LINE_START);
+        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);

-    jPanel2.setFont(new java.awt.Font("Arial", 0, 12)); // NOI18N
-    jPanel2.setPreferredSize(new java.awt.Dimension(45, 45));
+        jPanel2.setFont(new java.awt.Font("Arial", 0, 12)); // NOI18N
+        jPanel2.setPreferredSize(new java.awt.Dimension(45, 45));

-    jButton1.setToolTipText(AppLocal.getIntString("tooltip.menu")); // NOI18N
-    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) {
-        jButton1ActionPerformed(evt);
-      }
-    });
+        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() {
+            public void actionPerformed(java.awt.event.ActionEvent evt) {
+                showMainMenuButtonActionPerformed(evt);
+            }
+        });

-    javax.swing.GroupLayout jPanel2Layout = new javax.swing.GroupLayout(jPanel2);
-    jPanel2.setLayout(jPanel2Layout);
-    jPanel2Layout.setHorizontalGroup(
+        javax.swing.GroupLayout jPanel2Layout = new javax.swing.GroupLayout(jPanel2);
+        jPanel2.setLayout(jPanel2Layout);
+        jPanel2Layout.setHorizontalGroup(
            jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-                    .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, jPanel2Layout.createSequentialGroup()
-                            .addGap(0, 0, 0)
-                            .addComponent(jButton1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
-                            .addContainerGap())
-    );
-    jPanel2Layout.setVerticalGroup(
+            .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)
+                .addContainerGap())
+        );
+        jPanel2Layout.setVerticalGroup(
            jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-                    .addGroup(jPanel2Layout.createSequentialGroup()
-                            .addContainerGap(88, Short.MAX_VALUE)
-                            .addComponent(jButton1, javax.swing.GroupLayout.DEFAULT_SIZE, 33, Short.MAX_VALUE)
-                            .addContainerGap(188, Short.MAX_VALUE))
-    );
+            .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))
+        );

-    jPanel1.add(jPanel2, java.awt.BorderLayout.LINE_END);
+        mainMenuJPanel.add(jPanel2, java.awt.BorderLayout.LINE_END);

-    add(jPanel1, java.awt.BorderLayout.LINE_START);
+        add(mainMenuJPanel, java.awt.BorderLayout.LINE_START);

-    m_jPanelRight.setPreferredSize(new java.awt.Dimension(200, 40));
-    m_jPanelRight.setLayout(new java.awt.BorderLayout());
+        salesScreenJPanel.setPreferredSize(new java.awt.Dimension(200, 40));
+        salesScreenJPanel.setLayout(new java.awt.BorderLayout());

-    m_jPanelTitle.setLayout(new java.awt.BorderLayout());
+        salesScreenTitlePanel.setLayout(new java.awt.BorderLayout());

-    m_jTitle.setFont(new java.awt.Font("Arial", 1, 14)); // NOI18N
-    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);
+        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_jPanelRight.add(m_jPanelTitle, java.awt.BorderLayout.NORTH);
+        salesScreenJPanel.add(salesScreenTitlePanel, java.awt.BorderLayout.NORTH);

-    m_jPanelContainer.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
-    m_jPanelContainer.setLayout(new java.awt.CardLayout());
-    m_jPanelRight.add(m_jPanelContainer, java.awt.BorderLayout.CENTER);
+        m_jPanelContainer.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
+        m_jPanelContainer.setLayout(new java.awt.CardLayout());
+        salesScreenJPanel.add(m_jPanelContainer, BorderLayout.CENTER);

-    add(m_jPanelRight, java.awt.BorderLayout.CENTER);
-  }// </editor-fold>//GEN-END:initComponents
+        add(salesScreenJPanel, java.awt.BorderLayout.CENTER);
+    }// </editor-fold>//GEN-END:initComponents

-  private void jButton1ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jButton1ActionPerformed
+  private void showMainMenuButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_showMainMenuButtonActionPerformed

    setMenuVisible(!m_jPanelLeft.isVisible());

-  }//GEN-LAST:event_jButton1ActionPerformed
+  }//GEN-LAST:event_showMainMenuButtonActionPerformed


-  // Variables declaration - do not modify//GEN-BEGIN:variables
-  private javax.swing.JButton jButton1;
-  private javax.swing.JPanel jPanel1;
-  private javax.swing.JPanel jPanel2;
-  private javax.swing.JPanel m_jPanelContainer;
-  private javax.swing.JScrollPane m_jPanelLeft;
-  private javax.swing.JPanel m_jPanelRight;
-  private javax.swing.JPanel m_jPanelTitle;
-  private javax.swing.JLabel m_jTitle;
-  // End of variables declaration//GEN-END:variables
+    // Variables declaration - do not modify//GEN-BEGIN:variables
+    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;
+    // End of variables declaration//GEN-END:variables

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

@@ -76,7 +76,7 @@ public class JRootKiosk extends javax.swing.JFrame implements AppMessage {
        String osName = System.getProperty("os.name").toLowerCase();
        boolean isWindows = osName.startsWith("windows");
        boolean isMac = osName.startsWith("mac");
-        
+
        m_OS = new OSValidator();
        m_props = props;
        
@@ -129,7 +129,7 @@ public class StartPOS {
        metrics.setUniCentaVersion(AppLocal.APP_VERSION);
        Application application = new Application();
        application.postMetrics(metrics);
-        application.startEventListener(host, jRootApp);
+        application.startEventListener(host, jRootApp, null);
      } catch (Exception e) {
        log.error("Problem with starting the uniCenta plugin application:${}", e.getMessage());
      }
@@ -41,6 +41,8 @@ import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.UUID;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;


 /**
@@ -276,6 +278,7 @@ public class CustomerCSVImport extends JPanel implements JPanelView {
   * the UI responsiveness.
   */
  private void setWorker() {
+    ExecutorService customExecutor = Executors.newCachedThreadPool();
    progress = 0;
    webPBar.setStringPainted(true);

@@ -304,7 +307,8 @@ public class CustomerCSVImport extends JPanel implements JPanelView {
        }
      }
    };
-    pbWorker.execute();
+    // pbWorker.execute();
+    customExecutor.submit(pbWorker);
  }

  /**
@@ -44,6 +44,8 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.UUID;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;


 /**
@@ -80,7 +82,7 @@ public class JPanelCSVImport extends JPanel implements JPanelView {

    protected SaveProvider spr;
 
-    private String Category;
+    private String category;
    private String categoryName;
    private String categoryParentid;
    private Integer categoryCatorder;
@@ -292,6 +294,7 @@ public class JPanelCSVImport extends JPanel implements JPanelView {
     * the UI responsiveness.
    */
    private void setWorker() {
+        ExecutorService customExecutor = Executors.newCachedThreadPool();
        progress = 0;
        webPBar.setStringPainted(true);

@@ -320,7 +323,8 @@ public class JPanelCSVImport extends JPanel implements JPanelView {
                }    
            }
        };
-        pbWorker.execute();
+        //pbWorker.execute();
+        customExecutor.submit(pbWorker);
    }

    /**
@@ -370,7 +374,7 @@ public class JPanelCSVImport extends JPanel implements JPanelView {
                String SellPrice = products.get((String) jComboSell.getSelectedItem());
                productTax = products.get((String) jComboTax.getSelectedItem());                
                
-                Category = products.get((String) jComboCategory.getSelectedItem());
+                category = products.get((String) jComboCategory.getSelectedItem());
                Supplier = products.get((String) jComboSupplier.getSelectedItem());                
                
                currentRecord++;
@@ -514,17 +518,17 @@ public class JPanelCSVImport extends JPanel implements JPanelView {
    private String getCategory() {

        if (jComboCategory.getSelectedItem() != category_default) {
-            String cat = (String) cat_list.get(Category);
+            String cat = (String) cat_list.get(category);

            if (cat != null) {
                return (cat);
            }
        }

-        if (!Category.equals("")) {
+        if (!category.equals("")) {
            Object[] newcat = new Object[3];
            newcat[0] = UUID.randomUUID().toString();
-            newcat[1] = Category;
+            newcat[1] = category;
            newcat[2] = true;

            try {
@@ -535,15 +539,15 @@ public class JPanelCSVImport extends JPanel implements JPanelView {
                    m_CategoryModel.setSelectedItem(category);
                    cat_list.put(category.toString(), m_CategoryModel.getSelectedKey().toString());
                }
-                    String cat = (String) cat_list.get(Category);
+                    String cat = (String) cat_list.get(category);
                    return (cat);
                } catch (BasicException ex) {
                log.error(ex.getMessage());
                }
            }

-        if (!badCategories.contains(Category)) {
-            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) 
@@ -964,7 +968,7 @@ public class JPanelCSVImport extends JPanel implements JPanelView {
        myprod[7] = productSellPrice;                                           // Sell price
        myprod[8] = previousBuy;                                                // Previous Buy price double
        myprod[9] = previousSell;                                               // Previous Sell price double
-        myprod[10] = Category;                                                  // Category
+        myprod[10] = category;                                                  // Category
        myprod[11] = productTax;                                                // Tax
        myprod[12] = Supplier;                                                  // Supplier
        try {
@@ -43,6 +43,8 @@ import java.sql.SQLException;
 import java.util.List;
 import java.util.Properties;
 import java.util.UUID;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;


 /**
@@ -511,6 +513,7 @@ public class StockQtyImport extends JPanel implements JPanelView {
   * the UI responsiveness.
   */
  private void setWorker() {
+    ExecutorService customExecutor = Executors.newCachedThreadPool();
    progress = 0;
    webPBar.setStringPainted(true);

@@ -539,7 +542,8 @@ public class StockQtyImport extends JPanel implements JPanelView {
        }
      }
    };
-    pbWorker.execute();
+    //pbWorker.execute();
+    customExecutor.submit(pbWorker);
  }

  /**
@@ -487,7 +487,7 @@ public final class ProductsEditor extends javax.swing.JPanel implements EditorRe
    myprod[28] = m_UomModel.getSelectedKey();
    myprod[29] = Formats.TIMESTAMP.parseValue(m_jdate.getText());

-    myprod[30] = m_jInCatalog.isSelected();
+    myprod [30] = m_jInCatalog.isSelected();
    myprod[31] = Formats.INT.parseValue(m_jCatalogOrder.getText());

    if (m_jName.getText().contains("&")) {
@@ -19,6 +19,7 @@

 package com.unicenta.pos.payment;

+import com.unicenta.basic.BasicException;
 import com.unicenta.format.Formats;
 import com.unicenta.pos.customers.CustomerInfoExt;
 import com.unicenta.pos.customers.DataLogicCustomers;
@@ -26,19 +27,22 @@ import com.unicenta.pos.forms.AppLocal;
 import com.unicenta.pos.forms.AppView;
 import com.unicenta.pos.forms.DataLogicSales;
 import com.unicenta.pos.forms.DataLogicSystem;
+import lombok.extern.slf4j.Slf4j;

 import java.awt.*;
 import java.awt.event.KeyEvent;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import javax.swing.JFrame;
-import javax.swing.SwingWorker;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import javax.swing.*;

 /**
 *
 * @author adrianromero
 */
+@Slf4j
 public abstract class JPaymentSelect extends javax.swing.JDialog
        implements JPaymentNotifier {

@@ -720,27 +724,37 @@ public abstract class JPaymentSelect extends javax.swing.JDialog

    private void m_jButtonOKActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_m_jButtonOKActionPerformed

-        SwingWorker worker = new SwingWorker() {
-            @Override
-            protected Object doInBackground() throws Exception {
-                m_jButtonOK.setEnabled(false);
-                setReturnPayment(((JPaymentInterface) m_jTabPayment.getSelectedComponent()).executePayment());
-                return null;
-            }
+        ExecutorService customExecutor = Executors.newCachedThreadPool();

-            @Override
-            public void done() {
-                m_jButtonOK.setEnabled(true);
-                m_jButtonCancel.setEnabled(true);
-                if (returnPayment != null) {
-                    m_aPaymentInfo.add(returnPayment);
-                    accepted = true;
-                    dispose();
+        try {
+            SwingWorker worker = new SwingWorker() {
+
+                @Override
+                protected Object doInBackground() {
+                    m_jButtonOK.setEnabled(false);
+                    setReturnPayment(((JPaymentInterface) m_jTabPayment.getSelectedComponent()).executePayment());
+                    return null;
                }
-            }
-        };

-        worker.execute();
+                @Override
+                public void done() {
+                    m_jButtonOK.setEnabled(true);
+                    m_jButtonCancel.setEnabled(true);
+                    if (returnPayment != null) {
+                        m_aPaymentInfo.add(returnPayment);
+                        accepted = true;
+                        dispose();
+                    }
+                }
+            };
+
+            //worker.execute();
+            customExecutor.submit(worker);
+        }
+        catch (Exception ex) {
+            System.out.println(ex.getMessage());
+        }
+
    }//GEN-LAST:event_m_jButtonOKActionPerformed

    private void m_jButtonCancelActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_m_jButtonCancelActionPerformed
@@ -39,6 +39,8 @@ public class PaymentGatewayFac {
                return new PaymentGatewayExt();
            case "PaymentSense":
                return new PaymentGatewayPaymentSense();
+            case "Teya":
+                return new PaymentGatewayTeya();
            default:
                return null;
        }
@@ -26,6 +26,7 @@ import lombok.extern.slf4j.Slf4j;

 import javax.swing.*;
 import java.awt.*;
+import java.util.ArrayList;

@Slf4j
 public class PaymentGatewayPaymentSense implements PaymentGateway {
@@ -34,13 +35,26 @@ public class PaymentGatewayPaymentSense implements PaymentGateway {
    public PaymentGatewayPaymentSense() {
    }

-    Window getPaymentWindow() {
-        for (Window window : Window.getWindows()) {
-            if (window.isActive()) {
-                return window;
+    Window getPaymentWindow(double amount) {
+        if (amount > 0) {
+            ArrayList<JPaymentSelectReceipt> paymentWindows = new ArrayList<>();
+            for (Window window : Window.getWindows()) {
+                if (window instanceof JPaymentSelectReceipt) {
+                    paymentWindows.add((JPaymentSelectReceipt) window);
+                }
            }
+            return paymentWindows.get(paymentWindows.size()-1);
        }
-        return null;
+        else {
+            ArrayList<JPaymentSelectRefund> paymentWindows = new ArrayList<>();
+            for (Window window : Window.getWindows()) {
+                if (window instanceof JPaymentSelectRefund) {
+                    paymentWindows.add((JPaymentSelectRefund) window);
+                }
+            }
+            return paymentWindows.get(paymentWindows.size()-1);
+        }
+
    }

    /**
@@ -53,7 +67,8 @@ public class PaymentGatewayPaymentSense implements PaymentGateway {
        int timer = 0;
        int timeout = 180;

-        new Application().paymentSenseTransaction(RoundUtils.round(payinfo.getTotal()), getPaymentWindow());
+        double roundedValue = RoundUtils.round(payinfo.getTotal());
+        new Application().paymentSenseTransaction(roundedValue, getPaymentWindow(roundedValue));

        while (AppContext.getIsProcessing() == null || AppContext.getIsProcessing()) {
            try {
@@ -0,0 +1,101 @@
+//    uniCenta oPOS  - Touch Friendly Point Of Sale
+//    Copyright (c) 2009-2018 uniCenta & previous Openbravo POS works
+//    https://unicenta.com
+//
+//    This file is part of uniCenta oPOS
+//
+//    uniCenta oPOS is free software: you can redistribute it and/or modify
+//    it under the terms of the GNU General Public License as published by
+//    the Free Software Foundation, either version 3 of the License, or
+//    (at your option) any later version.
+//
+//   uniCenta oPOS is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//    GNU General Public License for more details.
+//
+//    You should have received a copy of the GNU General Public License
+//    along with uniCenta oPOS.  If not, see <http://www.gnu.org/licenses/>.
+
+package com.unicenta.pos.payment;
+
+import com.unicenta.plugins.Application;
+import com.unicenta.plugins.common.AppContext;
+import com.unicenta.pos.util.RoundUtils;
+import lombok.extern.slf4j.Slf4j;
+
+import java.awt.*;
+import java.util.ArrayList;
+
+@Slf4j
+public class PaymentGatewayTeya implements PaymentGateway {
+
+    /** Creates a new instance of PaymentGatewayExt */
+    public PaymentGatewayTeya() {
+    }
+
+    Window getPaymentWindow(double amount) {
+        if (amount > 0) {
+            ArrayList<JPaymentSelectReceipt> paymentWindows = new ArrayList<>();
+            for (Window window : Window.getWindows()) {
+                if (window instanceof JPaymentSelectReceipt) {
+                    paymentWindows.add((JPaymentSelectReceipt) window);
+                }
+            }
+            return paymentWindows.get(paymentWindows.size()-1);
+        }
+        else {
+            ArrayList<JPaymentSelectRefund> paymentWindows = new ArrayList<>();
+            for (Window window : Window.getWindows()) {
+                if (window instanceof JPaymentSelectRefund) {
+                    paymentWindows.add((JPaymentSelectRefund) window);
+                }
+            }
+            return paymentWindows.get(paymentWindows.size()-1);
+        }
+
+    }
+
+    /**
+     *
+     * @param payinfo
+     */
+    @Override
+    public void execute(PaymentInfoMagcard payinfo) {
+
+        int timer = 0;
+        int timeout = 150;
+
+        double roundedValue = RoundUtils.round(payinfo.getTotal());
+
+        new Application().teyaTransaction(roundedValue, getPaymentWindow(roundedValue), payinfo.getTransactionID());
+
+        while (AppContext.getTeyaPaymentResult() == null) {
+            try {
+                log.info("uniCenta-oPos: waiting for payment to complete ....");
+                Thread.sleep(1000);
+                timer += 1;
+                if (timer > timeout) break;
+            } catch (InterruptedException e) {
+                log.error(e.getMessage());
+            }
+        }
+
+        if (AppContext.getTeyaPaymentResult().getStatus().equals("SUCCESSFUL")) {
+            payinfo.setCardName("Teya");
+            payinfo.setVerification("Chip and Pin");
+            payinfo.setChipAndPin(true);
+            payinfo.paymentOK(
+                    roundedValue > 0 ? AppContext.getTeyaPaymentResult().getReferenceId() : "",
+                    roundedValue > 0 ? AppContext.getTeyaPaymentResult().getGatewayPaymentId() : "",
+                    AppContext.getTeyaPaymentResult().getStatus()
+            );
+        }
+        else {
+            payinfo.paymentError("Transaction Error! Please try again", AppContext.getTeyaPaymentResult().getStatus());
+        }
+
+
+
+    }
+}
@@ -39,6 +39,8 @@ import javax.imageio.ImageIO;
 import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.parsers.SAXParser;
 import javax.xml.parsers.SAXParserFactory;
+
+import com.unicenta.pos.util.QRCode;
 import org.xml.sax.Attributes;
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
@@ -49,52 +51,52 @@ import org.xml.sax.helpers.DefaultHandler;
 * @author JG uniCenta
 */
 public class TicketParser extends DefaultHandler {
-    
+
    private static SAXParser m_sp = null;
-    
+
    private DeviceTicket m_printer;
    private DataLogicSystem m_system;
-    
+
    private StringBuilder text;
-    
+
    private String bctype;
    private String bcposition;
    private int m_iTextAlign;
    private int m_iTextLength;
    private int m_iTextStyle;
    private int size;
-    
+
    private StringBuilder m_sVisorLine;
    private int m_iVisorAnimation;
    private String m_sVisorLine1;
    private String m_sVisorLine2;
-    
+
    private double m_dValue1;
    private double m_dValue2;
    private int attribute3;
-    
+
    private int m_iOutputType;
    private static final int OUTPUT_NONE = 0;
    private static final int OUTPUT_DISPLAY = 1;
    private static final int OUTPUT_TICKET = 2;
    private static final int OUTPUT_FISCAL = 3;
-    private DevicePrinter m_oOutputPrinter;   
+    private DevicePrinter m_oOutputPrinter;
    private DateFormat df= new SimpleDateFormat("MM/dd/yyyy HH:mm:ss");
    private Date today;
    private String cUser;
    private String ticketId;
    private String pickupId;
-    
-    
+
+
    /** Creates a new instance of TicketParser
     * @param printer
     * @param system */
    public TicketParser(DeviceTicket printer, DataLogicSystem system) {
        m_printer = printer;
        m_system = system;
-        today = Calendar.getInstance().getTime(); 
+        today = Calendar.getInstance().getTime();
    }
-    
+
    /**
     *
     * @param sIn
@@ -103,27 +105,27 @@ public class TicketParser extends DefaultHandler {
     */
    public void printTicket(String sIn, TicketInfo ticket) throws TicketPrinterException {
 //       cUser=ticket.getUser().getName();
-       cUser=ticket.getName();        
-        ticketId=Integer.toString(ticket.getTicketId()); 
+        cUser=ticket.getName();
+        ticketId=Integer.toString(ticket.getTicketId());
        pickupId=Integer.toString(ticket.getPickupId());
-        
+
        if (ticket.getTicketId()==0){
            ticketId="No Sale";
        }
        if (ticket.getPickupId()==0){
            pickupId="No PickupId";
-        }        
+        }
        printTicket(new StringReader(sIn));
-        
+

    }
-    
+
    /**
     *
     * @param sIn
     * @throws TicketPrinterException
     */
-    public void printTicket(String sIn) throws TicketPrinterException { 
+    public void printTicket(String sIn) throws TicketPrinterException {
        printTicket(new StringReader(sIn));
    }

@@ -133,15 +135,15 @@ public class TicketParser extends DefaultHandler {
     * @throws TicketPrinterException
     */
    public void printTicket(Reader in) throws TicketPrinterException  {
-        
+
        try {
-            
+
            if (m_sp == null) {
                SAXParserFactory spf = SAXParserFactory.newInstance();
                m_sp = spf.newSAXParser();
            }
            m_sp.parse(new InputSource(in), this);
-                        
+
        } catch (ParserConfigurationException ePC) {
            throw new TicketPrinterException(LocalRes.getIntString("exception.parserconfig") , ePC);
        } catch (SAXException eSAX) {
@@ -149,8 +151,8 @@ public class TicketParser extends DefaultHandler {
        } catch (IOException eIO) {
            throw new TicketPrinterException(LocalRes.getIntString("exception.iofile") , eIO);
        }
-    }    
-    
+    }
+
    @Override
    public void startDocument() throws SAXException {
        // inicalizo las variables pertinentes
@@ -168,293 +170,300 @@ public class TicketParser extends DefaultHandler {
    @Override
    public void endDocument() throws SAXException {
    }
-    
+
    @Override
-    public void startElement(String uri, String localName, String qName, Attributes attributes) throws SAXException{       
+    public void startElement(String uri, String localName, String qName, Attributes attributes) throws SAXException{
        String openDate = df.format(today);
        Date dNow = new Date();
-        
+
        switch (m_iOutputType) {
-        case OUTPUT_NONE:
-        switch (qName) {
-            case "opendrawer":
-                m_printer.getDevicePrinter(readString(attributes.getValue("printer"), "1")).openDrawer();
-                // Cashdrawer has been activated record the data in the table
-                try {
-                    m_system.execDrawerOpened(
-                            //new Object[] {df.format(dNow),cUser,ticketId});
-                             new Object[] {cUser,ticketId});
-                } catch (BasicException ex) {}
-                break;
-            case "play":
-                text = new StringBuilder();
-                break;
-            case "ticket":
-                m_iOutputType = OUTPUT_TICKET;
-                m_oOutputPrinter = m_printer.getDevicePrinter(readString(attributes.getValue("printer"), "1"));
-                m_oOutputPrinter.beginReceipt();
-                break;
-            case "display":
-                m_iOutputType = OUTPUT_DISPLAY;
-                String animation = attributes.getValue("animation");
-                if ("scroll".equals(animation)) {
-                    m_iVisorAnimation = DeviceDisplayBase.ANIMATION_SCROLL;
-                } else if ("flyer".equals(animation)) {
-                    m_iVisorAnimation = DeviceDisplayBase.ANIMATION_FLYER;
-                } else if ("blink".equals(animation)) {
-                    m_iVisorAnimation = DeviceDisplayBase.ANIMATION_BLINK;
-                } else if ("curtain".equals(animation)) {
-                    m_iVisorAnimation = DeviceDisplayBase.ANIMATION_CURTAIN;
-                } else { // "none"
-                    m_iVisorAnimation = DeviceDisplayBase.ANIMATION_NULL;
-                }
-                m_sVisorLine1 = null;
-                m_sVisorLine2 = null;                
-                m_oOutputPrinter = null;
-                break;
-            case "fiscalreceipt":
-                m_iOutputType = OUTPUT_FISCAL;
-                m_printer.getFiscalPrinter().beginReceipt();
-                break;
-            case "fiscalzreport":
-                m_printer.getFiscalPrinter().printZReport();
-                break;
-            case "fiscalxreport":
-                m_printer.getFiscalPrinter().printXReport();
-                break;
-        }
-            break;
-        case OUTPUT_TICKET:
-            if (null != qName)switch (qName) {
-            case "logo":
-                text = new StringBuilder();
-                break;
-            case "image":
-                text = new StringBuilder();
-                break;
-            case "barcode":
-                text = new StringBuilder();
-                bctype = attributes.getValue("type");
-                bcposition = attributes.getValue("position");
-                break;
-            case "line":
-                m_oOutputPrinter.beginLine(parseInt(attributes.getValue("size"), DevicePrinter.SIZE_0));
-                break;
-            case "text":
-                text = new StringBuilder();
-                m_iTextStyle = ("true".equals(attributes.getValue("bold")) 
-                        ? DevicePrinter.STYLE_BOLD : DevicePrinter.STYLE_PLAIN)
-                        | ("true".equals(attributes.getValue("underline")) 
-                        ? DevicePrinter.STYLE_UNDERLINE : DevicePrinter.STYLE_PLAIN);
-                String sAlign = attributes.getValue("align");
-                if (null == sAlign) {
-                    m_iTextAlign = DevicePrinter.ALIGN_LEFT;
-                } else switch (sAlign) {
-            case "right":
-                m_iTextAlign = DevicePrinter.ALIGN_RIGHT;
-                break;
-            case "center":
-                m_iTextAlign = DevicePrinter.ALIGN_CENTER;
-                break;
-            default:
-                m_iTextAlign = DevicePrinter.ALIGN_LEFT;
-                break;
-        }
-                m_iTextLength = parseInt(attributes.getValue("length"), 0);
-                break;
-            default:
-                break;
-        }
-            break;
-        case OUTPUT_DISPLAY:
-            if (null != qName) switch (qName) {
-            case "line":
-                // line 1 or 2 of the display
-                m_sVisorLine = new StringBuilder();
-                break;
-            case "line1":
-                // linea 1 del visor
-                m_sVisorLine = new StringBuilder();
-                break;
-            case "line2":
-                // linea 2 del visor
-                m_sVisorLine = new StringBuilder();
-                break;
-            case "text":
-                text = new StringBuilder();
-                String sAlign = attributes.getValue("align");
-                if (null == sAlign) {
-                    m_iTextAlign = DevicePrinter.ALIGN_LEFT;
-                } else switch (sAlign) {
-            case "right":
-                m_iTextAlign = DevicePrinter.ALIGN_RIGHT;
-                break;
-            case "center":
-                m_iTextAlign = DevicePrinter.ALIGN_CENTER;
-                break;
-            default:
-                m_iTextAlign = DevicePrinter.ALIGN_LEFT;
-                break;
-        }
-                m_iTextLength = parseInt(attributes.getValue("length"));
-                break;
-            default:
-                break;
-        }
-            break;
-        case OUTPUT_FISCAL:
-            if (null != qName) 
+            case OUTPUT_NONE:
                switch (qName) {
-                    case "line":   
-                        text = new StringBuilder();
-                        m_dValue1 = parseDouble(attributes.getValue("price"));
-                        m_dValue2 = parseDouble(attributes.getValue("units"), 1.0);
-                        attribute3 = parseInt(attributes.getValue("tax"));
-                        break; 
-                    case "message":
+                    case "opendrawer":
+                        m_printer.getDevicePrinter(readString(attributes.getValue("printer"), "1")).openDrawer();
+                        // Cashdrawer has been activated record the data in the table
+                        try {
+                            m_system.execDrawerOpened(
+                                    //new Object[] {df.format(dNow),cUser,ticketId});
+                                    new Object[] {cUser,ticketId});
+                        } catch (BasicException ex) {}
+                        break;
+                    case "play":
                        text = new StringBuilder();
                        break;
-                    case "total":    
+                    case "ticket":
+                        m_iOutputType = OUTPUT_TICKET;
+                        m_oOutputPrinter = m_printer.getDevicePrinter(readString(attributes.getValue("printer"), "1"));
+                        m_oOutputPrinter.beginReceipt();
+                        break;
+                    case "display":
+                        m_iOutputType = OUTPUT_DISPLAY;
+                        String animation = attributes.getValue("animation");
+                        if ("scroll".equals(animation)) {
+                            m_iVisorAnimation = DeviceDisplayBase.ANIMATION_SCROLL;
+                        } else if ("flyer".equals(animation)) {
+                            m_iVisorAnimation = DeviceDisplayBase.ANIMATION_FLYER;
+                        } else if ("blink".equals(animation)) {
+                            m_iVisorAnimation = DeviceDisplayBase.ANIMATION_BLINK;
+                        } else if ("curtain".equals(animation)) {
+                            m_iVisorAnimation = DeviceDisplayBase.ANIMATION_CURTAIN;
+                        } else { // "none"
+                            m_iVisorAnimation = DeviceDisplayBase.ANIMATION_NULL;
+                        }
+                        m_sVisorLine1 = null;
+                        m_sVisorLine2 = null;
+                        m_oOutputPrinter = null;
+                        break;
+                    case "fiscalreceipt":
+                        m_iOutputType = OUTPUT_FISCAL;
+                        m_printer.getFiscalPrinter().beginReceipt();
+                        break;
+                    case "fiscalzreport":
+                        m_printer.getFiscalPrinter().printZReport();
+                        break;
+                    case "fiscalxreport":
+                        m_printer.getFiscalPrinter().printXReport();
+                        break;
+                }
+                break;
+            case OUTPUT_TICKET:
+                if (null != qName)switch (qName) {
+                    case "logo":
                        text = new StringBuilder();
-                        m_dValue1 = parseDouble(attributes.getValue("paid"));
+                        break;
+                    case "image":
+                        text = new StringBuilder();
+                        break;
+                    case "barcode":
+                        text = new StringBuilder();
+                        bctype = attributes.getValue("type");
+                        bcposition = attributes.getValue("position");
+                        break;
+                    case "qr-code":
+                        text = new StringBuilder();
+                        break;
+                    case "line":
+                        m_oOutputPrinter.beginLine(parseInt(attributes.getValue("size"), DevicePrinter.SIZE_0));
+                        break;
+                    case "text":
+                        text = new StringBuilder();
+                        m_iTextStyle = ("true".equals(attributes.getValue("bold"))
+                                ? DevicePrinter.STYLE_BOLD : DevicePrinter.STYLE_PLAIN)
+                                | ("true".equals(attributes.getValue("underline"))
+                                ? DevicePrinter.STYLE_UNDERLINE : DevicePrinter.STYLE_PLAIN);
+                        String sAlign = attributes.getValue("align");
+                        if (null == sAlign) {
+                            m_iTextAlign = DevicePrinter.ALIGN_LEFT;
+                        } else switch (sAlign) {
+                            case "right":
+                                m_iTextAlign = DevicePrinter.ALIGN_RIGHT;
+                                break;
+                            case "center":
+                                m_iTextAlign = DevicePrinter.ALIGN_CENTER;
+                                break;
+                            default:
+                                m_iTextAlign = DevicePrinter.ALIGN_LEFT;
+                                break;
+                        }
+                        m_iTextLength = parseInt(attributes.getValue("length"), 0);
                        break;
                    default:
                        break;
                }
-            break;
+                break;
+            case OUTPUT_DISPLAY:
+                if (null != qName) switch (qName) {
+                    case "line":
+                        // line 1 or 2 of the display
+                        m_sVisorLine = new StringBuilder();
+                        break;
+                    case "line1":
+                        // linea 1 del visor
+                        m_sVisorLine = new StringBuilder();
+                        break;
+                    case "line2":
+                        // linea 2 del visor
+                        m_sVisorLine = new StringBuilder();
+                        break;
+                    case "text":
+                        text = new StringBuilder();
+                        String sAlign = attributes.getValue("align");
+                        if (null == sAlign) {
+                            m_iTextAlign = DevicePrinter.ALIGN_LEFT;
+                        } else switch (sAlign) {
+                            case "right":
+                                m_iTextAlign = DevicePrinter.ALIGN_RIGHT;
+                                break;
+                            case "center":
+                                m_iTextAlign = DevicePrinter.ALIGN_CENTER;
+                                break;
+                            default:
+                                m_iTextAlign = DevicePrinter.ALIGN_LEFT;
+                                break;
+                        }
+                        m_iTextLength = parseInt(attributes.getValue("length"));
+                        break;
+                    default:
+                        break;
+                }
+                break;
+            case OUTPUT_FISCAL:
+                if (null != qName)
+                    switch (qName) {
+                        case "line":
+                            text = new StringBuilder();
+                            m_dValue1 = parseDouble(attributes.getValue("price"));
+                            m_dValue2 = parseDouble(attributes.getValue("units"), 1.0);
+                            attribute3 = parseInt(attributes.getValue("tax"));
+                            break;
+                        case "message":
+                            text = new StringBuilder();
+                            break;
+                        case "total":
+                            text = new StringBuilder();
+                            m_dValue1 = parseDouble(attributes.getValue("paid"));
+                            break;
+                        default:
+                            break;
+                    }
+                break;
        }
-    } 
-    
+    }
+
    @Override
    public void endElement(String uri, String localName, String qName) throws SAXException {

        switch (m_iOutputType) {
-        case OUTPUT_NONE:
-            if ("play".equals(qName)) {
-                try { 
-                    AudioClip oAudio = Applet.newAudioClip(getClass().getClassLoader().getResource(text.toString()));
-                    oAudio.play();        
-                } catch (Exception fnfe) {
-                    //throw new ResourceNotFoundException( fnfe.getMessage() );
+            case OUTPUT_NONE:
+                if ("play".equals(qName)) {
+                    try {
+                        AudioClip oAudio = Applet.newAudioClip(getClass().getClassLoader().getResource(text.toString()));
+                        oAudio.play();
+                    } catch (Exception fnfe) {
+                        //throw new ResourceNotFoundException( fnfe.getMessage() );
+                    }
+                    text = null;
                }
-                text = null;
-            } 
-            break;    
-            
-// Added 23.05.13 used by star TSP700 to print stored logo image JDL            
-        case OUTPUT_TICKET:
-            if ("logo".equals(qName)){
-                    m_oOutputPrinter.printLogo();
-                  // }        
-            }else if ("image".equals(qName)){
-                try {
-//                    BufferedImage image = ImageIO.read(getClass().getClassLoader().getResourceAsStream(text.toString()));
-                    BufferedImage image = m_system.getResourceAsImage(text.toString());
+                break;

-                    if (image == null) {
-                        image = decodeToImage(text.toString());
-                    }
-                    if (image != null) {
-                        m_oOutputPrinter.printImage(image);
-                    }
-                    
-                } catch (Exception fnfe) {
-                    //throw new ResourceNotFoundException( fnfe.getMessage() );
+// Added 23.05.13 used by star TSP700 to print stored logo image JDL
+            case OUTPUT_TICKET:
+                if ("logo".equals(qName)){
+                    m_oOutputPrinter.printLogo();
+                    // }
                }
-                text = null;
-            } else if ("barcode".equals(qName)) {
-                m_oOutputPrinter.printBarCode(bctype, bcposition, text.toString());
-                text = null;
-            } else if ("text".equals(qName)) {
-                if (m_iTextLength > 0) {
-                    switch(m_iTextAlign) {
-                    case DevicePrinter.ALIGN_RIGHT:
-                        m_oOutputPrinter.printText(m_iTextStyle, DeviceTicket.alignRight(text.toString(), m_iTextLength));
-                        break;
-                    case DevicePrinter.ALIGN_CENTER:
-                        m_oOutputPrinter.printText(m_iTextStyle, DeviceTicket.alignCenter(text.toString(), m_iTextLength));
-                        break;
-                    default: // DevicePrinter.ALIGN_LEFT
-                        m_oOutputPrinter.printText(m_iTextStyle, DeviceTicket.alignLeft(text.toString(), m_iTextLength));
-                        break;
+                if ("image".equals(qName)){
+                    try {
+//                    BufferedImage image = ImageIO.read(getClass().getClassLoader().getResourceAsStream(text.toString()));
+                        BufferedImage image = m_system.getResourceAsImage(text.toString());
+
+                        if (image == null) {
+                            image = decodeToImage(text.toString());
+                        }
+                        if (image != null) {
+                            m_oOutputPrinter.printImage(image);
+                        }
+
+                    } catch (Exception fnfe) {
+                        //throw new ResourceNotFoundException( fnfe.getMessage() );
                    }
-                } else {
-                    m_oOutputPrinter.printText(m_iTextStyle, text.toString());
+                    text = null;
+                } else if ("qr-code".equals(qName)) {
+                    m_oOutputPrinter.printImage(QRCode.printQRCode(text.toString()));
                }
-                text = null;
-            } else if ("line".equals(qName)) {
-                m_oOutputPrinter.endLine();
-            } else if ("ticket".equals(qName)) {
-                m_oOutputPrinter.endReceipt();
-                m_iOutputType = OUTPUT_NONE;
-                m_oOutputPrinter = null;
-            }
-            break;
-        case OUTPUT_DISPLAY:
-            if ("line".equals(qName)) { // line 1 or 2 of the display
-                if (m_sVisorLine1 == null) {
+                else if ("barcode".equals(qName)) {
+                    m_oOutputPrinter.printBarCode(bctype, bcposition, text.toString());
+                    text = null;
+                } else if ("text".equals(qName)) {
+                    if (m_iTextLength > 0) {
+                        switch(m_iTextAlign) {
+                            case DevicePrinter.ALIGN_RIGHT:
+                                m_oOutputPrinter.printText(m_iTextStyle, DeviceTicket.alignRight(text.toString(), m_iTextLength));
+                                break;
+                            case DevicePrinter.ALIGN_CENTER:
+                                m_oOutputPrinter.printText(m_iTextStyle, DeviceTicket.alignCenter(text.toString(), m_iTextLength));
+                                break;
+                            default: // DevicePrinter.ALIGN_LEFT
+                                m_oOutputPrinter.printText(m_iTextStyle, DeviceTicket.alignLeft(text.toString(), m_iTextLength));
+                                break;
+                        }
+                    } else {
+                        m_oOutputPrinter.printText(m_iTextStyle, text.toString());
+                    }
+                    text = null;
+                } else if ("line".equals(qName)) {
+                    m_oOutputPrinter.endLine();
+                } else if ("ticket".equals(qName)) {
+                    m_oOutputPrinter.endReceipt();
+                    m_iOutputType = OUTPUT_NONE;
+                    m_oOutputPrinter = null;
+                }
+                break;
+            case OUTPUT_DISPLAY:
+                if ("line".equals(qName)) { // line 1 or 2 of the display
+                    if (m_sVisorLine1 == null) {
+                        m_sVisorLine1 = m_sVisorLine.toString();
+                    } else {
+                        m_sVisorLine2 = m_sVisorLine.toString();
+                    }
+                    m_sVisorLine = null;
+                } else if ("line1".equals(qName)) { // linea 1 del visor
                    m_sVisorLine1 = m_sVisorLine.toString();
-                } else {
+                    m_sVisorLine = null;
+                } else if ("line2".equals(qName)) { // linea 2 del visor
                    m_sVisorLine2 = m_sVisorLine.toString();
-                }
-                m_sVisorLine = null;
-            } else if ("line1".equals(qName)) { // linea 1 del visor
-                m_sVisorLine1 = m_sVisorLine.toString();
-                m_sVisorLine = null;
-            } else if ("line2".equals(qName)) { // linea 2 del visor
-                m_sVisorLine2 = m_sVisorLine.toString();
-                m_sVisorLine = null;
-            } else if ("text".equals(qName)) {
-                if (m_iTextLength > 0) {
-                    switch(m_iTextAlign) {
-                    case DevicePrinter.ALIGN_RIGHT:
-                        m_sVisorLine.append(DeviceTicket.alignRight(text.toString(), m_iTextLength));
-                        break;
-                    case DevicePrinter.ALIGN_CENTER:
-                        m_sVisorLine.append(DeviceTicket.alignCenter(text.toString(), m_iTextLength));
-                        break;
-                    default: // DevicePrinter.ALIGN_LEFT
-                        m_sVisorLine.append(DeviceTicket.alignLeft(text.toString(), m_iTextLength));
-                        break;
+                    m_sVisorLine = null;
+                } else if ("text".equals(qName)) {
+                    if (m_iTextLength > 0) {
+                        switch(m_iTextAlign) {
+                            case DevicePrinter.ALIGN_RIGHT:
+                                m_sVisorLine.append(DeviceTicket.alignRight(text.toString(), m_iTextLength));
+                                break;
+                            case DevicePrinter.ALIGN_CENTER:
+                                m_sVisorLine.append(DeviceTicket.alignCenter(text.toString(), m_iTextLength));
+                                break;
+                            default: // DevicePrinter.ALIGN_LEFT
+                                m_sVisorLine.append(DeviceTicket.alignLeft(text.toString(), m_iTextLength));
+                                break;
+                        }
+                    } else {
+                        m_sVisorLine.append(text);
                    }
-                } else {
-                    m_sVisorLine.append(text);
+                    text = null;
+                } else if ("display".equals(qName)) {
+                    m_printer.getDeviceDisplay().writeVisor(m_iVisorAnimation, m_sVisorLine1, m_sVisorLine2);
+                    m_iVisorAnimation = DeviceDisplayBase.ANIMATION_NULL;
+                    m_sVisorLine1 = null;
+                    m_sVisorLine2 = null;
+                    m_iOutputType = OUTPUT_NONE;
+                    m_oOutputPrinter = null;
                }
-                text = null;
-            } else if ("display".equals(qName)) {
-                m_printer.getDeviceDisplay().writeVisor(m_iVisorAnimation, m_sVisorLine1, m_sVisorLine2);        
-                m_iVisorAnimation = DeviceDisplayBase.ANIMATION_NULL;                
-                m_sVisorLine1 = null;
-                m_sVisorLine2 = null;
-                m_iOutputType = OUTPUT_NONE;
-                m_oOutputPrinter = null;
-            }
-            break;
-        case OUTPUT_FISCAL:
-            if ("fiscalreceipt".equals(qName)) {
-                m_printer.getFiscalPrinter().endReceipt();
-                m_iOutputType = OUTPUT_NONE;
-            } else if ("line".equals(qName)) {
-                m_printer.getFiscalPrinter().printLine(text.toString(), m_dValue1, m_dValue2, attribute3);
-                text = null;               
-            } else if ("message".equals(qName)) {
-                m_printer.getFiscalPrinter().printMessage(text.toString());
-                text = null;               
-            } else if ("total".equals(qName)) {
-                m_printer.getFiscalPrinter().printTotal(text.toString(), m_dValue1);
-                text = null;               
-            }
-            break;
-        }          
+                break;
+            case OUTPUT_FISCAL:
+                if ("fiscalreceipt".equals(qName)) {
+                    m_printer.getFiscalPrinter().endReceipt();
+                    m_iOutputType = OUTPUT_NONE;
+                } else if ("line".equals(qName)) {
+                    m_printer.getFiscalPrinter().printLine(text.toString(), m_dValue1, m_dValue2, attribute3);
+                    text = null;
+                } else if ("message".equals(qName)) {
+                    m_printer.getFiscalPrinter().printMessage(text.toString());
+                    text = null;
+                } else if ("total".equals(qName)) {
+                    m_printer.getFiscalPrinter().printTotal(text.toString(), m_dValue1);
+                    text = null;
+                }
+                break;
+        }
    }
-    
+
    @Override
    public void characters(char[] ch, int start, int length) throws SAXException {
        if (text != null) {
            text.append(ch, start, length);
        }
    }
-    
+
    private int parseInt(String sValue, int iDefault) {
        try {
            return Integer.parseInt(sValue);
@@ -462,11 +471,11 @@ public class TicketParser extends DefaultHandler {
            return iDefault;
        }
    }
-    
+
    private int parseInt(String sValue) {
        return parseInt(sValue, 0);
    }
-    
+
    private double parseDouble(String sValue, double ddefault) {
        try {
            return Double.parseDouble(sValue);
@@ -474,11 +483,11 @@ public class TicketParser extends DefaultHandler {
            return ddefault;
        }
    }
-    
+
    private double parseDouble(String sValue) {
        return parseDouble(sValue, 0.0);
    }
-    
+
    private String readString(String sValue, String sDefault) {
        if (sValue == null || sValue.equals("")) {
            return sDefault;
@@ -502,5 +511,5 @@ public class TicketParser extends DefaultHandler {
        return image;


-    }    
+    }
 }
@@ -22,6 +22,7 @@ package com.unicenta.pos.reports;
 import com.unicenta.basic.BasicException;
 import com.unicenta.data.loader.*;
 import com.unicenta.data.user.EditorCreator;
+import com.unicenta.pos.forms.AppConfig;
 import com.unicenta.pos.forms.AppLocal;
 import com.unicenta.pos.forms.AppView;
 import com.unicenta.pos.forms.BeanFactoryException;
@@ -197,5 +198,12 @@ public class PanelReportBean extends JPanelReport {
     */
    public void addQBFFilter(ReportEditorCreator qbff) {
        qbffilter.addEditor(qbff);
-    }    
+    }
+    public String getDBType() {
+        String url = AppConfig.getInstance().getProperty("db.URL");
+        if (url.contains("derby")) {
+            return "derby";
+        }
+        return "mysql";
+    }
 }
@@ -42,7 +42,6 @@ import com.unicenta.pos.panels.JProductFinder;
 import com.unicenta.pos.payment.JPaymentSelect;
 import com.unicenta.pos.payment.JPaymentSelectReceipt;
 import com.unicenta.pos.payment.JPaymentSelectRefund;
-import com.unicenta.pos.printer.DeviceTicket;
 import com.unicenta.pos.printer.TicketParser;
 import com.unicenta.pos.printer.TicketPrinterException;
 import com.unicenta.pos.sales.restaurant.RestaurantDBUtils;
@@ -1797,6 +1796,7 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
  }

  private boolean closeTicket(TicketInfo ticket, Object ticketext) {
+    log.debug("Closing Ticket");
    if (listener != null) {
      listener.stop();
    }
@@ -1809,6 +1809,7 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
      try {

        taxeslogic.calculateTaxes(ticket);
+        log.debug("Calculating taxes");
        if (ticket.getTotal() >= 0.0) {
          ticket.resetPayments();
        }
@@ -1818,8 +1819,10 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
            listener.stop();
          }

+          log.debug("Printing ticket");
          printTicket("Printer.TicketTotal", ticket, ticketext);

+          log.debug("Show Payment Dialog");
          JPaymentSelect paymentdialog = ticket.getTicketType() == TicketInfo.RECEIPT_NORMAL
                  ? paymentdialogreceipt
                  : paymentdialogrefund;
@@ -1839,9 +1842,11 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac

              try {
                dlSales.saveTicket(ticket, m_App.getInventoryLocation());
-                m_config.setProperty("lastticket.number", Integer.toString(ticket.getTicketId()));
-                m_config.setProperty("lastticket.type", Integer.toString(ticket.getTicketType()));
-                m_config.saveWithExistingProperties();
+                String lastTicketNumber = Integer.toString(ticket.getTicketId());
+                String lastTicketType = Integer.toString(ticket.getTicketType());
+                m_config.setProperty("lastticket.number", lastTicketNumber);
+                m_config.setProperty("lastticket.type", lastTicketType);
+                m_config.setLastTicket(lastTicketNumber, lastTicketType);

              } catch (BasicException eData) {
                MessageInf msg = new MessageInf(MessageInf.SGN_NOTICE, AppLocal.getIntString("message.nosaveticket"), eData);
@@ -1896,6 +1901,7 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
  }

  private boolean warrantyCheck(TicketInfo ticket) {
+    log.debug("Warranty Check");
    warrantyPrint = false;
    int lines = 0;
    while (lines < ticket.getLinesCount()) {
@@ -2215,13 +2221,14 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac

        if (checkProduct != null) {

-          if (checkProduct.getUnits() <= 0) {
+          if (checkProduct.getUnits() != null && checkProduct.getUnits() <= 0) {
            jCheckStock.setForeground(Color.magenta);
          } else {
            jCheckStock.setForeground(Color.darkGray);
          }

-          double dUnits = checkProduct.getUnits();
+          double dUnits = checkProduct.getUnits() == null ? 0.0 : checkProduct.getUnits();
+
          int iUnits;
          iUnits = (int) dUnits;
          jCheckStock.setText(Integer.toString(iUnits));
@@ -3269,7 +3276,11 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
    if (listener != null) {
      listener.stop();
    }
-    Object[] options = {"Create", "Find", "Cancel"};
+    Object[] options = {
+            AppLocal.getIntString("label.create"),
+            AppLocal.getIntString("label.find"),
+            AppLocal.getIntString("label.cancel")
+    };

    int n = JOptionPane.showOptionDialog(null,
            AppLocal.getIntString("message.customeradd"),
@@ -23,6 +23,8 @@ import com.unicenta.pos.catalog.CatalogSelector;
 import com.unicenta.pos.catalog.JCatalog;
 import com.unicenta.pos.forms.AppView;
 import com.unicenta.pos.ticket.ProductInfoExt;
+import lombok.extern.slf4j.Slf4j;
+
 import java.awt.Component;
 import java.awt.Dimension;
 import java.awt.event.ActionEvent;
@@ -34,6 +36,7 @@ import javax.swing.event.ListSelectionListener;
 *
 * @author JG uniCenta
 */
+@Slf4j
 public class JPanelTicketSales extends JPanelTicket {

    private CatalogSelector m_cat;
@@ -95,6 +98,7 @@ public class JPanelTicketSales extends JPanelTicket {
     */
    @Override
    protected JTicketsBag getJTicketsBag() {
+        log.debug("Get JTickets Bag");
        return JTicketsBag.createTicketsBag(m_App.getProperties().getProperty("machine.ticketsbag"), m_App, this);
    }
    
@@ -7,6 +7,8 @@ package com.unicenta.pos.sales.restaurant;
 import com.unicenta.data.loader.Session;
 import com.unicenta.pos.forms.AppView;
 import com.unicenta.pos.forms.DataLogicSystem;
+import lombok.extern.slf4j.Slf4j;
+
 import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
@@ -18,7 +20,7 @@ import java.sql.Timestamp;
 *
 * @author JDL
 */
-
+@Slf4j
 public class RestaurantDBUtils {
    private Session s;
    private Connection con;  
@@ -304,11 +306,11 @@ public class RestaurantDBUtils {
            rs = stmt.executeQuery(SQL);
        
            if (rs.next()){
-                String customer =rs.getString("TICKETID");
-                return(customer);
+              return(rs.getString("TICKETID"));
            }    
        }catch(SQLException e){
-        }   
+          log.error("Error running SQL: {}{}", SQL, e.getMessage());
+        }

        return "";
    }  
@@ -553,6 +555,21 @@ public class RestaurantDBUtils {
        return "";
    }

+    public String getTableId (String nameOfTable){
+      try{
+        SQL = "SELECT ID FROM places WHERE NAME='"+ nameOfTable + "'";
+        stmt = con.createStatement();
+        rs = stmt.executeQuery(SQL);
+
+        if (rs.next()){
+          return(rs.getString("ID"));
+        }
+      }catch(SQLException e){
+        log.error("Error running SQL: {}{}", SQL, e.getMessage());
+      }
+      return "";
+    }
+
    /**
     *
     * @param tableID
@@ -33,17 +33,19 @@ import com.unicenta.pos.sales.ReprintTicketInfo;
 import com.unicenta.pos.sales.SharedTicketInfo;
 import com.unicenta.pos.sales.TicketsEditor;
 import com.unicenta.pos.ticket.TicketInfo;
+import lombok.extern.slf4j.Slf4j;
+
 import java.util.List;
 import java.util.UUID;
-import javax.swing.JComponent;
-import javax.swing.JOptionPane;
-import javax.swing.JPanel;
-import javax.swing.SwingUtilities;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import javax.swing.*;

 /**
 *
 * @author JG uniCenta
 */
+@Slf4j
 public class JTicketsBagShared extends JTicketsBag {
    
    private String m_sCurrentTicket = null;
@@ -51,6 +53,7 @@ public class JTicketsBagShared extends JTicketsBag {
    private DataLogicSales dlSales = null;  
    private final DataLogicSystem dlSystem;    
    private Boolean showList;
+    private int existingOrderCount;
   
    
    /** Creates new form JTicketsBagShared
@@ -75,6 +78,26 @@ public class JTicketsBagShared extends JTicketsBag {
     */
    @Override
    public void activate() {
+
+        log.debug("Loading Sales screen! "+this.getClass());
+
+        ExecutorService customExecutor = Executors.newCachedThreadPool();
+        SwingWorker<String, String> reloadLayaway = new SwingWorker() {
+            @Override
+            protected String doInBackground() throws Exception {
+                while (true) {
+                    log.debug("refresh screen");
+                    updateCount();
+                    Thread.sleep(5000);
+                }
+
+                //return null;
+            }
+        };
+
+        //reloadLayaway.execute();
+        customExecutor.submit(reloadLayaway);
+
        
        m_sCurrentTicket = null;
        selectValidTicket();     
@@ -118,12 +141,26 @@ public class JTicketsBagShared extends JTicketsBag {
    }

    public void updateCount() {
+
+        /*
+        1. Need to get / set  the existing count
+        2. When count increases show dialog
+         */
        try {
            List<SharedTicketInfo> l = dlReceipts.getSharedTicketList();
            int count = l.size();
+
+            if (count > existingOrderCount) {
+                log.info("New Order Received from the API!");
+                // show Order Window
+//                List<ReprintTicketInfo> ticketInfoList= dlSales.getReprintTicketList();
+//                JTicketsReprintList listDialog = JTicketsReprintList.newJDialog(JTicketsBagShared.this);
+//                String id = listDialog.showTicketsList(ticketInfoList, dlSales);
+            }
            
            if (count > 0) {
                m_jListTickets.setText(Integer.toString(count));
+                existingOrderCount = count;
            } else {
                m_jListTickets.setText("");
            }
@@ -362,9 +399,9 @@ public class JTicketsBagShared extends JTicketsBag {
                            || m_App.getAppUserView().getUser().hasPermission("sales.ViewSharedTicket")
                            || m_App.getAppUserView().getUser().hasPermission("sales.Override"))
                    {
-                        List<SharedTicketInfo> l = dlReceipts.getSharedTicketList();
+                        List<SharedTicketInfo> sharedTicketList = dlReceipts.getSharedTicketList();
                        JTicketsBagSharedList listDialog = JTicketsBagSharedList.newJDialog(JTicketsBagShared.this);
-                        String id = listDialog.showTicketsList(l, dlReceipts);
+                        String id = listDialog.showTicketsList(sharedTicketList, dlReceipts);

                        if (id != null) {
                            saveCurrentTicket();
@@ -405,6 +442,10 @@ public class JTicketsBagShared extends JTicketsBag {
        ((JRootApp)m_App).closeAppView();
    }//GEN-LAST:event_m_jHoldActionPerformed

+    private void showOrderWindow() {
+
+    }
+
    private void m_jReprintTicketsActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_m_jReprintTicketsActionPerformed
        SwingUtilities.invokeLater(new Runnable() {
            @Override
@@ -96,7 +96,7 @@ public class JTicketsReprintList extends javax.swing.JDialog {
        m_ticket = null;
        m_ticketCopy = null;        

-ReprintTicketInfo m_Ticket = null;
+        ReprintTicketInfo m_Ticket = null;
        
        for (ReprintTicketInfo aticket : atickets) {
            m_jtickets.add(new JButtonTicket(aticket, dlSales));
@@ -648,7 +648,17 @@ public final class TicketInfo implements SerializableRead, Externalizable {
        String row =(m_config.getProperty("tkt."+data));
        
        return row;
-    }    
+    }
+
+    public String printQRCode(String nameHeader, String vatHeader, String vatLabel){
+        String name = getTicketHeaderFooterData(nameHeader);
+        String vatNumberHeader = getTicketHeaderFooterData(vatHeader);
+        String vatNumber = vatNumberHeader.split(vatLabel)[1];
+        String date = new SimpleDateFormat("yyyy-mm-dd hh:mm:ss").format(getDate());
+        String total = String.valueOf(getTotal());
+        String vatValue = String.valueOf(getTax());
+        return name+","+vatNumber+","+date+","+total+","+vatValue;
+    }
    
    public String printTicketHeaderLine1() {
        String lineData = getTicketHeaderFooterData("header1");
@@ -43,6 +43,8 @@ import java.sql.*;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Properties;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 import java.util.regex.Matcher;

 /**
@@ -2721,6 +2723,7 @@ public final class Transfer extends JPanel implements JPanelView {
            JOptionPane.YES_NO_OPTION,
            JOptionPane.QUESTION_MESSAGE) == JOptionPane.YES_OPTION) {

+      ExecutorService customExecutor = Executors.newCachedThreadPool();
      SwingWorker<Void, Void> worker = new SwingWorker<Void, Void>() {

        @Override
@@ -2731,7 +2734,8 @@ public final class Transfer extends JPanel implements JPanelView {
        }
      };

-      worker.execute();
+      //worker.execute();
+      customExecutor.submit(worker);

    }
    System.gc();
@@ -0,0 +1,75 @@
+package com.unicenta.pos.util;
+
+import com.google.zxing.BarcodeFormat;
+import com.google.zxing.WriterException;
+import com.google.zxing.client.j2se.MatrixToImageWriter;
+import com.google.zxing.common.BitMatrix;
+import com.google.zxing.qrcode.QRCodeWriter;
+
+import javax.imageio.ImageIO;
+import java.awt.image.BufferedImage;
+import java.io.File;
+import java.nio.charset.StandardCharsets;
+import java.util.Base64;
+
+public class QRCode {
+
+    public static BufferedImage printQRCode(String data) {
+
+        String[] values = data.split(",");
+
+        try {
+            // Name
+            QRObject name = new QRObject(1,  values[0] );
+            byte nameTagByte = (byte) name.getTag();
+            byte nameLengthByte = (byte) name.getLength();
+            byte[] nameBytes = {nameTagByte, nameLengthByte};
+            String nameString = new String(nameBytes, StandardCharsets.UTF_8)+name.getValue();
+
+            //vat number
+            QRObject vat = new QRObject(2, values[1]);
+            byte vatTagByte = (byte) vat.getTag();
+            byte vatLengthByte = (byte) vat.getLength();
+            byte[] vatBytes = {vatTagByte, vatLengthByte};
+            String vatString = new String(vatBytes, StandardCharsets.UTF_8)+vat.getValue();
+
+            // date
+            QRObject date = new QRObject(3, values[2]);
+            byte dateTagByte = (byte) date.getTag();
+            byte dateLengthByte = (byte) date.getLength();
+            byte[] dateBytes = {dateTagByte, dateLengthByte};
+            String dateString = new String(dateBytes, StandardCharsets.UTF_8)+date.getValue();
+
+            // amount
+            QRObject amount = new QRObject(4, values[3]);
+            byte amountTagByte = (byte) amount.getTag();
+            byte amountLengthByte = (byte) amount.getLength();
+            byte[] amountBytes = {amountTagByte, amountLengthByte};
+            String amountString = new String(amountBytes, StandardCharsets.UTF_8)+amount.getValue();
+
+
+            // Vat amount
+            QRObject vatAmount = new QRObject(5, values[4]);
+            byte vatAmountTag = (byte) vatAmount.getTag();
+            byte vatAmountLengthByte = (byte) vatAmount.getLength();
+            byte[] vatAmountBytes = {vatAmountTag, vatAmountLengthByte};
+            String vatAmountString = new String(vatAmountBytes, StandardCharsets.UTF_8)+vatAmount.getValue();
+
+
+            //barcode
+            String barCodeString = nameString+vatString+dateString+amountString+vatAmountString;
+            String encodedBarcode = Base64.getEncoder().encodeToString(barCodeString.getBytes(StandardCharsets.UTF_8));
+
+            System.out.println(encodedBarcode);
+
+            QRCodeWriter barcodeWriter = new QRCodeWriter();
+            BitMatrix bitMatrix = barcodeWriter.encode(encodedBarcode, BarcodeFormat.QR_CODE, 200, 200);
+
+            BufferedImage bufferedImage = MatrixToImageWriter.toBufferedImage(bitMatrix);
+            return MatrixToImageWriter.toBufferedImage(bitMatrix);
+        } catch (WriterException e) {
+            e.printStackTrace();
+            return null;
+        }
+    }
+}
@@ -0,0 +1,40 @@
+package com.unicenta.pos.util;
+
+import java.nio.charset.StandardCharsets;
+
+public class QRObject {
+
+    private int tag;
+    private int length;
+    private String value;
+
+    public QRObject(int tag, String value) {
+        this.tag = tag;
+        this.length = setLength(value);
+        this.value = value;
+    }
+
+    public int getTag() {
+        return tag;
+    }
+
+    public void setTag(int tag) {
+        this.tag = tag;
+    }
+
+    public String getValue() {
+        return value;
+    }
+
+    public void setValue(String value) {
+        this.value = value;
+    }
+
+    public int getLength() {
+        return length;
+    }
+
+    private static int setLength(String value) {
+        return value.getBytes(StandardCharsets.UTF_8).length;
+    }
+}
@@ -1,7 +1 @@
-UPDATE resources SET content = $FILE{/com/unicenta/pos/templates/script.Linediscount.txt} WHERE name = 'script.Linediscount';
-
-UPDATE resources SET content = $FILE{/com/unicenta/pos/templates/script.Totaldiscount.txt} WHERE name = 'script.Totaldiscount';
-
-UPDATE resources SET content = $FILE{/com/unicenta/pos/templates/script.multibuy.txt} WHERE name = 'script.multibuy';
-
 UPDATE applications SET version = $APP_VERSION{} WHERE id = $APP_ID{};
@@ -336,7 +336,7 @@ CREATE TABLE `products` (
 	`stockunits` double NOT NULL default '0',
 	`printto` varchar(255) default '1',
 	`supplier` varchar(255) default NULL,
-        `uom` varchar(255) default '0',
+    `uom` varchar(255) default '0',
 	`memodate` datetime default '2018-01-01 00:00:01',

 	PRIMARY KEY  ( `id` ),
@@ -1,70 +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';
+UPDATE applications SET version = $APP_VERSION{} WHERE id = $APP_ID{};
 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;
-
-UPDATE resources SET content = $FILE{/com/unicenta/pos/templates/script.Linediscount.txt} WHERE name = 'script.Linediscount';
-COMMIT;
-
-UPDATE resources SET content = $FILE{/com/unicenta/pos/templates/script.Totaldiscount.txt} WHERE name = 'script.Totaldiscount';
-COMMIT;
-
-UPDATE resources SET content = $FILE{/com/unicenta/pos/templates/script.multibuy.txt} WHERE name = 'script.multibuy';
-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{}, $APP_VERSION{});
-
-COMMIT;
@@ -44,14 +44,6 @@ COMMIT;
 UPDATE resources SET content = $FILE{/com/unicenta/pos/templates/customer.updated.xml} WHERE name = 'Customer.Updated';
 COMMIT;

-UPDATE resources SET content = $FILE{/com/unicenta/pos/templates/script.Linediscount.txt} WHERE name = 'script.Linediscount';
-COMMIT;
-
-UPDATE resources SET content = $FILE{/com/unicenta/pos/templates/script.Totaldiscount.txt} WHERE name = 'script.Totaldiscount';
-COMMIT;
-
-UPDATE resources SET content = $FILE{/com/unicenta/pos/templates/script.multibuy.txt} WHERE name = 'script.multibuy';
-COMMIT;

 -- ROLES
 DELETE FROM roles WHERE id = '0';
@@ -65,6 +57,6 @@ INSERT INTO roles(id, name, permissions) VALUES('2', 'Employee role', $FILE{/com
 -- Switch ON table foreign key relationships
 set foreign_key_checks = 1;

-INSERT INTO applications(id, name, version) VALUES($APP_ID{}, $APP_NAME{}, $APP_VERSION{});
+INSERT INTO applications(id, name, version) VALUES($APP_ID{}, $APP_NAME{}, '5.3.1');

 COMMIT;
@@ -218,7 +218,6 @@
        <line><text>Tranx ID        : </text><text>${paymentline.printTransactionID()}</text></line>
        <line><text>Auth Code       : </text><text>${paymentline.printAuthorization()}</text></line>
        <line><text>Verified By     : </text><text>${paymentline.printVerification()}</text></line>
-        <line><text>Card # (last 4) : </text><text>${paymentline.printLastFourDigits()}</text></line>
        #end
        #if (!$paymentline.chipAndPin)
        <line size="1"><text align="center" length="42" bold="true">CARD SALE</text></line>
@@ -255,7 +254,7 @@
        <line></line>
        #end
        #end
-
+        <!-- ZACAT please see release notes -->
    </ticket>

    #foreach ($paymentline in $ticket.payments)
@@ -100,6 +100,7 @@
    <!-- ADDITIONAL FEATURES ************************************************* -->
    <!-- SET Show Change in Cash Sale (Default=ENABLED -->
        <event key="ticket.close" code="Ticket.Close"/>
+        <event key="ticket.total" code="Ticket.Total"/>
 	<event key="cash.close" code="Cash.Close"/>

 <!-- Execute your own scripts by EVENTS triggered by Sales Screen -->
@@ -24,26 +24,65 @@ report.setTitleKey("Menu.Top10Sales");
 report.setReport("/com/unicenta/reports/sales_chart_top10");
 report.setResourceBundle("com/unicenta/reports/sales_messages");

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

@@ -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.0.1 Upgrade!</h2></br><h3>Your current database version is {0}</h3><br>For version 5.0 click <b>YES</b><br/><br/>For any other version click <b>NO</b> and get to 5.0 first<br><br/>
+message.eolupdate=<html><center><h2>Version 5.4.0 Upgrade!</h2></br><h3>Your current database version is {0}</h3><br>For version 5.3 and above click <b>YES</b><br/><br/>For any other version click <b>NO</b> and get to 5.3 first<br><br/>
 message.ibuttonassign=<html><center>Get the iButton ID<br>Place iButton onto the reader then click OK 
 message.ibuttonnotassign=<html><center>The iButton used is not yet assigned to anyone
 message.ibuttonnotfound=No iButton adapter found.  Key fobs will be disabled.
@@ -18,7 +18,8 @@
 #    along with uniCenta oPOS.  If not, see <http://www.gnu.org/licenses/>.

 button.backup=Copia seguridad realizada
-Button.Cancel=\ 
+button.Cancel=Cancelar
+Button.Cancel=Cancelar
 button.cancel=Cancelar
 button.catalogadd=A\u00f1adir al cat\u00e1logo
 button.catalogdel=Borrar del cat\u00e1logo
@@ -27,7 +28,7 @@ button.close=Cerrar
 Button.Close=Cerrar
 button.closecash=Cerrar caja
 button.closecashpreview=Cerrar Vista previa
-button.deleteticket=Borar Tiquet
+button.deleteticket=Borar tiquet
 button.discount=Descuento
 button.edit=Editar
 button.email=email
@@ -44,8 +45,6 @@ button.listtickets=Lista
 button.memberdiscount=Desc Miembro
 button.moorings=Moorings
 button.movetable=Mover
-button.newcustomer=Nuevo
-Button.newcustomer=Nuevo
 button.newcustomer=Nuevo Cliente
 Button.newcustomer=Nuevo cliente
 button.newticket=Nuevo
@@ -87,7 +86,7 @@ button.totaldiscount=Total Desc'
 button.transfer=Transferancia Base de Datos

 caption.split=Dividir recibo
-caption.tickets=Recibos
+caption.tickets=Tiquets
 caption.upload=Subir lista de productos

 cboption.clear=Borrar clave existente
@@ -119,7 +118,7 @@ filter.imgfile=Imagen (*.jpg,*.png)
 form.customertitle=Lista de clientes
 form.productslist=Lista de productos
 form.selectprintertitle=Seleccionar impresora
-form.tickettitle=Lista de recibos
+form.tickettitle=Lista de tiquets

 label.address=Direcci\u00f3n l\u00ednea 1
 label.address2=Direcci\u00f3n l\u00ednea 2
@@ -208,7 +207,6 @@ label.curdebt=Deuda actual
 label.currency=Moneda
 label.currencybutton=Ocultar Superposici\u00f3n texto Pagos
 label.currentstock=Disponible
-label.currentstock=Esta, existe
 label.customer=Cliente
 label.customerdate=Fecha Memorizada
 label.customerupdated=Clientes actualizados\t
@@ -216,8 +214,6 @@ label.custtaxcategory=Categor\u00eda de impuesto por cliente
 label.cvsinvalid=Productos Inv\u00e1lidos
 label.cvsnotchanged=Sin Cambios
 label.Database=Base de datos
-Label.Database=Base de datos
-Label.Database=Base de datos
 label.date=Fecha
 label.datestitle=Fechas de cierre
 label.datetime=Fecha y hora
@@ -266,7 +262,6 @@ label.inputamount=Campo de entrada por encima del teclado
 label.InputCash=Entregado
 label.integer=Entero
 label.invalidcustomers=Clientes no validos
-label.invalidcustomers=Clientes no validos
 label.invlinetotal=Linea total
 label.IP1=IP 2
 label.item=Art\u00edculo
@@ -275,7 +270,7 @@ label.javapos.drawer=Nombre del caj\u00f3n
 label.javapos.printer=Nombre de la impresora
 label.lastname=Apellidos
 label.lindediscount=Desc' %
-label.linevoids=Boletos vac\u00edos
+label.linevoids=L\u00edneas borradas y tiquets vac\u00edos
 Label.LoadError=Error de Carga
 label.LoadError=Se ha producido un error al mostrar esta funcionalidad.
 label.locale=Localizaci\u00f3n
@@ -308,10 +303,10 @@ label.maximum=M\u00e1ximo
 label.merchantcode=C\u00f3digo de comercio
 label.minimum=M\u00ednimo
 label.money=Total
-label.mooringcreatebtn=Crear Ticket
-label.mooringscreatefor=Crear ticket para
+label.mooringcreatebtn=Crear Tiquet
+label.mooringscreatefor=Crear tiquet para
 label.name=Nombre
-label.nocashsales=Sin Venta-Abrir Caj\u00f3n
+label.nocashsales=Aperturas de caj\u00f3n sin venta
 label.notes=Notas
 label.noticketstoclose=No hay tiquets por cerrar
 label.nullcategory=(Sin categor\u00eda)
@@ -343,9 +338,8 @@ label.placename=Sitio
 label.placeposition=Posici\u00f3n
 label.postal=C\u00f3digo postal
 label.prepay=Cantidad de prepago
-label.prepay=Cantidad Prepago
-label.price=PVP
-label.pricetax=PVP+IVA
+label.price=Base
+label.pricetax=Base+IVA
 label.priceupdate=Actualizaciones de precios
 label.csvnewcustomers=Nuevos Clientes
 label.priceupdate=Permitir actualizaciones de precios
@@ -369,8 +363,8 @@ label.prodname=Nombre
 label.prodnamem=<html> Nombre <font color = FB00FF> *
 label.prodorder=Orden
 label.prodpricebuy=Precio compra
-label.prodpricesell=PVP
-label.prodpriceselltax=PVP+IVA
+label.prodpricesell=Base
+label.prodpriceselltax=Base+IVA
 label.prodproperties=Propiedades
 label.prodref=Referencia
 label.prodscale=Balanza
@@ -383,13 +377,13 @@ label.prodsupplier=Proveedores
 label.prodtaxcode=Impuesto
 label.product=C\u00f3digo de barras
 label.producthtmlguide=<html>\n<div></p>Puedes personalizar la pantalla de venta de Productos aqu\u00ed. \nSi tienes algunos conocimientos de HTML puedes completar lo que aparece aqu\u00ed</p><br><br></div>\n<div>Pasa el cursor sobre el texto de la derecha para ver el c\u00f3digo HTML asociado al efecto que quieres en el Bot\u00f3n<br><br></div>\n
-label.productreceipt=Se requiere Ticket para la garant\u00eda
+label.productreceipt=Se requiere tiquet para la garant\u00eda
 label.produnits=Unidades
 label.prodvaluebuy=Valor de compra
 label.prodvaluesell=Valor de venta
 label.prodvolume=Volumen
 label.properties=Propiedades
-label.receiptprint=Desactivar Impresi\u00f3n Ticket
+label.receiptprint=Desactivar Impresi\u00f3n de tiquet
 label.receiptprinter=Impresora de recibos
 label.recorddeleted=(Registro borrado)
 label.recordeof=(No hay registros)
@@ -436,7 +430,7 @@ label.stocktaker=Entrado por
 label.storename=Nombre de tienda
 label.StripeLivePublishableKey=Clave publicable en vivo
 label.subcategorytitle=Nombre en panel
-label.subtotalcash=Subtotal
+label.subtotalcash=Total sin IVA
 label.supplierdocment=Documento
 label.suppliertaxid=La Cuenta
 label.SupplierTransactions=Actas
@@ -453,12 +447,12 @@ label.tableshowwaiterdetails=Mostrar Camarero
 label.tabletransbutton=Boton de la mesa transparente
 label.tabletransbutton=Boton de la mesa transparente
 label.tabletransbutton=Boton de la mesa transparente
-label.tax=Impuesto
-label.taxcash=Impuestos
+label.tax=IVA
+label.taxcash=IVA
 label.taxcategory=Cat. de impuesto
-label.taxes=Impuestos
+label.taxes=IVA
 label.taxid=CIF/NIF
-label.taxincluded=Impuestos Incluidos al inicio
+label.taxincluded=IVA Incluido al inicio
 label.taxparent=Impuesto padre
 label.tblProdHeaderCol1=Almac\u00e9n
 label.tblProdHeaderCol2=cantidad
@@ -471,14 +465,14 @@ label.textclourtablename=Color nombre Mesa
 label.textcolourcustomer=Color texto Cliente
 label.textcolourwaiter=Color texto Camarero
 label.texttip=Mensaje texto
-label.ticketid=Ticket #
+label.ticketid=Tiquet #
 label.Tickets=Pagos
-label.Ticketsbag=Recibos
+label.Ticketsbag=Tiquets
 Label.Ticketsbag=Tiquets
 label.ticketsetupexample=Ejemplo
-label.ticketsetupnumber=Long. m\u00edn N\u00fam Ticket
+label.ticketsetupnumber=Long. m\u00edn N\u00fam Tiquet
 label.ticketsetupprefix=Prefijo N\u00fam. Recibo
-label.tickettype=Tipo de boleto
+label.tickettype=Tipo de tiquet
 label.time=Hora
 label.tktfooter1=Pie de p\u00e1gina 1
 label.tktfooter2=Pie de p\u00e1gina 2
@@ -486,7 +480,7 @@ label.tktfooter3=Pie de p\u00e1gina 3
 label.tktfooter4=Pie de p\u00e1gina 4
 label.tktfooter5=Pie de p\u00e1gina 5
 label.tktfooter6=Pie de p\u00e1gina 6
-label.totalcash=Total
+label.totalcash=Total PVP
 label.totaldiscount=Total Desc'
 label.Transactions=Transacciones
 label.type=Tipo
@@ -496,8 +490,8 @@ label.uploadingproducts=Subiendo productos... Por favor, espere
 label.URL=URL
 label.user=Usuario
 label.ValidFrom=Validez desde
-label.value=Importe
-label.value2=Precio
+label.value=PVP
+label.value2=PVP
 label.variableprice=Precio Variable
 label.visible=Visible
 label.voucherValue=Valor
@@ -672,9 +666,9 @@ Menu.Taxes=Impuestos
 Menu.ThirdParties=Proveedores
 Menu.ThirdPartiesManagement=Gesti\u00f3n de proveedores

-Menu.Ticket=Ventas
-Menu.TicketEdit=Editar ventas
-Menu.TicketRefund=Devoluciones
+Menu.Ticket=Vender
+Menu.TicketEdit=Buscar tiquets
+Menu.TicketRefund=Reembolsos
 Menu.TimeSeriesProduct=Series de<br><b>tiempo

 Menu.Tools.Resets=Resetear Aplicaciones
@@ -687,7 +681,7 @@ Menu.Update= Actulizaci\u00f3n Manual Base de Datos
 Menu.Tools.UpdatedPrices=Cambio de Precios

 Menu.Users=Usuarios
-Menu.UserNoSales=Boleto vac\u00edo
+Menu.UserNoSales=Tiquet vac\u00edo
 Menu.UserSells=<html>Caja por<br><b>vendedor
 Menu.UsersReport=Usuarios
 Menu.UserTip=Consejos por usuario
@@ -718,7 +712,7 @@ message.cannotloadlists=No se han podido cargar las listas de datos.
 message.cannotloadreport=No se ha podido cargar la definici\u00f3n del informe.
 message.cannotloadreportdata=No se han podido cargar los datos del informe.
 message.cannotloadresourcedata=No se han podido cargar los recursos del informe.
-message.cannotloadticket=No se ha podido cargar el recibo.
+message.cannotloadticket=No se ha podido cargar el tiquet.
 message.CannotMove=No se puede mover a otro registro.
 message.cannotprint=No se puede imprimir el recibo.
 message.cannotprintline=No se ha podido imprimir la l\u00ednea.
@@ -763,17 +757,17 @@ message.nocustomernodebt=Este recibo no est\u00e1 asignado.\nNo puede ser pagado
 message.nopaymentgateway=Pasarela de pago sin definir.
 message.noprinters=No hay impresoras instaladas en el sistema.
 message.noproduct=No existe un producto con el c\u00f3digo introducido
-message.nosaveticket=No se ha podido guardar el recibo.
+message.nosaveticket=No se ha podido guardar el tiquet.
 message.noshift=No tienes un turno anterior
 message.nosupptranx=No hay transacciones para este proveedor
 message.notactive=Ha sucedido un error al mostrar el panel.
-message.notexiststicket=El recibo no existe.
-message.noticket=El recibo ya no existe
+message.notexiststicket=El tiquet no existe.
+message.noticket=El tiquet ya no existe
 message.notpermissions=No se le permite ejecutar esta tarea
 message.noupdatescript=<html>Se ha detectado un versi\u00f3n anterior de la base de datos pero no es posible actualizar la base de datos autom\u00e1ticamente. Openbravo POS se cerrar\u00e1 ahora.
 message.novprice=<html><center><h4>Producto de precio variable!</h2><br> Introducir precio y luego seleccionar producto
 message.noweight=No se ha podido realizar la pesada
-message.nullticket=<html>No puedes crear un ticket vac\u00edo!<br>Por favor a\u00f1ade alg\u00fan art\u00edculo a esta venta
+message.nullticket=<html>No puedes crear un tiquet vac\u00edo!<br>Por favor a\u00f1ade alg\u00fan art\u00edculo a esta venta
 message.numericamount = La cantidad debe ser un numero.
 message.paymentcashneg=Haga la devoluci\u00f3n y pulse Aceptar.
 message.paymenterror=Error de transaccion de pago!
@@ -799,11 +793,11 @@ message.restartchanges=La configuraci\u00f3n se ha guardado correctamente. Los c
 message.scannerfail=Se ha producido un error al subir la lista de productos.
 message.scannerfail2=Se ha producido un error al descargar la lista de productos.
 message.scannerok=Se ha subido con \u00e9xito la lista de productos.
-message.sharedticket=<html><center><h3>Hay entradas en la pila</h3><br>Desafortunadamente no puedes verlos.
-message.sharedticketlock=El billete esta bloqueado! En uso en otro terminal
-message.sharedticketlockoverriden=<html><center><h4>Su Vale fue excedido por alguien con permisos de usuario mas altos.<br>Cualquier cambio que haya hecho en su Vale actual puede ser reemplazado
-message.sharedtickets=<html><center><h3>Hay entradas en la pila!</h3>Completar o enviar a la papelera
-message.sharedtickettitle=Lista de Vales compartidos
+message.sharedticket=<html><center><h3>Hay tiquets aparcados</h3><br>Desafortunadamente no puedes verlos.
+message.sharedticketlock=El tiquet esta bloqueado! En uso en otro terminal
+message.sharedticketlockoverriden=<html><center><h4>Su tiquet fue emitido por alguien con permisos de usuario mas altos.<br>Cualquier cambio que haya hecho en su tiquet actual puede ser reemplazado
+message.sharedtickets=<html><center><h3>Hay tiquets aparcados!</h3>Completar o enviar a la papelera
+message.sharedtickettitle=Lista de tiquets aparcados
 message.startupText=<html>Cambiar el contenido del texto de inicio predeterminado y no declarar que se trata de un software libre infringe la GNU General Public License de Free Software Foundation GPL.
 message.supplierinvalid=Proveedor no valido
 message.systemclosecas=Producto no valido
@@ -811,12 +805,12 @@ message.systemclosecash=Mover botones Cerrar Caja
 message.tableempty=<html>El Vale de esta tabla esta siendo editado por otro usuario<br>Vuelva luego.
 message.tableempty=La mesa est\u00e1 ahora vac\u00eda.
 message.tablefull=La mesa est\u00e1 ahora vac\u00eda.
-message.ticketrefunded=<html>Este Vale ya ha sido Reembolsado<br>Solo se permite un reembolso por Vale
-message.ticketrefundedtitle=Cheque de reembolso de Vales
+message.ticketrefunded=<html>Este tiquet ya ha sido Reembolsado<br>Solo se permite un reembolso por tiquet
+message.ticketrefundedtitle=Recibo de reembolso de tiquet
 message.title.checkstock= Control de inventario
 message.title.nostocklocation=Localizaciones
 message.title=Mensaje de caja registradora
-message.transfer=<html>La transferencia puede tardar mucho tiempo dependiendo del tama\u00c3\u00b1o de su base de datos<br> Estas seguro de que quieres seguir adelante?
+message.transfer=<html>La transferencia puede tardar mucho tiempo dependiendo del tama\u00f1o de su base de datos<br> Estas seguro de que quieres seguir adelante?
 message.transfercomplete=<html>La transferencia de datos esta completa<br>Los datos se indexaran ahora
 message.transfernotsupported=Tipo de Migraci\u00f3n de Base de Datos no soportada
 message.transfertitle=Transferencia de base de datos
@@ -831,12 +825,12 @@ message.wannasave=\u00bfDesea guardar los cambios antes de salir?
 messsage.title.supplierinvalid=Proveedor no valido

 notify.added='Agregado'
-notify.customeradd='Cliente a\u00c3\u00b1adido a este ticket'
-notify.customerchange='El cliente ha cambiado por este ticket'
-notify.customerremove='El cliente ha borrado por este ticket'
+notify.customeradd='Cliente a\u00c3\u00b1adido a este tiquet'
+notify.customerchange='El cliente se ha cambiado para este tiquet'
+notify.customerremove='El cliente se ha eliminado para este tiquet'
 notify.deleted='Borrado'
-notify.printed='Imprimido'
-notify.printing='Imprimendo...'
+notify.printed='Impreso'
+notify.printing='Imprimiendo...'
 notify.removed='Borrado'
 notify.saved='Guardado'

@@ -855,24 +849,24 @@ rest.label.chairs=Personas
 rest.label.customer=Cliente
 rest.label.date=Fecha
 rest.label.notes=Notas
-rest.label.selectcustomer=Selecionar Persona
+rest.label.selectcustomer=Selecionar cliente
 rest.label.showcalendar=Ver/quitar Calendario

 scale.invalidvalue=La balanza devolvi\u00f3 un valor err\u00f3neo.
 scale.notdefined=La balanza no est\u00e1 definida.

 stock.in.movement=(entrada) Traspaso
-stock.in.purchase=(entrada) compra
-stock.in.refund=(entrada) devoluci\u00f3n
-stock.out.break=(salida) rotura
-stock.out.crossing=Traspaso
-stock.out.free=Gratis
-stock.out.movement=(salida) Traspaso
-stock.out.refund=Retornar - Suprimir
-stock.out.sale=(salida) venta
-stock.out.sample=Ejemplo - Salida
-stock.out.subtract=Sustraer
-stock.out.used=Usado
+stock.in.purchase=(entrada) Compra
+stock.in.refund=(entrada) Devuelto
+stock.out.break=(salida) Rotura
+stock.out.crossing=(entrada) Otros motivos
+stock.out.free=(salida) Regalo
+stock.out.movement=No se usa
+stock.out.refund=(salida) Retornado
+stock.out.sale=(salida) Venta
+stock.out.sample=(salida) Empleados
+stock.out.subtract=(salida) Robado
+stock.out.used=(salida) Traspaso

 tab.bank=Banco
 tab.cash=Caja
@@ -884,9 +878,9 @@ tab.debt=A cuenta
 tab.debt=D\u00e9bito
 tab.free=Escaso
 tab.magcard=Tarjeta
-tab.paper=Boleto
-tab.paper=Slip
-tab.slip=Slip
+tab.paper=Tiquet
+tab.paper=A cuenta
+tab.slip=A cuenta
 tab.ticket=Tiquet
 tab.voucher=Vale

@@ -911,7 +905,7 @@ tkt.tktheader6=Cabezal 6

 tooltip.=Reembolsar todo
 tooltip.addnew=<html><center><h4>Adquirir Nuevo
-tooltip.addnewticket=<html><center><h4>Nuevo Tiquet
+tooltip.addnewticket=<html><center><h4>Aparcar tiquet
 tooltip.attributes=<html><center><h4>Atributos
 tooltip.barcodetype=El valor predeterminado es EAN Barcodes. Comprobar para cambiar a codigos de barras de formato UPC
 tooltip.btn.closecash=<html><center><h4>Cerrar efectivo (tambien conocido como lectura Z)<br>Cerrar transacciones hasta este momento
@@ -946,7 +940,7 @@ tooltip.fontsize=<font size=-2>peque\u00f1o</font>
 tooltip.fontsizelarge=<html><center><h4><font size=+2>Grande</font>
 tooltip.fontsizesmall=<font size=-2>peque\u00f1o</font>
 tooltip.fontsizesmall=<html><center><h4><font size=-2>Menor</font>
-tooltip.layaway=<html><center><h4>Entradas a la espera de finalizacion
+tooltip.layaway=<html><center><h4>Tiquets aparcados
 tooltip.menu=Ver/Suprimir Menu y todo el programa
 tooltip.openfile=<html><center><h4>Seleccione el archivo necesario para este control\n
 tooltip.openfile=<html><center><h4>Seleccione el archivo necesario para este control\n
@@ -955,7 +949,7 @@ tooltip.prepay=Prepago a cuenta
 tooltip.priceupdate=Permitir actualizaciones de precios en la pantalla Ventas

 tooltip.printto=<html><center><h4>Seleccione esta impresora predeterminada de productos
-tooltip.printtoremote=<html><center><h4>Imprimir el ticket a la impresora remota
+tooltip.printtoremote=<html><center><h4>Imprimir el tiquet a la impresora remota
 tooltip.proddate=Utilice este campo de fecha para algo como la fecha de caducidad de un producto
 tooltip.prodhtmldisplayBold=<html><center><h4>Establezca el texto del boton en Negrita
 tooltip.prodhtmldisplayBreak=<html><center><h4>Inserta un salto de linea y se borra todo<br>(una nueva linea) para el texto del boton
@@ -970,37 +964,37 @@ tooltip.product.button.tab=<html> La pesta\u00f1a Bot\u00f3n permite mejorar el
 tooltip.product.general.tab=<html>La pesta\u00f1a General contiene la informaci\u00f3n principal de los productos. Los campos que tienen un * (asterisco) DEBEN completarse y no pueden estar vac\u00edos
 tooltip.quicklogoff=<html><center><h4>Salida rapida
 tooltip.refunditem=<html><center><h4>Reembolsar un solo articulo
-tooltip.refundline=<html><center><h4>Reembolsar una linea de billetes
+tooltip.refundline=<html><center><h4>Reembolsar una linea de tiquet
 tooltip.refundticket=<html><center><h4>Reembolsar todo
-tooltip.reprint=<html><center><h4>TIQUET Reimpreso
-tooltip.reprintLastTicket=<html><center><h4>Imprimir el ultimo Ticket
-tooltip.saleattributes=<html><center><h4>Elegir atributos del productobr>Para la linea de transaccion actual
+tooltip.reprint=<html><center><h4>TIQUET REIMPRESO
+tooltip.reprintLastTicket=<html><center><h4>Imprimir el \u00faltimo tiquet
+tooltip.saleattributes=<html><center><h4>Elegir atributos del producto<br>Para la linea de transaccion actual
 tooltip.salebarcode=<html><center><h4>Haga clic para obtener coincidencia de productos<br> Codigo de barras introducido manualmente
 tooltip.salechangetax=<html><center><h4>Cambiar impuesto para la linea de transaccion actual
-tooltip.salecheckstock=<html><center><h4>Comprobar existencias para la linea de transaccion actual<br>Doble toque para obtener mas informacion
-tooltip.saleeditline=<html><center><h4>Editar el ultimo Tiquet
+tooltip.salecheckstock=<html><center><h4>Comprobar existencias para la linea de transaccion actual<br>Doble toque para obtener m\u00e1s informaci\u00f3n
+tooltip.saleeditline=<html><center><h4>Editar el ultimo tiquet
 tooltip.saleproductfind=<html><center><h4>Buscar por producto
-tooltip.saleremoveline=<html><center><h4>Borrar el actual tiquet
+tooltip.saleremoveline=<html><center><h4>Borrar l\u00ednea seleccionada
 tooltip.salesattributes=<html><center><h4>Atributos
-tooltip.salescustomer=<html><center><h4>Buscar o crear<br>Tiquet para este cliente
-tooltip.salesplit=<html><center><h4>Venta de Split
+tooltip.salescustomer=<html><center><h4>Seleccionar cliente<br>para este tiquet
+tooltip.salesplit=<html><center><h4>Repartir venta
 tooltip.salestaxswitch=<html><center><h4>Impuesto para aplicar a<br> a la linea de transaccion actual
-tooltip.salesubtotal=<html><center><h4>Total de lineas de billetes sin IVA
-tooltip.saletax=<html><center><h4>Impuestos totales de lineas de billetes<br>El impuesto se calcula linea por linea
-tooltip.saletotal=<html><center><h4>Vale total incluyendo impuestos
+tooltip.salesubtotal=<html><center><h4>Total de l\u00edneas de tiquets sin IVA
+tooltip.saletax=<html><center><h4>Impuestos totales de las l\u00edneas de tiquets<br>El impuesto se calcula l\u00ednea por l\u00ednea
+tooltip.saletotal=<html><center><h4>Total impuestos incluidos
 tooltip.save=<html><center><h4>Guardar
 tooltip.scale=<html><center><h4>Abrir en pantalla<br>como Bascula virtual
 tooltip.supplierdocument=<html><center><h4>Introduzca la entrega de un proveedor<br>Nota o factura
 tooltip.switchtax=<html><center><h4>Impuesto de cambio de un precio introducido manualmente
 tooltip.ticketedit=<html><center><h4>Editar tiquet
 tooltip.ticketrefund=<html><center><h4>Tiquet de reembolso
-tooltip.ticketreprint=<html><center><h4>Reimprimir Tiquet
-tooltip.ticketsearch=<html><center><h4>Buscar Tiquets
+tooltip.ticketreprint=<html><center><h4>Reimprimir tiquet
+tooltip.ticketsearch=<html><center><h4>Buscar tiquets
 tooltip.transferdb=<html><center><h4>Iniciar la base de datos Proceso de transferencia
 tooltip.transferdbversion=<html><center><h4>La version uniCenta oPOS de la base de datos de transferencias
 tooltip.transferfromdb=<html><center><h4>Seleccione el tipo de base de datos a transferir desde
 tooltip.transfertxtout=<html><center><h4>Lista actualizada dinamicamente de cada proceso cuando sucede<br>\nEnumera las tablas de la base de datos de transferencia
-tooltip.vouchercustomer=<html><center><h4>Buscar o Crear nuevo<br>el Cliente de este tiquet
+tooltip.vouchercustomer=<html><center><h4>Buscar o Crear nuevo<br>Cliente para este tiquet
 tooltip.xmlheader=Utilicelo para insertar el encabezado XML correcto para su uso en los scripts de extension
 tootltip.transferclass=<html><center><h4>Dejar como predeterminado a menos que<br>Se selecciona una biblioteca de controladores diferente
 tootltip.transferdbname=<html><center><h4>Esta es la URL completa de la<br>Servidor que aloja la base de datos <br>\nEl valor predeterminado es localhost. Cambie aqui si su base de datos esta alojada en un servidor remoto
@@ -1024,7 +1018,7 @@ transpayment.debtpaid=A cuenta pagados
 transpayment.free=Sin cargo
 transpayment.ccard=Tarjeta de credito
 transpayment.ccardrefund=Devoluci\u00f3n con tarjeta
-transpayment.slip=Vales
+transpayment.slip=A cuenta
 transpayment.ticket=Tiquet
 transpayment.voucher=Vale
 transpayment.voucherin=Cupon - Redimido
@@ -1037,7 +1031,7 @@ label.DbName1=DB 2 Nombre
 label.DbPort=Port
 label.DbPort1=Port 2
 label.DbURL1=DB 2 URL
-label.discount=Reembolso
+label.discount=Descuento
 label.display=Pantalla
 label.from=De
 label.ibutton=iButton
@@ -1045,7 +1039,7 @@ label.ibuttonresponsespeed=Sensibilidad
 label.imagesize=Tama\u00f1o de la imagen 250x250 p\u00edxeles o inferior para un mejor rendimiento
 label.instance=\u00fanica instancia
 label.invline=Cambiar Precio Comprar
-label.invlinestotal=L\u00edneas Total
+label.invlinestotal=Total l\u00edneas
 label.locationplace=Almac\u00e9n
 label.customer_list=Lista
 label.customer_export=Lista de exportaci\u00f3n
@@ -1064,7 +1058,7 @@ label.prodbarcodetype=Tipo de c\u00f3digo de barras
 label.prodcategorym=<html>Categor\u00eda<font color=FB00FF> *
 label.proddefaultcategory=Predeterminado Cat'
 label.prodpricebuym=<html>Precio de compra<font color=FB00FF> *
-label.prodpriceselltaxm=<html>Precio de venta inc'<font color=FB00FF> *
+label.prodpriceselltaxm=<html>PVP<font color=FB00FF> *
 label.prodrefm=<html>Referencia<font color=FB00FF> *
 label.prodtax=Impuesto
 label.rolem=<html>Role<font color=FB00FF> *
@@ -1116,8 +1110,8 @@ form.usertitle=Lista de usuarios
 migration.warning=Advertencia
 label.warranty=Garant\u00eda
 message.deletelineno=No tienes permitido hacer esto
-message.nosharedtickets=No tienes pedidos compartidas en la pila
-tooltip.customerpay.prepay=Seleccione un cliente y luego ingrese el importe de pago aqu\u00ed y luego haga clic en bot\u00f3n Prepago
+message.nosharedtickets=No hay tiquets aparcados
+tooltip.customerpay.prepay=Seleccione un cliente, ingrese el importe de pago aqu\u00ed y luego haga clic en bot\u00f3n Prepago
 tootltip.save=Guardar
 label.configOptionRestaurant=Restaurante
 button.closecashreprint=Reimprimir
@@ -1150,13 +1144,13 @@ label.autoRefreshTableMapTimerOFF=<html> La Actualizaci\u00f3n Autom\u00e1tica e
 label.autoRefreshTableMapTimerON=<html> La Actualizaci\u00f3n Autom\u00e1tica es: <b> ON </ b>
 Menu.Closing1=<html>Caja cerrado <br /> <b> Exportaci\u00f3n
 Menu.Closing2=<html>Caja cerrado <br /> <b> Exportaci\u00f3n
-message.customernotfound=<html> Cliente no encontrado. <br> \u00bfDesea crear un nuevo registro de cliente?
+message.customernotfound=<html> Cliente no encontrado. <br> \u00bfDesea crear un nuevo cliente?
 Menu.InventoryBundles=<html>Inventario <br /><b>Paquetes
 tooltip.product.properties.tab=<html> La ficha Propiedades se utiliza junto con los scripts de recursos <br>Se utiliza para agregar m\u00e1s atributos a un producto
 tooltip.product.stock.tab=<html> La pesta\u00f1a Almac\u00e9n contiene los atributos opcionales Productos
 message.customercheck=Se requiere una clave de b\u00fasqueda y un nombre.
-message.customeradd=\u00bfA\u00f1adir al cliente a este boleto?
-message.customerchangeyn=\u00bfEst\u00e1 seguro de que desea cambiar el cliente por el recibo actual?
+message.customeradd=\u00bfA\u00f1adir cliente a este tiquet?
+message.customerchangeyn=\u00bfEst\u00e1 seguro de que desea cambiar el cliente para el tiquet actual?
 message.deletelineyes=\u00bfEstas seguro que quieres borrarlo?
 message.sharedticketlockoverride=\u00bfEst\u00e1s seguro de que quieres Over-ride?
 message.customerclear=\u00bfEst\u00e1s seguro? Cancelar borrar\u00e1 al Cliente.
@@ -1183,11 +1177,14 @@ database.ScriptWarning=Error de script de base de datos
 exception.unavailabledataset=El conjunto de datos no est\u00e1 disponible
 message.email=No se ha encontrado la aplicaci\u00f3n de correo electr\u00f3nico de escritorio
 message.enterbuyprice=Introduzca el nuevo Precio de Compra
-tooltip.edit.findticket=Introduzca Recibo y toque para Buscar por n\u00famero
+tooltip.edit.findticket=Introduzca n\u00ba de tiquet y valide para Buscar por n\u00famero
 exception.unavailablefield=Campo no definido: {0}
 exception.unavailablefields=Campos no disponibles
 cboption.find=Buscar
 button.prodhtmldisplayFont=Tipo de fuente
 button.prodhtmldisplayImage=Imagen
 label.csvclear=Diario de importaci\u00f3n
-message.eolupdate=<html><center><h3>uniCenta oPOS Versi\u00f3n {0} detectada!</h3><h4>\u00a1Las actualizaciones de la versi\u00f3n est\u00e1n cambiando!</h4> Si su versi\u00f3n es 4.5 o posterior, elija <b>S\u00cd</b> para continuar.<br/><br/> Para versiones anteriores, haga clic en <b>NO</b> para abrir Opciones de configuraci\u00f3n ahora.<br/></br>Lea la Gu\u00eda de transferencia de datos de uniCenta oPOS
+message.eolupdate=<html><center><h3>uniCenta oPOS Versi\u00f3n {0} detectada!</h3><h4>\u00a1Las actualizaciones de la versi\u00f3n est\u00e1n cambiando!</h4> Si su versi\u00f3n es 4.5 o posterior, elija <b>S\u00cd</b> para continuar.<br/><br/> Para versiones anteriores, haga clic en <b>NO</b> para abrir Opciones de configuraci\u00f3n ahora.<br/></br>Lea la Gu\u00eda de transferencia de datos de uniCenta oPOS
+label.find=Buscar
+label.create=Crear
+label.cancel=Cancelar
@@ -468,4 +468,4 @@ transpayment.ticket=Ticket
 transpayment.voucherin=Vales cobrados
 transpayment.voucherout=Vales emitidos
 Visor.Title=uniCenta oPOS
-message.eolupdate=<html><center><h3>uniCenta oPOS Versi\u00f3n {0} detectada!</h3><h4>\u00a1Las actualizaciones de la versi\u00f3n est\u00e1n cambiando!</h4> Si su versi\u00f3n es 4.5 o posterior, elija <b>S\u00cd</b> para continuar.<br/><br/> Para versiones anteriores, haga clic en <b>NO</b> para abrir Opciones de configuraci\u00f3n ahora.<br/></br>Lea la Gu\u00eda de transferencia de datos de uniCenta oPOS
+message.eolupdate=<html><center><h3>uniCenta oPOS Versi\u00f3n {0} detectada!</h3><h4>\u00a1Las actualizaciones de la versi\u00f3n est\u00e1n cambiando!</h4> Si su versi\u00f3n es 5.3 o posterior, elija <b>S\u00cd</b> para continuar.<br/><br/> Para versiones anteriores, haga clic en <b>NO</b> para abrir Opciones de configuraci\u00f3n ahora.<br/></br>Lea la Gu\u00eda de transferencia de datos de uniCenta oPOS
@@ -911,7 +911,7 @@ message.transfermessage=Database overdracht
 message.transfernotsupported=Database overdrachtstype wordt niet ondersteund
 message.transfertitle=Database overdracht
 message.updatedatabase=<html><center><h3>uniCenta oPOS Version {0} database gedetecteerd!</h3> De database wordt automatisch geüpgraded.<br>GEGEVENS KUNNEN VERLOREN GAAN. MAAK EERST EEN BACKUP.<br><br>Wilt u doorgaan?
-message.eolupdate=<html><center><h3>uniCenta oPOS Version {0} gedetecteerd!</h3><h4>Versie-upgrades veranderen!</h4>Als je versie 4.5 of hoger is kies<b>YES</b>om door te gaan<br/><br/>Voor oudere versies kies<b>NO</b> Om nu de configuratie opties te openen!<br>Lees alstublieft de uniCenta oPOS Data Transfer Guide<br/><br/>
+message.eolupdate=<html><center><h3>uniCenta oPOS Version {0} gedetecteerd!</h3><h4>Versie-upgrades veranderen!</h4>Als je versie 5.3 of hoger is kies<b>YES</b>om door te gaan<br/><br/>Voor oudere versies kies<b>NO</b> Om nu de configuratie opties te openen!<br>Lees alstublieft de uniCenta oPOS Data Transfer Guide<br/><br/>
 message.URL=<html>Een webpagina laten zien in het hoofdscherm . vereist de volledige URL<br />Voor een lokaal bestand begin met - <b>file://</b><br/>Voor een extern bestand gebruik <b>http://</b><br/> 
 message.uuidcopy=<html><center><h4>UUID is gekopieerd naar het klembord
 message.vipno=Klant is geen VIP
@@ -0,0 +1,73 @@
+package com.unicenta.pos.util;
+
+import com.google.zxing.BarcodeFormat;
+import com.google.zxing.client.j2se.MatrixToImageWriter;
+import com.google.zxing.common.BitMatrix;
+import com.google.zxing.qrcode.QRCodeWriter;
+import org.junit.jupiter.api.Test;
+
+import javax.imageio.ImageIO;
+import java.awt.image.BufferedImage;
+import java.io.File;
+import java.nio.charset.StandardCharsets;
+import java.util.Base64;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+class QRCodeTest {
+
+    @Test
+    void shouldPrintQRCode() throws Exception {
+        // Name
+        QRObject name = new QRObject(1,  "Hugh Stevenson");
+        byte nameTagByte = (byte) name.getTag();
+        byte nameLengthByte = (byte) name.getLength();
+        byte[] nameBytes = {nameTagByte, nameLengthByte};
+        String nameString = new String(nameBytes, StandardCharsets.UTF_8)+name.getValue();
+
+        //vat number
+        QRObject vat = new QRObject(2, "1234567890");
+        byte vatTagByte = (byte) vat.getTag();
+        byte vatLengthByte = (byte) vat.getLength();
+        byte[] vatBytes = {vatTagByte, vatLengthByte};
+        String vatString = new String(vatBytes, StandardCharsets.UTF_8)+vat.getValue();
+
+        // date
+        QRObject date = new QRObject(3, "2021-11-28 09:30:00");
+        byte dateTagByte = (byte) date.getTag();
+        byte dateLengthByte = (byte) date.getLength();
+        byte[] dateBytes = {dateTagByte, dateLengthByte};
+        String dateString = new String(dateBytes, StandardCharsets.UTF_8)+date.getValue();
+
+        // amount
+        QRObject amount = new QRObject(4, "1000.00");
+        byte amountTagByte = (byte) amount.getTag();
+        byte amountLengthByte = (byte) amount.getLength();
+        byte[] amountBytes = {amountTagByte, amountLengthByte};
+        String amountString = new String(amountBytes, StandardCharsets.UTF_8)+amount.getValue();
+
+
+        // Vat amount
+        QRObject vatAmount = new QRObject(5, "150.00");
+        byte vatAmountTag = (byte) vatAmount.getTag();
+        byte vatAmountLengthByte = (byte) vatAmount.getLength();
+        byte[] vatAmountBytes = {vatAmountTag, vatAmountLengthByte};
+        String vatAmountString = new String(vatAmountBytes, StandardCharsets.UTF_8)+vatAmount.getValue();
+
+
+        //barcode
+        String barCodeString = nameString+vatString+dateString+amountString+vatAmountString;
+        String encodedBarcode = Base64.getEncoder().encodeToString(barCodeString.getBytes(StandardCharsets.UTF_8));
+
+        assert encodedBarcode != null;
+
+        QRCodeWriter barcodeWriter = new QRCodeWriter();
+        BitMatrix bitMatrix = barcodeWriter.encode(encodedBarcode, BarcodeFormat.QR_CODE, 200, 200);
+
+        BufferedImage bufferedImage = MatrixToImageWriter.toBufferedImage(bitMatrix);
+
+        File outputfile = new File("test.jpg");
+        assert  ImageIO.write(bufferedImage, "jpg", outputfile);
+
+    }
+}
Author	SHA1	Message	Date
hugh	3e3076f2d5	5.4.0 web release java 8 requirements	2025-08-06 18:10:42 +01:00
hugh	fa4edbe365	merge main	2025-08-06 17:39:16 +01:00
hugh	4a82f944b5	5.4.0 release for web / don't need derbyshared	2025-08-04 17:07:49 +01:00
hugh	73c3ed11b1	5.4.0 release for web	2025-08-04 16:57:31 +01:00
hugh	8771d24bb6	5.4.0 release	2025-07-31 19:13:42 +01:00
hugh-unicenta	da06d3ed76	Woocom (#50 ) * orders * woocommerce support * working with MariaDB + Derby	2025-07-31 16:03:08 +01:00
hugh	2036b92129	5.3.2 release	2025-05-06 15:34:19 +01:00
hugh	27fae06809	wip	2025-05-06 15:29:43 +01:00
hugh	dc42e43413	UOCL-292: Add Maven Wrapper	2025-03-28 11:41:03 +00:00
hugh	84e9b1c32e	UOCL-290: xls exports fix	2025-03-28 11:25:51 +00:00
hugh	a23260f982	Revert "Revert "UOCL-285: payment screen hanging (#42 )"" This reverts commit `acc38ba567`.	2025-03-28 11:16:28 +00:00
hugh	acc38ba567	Revert "UOCL-285: payment screen hanging (#42 )" This reverts commit `0c6b84dd5f`.	2025-03-28 11:14:51 +00:00
hugh	1f984b560c	fixing test for GH	2025-03-14 12:37:18 +00:00
hugh-unicenta	0c6b84dd5f	UOCL-285: payment screen hanging (#42 ) * UOCL-285: payment screen hanging * UOCL-290: xls exports fix * 5.3.2 release	2025-03-07 10:56:03 +00:00
hugh-unicenta	a038cc2282	UOCL-285: payment screen hanging (#41 )	2025-01-05 16:30:07 +00:00
hugh	d3f9fdb421	5.3.1 web release	2025-01-04 15:02:22 +00:00
hugh	256c8c4097	5.3.1 web release	2024-10-23 15:05:19 +01:00
hugh	7ef06723c4	5.3.1 web release	2024-09-07 13:56:23 +01:00
hugh	4a77297e23	starting	2024-08-24 11:34:51 +01:00
hugh	3b6829e181	adding more debug logging	2024-06-23 19:34:28 +01:00
hugh-unicenta	33ab53f520	5.3.1 release (#36 ) * UOCL-265: Spanish translation improvements * UOCL-246: Reprint receipt fix * UOCL-246: Reprint receipt fix * UOCL-246: reprint receipt * UOCL-283: Porting ZATCA QR-code! * UOCL-283: Porting ZATCA QR-code! * UOCL-246: reprint receipt * UOCL-274: Top 10 sales rpt fix * UOCL-274: Top 10 sales rpt fix * 5.3.1 release	2024-05-20 17:03:58 +01:00
hugh-unicenta	63bdae5ca4	Merge pull request #35 from uniCenta/security Urgent Security Updates	2024-04-27 15:57:43 +01:00
hugh	9ee5b76dc9	UOCL-281: xstream library security fix	2024-04-27 14:54:00 +01:00
hugh	8816496cd7	UOCL-280: Apache Derby Security update	2024-04-27 14:31:45 +01:00
hugh	a97014198b	UOCL-279: Postgresql library upgrade	2024-04-26 16:50:57 +01:00
hugh	204862f694	UOCL-278: security jasperreports library upgrade	2024-04-26 16:39:21 +01:00
hugh	0ea796caa4	UOCL-277: xmlgraphics security	2024-04-26 16:37:16 +01:00
hugh	a3e297fa61	5.3 release	2024-02-01 13:37:07 +00:00
hugh	f0c670fd67	5.3 release	2024-01-29 15:40:29 +00:00
hugh	a23631be46	5.3 release	2024-01-27 15:10:23 +00:00
hugh-unicenta	a86418b16d	Merge pull request #31 from uniCenta/product-api-new Product api new	2024-01-27 14:45:29 +00:00
hugh	763c06f0c9	teya fix working	2024-01-27 14:44:13 +00:00
hugh	1b34fdabb0	product api	2023-12-29 17:09:58 +00:00
hugh	cab75818b7	5.2 release	2023-12-23 16:36:54 +00:00
hugh	5864c6373a	5.2 release	2023-12-22 17:29:39 +00:00
hugh	0d6b0192d8	5.2 release	2023-12-22 17:29:07 +00:00
hugh	bedf5b60ad	5.2 release	2023-12-21 17:31:21 +00:00
hugh-unicenta	3b0eccae9c	Merge pull request #28 from uniCenta/order-api Order api	2023-12-21 17:28:30 +00:00
hugh	b8f22b9ae2	order api	2023-12-21 17:27:24 +00:00
hugh	cefebc3882	wip	2023-12-11 18:52:25 +00:00
hugh	bfaeedfa34	Orders POC	2023-12-10 14:41:24 +00:00
hugh	492990848b	5.1 release / latest adapter	2023-11-21 14:45:46 +00:00
hugh	3637f8a352	5.1 release	2023-11-14 11:05:15 +00:00
hugh	160cd189c8	5.1 release	2023-11-14 10:34:57 +00:00
hugh	33c4c39082	5.1 release	2023-11-14 10:33:33 +00:00
hugh	f5930ee93d	fixing slow build	2023-11-13 14:14:04 +00:00
hugh	83b5c421c2	fixing slow build	2023-11-13 14:05:00 +00:00
hugh	5fed36a86c	adding gh action maven build	2023-11-13 13:49:39 +00:00
hugh	6f026636eb	adding gh action maven build	2023-11-13 13:47:15 +00:00
hugh	9095f02baf	adding gh action maven build	2023-11-13 13:42:40 +00:00
hugh	e81ef4244a	adding gh action maven build	2023-11-13 13:40:41 +00:00
hugh	bdeb625570	payment window fix	2023-11-11 15:17:54 +00:00
hugh	d40880a7c2	payment window fix	2023-11-11 15:15:36 +00:00
hugh	e136c11f27	5.2 release	2023-11-11 15:10:31 +00:00
hugh-unicenta	c8855c2a57	Merge pull request #23 from uniCenta/teya-integration Teya integration	2023-11-10 18:00:59 +00:00
hugh	817168fc88	merge conflict	2023-11-10 18:00:22 +00:00
hugh-unicenta	27ac3f6bb5	Merge branch 'main' into teya-integration	2023-11-10 17:56:41 +00:00
hugh	d1fc482eb5	teya finish up	2023-11-10 17:54:59 +00:00
hugh-unicenta	84c4b2b0b2	Merge pull request #21 from uniCenta/customer-api Customer api	2023-11-10 17:53:41 +00:00
hugh	e9fff7f4a3	teya integration / payment	2023-11-08 19:22:02 +00:00
hugh	b7bef162df	teya integration / payment	2023-11-08 19:21:17 +00:00
hugh	5b81989f2f	teya integration / payment	2023-11-03 12:43:41 +00:00
hugh	90114551ff	fixing window binding	2023-11-01 17:21:22 +00:00
hugh	7a084e37a0	teya payment happy path	2023-11-01 16:40:28 +00:00