wip

.gitignore

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

pom.xml

@@ -8,8 +8,8 @@
   <packaging>jar</packaging>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <maven.compiler.source>1.8</maven.compiler.source>
+    <maven.compiler.source>11</maven.compiler.source>
-    <maven.compiler.target>1.8</maven.compiler.target>
+    <maven.compiler.target>11</maven.compiler.target>
     <derby.version>10.14.2.0</derby.version>
   </properties>
   <dependencies>

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

@@ -19,93 +19,10 @@
     <AuxValue name="FormSettings_listenerGenerationStyle" type="java.lang.Integer" value="0"/>
     <AuxValue name="FormSettings_variablesLocal" type="java.lang.Boolean" value="false"/>
     <AuxValue name="FormSettings_variablesModifier" type="java.lang.Integer" value="2"/>
+    <AuxValue name="designerSize" type="java.awt.Dimension" value="-84,-19,0,5,115,114,0,18,106,97,118,97,46,97,119,116,46,68,105,109,101,110,115,105,111,110,65,-114,-39,-41,-84,95,68,20,2,0,2,73,0,6,104,101,105,103,104,116,73,0,5,119,105,100,116,104,120,112,0,0,1,-128,0,0,1,-51"/>
   </AuxValues>
-
-  <Layout>
-    <DimensionLayout dim="0">
-      <Group type="103" groupAlignment="0" attributes="0">
-          <Group type="102" attributes="0">
-              <EmptySpace max="-2" attributes="0"/>
-              <Group type="103" groupAlignment="0" attributes="0">
-                  <Group type="102" attributes="0">
-                      <Component id="jLabel3" min="-2" max="-2" attributes="0"/>
-                      <EmptySpace type="separate" max="-2" attributes="0"/>
-                      <Component id="m_jVisible" min="-2" pref="207" max="-2" attributes="0"/>
-                  </Group>
-                  <Group type="102" alignment="0" attributes="0">
-                      <Component id="jLabel2" min="-2" max="-2" attributes="0"/>
-                      <EmptySpace type="unrelated" max="-2" attributes="0"/>
-                      <Component id="m_jRole" min="-2" pref="180" max="-2" attributes="0"/>
-                  </Group>
-                  <Group type="102" alignment="0" attributes="0">
-                      <Component id="jLabel4" min="-2" max="-2" attributes="0"/>
-                      <EmptySpace type="unrelated" max="-2" attributes="0"/>
-                      <Component id="m_jImage" min="-2" max="-2" attributes="0"/>
-                  </Group>
-                  <Group type="102" alignment="0" attributes="0">
-                      <Component id="jLblCardID" min="-2" max="-2" attributes="0"/>
-                      <EmptySpace type="unrelated" max="-2" attributes="0"/>
-                      <Component id="m_jcard" min="-2" pref="180" max="-2" attributes="0"/>
-                      <EmptySpace max="-2" attributes="0"/>
-                      <Component id="webCBSecurity" max="-2" attributes="0"/>
-                  </Group>
-                  <Group type="102" alignment="0" attributes="0">
-                      <Group type="103" groupAlignment="0" attributes="0">
-                          <Component id="jLabel1" min="-2" max="-2" attributes="0"/>
-                          <Component id="jLabel6" alignment="0" min="-2" max="-2" attributes="0"/>
-                      </Group>
-                      <EmptySpace type="unrelated" max="-2" attributes="0"/>
-                      <Group type="103" groupAlignment="0" attributes="0">
-                          <Component id="jButton1" min="-2" max="-2" attributes="0"/>
-                          <Component id="m_jName" min="-2" pref="180" max="-2" attributes="0"/>
-                      </Group>
-                  </Group>
-              </Group>
-              <EmptySpace max="-2" attributes="0"/>
-          </Group>
-      </Group>
-    </DimensionLayout>
-    <DimensionLayout dim="1">
-      <Group type="103" groupAlignment="0" attributes="0">
-          <Group type="102" alignment="1" attributes="0">
-              <EmptySpace type="separate" max="-2" attributes="0"/>
-              <Group type="103" groupAlignment="3" attributes="0">
-                  <Component id="jLabel1" alignment="3" min="-2" max="-2" attributes="0"/>
-                  <Component id="m_jName" alignment="3" min="-2" max="-2" attributes="0"/>
-              </Group>
-              <EmptySpace type="unrelated" max="-2" attributes="0"/>
-              <Group type="103" groupAlignment="2" attributes="0">
-                  <Component id="jLabel6" alignment="2" min="-2" max="-2" attributes="0"/>
-                  <Component id="jButton1" alignment="2" min="-2" max="-2" attributes="0"/>
-              </Group>
-              <EmptySpace type="unrelated" max="-2" attributes="0"/>
-              <Group type="103" groupAlignment="2" attributes="0">
-                  <Component id="jLblCardID" alignment="2" min="-2" max="-2" attributes="0"/>
-                  <Component id="m_jcard" alignment="2" min="-2" max="-2" attributes="0"/>
-                  <Component id="webCBSecurity" alignment="2" min="-2" max="-2" attributes="0"/>
-              </Group>
-              <EmptySpace type="unrelated" max="-2" attributes="0"/>
-              <Group type="103" groupAlignment="3" attributes="0">
-                  <Component id="jLabel2" alignment="3" min="-2" max="-2" attributes="0"/>
-                  <Component id="m_jRole" alignment="3" min="-2" max="-2" attributes="0"/>
-              </Group>
-              <EmptySpace type="unrelated" max="-2" attributes="0"/>
-              <Group type="103" groupAlignment="0" attributes="0">
-                  <Component id="jLabel3" min="-2" pref="25" max="-2" attributes="0"/>
-                  <Component id="m_jVisible" min="-2" pref="25" max="-2" attributes="0"/>
-              </Group>
-              <EmptySpace min="-2" pref="15" max="-2" attributes="0"/>
-              <Group type="103" groupAlignment="0" attributes="0">
-                  <Component id="m_jImage" min="-2" max="-2" attributes="0"/>
-                  <Component id="jLabel4" min="-2" max="-2" attributes="0"/>
-              </Group>
-              <EmptySpace max="32767" attributes="0"/>
-          </Group>
-      </Group>
-    </DimensionLayout>
-  </Layout>
   <SubComponents>
-    <Component class="javax.swing.JLabel" name="jLabel1">
+    <Component class="javax.swing.JLabel" name="nameLabel">
       <Properties>
         <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
           <Font name="Arial" size="14" style="0"/>
@@ -121,10 +38,10 @@
         </Property>
       </Properties>
       <Events>
-        <EventHandler event="mouseClicked" listener="java.awt.event.MouseListener" parameters="java.awt.event.MouseEvent" handler="jLabel1MouseClicked"/>
+        <EventHandler event="mouseClicked" listener="java.awt.event.MouseListener" parameters="java.awt.event.MouseEvent" handler="nameLabelMouseClicked"/>
       </Events>
     </Component>
-    <Component class="javax.swing.JTextField" name="m_jName">
+    <Component class="javax.swing.JTextField" name="nameTextField">
       <Properties>
         <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
           <Font name="Arial" size="14" style="0"/>
@@ -134,7 +51,7 @@
         </Property>
       </Properties>
     </Component>
-    <Component class="javax.swing.JCheckBox" name="m_jVisible">
+    <Component class="javax.swing.JCheckBox" name="isVisible">
       <Properties>
         <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
           <Font name="Arial" size="12" style="0"/>
@@ -144,7 +61,7 @@
         </Property>
       </Properties>
     </Component>
-    <Component class="javax.swing.JLabel" name="jLabel3">
+    <Component class="javax.swing.JLabel" name="visiableLabel">
       <Properties>
         <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
           <Font name="Arial" size="14" style="0"/>
@@ -157,7 +74,7 @@
         </Property>
       </Properties>
     </Component>
-    <Component class="javax.swing.JLabel" name="jLabel4">
+    <Component class="javax.swing.JLabel" name="imageLabel">
       <Properties>
         <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
           <Font name="Arial" size="14" style="0"/>
@@ -170,7 +87,7 @@
         </Property>
       </Properties>
     </Component>
-    <Component class="com.unicenta.data.gui.JImageEditor" name="m_jImage">
+    <Component class="com.unicenta.data.gui.JImageEditor" name="imageEditor">
       <Properties>
         <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
           <Font name="Arial" size="12" style="0"/>
@@ -210,7 +127,7 @@
         </Property>
       </Properties>
     </Component>
-    <Component class="javax.swing.JLabel" name="jLabel2">
+    <Component class="javax.swing.JLabel" name="roleLabel">
       <Properties>
         <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
           <Font name="Arial" size="14" style="0"/>
@@ -223,7 +140,7 @@
         </Property>
       </Properties>
     </Component>
-    <Component class="javax.swing.JTextField" name="m_jcard">
+    <Component class="javax.swing.JTextField" name="cardIdTextField">
       <Properties>
         <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
           <Font name="Arial" size="14" style="0"/>
@@ -233,7 +150,7 @@
         </Property>
       </Properties>
     </Component>
-    <Component class="javax.swing.JLabel" name="jLblCardID">
+    <Component class="javax.swing.JLabel" name="cardIdLabel">
       <Properties>
         <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
           <Font name="Arial" size="14" style="0"/>
@@ -246,33 +163,7 @@
         </Property>
       </Properties>
     </Component>
-    <Component class="com.alee.laf.combobox.WebComboBox" name="webCBSecurity">
+    <Component class="javax.swing.JLabel" name="passwordLabel">
-      <Properties>
-        <Property name="model" type="javax.swing.ComboBoxModel" editor="org.netbeans.modules.form.editors2.ComboBoxModelEditor">
-          <StringArray count="3">
-            <StringItem index="0" value="Generate new key"/>
-            <StringItem index="1" value="Delete exisitng key"/>
-            <StringItem index="2" value="Use iButton ID"/>
-          </StringArray>
-        </Property>
-        <Property name="selectedIndex" type="int" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
-          <Connection code="0" type="code"/>
-        </Property>
-        <Property name="toolTipText" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-          <ResourceString bundle="pos_messages.properties" key="tooltip.peoplesecurity" replaceFormat="AppLocal.getIntString(&quot;tooltip.peoplesecurity&quot;)"/>
-        </Property>
-        <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
-          <Font name="Arial" size="14" style="0"/>
-        </Property>
-        <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
-          <Dimension value="[140, 45]"/>
-        </Property>
-      </Properties>
-      <Events>
-        <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="webCBSecurityActionPerformed"/>
-      </Events>
-    </Component>
-    <Component class="javax.swing.JLabel" name="jLabel6">
       <Properties>
         <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
           <Font name="Arial" size="14" style="0"/>
@@ -285,5 +176,12 @@
         </Property>
       </Properties>
     </Component>
+    <Component class="javax.swing.JLabel" name="taxIdLabel">
+      <Properties>
+        <Property name="text" type="java.lang.String" value="Tax ID"/>
+      </Properties>
+    </Component>
+    <Component class="javax.swing.JTextField" name="taxIdTextField">
+    </Component>
   </SubComponents>
 </Form>

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

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

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

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

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

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

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

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

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

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

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

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