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

@@ -42,426 +42,368 @@ import javax.swing.*;
  */
 public class PeopleView extends JPanel implements EditorRecord {
 
-    private Object m_oId;
+  private Object m_oId;
-    private String m_sPassword;
+  private String m_sPassword;
-    
-    private final DirtyManager m_Dirty;
-    
-    private final SentenceList m_sentrole;
-    private ComboBoxValModel m_RoleModel;  
-    
-    private final ComboBoxValModel m_ReasonModel;        
-    
-    /** Creates new form PeopleEditor
-     * @param dlAdmin
-     * @param dirty */
-    public PeopleView(DataLogicAdmin dlAdmin, DirtyManager dirty) {
 
-        initComponents();
+  private final DirtyManager m_Dirty;
-                
-        // El modelo de roles
-        m_sentrole = dlAdmin.getRolesList();
-        m_RoleModel = new ComboBoxValModel();
-        
-        m_Dirty = dirty;
-        m_jName.getDocument().addDocumentListener(dirty);
-        m_jRole.addActionListener(dirty);
-        m_jVisible.addActionListener(dirty);
-        m_jImage.addPropertyChangeListener("image", dirty);
-        m_jcard.getDocument().addDocumentListener(dirty);
 
-        m_ReasonModel = new ComboBoxValModel();
+  private final SentenceList m_sentrole;
-        m_ReasonModel.add(AppLocal.getIntString("cboption.generate"));
+  private ComboBoxValModel m_RoleModel;
-        m_ReasonModel.add(AppLocal.getIntString("cboption.clear"));              
+
-        m_ReasonModel.add(AppLocal.getIntString("cboption.iButton"));                      
+  private final ComboBoxValModel m_ReasonModel;
-        
+
-        webCBSecurity.setModel(m_ReasonModel);
+  /**
-        
+   * Creates new form PeopleEditor
-        writeValueEOF();
+   * 
+   * @param dlAdmin
+   * @param dirty
+   */
+  public PeopleView(DataLogicAdmin dlAdmin, DirtyManager dirty) {
+
+    initComponents();
+
+    // El modelo de roles
+    m_sentrole = dlAdmin.getRolesList();
+    m_RoleModel = new ComboBoxValModel();
+
+    m_Dirty = dirty;
+    nameTextField.getDocument().addDocumentListener(dirty);
+    m_jRole.addActionListener(dirty);
+    isVisible.addActionListener(dirty);
+    imageEditor.addPropertyChangeListener("image", dirty);
+    cardIdTextField.getDocument().addDocumentListener(dirty);
+
+    m_ReasonModel = new ComboBoxValModel();
+    m_ReasonModel.add(AppLocal.getIntString("cboption.generate"));
+    m_ReasonModel.add(AppLocal.getIntString("cboption.clear"));
+    m_ReasonModel.add(AppLocal.getIntString("cboption.iButton"));
+
+    webCBSecurity.setModel(m_ReasonModel);
+
+    writeValueEOF();
+  }
+
+  /**
+   *
+   */
+  @Override
+  public void writeValueEOF() {
+    m_oId = null;
+    nameTextField.setText(null);
+    m_sPassword = null;
+    m_RoleModel.setSelectedKey(null);
+    isVisible.setSelected(false);
+    cardIdTextField.setText(null);
+    imageEditor.setImage(null);
+    nameTextField.setEnabled(false);
+    m_jRole.setEnabled(false);
+    isVisible.setEnabled(false);
+    cardIdTextField.setEnabled(false);
+    imageEditor.setEnabled(false);
+    jButton1.setEnabled(false);
+    webCBSecurity.setEnabled(false);
+  }
+
+  /**
+   *
+   */
+  @Override
+  public void writeValueInsert() {
+    m_oId = null;
+    nameTextField.setText(null);
+    m_sPassword = null;
+    m_RoleModel.setSelectedKey(null);
+    isVisible.setSelected(true);
+    cardIdTextField.setText(null);
+    imageEditor.setImage(null);
+    nameTextField.setEnabled(true);
+    m_jRole.setEnabled(true);
+    isVisible.setEnabled(true);
+    cardIdTextField.setEnabled(true);
+    imageEditor.setEnabled(true);
+    jButton1.setEnabled(true);
+    webCBSecurity.setEnabled(true);
+  }
+
+  /**
+   *
+   * @param value
+   */
+  @Override
+  public void writeValueDelete(Object value) {
+    Object[] people = (Object[]) value;
+    m_oId = people[0];
+    nameTextField.setText(Formats.STRING.formatValue(people[1]));
+    m_sPassword = Formats.STRING.formatValue(people[2]);
+    m_RoleModel.setSelectedKey(people[3]);
+    isVisible.setSelected(((Boolean) people[4]).booleanValue());
+    cardIdTextField.setText(Formats.STRING.formatValue(people[5]));
+    imageEditor.setImage((BufferedImage) people[6]);
+
+    nameTextField.setEnabled(false);
+    m_jRole.setEnabled(false);
+    isVisible.setEnabled(false);
+    cardIdTextField.setEnabled(false);
+    imageEditor.setEnabled(false);
+    jButton1.setEnabled(false);
+    webCBSecurity.setEnabled(false);
+  }
+
+  /**
+   *
+   * @param value
+   */
+  @Override
+  public void writeValueEdit(Object value) {
+    Object[] people = (Object[]) value;
+    m_oId = people[0];
+    nameTextField.setText(Formats.STRING.formatValue(people[1]));
+    m_sPassword = Formats.STRING.formatValue(people[2]);
+    m_RoleModel.setSelectedKey(people[3]);
+    isVisible.setSelected(((Boolean) people[4]).booleanValue());
+    cardIdTextField.setText(Formats.STRING.formatValue(people[5]));
+    imageEditor.setImage((BufferedImage) people[6]);
+
+    if (cardIdTextField.getText().length() == 16) {
+      cardIdLabel.setText(AppLocal.getIntString("label.ibutton"));
+    } else {
+      cardIdLabel.setText(AppLocal.getIntString("label.card"));
+    }
+    System.out.println(cardIdTextField.getText().length());
+
+    nameTextField.setEnabled(true);
+    m_jRole.setEnabled(true);
+    isVisible.setEnabled(true);
+    cardIdTextField.setEnabled(true);
+    imageEditor.setEnabled(true);
+    jButton1.setEnabled(true);
+    webCBSecurity.setEnabled(true);
+  }
+
+  /**
+   *
+   * @return
+   * @throws BasicException
+   */
+  @Override
+  public Object createValue() throws BasicException {
+    Object[] people = new Object[7];
+    people[0] = m_oId == null ? UUID.randomUUID().toString() : m_oId;
+    people[1] = Formats.STRING.parseValue(nameTextField.getText());
+    people[2] = Formats.STRING.parseValue(m_sPassword);
+    people[3] = m_RoleModel.getSelectedKey();
+    people[4] = isVisible.isSelected();
+    people[5] = Formats.STRING.parseValue(cardIdTextField.getText());
+    people[6] = imageEditor.getImage();
+    return people;
+  }
+
+  /**
+   *
+   * @return
+   */
+  @Override
+  public Component getComponent() {
+    return this;
+  }
+
+  /**
+   *
+   * @throws BasicException
+   */
+  public void activate() throws BasicException {
+
+    m_RoleModel = new ComboBoxValModel(m_sentrole.list());
+    m_jRole.setModel(m_RoleModel);
+  }
+
+  /**
+   *
+   */
+  @Override
+  public void refresh() {
+  }
+
+  /**
+   * 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
+  private void initComponents() {
+
+    nameLabel = new javax.swing.JLabel();
+    nameTextField = new javax.swing.JTextField();
+    isVisible = new javax.swing.JCheckBox();
+    visiableLabel = new javax.swing.JLabel();
+    imageLabel = new javax.swing.JLabel();
+    imageEditor = new com.unicenta.data.gui.JImageEditor();
+    jButton1 = new javax.swing.JButton();
+    m_jRole = new javax.swing.JComboBox();
+    roleLabel = new javax.swing.JLabel();
+    cardIdTextField = new javax.swing.JTextField();
+    cardIdLabel = new javax.swing.JLabel();
+    passwordLabel = new javax.swing.JLabel();
+    taxIdLabel = new javax.swing.JLabel();
+    taxIdTextField = new javax.swing.JTextField();
+
+    setFont(new java.awt.Font("Arial", 0, 12)); // NOI18N
+    setPreferredSize(new java.awt.Dimension(500, 500));
+
+    nameLabel.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
+    nameLabel.setIcon(new javax.swing.ImageIcon(getClass().getResource("/com/unicenta/images/info.png"))); // NOI18N
+    nameLabel.setText(AppLocal.getIntString("label.peoplenamem")); // NOI18N
+    nameLabel.setPreferredSize(new java.awt.Dimension(110, 30));
+    nameLabel.addMouseListener(new java.awt.event.MouseAdapter() {
+      public void mouseClicked(java.awt.event.MouseEvent evt) {
+        nameLabelMouseClicked(evt);
+      }
+    });
+    add(nameLabel);
+
+    nameTextField.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
+    nameTextField.setPreferredSize(new java.awt.Dimension(0, 30));
+    add(nameTextField);
+
+    isVisible.setFont(new java.awt.Font("Arial", 0, 12)); // NOI18N
+    isVisible.setPreferredSize(new java.awt.Dimension(0, 30));
+    add(isVisible);
+
+    visiableLabel.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
+    visiableLabel.setText(AppLocal.getIntString("label.peoplevisible")); // NOI18N
+    visiableLabel.setPreferredSize(new java.awt.Dimension(110, 30));
+    add(visiableLabel);
+
+    imageLabel.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
+    imageLabel.setText(AppLocal.getIntString("label.peopleimage")); // NOI18N
+    imageLabel.setPreferredSize(new java.awt.Dimension(110, 30));
+    add(imageLabel);
+
+    imageEditor.setFont(new java.awt.Font("Arial", 0, 12)); // NOI18N
+    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
+    jButton1.setText(AppLocal.getIntString("button.peoplepassword")); // NOI18N
+    jButton1.setToolTipText("");
+    jButton1.setPreferredSize(new java.awt.Dimension(80, 45));
+    jButton1.addActionListener(new java.awt.event.ActionListener() {
+      public void actionPerformed(java.awt.event.ActionEvent evt) {
+        jButton1ActionPerformed(evt);
+      }
+    });
+    add(jButton1);
+
+    m_jRole.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
+    m_jRole.setPreferredSize(new java.awt.Dimension(0, 30));
+    add(m_jRole);
+
+    roleLabel.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
+    roleLabel.setText(AppLocal.getIntString("label.rolem")); // NOI18N
+    roleLabel.setPreferredSize(new java.awt.Dimension(110, 30));
+    add(roleLabel);
+
+    cardIdTextField.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
+    cardIdTextField.setPreferredSize(new java.awt.Dimension(0, 30));
+    add(cardIdTextField);
+
+    cardIdLabel.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
+    cardIdLabel.setText(AppLocal.getIntString("label.card")); // NOI18N
+    cardIdLabel.setPreferredSize(new java.awt.Dimension(110, 30));
+    add(cardIdLabel);
+
+    passwordLabel.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
+    passwordLabel.setText(AppLocal.getIntString("label.Password")); // NOI18N
+    passwordLabel.setPreferredSize(new java.awt.Dimension(110, 30));
+    add(passwordLabel);
+
+    taxIdLabel.setText("Tax ID");
+    add(taxIdLabel);
+    add(taxIdTextField);
+  }// </editor-fold>//GEN-END:initComponents
+
+  private void jButton1ActionPerformed(java.awt.event.ActionEvent evt) {// GEN-FIRST:event_jButton1ActionPerformed
+
+    String sNewPassword = Hashcypher.changePassword(this);
+    if (sNewPassword != null) {
+      m_sPassword = sNewPassword;
+      m_Dirty.setDirty(true);
     }
 
-    /**
+  }// GEN-LAST:event_jButton1ActionPerformed
-     *
+
-     */
+  private void webCBSecurityActionPerformed(java.awt.event.ActionEvent evt) {// GEN-FIRST:event_webCBSecurityActionPerformed
-    @Override
+
-    public void writeValueEOF() {
+    if (webCBSecurity.getSelectedIndex() == 0) {
-        m_oId = null;
+      if (JOptionPane.showConfirmDialog(this,
-        m_jName.setText(null);
+          AppLocal.getIntString("message.cardnew"),
-        m_sPassword = null;
+          AppLocal.getIntString("title.editor"),
-        m_RoleModel.setSelectedKey(null);
+          JOptionPane.YES_NO_OPTION,
-        m_jVisible.setSelected(false);
+          JOptionPane.QUESTION_MESSAGE) == JOptionPane.YES_OPTION) {
-        m_jcard.setText(null);
+        cardIdTextField.setText("C" + StringUtils.getCardNumber());
-        m_jImage.setImage(null);
+        m_Dirty.setDirty(true);
-        m_jName.setEnabled(false);
+      }
-        m_jRole.setEnabled(false);
-        m_jVisible.setEnabled(false);
-        m_jcard.setEnabled(false);
-        m_jImage.setEnabled(false);
-        jButton1.setEnabled(false);
-        webCBSecurity.setEnabled(false);
-    }
-    
-    /**
-     *
-     */
-    @Override
-    public void writeValueInsert() {
-        m_oId = null;
-        m_jName.setText(null);
-        m_sPassword = null;
-        m_RoleModel.setSelectedKey(null);
-        m_jVisible.setSelected(true);
-        m_jcard.setText(null);
-        m_jImage.setImage(null);
-        m_jName.setEnabled(true);
-        m_jRole.setEnabled(true);
-        m_jVisible.setEnabled(true);
-        m_jcard.setEnabled(true);
-        m_jImage.setEnabled(true);
-        jButton1.setEnabled(true);
-        webCBSecurity.setEnabled(true);        
-    }
-    
-    /**
-     *
-     * @param value
-     */
-    @Override
-    public void writeValueDelete(Object value) {
-        Object[] people = (Object[]) value;
-        m_oId = people[0];
-        m_jName.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());
-        m_jcard.setText(Formats.STRING.formatValue(people[5]));
-        m_jImage.setImage((BufferedImage) people[6]);
-        
-        m_jName.setEnabled(false);
-        m_jRole.setEnabled(false);
-        m_jVisible.setEnabled(false);
-        m_jcard.setEnabled(false);
-        m_jImage.setEnabled(false);        
-        jButton1.setEnabled(false);
-        webCBSecurity.setEnabled(false);        
     }
 
-    /**
+    if (webCBSecurity.getSelectedIndex() == 1) {
-     *
+      if (JOptionPane.showConfirmDialog(this,
-     * @param value
+          AppLocal.getIntString("message.cardremove"),
-     */
+          AppLocal.getIntString("title.editor"),
-    @Override
+          JOptionPane.YES_NO_OPTION,
-    public void writeValueEdit(Object value) {
+          JOptionPane.QUESTION_MESSAGE) == JOptionPane.YES_OPTION) {
-        Object[] people = (Object[]) value;
+        cardIdTextField.setText(null);
-        m_oId = people[0];
+        m_Dirty.setDirty(true);
-        m_jName.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());
-        m_jcard.setText(Formats.STRING.formatValue(people[5]));
-        m_jImage.setImage((BufferedImage) people[6]);
-        
-        if (m_jcard.getText().length() == 16) {
-            jLblCardID.setText(AppLocal.getIntString("label.ibutton"));
-        } else {
-            jLblCardID.setText(AppLocal.getIntString("label.card"));            
-        }
-        System.out.println(m_jcard.getText().length());        
-        
-        m_jName.setEnabled(true);
-        m_jRole.setEnabled(true);
-        m_jVisible.setEnabled(true);
-        m_jcard.setEnabled(true);
-        m_jImage.setEnabled(true);
-        jButton1.setEnabled(true);
-        webCBSecurity.setEnabled(true);        
-    }
-    
-    /**
-     *
-     * @return
-     * @throws BasicException
-     */
-    @Override
-    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[2] = Formats.STRING.parseValue(m_sPassword);
-        people[3] = m_RoleModel.getSelectedKey();
-        people[4] = m_jVisible.isSelected();
-        people[5] = Formats.STRING.parseValue(m_jcard.getText());
-        people[6] = m_jImage.getImage();
-        return people;
     }
 
-    /**
+    if (webCBSecurity.getSelectedIndex() == 2) {
-     *
+      if (JOptionPane.showConfirmDialog(this,
-     * @return
+          AppLocal.getIntString("message.ibuttonassign"),
-     */
+          AppLocal.getIntString("title.editor"),
-    @Override
+          JOptionPane.OK_CANCEL_OPTION,
-    public Component getComponent() {
+          JOptionPane.INFORMATION_MESSAGE) == JOptionPane.OK_OPTION)
-        return this;
+
+      {
+        cardIdTextField.setText(uOWWatch.getibuttonid());
+        cardIdLabel.setText(AppLocal.getIntString("label.ibutton"));
+        m_Dirty.setDirty(true);
+      }
+
     }
 
-    /**
+  }// GEN-LAST:event_webCBSecurityActionPerformed
-     *
+
-     * @throws BasicException
+  private void nameLabelMouseClicked(java.awt.event.MouseEvent evt) {// GEN-FIRST:event_nameLabelMouseClicked
-     */
+    if (evt.getClickCount() == 2) {
-    public void activate() throws BasicException {
+      String uuidString = m_oId.toString();
-        
+      StringSelection stringSelection = new StringSelection(uuidString);
-        m_RoleModel = new ComboBoxValModel(m_sentrole.list());
+      Clipboard clpbrd = Toolkit.getDefaultToolkit().getSystemClipboard();
-        m_jRole.setModel(m_RoleModel);
+      clpbrd.setContents(stringSelection, null);
+
+      JOptionPane.showMessageDialog(null,
+          AppLocal.getIntString("message.uuidcopy"));
     }
-    
+  }// GEN-LAST:event_nameLabelMouseClicked
-   
-    /**
-     *
-     */
-    @Override
-    public void refresh() {
-    }
-     
-    /** 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
-    private void initComponents() {
 
-        jLabel1 = new javax.swing.JLabel();
+  // Variables declaration - do not modify//GEN-BEGIN:variables
-        m_jName = new javax.swing.JTextField();
+  private javax.swing.JLabel cardIdLabel;
-        m_jVisible = new javax.swing.JCheckBox();
+  private javax.swing.JTextField cardIdTextField;
-        jLabel3 = new javax.swing.JLabel();
+  private com.unicenta.data.gui.JImageEditor imageEditor;
-        jLabel4 = new javax.swing.JLabel();
+  private javax.swing.JLabel imageLabel;
-        m_jImage = new com.unicenta.data.gui.JImageEditor();
+  private javax.swing.JCheckBox isVisible;
-        jButton1 = new javax.swing.JButton();
+  private javax.swing.JButton jButton1;
-        m_jRole = new javax.swing.JComboBox();
+  private javax.swing.JComboBox m_jRole;
-        jLabel2 = new javax.swing.JLabel();
+  private javax.swing.JLabel nameLabel;
-        m_jcard = new javax.swing.JTextField();
+  private javax.swing.JTextField nameTextField;
-        jLblCardID = new javax.swing.JLabel();
+  private javax.swing.JLabel passwordLabel;
-        webCBSecurity = new com.alee.laf.combobox.WebComboBox();
+  private javax.swing.JLabel roleLabel;
-        jLabel6 = new javax.swing.JLabel();
+  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
 
-        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
-        jLabel1.setIcon(new javax.swing.ImageIcon(getClass().getResource("/com/unicenta/images/info.png"))); // NOI18N
-        jLabel1.setText(AppLocal.getIntString("label.peoplenamem")); // NOI18N
-        jLabel1.setPreferredSize(new java.awt.Dimension(110, 30));
-        jLabel1.addMouseListener(new java.awt.event.MouseAdapter() {
-            public void mouseClicked(java.awt.event.MouseEvent evt) {
-                jLabel1MouseClicked(evt);
-            }
-        });
-
-        m_jName.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
-        m_jName.setPreferredSize(new java.awt.Dimension(0, 30));
-
-        m_jVisible.setFont(new java.awt.Font("Arial", 0, 12)); // NOI18N
-        m_jVisible.setPreferredSize(new java.awt.Dimension(0, 30));
-
-        jLabel3.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
-        jLabel3.setText(AppLocal.getIntString("label.peoplevisible")); // NOI18N
-        jLabel3.setPreferredSize(new java.awt.Dimension(110, 30));
-
-        jLabel4.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
-        jLabel4.setText(AppLocal.getIntString("label.peopleimage")); // NOI18N
-        jLabel4.setPreferredSize(new java.awt.Dimension(110, 30));
-
-        m_jImage.setFont(new java.awt.Font("Arial", 0, 12)); // NOI18N
-        m_jImage.setPreferredSize(new java.awt.Dimension(300, 250));
-
-        jButton1.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
-        jButton1.setIcon(new javax.swing.ImageIcon(getClass().getResource("/com/unicenta/images/password.png"))); // NOI18N
-        jButton1.setText(AppLocal.getIntString("button.peoplepassword")); // NOI18N
-        jButton1.setToolTipText("");
-        jButton1.setPreferredSize(new java.awt.Dimension(80, 45));
-        jButton1.addActionListener(new java.awt.event.ActionListener() {
-            public void actionPerformed(java.awt.event.ActionEvent evt) {
-                jButton1ActionPerformed(evt);
-            }
-        });
-
-        m_jRole.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
-        m_jRole.setPreferredSize(new java.awt.Dimension(0, 30));
-
-        jLabel2.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
-        jLabel2.setText(AppLocal.getIntString("label.rolem")); // NOI18N
-        jLabel2.setPreferredSize(new java.awt.Dimension(110, 30));
-
-        m_jcard.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
-        m_jcard.setPreferredSize(new java.awt.Dimension(0, 30));
-
-        jLblCardID.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
-        jLblCardID.setText(AppLocal.getIntString("label.card")); // NOI18N
-        jLblCardID.setPreferredSize(new java.awt.Dimension(110, 30));
-
-        webCBSecurity.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "Generate new key", "Delete exisitng key", "Use iButton ID" }));
-        webCBSecurity.setSelectedIndex(0);
-        webCBSecurity.setToolTipText(AppLocal.getIntString("tooltip.peoplesecurity")); // NOI18N
-        webCBSecurity.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
-        webCBSecurity.setPreferredSize(new java.awt.Dimension(140, 45));
-        webCBSecurity.addActionListener(new java.awt.event.ActionListener() {
-            public void actionPerformed(java.awt.event.ActionEvent evt) {
-                webCBSecurityActionPerformed(evt);
-            }
-        });
-
-        jLabel6.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
-        jLabel6.setText(AppLocal.getIntString("label.Password")); // NOI18N
-        jLabel6.setPreferredSize(new java.awt.Dimension(110, 30));
-
-        javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
-        this.setLayout(layout);
-        layout.setHorizontalGroup(
-            layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-            .addGroup(layout.createSequentialGroup()
-                .addContainerGap()
-                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-                    .addGroup(layout.createSequentialGroup()
-                        .addComponent(jLabel3, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
-                        .addGap(18, 18, 18)
-                        .addComponent(m_jVisible, javax.swing.GroupLayout.PREFERRED_SIZE, 207, javax.swing.GroupLayout.PREFERRED_SIZE))
-                    .addGroup(layout.createSequentialGroup()
-                        .addComponent(jLabel2, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
-                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
-                        .addComponent(m_jRole, javax.swing.GroupLayout.PREFERRED_SIZE, 180, javax.swing.GroupLayout.PREFERRED_SIZE))
-                    .addGroup(layout.createSequentialGroup()
-                        .addComponent(jLabel4, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
-                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
-                        .addComponent(m_jImage, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
-                    .addGroup(layout.createSequentialGroup()
-                        .addComponent(jLblCardID, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
-                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
-                        .addComponent(m_jcard, javax.swing.GroupLayout.PREFERRED_SIZE, 180, javax.swing.GroupLayout.PREFERRED_SIZE)
-                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                        .addComponent(webCBSecurity, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
-                    .addGroup(layout.createSequentialGroup()
-                        .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-                            .addComponent(jLabel1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
-                            .addComponent(jLabel6, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
-                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
-                        .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-                            .addComponent(jButton1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
-                            .addComponent(m_jName, javax.swing.GroupLayout.PREFERRED_SIZE, 180, javax.swing.GroupLayout.PREFERRED_SIZE))))
-                .addContainerGap())
-        );
-        layout.setVerticalGroup(
-            layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-            .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup()
-                .addGap(18, 18, 18)
-                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
-                    .addComponent(jLabel1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
-                    .addComponent(m_jName, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
-                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
-                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.CENTER)
-                    .addComponent(jLabel6, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
-                    .addComponent(jButton1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
-                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
-                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.CENTER)
-                    .addComponent(jLblCardID, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
-                    .addComponent(m_jcard, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
-                    .addComponent(webCBSecurity, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
-                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
-                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
-                    .addComponent(jLabel2, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
-                    .addComponent(m_jRole, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
-                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
-                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-                    .addComponent(jLabel3, javax.swing.GroupLayout.PREFERRED_SIZE, 25, javax.swing.GroupLayout.PREFERRED_SIZE)
-                    .addComponent(m_jVisible, javax.swing.GroupLayout.PREFERRED_SIZE, 25, javax.swing.GroupLayout.PREFERRED_SIZE))
-                .addGap(15, 15, 15)
-                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-                    .addComponent(m_jImage, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
-                    .addComponent(jLabel4, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
-                .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
-        );
-    }// </editor-fold>//GEN-END:initComponents
-
-    private void jButton1ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jButton1ActionPerformed
-
-        String sNewPassword = Hashcypher.changePassword(this);
-        if (sNewPassword != null) {
-            m_sPassword = sNewPassword;
-            m_Dirty.setDirty(true);
-        }
-
-    }//GEN-LAST:event_jButton1ActionPerformed
-
-    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) 
-            {  
-                m_jcard.setText("C" + StringUtils.getCardNumber());
-                m_Dirty.setDirty(true);
-            }        
-        }         
-
-        if(webCBSecurity.getSelectedIndex() == 1){
-            if (JOptionPane.showConfirmDialog(this, 
-                AppLocal.getIntString("message.cardremove"), 
-                AppLocal.getIntString("title.editor"), 
-                JOptionPane.YES_NO_OPTION, 
-                JOptionPane.QUESTION_MESSAGE) == JOptionPane.YES_OPTION) 
-            {  
-                m_jcard.setText(null);
-                m_Dirty.setDirty(true);
-            }
-        }
-        
-        if(webCBSecurity.getSelectedIndex() == 2){
-            if (JOptionPane.showConfirmDialog(this, 
-                AppLocal.getIntString("message.ibuttonassign"), 
-                AppLocal.getIntString("title.editor"), 
-                JOptionPane.OK_CANCEL_OPTION, 
-                JOptionPane.INFORMATION_MESSAGE) == JOptionPane.OK_OPTION) 
-
-            {  
-                m_jcard.setText( uOWWatch.getibuttonid() );
-                jLblCardID.setText(AppLocal.getIntString("label.ibutton"));
-                m_Dirty.setDirty(true);
-            }
-
-        }                
-               
-    }//GEN-LAST:event_webCBSecurityActionPerformed
-
-    private void jLabel1MouseClicked(java.awt.event.MouseEvent evt) {//GEN-FIRST:event_jLabel1MouseClicked
-        if (evt.getClickCount() == 2) {
-            String uuidString = m_oId.toString();
-            StringSelection stringSelection = new StringSelection(uuidString);
-            Clipboard clpbrd = Toolkit.getDefaultToolkit().getSystemClipboard();
-            clpbrd.setContents(stringSelection, null);
-        
-            JOptionPane.showMessageDialog(null, 
-                AppLocal.getIntString("message.uuidcopy"));
-        }
-    }//GEN-LAST:event_jLabel1MouseClicked
-    
-    
-    // Variables declaration - do not modify//GEN-BEGIN:variables
-    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.JTextField m_jcard;
-    private com.alee.laf.combobox.WebComboBox webCBSecurity;
-    // End of variables declaration//GEN-END:variables
-    
 }

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

@@ -37,348 +37,330 @@ import java.util.List;
  * @author adrianromero
  */
 public class DataLogicReceipts extends BeanFactoryDataSingle {
-    
-    private Session s;
-    
-    /** Creates a new instance of DataLogicReceipts */
-    public DataLogicReceipts() {
-    }
-    
-    /**
-     *
-     * @param s
-     */
-    @Override
-    public void init(Session s){
-        this.s = s;
-    }
-     
-    /**
-     *
-     * @param Id
-     * @return
-     * @throws BasicException
-     */
-    public final TicketInfo getSharedTicket(String Id) throws BasicException {
-        
-        if (Id == null) {
-            return null; 
-        } else {
-            Object[]record = (Object[]) new StaticSentence(s
-                    , "SELECT CONTENT, LOCKED FROM sharedtickets WHERE ID = ?"
-                    , SerializerWriteString.INSTANCE
-                    , new SerializerReadBasic(new Datas[] {
-                        Datas.SERIALIZABLE})).find(Id);
-            return record == null ? null : (TicketInfo) record[0];
-        }
-    }
-    
-        /**
-     *
-     * @param pickupId
-     * @return
-     * @throws BasicException
-     */
-    public final TicketInfo getSharedTicketPickupId(String pickupId) throws BasicException {
-        
-        if (pickupId == null) {
-            return null; 
-        } else {
-            Object[]record = (Object[]) new StaticSentence(s
-                    , "SELECT CONTENT, LOCKED FROM sharedtickets WHERE PICKUPID = ?"
-                    , SerializerWriteString.INSTANCE
-                    , new SerializerReadBasic(new Datas[] {
-                        Datas.SERIALIZABLE})).find(pickupId);
-            return record == null ? null : (TicketInfo) record[0];
-        }
-    } 
 
-    /**
+  private Session s;
-     * 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 PICKUPID" 
-                , null
-                , new SerializerReadClass(SharedTicketInfo.class)).list();
-    }
-    
-    /**
-     * Return only current APPUSER SHAREDtickets
-     * @param appuser
-     * @return
-     * @throws BasicException
-     */
-    public final List<SharedTicketInfo> getUserSharedTicketList(String appuser) throws BasicException {
-        String sql = "SELECT ID, NAME, CONTENT, APPUSER, PICKUPID, LOCKED " 
-                + "FROM sharedtickets "
-                + "WHERE APPUSER =\""+ appuser +"\" ORDER BY PICKUPID";
-        
-            return (List<SharedTicketInfo>) new StaticSentence(s
-            , sql
-            , null
-            , new SerializerReadClass(SharedTicketInfo.class)).list();
-    }
-    
-    /**
-     * For Standard View
-     * @param id
-     * @param ticket
-     * @param pickupid
-     * @throws BasicException
-     */
-    public final void insertSharedTicket(final String id, final TicketInfo ticket, int pickupid) throws BasicException {
-        
-        Object[] values = new Object[] {
-            id, 
-            ticket.getName(), 
-            ticket,
-            ticket.getUser().getId(),
-            pickupid
 
-        };
+  /** Creates a new instance of DataLogicReceipts */
-        Datas[] datas;
+  public DataLogicReceipts() {
-        datas = new Datas[] {
+  }
-            Datas.STRING, 
-            Datas.STRING, 
-            Datas.SERIALIZABLE, 
-            Datas.STRING,            
-            Datas.INT
 
-        };
+  /**
-        new PreparedSentence(s
+   *
-            , "INSERT INTO sharedtickets ("
+   * @param s
-                + "ID, "
+   */
-                + "NAME, "
+  @Override
-                + "CONTENT, "
+  public void init(Session s) {
-                + "APPUSER, "                    
+    this.s = s;
-                + "PICKUPID) "
+  }
-                + "VALUES (?, ?, ?, ?, ?)"                
-            , new SerializerWriteBasicExt(datas, new int[] {0, 1, 2, 3, 4})).exec(values);                
-    }
-    
-    /**
-     *
-     * @param id
-     * @param ticket
-     * @param pickupid
-     * @throws BasicException
-     */
-    public final void updateSharedTicket(final String id, final TicketInfo ticket, int pickupid) throws BasicException {
-            
-        Object[] values = new Object[] {
-            id, 
-            ticket.getName(), 
-            ticket, 
-            ticket.getUser().getId(),
-            pickupid
-        };
-        Datas[] datas = new Datas[] {
-            Datas.STRING, 
-            Datas.STRING, 
-            Datas.SERIALIZABLE, 
-            Datas.STRING,
-            Datas.INT
-        };
-        new PreparedSentence(s
-                , "UPDATE sharedtickets SET "
-                + "NAME = ?, "
-                + "CONTENT = ?, "
-                + "APPUSER = ?, "                        
-                + "PICKUPID = ? "
-                + "WHERE ID = ?"
-                , new SerializerWriteBasicExt(datas, 
-                        new int[] {
-                            1, 2, 3, 4, 0})).exec(values);
-    }
 
-    /**
+  /**
-     *
+   *
-     * @param id
+   * @param Id
-     * @param ticket
+   * @return
-     * @param pickupid
+   * @throws BasicException
-     * @throws BasicException
+   */
-     */
+  public final TicketInfo getSharedTicket(String Id) throws BasicException {
-    public final void updateRSharedTicket(
+
-            final String id, 
+    if (Id == null) {
-            final TicketInfo ticket, 
+      return null;
-            int pickupid) throws BasicException {
+    } else {
-            
+      Object[] record = (Object[]) new StaticSentence(s, "SELECT CONTENT, LOCKED FROM sharedtickets WHERE ID = ?",
-        Object[] values = new Object[] {
+          SerializerWriteString.INSTANCE, new SerializerReadBasic(new Datas[] {
-            id, 
+              Datas.SERIALIZABLE }))
-            ticket.getName(), 
+          .find(Id);
-            ticket, 
+      return record == null ? null : (TicketInfo) record[0];
-            pickupid
-        };
-        Datas[] datas = new Datas[] {
-            Datas.STRING, 
-            Datas.STRING, 
-            Datas.SERIALIZABLE, 
-            Datas.INT
-        };
-        new PreparedSentence(s
-                , "UPDATE sharedtickets SET "
-                + "NAME = ?, "
-                + "CONTENT = ?, "
-                + "PICKUPID = ? "
-                + "WHERE ID = ?"
-                , new SerializerWriteBasicExt(datas, new int[] {1, 2, 3, 0})).exec(values);                
     }
-    
+  }
-     /**
+
-     * In place for multi-purposing like containing data from elsewhere and/or
+  /**
-     * using Place and User for Notifications
+   *
-     * @param id
+   * @param pickupId
-     * @param locked
+   * @return
-     * @throws BasicException
+   * @throws BasicException
-     */
+   */
-    public final void lockSharedTicket(final String id, final String locked) throws BasicException {
+  public final TicketInfo getSharedTicketPickupId(String pickupId) throws BasicException {
-            
+
-        Object[] values = new Object[] {
+    if (pickupId == null) {
-            id, 
+      return null;
-            locked
+    } else {
-        };
+      Object[] record = (Object[]) new StaticSentence(s, "SELECT CONTENT, LOCKED FROM sharedtickets WHERE PICKUPID = ?",
-        Datas[] datas = new Datas[] {
+          SerializerWriteString.INSTANCE, new SerializerReadBasic(new Datas[] {
-            Datas.STRING, 
+              Datas.SERIALIZABLE }))
+          .find(pickupId);
+      return record == null ? null : (TicketInfo) record[0];
+    }
+  }
+
+  /**
+   * 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 PICKUPID",
+        null, new SerializerReadClass(SharedTicketInfo.class)).list();
+  }
+
+  /**
+   * Return only current APPUSER SHAREDtickets
+   * 
+   * @param appuser
+   * @return
+   * @throws BasicException
+   */
+  public final List<SharedTicketInfo> getUserSharedTicketList(String appuser) throws BasicException {
+    String sql = "SELECT ID, NAME, CONTENT, APPUSER, PICKUPID, LOCKED "
+        + "FROM sharedtickets "
+        + "WHERE APPUSER =\"" + appuser + "\" ORDER BY PICKUPID";
+
+    return (List<SharedTicketInfo>) new StaticSentence(s, sql, null, new SerializerReadClass(SharedTicketInfo.class))
+        .list();
+  }
+
+  /**
+   * For Standard View
+   * 
+   * @param id
+   * @param ticket
+   * @param pickupid
+   * @throws BasicException
+   */
+  public final void insertSharedTicket(final String id, final TicketInfo ticket, int pickupid) throws BasicException {
+
+    Object[] values = new Object[] {
+        id,
+        ticket.getName(),
+        ticket,
+        ticket.getUserInfo().getId(),
+        pickupid
+
+    };
+    Datas[] datas;
+    datas = new Datas[] {
+        Datas.STRING,
+        Datas.STRING,
+        Datas.SERIALIZABLE,
+        Datas.STRING,
+        Datas.INT
+
+    };
+    new PreparedSentence(s, "INSERT INTO sharedtickets ("
+        + "ID, "
+        + "NAME, "
+        + "CONTENT, "
+        + "APPUSER, "
+        + "PICKUPID) "
+        + "VALUES (?, ?, ?, ?, ?)", new SerializerWriteBasicExt(datas, new int[] { 0, 1, 2, 3, 4 })).exec(values);
+  }
+
+  /**
+   *
+   * @param id
+   * @param ticket
+   * @param pickupid
+   * @throws BasicException
+   */
+  public final void updateSharedTicket(final String id, final TicketInfo ticket, int pickupid) throws BasicException {
+
+    Object[] values = new Object[] {
+        id,
+        ticket.getName(),
+        ticket,
+        ticket.getUserInfo().getId(),
+        pickupid
+    };
+    Datas[] datas = new Datas[] {
+        Datas.STRING,
+        Datas.STRING,
+        Datas.SERIALIZABLE,
+        Datas.STRING,
+        Datas.INT
+    };
+    new PreparedSentence(s, "UPDATE sharedtickets SET "
+        + "NAME = ?, "
+        + "CONTENT = ?, "
+        + "APPUSER = ?, "
+        + "PICKUPID = ? "
+        + "WHERE ID = ?",
+        new SerializerWriteBasicExt(datas,
+            new int[] {
+                1, 2, 3, 4, 0 }))
+        .exec(values);
+  }
+
+  /**
+   *
+   * @param id
+   * @param ticket
+   * @param pickupid
+   * @throws BasicException
+   */
+  public final void updateRSharedTicket(
+      final String id,
+      final TicketInfo ticket,
+      int pickupid) throws BasicException {
+
+    Object[] values = new Object[] {
+        id,
+        ticket.getName(),
+        ticket,
+        pickupid
+    };
+    Datas[] datas = new Datas[] {
+        Datas.STRING,
+        Datas.STRING,
+        Datas.SERIALIZABLE,
+        Datas.INT
+    };
+    new PreparedSentence(s, "UPDATE sharedtickets SET "
+        + "NAME = ?, "
+        + "CONTENT = ?, "
+        + "PICKUPID = ? "
+        + "WHERE ID = ?", new SerializerWriteBasicExt(datas, new int[] { 1, 2, 3, 0 })).exec(values);
+  }
+
+  /**
+   * In place for multi-purposing like containing data from elsewhere and/or
+   * using Place and User for Notifications
+   * 
+   * @param id
+   * @param locked
+   * @throws BasicException
+   */
+  public final void lockSharedTicket(final String id, final String locked) throws BasicException {
+
+    Object[] values = new Object[] {
+        id,
+        locked
+    };
+    Datas[] datas = new Datas[] {
+        Datas.STRING,
+        Datas.STRING
+    };
+    new PreparedSentence(s, "UPDATE sharedtickets SET "
+        + "LOCKED = ? "
+        + "WHERE ID = ?", new SerializerWriteBasicExt(datas, new int[] { 1, 0 })).exec(values);
+  }
+
+  /**
+   * In place for multi-purposing like flushing locks from elsewhere and/or
+   * using Place and User for Notifications
+   * 
+   * @param id
+   * @param unlocked
+   * @throws BasicException
+   */
+  public final void unlockSharedTicket(final String id, final String unlocked) throws BasicException {
+
+    Object[] values = new Object[] {
+        id,
+        unlocked
+    };
+    Datas[] datas = new Datas[] {
+        Datas.STRING,
+        Datas.STRING
+    };
+    new PreparedSentence(s, "UPDATE sharedtickets SET "
+        + "LOCKED = ? "
+        + "WHERE ID = ?", new SerializerWriteBasicExt(datas, new int[] { 1, 0 })).exec(values);
+  }
+
+  /**
+   * For Restaurant View
+   * 
+   * @param id
+   * @param ticket
+   * @param pickupid
+   * @throws BasicException
+   */
+  public final void insertRSharedTicket(
+      final String id,
+      final TicketInfo ticket,
+      int pickupid) throws BasicException {
+
+    Object[] values = new Object[] {
+        id,
+        ticket.getName(),
+        ticket,
+        ticket.getUserInfo(),
+        ticket.getPickupId(),
+        ticket.getHost()
+    };
+    Datas[] datas;
+    datas = new Datas[] {
+        Datas.STRING,
+        Datas.STRING,
+        Datas.SERIALIZABLE,
+        Datas.STRING,
+        Datas.INT
+
+    };
+    new PreparedSentence(s, "INSERT INTO sharedtickets ("
+        + "ID, "
+        + "NAME, "
+        + "CONTENT, "
+        + "APPUSER, "
+        + "PICKUPID) "
+        + "VALUES (?, ?, ?, ?, ?)", new SerializerWriteBasicExt(datas, new int[] { 0, 1, 2, 3, 4 })).exec(values);
+  }
+
+  /**
+   * 
+   * @param id
+   * @throws BasicException
+   */
+  public final void deleteSharedTicket(final String id) throws BasicException {
+
+    new StaticSentence(s, "DELETE FROM sharedtickets WHERE ID = ?", SerializerWriteString.INSTANCE).exec(id);
+  }
+
+  /**
+   *
+   * @param Id
+   * @return
+   * @throws BasicException
+   */
+  public final Integer getPickupId(String Id) throws BasicException {
+
+    if (Id == null) {
+      return null;
+    } else {
+      Object[] record = (Object[]) new StaticSentence(s, "SELECT PICKUPID FROM sharedtickets WHERE ID = ?",
+          SerializerWriteString.INSTANCE, new SerializerReadBasic(new Datas[] { Datas.INT })).find(Id);
+      return record == null ? 0 : (Integer) record[0];
+    }
+  }
+
+  public final String getUserId(final String id) throws BasicException {
+    Object[] userID = (Object[]) new StaticSentence(s, "SELECT APPUSER FROM sharedtickets WHERE ID = ?",
+        SerializerWriteString.INSTANCE, new SerializerReadBasic(new Datas[] { Datas.STRING })).find(id);
+    if (userID == null) {
+      return null;
+    } else {
+      return (String) userID[0];
+    }
+  }
+
+  public final String getLockState(final String id, String lockState) throws BasicException {
+    Object[] state = (Object[]) new StaticSentence(s, "SELECT LOCKED FROM sharedtickets WHERE ID = ?",
+        SerializerWriteString.INSTANCE, new SerializerReadBasic(new Datas[] {
             Datas.STRING
-        };
+        })).find(id);
-        new PreparedSentence(s
+    return (String) state[0];
-                , "UPDATE sharedtickets SET "
+  }
-                + "LOCKED = ? "
-                + "WHERE ID = ?"
-                , new SerializerWriteBasicExt(datas, new int[] {1, 0})).exec(values);
-    }
 
-     /**
+  public final String getServer(final String id, String user) throws BasicException {
-     * In place for multi-purposing like flushing locks from elsewhere and/or
+    Object[] server = (Object[]) new StaticSentence(s, "SELECT appuser FROM sharedtickets WHERE ID = ?",
-     * using Place and User for Notifications
+        SerializerWriteString.INSTANCE, new SerializerReadBasic(new Datas[] {
-     * @param id
-     * @param unlocked
-     * @throws BasicException
-     */
-    public final void unlockSharedTicket(final String id, final String unlocked) throws BasicException {
-            
-        Object[] values = new Object[] {
-            id, 
-            unlocked
-        };
-        Datas[] datas = new Datas[] {
-            Datas.STRING, 
             Datas.STRING
-        };
+        })).find(id);
-        new PreparedSentence(s
+    return (String) server[0];
-                , "UPDATE sharedtickets SET "
+  }
-                + "LOCKED = ? "
-                + "WHERE ID = ?"
-                , new SerializerWriteBasicExt(datas, new int[] {1, 0})).exec(values);
-    }    
-    
-    /**
-     * For Restaurant View
-     * @param id
-     * @param ticket
-     * @param pickupid
-     * @throws BasicException
-     */
-    public final void insertRSharedTicket(
-            final String id, 
-            final TicketInfo ticket, 
-            int pickupid) throws BasicException {
-        
-        Object[] values = new Object[] {
-            id, 
-            ticket.getName(), 
-            ticket,
-            ticket.getUser(),
-            ticket.getPickupId(),
-            ticket.getHost()                          
-        };
-        Datas[] datas;
-        datas = new Datas[] {
-            Datas.STRING, 
-            Datas.STRING, 
-            Datas.SERIALIZABLE, 
-            Datas.STRING,            
-            Datas.INT
-
-        };
-        new PreparedSentence(s
-            , "INSERT INTO sharedtickets ("
-                + "ID, "
-                + "NAME, "
-                + "CONTENT, "
-                + "APPUSER, "                    
-                + "PICKUPID) "
-                + "VALUES (?, ?, ?, ?, ?)"                
-            , new SerializerWriteBasicExt(datas, new int[] {0, 1, 2, 3, 4})).exec(values);                
-    }    
-
-    /**
-     * 
-     * @param id
-     * @throws BasicException
-     */
-    public final void deleteSharedTicket(final String id) throws BasicException {
-
-        new StaticSentence(s
-            , "DELETE FROM sharedtickets WHERE ID = ?"
-            , SerializerWriteString.INSTANCE).exec(id);      
-    }
-
-    /**
-     *
-     * @param Id
-     * @return
-     * @throws BasicException
-     */
-    public final Integer getPickupId(String Id) throws BasicException {
-        
-        if (Id == null) {
-            return null; 
-        } else {
-            Object[]record = (Object[]) new StaticSentence(s
-                    , "SELECT PICKUPID FROM sharedtickets WHERE ID = ?"
-                    , SerializerWriteString.INSTANCE
-                    , new SerializerReadBasic(new Datas[] {Datas.INT})).find(Id);
-            return record == null ? 0 : (Integer)record[0];
-        }
-    } 
-
-
-    public final String getUserId(final String id) throws BasicException {
-        Object[] userID = (Object []) new StaticSentence(s
-            , "SELECT APPUSER FROM sharedtickets WHERE ID = ?"
-            , SerializerWriteString.INSTANCE
-            , new SerializerReadBasic(new Datas[] {Datas.STRING})).find(id);
-            if( userID == null ) {
-                return null;
-            } else {
-                return (String) userID[0];
-        }
-    }
-    
-    public final String getLockState(final String id, String lockState) throws BasicException {
-        Object[] state = (Object[]) new StaticSentence(s
-            , "SELECT LOCKED FROM sharedtickets WHERE ID = ?"
-            , SerializerWriteString.INSTANCE
-            , new SerializerReadBasic(new Datas[] {
-                Datas.STRING
-            })).find(id);
-                return (String) state[0];
-    }
-
-    public final String getServer(final String id, String user) throws BasicException {
-        Object[] server = (Object[]) new StaticSentence(s
-            , "SELECT appuser FROM sharedtickets WHERE ID = ?"
-            , SerializerWriteString.INSTANCE
-            , new SerializerReadBasic(new Datas[] {
-                Datas.STRING
-            })).find(id);
-                return (String) server[0];
-    }    
 }

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

@@ -37,455 +37,509 @@ import java.util.Properties;
  */
 public class TicketLineInfo implements SerializableWrite, SerializableRead, Serializable {
 
-    private static final long serialVersionUID = 6608012948284450199L;
+  private static final long serialVersionUID = 6608012948284450199L;
-    private String m_sTicket;
+  private String m_sTicket;
-    private int m_iLine;
+  private int m_iLine;
-    private double multiply;
+  private double multiply;
 
-    @Override
+  @Override
-    public String toString() {
+  public String toString() {
-        return new Gson().toJson(this);
+    return new Gson().toJson(this);
+  }
+
+  private double price;
+  private TaxInfo tax;
+  private Properties attributes;
+  private String productid;
+  private String attsetinstid;
+  private Boolean updated = false;
+
+  private double newprice = 0.0;
+
+  /**
+   * Creates new TicketLineInfo
+   * 
+   * @param productid
+   * @param dMultiply
+   * @param dPrice
+   * @param tax
+   * @param props
+   */
+  public TicketLineInfo(String productid, double dMultiply, double dPrice, TaxInfo tax, Properties props) {
+    init(productid, null, dMultiply, dPrice, tax, props);
+  }
+
+  /**
+   *
+   * @param productid
+   * @param dMultiply
+   * @param dPrice
+   * @param tax
+   */
+  public TicketLineInfo(String productid, double dMultiply, double dPrice, TaxInfo tax) {
+    init(productid, null, dMultiply, dPrice, tax, new Properties());
+  }
+
+  /**
+   * Example: Call from script.TotalDiscount event
+   * 
+   * @param productid
+   * @param productname
+   * @param producttaxcategory
+   * @param productprinter
+   * @param dMultiply
+   * @param dPrice
+   * @param tax
+   */
+  public TicketLineInfo(String productid, String productname, String producttaxcategory, String productprinter,
+      double dMultiply, double dPrice, TaxInfo tax) {
+    Properties props = new Properties();
+    props.setProperty("product.name", productname);
+    props.setProperty("product.taxcategoryid", producttaxcategory);
+    props.setProperty("product.printer", productprinter); // added to props as may introduce printer redirect
+
+    init(productid, null, dMultiply, dPrice, tax, props);
+  }
+
+  /**
+   * Example: Call from script.LineDiscount event
+   * 
+   * @param productname
+   * @param producttaxcategory
+   * @param productprinter     //added to props as may introduce printer redirect
+   * @param dMultiply
+   * @param dPrice
+   * @param tax
+   */
+  public TicketLineInfo(String productname, String producttaxcategory, String productprinter, double dMultiply,
+      double dPrice, TaxInfo tax) {
+
+    Properties props = new Properties();
+    props.setProperty("product.name", productname);
+    props.setProperty("product.taxcategoryid", producttaxcategory);
+    props.setProperty("product.printer", productprinter);
+
+    init(null, null, dMultiply, dPrice, tax, props);
+  }
+
+  /**
+   *
+   */
+  public TicketLineInfo() {
+    init(null, null, 0.0, 0.0, null, new Properties());
+  }
+
+  /**
+   *
+   * @param product
+   * @param dMultiply
+   * @param dPrice
+   * @param tax
+   * @param attributes
+   */
+  public TicketLineInfo(ProductInfoExt product, double dMultiply, double dPrice, TaxInfo tax, Properties attributes) {
+
+    String pid;
+
+    if (product == null) {
+      pid = null;
+      tax = null;
+    } else {
+      pid = product.getID();
+      attributes.setProperty("product.name", product.getName());
+      attributes.setProperty("product.reference", product.getReference());
+      attributes.setProperty("product.code", product.getCode());
+
+      if (product.getMemoDate() == null) {
+        attributes.setProperty("product.memodate", "1900-01-01 00:00:01");
+      } else {
+        attributes.setProperty("product.memodate", product.getMemoDate());
+      }
+
+      attributes.setProperty("product.com", product.isCom() ? "true" : "false");
+      attributes.setProperty("product.constant", product.isConstant() ? "true" : "false");
+
+      if (product.getPrinter() != null) {
+        attributes.setProperty("product.printer", product.getPrinter());
+      } else {
+        attributes.setProperty("product.printer", "1");
+      }
+
+      attributes.setProperty("product.service", product.isService() ? "true" : "false");
+      attributes.setProperty("product.vprice", product.isVprice() ? "true" : "false");
+      attributes.setProperty("product.verpatrib", product.isVerpatrib() ? "true" : "false");
+
+      if (product.getTextTip() != null) {
+        attributes.setProperty("product.texttip", product.getTextTip());
+      }
+
+      attributes.setProperty("product.warranty", product.getWarranty() ? "true" : "false");
+
+      if (product.getAttributeSetID() != null) {
+        attributes.setProperty("product.attsetid", product.getAttributeSetID());
+      }
+
+      attributes.setProperty("product.taxcategoryid", product.getTaxCategoryID());
+
+      if (product.getCategoryID() != null) {
+        attributes.setProperty("product.categoryid", product.getCategoryID());
+      }
+
+      if ("true".equals(attributes.getProperty("ticket.updated"))) {
+        attributes.setProperty("ticket.updated", "false");
+      } else {
+        attributes.setProperty("ticket.updated", "true");
+      }
     }
 
-    private double price;
+    init(pid, null, dMultiply, dPrice, tax, attributes);
-    private TaxInfo tax;
+  }
-    private Properties attributes;
-    private String productid;
-    private String attsetinstid;
-    private Boolean updated = false;
-    
-    private double newprice = 0.0;
-    
-    /** Creates new TicketLineInfo
-     * @param productid
-     * @param dMultiply
-     * @param dPrice
-     * @param tax
-     * @param props */
-    public TicketLineInfo(String productid, double dMultiply, double dPrice, TaxInfo tax, Properties props) {
-        init(productid, null, dMultiply, dPrice, tax, props);
-    }
 
-    /**
+  /**
-     *
+   *
-     * @param productid
+   * @param oProduct
-     * @param dMultiply
+   * @param dPrice
-     * @param dPrice
+   * @param tax
-     * @param tax
+   * @param attributes
-     */
+   */
-    public TicketLineInfo(String productid, double dMultiply, double dPrice, TaxInfo tax) {
+  public TicketLineInfo(ProductInfoExt oProduct, double dPrice, TaxInfo tax, Properties attributes) {
-        init(productid, null, dMultiply, dPrice, tax, new Properties());
+    this(oProduct, 1.0, dPrice, tax, attributes);
-    }
+  }
 
-    /**
+  /**
-     * Example: Call from script.TotalDiscount event
+   *
-     * @param productid
+   * @param line
-     * @param productname
+   */
-     * @param producttaxcategory
+  public TicketLineInfo(TicketLineInfo line) {
-     * @param productprinter
+    init(line.productid, line.attsetinstid, line.multiply, line.price,
-     * @param dMultiply
+        line.tax, (Properties) line.attributes.clone());
-     * @param dPrice
+  }
-     * @param tax
-     */
-    public TicketLineInfo(String productid, String productname, String producttaxcategory, String productprinter, double dMultiply, double dPrice, TaxInfo tax) {
-        Properties props = new Properties();
-        props.setProperty("product.name", productname);
-        props.setProperty("product.taxcategoryid", producttaxcategory);
-        props.setProperty("product.printer", productprinter);   //added to props as may introduce printer redirect
-        
-        init(productid, null, dMultiply, dPrice, tax, props);
-    }
 
-    /**
+  private void init(String productid, String attsetinstid, double dMultiply, double dPrice, TaxInfo tax,
-     * Example: Call from script.LineDiscount event
+      Properties attributes) {
-     * @param productname
-     * @param producttaxcategory
-     * @param productprinter    //added to props as may introduce printer redirect
-     * @param dMultiply
-     * @param dPrice
-     * @param tax
-     */
-    public TicketLineInfo(String productname, String producttaxcategory, String productprinter, double dMultiply, double dPrice, TaxInfo tax) {
 
-        Properties props = new Properties();
+    this.productid = productid;
-        props.setProperty("product.name", productname);
+    this.attsetinstid = attsetinstid;
-        props.setProperty("product.taxcategoryid", producttaxcategory);
+    multiply = dMultiply;
-        props.setProperty("product.printer", productprinter);
+    price = dPrice;
-        
+    this.tax = tax;
-        init(null, null, dMultiply, dPrice, tax, props);
+    this.attributes = attributes;
-    }
 
-    /**
+    m_sTicket = null;
-     *
+    m_iLine = -1;
-     */
+  }
-    public TicketLineInfo() {
-        init(null, null, 0.0, 0.0, null, new Properties());
-    }
 
-    /**
+  void setTicket(String ticket, int line) {
-     *
+    m_sTicket = ticket;
-     * @param product
+    m_iLine = line;
-     * @param dMultiply
+  }
-     * @param dPrice
-     * @param tax
-     * @param attributes
-     */
-    public TicketLineInfo(ProductInfoExt product, double dMultiply, double dPrice, TaxInfo tax, Properties attributes) {
 
-        String pid;
+  /**
+   *
+   * @param dp
+   * @throws BasicException
+   */
+  @Override
+  public void writeValues(DataWrite dp) throws BasicException {
+    dp.setString(1, m_sTicket);
+    dp.setInt(2, m_iLine);
+    dp.setString(3, productid);
+    dp.setString(4, attsetinstid);
+    dp.setDouble(5, multiply);
+    dp.setDouble(6, price);
+    dp.setString(7, tax.getId());
 
-        if (product == null) {
+    try {
-            pid = null;
+      ByteArrayOutputStream o = new ByteArrayOutputStream();
-            tax = null;
+      attributes.storeToXML(o, AppLocal.APP_NAME, "UTF-8");
-        } else {
+      dp.setBytes(8, o.toByteArray());
-            pid = product.getID();
+    } catch (IOException e) {
-            attributes.setProperty("product.name", product.getName());
+      dp.setBytes(8, null);
-            attributes.setProperty("product.reference", product.getReference());
+    }
-            attributes.setProperty("product.code", product.getCode());
+  }
 
-            if (product.getMemoDate() == null) {
+  /**
-                attributes.setProperty("product.memodate", "1900-01-01 00:00:01");                
+   *
-            } else {
+   * @param dr
-                attributes.setProperty("product.memodate", product.getMemoDate());                
+   * @throws BasicException
-            }
+   */
-         
+  @Override
-            attributes.setProperty("product.com", product.isCom() ? "true" : "false");
+  public void readValues(DataRead dr) throws BasicException {
-            attributes.setProperty("product.constant", product.isConstant() ? "true" : "false");
+    m_sTicket = dr.getString(1);
+    m_iLine = dr.getInt(2);
+    productid = dr.getString(3);
+    attsetinstid = dr.getString(4);
+    multiply = dr.getDouble(5);
+    price = dr.getDouble(6);
+    tax = new TaxInfo(
+        dr.getString(7),
+        dr.getString(8),
+        dr.getString(9),
+        dr.getString(10),
+        dr.getString(11),
+        dr.getDouble(12),
+        dr.getBoolean(13),
+        dr.getInt(14));
+    attributes = new Properties();
 
-            if (product.getPrinter() != null) {
+    try {
-                attributes.setProperty("product.printer", product.getPrinter());
+      byte[] img = dr.getBytes(15);
-            } else {
+      if (img != null) {
-                attributes.setProperty("product.printer", "1");
+        attributes.loadFromXML(new ByteArrayInputStream(img));
-            }    
+      }
-            
+    } catch (IOException e) {
-            attributes.setProperty("product.service", product.isService() ? "true" : "false");
+    }
-            attributes.setProperty("product.vprice", product.isVprice() ? "true" : "false");
+  }
-            attributes.setProperty("product.verpatrib", product.isVerpatrib() ? "true" : "false");
 
-            if (product.getTextTip() != null) {
+  /**
-                attributes.setProperty("product.texttip", product.getTextTip());
+   *
-            }
+   * @return
- 
+   */
-            attributes.setProperty("product.warranty", product.getWarranty()? "true" : "false");        
+  public TicketLineInfo copyTicketLine() {
-       
+    TicketLineInfo l = new TicketLineInfo();
-            if (product.getAttributeSetID() != null) {
+    l.productid = productid;
-                attributes.setProperty("product.attsetid", product.getAttributeSetID());
+    l.attsetinstid = attsetinstid;
-            }
+    l.multiply = multiply;
-            
+    l.price = price;
-            attributes.setProperty("product.taxcategoryid", product.getTaxCategoryID());
+    l.tax = tax;
-        
+    l.attributes = (Properties) attributes.clone();
-            if (product.getCategoryID() != null) {
-                attributes.setProperty("product.categoryid", product.getCategoryID());
-            }
 
-            if ("true".equals(attributes.getProperty("ticket.updated"))) {
+    return l;
-                attributes.setProperty("ticket.updated", "false");                
+  }
-            } else {
-                attributes.setProperty("ticket.updated", "true");                
-            }
-        }
 
-        init(pid, null, dMultiply, dPrice, tax, attributes);
+  /**
-    }
+   *
+   * @return
+   */
+  public int getTicketLine() {
+    return m_iLine;
+  }
 
-    /**
+  // These are the Lookups
-     *
+  public String getProductID() {
-     * @param oProduct
+    return productid;
-     * @param dPrice
+  }
-     * @param tax
-     * @param attributes
-     */
-    public TicketLineInfo(ProductInfoExt oProduct, double dPrice, TaxInfo tax, Properties attributes) {
-        this(oProduct, 1.0, dPrice, tax, attributes);
-    }
 
-    /**
+  public String getProductCategoryID() {
-     *
+    return (attributes.getProperty("product.categoryid"));
-     * @param line
+  }
-     */
-    public TicketLineInfo(TicketLineInfo line) {
-        init(line.productid, line.attsetinstid, line.multiply, line.price, 
-            line.tax, (Properties) line.attributes.clone());
-    }
 
-    private void init(String productid, String attsetinstid, double dMultiply, double dPrice, TaxInfo tax, Properties attributes) {
+  public String getProductAttSetId() {
+    return attributes.getProperty("product.attsetid");
+  }
 
-        this.productid = productid;
+  public String getProductAttSetInstId() {
-        this.attsetinstid = attsetinstid;
+    return attsetinstid;
-        multiply = dMultiply;
+  }
-        price = dPrice;
-        this.tax = tax;  
-        this.attributes = attributes;
-    
-        m_sTicket = null;
-        m_iLine = -1;
-    }
 
-    void setTicket(String ticket, int line) {
+  public String getProductAttSetInstDesc() {
-        m_sTicket = ticket;
+    return attributes.getProperty("product.attsetdesc", "");
-        m_iLine = line;
+  }
-    }
 
-    /**
+  public String getProductTaxCategoryID() {
-     *
+    return (attributes.getProperty("product.taxcategoryid"));
-     * @param dp
+  }
-     * @throws BasicException
-     */
-    @Override
-    public void writeValues(DataWrite dp) throws BasicException {
-        dp.setString(1, m_sTicket);
-        dp.setInt(2, m_iLine);
-        dp.setString(3, productid);
-        dp.setString(4, attsetinstid);
-        dp.setDouble(5, multiply);
-        dp.setDouble(6, price);
-        dp.setString(7, tax.getId());
 
-        try {
+  public String getTicketUpdated() {
-            ByteArrayOutputStream o = new ByteArrayOutputStream();
+    return (attributes.getProperty("ticket.updated"));
-            attributes.storeToXML(o, AppLocal.APP_NAME, "UTF-8");
+  }
-            dp.setBytes(8, o.toByteArray());
-        } catch (IOException e) {
-            dp.setBytes(8, null);
-        }
-    }
 
-    /**
+  public TaxInfo getTaxInfo() {
-     *
+    return tax;
-     * @param dr
+  }
-     * @throws BasicException
-     */
-    @Override
-    public void readValues(DataRead dr) throws BasicException {
-        m_sTicket = dr.getString(1);
-        m_iLine = dr.getInt(2);
-        productid = dr.getString(3);
-        attsetinstid = dr.getString(4);
-        multiply = dr.getDouble(5);
-        price = dr.getDouble(6);
-        tax = new TaxInfo(
-            dr.getString(7), 
-            dr.getString(8), 
-            dr.getString(9), 
-            dr.getString(10), 
-            dr.getString(11), 
-            dr.getDouble(12), 
-            dr.getBoolean(13), 
-            dr.getInt(14));
-        attributes = new Properties();
 
-        try {
+  public void setTaxInfo(TaxInfo oTaxInfo) {
-            byte[] img = dr.getBytes(15);
+    tax = oTaxInfo;
-            if (img != null) {
+  }
-                attributes.loadFromXML(new ByteArrayInputStream(img));
-            }
-        } catch (IOException e) {
-        }
-    }
 
-    /**
+  // These appear on Printed TicketLine
-     *
+  public String getProductName() {
-     * @return
+    return attributes.getProperty("product.name");
-     */
+  }
-    public TicketLineInfo copyTicketLine() {
-        TicketLineInfo l = new TicketLineInfo();
-        l.productid = productid;
-        l.attsetinstid = attsetinstid;
-        l.multiply = multiply;
-        l.price = price;
-        l.tax = tax; 
-        l.attributes = (Properties) attributes.clone();
 
-        return l;
+  public String getProductMemoDate() {
-    }
+    return attributes.getProperty("product.memodate");
+  }
 
-    /**
+  public double getPrice() {
-     *
+    return price;
-     * @return
+  }
-     */
-    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;
-    }     
-        
-// These appear on Printed TicketLine
-    public String getProductName() {
-        return attributes.getProperty("product.name");
-    }
-    public String getProductMemoDate() {
-        return attributes.getProperty("product.memodate");
-    }
-    public double getPrice() {
-        return price;
-    }
-    public double getMultiply() {
-        return multiply;
-    }
-    public double getTaxRate() {
-        return tax == null ? 0.0 : tax.getRate();
-    }
-    public double getNewPrice() {
-        newprice = price * (1.0 + getTaxRate());
-        return price;
-    }
-    public String getProductPrinter() {
-        return attributes.getProperty("product.printer");
-    }    
 
-// These are the Summaries    
+  public double getMultiply() {
-    public double getPriceTax() {
+    return multiply;
-        return price * (1.0 + getTaxRate());
+  }
-    }
 
-    public Properties getProperties() {
+  public double getTaxRate() {
-        return attributes;
+    return tax == null ? 0.0 : tax.getRate();
-    }
+  }
-    public String getProperty(String key) {
-        return attributes.getProperty(key);
-    }
-    public String getProperty(String key, String defaultvalue) {
-        return attributes.getProperty(key, defaultvalue);
-    }
 
-// These are Ticket Totals    
+  public double getNewPrice() {
-    public double getTax() {
+    newprice = price * (1.0 + getTaxRate());
-        return price * multiply * getTaxRate();
+    return price;
-    }
+  }
-    public double getValue() {
-        return price * multiply * (1.0 + getTaxRate());
-    }
-    public double getSubValue() {
-        return price * multiply;
-    }    
 
-// SETTERS
+  public String getProductPrinter() {
-    public void setPrice(double dValue) {
+    return attributes.getProperty("product.printer");
-        price = dValue;
+  }
+
+  // These are the Summaries
+  public double getPriceTax() {
+    return price * (1.0 + getTaxRate());
+  }
+
+  public Properties getProperties() {
+    return attributes;
+  }
+
+  public String getProperty(String key) {
+    return attributes.getProperty(key);
+  }
+
+  public String getProperty(String key, String defaultvalue) {
+    return attributes.getProperty(key, defaultvalue);
+  }
+
+  // These are Ticket Totals
+  public double getTax() {
+    return price * multiply * getTaxRate();
+  }
+
+  public double getValue() {
+    return price * multiply * (1.0 + getTaxRate());
+  }
+
+  public double getSubValue() {
+    return price * multiply;
+  }
+
+  // SETTERS
+  public void setPrice(double dValue) {
+    price = dValue;
+  }
+
+  public void setPriceTax(double dValue) {
+    price = dValue / (1.0 + getTaxRate());
+  }
+
+  public void setMultiply(double dValue) {
+    multiply = dValue;
+  }
+
+  public void setProperty(String key, String value) {
+    attributes.setProperty(key, value);
+  }
+
+  public void setProductTaxCategoryID(String taxID) {
+    attributes.setProperty("product.taxcategoryid", taxID);
+  }
+
+  public void setProductAttSetInstId(String value) {
+    attsetinstid = value;
+  }
+
+  public void setProductAttSetInstDesc(String value) {
+    if (value == null) {
+      attributes.remove(value);
+    } else {
+      attributes.setProperty("product.attsetdesc", value);
     }
-    public void setPriceTax(double dValue) {
+  }
-        price = dValue / (1.0 + getTaxRate());               
+
+  public void setTicketUpdated(String key, String value) {
+    attributes.setProperty("ticket.updated", value);
+  }
+
+  public void setProductPrinter(String value) {
+    if (value == null) {
+      attributes.remove(value);
+    } else {
+      attributes.setProperty("product.printer", value);
     }
-    public void setMultiply(double dValue) {
+  }
-        multiply = dValue;
+
-    }
+  /**
-    public void setProperty(String key, String value) {
+   *
-        attributes.setProperty(key, value);
+   * @return
-    }    
+   */
-    public void setProductTaxCategoryID(String taxID){
+  // Print to actual ${ticketline
-        attributes.setProperty("product.taxcategoryid",taxID);
+  public String printReference() {
-    }
+    return StringUtils.encodeXML(attributes.getProperty("product.reference"));
-    public void setProductAttSetInstId(String value) {
+  }
-        attsetinstid = value;
+
-    }
+  public String printCode() {
-    public void setProductAttSetInstDesc(String value) {
+    return StringUtils.encodeXML(attributes.getProperty("product.code"));
-        if (value == null) {
+  }
-            attributes.remove(value);
+
-        } else {
+  public String printName() {
-            attributes.setProperty("product.attsetdesc", value);
+    return StringUtils.encodeXML(attributes.getProperty("product.name"));
-        }
+  }
-    }
+
-    public void setTicketUpdated(String key, String value){
+  public String printProductMemoDate() {
-        attributes.setProperty("ticket.updated",value);
+    return StringUtils.encodeXML(attributes.getProperty("product.memodate"));
-    }
+  }
-    public void setProductPrinter(String value) {
+
-        if (value == null) {
+  public String printPrice() {
-            attributes.remove(value);
+    return Formats.CURRENCY.formatValue(getPrice());
-        } else {
+  }
-            attributes.setProperty("product.printer", value);
+
-        }
+  public String printPriceTax() {
-    }    
+    return Formats.CURRENCY.formatValue(getPriceTax());
-    
+  }
-    /**
+
-     *
+  public String printMultiply() {
-     * @return
+    return Formats.DOUBLE.formatValue(multiply);
-     */
+  }
-    // Print to actual ${ticketline
+
-    public String printReference() {
+  public String printValue() {
-        return StringUtils.encodeXML(attributes.getProperty("product.reference"));
+    return Formats.CURRENCY.formatValue(getValue());
-    }
+  }
-    public String printCode() {
+
-        return StringUtils.encodeXML(attributes.getProperty("product.code"));
+  public String printTaxRate() {
-    }
+    return Formats.PERCENT.formatValue(getTaxRate());
-    public String printName() {
+  }
-        return StringUtils.encodeXML(attributes.getProperty("product.name"));
+
-    }
+  public String printSubValue() {
-    public String printProductMemoDate() {
+    return Formats.CURRENCY.formatValue(getSubValue());
-        return StringUtils.encodeXML(attributes.getProperty("product.memodate"));
+  }
-    }         
+
-    public String printPrice() {
+  public String printTax() {
-        return Formats.CURRENCY.formatValue(getPrice());
+    return Formats.CURRENCY.formatValue(getTax());
-    }
+  }
-    public String printPriceTax() {
+
-        return Formats.CURRENCY.formatValue(getPriceTax());
+  public String printTextTip() {
-    }
+    return attributes.getProperty("product.texttip");
-    public String printMultiply() {
+  }
-        return Formats.DOUBLE.formatValue(multiply);
+
-    }
+  public String printPrinter() {
-    public String printValue() {
+    return StringUtils.encodeXML(attributes.getProperty("product.printer"));
-        return Formats.CURRENCY.formatValue(getValue());
+  }
-    }
+
-    public String printTaxRate() {
+  public boolean isProductCom() {
-        return Formats.PERCENT.formatValue(getTaxRate());
+    return "true".equals(attributes.getProperty("product.com"));
-    }
+  }
-    public String printSubValue() {
+
-        return Formats.CURRENCY.formatValue(getSubValue());
+  public boolean isProductService() {
-    }
+    return "true".equals(attributes.getProperty("product.service"));
-    public String printTax() {
+  }
-        return Formats.CURRENCY.formatValue(getTax());
+
-    }
+  public boolean isProductVprice() {
-    public String printTextTip() {
+    return "true".equals(attributes.getProperty("product.vprice"));
-	return attributes.getProperty("product.texttip");
+  }
-    }
+
-    public String printPrinter() {
+  public boolean isProductVerpatrib() {
-        return StringUtils.encodeXML(attributes.getProperty("product.printer"));
+    return "true".equals(attributes.getProperty("product.verpatrib"));
-    }      
+  }
-    public boolean isProductCom() {
+
-       return "true".equals(attributes.getProperty("product.com"));
+  public boolean isProductWarranty() {
-    }
+    return "true".equals(attributes.getProperty("product.warranty"));
-    public boolean isProductService() {
+  }
-	return "true".equals(attributes.getProperty("product.service"));
+
-    }
+  public boolean getUpdated() {
-    public boolean isProductVprice() {
+    return "true".equals(attributes.getProperty("ticket.updated"));
-	return "true".equals(attributes.getProperty("product.vprice"));
+  }
-    }
+
-    public boolean isProductVerpatrib() {
+  public void setUpdated(Boolean value) {
-	return "true".equals(attributes.getProperty("product.verpatrib"));
+    updated = value;
-    }
+  }
-    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;
-    }
-   
-}