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

wip

Browse Source
This commit is contained in:
Hugh
2025-12-29 15:40:07 +00:00
parent 79c082e081
commit cade3b10ad
10 changed files with 5714 additions and 5967 deletions
Download Patch File Download Diff File Expand all files Collapse all files
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>1.8</maven.compiler.source> <maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target> <maven.compiler.target>11</maven.compiler.target>
<derby.version>10.14.2.0</derby.version> <derby.version>10.14.2.0</derby.version>
</properties> </properties>
<dependencies> <dependencies>
src/main/java/com/unicenta/pos/admin/PeopleView.form
+19 -121
View File
@@ -19,93 +19,10 @@
<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="jLabel1"> <Component class="javax.swing.JLabel" name="nameLabel">
<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"/>
@@ -121,10 +38,10 @@
</Property> </Property>
</Properties> </Properties>
<Events> <Events>
<EventHandler event="mouseClicked" listener="java.awt.event.MouseListener" parameters="java.awt.event.MouseEvent" handler="jLabel1MouseClicked"/> <EventHandler event="mouseClicked" listener="java.awt.event.MouseListener" parameters="java.awt.event.MouseEvent" handler="nameLabelMouseClicked"/>
</Events> </Events>
</Component> </Component>
<Component class="javax.swing.JTextField" name="m_jName"> <Component class="javax.swing.JTextField" name="nameTextField">
<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"/>
@@ -134,7 +51,7 @@
</Property> </Property>
</Properties> </Properties>
</Component> </Component>
<Component class="javax.swing.JCheckBox" name="m_jVisible"> <Component class="javax.swing.JCheckBox" name="isVisible">
<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"/>
@@ -144,7 +61,7 @@
</Property> </Property>
</Properties> </Properties>
</Component> </Component>
<Component class="javax.swing.JLabel" name="jLabel3"> <Component class="javax.swing.JLabel" name="visiableLabel">
<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"/>
@@ -157,7 +74,7 @@
</Property> </Property>
</Properties> </Properties>
</Component> </Component>
<Component class="javax.swing.JLabel" name="jLabel4"> <Component class="javax.swing.JLabel" name="imageLabel">
<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"/>
@@ -170,7 +87,7 @@
</Property> </Property>
</Properties> </Properties>
</Component> </Component>
<Component class="com.unicenta.data.gui.JImageEditor" name="m_jImage"> <Component class="com.unicenta.data.gui.JImageEditor" name="imageEditor">
<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"/>
@@ -210,7 +127,7 @@
</Property> </Property>
</Properties> </Properties>
</Component> </Component>
<Component class="javax.swing.JLabel" name="jLabel2"> <Component class="javax.swing.JLabel" name="roleLabel">
<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"/>
@@ -223,7 +140,7 @@
</Property> </Property>
</Properties> </Properties>
</Component> </Component>
<Component class="javax.swing.JTextField" name="m_jcard"> <Component class="javax.swing.JTextField" name="cardIdTextField">
<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"/>
@@ -233,7 +150,7 @@
</Property> </Property>
</Properties> </Properties>
</Component> </Component>
<Component class="javax.swing.JLabel" name="jLblCardID"> <Component class="javax.swing.JLabel" name="cardIdLabel">
<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"/>
@@ -246,33 +163,7 @@
</Property> </Property>
</Properties> </Properties>
</Component> </Component>
<Component class="com.alee.laf.combobox.WebComboBox" name="webCBSecurity"> <Component class="javax.swing.JLabel" name="passwordLabel">
<Properties>
<Property name="model" type="javax.swing.ComboBoxModel" editor="org.netbeans.modules.form.editors2.ComboBoxModelEditor">
<StringArray count="3">
<StringItem index="0" value="Generate new key"/>
<StringItem index="1" value="Delete exisitng key"/>
<StringItem index="2" value="Use iButton ID"/>
</StringArray>
</Property>
<Property name="selectedIndex" type="int" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
<Connection code="0" type="code"/>
</Property>
<Property name="toolTipText" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
<ResourceString bundle="pos_messages.properties" key="tooltip.peoplesecurity" replaceFormat="AppLocal.getIntString(&quot;tooltip.peoplesecurity&quot;)"/>
</Property>
<Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
<Font name="Arial" size="14" style="0"/>
</Property>
<Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
<Dimension value="[140, 45]"/>
</Property>
</Properties>
<Events>
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="webCBSecurityActionPerformed"/>
</Events>
</Component>
<Component class="javax.swing.JLabel" name="jLabel6">
<Properties> <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"/>
@@ -285,5 +176,12 @@
</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
+118 -177
View File
@@ -64,11 +64,11 @@ public class PeopleView extends JPanel implements EditorRecord {
m_RoleModel = new ComboBoxValModel(); m_RoleModel = new ComboBoxValModel();
m_Dirty = dirty; m_Dirty = dirty;
m_jName.getDocument().addDocumentListener(dirty); nameTextField.getDocument().addDocumentListener(dirty);
m_jRole.addActionListener(dirty); m_jRole.addActionListener(dirty);
m_jVisible.addActionListener(dirty); isVisible.addActionListener(dirty);
m_jImage.addPropertyChangeListener("image", dirty); imageEditor.addPropertyChangeListener("image", dirty);
m_jcard.getDocument().addDocumentListener(dirty); cardIdTextField.getDocument().addDocumentListener(dirty);
m_ReasonModel = new ComboBoxValModel(); m_ReasonModel = new ComboBoxValModel();
m_ReasonModel.add(AppLocal.getIntString("cboption.generate")); m_ReasonModel.add(AppLocal.getIntString("cboption.generate"));
@@ -86,17 +86,17 @@ public class PeopleView extends JPanel implements EditorRecord {
@Override @Override
public void writeValueEOF() { public void writeValueEOF() {
m_oId = null; m_oId = null;
m_jName.setText(null); nameTextField.setText(null);
m_sPassword = null; m_sPassword = null;
m_RoleModel.setSelectedKey(null); m_RoleModel.setSelectedKey(null);
m_jVisible.setSelected(false); isVisible.setSelected(false);
m_jcard.setText(null); cardIdTextField.setText(null);
m_jImage.setImage(null); imageEditor.setImage(null);
m_jName.setEnabled(false); nameTextField.setEnabled(false);
m_jRole.setEnabled(false); m_jRole.setEnabled(false);
m_jVisible.setEnabled(false); isVisible.setEnabled(false);
m_jcard.setEnabled(false); cardIdTextField.setEnabled(false);
m_jImage.setEnabled(false); imageEditor.setEnabled(false);
jButton1.setEnabled(false); jButton1.setEnabled(false);
webCBSecurity.setEnabled(false); webCBSecurity.setEnabled(false);
} }
@@ -107,17 +107,17 @@ public class PeopleView extends JPanel implements EditorRecord {
@Override @Override
public void writeValueInsert() { public void writeValueInsert() {
m_oId = null; m_oId = null;
m_jName.setText(null); nameTextField.setText(null);
m_sPassword = null; m_sPassword = null;
m_RoleModel.setSelectedKey(null); m_RoleModel.setSelectedKey(null);
m_jVisible.setSelected(true); isVisible.setSelected(true);
m_jcard.setText(null); cardIdTextField.setText(null);
m_jImage.setImage(null); imageEditor.setImage(null);
m_jName.setEnabled(true); nameTextField.setEnabled(true);
m_jRole.setEnabled(true); m_jRole.setEnabled(true);
m_jVisible.setEnabled(true); isVisible.setEnabled(true);
m_jcard.setEnabled(true); cardIdTextField.setEnabled(true);
m_jImage.setEnabled(true); imageEditor.setEnabled(true);
jButton1.setEnabled(true); jButton1.setEnabled(true);
webCBSecurity.setEnabled(true); webCBSecurity.setEnabled(true);
} }
@@ -130,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];
m_jName.setText(Formats.STRING.formatValue(people[1])); nameTextField.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]);
m_jVisible.setSelected(((Boolean) people[4]).booleanValue()); isVisible.setSelected(((Boolean) people[4]).booleanValue());
m_jcard.setText(Formats.STRING.formatValue(people[5])); cardIdTextField.setText(Formats.STRING.formatValue(people[5]));
m_jImage.setImage((BufferedImage) people[6]); imageEditor.setImage((BufferedImage) people[6]);
m_jName.setEnabled(false); nameTextField.setEnabled(false);
m_jRole.setEnabled(false); m_jRole.setEnabled(false);
m_jVisible.setEnabled(false); isVisible.setEnabled(false);
m_jcard.setEnabled(false); cardIdTextField.setEnabled(false);
m_jImage.setEnabled(false); imageEditor.setEnabled(false);
jButton1.setEnabled(false); jButton1.setEnabled(false);
webCBSecurity.setEnabled(false); webCBSecurity.setEnabled(false);
} }
@@ -154,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];
m_jName.setText(Formats.STRING.formatValue(people[1])); nameTextField.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]);
m_jVisible.setSelected(((Boolean) people[4]).booleanValue()); isVisible.setSelected(((Boolean) people[4]).booleanValue());
m_jcard.setText(Formats.STRING.formatValue(people[5])); cardIdTextField.setText(Formats.STRING.formatValue(people[5]));
m_jImage.setImage((BufferedImage) people[6]); imageEditor.setImage((BufferedImage) people[6]);
if (m_jcard.getText().length() == 16) { if (cardIdTextField.getText().length() == 16) {
jLblCardID.setText(AppLocal.getIntString("label.ibutton")); cardIdLabel.setText(AppLocal.getIntString("label.ibutton"));
} else { } else {
jLblCardID.setText(AppLocal.getIntString("label.card")); cardIdLabel.setText(AppLocal.getIntString("label.card"));
} }
System.out.println(m_jcard.getText().length()); System.out.println(cardIdTextField.getText().length());
m_jName.setEnabled(true); nameTextField.setEnabled(true);
m_jRole.setEnabled(true); m_jRole.setEnabled(true);
m_jVisible.setEnabled(true); isVisible.setEnabled(true);
m_jcard.setEnabled(true); cardIdTextField.setEnabled(true);
m_jImage.setEnabled(true); imageEditor.setEnabled(true);
jButton1.setEnabled(true); jButton1.setEnabled(true);
webCBSecurity.setEnabled(true); webCBSecurity.setEnabled(true);
} }
@@ -186,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(m_jName.getText()); people[1] = Formats.STRING.parseValue(nameTextField.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] = m_jVisible.isSelected(); people[4] = isVisible.isSelected();
people[5] = Formats.STRING.parseValue(m_jcard.getText()); people[5] = Formats.STRING.parseValue(cardIdTextField.getText());
people[6] = m_jImage.getImage(); people[6] = imageEditor.getImage();
return people; return people;
} }
@@ -230,49 +230,56 @@ public class PeopleView extends JPanel implements EditorRecord {
// <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents // <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents
private void initComponents() { private void initComponents() {
jLabel1 = new javax.swing.JLabel(); nameLabel = new javax.swing.JLabel();
m_jName = new javax.swing.JTextField(); nameTextField = new javax.swing.JTextField();
m_jVisible = new javax.swing.JCheckBox(); isVisible = new javax.swing.JCheckBox();
jLabel3 = new javax.swing.JLabel(); visiableLabel = new javax.swing.JLabel();
jLabel4 = new javax.swing.JLabel(); imageLabel = new javax.swing.JLabel();
m_jImage = new com.unicenta.data.gui.JImageEditor(); imageEditor = new com.unicenta.data.gui.JImageEditor();
jButton1 = new javax.swing.JButton(); jButton1 = new javax.swing.JButton();
m_jRole = new javax.swing.JComboBox(); m_jRole = new javax.swing.JComboBox();
jLabel2 = new javax.swing.JLabel(); roleLabel = new javax.swing.JLabel();
m_jcard = new javax.swing.JTextField(); cardIdTextField = new javax.swing.JTextField();
jLblCardID = new javax.swing.JLabel(); cardIdLabel = new javax.swing.JLabel();
webCBSecurity = new com.alee.laf.combobox.WebComboBox(); passwordLabel = new javax.swing.JLabel();
jLabel6 = new javax.swing.JLabel(); taxIdLabel = new javax.swing.JLabel();
taxIdTextField = new javax.swing.JTextField();
setFont(new java.awt.Font("Arial", 0, 12)); // NOI18N setFont(new java.awt.Font("Arial", 0, 12)); // NOI18N
setPreferredSize(new java.awt.Dimension(500, 500)); setPreferredSize(new java.awt.Dimension(500, 500));
jLabel1.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N nameLabel.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
jLabel1.setIcon(new javax.swing.ImageIcon(getClass().getResource("/com/unicenta/images/info.png"))); // NOI18N nameLabel.setIcon(new javax.swing.ImageIcon(getClass().getResource("/com/unicenta/images/info.png"))); // NOI18N
jLabel1.setText(AppLocal.getIntString("label.peoplenamem")); // NOI18N nameLabel.setText(AppLocal.getIntString("label.peoplenamem")); // NOI18N
jLabel1.setPreferredSize(new java.awt.Dimension(110, 30)); nameLabel.setPreferredSize(new java.awt.Dimension(110, 30));
jLabel1.addMouseListener(new java.awt.event.MouseAdapter() { nameLabel.addMouseListener(new java.awt.event.MouseAdapter() {
public void mouseClicked(java.awt.event.MouseEvent evt) { public void mouseClicked(java.awt.event.MouseEvent evt) {
jLabel1MouseClicked(evt); nameLabelMouseClicked(evt);
} }
}); });
add(nameLabel);
m_jName.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N nameTextField.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
m_jName.setPreferredSize(new java.awt.Dimension(0, 30)); nameTextField.setPreferredSize(new java.awt.Dimension(0, 30));
add(nameTextField);
m_jVisible.setFont(new java.awt.Font("Arial", 0, 12)); // NOI18N isVisible.setFont(new java.awt.Font("Arial", 0, 12)); // NOI18N
m_jVisible.setPreferredSize(new java.awt.Dimension(0, 30)); isVisible.setPreferredSize(new java.awt.Dimension(0, 30));
add(isVisible);
jLabel3.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N visiableLabel.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
jLabel3.setText(AppLocal.getIntString("label.peoplevisible")); // NOI18N visiableLabel.setText(AppLocal.getIntString("label.peoplevisible")); // NOI18N
jLabel3.setPreferredSize(new java.awt.Dimension(110, 30)); visiableLabel.setPreferredSize(new java.awt.Dimension(110, 30));
add(visiableLabel);
jLabel4.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N imageLabel.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
jLabel4.setText(AppLocal.getIntString("label.peopleimage")); // NOI18N imageLabel.setText(AppLocal.getIntString("label.peopleimage")); // NOI18N
jLabel4.setPreferredSize(new java.awt.Dimension(110, 30)); imageLabel.setPreferredSize(new java.awt.Dimension(110, 30));
add(imageLabel);
m_jImage.setFont(new java.awt.Font("Arial", 0, 12)); // NOI18N imageEditor.setFont(new java.awt.Font("Arial", 0, 12)); // NOI18N
m_jImage.setPreferredSize(new java.awt.Dimension(300, 250)); imageEditor.setPreferredSize(new java.awt.Dimension(300, 250));
add(imageEditor);
jButton1.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N jButton1.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
@@ -284,101 +291,34 @@ 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);
jLabel2.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N roleLabel.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
jLabel2.setText(AppLocal.getIntString("label.rolem")); // NOI18N roleLabel.setText(AppLocal.getIntString("label.rolem")); // NOI18N
jLabel2.setPreferredSize(new java.awt.Dimension(110, 30)); roleLabel.setPreferredSize(new java.awt.Dimension(110, 30));
add(roleLabel);
m_jcard.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N cardIdTextField.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
m_jcard.setPreferredSize(new java.awt.Dimension(0, 30)); cardIdTextField.setPreferredSize(new java.awt.Dimension(0, 30));
add(cardIdTextField);
jLblCardID.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N cardIdLabel.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
jLblCardID.setText(AppLocal.getIntString("label.card")); // NOI18N cardIdLabel.setText(AppLocal.getIntString("label.card")); // NOI18N
jLblCardID.setPreferredSize(new java.awt.Dimension(110, 30)); cardIdLabel.setPreferredSize(new java.awt.Dimension(110, 30));
add(cardIdLabel);
webCBSecurity.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "Generate new key", "Delete exisitng key", "Use iButton ID" })); passwordLabel.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
webCBSecurity.setSelectedIndex(0); passwordLabel.setText(AppLocal.getIntString("label.Password")); // NOI18N
webCBSecurity.setToolTipText(AppLocal.getIntString("tooltip.peoplesecurity")); // NOI18N passwordLabel.setPreferredSize(new java.awt.Dimension(110, 30));
webCBSecurity.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N add(passwordLabel);
webCBSecurity.setPreferredSize(new java.awt.Dimension(140, 45));
webCBSecurity.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent evt) {
webCBSecurityActionPerformed(evt);
}
});
jLabel6.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N taxIdLabel.setText("Tax ID");
jLabel6.setText(AppLocal.getIntString("label.Password")); // NOI18N add(taxIdLabel);
jLabel6.setPreferredSize(new java.awt.Dimension(110, 30)); add(taxIdTextField);
javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
this.setLayout(layout);
layout.setHorizontalGroup(
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(layout.createSequentialGroup()
.addContainerGap()
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(layout.createSequentialGroup()
.addComponent(jLabel3, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
.addGap(18, 18, 18)
.addComponent(m_jVisible, javax.swing.GroupLayout.PREFERRED_SIZE, 207, javax.swing.GroupLayout.PREFERRED_SIZE))
.addGroup(layout.createSequentialGroup()
.addComponent(jLabel2, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
.addComponent(m_jRole, javax.swing.GroupLayout.PREFERRED_SIZE, 180, javax.swing.GroupLayout.PREFERRED_SIZE))
.addGroup(layout.createSequentialGroup()
.addComponent(jLabel4, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
.addComponent(m_jImage, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
.addGroup(layout.createSequentialGroup()
.addComponent(jLblCardID, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
.addComponent(m_jcard, javax.swing.GroupLayout.PREFERRED_SIZE, 180, javax.swing.GroupLayout.PREFERRED_SIZE)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(webCBSecurity, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
.addGroup(layout.createSequentialGroup()
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(jLabel1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
.addComponent(jLabel6, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(jButton1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
.addComponent(m_jName, javax.swing.GroupLayout.PREFERRED_SIZE, 180, javax.swing.GroupLayout.PREFERRED_SIZE))))
.addContainerGap())
);
layout.setVerticalGroup(
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup()
.addGap(18, 18, 18)
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
.addComponent(jLabel1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
.addComponent(m_jName, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.CENTER)
.addComponent(jLabel6, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
.addComponent(jButton1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.CENTER)
.addComponent(jLblCardID, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
.addComponent(m_jcard, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
.addComponent(webCBSecurity, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
.addComponent(jLabel2, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
.addComponent(m_jRole, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(jLabel3, javax.swing.GroupLayout.PREFERRED_SIZE, 25, javax.swing.GroupLayout.PREFERRED_SIZE)
.addComponent(m_jVisible, javax.swing.GroupLayout.PREFERRED_SIZE, 25, javax.swing.GroupLayout.PREFERRED_SIZE))
.addGap(15, 15, 15)
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(m_jImage, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
.addComponent(jLabel4, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
.addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
);
}// </editor-fold>//GEN-END:initComponents }// </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
@@ -401,7 +341,7 @@ public class PeopleView extends JPanel implements EditorRecord {
JOptionPane.YES_NO_OPTION, JOptionPane.YES_NO_OPTION,
JOptionPane.QUESTION_MESSAGE) == JOptionPane.YES_OPTION) JOptionPane.QUESTION_MESSAGE) == JOptionPane.YES_OPTION)
{ {
m_jcard.setText("C" + StringUtils.getCardNumber()); cardIdTextField.setText("C" + StringUtils.getCardNumber());
m_Dirty.setDirty(true); m_Dirty.setDirty(true);
} }
} }
@@ -413,7 +353,7 @@ public class PeopleView extends JPanel implements EditorRecord {
JOptionPane.YES_NO_OPTION, JOptionPane.YES_NO_OPTION,
JOptionPane.QUESTION_MESSAGE) == JOptionPane.YES_OPTION) JOptionPane.QUESTION_MESSAGE) == JOptionPane.YES_OPTION)
{ {
m_jcard.setText(null); cardIdTextField.setText(null);
m_Dirty.setDirty(true); m_Dirty.setDirty(true);
} }
} }
@@ -426,8 +366,8 @@ public class PeopleView extends JPanel implements EditorRecord {
JOptionPane.INFORMATION_MESSAGE) == JOptionPane.OK_OPTION) JOptionPane.INFORMATION_MESSAGE) == JOptionPane.OK_OPTION)
{ {
m_jcard.setText( uOWWatch.getibuttonid() ); cardIdTextField.setText( uOWWatch.getibuttonid() );
jLblCardID.setText(AppLocal.getIntString("label.ibutton")); cardIdLabel.setText(AppLocal.getIntString("label.ibutton"));
m_Dirty.setDirty(true); m_Dirty.setDirty(true);
} }
@@ -435,7 +375,7 @@ public class PeopleView extends JPanel implements EditorRecord {
}//GEN-LAST:event_webCBSecurityActionPerformed }//GEN-LAST:event_webCBSecurityActionPerformed
private void jLabel1MouseClicked(java.awt.event.MouseEvent evt) {//GEN-FIRST:event_jLabel1MouseClicked private void nameLabelMouseClicked(java.awt.event.MouseEvent evt) {//GEN-FIRST:event_nameLabelMouseClicked
if (evt.getClickCount() == 2) { if (evt.getClickCount() == 2) {
String uuidString = m_oId.toString(); String uuidString = m_oId.toString();
StringSelection stringSelection = new StringSelection(uuidString); StringSelection stringSelection = new StringSelection(uuidString);
@@ -445,23 +385,24 @@ public class PeopleView extends JPanel implements EditorRecord {
JOptionPane.showMessageDialog(null, JOptionPane.showMessageDialog(null,
AppLocal.getIntString("message.uuidcopy")); AppLocal.getIntString("message.uuidcopy"));
} }
}//GEN-LAST:event_jLabel1MouseClicked }//GEN-LAST:event_nameLabelMouseClicked
// 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.JCheckBox m_jVisible; private javax.swing.JLabel nameLabel;
private javax.swing.JTextField m_jcard; private javax.swing.JTextField nameTextField;
private com.alee.laf.combobox.WebComboBox webCBSecurity; 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;
// End of variables declaration//GEN-END:variables // End of variables declaration//GEN-END:variables
} }
src/main/java/com/unicenta/pos/customers/CustomersPayment.java
+83 -46
View File
@@ -174,7 +174,8 @@ 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 && customer.getCurdebt().doubleValue() > 0.0); // btnPay.setEnabled(customer.getCurdebt() != null &&
// customer.getCurdebt().doubleValue() > 0.0);
} }
@@ -257,12 +258,14 @@ public class CustomersPayment extends javax.swing.JPanel implements JPanelView,
} }
} }
/** This method is called from within the constructor to /**
* This method is called from within the constructor to
* initialize the form. * 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 Code">//GEN-BEGIN:initComponents // <editor-fold defaultstate="collapsed" desc="Generated
// Code">//GEN-BEGIN:initComponents
private void initComponents() { private void initComponents() {
java.awt.GridBagConstraints gridBagConstraints; java.awt.GridBagConstraints gridBagConstraints;
@@ -510,80 +513,111 @@ 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, javax.swing.GroupLayout.PREFERRED_SIZE) .addComponent(jLabel3, javax.swing.GroupLayout.PREFERRED_SIZE, 140,
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, javax.swing.GroupLayout.PREFERRED_SIZE)) .addComponent(txtName, javax.swing.GroupLayout.PREFERRED_SIZE, 240,
javax.swing.GroupLayout.PREFERRED_SIZE))
.addGroup(jPanel1Layout.createSequentialGroup() .addGroup(jPanel1Layout.createSequentialGroup()
.addComponent(jLabel5, javax.swing.GroupLayout.PREFERRED_SIZE, 140, javax.swing.GroupLayout.PREFERRED_SIZE) .addComponent(jLabel5, javax.swing.GroupLayout.PREFERRED_SIZE, 140,
javax.swing.GroupLayout.PREFERRED_SIZE)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
.addComponent(txtCard, javax.swing.GroupLayout.PREFERRED_SIZE, 240, javax.swing.GroupLayout.PREFERRED_SIZE)) .addComponent(txtCard, javax.swing.GroupLayout.PREFERRED_SIZE, 240,
javax.swing.GroupLayout.PREFERRED_SIZE))
.addGroup(jPanel1Layout.createSequentialGroup() .addGroup(jPanel1Layout.createSequentialGroup()
.addComponent(jLabel7, javax.swing.GroupLayout.PREFERRED_SIZE, 140, javax.swing.GroupLayout.PREFERRED_SIZE) .addComponent(jLabel7, javax.swing.GroupLayout.PREFERRED_SIZE, 140,
javax.swing.GroupLayout.PREFERRED_SIZE)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
.addComponent(txtTaxId, javax.swing.GroupLayout.PREFERRED_SIZE, 240, javax.swing.GroupLayout.PREFERRED_SIZE)) .addComponent(txtTaxId, javax.swing.GroupLayout.PREFERRED_SIZE, 240,
javax.swing.GroupLayout.PREFERRED_SIZE))
.addGroup(jPanel1Layout.createSequentialGroup() .addGroup(jPanel1Layout.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, javax.swing.GroupLayout.PREFERRED_SIZE) .addComponent(jLabel12, javax.swing.GroupLayout.PREFERRED_SIZE, 140,
.addComponent(jLabel4, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) javax.swing.GroupLayout.PREFERRED_SIZE)
.addComponent(jLabel4, javax.swing.GroupLayout.PREFERRED_SIZE,
javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) .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, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) .addComponent(txtPrePay, javax.swing.GroupLayout.PREFERRED_SIZE,
.addComponent(txtNotes, javax.swing.GroupLayout.PREFERRED_SIZE, 250, javax.swing.GroupLayout.PREFERRED_SIZE))))) javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
.addComponent(txtNotes, javax.swing.GroupLayout.PREFERRED_SIZE, 250,
javax.swing.GroupLayout.PREFERRED_SIZE)))))
.addGroup(jPanel1Layout.createSequentialGroup() .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, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) .addComponent(txtMaxdebt, javax.swing.GroupLayout.PREFERRED_SIZE,
javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(txtCurdebt, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) .addComponent(txtCurdebt, javax.swing.GroupLayout.PREFERRED_SIZE,
javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
.addGroup(jPanel1Layout.createSequentialGroup() .addGroup(jPanel1Layout.createSequentialGroup()
.addComponent(jLabel1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) .addComponent(jLabel1, javax.swing.GroupLayout.PREFERRED_SIZE,
javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(jLabel2, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))) .addComponent(jLabel2, javax.swing.GroupLayout.PREFERRED_SIZE,
javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)))
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .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, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) .addComponent(jLabel6, javax.swing.GroupLayout.PREFERRED_SIZE,
.addComponent(txtCurdate, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)))) javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
.addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) .addComponent(txtCurdate, javax.swing.GroupLayout.PREFERRED_SIZE,
); javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))))
.addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)));
jPanel1Layout.setVerticalGroup( jPanel1Layout.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, javax.swing.GroupLayout.PREFERRED_SIZE) .addComponent(jLabel7, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE,
.addComponent(txtTaxId, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) javax.swing.GroupLayout.PREFERRED_SIZE)
.addComponent(txtTaxId, javax.swing.GroupLayout.PREFERRED_SIZE,
javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .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, javax.swing.GroupLayout.PREFERRED_SIZE) .addComponent(jLabel3, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE,
.addComponent(txtName, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) javax.swing.GroupLayout.PREFERRED_SIZE)
.addComponent(txtName, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE,
javax.swing.GroupLayout.PREFERRED_SIZE))
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .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, javax.swing.GroupLayout.PREFERRED_SIZE) .addComponent(jLabel5, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE,
.addComponent(txtCard, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) javax.swing.GroupLayout.PREFERRED_SIZE)
.addComponent(txtCard, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE,
javax.swing.GroupLayout.PREFERRED_SIZE))
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .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, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) .addComponent(jLabel12, javax.swing.GroupLayout.PREFERRED_SIZE,
.addComponent(txtNotes, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
.addComponent(txtNotes, javax.swing.GroupLayout.PREFERRED_SIZE,
javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .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, javax.swing.GroupLayout.PREFERRED_SIZE) .addComponent(jLabel4, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE,
.addComponent(txtPrePay, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) javax.swing.GroupLayout.PREFERRED_SIZE)
.addComponent(txtPrePay, javax.swing.GroupLayout.PREFERRED_SIZE,
javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
.addGap(30, 30, 30) .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, javax.swing.GroupLayout.PREFERRED_SIZE) .addComponent(jLabel1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE,
.addComponent(jLabel2, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) javax.swing.GroupLayout.PREFERRED_SIZE)
.addComponent(jLabel6, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) .addComponent(jLabel2, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE,
javax.swing.GroupLayout.PREFERRED_SIZE)
.addComponent(jLabel6, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE,
javax.swing.GroupLayout.PREFERRED_SIZE))
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .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, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) .addComponent(txtCurdebt, javax.swing.GroupLayout.PREFERRED_SIZE,
.addComponent(txtMaxdebt, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
.addComponent(txtCurdate, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) .addComponent(txtMaxdebt, javax.swing.GroupLayout.PREFERRED_SIZE,
.addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
); .addComponent(txtCurdate, javax.swing.GroupLayout.PREFERRED_SIZE,
javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
.addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)));
add(jPanel1, java.awt.BorderLayout.CENTER); 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();
@@ -612,7 +646,8 @@ 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"), ex); MessageInf msg = new MessageInf(MessageInf.SGN_WARNING, AppLocal.getIntString("message.cannotfindcustomer"),
ex);
msg.show(this); msg.show(this);
} }
} }
@@ -642,7 +677,7 @@ public class CustomersPayment extends javax.swing.JPanel implements JPanelView,
ticket.setPayments(payments); ticket.setPayments(payments);
ticket.setUser(app.getAppUserView().getUser().getUserInfo()); ticket.setUserInfo(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);
@@ -654,7 +689,6 @@ 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 {
@@ -667,7 +701,8 @@ 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"), ex); MessageInf msg = new MessageInf(MessageInf.SGN_WARNING, AppLocal.getIntString("message.cannotfindcustomer"),
ex);
msg.show(this); msg.show(this);
} }
@@ -720,7 +755,7 @@ public class CustomersPayment extends javax.swing.JPanel implements JPanelView,
ticket.setPayments(payments); ticket.setPayments(payments);
ticket.setUser(app.getAppUserView().getUser().getUserInfo()); ticket.setUserInfo(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);
@@ -736,14 +771,16 @@ 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, AppLocal.getIntString("message.cannotfindcustomer")); MessageInf msg = new MessageInf(MessageInf.SGN_WARNING,
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"), ex); MessageInf msg = new MessageInf(MessageInf.SGN_WARNING, AppLocal.getIntString("message.cannotfindcustomer"),
ex);
msg.show(this); msg.show(this);
} }
src/main/java/com/unicenta/pos/forms/DataLogicSales.java
+338 -486
View File
File diff suppressed because it is too large Load Diff
src/main/java/com/unicenta/pos/sales/DataLogicReceipts.java
+49 -67
View File
@@ -64,11 +64,10 @@ public class DataLogicReceipts extends BeanFactoryDataSingle {
if (Id == null) { if (Id == null) {
return null; return null;
} else { } else {
Object[]record = (Object[]) new StaticSentence(s Object[] record = (Object[]) new StaticSentence(s, "SELECT CONTENT, LOCKED FROM sharedtickets WHERE ID = ?",
, "SELECT CONTENT, LOCKED FROM sharedtickets WHERE ID = ?" SerializerWriteString.INSTANCE, new SerializerReadBasic(new Datas[] {
, SerializerWriteString.INSTANCE Datas.SERIALIZABLE }))
, new SerializerReadBasic(new Datas[] { .find(Id);
Datas.SERIALIZABLE})).find(Id);
return record == null ? null : (TicketInfo) record[0]; return record == null ? null : (TicketInfo) record[0];
} }
} }
@@ -84,32 +83,34 @@ public class DataLogicReceipts extends BeanFactoryDataSingle {
if (pickupId == null) { if (pickupId == null) {
return null; return null;
} else { } else {
Object[]record = (Object[]) new StaticSentence(s Object[] record = (Object[]) new StaticSentence(s, "SELECT CONTENT, LOCKED FROM sharedtickets WHERE PICKUPID = ?",
, "SELECT CONTENT, LOCKED FROM sharedtickets WHERE PICKUPID = ?" SerializerWriteString.INSTANCE, new SerializerReadBasic(new Datas[] {
, SerializerWriteString.INSTANCE Datas.SERIALIZABLE }))
, new SerializerReadBasic(new Datas[] { .find(pickupId);
Datas.SERIALIZABLE})).find(pickupId);
return record == null ? null : (TicketInfo) record[0]; return record == null ? null : (TicketInfo) record[0];
} }
} }
/** /**
* JG Dec 14 Administrator and Manager Roles always have access to ALL SHAREDtickets * JG Dec 14 Administrator and Manager Roles always have access to ALL
* SHAREDtickets
*
* @return * @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 ORDER BY ID" // , "SELECT ID, NAME, CONTENT, APPUSER, PICKUPID, LOCKED FROM sharedtickets
// 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 null, new SerializerReadClass(SharedTicketInfo.class)).list();
, 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
@@ -119,14 +120,13 @@ public class DataLogicReceipts extends BeanFactoryDataSingle {
+ "FROM sharedtickets " + "FROM sharedtickets "
+ "WHERE APPUSER =\"" + appuser + "\" ORDER BY PICKUPID"; + "WHERE APPUSER =\"" + appuser + "\" ORDER BY PICKUPID";
return (List<SharedTicketInfo>) new StaticSentence(s return (List<SharedTicketInfo>) new StaticSentence(s, sql, null, new SerializerReadClass(SharedTicketInfo.class))
, sql .list();
, null
, new SerializerReadClass(SharedTicketInfo.class)).list();
} }
/** /**
* For Standard View * 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.getUser().getId(), ticket.getUserInfo().getId(),
pickupid pickupid
}; };
@@ -151,15 +151,13 @@ public class DataLogicReceipts extends BeanFactoryDataSingle {
Datas.INT Datas.INT
}; };
new PreparedSentence(s new PreparedSentence(s, "INSERT INTO sharedtickets ("
, "INSERT INTO sharedtickets ("
+ "ID, " + "ID, "
+ "NAME, " + "NAME, "
+ "CONTENT, " + "CONTENT, "
+ "APPUSER, " + "APPUSER, "
+ "PICKUPID) " + "PICKUPID) "
+ "VALUES (?, ?, ?, ?, ?)" + "VALUES (?, ?, ?, ?, ?)", new SerializerWriteBasicExt(datas, new int[] { 0, 1, 2, 3, 4 })).exec(values);
, new SerializerWriteBasicExt(datas, new int[] {0, 1, 2, 3, 4})).exec(values);
} }
/** /**
@@ -175,7 +173,7 @@ public class DataLogicReceipts extends BeanFactoryDataSingle {
id, id,
ticket.getName(), ticket.getName(),
ticket, ticket,
ticket.getUser().getId(), ticket.getUserInfo().getId(),
pickupid pickupid
}; };
Datas[] datas = new Datas[] { Datas[] datas = new Datas[] {
@@ -185,16 +183,16 @@ public class DataLogicReceipts extends BeanFactoryDataSingle {
Datas.STRING, Datas.STRING,
Datas.INT Datas.INT
}; };
new PreparedSentence(s new PreparedSentence(s, "UPDATE sharedtickets SET "
, "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})).exec(values); 1, 2, 3, 4, 0 }))
.exec(values);
} }
/** /**
@@ -221,18 +219,17 @@ public class DataLogicReceipts extends BeanFactoryDataSingle {
Datas.SERIALIZABLE, Datas.SERIALIZABLE,
Datas.INT Datas.INT
}; };
new PreparedSentence(s new PreparedSentence(s, "UPDATE sharedtickets SET "
, "UPDATE sharedtickets SET "
+ "NAME = ?, " + "NAME = ?, "
+ "CONTENT = ?, " + "CONTENT = ?, "
+ "PICKUPID = ? " + "PICKUPID = ? "
+ "WHERE ID = ?" + "WHERE ID = ?", new SerializerWriteBasicExt(datas, new int[] { 1, 2, 3, 0 })).exec(values);
, new SerializerWriteBasicExt(datas, new int[] {1, 2, 3, 0})).exec(values);
} }
/** /**
* In place for multi-purposing like containing data from elsewhere and/or * 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
@@ -247,16 +244,15 @@ public class DataLogicReceipts extends BeanFactoryDataSingle {
Datas.STRING, Datas.STRING,
Datas.STRING Datas.STRING
}; };
new PreparedSentence(s new PreparedSentence(s, "UPDATE sharedtickets SET "
, "UPDATE sharedtickets SET "
+ "LOCKED = ? " + "LOCKED = ? "
+ "WHERE ID = ?" + "WHERE ID = ?", new SerializerWriteBasicExt(datas, new int[] { 1, 0 })).exec(values);
, new SerializerWriteBasicExt(datas, new int[] {1, 0})).exec(values);
} }
/** /**
* In place for multi-purposing like flushing locks from elsewhere and/or * 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
@@ -271,15 +267,14 @@ public class DataLogicReceipts extends BeanFactoryDataSingle {
Datas.STRING, Datas.STRING,
Datas.STRING Datas.STRING
}; };
new PreparedSentence(s new PreparedSentence(s, "UPDATE sharedtickets SET "
, "UPDATE sharedtickets SET "
+ "LOCKED = ? " + "LOCKED = ? "
+ "WHERE ID = ?" + "WHERE ID = ?", new SerializerWriteBasicExt(datas, new int[] { 1, 0 })).exec(values);
, new SerializerWriteBasicExt(datas, new int[] {1, 0})).exec(values);
} }
/** /**
* For Restaurant View * For Restaurant View
*
* @param id * @param id
* @param ticket * @param ticket
* @param pickupid * @param pickupid
@@ -294,7 +289,7 @@ public class DataLogicReceipts extends BeanFactoryDataSingle {
id, id,
ticket.getName(), ticket.getName(),
ticket, ticket,
ticket.getUser(), ticket.getUserInfo(),
ticket.getPickupId(), ticket.getPickupId(),
ticket.getHost() ticket.getHost()
}; };
@@ -307,15 +302,13 @@ public class DataLogicReceipts extends BeanFactoryDataSingle {
Datas.INT Datas.INT
}; };
new PreparedSentence(s new PreparedSentence(s, "INSERT INTO sharedtickets ("
, "INSERT INTO sharedtickets ("
+ "ID, " + "ID, "
+ "NAME, " + "NAME, "
+ "CONTENT, " + "CONTENT, "
+ "APPUSER, " + "APPUSER, "
+ "PICKUPID) " + "PICKUPID) "
+ "VALUES (?, ?, ?, ?, ?)" + "VALUES (?, ?, ?, ?, ?)", new SerializerWriteBasicExt(datas, new int[] { 0, 1, 2, 3, 4 })).exec(values);
, new SerializerWriteBasicExt(datas, new int[] {0, 1, 2, 3, 4})).exec(values);
} }
/** /**
@@ -325,9 +318,7 @@ public class DataLogicReceipts extends BeanFactoryDataSingle {
*/ */
public final void deleteSharedTicket(final String id) throws BasicException { public final void deleteSharedTicket(final String id) throws BasicException {
new StaticSentence(s new StaticSentence(s, "DELETE FROM sharedtickets WHERE ID = ?", SerializerWriteString.INSTANCE).exec(id);
, "DELETE FROM sharedtickets WHERE ID = ?"
, SerializerWriteString.INSTANCE).exec(id);
} }
/** /**
@@ -341,20 +332,15 @@ public class DataLogicReceipts extends BeanFactoryDataSingle {
if (Id == null) { if (Id == null) {
return null; return null;
} else { } else {
Object[]record = (Object[]) new StaticSentence(s Object[] record = (Object[]) new StaticSentence(s, "SELECT PICKUPID FROM sharedtickets WHERE ID = ?",
, "SELECT PICKUPID FROM sharedtickets WHERE ID = ?" SerializerWriteString.INSTANCE, new SerializerReadBasic(new Datas[] { Datas.INT })).find(Id);
, SerializerWriteString.INSTANCE
, new SerializerReadBasic(new Datas[] {Datas.INT})).find(Id);
return record == null ? 0 : (Integer) record[0]; 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 Object[] userID = (Object[]) new StaticSentence(s, "SELECT APPUSER FROM sharedtickets WHERE ID = ?",
, "SELECT APPUSER FROM sharedtickets WHERE ID = ?" SerializerWriteString.INSTANCE, new SerializerReadBasic(new Datas[] { Datas.STRING })).find(id);
, SerializerWriteString.INSTANCE
, new SerializerReadBasic(new Datas[] {Datas.STRING})).find(id);
if (userID == null) { if (userID == null) {
return null; return null;
} else { } else {
@@ -363,20 +349,16 @@ 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 Object[] state = (Object[]) new StaticSentence(s, "SELECT LOCKED FROM sharedtickets WHERE ID = ?",
, "SELECT LOCKED FROM sharedtickets WHERE ID = ?" SerializerWriteString.INSTANCE, new SerializerReadBasic(new Datas[] {
, SerializerWriteString.INSTANCE
, new SerializerReadBasic(new Datas[] {
Datas.STRING 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 Object[] server = (Object[]) new StaticSentence(s, "SELECT appuser FROM sharedtickets WHERE ID = ?",
, "SELECT appuser FROM sharedtickets WHERE ID = ?" SerializerWriteString.INSTANCE, new SerializerReadBasic(new Datas[] {
, SerializerWriteString.INSTANCE
, new SerializerReadBasic(new Datas[] {
Datas.STRING Datas.STRING
})).find(id); })).find(id);
return (String) server[0]; return (String) server[0];
src/main/java/com/unicenta/pos/sales/JPanelTicket.java
+138 -149
View File
@@ -74,7 +74,6 @@ import java.util.*;
import static java.awt.Window.getWindows; import static java.awt.Window.getWindows;
/** /**
* @author JG uniCenta * @author JG uniCenta
*/ */
@@ -155,7 +154,6 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
private Integer oCount = 0; private Integer oCount = 0;
private Boolean pinOK; private Boolean pinOK;
/** /**
* Creates new form JTicketView * Creates new form JTicketView
*/ */
@@ -182,8 +180,8 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
dlCustomers = (DataLogicCustomers) m_App.getBean("com.unicenta.pos.customers.DataLogicCustomers"); dlCustomers = (DataLogicCustomers) m_App.getBean("com.unicenta.pos.customers.DataLogicCustomers");
dlReceipts = (DataLogicReceipts) app.getBean("com.unicenta.pos.sales.DataLogicReceipts"); dlReceipts = (DataLogicReceipts) app.getBean("com.unicenta.pos.sales.DataLogicReceipts");
/*
/* uniCenta Feb 2018 * uniCenta Feb 2018
* Changed for 4.3 * Changed for 4.3
* Set up main toolbar area with two rows to add cater for additional scripts * Set up main toolbar area with two rows to add cater for additional scripts
* else over-crowding and some dynamic buttons off screen/not visible * else over-crowding and some dynamic buttons off screen/not visible
@@ -191,7 +189,8 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
* Resources>Menu.Root * Resources>Menu.Root
*/ */
// Set Configuration>General>Tickets toolbar simple : standard : restaurant option // Set Configuration>General>Tickets toolbar simple : standard : restaurant
// option
m_ticketsbag = getJTicketsBag(); m_ticketsbag = getJTicketsBag();
m_jPanelBag.add(m_ticketsbag.getBagComponent(), BorderLayout.LINE_START); m_jPanelBag.add(m_ticketsbag.getBagComponent(), BorderLayout.LINE_START);
add(m_ticketsbag.getNullComponent(), "null"); add(m_ticketsbag.getNullComponent(), "null");
@@ -327,7 +326,6 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
} }
} }
} }
@Override @Override
@@ -512,7 +510,7 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
m_oTicketExt = oTicketExt; m_oTicketExt = oTicketExt;
if (m_oTicket != null) { if (m_oTicket != null) {
m_oTicket.setUser(m_App.getAppUserView().getUser().getUserInfo()); m_oTicket.setUserInfo(m_App.getAppUserView().getUser().getUserInfo());
m_oTicket.setActiveCash(m_App.getActiveCashIndex()); m_oTicket.setActiveCash(m_App.getActiveCashIndex());
m_oTicket.setDate(new Date()); m_oTicket.setDate(new Date());
@@ -818,10 +816,8 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
// if (m_App.getProperties().getProperty("override.check").equals("true")) { // if (m_App.getProperties().getProperty("override.check").equals("true")) {
if (!m_oTicket.getLine(i).getUpdated()) { if (!m_oTicket.getLine(i).getUpdated()) {
JOptionPane.showMessageDialog(this JOptionPane.showMessageDialog(this, AppLocal.getIntString("message.deletelinesent"),
, AppLocal.getIntString("message.deletelinesent") AppLocal.getIntString("label.deleteline"), JOptionPane.WARNING_MESSAGE);
, AppLocal.getIntString("label.deleteline")
, JOptionPane.WARNING_MESSAGE);
} else { } else {
if (executeEventAndRefresh("ticket.removeline", new ScriptArg("index", i)) == null) { if (executeEventAndRefresh("ticket.removeline", new ScriptArg("index", i)) == null) {
String ticketID = Integer.toString(m_oTicket.getTicketId()); String ticketID = Integer.toString(m_oTicket.getTicketId());
@@ -835,8 +831,7 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
m_oTicket.getLine(i).getProductID(), m_oTicket.getLine(i).getProductID(),
m_oTicket.getLine(i).getProductName(), m_oTicket.getLine(i).getProductName(),
m_oTicket.getLine(i).getMultiply() m_oTicket.getLine(i).getMultiply()
} });
);
if (m_oTicket.getLine(i).isProductCom()) { if (m_oTicket.getLine(i).isProductCom()) {
m_oTicket.removeLine(i); m_oTicket.removeLine(i);
@@ -846,8 +841,8 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
if (m_App.getAppUserView().getUser().hasPermission("sales.DeleteLines")) { if (m_App.getAppUserView().getUser().hasPermission("sales.DeleteLines")) {
int input = JOptionPane.showConfirmDialog(this, int input = JOptionPane.showConfirmDialog(this,
AppLocal.getIntString("message.deletelineyes") AppLocal.getIntString("message.deletelineyes"), AppLocal.getIntString("label.deleteline"),
, AppLocal.getIntString("label.deleteline"), JOptionPane.YES_NO_OPTION); JOptionPane.YES_NO_OPTION);
if (input == 0) { if (input == 0) {
m_oTicket.removeLine(i); m_oTicket.removeLine(i);
@@ -855,8 +850,8 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
} }
} else { } else {
JOptionPane.showMessageDialog(this, JOptionPane.showMessageDialog(this,
AppLocal.getIntString("message.deletelineno") AppLocal.getIntString("message.deletelineno"), AppLocal.getIntString("label.deleteline"),
, AppLocal.getIntString("label.deleteline"), JOptionPane.WARNING_MESSAGE); JOptionPane.WARNING_MESSAGE);
} }
} else { } else {
m_oTicket.removeLine(i); m_oTicket.removeLine(i);
@@ -911,7 +906,6 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
return dValue / (1.0 + dTaxRate); return dValue / (1.0 + dTaxRate);
} }
private double getInputValue() { private double getInputValue() {
try { try {
return Double.parseDouble(m_jPrice.getText()); return Double.parseDouble(m_jPrice.getText());
@@ -1073,9 +1067,9 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
} else if (sCode.startsWith(";")) { } else if (sCode.startsWith(";")) {
stateToZero(); stateToZero();
// START OF BARCODE PARSING // START OF BARCODE PARSING
/* This block is deliberately verbose and is base for future scanner handling /*
* This block is deliberately verbose and is base for future scanner handling
* Some scanners inject a CR+LF... some don't... * Some scanners inject a CR+LF... some don't...
* stateTransition() must allow for this as these add characters to .length() * stateTransition() must allow for this as these add characters to .length()
* First 3 digits are GS1 CountryCode OR Retailer internal use * First 3 digits are GS1 CountryCode OR Retailer internal use
@@ -1169,8 +1163,8 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
} }
TaxInfo tax = taxeslogic // get the TaxRate for the product TaxInfo tax = taxeslogic // get the TaxRate for the product
.getTaxInfo(oProduct.getTaxCategoryID() .getTaxInfo(oProduct.getTaxCategoryID(), m_oTicket.getCustomer()); // calculate if ticket has a
, m_oTicket.getCustomer()); // calculate if ticket has a Customer // Customer
switch (sVariableTypePrefix) { switch (sVariableTypePrefix) {
// PRICE - Assign var's // PRICE - Assign var's
@@ -1179,32 +1173,28 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
/ (1.0 + tax.getRate()); // selling price with tax / (1.0 + tax.getRate()); // selling price with tax
dUnits = (Double.parseDouble(sVariableNum) dUnits = (Double.parseDouble(sVariableNum)
/ 100) / oProduct.getPriceSellTax(tax); // Units as proportion of selling price / 100) / oProduct.getPriceSellTax(tax); // Units as proportion of selling price
oProduct.setProperty("product.price" oProduct.setProperty("product.price", Double.toString(oProduct.getPriceSell())); // push to screen
, Double.toString(oProduct.getPriceSell())); // push to screen
break; break;
case "20": // as above case "20": // as above
dPriceSell = oProduct.getPriceSellTax(tax) dPriceSell = oProduct.getPriceSellTax(tax)
/ (1.0 + tax.getRate()); / (1.0 + tax.getRate());
dUnits = (Double.parseDouble(sVariableNum) dUnits = (Double.parseDouble(sVariableNum)
/ 100) / oProduct.getPriceSellTax(tax); / 100) / oProduct.getPriceSellTax(tax);
oProduct.setProperty("product.price" oProduct.setProperty("product.price", Double.toString(oProduct.getPriceSellTax(tax)));
, Double.toString(oProduct.getPriceSellTax(tax)));
break; break;
case "21": case "21":
dPriceSell = oProduct.getPriceSellTax(tax) dPriceSell = oProduct.getPriceSellTax(tax)
/ (1.0 + tax.getRate()); / (1.0 + tax.getRate());
dUnits = (Double.parseDouble(sVariableNum) dUnits = (Double.parseDouble(sVariableNum)
/ 10) / oProduct.getPriceSellTax(tax); / 10) / oProduct.getPriceSellTax(tax);
oProduct.setProperty("product.price" oProduct.setProperty("product.price", Double.toString(oProduct.getPriceSell()));
, Double.toString(oProduct.getPriceSell()));
break; break;
case "22": case "22":
dPriceSell = oProduct.getPriceSellTax(tax) dPriceSell = oProduct.getPriceSellTax(tax)
/ (1.0 + tax.getRate()); / (1.0 + tax.getRate());
dUnits = (Double.parseDouble(sVariableNum) dUnits = (Double.parseDouble(sVariableNum)
/ 1) / oProduct.getPriceSellTax(tax); / 1) / oProduct.getPriceSellTax(tax);
oProduct.setProperty("product.price" oProduct.setProperty("product.price", Double.toString(oProduct.getPriceSell()));
, Double.toString(oProduct.getPriceSell()));
break; break;
// WEIGHT - Assign variable to Unit // WEIGHT - Assign variable to Unit
@@ -1212,28 +1202,22 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
weight = Double.parseDouble(sVariableNum) weight = Double.parseDouble(sVariableNum)
/ 1000; // 3 decimals = 01.049 kg / 1000; // 3 decimals = 01.049 kg
dUnits = weight; // which represents 1gramme Units dUnits = weight; // which represents 1gramme Units
oProduct.setProperty("product.weight" oProduct.setProperty("product.weight", Double.toString(weight));
, Double.toString(weight)); oProduct.setProperty("product.price", Double.toString(dPriceSell));
oProduct.setProperty("product.price"
, Double.toString(dPriceSell));
break; break;
case "24": case "24":
weight = Double.parseDouble(sVariableNum) weight = Double.parseDouble(sVariableNum)
/ 100; // 2 decimals = 010.49 kg / 100; // 2 decimals = 010.49 kg
dUnits = weight; // which represents 10gramme Units dUnits = weight; // which represents 10gramme Units
oProduct.setProperty("product.weight" oProduct.setProperty("product.weight", Double.toString(weight));
, Double.toString(weight)); oProduct.setProperty("product.price", Double.toString(dPriceSell));
oProduct.setProperty("product.price"
, Double.toString(dPriceSell));
break; break;
case "25": case "25":
weight = Double.parseDouble(sVariableNum) weight = Double.parseDouble(sVariableNum)
/ 10; // 1 decimal = 0104.9 kg / 10; // 1 decimal = 0104.9 kg
dUnits = weight; // which represents 100gramme Units dUnits = weight; // which represents 100gramme Units
oProduct.setProperty("product.weight" oProduct.setProperty("product.weight", Double.toString(weight));
, Double.toString(weight)); oProduct.setProperty("product.price", Double.toString(dPriceSell));
oProduct.setProperty("product.price"
, Double.toString(dPriceSell));
break; break;
/* /*
@@ -1241,27 +1225,25 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
* Use this section to add more case statements but these are not mandatory * Use this section to add more case statements but these are not mandatory
* If you have your own internal or other barcode schema then... * If you have your own internal or other barcode schema then...
* Example: * Example:
case "28": * case "28":
{ * {
// price has tax. Remove it from sPriceSell * // price has tax. Remove it from sPriceSell
TaxInfo tax = taxeslogic.getTaxInfo(oProduct.getTaxCategoryID(), m_oTicket.getCustomer()); * TaxInfo tax = taxeslogic.getTaxInfo(oProduct.getTaxCategoryID(),
dPriceSell /= (1.0 + tax.getRate()); * m_oTicket.getCustomer());
oProduct.setProperty("product.price", Double.toString(dPriceSell)); * dPriceSell /= (1.0 + tax.getRate());
weight = -1.0; * oProduct.setProperty("product.price", Double.toString(dPriceSell));
break; * weight = -1.0;
* break;
*/ */
default: default:
break; break;
} }
if (m_jaddtax.isSelected()) { if (m_jaddtax.isSelected()) {
addTicketLine(oProduct addTicketLine(oProduct, dUnits // weight
, dUnits //weight
, dPriceSell = oProduct.getPriceSellTax(tax)); , dPriceSell = oProduct.getPriceSellTax(tax));
} else { } else {
addTicketLine(oProduct addTicketLine(oProduct, dUnits, dPriceSell);
, dUnits
, dPriceSell);
} }
} }
} catch (BasicException eData) { } catch (BasicException eData) {
@@ -1270,14 +1252,15 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
} }
// UPC-A // UPC-A
/* Note: if begins 02 then its a standard /*
// UPC-A max value limitation is 4 digit price * Note: if begins 02 then its a standard
// UPC-A Extended uses State digit to give 5 digit price * // UPC-A max value limitation is 4 digit price
// uniCenta oPOS does not support UPC-A Extended at this time * // UPC-A Extended uses State digit to give 5 digit price
// Identifier Prod State Cost CheckCode * // uniCenta oPOS does not support UPC-A Extended at this time
// I PPPPP S CCCC K * // Identifier Prod State Cost CheckCode
// 1 23456 7 8901 2 * // I PPPPP S CCCC K
* // 1 23456 7 8901 2
*
* 0 = Standard UPC number (must have a zero to do zero-suppressed numbers) * 0 = Standard UPC number (must have a zero to do zero-suppressed numbers)
* 1 = Reserved * 1 = Reserved
* 2 = Random-weight items (fruits, vegetables, meats, etc.) * 2 = Random-weight items (fruits, vegetables, meats, etc.)
@@ -1295,8 +1278,7 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
&& (sCode.length() == 12)) { && (sCode.length() == 12)) {
try { try {
ProductInfoExt oProduct ProductInfoExt oProduct = dlSales.getProductInfoByUShortCode(sCode); // Return only UPC product
= dlSales.getProductInfoByUShortCode(sCode); // Return only UPC product
if (oProduct == null) { if (oProduct == null) {
Toolkit.getDefaultToolkit().beep(); Toolkit.getDefaultToolkit().beep();
@@ -1313,8 +1295,7 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
String sVariableNum = sCode.substring(7, 11); // grab the value from the code only using 4 digit price String sVariableNum = sCode.substring(7, 11); // grab the value from the code only using 4 digit price
TaxInfo tax = taxeslogic // get the TaxRate for the product TaxInfo tax = taxeslogic // get the TaxRate for the product
.getTaxInfo(oProduct.getTaxCategoryID() .getTaxInfo(oProduct.getTaxCategoryID(), m_oTicket.getCustomer());
, m_oTicket.getCustomer());
if (oProduct.getPriceSell() != 0.0) { // we have a weight barcode if (oProduct.getPriceSell() != 0.0) { // we have a weight barcode
weight = Double.parseDouble(sVariableNum) / 100; // 2 decimals (e.g. 10.49 kg) weight = Double.parseDouble(sVariableNum) / 100; // 2 decimals (e.g. 10.49 kg)
@@ -1336,13 +1317,9 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
} }
if (m_jaddtax.isSelected()) { if (m_jaddtax.isSelected()) {
addTicketLine(oProduct addTicketLine(oProduct, dUnits, dPriceSell);
, dUnits
, dPriceSell);
} else { } else {
addTicketLine(oProduct addTicketLine(oProduct, dUnits, dPriceSell / (1.0 + tax.getRate()));
, dUnits
, dPriceSell / (1.0 + tax.getRate()));
} }
} }
} catch (BasicException eData) { } catch (BasicException eData) {
@@ -1395,7 +1372,6 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
m_jPrice.setText(setTempjPrice(m_jPrice.getText() + cTrans)); m_jPrice.setText(setTempjPrice(m_jPrice.getText() + cTrans));
} }
} else if (cTrans == '.' } else if (cTrans == '.'
&& m_iNumberStatus == NUMBER_INPUTZERO && !priceWith00) { && m_iNumberStatus == NUMBER_INPUTZERO && !priceWith00) {
m_jPrice.setText("0."); m_jPrice.setText("0.");
@@ -1785,7 +1761,6 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
} }
} }
private Window getActiveWindow() { private Window getActiveWindow() {
for (Window window : getWindows()) { for (Window window : getWindows()) {
if (window instanceof JRootFrame) { if (window instanceof JRootFrame) {
@@ -1834,7 +1809,7 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
ticket.setPayments(paymentdialog.getSelectedPayments()); ticket.setPayments(paymentdialog.getSelectedPayments());
ticket.setUser(m_App.getAppUserView().getUser().getUserInfo()); ticket.setUserInfo(m_App.getAppUserView().getUser().getUserInfo());
ticket.setActiveCash(m_App.getActiveCashIndex()); ticket.setActiveCash(m_App.getActiveCashIndex());
ticket.setDate(new Date()); ticket.setDate(new Date());
@@ -1849,17 +1824,22 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
m_config.setLastTicket(lastTicketNumber, lastTicketType); m_config.setLastTicket(lastTicketNumber, lastTicketType);
} catch (BasicException eData) { } catch (BasicException eData) {
MessageInf msg = new MessageInf(MessageInf.SGN_NOTICE, AppLocal.getIntString("message.nosaveticket"), eData); MessageInf msg = new MessageInf(MessageInf.SGN_NOTICE, AppLocal.getIntString("message.nosaveticket"),
eData);
msg.show(this); msg.show(this);
} catch (IOException ex) { } catch (IOException ex) {
log.error(ex.getMessage()); log.error(ex.getMessage());
} }
if (m_config.getProperty("till.digital-receipt") != null && m_config.getProperty("till.digital-receipt").equals("true")){ if (m_config.getProperty("till.digital-receipt") != null
&& m_config.getProperty("till.digital-receipt").equals("true")) {
log.debug("Send digital receipt"); log.debug("Send digital receipt");
String xml = dlSystem.getResourceAsXML("Printer.Ticket"); String xml = dlSystem.getResourceAsXML("Printer.Ticket");
new Application().sendReceipt(ticket, xml, getActiveWindow()); new Application().sendReceipt(ticket, xml, getActiveWindow());
} }
// this is where we trigger the efr integration
//
//
executeEvent(ticket, ticketext, "ticket.close", executeEvent(ticket, ticketext, "ticket.close",
new ScriptArg("print", paymentdialog.isPrintSelected())); new ScriptArg("print", paymentdialog.isPrintSelected()));
@@ -1873,7 +1853,8 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
if ("restaurant".equals(m_App.getProperties() if ("restaurant".equals(m_App.getProperties()
.getProperty("machine.ticketsbag")) && !ticket.getOldTicket()) { .getProperty("machine.ticketsbag")) && !ticket.getOldTicket()) {
/* Deliberately Explicit to allow for reassignments - future /*
* Deliberately Explicit to allow for reassignments - future
* even though we could do a single SQL statment sweep for reset * even though we could do a single SQL statment sweep for reset
*/ */
restDB.clearCustomerNameInTable(ticketext.toString()); restDB.clearCustomerNameInTable(ticketext.toString());
@@ -1932,7 +1913,6 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
return (tmpPickupId); return (tmpPickupId);
} }
private void printTicket(String sresourcename, TicketInfo ticket, Object ticketext) { private void printTicket(String sresourcename, TicketInfo ticket, Object ticketext) {
String sresource = dlSystem.getResourceAsXML(sresourcename); String sresource = dlSystem.getResourceAsXML(sresourcename);
@@ -2032,7 +2012,6 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
} }
} }
Map reportparams = new HashMap(); Map reportparams = new HashMap();
try { try {
@@ -2045,7 +2024,8 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
reportfields.put("TICKET", ticket); reportfields.put("TICKET", ticket);
reportfields.put("PLACE", ticketext); reportfields.put("PLACE", ticketext);
JasperPrint jp = JasperFillManager.fillReport(jr, reportparams, new JRMapArrayDataSource(new Object[]{reportfields})); JasperPrint jp = JasperFillManager.fillReport(jr, reportparams,
new JRMapArrayDataSource(new Object[] { reportfields }));
PrintService service = ReportUtils.getPrintService(m_App.getProperties().getProperty("machine.printername")); PrintService service = ReportUtils.getPrintService(m_App.getProperties().getProperty("machine.printername"));
@@ -2124,7 +2104,6 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
} }
} }
private Object executeEvent(TicketInfo ticket, Object ticketext, String eventkey, ScriptArg... args) { private Object executeEvent(TicketInfo ticket, Object ticketext, String eventkey, ScriptArg... args) {
String resource = m_jbtnconfig.getEvent(eventkey); String resource = m_jbtnconfig.getEvent(eventkey);
@@ -2263,7 +2242,6 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
"<b>" + AppLocal.getIntString("label.vip") + " : " + "</b>" + vip + "<br>" + "<b>" + AppLocal.getIntString("label.vip") + " : " + "</b>" + vip + "<br>" +
"<b>" + AppLocal.getIntString("label.discount") + " : " + "</b>" + discount + "<br>"; "<b>" + AppLocal.getIntString("label.discount") + " : " + "</b>" + discount + "<br>";
JFrame frame = new JFrame(); JFrame frame = new JFrame();
JOptionPane.showMessageDialog(frame, JOptionPane.showMessageDialog(frame,
content, content,
@@ -2367,14 +2345,14 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
} }
} }
/** /**
* 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 FormEditor. * always regenerated by the FormEditor.
*/ */
// <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents // <editor-fold defaultstate="collapsed" desc="Generated
// Code">//GEN-BEGIN:initComponents
private void initComponents() { private void initComponents() {
m_jPanContainer = new javax.swing.JPanel(); m_jPanContainer = new javax.swing.JPanel();
@@ -2401,7 +2379,8 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
jCheckStock = new javax.swing.JButton(); jCheckStock = new javax.swing.JButton();
m_jPanelCentral = new javax.swing.JPanel(); m_jPanelCentral = new javax.swing.JPanel();
jPanel4 = new javax.swing.JPanel(); jPanel4 = new javax.swing.JPanel();
filler2 = new javax.swing.Box.Filler(new java.awt.Dimension(5, 0), new java.awt.Dimension(5, 0), new java.awt.Dimension(5, 32767)); filler2 = new javax.swing.Box.Filler(new java.awt.Dimension(5, 0), new java.awt.Dimension(5, 0),
new java.awt.Dimension(5, 32767));
m_jTicketId = new javax.swing.JLabel(); m_jTicketId = new javax.swing.JLabel();
m_jPanTotals = new javax.swing.JPanel(); m_jPanTotals = new javax.swing.JPanel();
m_jLblTotalEuros3 = new javax.swing.JLabel(); m_jLblTotalEuros3 = new javax.swing.JLabel();
@@ -2546,26 +2525,32 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
m_jButtonsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) m_jButtonsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(m_jButtonsLayout.createSequentialGroup() .addGroup(m_jButtonsLayout.createSequentialGroup()
.addContainerGap() .addContainerGap()
.addComponent(jBtnCustomer, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) .addComponent(jBtnCustomer, javax.swing.GroupLayout.PREFERRED_SIZE,
javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(btnSplit, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) .addComponent(btnSplit, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE,
javax.swing.GroupLayout.PREFERRED_SIZE)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(j_btnRemotePrt, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) .addComponent(j_btnRemotePrt, javax.swing.GroupLayout.PREFERRED_SIZE,
javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(btnReprint1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) .addComponent(btnReprint1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE,
.addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) javax.swing.GroupLayout.PREFERRED_SIZE)
); .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)));
m_jButtonsLayout.setVerticalGroup( m_jButtonsLayout.setVerticalGroup(
m_jButtonsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) m_jButtonsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(m_jButtonsLayout.createSequentialGroup() .addGroup(m_jButtonsLayout.createSequentialGroup()
.addGap(5, 5, 5) .addGap(5, 5, 5)
.addGroup(m_jButtonsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false) .addGroup(m_jButtonsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false)
.addComponent(j_btnRemotePrt, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) .addComponent(j_btnRemotePrt, javax.swing.GroupLayout.DEFAULT_SIZE,
.addComponent(btnSplit, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addComponent(btnReprint1, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) .addComponent(btnSplit, javax.swing.GroupLayout.Alignment.TRAILING,
.addComponent(jBtnCustomer, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) .addComponent(btnReprint1, javax.swing.GroupLayout.Alignment.TRAILING,
); javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addComponent(jBtnCustomer, javax.swing.GroupLayout.DEFAULT_SIZE,
javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
.addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)));
m_jPanelBag.add(m_jButtons); m_jPanelBag.add(m_jButtons);
@@ -2808,7 +2793,9 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
m_jPrice.setFont(new java.awt.Font("Arial", 1, 16)); // NOI18N m_jPrice.setFont(new java.awt.Font("Arial", 1, 16)); // NOI18N
m_jPrice.setForeground(new java.awt.Color(76, 197, 237)); m_jPrice.setForeground(new java.awt.Color(76, 197, 237));
m_jPrice.setHorizontalAlignment(javax.swing.SwingConstants.LEFT); m_jPrice.setHorizontalAlignment(javax.swing.SwingConstants.LEFT);
m_jPrice.setBorder(javax.swing.BorderFactory.createCompoundBorder(javax.swing.BorderFactory.createLineBorder(new java.awt.Color(76, 197, 237)), javax.swing.BorderFactory.createEmptyBorder(1, 4, 1, 4))); m_jPrice.setBorder(javax.swing.BorderFactory.createCompoundBorder(
javax.swing.BorderFactory.createLineBorder(new java.awt.Color(76, 197, 237)),
javax.swing.BorderFactory.createEmptyBorder(1, 4, 1, 4)));
m_jPrice.setOpaque(true); m_jPrice.setOpaque(true);
m_jPrice.setPreferredSize(new java.awt.Dimension(100, 25)); m_jPrice.setPreferredSize(new java.awt.Dimension(100, 25));
m_jPrice.setRequestFocusEnabled(false); m_jPrice.setRequestFocusEnabled(false);
@@ -2858,36 +2845,46 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
.addGroup(jPanel9Layout.createSequentialGroup() .addGroup(jPanel9Layout.createSequentialGroup()
.addGroup(jPanel9Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false) .addGroup(jPanel9Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false)
.addComponent(m_jPor) .addComponent(m_jPor)
.addComponent(m_jKeyFactory, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) .addComponent(m_jKeyFactory, javax.swing.GroupLayout.DEFAULT_SIZE,
javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 7, Short.MAX_VALUE) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 7, Short.MAX_VALUE)
.addGroup(jPanel9Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(jPanel9Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(jPanel9Layout.createSequentialGroup() .addGroup(jPanel9Layout.createSequentialGroup()
.addComponent(m_jaddtax, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) .addComponent(m_jaddtax, javax.swing.GroupLayout.DEFAULT_SIZE,
javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addGap(7, 7, 7) .addGap(7, 7, 7)
.addComponent(m_jTax, javax.swing.GroupLayout.PREFERRED_SIZE, 128, javax.swing.GroupLayout.PREFERRED_SIZE) .addComponent(m_jTax, javax.swing.GroupLayout.PREFERRED_SIZE, 128,
javax.swing.GroupLayout.PREFERRED_SIZE)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED))
.addGroup(jPanel9Layout.createSequentialGroup() .addGroup(jPanel9Layout.createSequentialGroup()
.addComponent(m_jPrice, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) .addComponent(m_jPrice, javax.swing.GroupLayout.DEFAULT_SIZE,
javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addGap(5, 5, 5))) .addGap(5, 5, 5)))
.addComponent(m_jEnter, javax.swing.GroupLayout.PREFERRED_SIZE, 71, javax.swing.GroupLayout.PREFERRED_SIZE) .addComponent(m_jEnter, javax.swing.GroupLayout.PREFERRED_SIZE, 71,
.addContainerGap()) javax.swing.GroupLayout.PREFERRED_SIZE)
); .addContainerGap()));
jPanel9Layout.setVerticalGroup( jPanel9Layout.setVerticalGroup(
jPanel9Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) jPanel9Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(jPanel9Layout.createSequentialGroup() .addGroup(jPanel9Layout.createSequentialGroup()
.addComponent(m_jEnter, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) .addComponent(m_jEnter, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE,
javax.swing.GroupLayout.PREFERRED_SIZE)
.addGap(0, 0, Short.MAX_VALUE)) .addGap(0, 0, Short.MAX_VALUE))
.addGroup(jPanel9Layout.createSequentialGroup() .addGroup(jPanel9Layout.createSequentialGroup()
.addComponent(m_jPrice, javax.swing.GroupLayout.PREFERRED_SIZE, 44, javax.swing.GroupLayout.PREFERRED_SIZE) .addComponent(m_jPrice, javax.swing.GroupLayout.PREFERRED_SIZE, 44,
javax.swing.GroupLayout.PREFERRED_SIZE)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 7, Short.MAX_VALUE) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 7, Short.MAX_VALUE)
.addGroup(jPanel9Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(jPanel9Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(m_jTax, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.PREFERRED_SIZE, 30, javax.swing.GroupLayout.PREFERRED_SIZE) .addComponent(m_jTax, javax.swing.GroupLayout.Alignment.TRAILING,
.addComponent(m_jaddtax, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))) javax.swing.GroupLayout.PREFERRED_SIZE, 30, javax.swing.GroupLayout.PREFERRED_SIZE)
.addComponent(m_jaddtax, javax.swing.GroupLayout.Alignment.TRAILING,
javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE,
javax.swing.GroupLayout.PREFERRED_SIZE)))
.addGroup(javax.swing.GroupLayout.Alignment.TRAILING, jPanel9Layout.createSequentialGroup() .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, jPanel9Layout.createSequentialGroup()
.addComponent(m_jPor) .addComponent(m_jPor)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED,
.addComponent(m_jKeyFactory, javax.swing.GroupLayout.PREFERRED_SIZE, 1, javax.swing.GroupLayout.PREFERRED_SIZE)) javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
); .addComponent(m_jKeyFactory, javax.swing.GroupLayout.PREFERRED_SIZE, 1,
javax.swing.GroupLayout.PREFERRED_SIZE)));
m_jPanEntries.add(jPanel9); m_jPanEntries.add(jPanel9);
@@ -3298,8 +3295,7 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
CustomerInfoExt m_customerInfo = dialog.getSelectedCustomer(); CustomerInfoExt m_customerInfo = dialog.getSelectedCustomer();
if (dialog.getSelectedCustomer() != null) { if (dialog.getSelectedCustomer() != null) {
try { try {
m_oTicket.setCustomer(dlSales.loadCustomerExt m_oTicket.setCustomer(dlSales.loadCustomerExt(dialog.getSelectedCustomer().getId()));
(dialog.getSelectedCustomer().getId()));
} catch (BasicException ex) { } catch (BasicException ex) {
log.error(ex.getMessage()); log.error(ex.getMessage());
} }
@@ -3317,11 +3313,10 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
if (finder.getSelectedCustomer() != null) { if (finder.getSelectedCustomer() != null) {
try { try {
m_oTicket.setCustomer(dlSales.loadCustomerExt m_oTicket.setCustomer(dlSales.loadCustomerExt(finder.getSelectedCustomer().getId()));
(finder.getSelectedCustomer().getId()));
if ("restaurant".equals(m_App.getProperties().getProperty("machine.ticketsbag"))) { if ("restaurant".equals(m_App.getProperties().getProperty("machine.ticketsbag"))) {
restDB.setCustomerNameInTableByTicketId(dlSales.loadCustomerExt restDB.setCustomerNameInTableByTicketId(
(finder.getSelectedCustomer().getId()).toString(), m_oTicket.getId()); dlSales.loadCustomerExt(finder.getSelectedCustomer().getId()).toString(), m_oTicket.getId());
} }
checkCustomer(); checkCustomer();
@@ -3352,11 +3347,10 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
if (finder.getSelectedCustomer() != null) { if (finder.getSelectedCustomer() != null) {
try { try {
m_oTicket.setCustomer(dlSales.loadCustomerExt m_oTicket.setCustomer(dlSales.loadCustomerExt(finder.getSelectedCustomer().getId()));
(finder.getSelectedCustomer().getId()));
if ("restaurant".equals(m_App.getProperties().getProperty("machine.ticketsbag"))) { if ("restaurant".equals(m_App.getProperties().getProperty("machine.ticketsbag"))) {
restDB.setCustomerNameInTableByTicketId(dlSales.loadCustomerExt restDB.setCustomerNameInTableByTicketId(
(finder.getSelectedCustomer().getId()).toString(), m_oTicket.getId()); dlSales.loadCustomerExt(finder.getSelectedCustomer().getId()).toString(), m_oTicket.getId());
} }
checkCustomer(); checkCustomer();
@@ -3432,9 +3426,10 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
private javax.swing.JButton m_jbtnScale; private javax.swing.JButton m_jbtnScale;
// End of variables declaration//GEN-END:variables // End of variables declaration//GEN-END:variables
/* Remote Orders Display /*
We only know about uniCenta oPOS orders and won't try and handle any * Remote Orders Display
that are injected from an external source * We only know about uniCenta oPOS orders and won't try and handle any
* that are injected from an external source
*/ */
public void remoteOrderDisplay() { public void remoteOrderDisplay() {
@@ -3492,29 +3487,23 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
} }
} }
dlSystem.addOrder(getPickupString(m_oTicket) dlSystem.addOrder(getPickupString(m_oTicket), (int) m_oTicket.getLine(i).getMultiply(),
, (int) m_oTicket.getLine(i).getMultiply() m_oTicket.getLine(i).getProductName(), m_oTicket.getLine(i).getProductAttSetInstDesc(),
, m_oTicket.getLine(i).getProductName() m_oTicket.getLine(i).getProperty("notes"), id, null, display, null, null);
, m_oTicket.getLine(i).getProductAttSetInstDesc()
, m_oTicket.getLine(i).getProperty("notes")
, id
, null
, display
, null
, null);
/* this block for future - right now we're deleting all ticketlines /*
and resending for consistency with actual ticketlines * this block for future - right now we're deleting all ticketlines
dlSystem.updateOrder(getPickupString(m_oTicket) * and resending for consistency with actual ticketlines
, (int) m_oTicket.getLine(i).getMultiply() * dlSystem.updateOrder(getPickupString(m_oTicket)
, m_oTicket.getLine(i).getProductName() * , (int) m_oTicket.getLine(i).getMultiply()
, m_oTicket.getLine(i).getProductAttSetInstDesc() * , m_oTicket.getLine(i).getProductName()
, m_oTicket.getLine(i).getProperty("notes") * , m_oTicket.getLine(i).getProductAttSetInstDesc()
, id * , m_oTicket.getLine(i).getProperty("notes")
, null * , id
, display * , null
, null * , display
, null); * , null
* , null);
*/ */
} catch (BasicException ex) { } catch (BasicException ex) {
src/main/java/com/unicenta/pos/sales/restaurant/JTicketsBagRestaurantMap.java
+28 -34
View File
@@ -74,7 +74,8 @@ 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(Place.class.getResource("/com/unicenta/images/edit_group_sm.png")); private static final Icon ICO_OCU_SM = new ImageIcon(
Place.class.getResource("/com/unicenta/images/edit_group_sm.png"));
private static final Icon ICO_WAITER = new NullIcon(1, 1); private static final Icon ICO_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;
@@ -87,10 +88,12 @@ 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) {
@@ -217,8 +220,7 @@ public class JTicketsBagRestaurantMap extends JTicketsBag {
pl.setY(newY); pl.setY(newY);
} }
} }
} });
);
pl.getButton().addActionListener(new MyActionListener(pl)); pl.getButton().addActionListener(new MyActionListener(pl));
} }
@@ -418,10 +420,8 @@ public class JTicketsBagRestaurantMap extends JTicketsBag {
m_PlaceCurrent = null; m_PlaceCurrent = null;
} else { } else {
JOptionPane.showMessageDialog(null JOptionPane.showMessageDialog(null, AppLocal.getIntString("message.sharedticketlockoverriden"),
, AppLocal.getIntString("message.sharedticketlockoverriden") AppLocal.getIntString("title.editor"), JOptionPane.INFORMATION_MESSAGE);
, AppLocal.getIntString("title.editor")
, JOptionPane.INFORMATION_MESSAGE);
} }
} catch (BasicException ex) { } catch (BasicException ex) {
log.error(ex.getMessage()); log.error(ex.getMessage());
@@ -598,7 +598,8 @@ Integer count = restDB.getGuestsInTable(place.getId());
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_OCU_SM); ? ICO_WAITER
: 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>"
@@ -646,12 +647,9 @@ Integer count = restDB.getGuestsInTable(place.getId());
// places here // places here
} else { } else {
m_jText.setText(AppLocal.getIntString("label.restaurantcustomer" m_jText.setText(AppLocal.getIntString("label.restaurantcustomer", new Object[] {
, new Object[] {
customer.getName() customer.getName()
} }));
)
);
m_aplaces.stream() m_aplaces.stream()
.forEach((place) -> { .forEach((place) -> {
@@ -660,11 +658,9 @@ Integer count = restDB.getGuestsInTable(place.getId());
m_jbtnReservations.setEnabled(false); m_jbtnReservations.setEnabled(false);
} }
} else { } else {
m_jText.setText(AppLocal.getIntString("label.restaurantmove" m_jText.setText(AppLocal.getIntString("label.restaurantmove", new Object[] {
, new Object[] {
m_PlaceClipboard.getName() m_PlaceClipboard.getName()
} }));
));
m_aplaces.stream() m_aplaces.stream()
.forEach((place) -> { .forEach((place) -> {
@@ -709,9 +705,11 @@ Integer count = restDB.getGuestsInTable(place.getId());
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();
@@ -723,7 +721,7 @@ Integer count = restDB.getGuestsInTable(place.getId());
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.setUser(m_App.getAppUserView().getUser().getUserInfo()); ticket.setUserInfo(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) {
@@ -742,10 +740,9 @@ Integer count = restDB.getGuestsInTable(place.getId());
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("message.sharedticketlockoverride"), AppLocal.getIntString("title.editor"),
, AppLocal.getIntString("title.editor") JOptionPane.YES_NO_OPTION, JOptionPane.WARNING_MESSAGE);
, JOptionPane.YES_NO_OPTION, JOptionPane.WARNING_MESSAGE);
if (res == JOptionPane.YES_OPTION) { if (res == JOptionPane.YES_OPTION) {
m_place.setPeople(true); m_place.setPeople(true);
@@ -766,10 +763,8 @@ Integer count = restDB.getGuestsInTable(place.getId());
m_lockState = "locked"; m_lockState = "locked";
setActivePlace(m_place, ticket); setActivePlace(m_place, ticket);
} else { } else {
JOptionPane.showMessageDialog(null JOptionPane.showMessageDialog(null, AppLocal.getIntString("message.sharedticket"),
, AppLocal.getIntString("message.sharedticket") AppLocal.getIntString("title.editor"), JOptionPane.OK_OPTION);
, AppLocal.getIntString("title.editor")
, JOptionPane.OK_OPTION);
} }
} }
} catch (BasicException ex) { } catch (BasicException ex) {
@@ -891,14 +886,14 @@ Integer count = restDB.getGuestsInTable(place.getId());
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 Code">//GEN-BEGIN:initComponents // <editor-fold defaultstate="collapsed" desc="Generated
// Code">//GEN-BEGIN:initComponents
private void initComponents() { private void initComponents() {
m_jPanelMap = new javax.swing.JPanel(); m_jPanelMap = new javax.swing.JPanel();
@@ -1069,7 +1064,6 @@ Integer count = restDB.getGuestsInTable(place.getId());
}); });
}// 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;
private javax.swing.JPanel jPanel2; private javax.swing.JPanel jPanel2;
src/main/java/com/unicenta/pos/ticket/TicketLineInfo.java
+59 -5
View File
@@ -56,12 +56,15 @@ 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);
} }
@@ -79,6 +82,7 @@ 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
@@ -87,7 +91,8 @@ 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, double dMultiply, double dPrice, TaxInfo tax) { public TicketLineInfo(String productid, String productname, String producttaxcategory, String productprinter,
double dMultiply, double dPrice, TaxInfo tax) {
Properties props = new Properties(); Properties props = new Properties();
props.setProperty("product.name", productname); props.setProperty("product.name", productname);
props.setProperty("product.taxcategoryid", producttaxcategory); props.setProperty("product.taxcategoryid", producttaxcategory);
@@ -98,6 +103,7 @@ public class TicketLineInfo implements SerializableWrite, SerializableRead, Seri
/** /**
* 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
@@ -105,7 +111,8 @@ 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, double dPrice, TaxInfo tax) { public TicketLineInfo(String productname, String producttaxcategory, String productprinter, double dMultiply,
double dPrice, TaxInfo tax) {
Properties props = new Properties(); Properties props = new Properties();
props.setProperty("product.name", productname); props.setProperty("product.name", productname);
@@ -208,7 +215,8 @@ 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, Properties attributes) { private void init(String productid, String attsetinstid, double dMultiply, double dPrice, TaxInfo tax,
Properties attributes) {
this.productid = productid; this.productid = productid;
this.attsetinstid = attsetinstid; this.attsetinstid = attsetinstid;
@@ -306,31 +314,40 @@ 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;
} }
@@ -339,22 +356,28 @@ public class TicketLineInfo implements SerializableWrite, SerializableRead, Seri
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");
} }
@@ -367,9 +390,11 @@ 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);
} }
@@ -378,9 +403,11 @@ public class TicketLineInfo implements SerializableWrite, SerializableRead, Seri
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;
} }
@@ -389,21 +416,27 @@ public class TicketLineInfo implements SerializableWrite, SerializableRead, Seri
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);
@@ -411,9 +444,11 @@ 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);
@@ -430,60 +465,79 @@ 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;
} }
test.jpg
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 12 KiB