5.5.0 release

.gitignore

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

pom.xml

@@ -1,16 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
-
   <groupId>com.unicenta</groupId>
   <artifactId>unicentaopos</artifactId>
-  <version>5.4.0</version>
+  <version>5.5.0</version>
   <packaging>jar</packaging>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <maven.compiler.source>11</maven.compiler.source>
-    <maven.compiler.target>11</maven.compiler.target>
-    <derby.version>10.15.2.0</derby.version>
+    <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>
@@ -116,7 +115,6 @@
       <artifactId>poi</artifactId>
       <version>3.17</version>
     </dependency>
-
     <dependency>
       <groupId>org.apache.poi</groupId>
       <artifactId>poi-ooxml</artifactId>
@@ -181,7 +179,6 @@
           <artifactId>slf4j-api</artifactId>
         </exclusion>
       </exclusions>
-
     </dependency>
     <dependency>
       <groupId>org.swinglabs.swingx</groupId>
@@ -255,11 +252,11 @@
       <artifactId>derbytools</artifactId>
       <version>${derby.version}</version>
     </dependency>
-    <dependency>
-      <groupId>org.apache.derby</groupId>
-      <artifactId>derbyshared</artifactId>
-      <version>${derby.version}</version>
-    </dependency>
+    <!--    <dependency>-->
+    <!--      <groupId>org.apache.derby</groupId>-->
+    <!--      <artifactId>derbyshared</artifactId>-->
+    <!--      <version>${derby.version}</version>-->
+    <!--    </dependency>-->
     <dependency>
       <groupId>xml-apis</groupId>
       <artifactId>xml-apis</artifactId>
@@ -293,7 +290,6 @@
       <artifactId>DynamicJasper-core-fonts</artifactId>
       <version>2.0</version>
     </dependency>
-
     <dependency>
       <groupId>org.eclipse.jdt.core.compiler</groupId>
       <artifactId>ecj</artifactId>
@@ -361,7 +357,7 @@
     <dependency>
       <groupId>com.unicenta</groupId>
       <artifactId>unicenta-plugins</artifactId>
-      <version>1.3.0</version>
+      <version>1.3.2-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>com.gluonhq</groupId>
@@ -450,7 +446,6 @@
       <version>4.2.0</version>
       <scope>test</scope>
     </dependency>
-
   </dependencies>
   <build>
     <plugins>

src/main/java/com/unicenta/pos/config/JPanelConfigPayment.java

@@ -53,6 +53,7 @@ public class JPanelConfigPayment extends javax.swing.JPanel implements PanelConf
         initPayments("external", new ConfigPaymentPanelEmpty());
         initPayments("PaymentSense",  new ConfigPaymentPanelEmpty());
         initPayments("Teya",  new ConfigPaymentPanelEmpty());
+        initPayments("MediaPayments",  new ConfigPaymentPanelEmpty());
 
         // Lector de tarjetas.
         jcboCardReader.addItem("Not defined");
@@ -91,9 +92,17 @@ public class JPanelConfigPayment extends javax.swing.JPanel implements PanelConf
 
         jcboCardReader.setSelectedItem(config.getProperty("payment.magcardreader"));
         jcboPaymentGateway.setSelectedItem(config.getProperty("payment.gateway"));
-        urlValue.setText(config.getProperty("payment.URL"));
-        deviceIdValue.setText(config.getProperty("payment.device-id"));
-        securityKeyValue.setText(config.getProperty("payment.security-key"));
+
+        String gateway = comboValue(jcboPaymentGateway.getSelectedItem());
+        if ("MediaPayments".equals(gateway)) {
+            urlValue.setText(config.getProperty("media-payments.pdq"));
+            deviceIdValue.setText(config.getProperty("media-payments.api-key"));
+            securityKeyValue.setText(config.getProperty("media-payments.secret"));
+        } else {
+            urlValue.setText(config.getProperty("payment.URL"));
+            deviceIdValue.setText(config.getProperty("payment.device-id"));
+            securityKeyValue.setText(config.getProperty("payment.security-key"));
+        }
         paymentConfiguration.loadProperties(config);
         dirty.setDirty(false);
     }
@@ -107,9 +116,17 @@ public class JPanelConfigPayment extends javax.swing.JPanel implements PanelConf
 
         config.setProperty("payment.magcardreader", comboValue(jcboCardReader.getSelectedItem()));
         config.setProperty("payment.gateway", comboValue(jcboPaymentGateway.getSelectedItem()));
-        config.setProperty("payment.URL", urlValue.getText());
-        config.setProperty("payment.device-id", deviceIdValue.getText());
-        config.setProperty("payment.security-key", securityKeyValue.getText());
+
+        String gateway = comboValue(jcboPaymentGateway.getSelectedItem());
+        if ("MediaPayments".equals(gateway)) {
+            config.setProperty("media-payments.pdq", urlValue.getText());
+            config.setProperty("media-payments.api-key", deviceIdValue.getText());
+            config.setProperty("media-payments.secret", securityKeyValue.getText());
+        } else {
+            config.setProperty("payment.URL", urlValue.getText());
+            config.setProperty("payment.device-id", deviceIdValue.getText());
+            config.setProperty("payment.security-key", securityKeyValue.getText());
+        }
         paymentConfiguration.saveProperties(config);
         dirty.setDirty(false);
     }
@@ -275,6 +292,9 @@ public class JPanelConfigPayment extends javax.swing.JPanel implements PanelConf
         paymentConfiguration = paymentsName.get(comboValue(jcboPaymentGateway.getSelectedItem()));
 
         if (comboValue(jcboPaymentGateway.getSelectedItem()).equals("PaymentSense")) {
+            urlLabel.setText("URL");
+            deviceIdLabel.setText("Device ID");
+            securityKeyLabel.setText("Security Key");
             emvConfigPanel.setVisible(Boolean.TRUE);
             jcboCardReader.setSelectedItem("EMV");
             jcboCardReader.setEnabled(Boolean.FALSE);
@@ -285,7 +305,18 @@ public class JPanelConfigPayment extends javax.swing.JPanel implements PanelConf
             jcboCardReader.setSelectedItem("EMV");
             jcboCardReader.setEnabled(Boolean.FALSE);
         }
+        else if (comboValue(jcboPaymentGateway.getSelectedItem()).equals("MediaPayments")) {
+            urlLabel.setText("Terminal ID");
+            deviceIdLabel.setText("API Key");
+            securityKeyLabel.setText("Security Key");
+            emvConfigPanel.setVisible(Boolean.TRUE);
+            jcboCardReader.setSelectedItem("EMV");
+            jcboCardReader.setEnabled(Boolean.FALSE);
+        }
         else {
+            urlLabel.setText("URL");
+            deviceIdLabel.setText("Device ID");
+            securityKeyLabel.setText("Security Key");
             emvConfigPanel.setVisible(Boolean.FALSE);
             jcboCardReader.setEnabled(Boolean.TRUE);
         }

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

@@ -21,7 +21,7 @@
 
   <Layout class="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout"/>
   <SubComponents>
-    <Container class="javax.swing.JPanel" name="jPanel1">
+    <Container class="javax.swing.JPanel" name="mainMenuJPanel">
       <Constraints>
         <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout" value="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout$BorderConstraintsDescription">
           <BorderConstraints direction="Before"/>
@@ -73,7 +73,7 @@
               <Group type="103" groupAlignment="0" attributes="0">
                   <Group type="102" alignment="1" attributes="0">
                       <EmptySpace min="0" pref="0" max="-2" attributes="0"/>
-                      <Component id="jButton1" min="-2" max="-2" attributes="0"/>
+                      <Component id="showMainMenuButton" min="-2" max="-2" attributes="0"/>
                       <EmptySpace max="-2" attributes="0"/>
                   </Group>
               </Group>
@@ -81,15 +81,15 @@
             <DimensionLayout dim="1">
               <Group type="103" groupAlignment="0" attributes="0">
                   <Group type="102" attributes="0">
-                      <EmptySpace pref="88" max="32767" attributes="0"/>
-                      <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"/>

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

@@ -101,20 +101,16 @@ public class JPrincipalApp extends javax.swing.JPanel implements AppUserView {
     m_principalnotificator.setText(m_appuser.getName());
     m_principalnotificator.setIcon(m_appuser.getIcon());
 
-    if (jButton1.getComponentOrientation().isLeftToRight()) {
-      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
 
 }

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

@@ -1021,7 +1021,7 @@ public class JRootApp extends JPanel implements AppView, DeviceMonitorEventListe
     jLabel2.setPreferredSize(new java.awt.Dimension(180, 34));
     m_jPanelTitle.add(jLabel2, java.awt.BorderLayout.LINE_START);
 
-    add(m_jPanelTitle, java.awt.BorderLayout.NORTH);
+    //add(m_jPanelTitle, java.awt.BorderLayout.NORTH);
 
     m_jPanelContainer.setLayout(new java.awt.CardLayout());
 

src/main/java/com/unicenta/pos/payment/JPaymentVoucher.form

@@ -40,10 +40,6 @@
                           <EmptySpace type="unrelated" max="-2" attributes="0"/>
                           <Component id="m_jVoucher" min="-2" max="-2" attributes="0"/>
                       </Group>
-                      <Group type="102" alignment="0" attributes="0">
-                          <EmptySpace max="-2" attributes="0"/>
-                          <Component id="jButton1" min="-2" max="-2" attributes="0"/>
-                      </Group>
                   </Group>
                   <EmptySpace min="0" pref="0" max="32767" attributes="0"/>
               </Group>
@@ -87,9 +83,7 @@
                       <Component id="webLblCustomer" alignment="3" min="-2" max="-2" attributes="0"/>
                       <Component id="webLblcustomerName" alignment="3" min="-2" max="-2" attributes="0"/>
                   </Group>
-                  <EmptySpace min="-2" pref="33" max="-2" attributes="0"/>
-                  <Component id="jButton1" min="-2" max="-2" attributes="0"/>
-                  <EmptySpace max="-2" attributes="0"/>
+                  <EmptySpace min="-2" pref="241" max="-2" attributes="0"/>
               </Group>
           </Group>
         </DimensionLayout>
@@ -166,43 +160,43 @@
             </Property>
           </Properties>
         </Component>
-        <Component class="com.alee.laf.label.WebLabel" name="webLblCustomer">
+        <Component class="javax.swing.JLabel" name="webLblCustomer">
           <Properties>
-            <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-              <ResourceString bundle="pos_messages.properties" key="label.customer" replaceFormat="AppLocal.getIntString(&quot;label.customer&quot;)"/>
-            </Property>
-            <Property name="toolTipText" type="java.lang.String" value=""/>
             <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
               <Font name="Arial" size="18" style="1"/>
             </Property>
-            <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
-              <Dimension value="[100, 30]"/>
-            </Property>
-          </Properties>
-        </Component>
-        <Component class="com.alee.laf.label.WebLabel" name="webLblcustomerName">
-          <Properties>
             <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
               <ResourceString bundle="pos_messages.properties" key="label.customer" replaceFormat="AppLocal.getIntString(&quot;label.customer&quot;)"/>
             </Property>
             <Property name="toolTipText" type="java.lang.String" value=""/>
-            <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
-              <Font name="Arial" size="14" style="0"/>
-            </Property>
             <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
               <Dimension value="[100, 30]"/>
             </Property>
           </Properties>
         </Component>
-        <Component class="com.alee.laf.label.WebLabel" name="voucherStatus">
+        <Component class="javax.swing.JLabel" name="webLblcustomerName">
           <Properties>
+            <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
+              <Font name="Arial" size="14" style="0"/>
+            </Property>
+            <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+              <ResourceString bundle="pos_messages.properties" key="label.customer" replaceFormat="AppLocal.getIntString(&quot;label.customer&quot;)"/>
+            </Property>
+            <Property name="toolTipText" type="java.lang.String" value=""/>
+            <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+              <Dimension value="[100, 30]"/>
+            </Property>
+          </Properties>
+        </Component>
+        <Component class="javax.swing.JLabel" name="voucherStatus">
+          <Properties>
+            <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
+              <Font name="Arial" size="14" style="0"/>
+            </Property>
             <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
               <ResourceString bundle="pos_messages.properties" key="label.voucherStatus" replaceFormat="AppLocal.getIntString(&quot;label.voucherStatus&quot;)"/>
             </Property>
             <Property name="toolTipText" type="java.lang.String" value=""/>
-            <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
-              <Font name="Arial" size="14" style="0"/>
-            </Property>
             <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
               <Dimension value="[100, 30]"/>
             </Property>
@@ -224,14 +218,6 @@
             </Property>
           </Properties>
         </Component>
-        <Component class="javax.swing.JButton" name="jButton1">
-          <Properties>
-            <Property name="text" type="java.lang.String" value="jButton1"/>
-          </Properties>
-          <Events>
-            <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="jButton1ActionPerformed"/>
-          </Events>
-        </Component>
       </SubComponents>
     </Container>
     <Container class="javax.swing.JPanel" name="jPanel11">

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

@@ -183,154 +183,141 @@ public class JPaymentVoucher extends javax.swing.JPanel implements JPaymentInter
    * 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() {
 
-    jPanel4 = new javax.swing.JPanel();
-    jLabel5 = new javax.swing.JLabel();
-    m_jVoucher = new javax.swing.JComboBox();
-    jLabel1 = new javax.swing.JLabel();
-    m_jMoneyEuros = new javax.swing.JLabel();
-    webLblCustomer = new com.alee.laf.label.WebLabel();
-    webLblcustomerName = new com.alee.laf.label.WebLabel();
-    voucherStatus = new com.alee.laf.label.WebLabel();
-    jLabel6 = new javax.swing.JLabel();
-    jButton1 = new javax.swing.JButton();
-    jPanel11 = new javax.swing.JPanel();
-    jPanel12 = new javax.swing.JPanel();
-    m_jKeys = new com.unicenta.editor.JEditorKeys();
-    jPanel1 = new javax.swing.JPanel();
-    m_jTendered = new com.unicenta.editor.JEditorCurrencyPositive();
+        jPanel4 = new javax.swing.JPanel();
+        jLabel5 = new javax.swing.JLabel();
+        m_jVoucher = new javax.swing.JComboBox();
+        jLabel1 = new javax.swing.JLabel();
+        m_jMoneyEuros = new javax.swing.JLabel();
+        webLblCustomer = new javax.swing.JLabel();
+        webLblcustomerName = new javax.swing.JLabel();
+        voucherStatus = new javax.swing.JLabel();
+        jLabel6 = new javax.swing.JLabel();
+        jPanel11 = new javax.swing.JPanel();
+        jPanel12 = new javax.swing.JPanel();
+        m_jKeys = new com.unicenta.editor.JEditorKeys();
+        jPanel1 = new javax.swing.JPanel();
+        m_jTendered = new com.unicenta.editor.JEditorCurrencyPositive();
 
-    setLayout(new java.awt.BorderLayout());
+        setLayout(new java.awt.BorderLayout());
 
-    jLabel5.setFont(new java.awt.Font("Arial", 1, 18)); // NOI18N
-    jLabel5.setLabelFor(m_jVoucher);
-    jLabel5.setText(AppLocal.getIntString("label.voucher")); // NOI18N
-    jLabel5.setPreferredSize(new java.awt.Dimension(100, 30));
+        jLabel5.setFont(new java.awt.Font("Arial", 1, 18)); // NOI18N
+        jLabel5.setLabelFor(m_jVoucher);
+        jLabel5.setText(AppLocal.getIntString("label.voucher")); // NOI18N
+        jLabel5.setPreferredSize(new java.awt.Dimension(100, 30));
 
-    m_jVoucher.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
-    m_jVoucher.setPreferredSize(new java.awt.Dimension(180, 30));
-    m_jVoucher.addActionListener(new java.awt.event.ActionListener() {
-      public void actionPerformed(java.awt.event.ActionEvent evt) {
-        m_jVoucherActionPerformed(evt);
-      }
-    });
+        m_jVoucher.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
+        m_jVoucher.setPreferredSize(new java.awt.Dimension(180, 30));
+        m_jVoucher.addActionListener(new java.awt.event.ActionListener() {
+            public void actionPerformed(java.awt.event.ActionEvent evt) {
+                m_jVoucherActionPerformed(evt);
+            }
+        });
 
-    jLabel1.setFont(new java.awt.Font("Arial", 1, 18)); // NOI18N
-    jLabel1.setText(AppLocal.getIntString("label.voucherValue")); // NOI18N
-    jLabel1.setPreferredSize(new java.awt.Dimension(100, 30));
+        jLabel1.setFont(new java.awt.Font("Arial", 1, 18)); // NOI18N
+        jLabel1.setText(AppLocal.getIntString("label.voucherValue")); // NOI18N
+        jLabel1.setPreferredSize(new java.awt.Dimension(100, 30));
 
-    m_jMoneyEuros.setBackground(new java.awt.Color(204, 255, 51));
-    m_jMoneyEuros.setFont(new java.awt.Font("Arial", 1, 18)); // NOI18N
-    m_jMoneyEuros.setHorizontalAlignment(javax.swing.SwingConstants.RIGHT);
-    m_jMoneyEuros.setBorder(javax.swing.BorderFactory.createCompoundBorder(javax.swing.BorderFactory.createLineBorder(javax.swing.UIManager.getDefaults().getColor("Button.darkShadow")), javax.swing.BorderFactory.createEmptyBorder(1, 4, 1, 4)));
-    m_jMoneyEuros.setOpaque(true);
-    m_jMoneyEuros.setPreferredSize(new java.awt.Dimension(180, 30));
+        m_jMoneyEuros.setBackground(new java.awt.Color(204, 255, 51));
+        m_jMoneyEuros.setFont(new java.awt.Font("Arial", 1, 18)); // NOI18N
+        m_jMoneyEuros.setHorizontalAlignment(javax.swing.SwingConstants.RIGHT);
+        m_jMoneyEuros.setBorder(javax.swing.BorderFactory.createCompoundBorder(javax.swing.BorderFactory.createLineBorder(javax.swing.UIManager.getDefaults().getColor("Button.darkShadow")), javax.swing.BorderFactory.createEmptyBorder(1, 4, 1, 4)));
+        m_jMoneyEuros.setOpaque(true);
+        m_jMoneyEuros.setPreferredSize(new java.awt.Dimension(180, 30));
 
-    webLblCustomer.setText(AppLocal.getIntString("label.customer")); // NOI18N
-    webLblCustomer.setToolTipText("");
-    webLblCustomer.setFont(new java.awt.Font("Arial", 1, 18)); // NOI18N
-    webLblCustomer.setPreferredSize(new java.awt.Dimension(100, 30));
+        webLblCustomer.setText(AppLocal.getIntString("label.customer")); // NOI18N
+        webLblCustomer.setToolTipText("");
+        webLblCustomer.setFont(new java.awt.Font("Arial", 1, 18)); // NOI18N
+        webLblCustomer.setPreferredSize(new java.awt.Dimension(100, 30));
 
-    webLblcustomerName.setText(AppLocal.getIntString("label.customer")); // NOI18N
-    webLblcustomerName.setToolTipText("");
-    webLblcustomerName.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
-    webLblcustomerName.setPreferredSize(new java.awt.Dimension(100, 30));
+        webLblcustomerName.setText(AppLocal.getIntString("label.customer")); // NOI18N
+        webLblcustomerName.setToolTipText("");
+        webLblcustomerName.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
+        webLblcustomerName.setPreferredSize(new java.awt.Dimension(100, 30));
 
-    voucherStatus.setText(AppLocal.getIntString("label.voucherStatus")); // NOI18N
-    voucherStatus.setToolTipText("");
-    voucherStatus.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
-    voucherStatus.setPreferredSize(new java.awt.Dimension(100, 30));
+        voucherStatus.setText(AppLocal.getIntString("label.voucherStatus")); // NOI18N
+        voucherStatus.setToolTipText("");
+        voucherStatus.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
+        voucherStatus.setPreferredSize(new java.awt.Dimension(100, 30));
 
-    jLabel6.setFont(new java.awt.Font("Arial", 1, 18)); // NOI18N
-    jLabel6.setLabelFor(m_jVoucher);
-    jLabel6.setText(AppLocal.getIntString("label.voucherStatus")); // NOI18N
-    jLabel6.setPreferredSize(new java.awt.Dimension(100, 30));
+        jLabel6.setFont(new java.awt.Font("Arial", 1, 18)); // NOI18N
+        jLabel6.setLabelFor(m_jVoucher);
+        jLabel6.setText(AppLocal.getIntString("label.voucherStatus")); // NOI18N
+        jLabel6.setPreferredSize(new java.awt.Dimension(100, 30));
 
-    jButton1.setText("jButton1");
-    jButton1.addActionListener(new java.awt.event.ActionListener() {
-      public void actionPerformed(java.awt.event.ActionEvent evt) {
-        jButton1ActionPerformed(evt);
-      }
-    });
-
-    javax.swing.GroupLayout jPanel4Layout = new javax.swing.GroupLayout(jPanel4);
-    jPanel4.setLayout(jPanel4Layout);
-    jPanel4Layout.setHorizontalGroup(
+        javax.swing.GroupLayout jPanel4Layout = new javax.swing.GroupLayout(jPanel4);
+        jPanel4.setLayout(jPanel4Layout);
+        jPanel4Layout.setHorizontalGroup(
             jPanel4Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+            .addGroup(jPanel4Layout.createSequentialGroup()
+                .addGroup(jPanel4Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
                     .addGroup(jPanel4Layout.createSequentialGroup()
-                            .addGroup(jPanel4Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-                                    .addGroup(jPanel4Layout.createSequentialGroup()
-                                            .addGap(10, 10, 10)
-                                            .addComponent(jLabel1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
-                                            .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
-                                            .addComponent(m_jMoneyEuros, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
-                                    .addGroup(jPanel4Layout.createSequentialGroup()
-                                            .addContainerGap()
-                                            .addComponent(jLabel5, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
-                                            .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
-                                            .addComponent(m_jVoucher, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
-                                    .addGroup(jPanel4Layout.createSequentialGroup()
-                                            .addContainerGap()
-                                            .addComponent(jButton1)))
-                            .addGap(0, 0, Short.MAX_VALUE))
+                        .addGap(10, 10, 10)
+                        .addComponent(jLabel1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
+                        .addComponent(m_jMoneyEuros, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
                     .addGroup(jPanel4Layout.createSequentialGroup()
-                            .addContainerGap()
-                            .addGroup(jPanel4Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-                                    .addGroup(jPanel4Layout.createSequentialGroup()
-                                            .addComponent(webLblCustomer, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
-                                            .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
-                                            .addComponent(webLblcustomerName, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
-                                    .addGroup(jPanel4Layout.createSequentialGroup()
-                                            .addComponent(jLabel6, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
-                                            .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
-                                            .addComponent(voucherStatus, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))))
-    );
-    jPanel4Layout.setVerticalGroup(
+                        .addContainerGap()
+                        .addComponent(jLabel5, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
+                        .addComponent(m_jVoucher, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)))
+                .addGap(0, 0, Short.MAX_VALUE))
+            .addGroup(jPanel4Layout.createSequentialGroup()
+                .addContainerGap()
+                .addGroup(jPanel4Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+                    .addGroup(jPanel4Layout.createSequentialGroup()
+                        .addComponent(webLblCustomer, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
+                        .addComponent(webLblcustomerName, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
+                    .addGroup(jPanel4Layout.createSequentialGroup()
+                        .addComponent(jLabel6, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
+                        .addComponent(voucherStatus, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))))
+        );
+        jPanel4Layout.setVerticalGroup(
             jPanel4Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-                    .addGroup(jPanel4Layout.createSequentialGroup()
-                            .addContainerGap()
-                            .addGroup(jPanel4Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
-                                    .addComponent(jLabel5, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
-                                    .addComponent(m_jVoucher, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
-                            .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
-                            .addGroup(jPanel4Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING)
-                                    .addComponent(jLabel6, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
-                                    .addComponent(voucherStatus, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
-                            .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
-                            .addGroup(jPanel4Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-                                    .addComponent(jLabel1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
-                                    .addComponent(m_jMoneyEuros, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
-                            .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
-                            .addGroup(jPanel4Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
-                                    .addComponent(webLblCustomer, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
-                                    .addComponent(webLblcustomerName, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
-                            .addGap(33, 33, 33)
-                            .addComponent(jButton1)
-                            .addContainerGap())
-    );
+            .addGroup(jPanel4Layout.createSequentialGroup()
+                .addContainerGap()
+                .addGroup(jPanel4Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+                    .addComponent(jLabel5, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                    .addComponent(m_jVoucher, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
+                .addGroup(jPanel4Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING)
+                    .addComponent(jLabel6, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                    .addComponent(voucherStatus, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
+                .addGroup(jPanel4Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+                    .addComponent(jLabel1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                    .addComponent(m_jMoneyEuros, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
+                .addGroup(jPanel4Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+                    .addComponent(webLblCustomer, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                    .addComponent(webLblcustomerName, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+                .addGap(241, 241, 241))
+        );
 
-    add(jPanel4, java.awt.BorderLayout.CENTER);
+        add(jPanel4, java.awt.BorderLayout.CENTER);
 
-    jPanel11.setLayout(new java.awt.BorderLayout());
+        jPanel11.setLayout(new java.awt.BorderLayout());
 
-    jPanel12.setLayout(new javax.swing.BoxLayout(jPanel12, javax.swing.BoxLayout.Y_AXIS));
-    jPanel12.add(m_jKeys);
+        jPanel12.setLayout(new javax.swing.BoxLayout(jPanel12, javax.swing.BoxLayout.Y_AXIS));
+        jPanel12.add(m_jKeys);
 
-    jPanel1.setBorder(javax.swing.BorderFactory.createEmptyBorder(5, 5, 5, 5));
-    jPanel1.setLayout(new java.awt.BorderLayout());
+        jPanel1.setBorder(javax.swing.BorderFactory.createEmptyBorder(5, 5, 5, 5));
+        jPanel1.setLayout(new java.awt.BorderLayout());
 
-    m_jTendered.setFont(new java.awt.Font("Arial", 0, 12)); // NOI18N
-    m_jTendered.setPreferredSize(new java.awt.Dimension(130, 30));
-    jPanel1.add(m_jTendered, java.awt.BorderLayout.CENTER);
+        m_jTendered.setFont(new java.awt.Font("Arial", 0, 12)); // NOI18N
+        m_jTendered.setPreferredSize(new java.awt.Dimension(130, 30));
+        jPanel1.add(m_jTendered, java.awt.BorderLayout.CENTER);
 
-    jPanel12.add(jPanel1);
+        jPanel12.add(jPanel1);
 
-    jPanel11.add(jPanel12, java.awt.BorderLayout.NORTH);
+        jPanel11.add(jPanel12, java.awt.BorderLayout.NORTH);
 
-    add(jPanel11, java.awt.BorderLayout.EAST);
-  }// </editor-fold>//GEN-END:initComponents
+        add(jPanel11, java.awt.BorderLayout.EAST);
+    }// </editor-fold>//GEN-END:initComponents
 
   private void m_jVoucherActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_m_jVoucherActionPerformed
 
@@ -365,27 +352,22 @@ public class JPaymentVoucher extends javax.swing.JPanel implements JPaymentInter
     }
   }//GEN-LAST:event_m_jVoucherActionPerformed
 
-  private void jButton1ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jButton1ActionPerformed
 
-  }//GEN-LAST:event_jButton1ActionPerformed
-
-
-  // Variables declaration - do not modify//GEN-BEGIN:variables
-  private javax.swing.JButton jButton1;
-  private javax.swing.JLabel jLabel1;
-  private javax.swing.JLabel jLabel5;
-  private javax.swing.JLabel jLabel6;
-  private javax.swing.JPanel jPanel1;
-  private javax.swing.JPanel jPanel11;
-  private javax.swing.JPanel jPanel12;
-  private javax.swing.JPanel jPanel4;
-  private com.unicenta.editor.JEditorKeys m_jKeys;
-  private javax.swing.JLabel m_jMoneyEuros;
-  private com.unicenta.editor.JEditorCurrencyPositive m_jTendered;
-  private javax.swing.JComboBox m_jVoucher;
-  private com.alee.laf.label.WebLabel voucherStatus;
-  private com.alee.laf.label.WebLabel webLblCustomer;
-  private com.alee.laf.label.WebLabel webLblcustomerName;
-  // End of variables declaration//GEN-END:variables
+    // Variables declaration - do not modify//GEN-BEGIN:variables
+    private javax.swing.JLabel jLabel1;
+    private javax.swing.JLabel jLabel5;
+    private javax.swing.JLabel jLabel6;
+    private javax.swing.JPanel jPanel1;
+    private javax.swing.JPanel jPanel11;
+    private javax.swing.JPanel jPanel12;
+    private javax.swing.JPanel jPanel4;
+    private com.unicenta.editor.JEditorKeys m_jKeys;
+    private javax.swing.JLabel m_jMoneyEuros;
+    private com.unicenta.editor.JEditorCurrencyPositive m_jTendered;
+    private javax.swing.JComboBox m_jVoucher;
+    private javax.swing.JLabel voucherStatus;
+    private javax.swing.JLabel webLblCustomer;
+    private javax.swing.JLabel webLblcustomerName;
+    // End of variables declaration//GEN-END:variables
 
 }

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

@@ -41,6 +41,8 @@ public class PaymentGatewayFac {
                 return new PaymentGatewayPaymentSense();
             case "Teya":
                 return new PaymentGatewayTeya();
+            case "MediaPayments":
+                return new PaymentGatewayMediaPayments();
             default:
                 return null;
         }

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

@@ -0,0 +1,97 @@
+//    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 PaymentGatewayMediaPayments implements PaymentGateway {
+
+  public PaymentGatewayMediaPayments() {
+  }
+
+  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);
+    }
+  }
+
+  @Override
+  public void execute(PaymentInfoMagcard payinfo) {
+
+    int timer = 0;
+    int timeout = 180;
+
+    double roundedValue = RoundUtils.round(payinfo.getTotal());
+    new Application().mediaPaymentsTransaction(roundedValue, getPaymentWindow(roundedValue),
+        payinfo.getTransactionID().length() > 12 ? payinfo.getTransactionID() : null);
+
+    while (AppContext.getIsProcessing() == null || AppContext.getIsProcessing()) {
+      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.getMediaPaymentsPaymentResult() == null) {
+      payinfo.paymentError("Transaction Error! Please try again", "No Response");
+    } else if ("APPROVED".equals(AppContext.getMediaPaymentsPaymentResult().getProcessingDetails().getStatus())) {
+      payinfo.setCardName(AppContext.getMediaPaymentsPaymentResult().getProcessingDetails().getCard().getType());
+      payinfo
+          .setVerification(AppContext.getMediaPaymentsPaymentResult().getProcessingDetails().getVerificationMethod());
+      payinfo.setChipAndPin(true);
+      payinfo.paymentOK(
+          AppContext.getMediaPaymentsPaymentResult().getAdditionalInformation().getRequestId(),
+          AppContext.getMediaPaymentsPaymentResult().getTransactionDetails().getId(),
+          AppContext.getMediaPaymentsPaymentResult().getProcessingDetails().getStatus());
+    } else {
+      String errorMsg = AppContext.getMediaPaymentsPaymentResult().getErrorMessage();
+      if (errorMsg == null) {
+        errorMsg = AppContext.getMediaPaymentsPaymentResult().getMessage();
+      }
+      payinfo.paymentError("Transaction Error! Please try again", errorMsg);
+    }
+  }
+}

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

@@ -82,7 +82,7 @@ public class JTicketsBagShared extends JTicketsBag {
         log.debug("Loading Sales screen! "+this.getClass());
 
         ExecutorService customExecutor = Executors.newCachedThreadPool();
-        SwingWorker<String, String> reloadLayaway = new SwingWorker<String, String>() {
+        SwingWorker<String, String> reloadLayaway = new SwingWorker() {
             @Override
             protected String doInBackground() throws Exception {
                 while (true) {

src/main/java/com/unicenta/pos/voucher/VoucherInfo.java

@@ -24,124 +24,132 @@ import com.unicenta.data.loader.DataRead;
 import com.unicenta.data.loader.IKeyed;
 import com.unicenta.data.loader.SerializerRead;
 
+import lombok.extern.slf4j.Slf4j;
 
+@Slf4j
 public class VoucherInfo implements IKeyed {
-    private String id;
-    private String voucherNumber;
-    private String customerName;
-    private double amount;
-    private String status;
+  private String id;
+  private String voucherNumber;
+  private String customerName;
+  private double amount;
+  private String status;
 
-    public VoucherInfo() {
-    }
+  public VoucherInfo() {
+  }
 
-    public VoucherInfo(
-        String id, 
-        String voucherNumber, 
-        String customerName,
-        double amount, 
-        String status) 
-    {
-        this.id = id;
-        this.voucherNumber = voucherNumber;
-        this.customerName = customerName;
-        this.amount = amount;
-        this.status = status;
-    }
-      
+  public VoucherInfo(
+      String id,
+      String voucherNumber,
+      String customerName,
+      double amount,
+      String status) {
+    this.id = id;
+    this.voucherNumber = voucherNumber;
+    this.customerName = customerName;
+    this.amount = amount;
+    this.status = status;
+  }
 
-    @Override
-    public Object getKey() {
-        return getId();
-    }
+  @Override
+  public Object getKey() {
+    return getId();
+  }
 
-    /**
-     * @return the id
-     */
-    public String getId() {
-        return id;
-    }
+  /**
+   * @return the id
+   */
+  public String getId() {
+    return id;
+  }
 
-    /**
-     * @param id the id to set
-     */
-    public void setId(String id) {
-        this.id = id;
-    }
+  /**
+   * @param id the id to set
+   */
+  public void setId(String id) {
+    this.id = id;
+  }
 
-    /**
-     * @return the voucherNumber
-     */
-    public String getVoucherNumber() {
-        return voucherNumber;
-    }
+  /**
+   * @return the voucherNumber
+   */
+  public String getVoucherNumber() {
+    return voucherNumber;
+  }
 
-    /**
-     * @param voucherNumber the voucherNumber to set
-     */
-    public void setVoucherNumber(String voucherNumber) {
-        this.voucherNumber = voucherNumber;
-    }
-    
-    /**
-     * @return the customerName
-     */
-    public String getCustomerName() {
-        return customerName;
-    }
+  /**
+   * @param voucherNumber the voucherNumber to set
+   */
+  public void setVoucherNumber(String voucherNumber) {
+    this.voucherNumber = voucherNumber;
+  }
 
-    /**
-     * @param customerName the customerName to set
-     */
-    public void setCustomerName(String customerName) {
-        this.customerName = customerName;
-    }
+  /**
+   * @return the customerName
+   */
+  public String getCustomerName() {
+    return customerName;
+  }
 
-    /**
-     * @return the amount
-     */
-    public double getAmount() {
-        return amount;
-    }
+  /**
+   * @param customerName the customerName to set
+   */
+  public void setCustomerName(String customerName) {
+    this.customerName = customerName;
+  }
 
-    /**
-     * @param amount the amount to set
-     */
-    public void setAmount(double amount) {
-        this.amount = amount;
-    }
-    
-    
-     @Override
-    public String toString() {
-        return voucherNumber;
-    }
-    
-    /**
-     * @return the status
-     */
-    public String getStatus() {
-        return status;
-    }
+  /**
+   * @return the amount
+   */
+  public double getAmount() {
+    return amount;
+  }
 
-    /**
-     * @param status the status to set
-     */
-    public void setStatus(String status) {
-        this.status = status;
-    }
+  /**
+   * @param amount the amount to set
+   */
+  public void setAmount(double amount) {
+    this.amount = amount;
+  }
 
-    public static SerializerRead getSerializerRead() {
-        return new SerializerRead() 
-        {
-            @Override
-        public Object readValues(DataRead dr) throws BasicException {
-            return new VoucherInfo(
-                    dr.getString(1), 
-                    dr.getString(2), 
-                    dr.getString(3),
-                    dr.getDouble(4),
-                    dr.getString(5));            
-        }};
-    }    
+  @Override
+  public String toString() {
+    return voucherNumber;
+  }
+
+  /**
+   * @return the status
+   */
+  public String getStatus() {
+    return status;
+  }
+
+  /**
+   * @param status the status to set
+   */
+  public void setStatus(String status) {
+    this.status = status;
+  }
+
+  public static SerializerRead getSerializerRead() {
+    return new SerializerRead() {
+      @Override
+      public Object readValues(DataRead dr) throws BasicException {
+        VoucherInfo voucherInfo = null;
+
+        try {
+          voucherInfo = new VoucherInfo(
+              dr.getString(1),
+              dr.getString(2),
+              dr.getString(3),
+              dr.getDouble(4),
+              dr.getString(5));
+        } catch (Exception e) {
+          log.error("Error reading voucher info: {}", e.getMessage());
+          log.error(dr.getString(2));
+        }
+
+        return voucherInfo;
+      }
+    };
+  }
 }

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

@@ -1,2 +1,62 @@
-UPDATE applications SET version = $APP_VERSION{} WHERE id = $APP_ID{};
+-- CLEAR THE DECKS
+DELETE FROM sharedtickets;
+
+-- Switch OFF table foreign key relationships
+set foreign_key_checks = 0;
+
+-- RECREATE applications table
+DROP TABLE `applications`;
+CREATE TABLE IF NOT EXISTS `applications` (
+	`id` varchar(255) NOT NULL,
+	`name` varchar(255) NOT NULL,
+	`version` varchar(255) NOT NULL,
+	`instdate` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+	PRIMARY KEY  ( `id` )
+) ENGINE = InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT = Compact;
+
+
+-- SYSTEM
+DELETE FROM resources WHERE name = 'script.posapps';
+
+
+DELETE FROM resources WHERE id = '0';
+DELETE FROM resources WHERE id = '00';
+INSERT INTO resources(id, name, restype, content) VALUES('00', 'Menu.Root', 0, $FILE{/com/unicenta/pos/templates/Menu.Root.txt});
+
+UPDATE resources SET content = $FILE{/com/unicenta/pos/templates/Ticket.Buttons.xml} WHERE name = 'Ticket.Buttons';
+COMMIT;
+
+UPDATE resources SET content = $FILE{/com/unicenta/pos/templates/Printer.Ticket.xml} WHERE name = 'Printer.Ticket';
+COMMIT;
+
+UPDATE resources SET content = $FILE{/com/unicenta/pos/templates/Ticket.Close.xml} WHERE name = 'Ticket.Close';
+COMMIT;
+
+UPDATE resources SET content = $FILE{/com/unicenta/pos/templates/Cash.Close.xml} WHERE name = 'Cash.Close';
+COMMIT;
+
+UPDATE resources SET content = $FILE{/com/unicenta/pos/templates/customer.created.xml} WHERE name = 'Customer.Created';
+COMMIT;
+
+UPDATE resources SET content = $FILE{/com/unicenta/pos/templates/customer.deleted.xml} WHERE name = 'Customer.Deleted';
+COMMIT;
+
+UPDATE resources SET content = $FILE{/com/unicenta/pos/templates/customer.updated.xml} WHERE name = 'Customer.Updated';
+COMMIT;
+
+
+-- ROLES
+DELETE FROM roles WHERE id = '0';
+INSERT INTO roles(id, name, permissions) VALUES('0', 'Administrator role', $FILE{/com/unicenta/pos/templates/Role.Administrator.xml} );
+DELETE FROM roles WHERE id = '1';
+INSERT INTO roles(id, name, permissions) VALUES('1', 'Manager role', $FILE{/com/unicenta/pos/templates/Role.Manager.xml} );
+DELETE FROM roles WHERE id = '2';
+INSERT INTO roles(id, name, permissions) VALUES('2', 'Employee role', $FILE{/com/unicenta/pos/templates/Role.Employee.xml} );
+
+
+-- Switch ON table foreign key relationships
+set foreign_key_checks = 1;
+
+INSERT INTO applications(id, name, version) VALUES($APP_ID{}, $APP_NAME{}, '5.3.1');
+
 COMMIT;