unicenta-base/unicenta-opos
3
1
Fork 0
Code Issues 10 Pull Requests Actions Packages Projects 1 Releases 1 Wiki Activity

Compare commits

merge into: unicenta-base/unicenta-opos:UOCL-315-efr
Branches Tags
unicenta-base/unicenta-opos:main unicenta-base/unicenta-opos:5.5.0-development unicenta-base/unicenta-opos:debugging unicenta-base/unicenta-opos:UOCL-315-efr-attempt-2 unicenta-base/unicenta-opos:UOCL-315-efr unicenta-base/unicenta-opos:5.x-web unicenta-base/unicenta-opos:5.3.2 unicenta-base/unicenta-opos:java-17 unicenta-base/unicenta-opos:order-api unicenta-base/unicenta-opos:teya-integration unicenta-base/unicenta-opos:customer-api
unicenta-base/unicenta-opos:5.4.0-web unicenta-base/unicenta-opos:5.4.0 unicenta-base/unicenta-opos:5.3 unicenta-base/unicenta-opos:5.2 unicenta-base/unicenta-opos:5.0.1 unicenta-base/unicenta-opos:5.0
..
pull from: unicenta-base/unicenta-opos:debugging
Branches Tags
unicenta-base/unicenta-opos:main unicenta-base/unicenta-opos:5.5.0-development unicenta-base/unicenta-opos:debugging unicenta-base/unicenta-opos:UOCL-315-efr-attempt-2 unicenta-base/unicenta-opos:UOCL-315-efr unicenta-base/unicenta-opos:5.x-web unicenta-base/unicenta-opos:5.3.2 unicenta-base/unicenta-opos:java-17 unicenta-base/unicenta-opos:order-api unicenta-base/unicenta-opos:teya-integration unicenta-base/unicenta-opos:customer-api
unicenta-base/unicenta-opos:5.4.0-web unicenta-base/unicenta-opos:5.4.0 unicenta-base/unicenta-opos:5.3 unicenta-base/unicenta-opos:5.2 unicenta-base/unicenta-opos:5.0.1 unicenta-base/unicenta-opos:5.0

2 Commits
UOCL-315-efr .. debugging

Author SHA1 Message Date
hugh 94d587705c formating 2026-04-14 21:26:50 +01:00
hugh aa6c87ab90 don't need to track these 2026-04-13 21:13:08 +01:00
13 changed files with 6956 additions and 6704 deletions
Expand all files Collapse all files
.gitignore
+1 -1
View File
@@ -7,7 +7,7 @@ nbactions.xml
*.log *.log
docker.sock docker.sock
.DS_Store .DS_Store
.settings/
.classpath .classpath
.factorypath .factorypath
.settings/
.project .project
pom.xml
+2 -2
View File
@@ -8,8 +8,8 @@
<packaging>jar</packaging> <packaging>jar</packaging>
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>11</maven.compiler.source> <maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target> <maven.compiler.target>1.8</maven.compiler.target>
<derby.version>10.14.2.0</derby.version> <derby.version>10.14.2.0</derby.version>
</properties> </properties>
<dependencies> <dependencies>
src/main/java/com/unicenta/pos/admin/PeopleView.form
+121 -19
View File
@@ -19,10 +19,93 @@
<AuxValue name="FormSettings_listenerGenerationStyle" type="java.lang.Integer" value="0"/> <AuxValue name="FormSettings_listenerGenerationStyle" type="java.lang.Integer" value="0"/>
<AuxValue name="FormSettings_variablesLocal" type="java.lang.Boolean" value="false"/> <AuxValue name="FormSettings_variablesLocal" type="java.lang.Boolean" value="false"/>
<AuxValue name="FormSettings_variablesModifier" type="java.lang.Integer" value="2"/> <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> </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> <SubComponents>
<Component class="javax.swing.JLabel" name="nameLabel"> <Component class="javax.swing.JLabel" name="jLabel1">
<Properties> <Properties>
<Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor"> <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
<Font name="Arial" size="14" style="0"/> <Font name="Arial" size="14" style="0"/>
@@ -38,10 +121,10 @@
</Property> </Property>
</Properties> </Properties>
<Events> <Events>
<EventHandler event="mouseClicked" listener="java.awt.event.MouseListener" parameters="java.awt.event.MouseEvent" handler="nameLabelMouseClicked"/> <EventHandler event="mouseClicked" listener="java.awt.event.MouseListener" parameters="java.awt.event.MouseEvent" handler="jLabel1MouseClicked"/>
</Events> </Events>
</Component> </Component>
<Component class="javax.swing.JTextField" name="nameTextField"> <Component class="javax.swing.JTextField" name="m_jName">
<Properties> <Properties>
<Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor"> <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
<Font name="Arial" size="14" style="0"/> <Font name="Arial" size="14" style="0"/>
@@ -51,7 +134,7 @@
</Property> </Property>
</Properties> </Properties>
</Component> </Component>
<Component class="javax.swing.JCheckBox" name="isVisible"> <Component class="javax.swing.JCheckBox" name="m_jVisible">
<Properties> <Properties>
<Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor"> <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
<Font name="Arial" size="12" style="0"/> <Font name="Arial" size="12" style="0"/>
@@ -61,7 +144,7 @@
</Property> </Property>
</Properties> </Properties>
</Component> </Component>
<Component class="javax.swing.JLabel" name="visiableLabel"> <Component class="javax.swing.JLabel" name="jLabel3">
<Properties> <Properties>
<Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor"> <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
<Font name="Arial" size="14" style="0"/> <Font name="Arial" size="14" style="0"/>
@@ -74,7 +157,7 @@
</Property> </Property>
</Properties> </Properties>
</Component> </Component>
<Component class="javax.swing.JLabel" name="imageLabel"> <Component class="javax.swing.JLabel" name="jLabel4">
<Properties> <Properties>
<Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor"> <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
<Font name="Arial" size="14" style="0"/> <Font name="Arial" size="14" style="0"/>
@@ -87,7 +170,7 @@
</Property> </Property>
</Properties> </Properties>
</Component> </Component>
<Component class="com.unicenta.data.gui.JImageEditor" name="imageEditor"> <Component class="com.unicenta.data.gui.JImageEditor" name="m_jImage">
<Properties> <Properties>
<Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor"> <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
<Font name="Arial" size="12" style="0"/> <Font name="Arial" size="12" style="0"/>
@@ -127,7 +210,7 @@
</Property> </Property>
</Properties> </Properties>
</Component> </Component>
<Component class="javax.swing.JLabel" name="roleLabel"> <Component class="javax.swing.JLabel" name="jLabel2">
<Properties> <Properties>
<Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor"> <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
<Font name="Arial" size="14" style="0"/> <Font name="Arial" size="14" style="0"/>
@@ -140,7 +223,7 @@
</Property> </Property>
</Properties> </Properties>
</Component> </Component>
<Component class="javax.swing.JTextField" name="cardIdTextField"> <Component class="javax.swing.JTextField" name="m_jcard">
<Properties> <Properties>
<Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor"> <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
<Font name="Arial" size="14" style="0"/> <Font name="Arial" size="14" style="0"/>
@@ -150,7 +233,7 @@
</Property> </Property>
</Properties> </Properties>
</Component> </Component>
<Component class="javax.swing.JLabel" name="cardIdLabel"> <Component class="javax.swing.JLabel" name="jLblCardID">
<Properties> <Properties>
<Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor"> <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
<Font name="Arial" size="14" style="0"/> <Font name="Arial" size="14" style="0"/>
@@ -163,7 +246,33 @@
</Property> </Property>
</Properties> </Properties>
</Component> </Component>
<Component class="javax.swing.JLabel" name="passwordLabel"> <Component class="com.alee.laf.combobox.WebComboBox" name="webCBSecurity">
<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> <Properties>
<Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor"> <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
<Font name="Arial" size="14" style="0"/> <Font name="Arial" size="14" style="0"/>
@@ -176,12 +285,5 @@
</Property> </Property>
</Properties> </Properties>
</Component> </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> </SubComponents>
</Form> </Form>
src/main/java/com/unicenta/pos/admin/PeopleView.java
+194 -136
View File
@@ -52,12 +52,9 @@ public class PeopleView extends JPanel implements EditorRecord {
private final ComboBoxValModel m_ReasonModel; private final ComboBoxValModel m_ReasonModel;
/** /** Creates new form PeopleEditor
* Creates new form PeopleEditor
*
* @param dlAdmin * @param dlAdmin
* @param dirty * @param dirty */
*/
public PeopleView(DataLogicAdmin dlAdmin, DirtyManager dirty) { public PeopleView(DataLogicAdmin dlAdmin, DirtyManager dirty) {
initComponents(); initComponents();
@@ -67,11 +64,11 @@ public class PeopleView extends JPanel implements EditorRecord {
m_RoleModel = new ComboBoxValModel(); m_RoleModel = new ComboBoxValModel();
m_Dirty = dirty; m_Dirty = dirty;
nameTextField.getDocument().addDocumentListener(dirty); m_jName.getDocument().addDocumentListener(dirty);
m_jRole.addActionListener(dirty); m_jRole.addActionListener(dirty);
isVisible.addActionListener(dirty); m_jVisible.addActionListener(dirty);
imageEditor.addPropertyChangeListener("image", dirty); m_jImage.addPropertyChangeListener("image", dirty);
cardIdTextField.getDocument().addDocumentListener(dirty); m_jcard.getDocument().addDocumentListener(dirty);
m_ReasonModel = new ComboBoxValModel(); m_ReasonModel = new ComboBoxValModel();
m_ReasonModel.add(AppLocal.getIntString("cboption.generate")); m_ReasonModel.add(AppLocal.getIntString("cboption.generate"));
@@ -89,17 +86,17 @@ public class PeopleView extends JPanel implements EditorRecord {
@Override @Override
public void writeValueEOF() { public void writeValueEOF() {
m_oId = null; m_oId = null;
nameTextField.setText(null); m_jName.setText(null);
m_sPassword = null; m_sPassword = null;
m_RoleModel.setSelectedKey(null); m_RoleModel.setSelectedKey(null);
isVisible.setSelected(false); m_jVisible.setSelected(false);
cardIdTextField.setText(null); m_jcard.setText(null);
imageEditor.setImage(null); m_jImage.setImage(null);
nameTextField.setEnabled(false); m_jName.setEnabled(false);
m_jRole.setEnabled(false); m_jRole.setEnabled(false);
isVisible.setEnabled(false); m_jVisible.setEnabled(false);
cardIdTextField.setEnabled(false); m_jcard.setEnabled(false);
imageEditor.setEnabled(false); m_jImage.setEnabled(false);
jButton1.setEnabled(false); jButton1.setEnabled(false);
webCBSecurity.setEnabled(false); webCBSecurity.setEnabled(false);
} }
@@ -110,17 +107,17 @@ public class PeopleView extends JPanel implements EditorRecord {
@Override @Override
public void writeValueInsert() { public void writeValueInsert() {
m_oId = null; m_oId = null;
nameTextField.setText(null); m_jName.setText(null);
m_sPassword = null; m_sPassword = null;
m_RoleModel.setSelectedKey(null); m_RoleModel.setSelectedKey(null);
isVisible.setSelected(true); m_jVisible.setSelected(true);
cardIdTextField.setText(null); m_jcard.setText(null);
imageEditor.setImage(null); m_jImage.setImage(null);
nameTextField.setEnabled(true); m_jName.setEnabled(true);
m_jRole.setEnabled(true); m_jRole.setEnabled(true);
isVisible.setEnabled(true); m_jVisible.setEnabled(true);
cardIdTextField.setEnabled(true); m_jcard.setEnabled(true);
imageEditor.setEnabled(true); m_jImage.setEnabled(true);
jButton1.setEnabled(true); jButton1.setEnabled(true);
webCBSecurity.setEnabled(true); webCBSecurity.setEnabled(true);
} }
@@ -133,18 +130,18 @@ public class PeopleView extends JPanel implements EditorRecord {
public void writeValueDelete(Object value) { public void writeValueDelete(Object value) {
Object[] people = (Object[]) value; Object[] people = (Object[]) value;
m_oId = people[0]; m_oId = people[0];
nameTextField.setText(Formats.STRING.formatValue(people[1])); m_jName.setText(Formats.STRING.formatValue(people[1]));
m_sPassword = Formats.STRING.formatValue(people[2]); m_sPassword = Formats.STRING.formatValue(people[2]);
m_RoleModel.setSelectedKey(people[3]); m_RoleModel.setSelectedKey(people[3]);
isVisible.setSelected(((Boolean) people[4]).booleanValue()); m_jVisible.setSelected(((Boolean) people[4]).booleanValue());
cardIdTextField.setText(Formats.STRING.formatValue(people[5])); m_jcard.setText(Formats.STRING.formatValue(people[5]));
imageEditor.setImage((BufferedImage) people[6]); m_jImage.setImage((BufferedImage) people[6]);
nameTextField.setEnabled(false); m_jName.setEnabled(false);
m_jRole.setEnabled(false); m_jRole.setEnabled(false);
isVisible.setEnabled(false); m_jVisible.setEnabled(false);
cardIdTextField.setEnabled(false); m_jcard.setEnabled(false);
imageEditor.setEnabled(false); m_jImage.setEnabled(false);
jButton1.setEnabled(false); jButton1.setEnabled(false);
webCBSecurity.setEnabled(false); webCBSecurity.setEnabled(false);
} }
@@ -157,25 +154,25 @@ public class PeopleView extends JPanel implements EditorRecord {
public void writeValueEdit(Object value) { public void writeValueEdit(Object value) {
Object[] people = (Object[]) value; Object[] people = (Object[]) value;
m_oId = people[0]; m_oId = people[0];
nameTextField.setText(Formats.STRING.formatValue(people[1])); m_jName.setText(Formats.STRING.formatValue(people[1]));
m_sPassword = Formats.STRING.formatValue(people[2]); m_sPassword = Formats.STRING.formatValue(people[2]);
m_RoleModel.setSelectedKey(people[3]); m_RoleModel.setSelectedKey(people[3]);
isVisible.setSelected(((Boolean) people[4]).booleanValue()); m_jVisible.setSelected(((Boolean) people[4]).booleanValue());
cardIdTextField.setText(Formats.STRING.formatValue(people[5])); m_jcard.setText(Formats.STRING.formatValue(people[5]));
imageEditor.setImage((BufferedImage) people[6]); m_jImage.setImage((BufferedImage) people[6]);
if (cardIdTextField.getText().length() == 16) { if (m_jcard.getText().length() == 16) {
cardIdLabel.setText(AppLocal.getIntString("label.ibutton")); jLblCardID.setText(AppLocal.getIntString("label.ibutton"));
} else { } else {
cardIdLabel.setText(AppLocal.getIntString("label.card")); jLblCardID.setText(AppLocal.getIntString("label.card"));
} }
System.out.println(cardIdTextField.getText().length()); System.out.println(m_jcard.getText().length());
nameTextField.setEnabled(true); m_jName.setEnabled(true);
m_jRole.setEnabled(true); m_jRole.setEnabled(true);
isVisible.setEnabled(true); m_jVisible.setEnabled(true);
cardIdTextField.setEnabled(true); m_jcard.setEnabled(true);
imageEditor.setEnabled(true); m_jImage.setEnabled(true);
jButton1.setEnabled(true); jButton1.setEnabled(true);
webCBSecurity.setEnabled(true); webCBSecurity.setEnabled(true);
} }
@@ -189,12 +186,12 @@ public class PeopleView extends JPanel implements EditorRecord {
public Object createValue() throws BasicException { public Object createValue() throws BasicException {
Object[] people = new Object[7]; Object[] people = new Object[7];
people[0] = m_oId == null ? UUID.randomUUID().toString() : m_oId; people[0] = m_oId == null ? UUID.randomUUID().toString() : m_oId;
people[1] = Formats.STRING.parseValue(nameTextField.getText()); people[1] = Formats.STRING.parseValue(m_jName.getText());
people[2] = Formats.STRING.parseValue(m_sPassword); people[2] = Formats.STRING.parseValue(m_sPassword);
people[3] = m_RoleModel.getSelectedKey(); people[3] = m_RoleModel.getSelectedKey();
people[4] = isVisible.isSelected(); people[4] = m_jVisible.isSelected();
people[5] = Formats.STRING.parseValue(cardIdTextField.getText()); people[5] = Formats.STRING.parseValue(m_jcard.getText());
people[6] = imageEditor.getImage(); people[6] = m_jImage.getImage();
return people; return people;
} }
@@ -217,6 +214,7 @@ public class PeopleView extends JPanel implements EditorRecord {
m_jRole.setModel(m_RoleModel); m_jRole.setModel(m_RoleModel);
} }
/** /**
* *
*/ */
@@ -224,66 +222,57 @@ public class PeopleView extends JPanel implements EditorRecord {
public void refresh() { public void refresh() {
} }
/** /** This method is called from within the constructor to
* This method is called from within the constructor to
* initialize the form. * initialize the form.
* WARNING: Do NOT modify this code. The content of this method is * WARNING: Do NOT modify this code. The content of this method is
* always regenerated by the Form Editor. * always regenerated by the Form Editor.
*/ */
// <editor-fold defaultstate="collapsed" desc="Generated // <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents
// Code">//GEN-BEGIN:initComponents
private void initComponents() { private void initComponents() {
nameLabel = new javax.swing.JLabel(); jLabel1 = new javax.swing.JLabel();
nameTextField = new javax.swing.JTextField(); m_jName = new javax.swing.JTextField();
isVisible = new javax.swing.JCheckBox(); m_jVisible = new javax.swing.JCheckBox();
visiableLabel = new javax.swing.JLabel(); jLabel3 = new javax.swing.JLabel();
imageLabel = new javax.swing.JLabel(); jLabel4 = new javax.swing.JLabel();
imageEditor = new com.unicenta.data.gui.JImageEditor(); m_jImage = new com.unicenta.data.gui.JImageEditor();
jButton1 = new javax.swing.JButton(); jButton1 = new javax.swing.JButton();
m_jRole = new javax.swing.JComboBox(); m_jRole = new javax.swing.JComboBox();
roleLabel = new javax.swing.JLabel(); jLabel2 = new javax.swing.JLabel();
cardIdTextField = new javax.swing.JTextField(); m_jcard = new javax.swing.JTextField();
cardIdLabel = new javax.swing.JLabel(); jLblCardID = new javax.swing.JLabel();
passwordLabel = new javax.swing.JLabel(); webCBSecurity = new com.alee.laf.combobox.WebComboBox();
taxIdLabel = new javax.swing.JLabel(); jLabel6 = new javax.swing.JLabel();
taxIdTextField = new javax.swing.JTextField();
setFont(new java.awt.Font("Arial", 0, 12)); // NOI18N setFont(new java.awt.Font("Arial", 0, 12)); // NOI18N
setPreferredSize(new java.awt.Dimension(500, 500)); setPreferredSize(new java.awt.Dimension(500, 500));
nameLabel.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N jLabel1.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
nameLabel.setIcon(new javax.swing.ImageIcon(getClass().getResource("/com/unicenta/images/info.png"))); // NOI18N jLabel1.setIcon(new javax.swing.ImageIcon(getClass().getResource("/com/unicenta/images/info.png"))); // NOI18N
nameLabel.setText(AppLocal.getIntString("label.peoplenamem")); // NOI18N jLabel1.setText(AppLocal.getIntString("label.peoplenamem")); // NOI18N
nameLabel.setPreferredSize(new java.awt.Dimension(110, 30)); jLabel1.setPreferredSize(new java.awt.Dimension(110, 30));
nameLabel.addMouseListener(new java.awt.event.MouseAdapter() { jLabel1.addMouseListener(new java.awt.event.MouseAdapter() {
public void mouseClicked(java.awt.event.MouseEvent evt) { public void mouseClicked(java.awt.event.MouseEvent evt) {
nameLabelMouseClicked(evt); jLabel1MouseClicked(evt);
} }
}); });
add(nameLabel);
nameTextField.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N m_jName.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
nameTextField.setPreferredSize(new java.awt.Dimension(0, 30)); m_jName.setPreferredSize(new java.awt.Dimension(0, 30));
add(nameTextField);
isVisible.setFont(new java.awt.Font("Arial", 0, 12)); // NOI18N m_jVisible.setFont(new java.awt.Font("Arial", 0, 12)); // NOI18N
isVisible.setPreferredSize(new java.awt.Dimension(0, 30)); m_jVisible.setPreferredSize(new java.awt.Dimension(0, 30));
add(isVisible);
visiableLabel.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N jLabel3.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
visiableLabel.setText(AppLocal.getIntString("label.peoplevisible")); // NOI18N jLabel3.setText(AppLocal.getIntString("label.peoplevisible")); // NOI18N
visiableLabel.setPreferredSize(new java.awt.Dimension(110, 30)); jLabel3.setPreferredSize(new java.awt.Dimension(110, 30));
add(visiableLabel);
imageLabel.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N jLabel4.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
imageLabel.setText(AppLocal.getIntString("label.peopleimage")); // NOI18N jLabel4.setText(AppLocal.getIntString("label.peopleimage")); // NOI18N
imageLabel.setPreferredSize(new java.awt.Dimension(110, 30)); jLabel4.setPreferredSize(new java.awt.Dimension(110, 30));
add(imageLabel);
imageEditor.setFont(new java.awt.Font("Arial", 0, 12)); // NOI18N m_jImage.setFont(new java.awt.Font("Arial", 0, 12)); // NOI18N
imageEditor.setPreferredSize(new java.awt.Dimension(300, 250)); m_jImage.setPreferredSize(new java.awt.Dimension(300, 250));
add(imageEditor);
jButton1.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N 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.setIcon(new javax.swing.ImageIcon(getClass().getResource("/com/unicenta/images/password.png"))); // NOI18N
@@ -295,37 +284,104 @@ public class PeopleView extends JPanel implements EditorRecord {
jButton1ActionPerformed(evt); jButton1ActionPerformed(evt);
} }
}); });
add(jButton1);
m_jRole.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N m_jRole.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
m_jRole.setPreferredSize(new java.awt.Dimension(0, 30)); m_jRole.setPreferredSize(new java.awt.Dimension(0, 30));
add(m_jRole);
roleLabel.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N jLabel2.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
roleLabel.setText(AppLocal.getIntString("label.rolem")); // NOI18N jLabel2.setText(AppLocal.getIntString("label.rolem")); // NOI18N
roleLabel.setPreferredSize(new java.awt.Dimension(110, 30)); jLabel2.setPreferredSize(new java.awt.Dimension(110, 30));
add(roleLabel);
cardIdTextField.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N m_jcard.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
cardIdTextField.setPreferredSize(new java.awt.Dimension(0, 30)); m_jcard.setPreferredSize(new java.awt.Dimension(0, 30));
add(cardIdTextField);
cardIdLabel.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N jLblCardID.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
cardIdLabel.setText(AppLocal.getIntString("label.card")); // NOI18N jLblCardID.setText(AppLocal.getIntString("label.card")); // NOI18N
cardIdLabel.setPreferredSize(new java.awt.Dimension(110, 30)); jLblCardID.setPreferredSize(new java.awt.Dimension(110, 30));
add(cardIdLabel);
passwordLabel.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N webCBSecurity.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "Generate new key", "Delete exisitng key", "Use iButton ID" }));
passwordLabel.setText(AppLocal.getIntString("label.Password")); // NOI18N webCBSecurity.setSelectedIndex(0);
passwordLabel.setPreferredSize(new java.awt.Dimension(110, 30)); webCBSecurity.setToolTipText(AppLocal.getIntString("tooltip.peoplesecurity")); // NOI18N
add(passwordLabel); 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);
}
});
taxIdLabel.setText("Tax ID"); jLabel6.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
add(taxIdLabel); jLabel6.setText(AppLocal.getIntString("label.Password")); // NOI18N
add(taxIdTextField); 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 }// </editor-fold>//GEN-END:initComponents
private void jButton1ActionPerformed(java.awt.event.ActionEvent evt) {// GEN-FIRST:event_jButton1ActionPerformed private void jButton1ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jButton1ActionPerformed
String sNewPassword = Hashcypher.changePassword(this); String sNewPassword = Hashcypher.changePassword(this);
if (sNewPassword != null) { if (sNewPassword != null) {
@@ -333,33 +389,36 @@ public class PeopleView extends JPanel implements EditorRecord {
m_Dirty.setDirty(true); m_Dirty.setDirty(true);
} }
}// GEN-LAST:event_jButton1ActionPerformed }//GEN-LAST:event_jButton1ActionPerformed
private void webCBSecurityActionPerformed(java.awt.event.ActionEvent evt) {// GEN-FIRST:event_webCBSecurityActionPerformed private void webCBSecurityActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_webCBSecurityActionPerformed
if (webCBSecurity.getSelectedIndex() == 0) {
if(webCBSecurity.getSelectedIndex() == 0){
if (JOptionPane.showConfirmDialog(this, if (JOptionPane.showConfirmDialog(this,
AppLocal.getIntString("message.cardnew"), AppLocal.getIntString("message.cardnew"),
AppLocal.getIntString("title.editor"), AppLocal.getIntString("title.editor"),
JOptionPane.YES_NO_OPTION, JOptionPane.YES_NO_OPTION,
JOptionPane.QUESTION_MESSAGE) == JOptionPane.YES_OPTION) { JOptionPane.QUESTION_MESSAGE) == JOptionPane.YES_OPTION)
cardIdTextField.setText("C" + StringUtils.getCardNumber()); {
m_jcard.setText("C" + StringUtils.getCardNumber());
m_Dirty.setDirty(true); m_Dirty.setDirty(true);
} }
} }
if (webCBSecurity.getSelectedIndex() == 1) { if(webCBSecurity.getSelectedIndex() == 1){
if (JOptionPane.showConfirmDialog(this, if (JOptionPane.showConfirmDialog(this,
AppLocal.getIntString("message.cardremove"), AppLocal.getIntString("message.cardremove"),
AppLocal.getIntString("title.editor"), AppLocal.getIntString("title.editor"),
JOptionPane.YES_NO_OPTION, JOptionPane.YES_NO_OPTION,
JOptionPane.QUESTION_MESSAGE) == JOptionPane.YES_OPTION) { JOptionPane.QUESTION_MESSAGE) == JOptionPane.YES_OPTION)
cardIdTextField.setText(null); {
m_jcard.setText(null);
m_Dirty.setDirty(true); m_Dirty.setDirty(true);
} }
} }
if (webCBSecurity.getSelectedIndex() == 2) { if(webCBSecurity.getSelectedIndex() == 2){
if (JOptionPane.showConfirmDialog(this, if (JOptionPane.showConfirmDialog(this,
AppLocal.getIntString("message.ibuttonassign"), AppLocal.getIntString("message.ibuttonassign"),
AppLocal.getIntString("title.editor"), AppLocal.getIntString("title.editor"),
@@ -367,16 +426,16 @@ public class PeopleView extends JPanel implements EditorRecord {
JOptionPane.INFORMATION_MESSAGE) == JOptionPane.OK_OPTION) JOptionPane.INFORMATION_MESSAGE) == JOptionPane.OK_OPTION)
{ {
cardIdTextField.setText(uOWWatch.getibuttonid()); m_jcard.setText( uOWWatch.getibuttonid() );
cardIdLabel.setText(AppLocal.getIntString("label.ibutton")); jLblCardID.setText(AppLocal.getIntString("label.ibutton"));
m_Dirty.setDirty(true); m_Dirty.setDirty(true);
} }
} }
}// GEN-LAST:event_webCBSecurityActionPerformed }//GEN-LAST:event_webCBSecurityActionPerformed
private void nameLabelMouseClicked(java.awt.event.MouseEvent evt) {// GEN-FIRST:event_nameLabelMouseClicked private void jLabel1MouseClicked(java.awt.event.MouseEvent evt) {//GEN-FIRST:event_jLabel1MouseClicked
if (evt.getClickCount() == 2) { if (evt.getClickCount() == 2) {
String uuidString = m_oId.toString(); String uuidString = m_oId.toString();
StringSelection stringSelection = new StringSelection(uuidString); StringSelection stringSelection = new StringSelection(uuidString);
@@ -386,23 +445,22 @@ public class PeopleView extends JPanel implements EditorRecord {
JOptionPane.showMessageDialog(null, JOptionPane.showMessageDialog(null,
AppLocal.getIntString("message.uuidcopy")); AppLocal.getIntString("message.uuidcopy"));
} }
}// GEN-LAST:event_nameLabelMouseClicked }//GEN-LAST:event_jLabel1MouseClicked
// Variables declaration - do not modify//GEN-BEGIN:variables // Variables declaration - do not modify//GEN-BEGIN:variables
private javax.swing.JLabel cardIdLabel;
private javax.swing.JTextField cardIdTextField;
private com.unicenta.data.gui.JImageEditor imageEditor;
private javax.swing.JLabel imageLabel;
private javax.swing.JCheckBox isVisible;
private javax.swing.JButton jButton1; private javax.swing.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.JComboBox m_jRole;
private javax.swing.JLabel nameLabel; private javax.swing.JCheckBox m_jVisible;
private javax.swing.JTextField nameTextField; private javax.swing.JTextField m_jcard;
private javax.swing.JLabel passwordLabel;
private javax.swing.JLabel roleLabel;
private javax.swing.JLabel taxIdLabel;
private javax.swing.JTextField taxIdTextField;
private javax.swing.JLabel visiableLabel;
private com.alee.laf.combobox.WebComboBox webCBSecurity; private com.alee.laf.combobox.WebComboBox webCBSecurity;
// End of variables declaration//GEN-END:variables // End of variables declaration//GEN-END:variables
src/main/java/com/unicenta/pos/customers/CustomersPayment.java
+60 -97
View File
@@ -174,8 +174,7 @@ public class CustomersPayment extends javax.swing.JPanel implements JPanelView,
btnPay.setEnabled(true); btnPay.setEnabled(true);
btnPrePay.setEnabled(true); btnPrePay.setEnabled(true);
// btnPay.setEnabled(customer.getCurdebt() != null && // btnPay.setEnabled(customer.getCurdebt() != null && customer.getCurdebt().doubleValue() > 0.0);
// customer.getCurdebt().doubleValue() > 0.0);
} }
@@ -250,22 +249,20 @@ public class CustomersPayment extends javax.swing.JPanel implements JPanelView,
script.put("ticket", ticket); script.put("ticket", ticket);
script.put("customer", customer); script.put("customer", customer);
ttp.printTicket(script.eval(resource).toString()); ttp.printTicket(script.eval(resource).toString());
// JG 6 May use multicatch // JG 6 May use multicatch
} catch (ScriptException | TicketPrinterException e) { } catch ( ScriptException | TicketPrinterException e) {
MessageInf msg = new MessageInf(MessageInf.SGN_WARNING, AppLocal.getIntString("message.cannotprintticket"), e); MessageInf msg = new MessageInf(MessageInf.SGN_WARNING, AppLocal.getIntString("message.cannotprintticket"), e);
msg.show(this); msg.show(this);
} }
} }
} }
/** /** This method is called from within the constructor to
* This method is called from within the constructor to
* initialize the form. * initialize the form.
* WARNING: Do NOT modify this code. The content of this method is * WARNING: Do NOT modify this code. The content of this method is
* always regenerated by the Form Editor. * always regenerated by the Form Editor.
*/ */
// <editor-fold defaultstate="collapsed" desc="Generated // <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents
// Code">//GEN-BEGIN:initComponents
private void initComponents() { private void initComponents() {
java.awt.GridBagConstraints gridBagConstraints; java.awt.GridBagConstraints gridBagConstraints;
@@ -513,124 +510,93 @@ public class CustomersPayment extends javax.swing.JPanel implements JPanelView,
.addContainerGap() .addContainerGap()
.addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(jPanel1Layout.createSequentialGroup() .addGroup(jPanel1Layout.createSequentialGroup()
.addComponent(jLabel3, javax.swing.GroupLayout.PREFERRED_SIZE, 140, .addComponent(jLabel3, javax.swing.GroupLayout.PREFERRED_SIZE, 140, javax.swing.GroupLayout.PREFERRED_SIZE)
javax.swing.GroupLayout.PREFERRED_SIZE)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
.addComponent(txtName, javax.swing.GroupLayout.PREFERRED_SIZE, 240, .addComponent(txtName, javax.swing.GroupLayout.PREFERRED_SIZE, 240, javax.swing.GroupLayout.PREFERRED_SIZE))
javax.swing.GroupLayout.PREFERRED_SIZE))
.addGroup(jPanel1Layout.createSequentialGroup() .addGroup(jPanel1Layout.createSequentialGroup()
.addComponent(jLabel5, javax.swing.GroupLayout.PREFERRED_SIZE, 140, .addComponent(jLabel5, javax.swing.GroupLayout.PREFERRED_SIZE, 140, javax.swing.GroupLayout.PREFERRED_SIZE)
javax.swing.GroupLayout.PREFERRED_SIZE)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
.addComponent(txtCard, javax.swing.GroupLayout.PREFERRED_SIZE, 240, .addComponent(txtCard, javax.swing.GroupLayout.PREFERRED_SIZE, 240, javax.swing.GroupLayout.PREFERRED_SIZE))
javax.swing.GroupLayout.PREFERRED_SIZE))
.addGroup(jPanel1Layout.createSequentialGroup() .addGroup(jPanel1Layout.createSequentialGroup()
.addComponent(jLabel7, javax.swing.GroupLayout.PREFERRED_SIZE, 140, .addComponent(jLabel7, javax.swing.GroupLayout.PREFERRED_SIZE, 140, javax.swing.GroupLayout.PREFERRED_SIZE)
javax.swing.GroupLayout.PREFERRED_SIZE)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
.addComponent(txtTaxId, javax.swing.GroupLayout.PREFERRED_SIZE, 240, .addComponent(txtTaxId, javax.swing.GroupLayout.PREFERRED_SIZE, 240, javax.swing.GroupLayout.PREFERRED_SIZE))
javax.swing.GroupLayout.PREFERRED_SIZE))
.addGroup(jPanel1Layout.createSequentialGroup() .addGroup(jPanel1Layout.createSequentialGroup()
.addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(jLabel12, javax.swing.GroupLayout.PREFERRED_SIZE, 140, .addComponent(jLabel12, javax.swing.GroupLayout.PREFERRED_SIZE, 140, javax.swing.GroupLayout.PREFERRED_SIZE)
javax.swing.GroupLayout.PREFERRED_SIZE) .addComponent(jLabel4, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
.addComponent(jLabel4, javax.swing.GroupLayout.PREFERRED_SIZE,
javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
.addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(txtPrePay, javax.swing.GroupLayout.PREFERRED_SIZE, .addComponent(txtPrePay, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) .addComponent(txtNotes, javax.swing.GroupLayout.PREFERRED_SIZE, 250, javax.swing.GroupLayout.PREFERRED_SIZE)))))
.addComponent(txtNotes, javax.swing.GroupLayout.PREFERRED_SIZE, 250,
javax.swing.GroupLayout.PREFERRED_SIZE)))))
.addGroup(jPanel1Layout.createSequentialGroup() .addGroup(jPanel1Layout.createSequentialGroup()
.addGap(18, 18, 18) .addGap(18, 18, 18)
.addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(jPanel1Layout.createSequentialGroup() .addGroup(jPanel1Layout.createSequentialGroup()
.addComponent(txtMaxdebt, javax.swing.GroupLayout.PREFERRED_SIZE, .addComponent(txtMaxdebt, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(txtCurdebt, javax.swing.GroupLayout.PREFERRED_SIZE, .addComponent(txtCurdebt, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
.addGroup(jPanel1Layout.createSequentialGroup() .addGroup(jPanel1Layout.createSequentialGroup()
.addComponent(jLabel1, javax.swing.GroupLayout.PREFERRED_SIZE, .addComponent(jLabel1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(jLabel2, javax.swing.GroupLayout.PREFERRED_SIZE, .addComponent(jLabel2, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)))
javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)))
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(jLabel6, javax.swing.GroupLayout.PREFERRED_SIZE, .addComponent(jLabel6, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) .addComponent(txtCurdate, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))))
.addComponent(txtCurdate, javax.swing.GroupLayout.PREFERRED_SIZE, .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)))) );
.addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)));
jPanel1Layout.setVerticalGroup( jPanel1Layout.setVerticalGroup(
jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(jPanel1Layout.createSequentialGroup() .addGroup(jPanel1Layout.createSequentialGroup()
.addContainerGap() .addContainerGap()
.addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
.addComponent(jLabel7, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, .addComponent(jLabel7, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
javax.swing.GroupLayout.PREFERRED_SIZE) .addComponent(txtTaxId, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
.addComponent(txtTaxId, javax.swing.GroupLayout.PREFERRED_SIZE,
javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
.addComponent(jLabel3, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, .addComponent(jLabel3, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
javax.swing.GroupLayout.PREFERRED_SIZE) .addComponent(txtName, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
.addComponent(txtName, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE,
javax.swing.GroupLayout.PREFERRED_SIZE))
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
.addComponent(jLabel5, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, .addComponent(jLabel5, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
javax.swing.GroupLayout.PREFERRED_SIZE) .addComponent(txtCard, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
.addComponent(txtCard, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE,
javax.swing.GroupLayout.PREFERRED_SIZE))
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(jLabel12, javax.swing.GroupLayout.PREFERRED_SIZE, .addComponent(jLabel12, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) .addComponent(txtNotes, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
.addComponent(txtNotes, javax.swing.GroupLayout.PREFERRED_SIZE,
javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING) .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING)
.addComponent(jLabel4, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, .addComponent(jLabel4, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
javax.swing.GroupLayout.PREFERRED_SIZE) .addComponent(txtPrePay, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
.addComponent(txtPrePay, javax.swing.GroupLayout.PREFERRED_SIZE,
javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
.addGap(30, 30, 30) .addGap(30, 30, 30)
.addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
.addComponent(jLabel1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, .addComponent(jLabel1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
javax.swing.GroupLayout.PREFERRED_SIZE) .addComponent(jLabel2, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
.addComponent(jLabel2, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, .addComponent(jLabel6, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
javax.swing.GroupLayout.PREFERRED_SIZE)
.addComponent(jLabel6, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE,
javax.swing.GroupLayout.PREFERRED_SIZE))
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
.addComponent(txtCurdebt, javax.swing.GroupLayout.PREFERRED_SIZE, .addComponent(txtCurdebt, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) .addComponent(txtMaxdebt, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
.addComponent(txtMaxdebt, javax.swing.GroupLayout.PREFERRED_SIZE, .addComponent(txtCurdate, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
.addComponent(txtCurdate, javax.swing.GroupLayout.PREFERRED_SIZE, );
javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
.addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)));
add(jPanel1, java.awt.BorderLayout.CENTER); add(jPanel1, java.awt.BorderLayout.CENTER);
}// </editor-fold>//GEN-END:initComponents }// </editor-fold>//GEN-END:initComponents
private void jButton1ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jButton1ActionPerformed
private void jButton1ActionPerformed(java.awt.event.ActionEvent evt) {// GEN-FIRST:event_jButton1ActionPerformed
readCustomer(); readCustomer();
}// GEN-LAST:event_jButton1ActionPerformed }//GEN-LAST:event_jButton1ActionPerformed
private void m_jKeysActionPerformed(java.awt.event.ActionEvent evt) {// GEN-FIRST:event_m_jKeysActionPerformed private void m_jKeysActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_m_jKeysActionPerformed
readCustomer(); readCustomer();
}// GEN-LAST:event_m_jKeysActionPerformed }//GEN-LAST:event_m_jKeysActionPerformed
private void btnCustomerActionPerformed(java.awt.event.ActionEvent evt) {// GEN-FIRST:event_btnCustomerActionPerformed private void btnCustomerActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnCustomerActionPerformed
JCustomerFinder finder = JCustomerFinder.getCustomerFinder(this, dlcustomers); JCustomerFinder finder = JCustomerFinder.getCustomerFinder(this, dlcustomers);
finder.search(null); finder.search(null);
@@ -646,17 +612,16 @@ public class CustomersPayment extends javax.swing.JPanel implements JPanelView,
editCustomer(c); editCustomer(c);
} }
} catch (BasicException ex) { } catch (BasicException ex) {
MessageInf msg = new MessageInf(MessageInf.SGN_WARNING, AppLocal.getIntString("message.cannotfindcustomer"), MessageInf msg = new MessageInf(MessageInf.SGN_WARNING, AppLocal.getIntString("message.cannotfindcustomer"), ex);
ex);
msg.show(this); msg.show(this);
} }
} }
editorcard.reset(); editorcard.reset();
editorcard.activate(); editorcard.activate();
}// GEN-LAST:event_btnCustomerActionPerformed }//GEN-LAST:event_btnCustomerActionPerformed
private void btnPayActionPerformed(java.awt.event.ActionEvent evt) {// GEN-FIRST:event_btnPayActionPerformed private void btnPayActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnPayActionPerformed
paymentdialog.setPrintSelected(true); paymentdialog.setPrintSelected(true);
@@ -677,7 +642,7 @@ public class CustomersPayment extends javax.swing.JPanel implements JPanelView,
ticket.setPayments(payments); ticket.setPayments(payments);
ticket.setUserInfo(app.getAppUserView().getUser().getUserInfo()); ticket.setUser(app.getAppUserView().getUser().getUserInfo());
ticket.setActiveCash(app.getActiveCashIndex()); ticket.setActiveCash(app.getActiveCashIndex());
ticket.setDate(new Date()); ticket.setDate(new Date());
ticket.setCustomer(customerext); ticket.setCustomer(customerext);
@@ -689,6 +654,7 @@ public class CustomersPayment extends javax.swing.JPanel implements JPanelView,
msg.show(this); msg.show(this);
} }
// reload customer // reload customer
CustomerInfoExt c; CustomerInfoExt c;
try { try {
@@ -701,8 +667,7 @@ public class CustomersPayment extends javax.swing.JPanel implements JPanelView,
} }
} catch (BasicException ex) { } catch (BasicException ex) {
c = null; c = null;
MessageInf msg = new MessageInf(MessageInf.SGN_WARNING, AppLocal.getIntString("message.cannotfindcustomer"), MessageInf msg = new MessageInf(MessageInf.SGN_WARNING, AppLocal.getIntString("message.cannotfindcustomer"), ex);
ex);
msg.show(this); msg.show(this);
} }
@@ -715,9 +680,9 @@ public class CustomersPayment extends javax.swing.JPanel implements JPanelView,
editorcard.reset(); editorcard.reset();
editorcard.activate(); editorcard.activate();
}// GEN-LAST:event_btnPayActionPerformed }//GEN-LAST:event_btnPayActionPerformed
private void btnSaveActionPerformed(java.awt.event.ActionEvent evt) {// GEN-FIRST:event_btnSaveActionPerformed private void btnSaveActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnSaveActionPerformed
if (dirty.isDirty()) { if (dirty.isDirty()) {
save(); save();
@@ -726,9 +691,9 @@ public class CustomersPayment extends javax.swing.JPanel implements JPanelView,
editorcard.activate(); editorcard.activate();
} }
}// GEN-LAST:event_btnSaveActionPerformed }//GEN-LAST:event_btnSaveActionPerformed
private void btnPrePayActionPerformed(java.awt.event.ActionEvent evt) {// GEN-FIRST:event_btnPrePayActionPerformed private void btnPrePayActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnPrePayActionPerformed
txtPrePay.setFocusable(true); txtPrePay.setFocusable(true);
txtPrePay.requestFocusInWindow(); txtPrePay.requestFocusInWindow();
@@ -755,7 +720,7 @@ public class CustomersPayment extends javax.swing.JPanel implements JPanelView,
ticket.setPayments(payments); ticket.setPayments(payments);
ticket.setUserInfo(app.getAppUserView().getUser().getUserInfo()); ticket.setUser(app.getAppUserView().getUser().getUserInfo());
ticket.setActiveCash(app.getActiveCashIndex()); ticket.setActiveCash(app.getActiveCashIndex());
ticket.setDate(new Date()); ticket.setDate(new Date());
ticket.setCustomer(customerext); ticket.setCustomer(customerext);
@@ -771,16 +736,14 @@ public class CustomersPayment extends javax.swing.JPanel implements JPanelView,
try { try {
c = dlsales.loadCustomerExt(customerext.getId()); c = dlsales.loadCustomerExt(customerext.getId());
if (c == null) { if (c == null) {
MessageInf msg = new MessageInf(MessageInf.SGN_WARNING, MessageInf msg = new MessageInf(MessageInf.SGN_WARNING, AppLocal.getIntString("message.cannotfindcustomer"));
AppLocal.getIntString("message.cannotfindcustomer"));
msg.show(this); msg.show(this);
} else { } else {
editCustomer(c); editCustomer(c);
} }
} catch (BasicException ex) { } catch (BasicException ex) {
c = null; c = null;
MessageInf msg = new MessageInf(MessageInf.SGN_WARNING, AppLocal.getIntString("message.cannotfindcustomer"), MessageInf msg = new MessageInf(MessageInf.SGN_WARNING, AppLocal.getIntString("message.cannotfindcustomer"), ex);
ex);
msg.show(this); msg.show(this);
} }
@@ -793,7 +756,7 @@ public class CustomersPayment extends javax.swing.JPanel implements JPanelView,
editorcard.reset(); editorcard.reset();
editorcard.activate(); editorcard.activate();
} }
}// GEN-LAST:event_btnPrePayActionPerformed }//GEN-LAST:event_btnPrePayActionPerformed
// Variables declaration - do not modify//GEN-BEGIN:variables // Variables declaration - do not modify//GEN-BEGIN:variables
private javax.swing.JButton btnCustomer; private javax.swing.JButton btnCustomer;
src/main/java/com/unicenta/pos/forms/DataLogicSales.java
+543 -395
View File
File diff suppressed because it is too large Load Diff
src/main/java/com/unicenta/pos/sales/DataLogicReceipts.java
+71 -53
View File
@@ -49,7 +49,7 @@ public class DataLogicReceipts extends BeanFactoryDataSingle {
* @param s * @param s
*/ */
@Override @Override
public void init(Session s) { public void init(Session s){
this.s = s; this.s = s;
} }
@@ -64,10 +64,11 @@ public class DataLogicReceipts extends BeanFactoryDataSingle {
if (Id == null) { if (Id == null) {
return null; return null;
} else { } else {
Object[] record = (Object[]) new StaticSentence(s, "SELECT CONTENT, LOCKED FROM sharedtickets WHERE ID = ?", Object[]record = (Object[]) new StaticSentence(s
SerializerWriteString.INSTANCE, new SerializerReadBasic(new Datas[] { , "SELECT CONTENT, LOCKED FROM sharedtickets WHERE ID = ?"
Datas.SERIALIZABLE })) , SerializerWriteString.INSTANCE
.find(Id); , new SerializerReadBasic(new Datas[] {
Datas.SERIALIZABLE})).find(Id);
return record == null ? null : (TicketInfo) record[0]; return record == null ? null : (TicketInfo) record[0];
} }
} }
@@ -83,34 +84,32 @@ public class DataLogicReceipts extends BeanFactoryDataSingle {
if (pickupId == null) { if (pickupId == null) {
return null; return null;
} else { } else {
Object[] record = (Object[]) new StaticSentence(s, "SELECT CONTENT, LOCKED FROM sharedtickets WHERE PICKUPID = ?", Object[]record = (Object[]) new StaticSentence(s
SerializerWriteString.INSTANCE, new SerializerReadBasic(new Datas[] { , "SELECT CONTENT, LOCKED FROM sharedtickets WHERE PICKUPID = ?"
Datas.SERIALIZABLE })) , SerializerWriteString.INSTANCE
.find(pickupId); , new SerializerReadBasic(new Datas[] {
Datas.SERIALIZABLE})).find(pickupId);
return record == null ? null : (TicketInfo) record[0]; return record == null ? null : (TicketInfo) record[0];
} }
} }
/** /**
* JG Dec 14 Administrator and Manager Roles always have access to ALL * JG Dec 14 Administrator and Manager Roles always have access to ALL SHAREDtickets
* SHAREDtickets
*
* @return * @return
* @throws BasicException * @throws BasicException
*/ */
public final List<SharedTicketInfo> getSharedTicketList() throws BasicException { public final List<SharedTicketInfo> getSharedTicketList() throws BasicException {
return (List<SharedTicketInfo>) new StaticSentence(s return (List<SharedTicketInfo>) new StaticSentence(s
// , "SELECT ID, NAME, CONTENT, APPUSER, PICKUPID, LOCKED FROM sharedtickets // , "SELECT ID, NAME, CONTENT, APPUSER, PICKUPID, LOCKED FROM sharedtickets ORDER BY ID"
// ORDER BY ID"
, "SELECT ID, NAME, CONTENT, APPUSER, PICKUPID, LOCKED " , "SELECT ID, NAME, CONTENT, APPUSER, PICKUPID, LOCKED "
+ "FROM sharedtickets ORDER BY PICKUPID", + "FROM sharedtickets ORDER BY PICKUPID"
null, new SerializerReadClass(SharedTicketInfo.class)).list(); , null
, new SerializerReadClass(SharedTicketInfo.class)).list();
} }
/** /**
* Return only current APPUSER SHAREDtickets * Return only current APPUSER SHAREDtickets
*
* @param appuser * @param appuser
* @return * @return
* @throws BasicException * @throws BasicException
@@ -118,15 +117,16 @@ public class DataLogicReceipts extends BeanFactoryDataSingle {
public final List<SharedTicketInfo> getUserSharedTicketList(String appuser) throws BasicException { public final List<SharedTicketInfo> getUserSharedTicketList(String appuser) throws BasicException {
String sql = "SELECT ID, NAME, CONTENT, APPUSER, PICKUPID, LOCKED " String sql = "SELECT ID, NAME, CONTENT, APPUSER, PICKUPID, LOCKED "
+ "FROM sharedtickets " + "FROM sharedtickets "
+ "WHERE APPUSER =\"" + appuser + "\" ORDER BY PICKUPID"; + "WHERE APPUSER =\""+ appuser +"\" ORDER BY PICKUPID";
return (List<SharedTicketInfo>) new StaticSentence(s, sql, null, new SerializerReadClass(SharedTicketInfo.class)) return (List<SharedTicketInfo>) new StaticSentence(s
.list(); , sql
, null
, new SerializerReadClass(SharedTicketInfo.class)).list();
} }
/** /**
* For Standard View * For Standard View
*
* @param id * @param id
* @param ticket * @param ticket
* @param pickupid * @param pickupid
@@ -138,7 +138,7 @@ public class DataLogicReceipts extends BeanFactoryDataSingle {
id, id,
ticket.getName(), ticket.getName(),
ticket, ticket,
ticket.getUserInfo().getId(), ticket.getUser().getId(),
pickupid pickupid
}; };
@@ -151,13 +151,15 @@ public class DataLogicReceipts extends BeanFactoryDataSingle {
Datas.INT Datas.INT
}; };
new PreparedSentence(s, "INSERT INTO sharedtickets (" new PreparedSentence(s
, "INSERT INTO sharedtickets ("
+ "ID, " + "ID, "
+ "NAME, " + "NAME, "
+ "CONTENT, " + "CONTENT, "
+ "APPUSER, " + "APPUSER, "
+ "PICKUPID) " + "PICKUPID) "
+ "VALUES (?, ?, ?, ?, ?)", new SerializerWriteBasicExt(datas, new int[] { 0, 1, 2, 3, 4 })).exec(values); + "VALUES (?, ?, ?, ?, ?)"
, new SerializerWriteBasicExt(datas, new int[] {0, 1, 2, 3, 4})).exec(values);
} }
/** /**
@@ -173,7 +175,7 @@ public class DataLogicReceipts extends BeanFactoryDataSingle {
id, id,
ticket.getName(), ticket.getName(),
ticket, ticket,
ticket.getUserInfo().getId(), ticket.getUser().getId(),
pickupid pickupid
}; };
Datas[] datas = new Datas[] { Datas[] datas = new Datas[] {
@@ -183,16 +185,16 @@ public class DataLogicReceipts extends BeanFactoryDataSingle {
Datas.STRING, Datas.STRING,
Datas.INT Datas.INT
}; };
new PreparedSentence(s, "UPDATE sharedtickets SET " new PreparedSentence(s
, "UPDATE sharedtickets SET "
+ "NAME = ?, " + "NAME = ?, "
+ "CONTENT = ?, " + "CONTENT = ?, "
+ "APPUSER = ?, " + "APPUSER = ?, "
+ "PICKUPID = ? " + "PICKUPID = ? "
+ "WHERE ID = ?", + "WHERE ID = ?"
new SerializerWriteBasicExt(datas, , new SerializerWriteBasicExt(datas,
new int[] { new int[] {
1, 2, 3, 4, 0 })) 1, 2, 3, 4, 0})).exec(values);
.exec(values);
} }
/** /**
@@ -219,17 +221,18 @@ public class DataLogicReceipts extends BeanFactoryDataSingle {
Datas.SERIALIZABLE, Datas.SERIALIZABLE,
Datas.INT Datas.INT
}; };
new PreparedSentence(s, "UPDATE sharedtickets SET " new PreparedSentence(s
, "UPDATE sharedtickets SET "
+ "NAME = ?, " + "NAME = ?, "
+ "CONTENT = ?, " + "CONTENT = ?, "
+ "PICKUPID = ? " + "PICKUPID = ? "
+ "WHERE ID = ?", new SerializerWriteBasicExt(datas, new int[] { 1, 2, 3, 0 })).exec(values); + "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 * In place for multi-purposing like containing data from elsewhere and/or
* using Place and User for Notifications * using Place and User for Notifications
*
* @param id * @param id
* @param locked * @param locked
* @throws BasicException * @throws BasicException
@@ -244,15 +247,16 @@ public class DataLogicReceipts extends BeanFactoryDataSingle {
Datas.STRING, Datas.STRING,
Datas.STRING Datas.STRING
}; };
new PreparedSentence(s, "UPDATE sharedtickets SET " new PreparedSentence(s
, "UPDATE sharedtickets SET "
+ "LOCKED = ? " + "LOCKED = ? "
+ "WHERE ID = ?", new SerializerWriteBasicExt(datas, new int[] { 1, 0 })).exec(values); + "WHERE ID = ?"
, new SerializerWriteBasicExt(datas, new int[] {1, 0})).exec(values);
} }
/** /**
* In place for multi-purposing like flushing locks from elsewhere and/or * In place for multi-purposing like flushing locks from elsewhere and/or
* using Place and User for Notifications * using Place and User for Notifications
*
* @param id * @param id
* @param unlocked * @param unlocked
* @throws BasicException * @throws BasicException
@@ -267,14 +271,15 @@ public class DataLogicReceipts extends BeanFactoryDataSingle {
Datas.STRING, Datas.STRING,
Datas.STRING Datas.STRING
}; };
new PreparedSentence(s, "UPDATE sharedtickets SET " new PreparedSentence(s
, "UPDATE sharedtickets SET "
+ "LOCKED = ? " + "LOCKED = ? "
+ "WHERE ID = ?", new SerializerWriteBasicExt(datas, new int[] { 1, 0 })).exec(values); + "WHERE ID = ?"
, new SerializerWriteBasicExt(datas, new int[] {1, 0})).exec(values);
} }
/** /**
* For Restaurant View * For Restaurant View
*
* @param id * @param id
* @param ticket * @param ticket
* @param pickupid * @param pickupid
@@ -289,7 +294,7 @@ public class DataLogicReceipts extends BeanFactoryDataSingle {
id, id,
ticket.getName(), ticket.getName(),
ticket, ticket,
ticket.getUserInfo(), ticket.getUser(),
ticket.getPickupId(), ticket.getPickupId(),
ticket.getHost() ticket.getHost()
}; };
@@ -302,13 +307,15 @@ public class DataLogicReceipts extends BeanFactoryDataSingle {
Datas.INT Datas.INT
}; };
new PreparedSentence(s, "INSERT INTO sharedtickets (" new PreparedSentence(s
, "INSERT INTO sharedtickets ("
+ "ID, " + "ID, "
+ "NAME, " + "NAME, "
+ "CONTENT, " + "CONTENT, "
+ "APPUSER, " + "APPUSER, "
+ "PICKUPID) " + "PICKUPID) "
+ "VALUES (?, ?, ?, ?, ?)", new SerializerWriteBasicExt(datas, new int[] { 0, 1, 2, 3, 4 })).exec(values); + "VALUES (?, ?, ?, ?, ?)"
, new SerializerWriteBasicExt(datas, new int[] {0, 1, 2, 3, 4})).exec(values);
} }
/** /**
@@ -318,7 +325,9 @@ public class DataLogicReceipts extends BeanFactoryDataSingle {
*/ */
public final void deleteSharedTicket(final String id) throws BasicException { public final void deleteSharedTicket(final String id) throws BasicException {
new StaticSentence(s, "DELETE FROM sharedtickets WHERE ID = ?", SerializerWriteString.INSTANCE).exec(id); new StaticSentence(s
, "DELETE FROM sharedtickets WHERE ID = ?"
, SerializerWriteString.INSTANCE).exec(id);
} }
/** /**
@@ -332,16 +341,21 @@ public class DataLogicReceipts extends BeanFactoryDataSingle {
if (Id == null) { if (Id == null) {
return null; return null;
} else { } else {
Object[] record = (Object[]) new StaticSentence(s, "SELECT PICKUPID FROM sharedtickets WHERE ID = ?", Object[]record = (Object[]) new StaticSentence(s
SerializerWriteString.INSTANCE, new SerializerReadBasic(new Datas[] { Datas.INT })).find(Id); , "SELECT PICKUPID FROM sharedtickets WHERE ID = ?"
return record == null ? 0 : (Integer) record[0]; , 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 { public final String getUserId(final String id) throws BasicException {
Object[] userID = (Object[]) new StaticSentence(s, "SELECT APPUSER FROM sharedtickets WHERE ID = ?", Object[] userID = (Object []) new StaticSentence(s
SerializerWriteString.INSTANCE, new SerializerReadBasic(new Datas[] { Datas.STRING })).find(id); , "SELECT APPUSER FROM sharedtickets WHERE ID = ?"
if (userID == null) { , SerializerWriteString.INSTANCE
, new SerializerReadBasic(new Datas[] {Datas.STRING})).find(id);
if( userID == null ) {
return null; return null;
} else { } else {
return (String) userID[0]; return (String) userID[0];
@@ -349,16 +363,20 @@ public class DataLogicReceipts extends BeanFactoryDataSingle {
} }
public final String getLockState(final String id, String lockState) throws BasicException { public final String getLockState(final String id, String lockState) throws BasicException {
Object[] state = (Object[]) new StaticSentence(s, "SELECT LOCKED FROM sharedtickets WHERE ID = ?", Object[] state = (Object[]) new StaticSentence(s
SerializerWriteString.INSTANCE, new SerializerReadBasic(new Datas[] { , "SELECT LOCKED FROM sharedtickets WHERE ID = ?"
, SerializerWriteString.INSTANCE
, new SerializerReadBasic(new Datas[] {
Datas.STRING Datas.STRING
})).find(id); })).find(id);
return (String) state[0]; return (String) state[0];
} }
public final String getServer(final String id, String user) throws BasicException { public final String getServer(final String id, String user) throws BasicException {
Object[] server = (Object[]) new StaticSentence(s, "SELECT appuser FROM sharedtickets WHERE ID = ?", Object[] server = (Object[]) new StaticSentence(s
SerializerWriteString.INSTANCE, new SerializerReadBasic(new Datas[] { , "SELECT appuser FROM sharedtickets WHERE ID = ?"
, SerializerWriteString.INSTANCE
, new SerializerReadBasic(new Datas[] {
Datas.STRING Datas.STRING
})).find(id); })).find(id);
return (String) server[0]; return (String) server[0];
src/main/java/com/unicenta/pos/sales/JPanelTicket.java
+227 -216
View File
File diff suppressed because it is too large Load Diff
src/main/java/com/unicenta/pos/sales/restaurant/JTicketsBagRestaurantMap.java
+104 -98
View File
@@ -74,8 +74,7 @@ public class JTicketsBagRestaurantMap extends JTicketsBag {
private DataLogicSales dlSales = null; private DataLogicSales dlSales = null;
private DataLogicSystem dlSystem = null; private DataLogicSystem dlSystem = null;
private final RestaurantDBUtils restDB; private final RestaurantDBUtils restDB;
private static final Icon ICO_OCU_SM = new ImageIcon( private static final Icon ICO_OCU_SM = new ImageIcon(Place.class.getResource("/com/unicenta/images/edit_group_sm.png"));
Place.class.getResource("/com/unicenta/images/edit_group_sm.png"));
private static final Icon ICO_WAITER = new NullIcon(1, 1); private static final Icon ICO_WAITER = new NullIcon(1, 1);
private static final Icon ICO_FRE = new NullIcon(22, 22); private static final Icon ICO_FRE = new NullIcon(22, 22);
private String waiterDetails; private String waiterDetails;
@@ -88,12 +87,10 @@ public class JTicketsBagRestaurantMap extends JTicketsBag {
private AppView m_app; private AppView m_app;
private Boolean showLayout = false; private Boolean showLayout = false;
/**
* Creates new form JTicketsBagRestaurant /** Creates new form JTicketsBagRestaurant
*
* @param app * @param app
* @param panelticket * @param panelticket */
*/
public JTicketsBagRestaurantMap(AppView app, TicketsEditor panelticket) { public JTicketsBagRestaurantMap(AppView app, TicketsEditor panelticket) {
@@ -220,7 +217,8 @@ public class JTicketsBagRestaurantMap extends JTicketsBag {
pl.setY(newY); pl.setY(newY);
} }
} }
}); }
);
pl.getButton().addActionListener(new MyActionListener(pl)); pl.getButton().addActionListener(new MyActionListener(pl));
} }
@@ -242,7 +240,7 @@ public class JTicketsBagRestaurantMap extends JTicketsBag {
.getString("label.autoRefreshTableMapTimerON")); .getString("label.autoRefreshTableMapTimerON"));
Timer autoRefreshTimer = new Timer(Integer.parseInt(m_App.getProperties() Timer autoRefreshTimer = new Timer(Integer.parseInt(m_App.getProperties()
.getProperty("till.autoRefreshTimer")) * 1000, new tableMapRefresh()); .getProperty("till.autoRefreshTimer"))*1000, new tableMapRefresh());
autoRefreshTimer.start(); autoRefreshTimer.start();
try { try {
@@ -255,7 +253,7 @@ public class JTicketsBagRestaurantMap extends JTicketsBag {
.getString("label.autoRefreshTableMapTimerOFF")); .getString("label.autoRefreshTableMapTimerOFF"));
} }
} }
class tableMapRefresh implements ActionListener { class tableMapRefresh implements ActionListener {
@@ -309,7 +307,7 @@ public class JTicketsBagRestaurantMap extends JTicketsBag {
dlReceipts.updateSharedTicket(m_PlaceCurrent.getId(), dlReceipts.updateSharedTicket(m_PlaceCurrent.getId(),
m_panelticket.getActiveTicket(), m_panelticket.getActiveTicket(),
m_panelticket.getActiveTicket().getPickupId()); m_panelticket.getActiveTicket().getPickupId());
dlReceipts.unlockSharedTicket(m_PlaceCurrent.getId(), null); dlReceipts.unlockSharedTicket(m_PlaceCurrent.getId(),null);
} catch (BasicException e) { } catch (BasicException e) {
new MessageInf(e).show(this); new MessageInf(e).show(this);
} }
@@ -359,7 +357,7 @@ public class JTicketsBagRestaurantMap extends JTicketsBag {
if (m_PlaceCurrent != null) { if (m_PlaceCurrent != null) {
try { try {
dlReceipts.updateRSharedTicket(m_PlaceCurrent.getId(), dlReceipts.updateRSharedTicket(m_PlaceCurrent.getId(),
m_panelticket.getActiveTicket(), m_panelticket.getActiveTicket().getPickupId()); m_panelticket.getActiveTicket(),m_panelticket.getActiveTicket().getPickupId());
} catch (BasicException e) { } catch (BasicException e) {
new MessageInf(e).show(this); new MessageInf(e).show(this);
} }
@@ -367,7 +365,7 @@ public class JTicketsBagRestaurantMap extends JTicketsBag {
m_PlaceClipboard = m_PlaceCurrent; // put FROM table to TO table m_PlaceClipboard = m_PlaceCurrent; // put FROM table to TO table
customer = null; customer = null;
// m_PlaceCurrent = null; // Hang on we'll clear later after we're done // m_PlaceCurrent = null; // Hang on we'll clear later after we're done
} }
printState(); printState();
@@ -420,8 +418,10 @@ public class JTicketsBagRestaurantMap extends JTicketsBag {
m_PlaceCurrent = null; m_PlaceCurrent = null;
} else { } else {
JOptionPane.showMessageDialog(null, AppLocal.getIntString("message.sharedticketlockoverriden"), JOptionPane.showMessageDialog(null
AppLocal.getIntString("title.editor"), JOptionPane.INFORMATION_MESSAGE); , AppLocal.getIntString("message.sharedticketlockoverriden")
, AppLocal.getIntString("title.editor")
, JOptionPane.INFORMATION_MESSAGE);
} }
} catch (BasicException ex) { } catch (BasicException ex) {
log.error(ex.getMessage()); log.error(ex.getMessage());
@@ -441,7 +441,7 @@ public class JTicketsBagRestaurantMap extends JTicketsBag {
if (m_PlaceCurrent != null) { if (m_PlaceCurrent != null) {
id = m_PlaceCurrent.getId(); id = m_PlaceCurrent.getId();
} }
return (id); return(id);
} }
/** /**
@@ -453,7 +453,7 @@ public class JTicketsBagRestaurantMap extends JTicketsBag {
if (m_PlaceCurrent != null) { if (m_PlaceCurrent != null) {
stableName = m_PlaceCurrent.getName(); stableName = m_PlaceCurrent.getName();
} }
return (stableName); return(stableName);
} }
/** /**
@@ -516,9 +516,9 @@ public class JTicketsBagRestaurantMap extends JTicketsBag {
}); });
} }
/* /*
* Populate the floor plans and tables * Populate the floor plans and tables
*/ */
private void printState() { private void printState() {
String sDB; String sDB;
sDB = m_App.getProperties().getProperty("db.engine"); sDB = m_App.getProperties().getProperty("db.engine");
@@ -538,10 +538,10 @@ public class JTicketsBagRestaurantMap extends JTicketsBag {
}) })
.map((place) -> { .map((place) -> {
if (m_App.getProperties().getProperty("table.tablecolour") == null) { if (m_App.getProperties().getProperty("table.tablecolour")== null){
tableName = "<style=font-size:9px;font-weight:bold;><font color = black>" tableName="<style=font-size:9px;font-weight:bold;><font color = black>"
+ place.getName() + "</font></style>"; + place.getName()+"</font></style>";
} else { }else{
if (place.getOccupied() != null) { if (place.getOccupied() != null) {
Date date = new java.util.Date(); Date date = new java.util.Date();
Timestamp t1 = new Timestamp(date.getTime()); Timestamp t1 = new Timestamp(date.getTime());
@@ -552,20 +552,20 @@ public class JTicketsBagRestaurantMap extends JTicketsBag {
int hours = seconds / 3600; int hours = seconds / 3600;
int minutes = (seconds % 3600) / 60; int minutes = (seconds % 3600) / 60;
Integer count = restDB.getGuestsInTable(place.getId()); Integer count = restDB.getGuestsInTable(place.getId());
tableName = "<style=font-size:9px;font-weight:bold;><font color =" tableName="<style=font-size:9px;font-weight:bold;><font color ="
+ m_App.getProperties().getProperty("table.tablecolour") + ">" + m_App.getProperties().getProperty("table.tablecolour")+ ">"
+ place.getName() + " / " + place.getSeats() + "<br>" + place.getName() + " / " + place.getSeats() + "<br>"
// + AppLocal.getIntString("button.guest") + place.getGuests() + "<br>" // + AppLocal.getIntString("button.guest") + place.getGuests() + "<br>"
+ AppLocal.getIntString("button.guest") + count + "<br>" + AppLocal.getIntString("button.guest") + count + "<br>"
+ AppLocal.getIntString("button.occupied") + AppLocal.getIntString("button.occupied")
+ hours + "h" + ":" + minutes + "m" + hours + "h" + ":" + minutes + "m"
+ "<br>" + "<br>"
+ "</font></style>"; + "</font></style>";
} else { } else {
tableName = "<style=font-size:9px;font-weight:bold;><font color =" tableName="<style=font-size:9px;font-weight:bold;><font color ="
+ m_App.getProperties().getProperty("table.tablecolour") + ">" + m_App.getProperties().getProperty("table.tablecolour")+ ">"
+ place.getName() + " / " + place.getSeats() + "<br>" + place.getName() + " / " + place.getSeats() + "<br>"
+ "</font></style>"; + "</font></style>";
} }
@@ -574,16 +574,16 @@ public class JTicketsBagRestaurantMap extends JTicketsBag {
}) })
.map((place) -> { .map((place) -> {
if (Boolean.parseBoolean(m_App.getProperties().getProperty("table.showwaiterdetails"))) { if (Boolean.parseBoolean(m_App.getProperties().getProperty("table.showwaiterdetails"))){
if (m_App.getProperties().getProperty("table.waitercolour") == null) { if (m_App.getProperties().getProperty("table.waitercolour")== null){
waiterDetails = (restDB.getWaiterNameInTable(place.getName()) == null) ? "" waiterDetails = (restDB.getWaiterNameInTable(place.getName()) ==null)? ""
: "<style=font-size:9px;font-weight:bold;><font color = red>" :"<style=font-size:9px;font-weight:bold;><font color = red>"
+ restDB.getWaiterNameInTableById(place.getId()) + "</font></style><br>"; + restDB.getWaiterNameInTableById(place.getId())+"</font></style><br>";
} else { }else{
waiterDetails = (restDB.getWaiterNameInTable(place.getName()) == null) ? "" waiterDetails = (restDB.getWaiterNameInTable(place.getName()) ==null)? ""
: "<style=font-size:9px;font-weight:bold;><font color =" :"<style=font-size:9px;font-weight:bold;><font color ="
+ m_App.getProperties().getProperty("table.waitercolour") + ">" + m_App.getProperties().getProperty("table.waitercolour")+ ">"
+ restDB.getWaiterNameInTableById(place.getId()) + "</font></style><br>"; + restDB.getWaiterNameInTableById(place.getId())+"</font></style><br>";
} }
place.getButton().setIcon(ICO_OCU_SM); place.getButton().setIcon(ICO_OCU_SM);
} else { } else {
@@ -594,21 +594,20 @@ public class JTicketsBagRestaurantMap extends JTicketsBag {
.map((place) -> { .map((place) -> {
if (Boolean.parseBoolean( if (Boolean.parseBoolean(
m_App.getProperties().getProperty("table.showcustomerdetails"))) { m_App.getProperties().getProperty("table.showcustomerdetails"))){
place.getButton().setIcon((Boolean.parseBoolean( place.getButton().setIcon((Boolean.parseBoolean(
m_App.getProperties().getProperty("table.showwaiterdetails")) m_App.getProperties().getProperty("table.showwaiterdetails"))
&& (restDB.getCustomerNameInTable(place.getName()) != null)) && (restDB.getCustomerNameInTable(place.getName()) !=null))
? ICO_WAITER ? ICO_WAITER:ICO_OCU_SM);
: ICO_OCU_SM); if (m_App.getProperties().getProperty("table.customercolour")== null){
if (m_App.getProperties().getProperty("table.customercolour") == null) { customerDetails = (restDB.getCustomerNameInTable(place.getName()) ==null)? ""
customerDetails = (restDB.getCustomerNameInTable(place.getName()) == null) ? "" :"<style=font-size:9px;font-weight:bold;><font color = blue>"
: "<style=font-size:9px;font-weight:bold;><font color = blue>" + restDB.getCustomerNameInTableById(place.getId())+"</font></style><br>";
+ restDB.getCustomerNameInTableById(place.getId()) + "</font></style><br>"; }else{
} else { customerDetails = (restDB.getCustomerNameInTable(place.getName()) ==null)? ""
customerDetails = (restDB.getCustomerNameInTable(place.getName()) == null) ? "" :"<style=font-size:9px;font-weight:bold;><font color ="
: "<style=font-size:9px;font-weight:bold;><font color =" + m_App.getProperties().getProperty("table.customercolour")+ ">"
+ m_App.getProperties().getProperty("table.customercolour") + ">" + restDB.getCustomerNameInTableById(place.getId())+"</font></style><br>";
+ restDB.getCustomerNameInTableById(place.getId()) + "</font></style><br>";
} }
} else { } else {
customerDetails = ""; customerDetails = "";
@@ -622,17 +621,17 @@ public class JTicketsBagRestaurantMap extends JTicketsBag {
|| (Boolean.parseBoolean( || (Boolean.parseBoolean(
m_App.getProperties().getProperty("table.showcustomerdetails")))) { m_App.getProperties().getProperty("table.showcustomerdetails")))) {
place.getButton().setText("<html><center>" place.getButton().setText("<html><center>"
+ customerDetails + waiterDetails + tableName + "</html>"); + customerDetails + waiterDetails +tableName+"</html>" );
} else { }else{
if (m_App.getProperties().getProperty("table.tablecolour") == null) { if (m_App.getProperties().getProperty("table.tablecolour")== null){
tableName = "<style=font-size:10px;font-weight:bold;><font color = black>" tableName="<style=font-size:10px;font-weight:bold;><font color = black>"
+ place.getName() + "</font></style>"; + place.getName()+"</font></style>";
} else { }else{
tableName = "<style=font-size:10px;font-weight:bold;><font color =" tableName="<style=font-size:10px;font-weight:bold;><font color ="
+ m_App.getProperties().getProperty("table.tablecolour") + ">" + m_App.getProperties().getProperty("table.tablecolour")+ ">"
+ place.getName() + "</font></style>"; + place.getName()+"</font></style>";
} }
place.getButton().setText("<html><center>" + tableName + "</html>"); place.getButton().setText("<html><center>"+tableName+"</html>");
} }
return place; return place;
}) })
@@ -644,12 +643,15 @@ public class JTicketsBagRestaurantMap extends JTicketsBag {
}); });
m_jbtnReservations.setEnabled(true); m_jbtnReservations.setEnabled(true);
// places here // places here
} else { } else {
m_jText.setText(AppLocal.getIntString("label.restaurantcustomer", new Object[] { m_jText.setText(AppLocal.getIntString("label.restaurantcustomer"
, new Object[] {
customer.getName() customer.getName()
})); }
)
);
m_aplaces.stream() m_aplaces.stream()
.forEach((place) -> { .forEach((place) -> {
@@ -658,9 +660,11 @@ public class JTicketsBagRestaurantMap extends JTicketsBag {
m_jbtnReservations.setEnabled(false); m_jbtnReservations.setEnabled(false);
} }
} else { } else {
m_jText.setText(AppLocal.getIntString("label.restaurantmove", new Object[] { m_jText.setText(AppLocal.getIntString("label.restaurantmove"
, new Object[] {
m_PlaceClipboard.getName() m_PlaceClipboard.getName()
})); }
));
m_aplaces.stream() m_aplaces.stream()
.forEach((place) -> { .forEach((place) -> {
@@ -691,25 +695,23 @@ public class JTicketsBagRestaurantMap extends JTicketsBag {
m_restaurantmap.updateGuestCount(); m_restaurantmap.updateGuestCount();
try { try {
dlReceipts.lockSharedTicket(m_PlaceCurrent.getId(), "locked"); dlReceipts.lockSharedTicket(m_PlaceCurrent.getId(),"locked");
} catch (BasicException ex) { } catch (BasicException ex) {
log.error(ex.getMessage()); log.error(ex.getMessage());
} }
} }
private void showView(String view) { private void showView(String view) {
CardLayout cl = (CardLayout) (getLayout()); CardLayout cl = (CardLayout)(getLayout());
cl.show(this, view); cl.show(this, view);
} }
private class MyActionListener implements ActionListener { private class MyActionListener implements ActionListener {
private final Place m_place; private final Place m_place;
public MyActionListener(Place place) { public MyActionListener(Place place) {
m_place = place; m_place = place;
} }
@Override @Override
public void actionPerformed(ActionEvent evt) { public void actionPerformed(ActionEvent evt) {
m_App.getAppUserView().getUser(); m_App.getAppUserView().getUser();
@@ -721,7 +723,7 @@ public class JTicketsBagRestaurantMap extends JTicketsBag {
TicketInfo ticket = getTicketInfo(m_place); TicketInfo ticket = getTicketInfo(m_place);
if (ticket == null) { // It's an empty table if (ticket == null) { // It's an empty table
ticket = new TicketInfo(); ticket = new TicketInfo();
ticket.setUserInfo(m_App.getAppUserView().getUser().getUserInfo()); ticket.setUser(m_App.getAppUserView().getUser().getUserInfo());
try { try {
dlReceipts.insertSharedTicket(m_place.getId(), ticket, ticket.getPickupId()); dlReceipts.insertSharedTicket(m_place.getId(), ticket, ticket.getPickupId());
} catch (BasicException e) { } catch (BasicException e) {
@@ -733,29 +735,30 @@ public class JTicketsBagRestaurantMap extends JTicketsBag {
} else { // Table not empty } else { // Table not empty
String m_lockState = null; String m_lockState = null;
try { try {
m_lockState = dlReceipts.getLockState(m_place.getId(), m_lockState); // check lockstate m_lockState = dlReceipts.getLockState(m_place.getId(), m_lockState); //check lockstate
if ("locked".equals(m_lockState)) { // It's locked if ("locked".equals(m_lockState)) { // It's locked
JOptionPane.showMessageDialog(null, JOptionPane.showMessageDialog(null,
AppLocal.getIntString("message.sharedticketlock")); AppLocal.getIntString("message.sharedticketlock"));
if (m_App.getAppUserView().getUser().hasPermission("sales.Override")) { // Override it if (m_App.getAppUserView().getUser().hasPermission("sales.Override")) { // Override it
int res = JOptionPane.showConfirmDialog(null, int res = JOptionPane.showConfirmDialog(null
AppLocal.getIntString("message.sharedticketlockoverride"), AppLocal.getIntString("title.editor"), , AppLocal.getIntString("message.sharedticketlockoverride")
JOptionPane.YES_NO_OPTION, JOptionPane.WARNING_MESSAGE); , AppLocal.getIntString("title.editor")
, JOptionPane.YES_NO_OPTION, JOptionPane.WARNING_MESSAGE);
if (res == JOptionPane.YES_OPTION) { if (res == JOptionPane.YES_OPTION) {
m_place.setPeople(true); m_place.setPeople(true);
m_PlaceClipboard = null; m_PlaceClipboard = null;
setActivePlace(m_place, ticket); setActivePlace(m_place, ticket);
dlReceipts.lockSharedTicket(m_PlaceCurrent.getId(), "locked"); dlReceipts.lockSharedTicket(m_PlaceCurrent.getId(),"locked");
} }
} }
} else { // It's not locked } else { // It's not locked
String m_user = m_App.getAppUserView().getUser().getId(); String m_user = m_App.getAppUserView().getUser().getId();
String ticketuser = dlReceipts.getServer(m_place.getId(), m_user); String ticketuser = dlReceipts.getServer(m_place.getId(),m_user);
if (m_App.getAppUserView().getUser().hasPermission("sales.Override") // Check User permission if (m_App.getAppUserView().getUser().hasPermission("sales.Override") //Check User permission
|| m_user.equals(ticketuser)) { || m_user.equals(ticketuser)) {
m_place.setPeople(true); m_place.setPeople(true);
@@ -763,19 +766,21 @@ public class JTicketsBagRestaurantMap extends JTicketsBag {
m_lockState = "locked"; m_lockState = "locked";
setActivePlace(m_place, ticket); setActivePlace(m_place, ticket);
} else { } else {
JOptionPane.showMessageDialog(null, AppLocal.getIntString("message.sharedticket"), JOptionPane.showMessageDialog(null
AppLocal.getIntString("title.editor"), JOptionPane.OK_OPTION); , AppLocal.getIntString("message.sharedticket")
, AppLocal.getIntString("title.editor")
, JOptionPane.OK_OPTION);
} }
} }
} catch (BasicException ex) { } catch (BasicException ex) {
log.error(ex.getMessage()); log.error(ex.getMessage());
} }
// printState(); // show table map. Why here? // printState(); // show table map. Why here?
} }
} }
// This block handles Merge // This block handles Merge
// at this stage m_PlaceClipboard is FROM table // at this stage m_PlaceClipboard is FROM table
// at this point m_place is TO table // at this point m_place is TO table
if (m_PlaceClipboard != null) { // Anything in the Clipboard? if (m_PlaceClipboard != null) { // Anything in the Clipboard?
TicketInfo ticketclip = getTicketInfo(m_PlaceClipboard); // add ticket object from clipboard TicketInfo ticketclip = getTicketInfo(m_PlaceClipboard); // add ticket object from clipboard
@@ -882,18 +887,18 @@ public class JTicketsBagRestaurantMap extends JTicketsBag {
* *
* @param btnText * @param btnText
*/ */
public void setButtonTextBags(String btnText) { public void setButtonTextBags(String btnText){
m_PlaceClipboard.setButtonText(btnText); m_PlaceClipboard.setButtonText(btnText);
} }
/**
* This method is called from within the constructor to
/** This method is called from within the constructor to
* initialize the form. * initialize the form.
* WARNING: Do NOT modify this code. The content of this method is * WARNING: Do NOT modify this code. The content of this method is
* always regenerated by the Form Editor. * always regenerated by the Form Editor.
*/ */
// <editor-fold defaultstate="collapsed" desc="Generated // <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents
// Code">//GEN-BEGIN:initComponents
private void initComponents() { private void initComponents() {
m_jPanelMap = new javax.swing.JPanel(); m_jPanelMap = new javax.swing.JPanel();
@@ -1008,18 +1013,18 @@ public class JTicketsBagRestaurantMap extends JTicketsBag {
add(m_jPanelMap, "map"); add(m_jPanelMap, "map");
}// </editor-fold>//GEN-END:initComponents }// </editor-fold>//GEN-END:initComponents
private void m_jbtnRefreshActionPerformed(java.awt.event.ActionEvent evt) {// GEN-FIRST:event_m_jbtnRefreshActionPerformed private void m_jbtnRefreshActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_m_jbtnRefreshActionPerformed
loadTickets(); loadTickets();
printState(); printState();
}// GEN-LAST:event_m_jbtnRefreshActionPerformed }//GEN-LAST:event_m_jbtnRefreshActionPerformed
private void m_jbtnReservationsActionPerformed(java.awt.event.ActionEvent evt) {// GEN-FIRST:event_m_jbtnReservationsActionPerformed private void m_jbtnReservationsActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_m_jbtnReservationsActionPerformed
showView("res"); showView("res");
m_jreservations.activate(); m_jreservations.activate();
}// GEN-LAST:event_m_jbtnReservationsActionPerformed }//GEN-LAST:event_m_jbtnReservationsActionPerformed
private void m_jbtnLayoutActionPerformed(java.awt.event.ActionEvent evt) {// GEN-FIRST:event_m_jbtnLayoutActionPerformed private void m_jbtnLayoutActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_m_jbtnLayoutActionPerformed
if (java.util.ResourceBundle.getBundle("pos_messages") if (java.util.ResourceBundle.getBundle("pos_messages")
.getString("button.layout").equals(m_jbtnLayout.getText())) { .getString("button.layout").equals(m_jbtnLayout.getText())) {
actionEnabled = false; actionEnabled = false;
@@ -1052,9 +1057,9 @@ public class JTicketsBagRestaurantMap extends JTicketsBag {
pl.getButton().setBorderPainted(false); pl.getButton().setBorderPainted(false);
}); });
} }
}// GEN-LAST:event_m_jbtnLayoutActionPerformed }//GEN-LAST:event_m_jbtnLayoutActionPerformed
private void m_jbtnSaveActionPerformed(java.awt.event.ActionEvent evt) {// GEN-FIRST:event_m_jbtnSaveActionPerformed private void m_jbtnSaveActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_m_jbtnSaveActionPerformed
m_aplaces.forEach((pl) -> { m_aplaces.forEach((pl) -> {
try { try {
dlSystem.updatePlaces(pl.getX(), pl.getY(), pl.getId()); dlSystem.updatePlaces(pl.getX(), pl.getY(), pl.getId());
@@ -1062,7 +1067,8 @@ public class JTicketsBagRestaurantMap extends JTicketsBag {
log.error(ex.getMessage()); log.error(ex.getMessage());
} }
}); });
}// GEN-LAST:event_m_jbtnSaveActionPerformed }//GEN-LAST:event_m_jbtnSaveActionPerformed
// Variables declaration - do not modify//GEN-BEGIN:variables // Variables declaration - do not modify//GEN-BEGIN:variables
private javax.swing.JPanel jPanel1; private javax.swing.JPanel jPanel1;
src/main/java/com/unicenta/pos/ticket/TicketInfo.java
+172 -168
View File
@@ -48,41 +48,41 @@ public final class TicketInfo implements SerializableRead, Externalizable {
public static final int RECEIPT_PAYMENT = 2; public static final int RECEIPT_PAYMENT = 2;
public static final int RECEIPT_NOSALE = 3; public static final int RECEIPT_NOSALE = 3;
// JG Jun 2017 - contain partial/full refunds // JG Jun 2017 - contain partial/full refunds
public static final int REFUND_NOT = 0; // is a non-refunded ticket public static final int REFUND_NOT = 0; // is a non-refunded ticket
public static final int REFUND_PARTIAL = 1; public static final int REFUND_PARTIAL = 1;
public static final int REFUND_ALL = 2; public static final int REFUND_ALL = 2;
private static final DateFormat m_dateformat = new SimpleDateFormat("hh:mm"); private static final DateFormat m_dateformat = new SimpleDateFormat("hh:mm");
private String host; private String m_sHost;
private String id; private String m_sId;
private int ticketType; private int tickettype;
private int ticketId; private int m_iTicketId;
private int pickupId; private int m_iPickupId;
private java.util.Date date; private java.util.Date m_dDate;
private Properties attributes; private Properties attributes;
private UserInfo userInfo; private UserInfo m_User;
private Double multiply; private Double multiply;
private CustomerInfoExt cutomerInfoExt; private CustomerInfoExt m_Customer;
private String activeCash; private String m_sActiveCash;
private List<TicketLineInfo> ticketLines; private List<TicketLineInfo> m_aLines;
private List<PaymentInfo> payments; private List<PaymentInfo> payments;
private List<TicketTaxInfo> taxes; private List<TicketTaxInfo> taxes;
private final String m_sResponse; private final String m_sResponse;
private String loyaltyCardNumber; private String loyaltyCardNumber;
private Boolean oldTicket; private Boolean oldTicket;
private boolean tip; private boolean tip;
private PaymentInfoTicket ticketPaymentInfo; private PaymentInfoTicket m_paymentInfo;
private boolean isProcessed; private boolean m_isProcessed;
private final String locked; private final String m_locked;
private Double nsum; private Double nsum;
private int ticketstatus; private int ticketstatus;
private static String hostname; private static String hostname;
public static void setHostname(String name) { public static void setHostname(String name) {
hostname = name; hostname =name;
} }
public static String getHostname() { public static String getHostname() {
@@ -91,53 +91,53 @@ public final class TicketInfo implements SerializableRead, Externalizable {
/** Creates new TicketModel */ /** Creates new TicketModel */
public TicketInfo() { public TicketInfo() {
id = UUID.randomUUID().toString(); m_sId = UUID.randomUUID().toString();
ticketType = RECEIPT_NORMAL; tickettype = RECEIPT_NORMAL;
ticketId = 0; // incrementamos m_iTicketId = 0; // incrementamos
date = new Date(); m_dDate = new Date();
attributes = new Properties(); attributes = new Properties();
userInfo = null; m_User = null;
cutomerInfoExt = null; m_Customer = null;
activeCash = null; m_sActiveCash = null;
ticketLines = new ArrayList<>(); m_aLines = new ArrayList<>();
payments = new ArrayList<>(); payments = new ArrayList<>();
taxes = null; taxes = null;
m_sResponse = null; m_sResponse = null;
oldTicket = false; oldTicket=false;
AppConfig config = new AppConfig(new File(new File( AppConfig config = new AppConfig(new File(new File(
System.getProperty("user.home")), AppLocal.APP_ID + ".properties")); System.getProperty("user.home")), AppLocal.APP_ID + ".properties"));
config.load(); config.load();
tip = Boolean.valueOf(config.getProperty("machine.showTip")); tip = Boolean.valueOf(config.getProperty("machine.showTip"));
isProcessed = false; m_isProcessed = false;
locked = null; m_locked = null;
ticketstatus = 0; ticketstatus = 0;
} }
@Override @Override
public void writeExternal(ObjectOutput out) throws IOException { public void writeExternal(ObjectOutput out) throws IOException {
out.writeObject(id); out.writeObject(m_sId);
out.writeInt(ticketType); out.writeInt(tickettype);
out.writeInt(ticketId); out.writeInt(m_iTicketId);
out.writeObject(cutomerInfoExt); out.writeObject(m_Customer);
out.writeObject(date); out.writeObject(m_dDate);
out.writeObject(attributes); out.writeObject(attributes);
out.writeObject(ticketLines); out.writeObject(m_aLines);
out.writeInt(ticketstatus); out.writeInt(ticketstatus);
} }
@Override @Override
public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException { public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
id = (String) in.readObject(); m_sId = (String) in.readObject();
ticketType = in.readInt(); tickettype = in.readInt();
ticketId = in.readInt(); m_iTicketId = in.readInt();
cutomerInfoExt = (CustomerInfoExt) in.readObject(); m_Customer = (CustomerInfoExt) in.readObject();
date = (Date) in.readObject(); m_dDate = (Date) in.readObject();
attributes = (Properties) in.readObject(); attributes = (Properties) in.readObject();
ticketLines = (List<TicketLineInfo>) in.readObject(); m_aLines = (List<TicketLineInfo>) in.readObject();
userInfo = null; m_User = null;
activeCash = null; m_sActiveCash = null;
payments = new ArrayList<>(); // JG June 2102 diamond inference payments = new ArrayList<>(); // JG June 2102 diamond inference
taxes = null; taxes = null;
@@ -151,11 +151,11 @@ public final class TicketInfo implements SerializableRead, Externalizable {
*/ */
@Override @Override
public void readValues(DataRead dr) throws BasicException { public void readValues(DataRead dr) throws BasicException {
id = dr.getString(1); m_sId = dr.getString(1);
ticketType = dr.getInt(2); tickettype = dr.getInt(2);
ticketId = dr.getInt(3); m_iTicketId = dr.getInt(3);
date = dr.getTimestamp(4); m_dDate = dr.getTimestamp(4);
activeCash = dr.getString(5); m_sActiveCash = dr.getString(5);
try { try {
byte[] img = dr.getBytes(6); byte[] img = dr.getBytes(6);
if (img != null) { if (img != null) {
@@ -163,9 +163,9 @@ public final class TicketInfo implements SerializableRead, Externalizable {
} }
} catch (IOException e) { } catch (IOException e) {
} }
userInfo = new UserInfo(dr.getString(7), dr.getString(8)); m_User = new UserInfo(dr.getString(7), dr.getString(8));
cutomerInfoExt = new CustomerInfoExt(dr.getString(9)); m_Customer = new CustomerInfoExt(dr.getString(9));
ticketLines = new ArrayList<>(); m_aLines = new ArrayList<>();
payments = new ArrayList<>(); payments = new ArrayList<>();
taxes = null; taxes = null;
@@ -177,76 +177,73 @@ public final class TicketInfo implements SerializableRead, Externalizable {
* @return * @return
*/ */
public TicketInfo copyTicket() { public TicketInfo copyTicket() {
TicketInfo ticketInfo = new TicketInfo(); TicketInfo t = new TicketInfo();
ticketInfo.ticketType = ticketType; t.tickettype = tickettype;
ticketInfo.ticketId = ticketId; t.m_iTicketId = m_iTicketId;
ticketInfo.date = date; t.m_dDate = m_dDate;
ticketInfo.activeCash = activeCash; t.m_sActiveCash = m_sActiveCash;
ticketInfo.attributes = (Properties) attributes.clone(); t.attributes = (Properties) attributes.clone();
ticketInfo.userInfo = userInfo; t.m_User = m_User;
ticketInfo.cutomerInfoExt = cutomerInfoExt; t.m_Customer = m_Customer;
ticketInfo.ticketLines = new ArrayList<>(); // JG June 2102 diamond inference t.m_aLines = new ArrayList<>(); // JG June 2102 diamond inference
ticketLines.forEach((line) -> { m_aLines.forEach((l) -> {
ticketInfo.ticketLines.add(line.copyTicketLine()); t.m_aLines.add(l.copyTicketLine());
}); });
ticketInfo.refreshLines(); t.refreshLines();
ticketInfo.payments = new LinkedList<>(); // JG June 2102 diamond inference t.payments = new LinkedList<>(); // JG June 2102 diamond inference
payments.forEach((p) -> { payments.forEach((p) -> {
ticketInfo.payments.add(p.copyPayment()); t.payments.add(p.copyPayment());
}); });
ticketInfo.oldTicket = oldTicket; t.oldTicket=oldTicket;
// taxes are not copied, must be calculated again. // taxes are not copied, must be calculated again.
ticketInfo.ticketstatus = ticketstatus; t.ticketstatus = ticketstatus;
return ticketInfo; return t;
} }
public String getId() { public String getId() {
return id; return m_sId;
} }
public int getTicketType() { public int getTicketType() {
return ticketType; return tickettype;
} }
public void setTicketType(int tickettype) { public void setTicketType(int tickettype) {
this.ticketType = tickettype; this.tickettype = tickettype;
} }
public int getTicketId() { public int getTicketId() {
return ticketId; return m_iTicketId;
} }
public void setTicketId(int iTicketId) { public void setTicketId(int iTicketId) {
ticketId = iTicketId; m_iTicketId = iTicketId;
} }
public int getTicketStatus() { public int getTicketStatus() {
return ticketstatus; return ticketstatus;
} }
public void setTicketStatus(int ticketstatus) { public void setTicketStatus(int ticketstatus) {
if (ticketId > 0) { if (m_iTicketId >0) {
this.ticketstatus = ticketId; this.ticketstatus = m_iTicketId;
} else { }else{
this.ticketstatus = ticketstatus; this.ticketstatus = ticketstatus;
} }
} }
public void setPickupId(int iTicketId) { public void setPickupId(int iTicketId) {
pickupId = iTicketId; m_iPickupId = iTicketId;
} }
public int getPickupId() { public int getPickupId() {
return pickupId; return m_iPickupId;
} }
public String getName(Object info) { public String getName(Object info) {
// JG Aug 2014 - Add User info // JG Aug 2014 - Add User info
List<String> name = new ArrayList<>(); List<String> name = new ArrayList<>();
String nameprop = getProperty("name"); String nameprop = getProperty("name");
@@ -254,23 +251,23 @@ public final class TicketInfo implements SerializableRead, Externalizable {
name.add(nameprop); name.add(nameprop);
} }
if (userInfo != null) { if (m_User != null) {
name.add(userInfo.getName()); name.add(m_User.getName());
} }
if (info == null) { if (info == null) {
if (ticketId == 0) { if (m_iTicketId == 0) {
name.add("(" + m_dateformat.format(date) + " " name.add("(" + m_dateformat.format(m_dDate) + " "
+ Long.toString(date.getTime() % 1000) + ")"); + Long.toString(m_dDate.getTime() % 1000) + ")");
} else { } else {
name.add(Integer.toString(ticketId)); name.add(Integer.toString(m_iTicketId));
} }
} else { } else {
name.add(info.toString()); name.add(info.toString());
} }
if (cutomerInfoExt != null) { if (m_Customer != null) {
name.add(cutomerInfoExt.getName()); name.add(m_Customer.getName());
} }
return org.apache.commons.lang.StringUtils.join(name, " - "); return org.apache.commons.lang.StringUtils.join(name, " - ");
@@ -281,64 +278,64 @@ public final class TicketInfo implements SerializableRead, Externalizable {
} }
public java.util.Date getDate() { public java.util.Date getDate() {
return date; return m_dDate;
} }
public void setDate(java.util.Date dDate) { public void setDate(java.util.Date dDate) {
date = dDate; m_dDate = dDate;
} }
public String getHost() { public String getHost() {
AppConfig m_config_host = new AppConfig(new File((System.getProperty("user.home")), AppConfig m_config_host = new AppConfig(new File((System.getProperty("user.home")),
AppLocal.APP_ID + ".properties")); AppLocal.APP_ID + ".properties"));
m_config_host.load(); m_config_host.load();
String machineHostname = (m_config_host.getProperty("machine.hostname")); String machineHostname =(m_config_host.getProperty("machine.hostname"));
m_config_host = null; m_config_host = null;
return machineHostname; return machineHostname;
} }
public UserInfo getUserInfo() { public UserInfo getUser() {
return userInfo; return m_User;
} }
public void setUserInfo(UserInfo value) { public void setUser(UserInfo value) {
userInfo = value; m_User = value;
} }
public CustomerInfoExt getCustomer() { public CustomerInfoExt getCustomer() {
return cutomerInfoExt; return m_Customer;
} }
public void setCustomer(CustomerInfoExt value) { public void setCustomer(CustomerInfoExt value) {
cutomerInfoExt = value; m_Customer = value;
} }
public String getCustomerId() { public String getCustomerId() {
if (cutomerInfoExt == null) { if (m_Customer == null) {
return null; return null;
} else { } else {
return cutomerInfoExt.getId(); return m_Customer.getId();
} }
} }
public String getTransactionID() { public String getTransactionID(){
return (getPayments().size() > 0) return (getPayments().size()>0)
? (getPayments().get(getPayments().size() - 1)).getTransactionID() ? ( getPayments().get(getPayments().size()-1) ).getTransactionID()
: StringUtils.getCardNumber(); // random transaction ID : StringUtils.getCardNumber(); //random transaction ID
} }
public String getReturnMessage() { public String getReturnMessage(){
return ((getPayments().get(getPayments().size() - 1)) instanceof PaymentInfoMagcard) return ( (getPayments().get(getPayments().size()-1)) instanceof PaymentInfoMagcard )
? ((PaymentInfoMagcard) (getPayments().get(getPayments().size() - 1))).getReturnMessage() ? ((PaymentInfoMagcard)(getPayments().get(getPayments().size()-1))).getReturnMessage()
: LocalRes.getIntString("button.OK"); : LocalRes.getIntString("button.OK");
} }
public void setActiveCash(String value) { public void setActiveCash(String value) {
activeCash = value; m_sActiveCash = value;
} }
public String getActiveCash() { public String getActiveCash() {
return activeCash; return m_sActiveCash;
} }
public String getProperty(String key) { public String getProperty(String key) {
@@ -358,45 +355,45 @@ public final class TicketInfo implements SerializableRead, Externalizable {
} }
public TicketLineInfo getLine(int index) { public TicketLineInfo getLine(int index) {
return ticketLines.get(index); return m_aLines.get(index);
} }
public void addLine(TicketLineInfo oLine) { public void addLine(TicketLineInfo oLine) {
oLine.setTicket(id, ticketLines.size()); oLine.setTicket(m_sId, m_aLines.size());
ticketLines.add(oLine); m_aLines.add(oLine);
} }
public void insertLine(int index, TicketLineInfo oLine) { public void insertLine(int index, TicketLineInfo oLine) {
ticketLines.add(index, oLine); m_aLines.add(index, oLine);
refreshLines(); refreshLines();
} }
public void setLine(int index, TicketLineInfo oLine) { public void setLine(int index, TicketLineInfo oLine) {
oLine.setTicket(id, index); oLine.setTicket(m_sId, index);
ticketLines.set(index, oLine); m_aLines.set(index, oLine);
} }
public void removeLine(int index) { public void removeLine(int index) {
ticketLines.remove(index); m_aLines.remove(index);
refreshLines(); refreshLines();
} }
public void refreshLines() { public void refreshLines() {
for (int i = 0; i < ticketLines.size(); i++) { for (int i = 0; i < m_aLines.size(); i++) {
getLine(i).setTicket(id, i); getLine(i).setTicket(m_sId, i);
} }
} }
public int getLinesCount() { public int getLinesCount() {
return ticketLines.size(); return m_aLines.size();
} }
public double getArticlesCount() { public double getArticlesCount() {
double dArticles = 0.0; double dArticles = 0.0;
TicketLineInfo oLine; TicketLineInfo oLine;
for (Iterator<TicketLineInfo> i = ticketLines.iterator(); i.hasNext();) { for (Iterator<TicketLineInfo> i = m_aLines.iterator(); i.hasNext();) {
oLine = i.next(); oLine = i.next();
dArticles += oLine.getMultiply(); dArticles += oLine.getMultiply();
} }
@@ -406,8 +403,9 @@ public final class TicketInfo implements SerializableRead, Externalizable {
public double getSubTotal() { public double getSubTotal() {
double sum = 0.0; double sum = 0.0;
sum = ticketLines.stream().map((line) -> line.getSubValue()).reduce(sum, sum = m_aLines.stream().map((line) ->
(accumulator, _item) -> accumulator + _item); line.getSubValue()).reduce(sum, (accumulator, _item) ->
accumulator + _item);
return sum; return sum;
} }
@@ -420,7 +418,9 @@ public final class TicketInfo implements SerializableRead, Externalizable {
nsum = sum; nsum = sum;
} }
} else { } else {
sum = ticketLines.stream().map((line) -> line.getTax()).reduce(sum, (accumulator, _item) -> accumulator + _item); sum = m_aLines.stream().map((line) ->
line.getTax()).reduce(sum, (accumulator, _item) ->
accumulator + _item);
} }
return sum; return sum;
} }
@@ -437,8 +437,10 @@ public final class TicketInfo implements SerializableRead, Externalizable {
public double getTotalPaid() { public double getTotalPaid() {
double sum = 0.0; double sum = 0.0;
sum = payments.stream().filter((p) -> (!"debtpaid".equals(p.getName()))).map((p) -> p.getTotal()).reduce(sum, sum = payments.stream().filter((p) ->
(accumulator, _item) -> accumulator + _item); (!"debtpaid".equals(p.getName()))).map((p) ->
p.getTotal()).reduce(sum, (accumulator, _item) ->
accumulator + _item);
return sum; return sum;
} }
@@ -447,11 +449,11 @@ public final class TicketInfo implements SerializableRead, Externalizable {
} }
public List<TicketLineInfo> getLines() { public List<TicketLineInfo> getLines() {
return ticketLines; return m_aLines;
} }
public void setLines(List<TicketLineInfo> l) { public void setLines(List<TicketLineInfo> l) {
ticketLines = l; m_aLines = l;
} }
public List<PaymentInfo> getPayments() { public List<PaymentInfo> getPayments() {
@@ -491,7 +493,7 @@ public final class TicketInfo implements SerializableRead, Externalizable {
} }
public void setIsProcessed(boolean isP) { public void setIsProcessed(boolean isP) {
isProcessed = isP; m_isProcessed = isP;
} }
public TicketTaxInfo getTaxLine(TaxInfo tax) { public TicketTaxInfo getTaxLine(TaxInfo tax) {
@@ -510,7 +512,7 @@ public final class TicketInfo implements SerializableRead, Externalizable {
Map<String, TicketTaxInfo> m = new HashMap<>(); Map<String, TicketTaxInfo> m = new HashMap<>();
TicketLineInfo oLine; TicketLineInfo oLine;
for (Iterator<TicketLineInfo> i = ticketLines.iterator(); i.hasNext();) { for (Iterator<TicketLineInfo> i = m_aLines.iterator(); i.hasNext();) {
oLine = i.next(); oLine = i.next();
TicketTaxInfo t = m.get(oLine.getTaxInfo().getId()); TicketTaxInfo t = m.get(oLine.getTaxInfo().getId());
@@ -531,24 +533,24 @@ public final class TicketInfo implements SerializableRead, Externalizable {
AppConfig m_config = new AppConfig(new File( AppConfig m_config = new AppConfig(new File(
(System.getProperty("user.home")), AppLocal.APP_ID + ".properties")); (System.getProperty("user.home")), AppLocal.APP_ID + ".properties"));
m_config.load(); m_config.load();
String receiptSize = (m_config.getProperty("till.receiptsize")); String receiptSize =(m_config.getProperty("till.receiptsize"));
String receiptPrefix = (m_config.getProperty("till.receiptprefix")); String receiptPrefix =(m_config.getProperty("till.receiptprefix"));
m_config = null; m_config =null;
if (ticketId > 0) { if (m_iTicketId > 0) {
String tmpTicketId = Integer.toString(ticketId); String tmpTicketId=Integer.toString(m_iTicketId);
if (receiptSize == null || (Integer.parseInt(receiptSize) <= tmpTicketId.length())) { if (receiptSize == null || (Integer.parseInt(receiptSize) <= tmpTicketId.length())){
if (receiptPrefix != null) { if (receiptPrefix != null){
tmpTicketId = receiptPrefix + tmpTicketId; tmpTicketId=receiptPrefix+tmpTicketId;
} }
return tmpTicketId; return tmpTicketId;
} }
while (tmpTicketId.length() < Integer.parseInt(receiptSize)) { while (tmpTicketId.length()<Integer.parseInt(receiptSize)){
tmpTicketId = "0" + tmpTicketId; tmpTicketId="0"+tmpTicketId;
} }
if (receiptPrefix != null) { if (receiptPrefix != null){
tmpTicketId = receiptPrefix + tmpTicketId; tmpTicketId=receiptPrefix+tmpTicketId;
} }
return tmpTicketId; return tmpTicketId;
} else { } else {
@@ -557,49 +559,50 @@ public final class TicketInfo implements SerializableRead, Externalizable {
} }
public String printDate() { public String printDate() {
return Formats.TIMESTAMP.formatValue(date); return Formats.TIMESTAMP.formatValue(m_dDate);
} }
public String printUser() { public String printUser() {
return userInfo == null ? "" : userInfo.getName(); return m_User == null ? "" : m_User.getName();
} }
public String printHost() { public String printHost() {
return host; return m_sHost;
} }
// Added JDL 28.05.13 for loyalty card functions
// Added JDL 28.05.13 for loyalty card functions
/** /**
* *
*/ */
public void clearCardNumber() { public void clearCardNumber(){
loyaltyCardNumber = null; loyaltyCardNumber=null;
} }
/** /**
* *
* @param cardNumber * @param cardNumber
*/ */
public void setLoyaltyCardNumber(String cardNumber) { public void setLoyaltyCardNumber(String cardNumber){
loyaltyCardNumber = cardNumber; loyaltyCardNumber=cardNumber;
} }
/** /**
* *
* @return * @return
*/ */
public String getLoyaltyCardNumber() { public String getLoyaltyCardNumber(){
return (loyaltyCardNumber); return (loyaltyCardNumber);
} }
public String printCustomer() { public String printCustomer() {
return cutomerInfoExt == null ? "" : cutomerInfoExt.getName(); return m_Customer == null ? "" : m_Customer.getName();
} }
public String printPhone1() { public String printPhone1() {
return cutomerInfoExt == null ? "" : cutomerInfoExt.getPhone1(); return m_Customer == null ? "" : m_Customer.getPhone1();
} }
public String printArticlesCount() { public String printArticlesCount() {
@@ -626,8 +629,8 @@ public final class TicketInfo implements SerializableRead, Externalizable {
return Formats.CURRENCY.formatValue(getTendered()); return Formats.CURRENCY.formatValue(getTendered());
} }
public String VoucherReturned() { public String VoucherReturned(){
return Formats.CURRENCY.formatValue(getTotalPaid() - getTotal()); return Formats.CURRENCY.formatValue(getTotalPaid()- getTotal());
} }
public boolean getOldTicket() { public boolean getOldTicket() {
@@ -639,27 +642,28 @@ public final class TicketInfo implements SerializableRead, Externalizable {
} }
public String getTicketHeaderFooterData(String data) { public String getTicketHeaderFooterData(String data) {
AppConfig m_config = new AppConfig(new File((System.getProperty("user.home")), AppLocal.APP_ID + ".properties")); AppConfig m_config = new AppConfig(new File((System.getProperty("user.home"))
, AppLocal.APP_ID + ".properties"));
m_config.load(); m_config.load();
String row = (m_config.getProperty("tkt." + data)); String row =(m_config.getProperty("tkt."+data));
return row; return row;
} }
public String printQRCode(String nameHeader, String vatHeader, String vatLabel) { public String printQRCode(String nameHeader, String vatHeader, String vatLabel){
String name = getTicketHeaderFooterData(nameHeader); String name = getTicketHeaderFooterData(nameHeader);
String vatNumberHeader = getTicketHeaderFooterData(vatHeader); String vatNumberHeader = getTicketHeaderFooterData(vatHeader);
String vatNumber = vatNumberHeader.split(vatLabel)[1]; String vatNumber = vatNumberHeader.split(vatLabel)[1];
String date = new SimpleDateFormat("yyyy-mm-dd hh:mm:ss").format(getDate()); String date = new SimpleDateFormat("yyyy-mm-dd hh:mm:ss").format(getDate());
String total = String.valueOf(getTotal()); String total = String.valueOf(getTotal());
String vatValue = String.valueOf(getTax()); String vatValue = String.valueOf(getTax());
return name + "," + vatNumber + "," + date + "," + total + "," + vatValue; return name+","+vatNumber+","+date+","+total+","+vatValue;
} }
public String printTicketHeaderLine1() { public String printTicketHeaderLine1() {
String lineData = getTicketHeaderFooterData("header1"); String lineData = getTicketHeaderFooterData("header1");
if (lineData != null) { if(lineData != null) {
return lineData; return lineData;
} else { } else {
return ""; return "";
@@ -669,7 +673,7 @@ public final class TicketInfo implements SerializableRead, Externalizable {
public String printTicketHeaderLine2() { public String printTicketHeaderLine2() {
String lineData = getTicketHeaderFooterData("header2"); String lineData = getTicketHeaderFooterData("header2");
if (lineData != null) { if(lineData != null) {
return lineData; return lineData;
} else { } else {
return ""; return "";
@@ -679,7 +683,7 @@ public final class TicketInfo implements SerializableRead, Externalizable {
public String printTicketHeaderLine3() { public String printTicketHeaderLine3() {
String lineData = getTicketHeaderFooterData("header3"); String lineData = getTicketHeaderFooterData("header3");
if (lineData != null) { if(lineData != null) {
return lineData; return lineData;
} else { } else {
return ""; return "";
@@ -689,7 +693,7 @@ public final class TicketInfo implements SerializableRead, Externalizable {
public String printTicketHeaderLine4() { public String printTicketHeaderLine4() {
String lineData = getTicketHeaderFooterData("header4"); String lineData = getTicketHeaderFooterData("header4");
if (lineData != null) { if(lineData != null) {
return lineData; return lineData;
} else { } else {
return ""; return "";
@@ -699,7 +703,7 @@ public final class TicketInfo implements SerializableRead, Externalizable {
public String printTicketHeaderLine5() { public String printTicketHeaderLine5() {
String lineData = getTicketHeaderFooterData("header5"); String lineData = getTicketHeaderFooterData("header5");
if (lineData != null) { if(lineData != null) {
return lineData; return lineData;
} else { } else {
return ""; return "";
@@ -709,7 +713,7 @@ public final class TicketInfo implements SerializableRead, Externalizable {
public String printTicketHeaderLine6() { public String printTicketHeaderLine6() {
String lineData = getTicketHeaderFooterData("header6"); String lineData = getTicketHeaderFooterData("header6");
if (lineData != null) { if(lineData != null) {
return lineData; return lineData;
} else { } else {
return ""; return "";
@@ -719,7 +723,7 @@ public final class TicketInfo implements SerializableRead, Externalizable {
public String printTicketFooterLine1() { public String printTicketFooterLine1() {
String lineData = getTicketHeaderFooterData("footer1"); String lineData = getTicketHeaderFooterData("footer1");
if (lineData != null) { if(lineData != null) {
return lineData; return lineData;
} else { } else {
return ""; return "";
@@ -729,7 +733,7 @@ public final class TicketInfo implements SerializableRead, Externalizable {
public String printTicketFooterLine2() { public String printTicketFooterLine2() {
String lineData = getTicketHeaderFooterData("footer2"); String lineData = getTicketHeaderFooterData("footer2");
if (lineData != null) { if(lineData != null) {
return lineData; return lineData;
} else { } else {
return ""; return "";
@@ -739,7 +743,7 @@ public final class TicketInfo implements SerializableRead, Externalizable {
public String printTicketFooterLine3() { public String printTicketFooterLine3() {
String lineData = getTicketHeaderFooterData("footer3"); String lineData = getTicketHeaderFooterData("footer3");
if (lineData != null) { if(lineData != null) {
return lineData; return lineData;
} else { } else {
return ""; return "";
@@ -749,7 +753,7 @@ public final class TicketInfo implements SerializableRead, Externalizable {
public String printTicketFooterLine4() { public String printTicketFooterLine4() {
String lineData = getTicketHeaderFooterData("footer4"); String lineData = getTicketHeaderFooterData("footer4");
if (lineData != null) { if(lineData != null) {
return lineData; return lineData;
} else { } else {
return ""; return "";
@@ -759,7 +763,7 @@ public final class TicketInfo implements SerializableRead, Externalizable {
public String printTicketFooterLine5() { public String printTicketFooterLine5() {
String lineData = getTicketHeaderFooterData("footer5"); String lineData = getTicketHeaderFooterData("footer5");
if (lineData != null) { if(lineData != null) {
return lineData; return lineData;
} else { } else {
return ""; return "";
@@ -769,7 +773,7 @@ public final class TicketInfo implements SerializableRead, Externalizable {
public String printTicketFooterLine6() { public String printTicketFooterLine6() {
String lineData = getTicketHeaderFooterData("footer6"); String lineData = getTicketHeaderFooterData("footer6");
if (lineData != null) { if(lineData != null) {
return lineData; return lineData;
} else { } else {
return ""; return "";
src/main/java/com/unicenta/pos/ticket/TicketLineInfo.java
+16 -70
View File
@@ -56,15 +56,12 @@ public class TicketLineInfo implements SerializableWrite, SerializableRead, Seri
private double newprice = 0.0; private double newprice = 0.0;
/** /** Creates new TicketLineInfo
* Creates new TicketLineInfo
*
* @param productid * @param productid
* @param dMultiply * @param dMultiply
* @param dPrice * @param dPrice
* @param tax * @param tax
* @param props * @param props */
*/
public TicketLineInfo(String productid, double dMultiply, double dPrice, TaxInfo tax, Properties props) { public TicketLineInfo(String productid, double dMultiply, double dPrice, TaxInfo tax, Properties props) {
init(productid, null, dMultiply, dPrice, tax, props); init(productid, null, dMultiply, dPrice, tax, props);
} }
@@ -82,7 +79,6 @@ public class TicketLineInfo implements SerializableWrite, SerializableRead, Seri
/** /**
* Example: Call from script.TotalDiscount event * Example: Call from script.TotalDiscount event
*
* @param productid * @param productid
* @param productname * @param productname
* @param producttaxcategory * @param producttaxcategory
@@ -91,19 +87,17 @@ public class TicketLineInfo implements SerializableWrite, SerializableRead, Seri
* @param dPrice * @param dPrice
* @param tax * @param tax
*/ */
public TicketLineInfo(String productid, String productname, String producttaxcategory, String productprinter, public TicketLineInfo(String productid, String productname, String producttaxcategory, String productprinter, double dMultiply, double dPrice, TaxInfo tax) {
double dMultiply, double dPrice, TaxInfo tax) {
Properties props = new Properties(); Properties props = new Properties();
props.setProperty("product.name", productname); props.setProperty("product.name", productname);
props.setProperty("product.taxcategoryid", producttaxcategory); props.setProperty("product.taxcategoryid", producttaxcategory);
props.setProperty("product.printer", productprinter); // added to props as may introduce printer redirect props.setProperty("product.printer", productprinter); //added to props as may introduce printer redirect
init(productid, null, dMultiply, dPrice, tax, props); init(productid, null, dMultiply, dPrice, tax, props);
} }
/** /**
* Example: Call from script.LineDiscount event * Example: Call from script.LineDiscount event
*
* @param productname * @param productname
* @param producttaxcategory * @param producttaxcategory
* @param productprinter //added to props as may introduce printer redirect * @param productprinter //added to props as may introduce printer redirect
@@ -111,8 +105,7 @@ public class TicketLineInfo implements SerializableWrite, SerializableRead, Seri
* @param dPrice * @param dPrice
* @param tax * @param tax
*/ */
public TicketLineInfo(String productname, String producttaxcategory, String productprinter, double dMultiply, public TicketLineInfo(String productname, String producttaxcategory, String productprinter, double dMultiply, double dPrice, TaxInfo tax) {
double dPrice, TaxInfo tax) {
Properties props = new Properties(); Properties props = new Properties();
props.setProperty("product.name", productname); props.setProperty("product.name", productname);
@@ -173,7 +166,7 @@ public class TicketLineInfo implements SerializableWrite, SerializableRead, Seri
attributes.setProperty("product.texttip", product.getTextTip()); attributes.setProperty("product.texttip", product.getTextTip());
} }
attributes.setProperty("product.warranty", product.getWarranty() ? "true" : "false"); attributes.setProperty("product.warranty", product.getWarranty()? "true" : "false");
if (product.getAttributeSetID() != null) { if (product.getAttributeSetID() != null) {
attributes.setProperty("product.attsetid", product.getAttributeSetID()); attributes.setProperty("product.attsetid", product.getAttributeSetID());
@@ -215,8 +208,7 @@ public class TicketLineInfo implements SerializableWrite, SerializableRead, Seri
line.tax, (Properties) line.attributes.clone()); line.tax, (Properties) line.attributes.clone());
} }
private void init(String productid, String attsetinstid, double dMultiply, double dPrice, TaxInfo tax, private void init(String productid, String attsetinstid, double dMultiply, double dPrice, TaxInfo tax, Properties attributes) {
Properties attributes) {
this.productid = productid; this.productid = productid;
this.attsetinstid = attsetinstid; this.attsetinstid = attsetinstid;
@@ -314,75 +306,60 @@ public class TicketLineInfo implements SerializableWrite, SerializableRead, Seri
public int getTicketLine() { public int getTicketLine() {
return m_iLine; return m_iLine;
} }
// These are the Lookups
// These are the Lookups
public String getProductID() { public String getProductID() {
return productid; return productid;
} }
public String getProductCategoryID() { public String getProductCategoryID() {
return (attributes.getProperty("product.categoryid")); return (attributes.getProperty("product.categoryid"));
} }
public String getProductAttSetId() { public String getProductAttSetId() {
return attributes.getProperty("product.attsetid"); return attributes.getProperty("product.attsetid");
} }
public String getProductAttSetInstId() { public String getProductAttSetInstId() {
return attsetinstid; return attsetinstid;
} }
public String getProductAttSetInstDesc() { public String getProductAttSetInstDesc() {
return attributes.getProperty("product.attsetdesc", ""); return attributes.getProperty("product.attsetdesc", "");
} }
public String getProductTaxCategoryID() { public String getProductTaxCategoryID() {
return (attributes.getProperty("product.taxcategoryid")); return (attributes.getProperty("product.taxcategoryid"));
} }
public String getTicketUpdated() { public String getTicketUpdated() {
return (attributes.getProperty("ticket.updated")); return (attributes.getProperty("ticket.updated"));
} }
public TaxInfo getTaxInfo() { public TaxInfo getTaxInfo() {
return tax; return tax;
} }
public void setTaxInfo(TaxInfo oTaxInfo) { public void setTaxInfo(TaxInfo oTaxInfo) {
tax = oTaxInfo; tax = oTaxInfo;
} }
// These appear on Printed TicketLine // These appear on Printed TicketLine
public String getProductName() { public String getProductName() {
return attributes.getProperty("product.name"); return attributes.getProperty("product.name");
} }
public String getProductMemoDate() { public String getProductMemoDate() {
return attributes.getProperty("product.memodate"); return attributes.getProperty("product.memodate");
} }
public double getPrice() { public double getPrice() {
return price; return price;
} }
public double getMultiply() { public double getMultiply() {
return multiply; return multiply;
} }
public double getTaxRate() { public double getTaxRate() {
return tax == null ? 0.0 : tax.getRate(); return tax == null ? 0.0 : tax.getRate();
} }
public double getNewPrice() { public double getNewPrice() {
newprice = price * (1.0 + getTaxRate()); newprice = price * (1.0 + getTaxRate());
return price; return price;
} }
public String getProductPrinter() { public String getProductPrinter() {
return attributes.getProperty("product.printer"); return attributes.getProperty("product.printer");
} }
// These are the Summaries // These are the Summaries
public double getPriceTax() { public double getPriceTax() {
return price * (1.0 + getTaxRate()); return price * (1.0 + getTaxRate());
} }
@@ -390,53 +367,43 @@ public class TicketLineInfo implements SerializableWrite, SerializableRead, Seri
public Properties getProperties() { public Properties getProperties() {
return attributes; return attributes;
} }
public String getProperty(String key) { public String getProperty(String key) {
return attributes.getProperty(key); return attributes.getProperty(key);
} }
public String getProperty(String key, String defaultvalue) { public String getProperty(String key, String defaultvalue) {
return attributes.getProperty(key, defaultvalue); return attributes.getProperty(key, defaultvalue);
} }
// These are Ticket Totals // These are Ticket Totals
public double getTax() { public double getTax() {
return price * multiply * getTaxRate(); return price * multiply * getTaxRate();
} }
public double getValue() { public double getValue() {
return price * multiply * (1.0 + getTaxRate()); return price * multiply * (1.0 + getTaxRate());
} }
public double getSubValue() { public double getSubValue() {
return price * multiply; return price * multiply;
} }
// SETTERS // SETTERS
public void setPrice(double dValue) { public void setPrice(double dValue) {
price = dValue; price = dValue;
} }
public void setPriceTax(double dValue) { public void setPriceTax(double dValue) {
price = dValue / (1.0 + getTaxRate()); price = dValue / (1.0 + getTaxRate());
} }
public void setMultiply(double dValue) { public void setMultiply(double dValue) {
multiply = dValue; multiply = dValue;
} }
public void setProperty(String key, String value) { public void setProperty(String key, String value) {
attributes.setProperty(key, value); attributes.setProperty(key, value);
} }
public void setProductTaxCategoryID(String taxID){
public void setProductTaxCategoryID(String taxID) { attributes.setProperty("product.taxcategoryid",taxID);
attributes.setProperty("product.taxcategoryid", taxID);
} }
public void setProductAttSetInstId(String value) { public void setProductAttSetInstId(String value) {
attsetinstid = value; attsetinstid = value;
} }
public void setProductAttSetInstDesc(String value) { public void setProductAttSetInstDesc(String value) {
if (value == null) { if (value == null) {
attributes.remove(value); attributes.remove(value);
@@ -444,11 +411,9 @@ public class TicketLineInfo implements SerializableWrite, SerializableRead, Seri
attributes.setProperty("product.attsetdesc", value); attributes.setProperty("product.attsetdesc", value);
} }
} }
public void setTicketUpdated(String key, String value){
public void setTicketUpdated(String key, String value) { attributes.setProperty("ticket.updated",value);
attributes.setProperty("ticket.updated", value);
} }
public void setProductPrinter(String value) { public void setProductPrinter(String value) {
if (value == null) { if (value == null) {
attributes.remove(value); attributes.remove(value);
@@ -465,79 +430,60 @@ public class TicketLineInfo implements SerializableWrite, SerializableRead, Seri
public String printReference() { public String printReference() {
return StringUtils.encodeXML(attributes.getProperty("product.reference")); return StringUtils.encodeXML(attributes.getProperty("product.reference"));
} }
public String printCode() { public String printCode() {
return StringUtils.encodeXML(attributes.getProperty("product.code")); return StringUtils.encodeXML(attributes.getProperty("product.code"));
} }
public String printName() { public String printName() {
return StringUtils.encodeXML(attributes.getProperty("product.name")); return StringUtils.encodeXML(attributes.getProperty("product.name"));
} }
public String printProductMemoDate() { public String printProductMemoDate() {
return StringUtils.encodeXML(attributes.getProperty("product.memodate")); return StringUtils.encodeXML(attributes.getProperty("product.memodate"));
} }
public String printPrice() { public String printPrice() {
return Formats.CURRENCY.formatValue(getPrice()); return Formats.CURRENCY.formatValue(getPrice());
} }
public String printPriceTax() { public String printPriceTax() {
return Formats.CURRENCY.formatValue(getPriceTax()); return Formats.CURRENCY.formatValue(getPriceTax());
} }
public String printMultiply() { public String printMultiply() {
return Formats.DOUBLE.formatValue(multiply); return Formats.DOUBLE.formatValue(multiply);
} }
public String printValue() { public String printValue() {
return Formats.CURRENCY.formatValue(getValue()); return Formats.CURRENCY.formatValue(getValue());
} }
public String printTaxRate() { public String printTaxRate() {
return Formats.PERCENT.formatValue(getTaxRate()); return Formats.PERCENT.formatValue(getTaxRate());
} }
public String printSubValue() { public String printSubValue() {
return Formats.CURRENCY.formatValue(getSubValue()); return Formats.CURRENCY.formatValue(getSubValue());
} }
public String printTax() { public String printTax() {
return Formats.CURRENCY.formatValue(getTax()); return Formats.CURRENCY.formatValue(getTax());
} }
public String printTextTip() { public String printTextTip() {
return attributes.getProperty("product.texttip"); return attributes.getProperty("product.texttip");
} }
public String printPrinter() { public String printPrinter() {
return StringUtils.encodeXML(attributes.getProperty("product.printer")); return StringUtils.encodeXML(attributes.getProperty("product.printer"));
} }
public boolean isProductCom() { public boolean isProductCom() {
return "true".equals(attributes.getProperty("product.com")); return "true".equals(attributes.getProperty("product.com"));
} }
public boolean isProductService() { public boolean isProductService() {
return "true".equals(attributes.getProperty("product.service")); return "true".equals(attributes.getProperty("product.service"));
} }
public boolean isProductVprice() { public boolean isProductVprice() {
return "true".equals(attributes.getProperty("product.vprice")); return "true".equals(attributes.getProperty("product.vprice"));
} }
public boolean isProductVerpatrib() { public boolean isProductVerpatrib() {
return "true".equals(attributes.getProperty("product.verpatrib")); return "true".equals(attributes.getProperty("product.verpatrib"));
} }
public boolean isProductWarranty() { public boolean isProductWarranty() {
return "true".equals(attributes.getProperty("product.warranty")); return "true".equals(attributes.getProperty("product.warranty"));
} }
public boolean getUpdated() { public boolean getUpdated() {
return "true".equals(attributes.getProperty("ticket.updated")); return "true".equals(attributes.getProperty("ticket.updated"));
} }
public void setUpdated(Boolean value) { public void setUpdated(Boolean value) {
updated = value; updated = value;
} }
src/main/java/com/unicenta/pos/voucher/VoucherInfo.java
+4 -8
View File
@@ -24,7 +24,6 @@ import com.unicenta.data.loader.DataRead;
import com.unicenta.data.loader.IKeyed; import com.unicenta.data.loader.IKeyed;
import com.unicenta.data.loader.SerializerRead; import com.unicenta.data.loader.SerializerRead;
public class VoucherInfo implements IKeyed { public class VoucherInfo implements IKeyed {
private String id; private String id;
private String voucherNumber; private String voucherNumber;
@@ -40,8 +39,7 @@ public class VoucherInfo implements IKeyed {
String voucherNumber, String voucherNumber,
String customerName, String customerName,
double amount, double amount,
String status) String status) {
{
this.id = id; this.id = id;
this.voucherNumber = voucherNumber; this.voucherNumber = voucherNumber;
this.customerName = customerName; this.customerName = customerName;
@@ -49,7 +47,6 @@ public class VoucherInfo implements IKeyed {
this.status = status; this.status = status;
} }
@Override @Override
public Object getKey() { public Object getKey() {
return getId(); return getId();
@@ -111,7 +108,6 @@ public class VoucherInfo implements IKeyed {
this.amount = amount; this.amount = amount;
} }
@Override @Override
public String toString() { public String toString() {
return voucherNumber; return voucherNumber;
@@ -132,8 +128,7 @@ public class VoucherInfo implements IKeyed {
} }
public static SerializerRead getSerializerRead() { public static SerializerRead getSerializerRead() {
return new SerializerRead() return new SerializerRead() {
{
@Override @Override
public Object readValues(DataRead dr) throws BasicException { public Object readValues(DataRead dr) throws BasicException {
return new VoucherInfo( return new VoucherInfo(
@@ -142,6 +137,7 @@ public class VoucherInfo implements IKeyed {
dr.getString(3), dr.getString(3),
dr.getDouble(4), dr.getDouble(4),
dr.getString(5)); dr.getString(5));
}}; }
};
} }
} }
test.jpg
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 12 KiB