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,101 +295,34 @@ 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
@@ -393,15 +337,13 @@ public class PeopleView extends JPanel implements EditorRecord {
 
   private void webCBSecurityActionPerformed(java.awt.event.ActionEvent evt) {// GEN-FIRST:event_webCBSecurityActionPerformed
 
-
     if (webCBSecurity.getSelectedIndex() == 0) {
       if (JOptionPane.showConfirmDialog(this,
           AppLocal.getIntString("message.cardnew"),
           AppLocal.getIntString("title.editor"),
           JOptionPane.YES_NO_OPTION,
-                JOptionPane.QUESTION_MESSAGE) == JOptionPane.YES_OPTION) 
+          JOptionPane.QUESTION_MESSAGE) == JOptionPane.YES_OPTION) {
-            {  
+        cardIdTextField.setText("C" + StringUtils.getCardNumber());
-                m_jcard.setText("C" + StringUtils.getCardNumber());
         m_Dirty.setDirty(true);
       }
     }
@@ -411,9 +353,8 @@ public class PeopleView extends JPanel implements EditorRecord {
           AppLocal.getIntString("message.cardremove"),
           AppLocal.getIntString("title.editor"),
           JOptionPane.YES_NO_OPTION,
-                JOptionPane.QUESTION_MESSAGE) == JOptionPane.YES_OPTION) 
+          JOptionPane.QUESTION_MESSAGE) == JOptionPane.YES_OPTION) {
-            {  
+        cardIdTextField.setText(null);
-                m_jcard.setText(null);
         m_Dirty.setDirty(true);
       }
     }
@@ -426,8 +367,8 @@ 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);
       }
 
@@ -435,7 +376,7 @@ public class PeopleView extends JPanel implements EditorRecord {
 
   }// 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);
 
   }
 
@@ -257,12 +258,14 @@ public class CustomersPayment extends javax.swing.JPanel implements JPanelView,
     }
   }
 
-    /** This method is called from within the constructor to
+  /**
+   * This method is called from within the constructor to
    * initialize the form.
    * WARNING: Do NOT modify this code. The content of this method is
    * always regenerated by the Form Editor.
    */
-    // <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents
+  // <editor-fold defaultstate="collapsed" desc="Generated
+  // Code">//GEN-BEGIN:initComponents
   private void initComponents() {
     java.awt.GridBagConstraints gridBagConstraints;
 
@@ -510,80 +513,111 @@ 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
 
     readCustomer();
@@ -612,7 +646,8 @@ 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);
       }
     }
@@ -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);
       }
 
@@ -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);
         }
 

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

@@ -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
@@ -119,14 +120,13 @@ public class DataLogicReceipts extends BeanFactoryDataSingle {
         + "FROM sharedtickets "
         + "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,20 +332,15 @@ 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
-                    , 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
-            , new SerializerReadBasic(new Datas[] {Datas.STRING})).find(id);
     if (userID == null) {
       return null;
     } else {
@@ -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/JPanelTicket.java

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

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));
     }
@@ -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());
@@ -598,7 +598,8 @@ Integer count = restDB.getGuestsInTable(place.getId());
                 place.getButton().setIcon((Boolean.parseBoolean(
                     m_App.getProperties().getProperty("table.showwaiterdetails"))
                     && (restDB.getCustomerNameInTable(place.getName()) != null))
-                                        ? ICO_WAITER:ICO_OCU_SM);
+                        ? ICO_WAITER
+                        : ICO_OCU_SM);
                 if (m_App.getProperties().getProperty("table.customercolour") == null) {
                   customerDetails = (restDB.getCustomerNameInTable(place.getName()) == null) ? ""
                       : "<style=font-size:9px;font-weight:bold;><font color = blue>"
@@ -646,12 +647,9 @@ Integer count = restDB.getGuestsInTable(place.getId());
         // 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) -> {
@@ -709,9 +705,11 @@ Integer count = restDB.getGuestsInTable(place.getId());
   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) {
@@ -742,10 +740,9 @@ Integer count = restDB.getGuestsInTable(place.getId());
                     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);
@@ -766,10 +763,8 @@ 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) {
@@ -891,14 +886,14 @@ Integer count = restDB.getGuestsInTable(place.getId());
     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();
@@ -1069,7 +1064,6 @@ Integer count = restDB.getGuestsInTable(place.getId());
     });
   }// GEN-LAST:event_m_jbtnSaveActionPerformed
 
-    
   // Variables declaration - do not modify//GEN-BEGIN:variables
   private javax.swing.JPanel jPanel1;
   private javax.swing.JPanel jPanel2;

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

@@ -55,27 +55,27 @@ public final class TicketInfo implements SerializableRead, Externalizable {
 
   private static final DateFormat m_dateformat = new SimpleDateFormat("hh:mm");
 
-    private String 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;
 
@@ -91,15 +91,15 @@ 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;
@@ -109,35 +109,35 @@ public final class TicketInfo implements SerializableRead, Externalizable {
         System.getProperty("user.home")), AppLocal.APP_ID + ".properties"));
     config.load();
     tip = Boolean.valueOf(config.getProperty("machine.showTip"));
-        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,69 +177,72 @@ 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 {
       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) {
@@ -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,11 +281,11 @@ 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() {
@@ -294,27 +297,27 @@ public final class TicketInfo implements SerializableRead, Externalizable {
     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();
     }
   }
 
@@ -331,11 +334,11 @@ public final class TicketInfo implements SerializableRead, Externalizable {
   }
 
   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());
@@ -538,8 +536,8 @@ public final class TicketInfo implements SerializableRead, Externalizable {
 
     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 (receiptPrefix != null) {
           tmpTicketId = receiptPrefix + tmpTicketId;
@@ -559,19 +557,18 @@ 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
 
   /**
@@ -598,11 +595,11 @@ public final class TicketInfo implements SerializableRead, Externalizable {
   }
 
   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() {
@@ -642,8 +639,7 @@ 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));
 

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,7 +91,8 @@ 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);
@@ -98,6 +103,7 @@ public class TicketLineInfo implements SerializableWrite, SerializableRead, Seri
 
   /**
    * Example: Call from script.LineDiscount event
+   * 
    * @param productname
    * @param producttaxcategory
    * @param productprinter     //added to props as may introduce printer redirect
@@ -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);
@@ -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,31 +314,40 @@ public class TicketLineInfo implements SerializableWrite, SerializableRead, Seri
   public int getTicketLine() {
     return m_iLine;
   }
+
   // These are the Lookups
   public String getProductID() {
     return productid;
   }
+
   public String getProductCategoryID() {
     return (attributes.getProperty("product.categoryid"));
   }
+
   public String getProductAttSetId() {
     return attributes.getProperty("product.attsetid");
   }
+
   public String getProductAttSetInstId() {
     return attsetinstid;
   }
+
   public String getProductAttSetInstDesc() {
     return attributes.getProperty("product.attsetdesc", "");
   }
+
   public String getProductTaxCategoryID() {
     return (attributes.getProperty("product.taxcategoryid"));
   }
+
   public String getTicketUpdated() {
     return (attributes.getProperty("ticket.updated"));
   }
+
   public TaxInfo getTaxInfo() {
     return tax;
   }
+
   public void setTaxInfo(TaxInfo oTaxInfo) {
     tax = oTaxInfo;
   }
@@ -339,22 +356,28 @@ public class TicketLineInfo implements SerializableWrite, SerializableRead, Seri
   public String getProductName() {
     return attributes.getProperty("product.name");
   }
+
   public String getProductMemoDate() {
     return attributes.getProperty("product.memodate");
   }
+
   public double getPrice() {
     return price;
   }
+
   public double getMultiply() {
     return multiply;
   }
+
   public double getTaxRate() {
     return tax == null ? 0.0 : tax.getRate();
   }
+
   public double getNewPrice() {
     newprice = price * (1.0 + getTaxRate());
     return price;
   }
+
   public String getProductPrinter() {
     return attributes.getProperty("product.printer");
   }
@@ -367,9 +390,11 @@ 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);
   }
@@ -378,9 +403,11 @@ public class TicketLineInfo implements SerializableWrite, SerializableRead, Seri
   public double getTax() {
     return price * multiply * getTaxRate();
   }
+
   public double getValue() {
     return price * multiply * (1.0 + getTaxRate());
   }
+
   public double getSubValue() {
     return price * multiply;
   }
@@ -389,21 +416,27 @@ public class TicketLineInfo implements SerializableWrite, SerializableRead, Seri
   public void setPrice(double dValue) {
     price = dValue;
   }
+
   public void setPriceTax(double dValue) {
     price = dValue / (1.0 + getTaxRate());
   }
+
   public void setMultiply(double dValue) {
     multiply = dValue;
   }
+
   public void setProperty(String key, String value) {
     attributes.setProperty(key, value);
   }
+
   public void setProductTaxCategoryID(String taxID) {
     attributes.setProperty("product.taxcategoryid", taxID);
   }
+
   public void setProductAttSetInstId(String value) {
     attsetinstid = value;
   }
+
   public void setProductAttSetInstDesc(String value) {
     if (value == null) {
       attributes.remove(value);
@@ -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 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;
   }